[Gnucash-changes] r12863 - gnucash/trunk - Rework schema infrastructure so that all schema strings will appear

David Hampton hampton at cvs.gnucash.org
Wed Jan 18 19:40:33 EST 2006


Author: hampton
Date: 2006-01-18 19:40:32 -0500 (Wed, 18 Jan 2006)
New Revision: 12863
Trac: http://svn.gnucash.org/trac/changeset/12863

Added:
   gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in
   gnucash/trunk/src/gnome-utils/schemas/apps_gnucash_history.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_common.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_totd.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in
   gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_register.schemas.in
   gnucash/trunk/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in
   gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in
Removed:
   gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas
   gnucash/trunk/src/gnome-utils/schemas/apps_gnucash_history.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_common.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_prices.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_totd.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas
   gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_register.schemas
   gnucash/trunk/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas
   gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas
Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/make-gnucash-potfiles.in
   gnucash/trunk/src/business/business-gnome/schemas/Makefile.am
   gnucash/trunk/src/gnome-utils/schemas/Makefile.am
   gnucash/trunk/src/gnome/schemas/Makefile.am
   gnucash/trunk/src/import-export/hbci/schemas/Makefile.am
   gnucash/trunk/src/import-export/schemas/Makefile.am
Log:
Rework schema infrastructure so that all schema strings will appear
for translation, and the translations will be incorporated back into
the schema files.  Fixed bugs #327507 and #327353.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/ChangeLog	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,3 +1,11 @@
+2006-01-18  David Hampton  <hampton at employees.org>
+
+	* All xxx.schemas files renamed to xxx.schemas.in.
+	* All schema directory Makefile.am files replaced.
+	* make-gnucash-potfiles.in: Now also pulls strings from schema
+	files.  Together these fix bugs #327507 and #327353 which are
+	about schema file strings not being translated.
+
 2006-01-18  Joshua Sled  <jsled at asynchronous.org>
 
 	* src/gnome/dialog-sx-from-trans.c (sxftd_update_fs): Propgate

Modified: gnucash/trunk/make-gnucash-potfiles.in
===================================================================
--- gnucash/trunk/make-gnucash-potfiles.in	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/make-gnucash-potfiles.in	2006-01-19 00:40:32 UTC (rev 12863)
@@ -10,7 +10,9 @@
 
 use File::Basename;
 
-my @possible_files = `find src -name '*.c' -o -name '*.glade' -o -name '*.desktop.in' -o -name '*.keys.in' |sort`;
+my @possible_files = `find src -name '*.c' -o -name '*.glade'      \\
+                      -o -name '*.desktop.in' -o -name '*.keys.in' \\
+                      -o -name '*.schemas.in' |sort`;
 ## For perl files add the following:
 # -o -name '*.pl'
 

Modified: gnucash/trunk/src/business/business-gnome/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/schemas/Makefile.am	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/business/business-gnome/schemas/Makefile.am	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,15 +1,10 @@
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
-dist_schema_DATA = \
-  apps_gnucash_dialog_business_common.schemas
+schemas_in_files = \
+  apps_gnucash_dialog_business_common.schemas.in
+schema_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
-endif
+ at INTLTOOL_SCHEMAS_RULE@
 
-uninstall-local:
-if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
-endif
+EXTRA_DIST = $(schemas_in_files)
 
+CLEANFILES = $(schema_DATA)

