diff --git a/configure.ac b/configure.ac index 2b6fe3b6b6..2a1975ef02 100644 --- a/configure.ac +++ b/configure.ac @@ -1441,6 +1441,25 @@ AC_CONFIG_FILES( src/bin/gnucash.rc src/app-utils/migratable-prefs.xml src/gnome/gnucash.desktop.in + dnl # GSettings schema files + src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in + src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in + src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in + src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in + src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in + src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in + src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in + src/gnome/gschemas/org.gnucash.gschema.xml.in + src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in + src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in + src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in + src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in + src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in + src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in + src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in + src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in + src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in + src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in dnl # Please read doc/build-system before adding *anything* here , diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in index 7f9818479b..2965c6259c 100644 --- a/make-gnucash-potfiles.in +++ b/make-gnucash-potfiles.in @@ -20,7 +20,7 @@ my @ignored_files = `grep -v \# @-SRCDIR-@/po/POTFILES.ignore`; my @possible_files = `cd @-SRCDIR-@ && find src -name '*.c' -o -name '*.glade' \\ -o -name '*.desktop.in' -o -name '*.keys.in' \\ - -o -name '*.schemas.in' |sort`; + -o -name '*.gschema.xml.in.in' |sort`; ## For perl files add the following: # -o -name '*.pl' @@ -45,8 +45,14 @@ foreach my $file (@possible_files) { # Ignore unreadable files, e.g. dangling symlinks next unless (-r "@-SRCDIR-@/" . $path . $name); + + # Force parse type for gsettings files + my $type = ""; + if ($file =~ m/.gschema.xml.in.in/ ){ + $type = "[type: gettext/gsettings]"; + } - print $path . $name . "\n"; + print $type . $path . $name . "\n"; } # These are also added, even though they are outside of src/ diff --git a/po/POTFILES.in b/po/POTFILES.in index 332687997e..3435946ccf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -101,6 +101,7 @@ src/business/business-gnome/gncmod-business-gnome.c src/business/business-gnome/gnc-plugin-business.c src/business/business-gnome/gnc-plugin-page-invoice.c src/business/business-gnome/gnc-plugin-page-owner-tree.c +[type: gettext/gsettings]src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in src/business/business-gnome/gtkbuilder/business-options-gnome.glade src/business/business-gnome/gtkbuilder/business-prefs.glade src/business/business-gnome/gtkbuilder/dialog-billterms.glade @@ -208,6 +209,15 @@ src/gnome/gnc-plugin-register2.c src/gnome/gnc-plugin-register.c src/gnome/gnc-split-reg2.c src/gnome/gnc-split-reg.c +[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in +[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in +[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in +[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in +[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in +[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in +[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.gschema.xml.in.in +[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in +[type: gettext/gsettings]src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in src/gnome/gtkbuilder/assistant-acct-period.glade src/gnome/gtkbuilder/assistant-hierarchy.glade src/gnome/gtkbuilder/assistant-loan.glade @@ -318,6 +328,8 @@ src/gnome-utils/gnc-tree-view-price.c src/gnome-utils/gnc-tree-view-split-reg.c src/gnome-utils/gnc-tree-view-sx-list.c src/gnome-utils/gnc-window.c +[type: gettext/gsettings]src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in +[type: gettext/gsettings]src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade src/gnome-utils/gtkbuilder/dialog-account.glade src/gnome-utils/gtkbuilder/dialog-book-close.glade @@ -364,12 +376,14 @@ src/import-export/aqbanking/gnc-file-aqb-import.c src/import-export/aqbanking/gnc-gwen-gui.c src/import-export/aqbanking/gncmod-aqbanking.c src/import-export/aqbanking/gnc-plugin-aqbanking.c +[type: gettext/gsettings]src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in src/import-export/csv-export/assistant-csv-export.c src/import-export/csv-export/assistant-csv-export.glade src/import-export/csv-export/csv-transactions-export.c src/import-export/csv-export/csv-tree-export.c src/import-export/csv-export/gncmod-csv-export.c src/import-export/csv-export/gnc-plugin-csv-export.c +[type: gettext/gsettings]src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in src/import-export/csv-import/assistant-csv-account-import.c src/import-export/csv-import/assistant-csv-account-import.glade src/import-export/csv-import/assistant-csv-trans-import.c @@ -379,8 +393,10 @@ src/import-export/csv-import/gnc-csv-gnumeric-popup.c src/import-export/csv-import/gnc-csv-model.c src/import-export/csv-import/gncmod-csv-import.c src/import-export/csv-import/gnc-plugin-csv-import.c +[type: gettext/gsettings]src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in src/import-export/dialog-import.glade src/import-export/gncmod-generic-import.c +[type: gettext/gsettings]src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in src/import-export/import-account-matcher.c src/import-export/import-backend.c src/import-export/import-commodity-matcher.c @@ -398,12 +414,14 @@ src/import-export/ofx/gncmod-ofx-import.c src/import-export/ofx/gnc-ofx-import.c src/import-export/ofx/gnc-ofx-kvp.c src/import-export/ofx/gnc-plugin-ofx.c +[type: gettext/gsettings]src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in src/import-export/qif-import/assistant-qif-import.c src/import-export/qif-import/assistant-qif-import.glade src/import-export/qif-import/dialog-account-picker.c src/import-export/qif-import/dialog-account-picker.glade src/import-export/qif-import/gncmod-qif-import.c src/import-export/qif-import/gnc-plugin-qif-import.c +[type: gettext/gsettings]src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in src/import-export/qif/qif-context.c src/import-export/qif/qif-file.c src/import-export/qif/qif-objects.c diff --git a/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in b/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in similarity index 99% rename from src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in rename to src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in index 35f289526a..0eb9cf651a 100644 --- a/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in +++ b/src/business/business-gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in @@ -1,4 +1,4 @@ - + diff --git a/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in b/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in similarity index 98% rename from src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in rename to src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in index eaded938c9..410e2ed19a 100644 --- a/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in +++ b/src/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in @@ -1,4 +1,4 @@ - + 4 diff --git a/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in b/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in similarity index 99% rename from src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in rename to src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in index 47aed561ec..a8317ed921 100644 --- a/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in +++ b/src/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in @@ -1,4 +1,4 @@ - + diff --git a/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in similarity index 99% rename from src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in rename to src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in index 062a96e128..b8a96cbcf9 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in @@ -1,4 +1,4 @@ - + '' diff --git a/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in similarity index 93% rename from src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in rename to src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in index ead8d52f03..1bcd2a6f02 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in @@ -1,4 +1,4 @@ - + false diff --git a/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in similarity index 99% rename from src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in rename to src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in index ae6f763671..bd77f3c200 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in @@ -1,4 +1,4 @@ - + diff --git a/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in similarity index 97% rename from src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in rename to src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in index 82f2267dd8..48ade396b4 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in @@ -1,4 +1,4 @@ - + true diff --git a/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in similarity index 98% rename from src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in rename to src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in index 47bac2ff21..f59940f916 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in @@ -1,4 +1,4 @@ - + diff --git a/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in b/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in similarity index 95% rename from src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in rename to src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in index e175969cd3..6d4ddeb86e 100644 --- a/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in @@ -1,4 +1,4 @@ - + 0 diff --git a/src/gnome/gschemas/org.gnucash.gschema.xml.in b/src/gnome/gschemas/org.gnucash.gschema.xml.in.in similarity index 99% rename from src/gnome/gschemas/org.gnucash.gschema.xml.in rename to src/gnome/gschemas/org.gnucash.gschema.xml.in.in index 63faa9aed4..b1438f2a2c 100644 --- a/src/gnome/gschemas/org.gnucash.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.gschema.xml.in.in @@ -1,4 +1,4 @@ - + diff --git a/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in b/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in similarity index 98% rename from src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in rename to src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in index d7747780c9..033f2ded7a 100644 --- a/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in @@ -1,4 +1,4 @@ - + true diff --git a/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in b/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in similarity index 92% rename from src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in rename to src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in index be76b6a86d..4abf11ecbe 100644 --- a/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in +++ b/src/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in @@ -1,4 +1,4 @@ - + false diff --git a/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in b/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in similarity index 98% rename from src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in rename to src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in index de7ca527ca..b704a9847c 100644 --- a/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in +++ b/src/import-export/aqbanking/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in @@ -1,4 +1,4 @@ - + (-1,-1,-1,-1) diff --git a/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in b/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in similarity index 95% rename from src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in rename to src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in index ec7b844c0c..32f8c70626 100644 --- a/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in +++ b/src/import-export/csv-export/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in @@ -1,4 +1,4 @@ - + (-1,-1,-1,-1) diff --git a/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in b/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in similarity index 94% rename from src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in rename to src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in index a7375fd73b..f05002bcdd 100644 --- a/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in +++ b/src/import-export/csv-import/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in @@ -1,4 +1,4 @@ - + (-1,-1,-1,-1) diff --git a/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in b/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in similarity index 99% rename from src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in rename to src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in index e9ecd5a2fb..69d7ebd1e9 100644 --- a/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in +++ b/src/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in @@ -1,4 +1,4 @@ - + true diff --git a/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in b/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in similarity index 89% rename from src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in rename to src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in index da9e030b9e..ec19ec463f 100644 --- a/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in +++ b/src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in @@ -1,4 +1,4 @@ - + '' diff --git a/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in b/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in similarity index 97% rename from src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in rename to src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in index 3b192d8a18..8456bfe004 100644 --- a/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in +++ b/src/import-export/qif-import/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in @@ -1,4 +1,4 @@ - + true