Deleted: gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas
===================================================================
--- gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,152 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/business/coordinates</key>
-      <applyto>/apps/gnucash/dialogs/business/bill/window_coordinates</applyto>
-      <applyto>/apps/gnucash/dialogs/business/customer_search/window_coordinates</applyto>
-      <applyto>/apps/gnucash/dialogs/business/employee_search/window_coordinates</applyto>
-      <applyto>/apps/gnucash/dialogs/business/invoice/window_coordinates</applyto>
-      <applyto>/apps/gnucash/dialogs/business/invoice_search/window_coordinates</applyto>
-      <applyto>/apps/gnucash/dialogs/business/job_search/window_coordinates</applyto>
-      <applyto>/apps/gnucash/dialogs/business/order_search/window_coordinates</applyto>
-      <applyto>/apps/gnucash/dialogs/business/vendor_search/window_coordinates</applyto>
-      <applyto>/apps/gnucash/dialogs/business/voucher/window_coordinates</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <locale name="C">
-        <short>Window position and size</short>
-        <long>
-	  This key contains the coordinates describing the last
-	  location of the window.  The numbers are the X and Y
-	  coordinates of the top left corner of the window, and the
-	  width and height of the window.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/search_for_active_only</key>
-      <applyto>/apps/gnucash/dialogs/business/customer_search/search_for_active_only</applyto>
-      <applyto>/apps/gnucash/dialogs/business/employee_search/search_for_active_only</applyto>
-      <applyto>/apps/gnucash/dialogs/business/invoice_search/search_for_active_only</applyto>
-      <applyto>/apps/gnucash/dialogs/business/job_search/search_for_active_only</applyto>
-      <applyto>/apps/gnucash/dialogs/business/order_search/search_for_active_only</applyto>
-      <applyto>/apps/gnucash/dialogs/business/vendor_search/search_for_active_only</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <locale name="C">
-        <short>Search only in active items</short>
-        <long>
-	  This key indicates whether to search in all items in the
-	  current class, or only in 'active' items in the current
-	  class.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/business/invoice/use_new_window</key>
-      <applyto>/apps/gnucash/dialogs/business/invoice/use_new_window</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Create a new window for each new invoice.</short>
-        <long>
-	  Set this value to TRUE to have gnucash open each new
-	  invoice in its own window.  Set to FALSE to have gnucash
-	  open new invoices as tabs in the front window.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/business/invoice/accumulate_splits</key>
-      <applyto>/apps/gnucash/dialogs/business/invoice/accumulate_splits</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Accumulate Create a new window for each new invoice.</short>
-        <long>
-	  If this field is TRUE then multiple entries in an invoice
-	  that transfer to the same account will be accumulated into a
-	  single split.  This field can be overridden per invoice in
-	  the Posting dialog.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/business/tax_included</key>
-      <applyto>/apps/gnucash/dialogs/business/bill/tax_included</applyto>
-      <applyto>/apps/gnucash/dialogs/business/invoice/tax_included</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Is tax included ion this type of business entry?</short>
-        <long>
-	  If set to TRUE then tax is included by default in entries of
-	  this type.  This setting is inherited by new customers and
-	  vendors.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/business/invoice/number_of_rows</key>
-      <applyto>/apps/gnucash/dialogs/business/invoice/number_of_rows</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>10.0</default>
-      <locale name="C">
-        <short>The number of rows in an invoice.</short>
-        <long>
-	  This field sets the number of rows to show in an invoice.
-	  It does not actually affect the display of the contents of
-	  the window.  It is only used to set the size of the window
-	  when first opened.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/business/bill/notify_when_due</key>
-      <applyto>/apps/gnucash/dialogs/business/bill/notify_when_due</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show bills due reminder at startup.</short>
-        <long>
-	  If TRUE, at startup Gnucash will check to see whether any
-	  bills will become due soon.  If so, it will present the user
-	  with a reminder dialog.  The definition of "soon" is
-	  controlled by the "Days in Advance" setting.  If FALSE,
-	  gnucash does not check for due bills.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/business/bill/days_in_advance</key>
-      <applyto>/apps/gnucash/dialogs/business/bill/days_in_advance</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>7.0</default>
-      <locale name="C">
-        <short>Show bills due within this many days.</short>
-        <long>
-	  This field defines the number of days in advance that
-	  Gnucash will check for due bills.  Its value is only used if
-	  the "Notify when due" setting is TRUE.
-	</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in (from rev 12840, gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas)

Modified: gnucash/trunk/src/gnome/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/schemas/Makefile.am	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/Makefile.am	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,23 +1,18 @@
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
-dist_schema_DATA = \
-  apps_gnucash_dialog_common.schemas \
-  apps_gnucash_dialog_commodities.schemas \
-  apps_gnucash_dialog_prices.schemas \
-  apps_gnucash_dialog_reconcile.schemas \
-  apps_gnucash_dialog_totd.schemas \
-  apps_gnucash_general.schemas \
-  apps_gnucash_warnings.schemas \
-  apps_gnucash_window_pages_account_tree.schemas \
-  apps_gnucash_window_pages_register.schemas
+schemas_in_files = \
+  apps_gnucash_dialog_common.schemas.in \
+  apps_gnucash_dialog_commodities.schemas.in \
+  apps_gnucash_dialog_prices.schemas.in \
+  apps_gnucash_dialog_reconcile.schemas.in \
+  apps_gnucash_dialog_totd.schemas.in \
+  apps_gnucash_general.schemas.in \
+  apps_gnucash_warnings.schemas.in \
+  apps_gnucash_window_pages_account_tree.schemas.in \
+  apps_gnucash_window_pages_register.schemas.in
+schema_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
-endif
+ at INTLTOOL_SCHEMAS_RULE@
 
-uninstall-local:
-if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
-endif
+EXTRA_DIST = $(schemas_in_files)
 
+CLEANFILES = $(schema_DATA)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,155 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/column_order</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/column_order</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[namespace,symbol,name,printname,uniquename,cusip_code,fraction,quote_flag,quote_source,quote_timezone]</default>
-      <locale name="C">
-        <short>Order of columns in the dialog</short>
-        <long>This key contains a list of name which control the order
-	in which the columns are listed in the dialog.  Names may be reordered
-	or removed from this list to control which columns appear in the dialog
-	and in what order.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/namespace_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/namespace_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the Namespace column</short>
-        <long>Whether or not to show the Namespace column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/symbol_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/symbol_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the symbol column</short>
-        <long>Whether or not to show the symbol column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/name_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/name_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the name column</short>
-        <long>Whether or not to show the name column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/fullname_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/fullname_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Whether or not to show the Full Name column</short>
-        <long>Whether or not to show the Full Name column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/printname_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/printname_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Whether or not to show the Print Name column</short>
-        <long>Whether or not to show the Print Name column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/uniquename_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/uniquename_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Whether or not to show the Unique Name column</short>
-        <long>Whether or not to show the Unique Name column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/cusip_code_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/cusip_code_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the CUSIP Code (Exchange Specific Data) column</short>
-        <long>Whether or not to show the CUSIP Code (Exchange Specific Data) column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/fraction_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/fraction_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the fraction column</short>
-        <long>Whether or not to show the fraction column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/quote_flag_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/quote_flag_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Whether or not to show the Quote Flag column</short>
-        <long>Whether or not to show the Quote Flag column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/quote_source_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/quote_source_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Whether or not to show the Quote Source column</short>
-        <long>Whether or not to show the Quote Source column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/quote_timezone_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/quote_timezone_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Whether or not to show the Quote Timezone column</short>
-        <long>Whether or not to show the Quote Timezone column.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_commodities/include_iso</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/include_iso</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Whether or not to show currencies in this dialog</short>
-        <long>Whether or not to show currencies in this dialog.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_commodities.schemas)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_common.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_common.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_common.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,163 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/position</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/find/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/edit_prices/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/since_last_run/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/transaction_editor/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/transaction_list/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/tax_info/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/preferences/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/reset_warnings/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/tip_of_the_day/window_position</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <locale name="C">
-        <short>Window position</short>
-        <long>
-	  The X,Y coordinates of the top left corner of the dialog
-	  when it was last closed.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/geometry</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/find/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/edit_prices/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/since_last_run/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/transaction_editor/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/transaction_list/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/tax_info/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/preferences/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/reset_warnings/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/tip_of_the_day/window_geometry</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <locale name="C">
-        <short>Window geometry</short>
-        <long>
-	  The width and size of the dialog when it was last closed.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/search_for_active_only</key>
-      <applyto>/apps/gnucash/dialogs/find/search_for_active_only</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <locale name="C">
-        <short>Search only in active items</short>
-        <long>
-	  This key indicates whether to search in all items in the
-	  current class, or only in 'active' items in the current
-	  class.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/last_path</key>
-      <applyto>/apps/gnucash/dialogs/export_accounts/last_path</applyto>
-      <applyto>/apps/gnucash/dialogs/log_replay/last_path</applyto>
-      <applyto>/apps/gnucash/dialogs/import/mt940/last_path</applyto>
-      <applyto>/apps/gnucash/dialogs/import/ofx/last_path</applyto>
-      <applyto>/apps/gnucash/dialogs/import/qif/last_path</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <locale name="C">
-        <short>Last pathname used</short>
-        <long>
-	  This key contains the last pathname used by this dialog.  It
-	  will be used as the initial filename/pathname the next time
-	  this dialog is opened.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/sort_column</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/sort_column</applyto>
-      <applyto>/apps/gnucash/dialogs/edit_prices/sort_column</applyto>
-      <applyto>/apps/gnucash/window/pages/account_tree/sort_column</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <locale name="C">
-        <short>How is the key column sorted</short>
-        <long>
-	  This key indicates which column in the tree is used for
-	  sorting.  Legal values for this key are the name of any
-	  column in this dialog (see the column_order key) or the
-	  keyword 'none'.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/sort_order</key>
-      <applyto>/apps/gnucash/dialogs/edit_commodities/sort_order</applyto>
-      <applyto>/apps/gnucash/dialogs/edit_prices/sort_order</applyto>
-      <applyto>/apps/gnucash/window/pages/account_tree/sort_order</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <locale name="C">
-        <short>How is the key column sorted</short>
-        <long>
-	  This key indicates how the key column is sorted.  Legal
-	  values for this key are 'ascending' and 'descending'.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/new_user/first_startup</key>
-      <applyto>/apps/gnucash/dialogs/new_user/first_startup</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show the new user dialog.</short>
-        <long>
-	 Show the new user dialog.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/new_hierarchy/show_on_new_file</key>
-      <applyto>/apps/gnucash/dialogs/new_hierarchy/show_on_new_file</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show the new hierarchy dialog whenever the "New File" menu item is chosen.</short>
-        <long>
-	 Show the new hierarchy dialog whenever the "New File" menu item is chosen.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/search/new_search_limit</key>
-      <applyto>/apps/gnucash/dialogs/search/new_search_limit</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>1.0</default>
-      <locale name="C">
-        <short>Default to 'new search' if fewer than this number of items is returned.</short>
-        <long>Default to 'new search' if fewer than this number of items is returned.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_common.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_common.schemas)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_prices.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_prices.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_prices.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_prices/column_order</key>
-      <applyto>/apps/gnucash/dialogs/edit_prices/column_order</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[commodity,currency,date,source,type,price]</default>
-      <locale name="C">
-        <short>Order of columns in the dialog</short>
-        <long>This key contains a list of name which control the order
-	in which the columns are listed in the dialog.  Names may be reordered
-	or removed from this list to control which columns appear in the dialog
-	and in what order.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_prices/commodity_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_prices/commodity_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the commodity column</short>
-        <long>Whether or not to show the commodity column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_prices/currency_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_prices/currency_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the currency column</short>
-        <long>Whether or not to show the currency column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_prices/date_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_prices/date_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the date column</short>
-        <long>Whether or not to show the date column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_prices/source_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_prices/source_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the Source column</short>
-        <long>Whether or not to show the Source column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_prices/type_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_prices/type_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the Type column</short>
-        <long>Whether or not to show the Type column.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/edit_prices/price_visible</key>
-      <applyto>/apps/gnucash/dialogs/edit_prices/price_visible</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Whether or not to show the Price column</short>
-        <long>Whether or not to show the Price column.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_prices.schemas)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/reconcile/check_cleared</key>
-      <applyto>/apps/gnucash/dialogs/reconcile/check_cleared</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Pre-select cleared transactions.</short>
-        <long>
-	  This setting controls whether or not any transactions are
-	  celected when a reconciliation dialog is created.  If set to
-	  TRUE, then all transactions marked as cleared in the
-	  register will appear already selected in this dialog. If
-	  FALSE, then no transactions will be initially selected.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/reconcile/auto_interest_transfer</key>
-      <applyto>/apps/gnucash/dialogs/reconcile/auto_interest_transfer</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Prompt for interest charges.</short>
-        <long>
-	  Prior to reconciling an account which charges or pays
-	  interest, prompt the user to enter a transaction for the
-	  interest charge or payment.  Currently only enabled for
-	  Bank, Credit, Mutual, Asset, Receivable, Payable, and
-	  Liability accounts.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/reconcile/auto_cc_payment</key>
-      <applyto>/apps/gnucash/dialogs/reconcile/auto_cc_payment</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Prompt for credit card payment.</short>
-        <long>
-	  After reconciling a credit card account, prompt the user to
-	  enter a credit card payment.
-	</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/scheduled_trans/since_last_run/show_at_file_open</key>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/since_last_run/show_at_file_open</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show "since last run" dialog when a file is opened.</short>
-        <long>
-	  Whether or not to show scheduled transactions "since last
-	  run" dialog when a data file is opened.  This includes the
-	  initial data file open when GnuCash starts.  A value of TRUE
-	  says to show the dialog; FALSE says not to show the dialog.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/scheduled_trans/transaction_editor/create_auto</key>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/transaction_editor/create_auto</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Set the "auto create" flag by default</short>
-        <long>
-	  If set to TRUE then any newly created scheduled transactions
-	  will have its 'auto create' flag set by default.  The user
-	  can change this pre-transaction flag during transaction
-	  creation, or at any later time by editing the transaction.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/scheduled_trans/transaction_editor/create_days</key>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/transaction_editor/create_days</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>0</default>
-      <locale name="C">
-        <short>How many days in advance to notify the user.</short>
-        <long>How many days in advance to notify the user.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/scheduled_trans/transaction_editor/notify</key>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/transaction_editor/notify</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Set the "notify" flag by default</short>
-        <long>
-	  If set to TRUE then any newly created scheduled transactions
-	  will have its 'notify' flag set by default.  The user can
-	  change this pre-transaction flag during transaction
-	  creation, or at any later time by editing the transaction.
-	  This setting only has meaning of the create_auto setting is
-	  TRUE.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/scheduled_trans/transaction_editor/remind_days</key>
-      <applyto>/apps/gnucash/dialogs/scheduled_trans/transaction_editor/remind_days</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>0</default>
-      <locale name="C">
-        <short>How many days in advance to remind the user.</short>
-        <long>How many days in advance to remind the user.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_totd.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_totd.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_totd.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/tip_of_the_day/show_at_startup</key>
-      <applyto>/apps/gnucash/dialogs/tip_of_the_day/show_at_startup</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show "Tip Of The Day" at GnuCash start</short>
-        <long>
-	  Whether or not to show "Tip Of The Day" when GnuCash starts
-	  up.  A value of TRUE says to show the dialog; FALSE says not
-	  to show the dialog.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/tip_of_the_day/current_tip</key>
-      <applyto>/apps/gnucash/dialogs/tip_of_the_day/current_tip</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>The next tip to show.</short>
-        <long>The next tip to show.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_totd.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_dialog_totd.schemas)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,468 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/save_window_geometry</key>
-      <applyto>/apps/gnucash/general/save_window_geometry</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Save window sizes and locations.</short>
-        <long>
-	  Save the size and location of each dialog window when it is
-	  closed.  The sizes and locations of content windows will be
-	  remembered when you quit gnucash.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/account_separator</key>
-      <applyto>/apps/gnucash/general/account_separator</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default>colon</default>
-      <locale name="C">
-        <short>What character to use between account names</short>
-        <long>
-	  This setting determines the character that will be used
-	  between components of an account name.  The legal settings
-	  are "colon" "slash", "backslash", "dash" and "period".
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/file_compression</key>
-      <applyto>/apps/gnucash/general/file_compression</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Compress the data file.</short>
-        <long>Compress the data file.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/negative_in_red</key>
-      <applyto>/apps/gnucash/general/negative_in_red</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Display negative amounts in red</short>
-        <long>Display negative amounts in red</long>
-      </locale>
-    </schema>
-
-    <schema>
-
-      <key>/schemas/apps/gnucash/general/enable_euro</key>
-      <applyto>/apps/gnucash/general/enable_euro</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Enables support for the European Union EURO currency.</short>
-        <long>Enables support for the European Union EURO currency.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/auto_decimal_point</key>
-      <applyto>/apps/gnucash/general/auto_decimal_point</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Automatically insert a decimal point.</short>
-        <long>
-	  If TRUE, Gnucash will automatically insert a decimal point
-	  into values that are entered without one.  If FALSE, Gnucash
-	  will not modify entered numbers.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/auto_decimal_places</key>
-      <applyto>/apps/gnucash/general/auto_decimal_places</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>2.0</default>
-      <locale name="C">
-        <short>How many automatic decimal places will be filled in.</short>
-        <long>How many automatic decimal places will be filled in.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/retain_days</key>
-      <applyto>/apps/gnucash/general/retain_days</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>30.0</default>
-      <locale name="C">
-        <short>Delete old log/backup files after this many days (0 = never).</short>
-        <long>Delete old log/backup files after this many days (0 = never).</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/reversed_accounts</key>
-      <applyto>/apps/gnucash/general/reversed_accounts</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default>credit</default>
-      <locale name="C">
-        <short>Accounts to reverse the balance</short>
-        <long>
-	  This setting allows certain accounts to have their balances
-	  reversed in sign from positive to negative, or vice versa.
-	  The setting "income_expense" is for users who like to see
-	  negative expenses and positive income.  The setting of
-	  "credit" is for users who want to see balances reflect the
-	  debit/credit status of the account.  The setting "none"
-	  doesn't reverse the sign on any balances.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/toolbar_style</key>
-      <applyto>/apps/gnucash/general/toolbar_style</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default>system</default>
-      <locale name="C">
-        <short>How to draw the toolbar.</short>
-        <long>
-	  This setting controls how the toolbar is drawn.  If set to
-	  "system" then GnuCash will use the desktop setting for how
-	  to draw toolbar buttons.  If set to "icon" then only icons
-	  will be show on toolbar buttons..  If set to "text" only the
-	  labels will be shown.  If set to "both" then both icons and
-	  labels will be shown.  If set to "both-horiz" then icons
-	  will be shown for all buttons with labels added on important
-	  buttons.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/use_accounting_labels</key>
-      <applyto>/apps/gnucash/general/use_accounting_labels</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Use formal account labels.</short>
-        <long>
-	  Setting this value to TRUE tells Gnucash to use the formal
-	  accounting labels "Credit" and "Debit" when designating
-	  fields on screen.  If false, Gnucash will use informal
-	  labels such as Increase/Decrease, "Funds In"/"Funds Out",
-	  etc.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/tab_close_buttons</key>
-      <applyto>/apps/gnucash/general/tab_close_buttons</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show close buttons on notebook tabs.</short>
-        <long>
-	  Setting this value to TRUE tells Gnucash to show a "close"
-	  button on any notebook tab that may be closed.  If FALSE,
-	  pages must be closed via the "close" menu item or the
-	  "close" button on toolbar.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/currency_choice</key>
-      <applyto>/apps/gnucash/general/currency_choice</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default>locale</default>
-      <locale name="C">
-        <short>Use system currency.</short>
-        <long>
-	  This setting controls the default currency used for new
-	  accounts.  If set to "locale" then GnuCash will retrieve the
-	  default currency from the user's locale setting.  If set to
-	  "other", Gnucash will use the setting specified by the
-	  currency_other key.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/currency_other</key>
-      <applyto>/apps/gnucash/general/currency_other</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <locale name="C">
-        <short>Default currency.</short>
-        <long>
-	  This setting controls the default currency used for new
-	  accounts if the currency_choice key is set to "other".  This
-	  field should contain the three letter ISO 4217 code for a
-	  currency (e.g. USD, GBP, RUB).
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/24hour_clock</key>
-      <applyto>/apps/gnucash/general/24hour_clock</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Use a 24 hour (instead of a 12 hour) time format.</short>
-        <long>Use a 24 hour (instead of a 12 hour) time format.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/date_format</key>
-      <applyto>/apps/gnucash/general/date_format</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default>locale</default>
-      <locale name="C">
-        <short>Set the format used to display dates.</short>
-        <long>
-	  This setting controls the way dates are displayed in
-	  GnuCash.  Legal values for this setting are "locale" to use
-	  the system locale setting, "ce" for Continental Europe style
-	  dates, "iso" for ISO 8601 standard dates , "uk" for United
-	  Kingdom style dates, and "us" for United States style dates.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/use_theme_colors</key>
-      <applyto>/apps/gnucash/general/register/use_theme_colors</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Color the register as specified by the system theme</short>
-        <long>
-	  A value of TRUE says to color the register as specified by
-	  the system theme.  This can be overridden to provide custom
-	  colors by editing the gtkrc file in the users home
-	  directory.  A value of FALSE says to show the standard
-	  register colors that GnuCash has always used.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/enter_moves_to_end</key>
-      <applyto>/apps/gnucash/general/register/enter_moves_to_end</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>"Enter" key moves to bottom of register.</short>
-        <long>
-	  If set to TRUE, pressing the enter key will move to the
-	  bottom of the register.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/auto_raise_lists</key>
-      <applyto>/apps/gnucash/general/register/auto_raise_lists</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Automatically raise the list of accounts or actions during input.</short>
-        <long>Automatically raise the list of accounts or actions during input.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/use_new_window</key>
-      <applyto>/apps/gnucash/general/register/use_new_window</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Create a new window for each new register.</short>
-        <long>
-	  Set this value to TRUE to have gnucash open each new
-	  register in its own window.  Set to FALSE to have gnucash
-	  open new registers as tabs in the front window.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/alternate_color_by_transaction</key>
-      <applyto>/apps/gnucash/general/register/alternate_color_by_transaction</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Color all lines of a transaction the same.</short>
-        <long>
-	 If TRUE all lines that make up a single transaction will use
-	 the same color for their background.  If FALSE, the
-	 background colors are alternated on each line.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/draw_horizontal_lines</key>
-      <applyto>/apps/gnucash/general/register/draw_horizontal_lines</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show horizontal borders in a register.</short>
-        <long>
-	 Show horizontal borders between cells in a register.  If TRUE
-	 the border between cells will be indicated with a heavy line.
-	 If FALSE, the border between cells will not be marked.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/draw_vertical_lines</key>
-      <applyto>/apps/gnucash/general/register/draw_vertical_lines</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show vertical borders in a register.</short>
-        <long>
-	 Show vertical borders between cells in a register.  If TRUE
-	 the border between cells will be indicated with a heavy line.
-	 If FALSE, the border between cells will not be marked.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/default_style</key>
-      <applyto>/apps/gnucash/general/register/default_style</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default>ledger</default>
-      <locale name="C">
-        <short>Use this style when opening a new register.</short>
-        <long>
-	  This field specifies the type of ledger to use when first
-	  opening a register window.  Legal values are "ledger",
-	  "auto-ledger" and "journal".  The ledger setting says to
-	  show each transaction on one or two lines.  The auto-ledger
-	  setting does the same, but also expands only the current
-	  transaction to show all splits.  The journal setting shows
-	  all transactions in expanded form.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/double_line_mode</key>
-      <applyto>/apps/gnucash/general/register/double_line_mode</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show two lines of information for each transaction.</short>
-        <long>
-	  Show two lines of information for each transaction in a
-	  register.  This is the default setting for when a register
-	  is first opened.  The setting can be changed at any time via
-	  the "View->Double Line" menu item.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/register/number_of_rows</key>
-      <applyto>/apps/gnucash/general/register/number_of_rows</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>10.0</default>
-      <locale name="C">
-        <short>The number of rows in an invoice.</short>
-        <long>
-	  This field sets the number of rows to show in a register.
-	  It does not actually affect the display of the contents of
-	  the window.  It is only used to set the size of the window
-	  when first opened.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/report/use_new_window</key>
-      <applyto>/apps/gnucash/general/report/use_new_window</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Create a new window for each new report.</short>
-        <long>
-	  Set this value to TRUE to have gnucash open each new
-	  report in its own window.  Set to FALSE to have gnucash
-	  open new registers as tabs in the front window.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/report/currency_choice</key>
-      <applyto>/apps/gnucash/general/report/currency_choice</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default>locale</default>
-      <locale name="C">
-        <short>Use system currency.</short>
-        <long>
-	  This setting controls the default currency used for
-	  reports. If set to "locale" then GnuCash will retrieve the
-	  default currency from the user's locale setting.  If set to
-	  "other", Gnucash will use the setting specified by the
-	  currency_other key.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/report/currency_other</key>
-      <applyto>/apps/gnucash/general/report/currency_other</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <locale name="C">
-        <short>Default currency.</short>
-        <long>
-	  This setting controls the default currency used for reports
-	  if the currency_choice key is set to "other".  This field
-	  should contain the three letter ISO 4217 code for a currency
-	  (e.g. USD, GBP, RUB).
-	</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_general.schemas)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/warnings/change_reconciled_split</key>
-      <applyto>/apps/gnucash/general/warnings/permanent/change_reconciled_split</applyto>
-      <applyto>/apps/gnucash/general/warnings/temporary/change_reconciled_split</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Change contents of reconciled split.</short>
-        <long>
-	  This dialog is presented before allowing you to change the
-	  contents of a reconciled split.  Allowing these changes can
-	  make it hard to perform future reconciliations.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/general/warnings/mark_split_unreconciled</key>
-      <applyto>/apps/gnucash/general/warnings/permanent/mark_split_unreconciled</applyto>
-      <applyto>/apps/gnucash/general/warnings/temporary/mark_split_unreconciled</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Mark transaction split as unreconciled.</short>
-        <long>
-	  This dialog is presented before allowing you to mark a
-	  transaction split as unreconciled.  Doing so will throw off
-	  the reconciled value of the register and can make it hard to
-	  perform future reconciliations.
-	</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_warnings.schemas)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,134 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/window/pages/account_tree/summary/grand_total</key>
-      <applyto>/apps/gnucash/window/pages/account_tree/summary/grand_total</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show a grand total of all accounts converted to the default report currency</short>
-        <long>Show a grand total of all accounts converted to the default report currency</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/window/pages/account_tree/summary/non_currency</key>
-      <applyto>/apps/gnucash/window/pages/account_tree/summary/non_currency</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show non currency commodities</short>
-        <long>Show non currency commodities</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/window/pages/account_tree/summary/start_choice</key>
-      <applyto>/apps/gnucash/window/pages/account_tree/summary/start_choice</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default>relative</default>
-      <locale name="C">
-        <short>Profit/loss starting date type</short>
-        <long>
-	  This setting controls the type of starting date used in
-	  profit/loss calculations.  If set to "absolute" then GnuCash
-	  will retrieve the starting date specified by the start_date
-	  key.  If set to anything else, Gnucash will retrieve the
-	  starting date specified by the start_period key.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/window/pages/account_tree/summary/start_date</key>
-      <applyto>/apps/gnucash/window/pages/account_tree/summary/start_date</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Starting date (in seconds from Jan 1, 1970).</short>
-        <long>
-	  This setting controls the starting date sed in profit/loss
-	  calculations if the start_choice key is set to "absolute".
-	  This field should contain a date as represented in seconds
-	  from January 1st, 1970.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/window/pages/account_tree/summary/start_period</key>
-      <applyto>/apps/gnucash/window/pages/account_tree/summary/start_period</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <default>5</default>
-      <locale name="C">
-        <short>Starting time period identifier.</short>
-        <long>
-	  This setting controls the starting date sed in profit/loss
-	  calculations if the start_choice key is set to anything
-	  other than "absolute".  This field should contain a value
-	  between 0 and 8.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/window/pages/account_tree/summary/end_choice</key>
-      <applyto>/apps/gnucash/window/pages/account_tree/summary/end_choice</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default>relative</default>
-      <locale name="C">
-        <short>Profit/loss ending date type</short>
-        <long>
-	  This setting controls the type of ending date used in
-	  profit/loss calculations.  If set to "absolute" then GnuCash
-	  will retrieve the ending date specified by the end_date
-	  key.  If set to anything else, Gnucash will retrieve the
-	  ending date specified by the end_period key.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/window/pages/account_tree/summary/end_date</key>
-      <applyto>/apps/gnucash/window/pages/account_tree/summary/end_date</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Ending date (in seconds from Jan 1, 1970).</short>
-        <long>
-	  This setting controls the ending date sed in profit/loss
-	  calculations if the end_choice key is set to "absolute".
-	  This field should contain a date as represented in seconds
-	  from January 1st, 1970.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/window/pages/account_tree/summary/end_period</key>
-      <applyto>/apps/gnucash/window/pages/account_tree/summary/end_period</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <default>5</default>
-      <locale name="C">
-        <short>Ending time period identifier.</short>
-        <long>
-	  This setting controls the ending date sed in profit/loss
-	  calculations if the end_choice key is set to anything
-	  other than "absolute".  This field should contain a value
-	  between 0 and 8.
-        </long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas)

Deleted: gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_register.schemas
===================================================================
--- gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_register.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_register.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/gnucash/window/pages/register/width</key>
-      <applyto>/apps/gnucash/window/pages/register/balance_width</applyto>
-      <applyto>/apps/gnucash/window/pages/register/credit_width</applyto>
-      <applyto>/apps/gnucash/window/pages/register/date-due_width</applyto>
-      <applyto>/apps/gnucash/window/pages/register/debit_width</applyto>
-      <applyto>/apps/gnucash/window/pages/register/num_width</applyto>
-      <applyto>/apps/gnucash/window/pages/register/split-type_width</applyto>
-      <applyto>/apps/gnucash/window/pages/register/transfer_width</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <locale name="C">
-        <short>Width of a column in the dialog</short>
-        <long>
-	  This key contains the width of the named column in the most
-	  recently closed register window.  Changing these values will
-	  change the sizes of the columns in the next opened register
-	</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_register.schemas.in (from rev 12840, gnucash/trunk/src/gnome/schemas/apps_gnucash_window_pages_register.schemas)

Modified: gnucash/trunk/src/gnome-utils/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/schemas/Makefile.am	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome-utils/schemas/Makefile.am	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,15 +1,10 @@
-schemadir   = @GCONF_SCHEMA_FILE_DIR@
-dist_schema_DATA = \
-  apps_gnucash_history.schemas
+schemadir = @GCONF_SCHEMA_FILE_DIR@
+schemas_in_files = \
+  apps_gnucash_history.schemas.in
+schema_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
-endif
+ at INTLTOOL_SCHEMAS_RULE@
 
-uninstall-local:
-if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
-endif
+EXTRA_DIST = $(schemas_in_files)
 
+CLEANFILES = $(schema_DATA)

Deleted: gnucash/trunk/src/gnome-utils/schemas/apps_gnucash_history.schemas
===================================================================
--- gnucash/trunk/src/gnome-utils/schemas/apps_gnucash_history.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/gnome-utils/schemas/apps_gnucash_history.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,58 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/gnucash/history/maxfiles</key>
-      <applyto>/apps/gnucash/history/maxfiles</applyto>
-      <owner>gnucash</owner>
-      <type>int</type>
-      <default>4</default>
-      <locale name="C">
-        <short>Number of files in history</short>
-        <long>
-          This key contains the number of files to keep in the
-          Recently Opened Files menu. This value may be set to zero to
-          disable the file history.  This number has a maximum value
-          of 10.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/history/first_file</key>
-      <applyto>/apps/gnucash/history/file0</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Most recently opened file</short>
-        <long>
-          This key contains the full path of the most recently opened file.
-	</long>
-      </locale>
-    </schema>
-
-
-    <schema>
-      <key>/schemas/apps/gnucash/history/other_files</key>
-      <applyto>/apps/gnucash/history/file1</applyto>
-      <applyto>/apps/gnucash/history/file2</applyto>
-      <applyto>/apps/gnucash/history/file3</applyto>
-      <applyto>/apps/gnucash/history/file4</applyto>
-      <applyto>/apps/gnucash/history/file5</applyto>
-      <applyto>/apps/gnucash/history/file6</applyto>
-      <applyto>/apps/gnucash/history/file7</applyto>
-      <applyto>/apps/gnucash/history/file8</applyto>
-      <applyto>/apps/gnucash/history/file9</applyto>
-      <owner>gnucash</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Next most recently opened file</short>
-        <long>
-          This key contains the full path of the next most recently opened file.
-	</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/gnome-utils/schemas/apps_gnucash_history.schemas.in (from rev 12837, gnucash/trunk/src/gnome-utils/schemas/apps_gnucash_history.schemas)

Modified: gnucash/trunk/src/import-export/hbci/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/hbci/schemas/Makefile.am	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/import-export/hbci/schemas/Makefile.am	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,15 +1,10 @@
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
-dist_schema_DATA = \
-  apps_gnucash_dialog_hbci.schemas
+schemas_in_files = \
+  apps_gnucash_dialog_hbci.schemas.in
+schema_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
-endif
+ at INTLTOOL_SCHEMAS_RULE@
 
-uninstall-local:
-if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
-endif
+EXTRA_DIST = $(schemas_in_files)
 
+CLEANFILES = $(schema_DATA)

Deleted: gnucash/trunk/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas
===================================================================
--- gnucash/trunk/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/hbci/position</key>
-      <applyto>/apps/gnucash/dialogs/import/hbci/connection_dialog/window_position</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <locale name="C">
-        <short>Window position</short>
-        <long>
-	  The X,Y coordinates of the top left corner of the dialog
-	  when it was last closed.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/hbci/geometry</key>
-      <applyto>/apps/gnucash/dialogs/import/hbci/connection_dialog/window_geometry</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <locale name="C">
-        <short>Window geometry</short>
-        <long>
-	  The width and size of the dialog when it was last closed.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/hbci/close_on_finish</key>
-      <applyto>/apps/gnucash/dialogs/import/hbci/close_on_finish</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>True</default>
-      <locale name="C">
-        <short>Close dialog when finished</short>
-        <long>
-	  Set this key to TRUE to automatically close the window when
-	  you finish the HBCI import process.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/hbci/remember_pin</key>
-      <applyto>/apps/gnucash/dialogs/import/hbci/remember_pin</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>False</default>
-      <locale name="C">
-        <short>Remember the PIN for HBCI in memory during a session.</short>
-        <long>Remember the PIN for HBCI in memory during a session.</long>
-      </locale>
-    </schema>
-
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/hbci/verbose_debug</key>
-      <applyto>/apps/gnucash/dialogs/import/hbci/verbose_debug</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>False</default>
-      <locale name="C">
-        <short>Activate verbose debug messages for HBCI Online Banking.</short>
-        <long>Activate verbose debug messages for HBCI Online Banking.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in (from rev 12840, gnucash/trunk/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas)

Modified: gnucash/trunk/src/import-export/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/schemas/Makefile.am	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/import-export/schemas/Makefile.am	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,15 +1,10 @@
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
-dist_schema_DATA = \
-  apps_gnucash_import_generic_matcher.schemas
+schemas_in_files = \
+  apps_gnucash_import_generic_matcher.schemas.in
+schema_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
-endif
+ at INTLTOOL_SCHEMAS_RULE@
 
-uninstall-local:
-if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
-endif
+EXTRA_DIST = $(schemas_in_files)
 
+CLEANFILES = $(schema_DATA)

Deleted: gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas
===================================================================
--- gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas	2006-01-19 00:39:53 UTC (rev 12862)
+++ gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas	2006-01-19 00:40:32 UTC (rev 12863)
@@ -1,160 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/position</key>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/match_picker/window_position</applyto>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/transaction_list/window_position</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <locale name="C">
-        <short>Window position</short>
-        <long>
-	  The X,Y coordinates of the top left corner of the dialog
-	  when it was last closed.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/geometry</key>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/match_picker/window_geometry</applyto>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/transaction_list/window_geometry</applyto>
-      <owner>gnucash</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <locale name="C">
-        <short>Window geometry</short>
-        <long>
-	  The width and size of the dialog when it was last closed.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/enable_skip</key>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/enable_skip</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Enable SKIP transaction action</short>
-        <long>
-          Enable the SKIP action in the transaction matcher.  If
-          enabled, a transaction whose best match's score is in the
-          yellow zone (above the Auto-ADD threshold but below the
-          Auto-CLEAR threshold) will be SKIPed by default.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/enable_edit</key>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/enable_edit</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Enable EDIT transaction action</short>
-        <long>
-          Enable the EDIT action in the transaction matcher.  NOT YET
-          SUPPORTED.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/use_bayes</key>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/use_bayes</applyto>
-      <owner>gnucash</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Use bayesian matching.</short>
-        <long>Use bayesian matching.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/match_threshold</key>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/match_threshold</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>1.0</default>
-      <locale name="C">
-        <short>
-          The minimum score a potential match must have to be
-          displayed in the match list.
-        </short>
-        <long>
-          The minimum score a potential match must have to be
-          displayed in the match list.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/auto_add_threshold</key>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/auto_add_threshold</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>3.0</default>
-      <locale name="C">
-        <short>
-          Score below this is automatically added.
-        </short>
-        <long>
-          A transaction whose best match's score is in the red zone
-          (above the display threshold but below or equal to the
-          Auto-ADD threshold) will be ADDed by default.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/auto_clear_threshold</key>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/auto_clear_threshold</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>6.0</default>
-      <locale name="C">
-        <short>
-          Score above this is automatically cleared.
-        </short>
-        <long>
-          A transaction whose best match's score is in the green zone
-          (above or equal to the Auto-CLEAR threshold) will be CLEARed
-          by default.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/atm_fee_threshold</key>
-      <applyto>/apps/gnucash/dialogs/import/generic_matcher/atm_fee_threshold</applyto>
-      <owner>gnucash</owner>
-      <type>float</type>
-      <default>2.0</default>
-      <locale name="C">
-        <short>
-          Maximum atm fees in your area.
-        </short>
-        <long>
-          In some places commercial ATMs (not belonging to a financial
-          institution) are installed in places like convienience
-          store.  These ATM add its fee directly to the amount instead
-          of showing up as a separate transaction or in your monthly
-          banking fees.  For example, you withdraw 100$, and you are
-          charged 101,50$ plus Interac fees.  If you manually entered
-          that 100$, the amounts won't match.  You should set this to
-          whatever is the maximum such fee in your area (in units of
-          your local currency), so the transaction will be recognised
-          as a match.
-        </long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>

Copied: gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in (from rev 12840, gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas)



More information about the gnucash-changes mailing list