gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Fri Aug 8 18:15:53 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/e25c2a34 (commit)
via https://github.com/Gnucash/gnucash/commit/063b9c57 (commit)
via https://github.com/Gnucash/gnucash/commit/10cd33f9 (commit)
via https://github.com/Gnucash/gnucash/commit/0ddd9db0 (commit)
from https://github.com/Gnucash/gnucash/commit/367b608f (commit)
commit e25c2a34b9e9995936010d5577aa588165d1a61c
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 8 15:15:23 2014 -0700
POTFILES.in resulting from previous make-gnucash-potfiles changes.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 29d133b..e042ecf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -426,6 +426,27 @@ src/import-export/qif-imp/gncmod-qif-import.c
src/import-export/qif/qif-context.c
src/import-export/qif/qif-file.c
src/import-export/qif/qif-objects.c
+src/libqof/qof/gnc-date.cpp
+src/libqof/qof/gnc-numeric.cpp
+src/libqof/qof/guid.cpp
+src/libqof/qof/kvp-util.cpp
+src/libqof/qof/kvp_frame.cpp
+src/libqof/qof/qof-string-cache.cpp
+src/libqof/qof/qof-win32.cpp
+src/libqof/qof/qofbackend.cpp
+src/libqof/qof/qofbook.cpp
+src/libqof/qof/qofchoice.cpp
+src/libqof/qof/qofclass.cpp
+src/libqof/qof/qofevent.cpp
+src/libqof/qof/qofid.cpp
+src/libqof/qof/qofinstance.cpp
+src/libqof/qof/qoflog.cpp
+src/libqof/qof/qofmath128.cpp
+src/libqof/qof/qofobject.cpp
+src/libqof/qof/qofquery.cpp
+src/libqof/qof/qofquerycore.cpp
+src/libqof/qof/qofsession.cpp
+src/libqof/qof/qofutil.cpp
src/plugins/bi_import/dialog-bi-import-gui.c
src/plugins/bi_import/dialog-bi-import-helper.c
src/plugins/bi_import/dialog-bi-import.c
@@ -501,7 +522,6 @@ src/report/utility-reports/gncmod-utility-reports.c
src/tax/us/gncmod-tax-us.c
src/gnome/gnucash.appdata.xml.in
src/gnome/gnucash.desktop.in.in
-src/libqof/qof/gnc-date.cpp
src/libqof/qof/qofbookslots.h
intl-scm/guile-strings.c
doc/tip_of_the_day.list.in
commit 063b9c57f4ed9cfe9edb8150c1161ac479003174
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 8 13:43:43 2014 -0700
Remove a bunch of no-longer-existing files from POTFILES.skip.
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0bfdc58..6f79c5d 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,23 +1,8 @@
# These are files that we don't want to translate, because they are
# not distributed.
-src/network-utils/gnc-gpg.c
-src/import-export/csv/gnc-csv2glist.c
-src/business/business-core/gncBusPeriod.c
-src/backend/dwi/qofmap.c
-src/gnome-utils/gnctreemodelsort.c
-src/gnome-utils/gtktreedatalist.c
-src/gnome-utils/gnc-tree-model-selection.c
src/backend/dbi/gncmod-backend-dbi.c
-src/backend/file/io-gncbin-r.c
src/backend/xml/gncmod-backend-xml.c
-src/import-export/binary-import/binary-import.glade
-src/import-export/binary-import/druid-commodity.c
-src/import-export/binary-import/gncmod-binary-import.c
-src/gnome-utils/glade/dialog-database-connection.glade
-src/libqof/qof/qofgobj.c
-src/libqof/qof/qofquery-deserial.c
-src/libqof/qof/qofquery-serialize.c
-src/libqof/qof/qofsql.c
+src/gnome-utils/gnc-tree-model-selection.c
# These we don't want to translate because they're experimental:
src/gnc/.*
commit 10cd33f9f584f74fe2c2ac1a827d3c8c4ac06d09
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 8 13:37:38 2014 -0700
Add *.cpp to the search pattern for files to translate.
Exclude the files in src/gnc and src/optional/gtkmm; they shouldn't have
any user-visible strings.
diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in
index 919cfc4..ae4b1aa 100644
--- a/make-gnucash-potfiles.in
+++ b/make-gnucash-potfiles.in
@@ -27,9 +27,11 @@ while (<IN>) {
close IN;
-my @possible_files = `cd @-SRCDIR-@ && find src -name '*.c' -o -name '*.glade' \\
+my @possible_files = `cd @-SRCDIR-@ && find src -name '*.c' \\
+ -o -name '*.cpp' -o -name '*.glade' \\
-o -name '*.desktop.in' -o -name '*.keys.in' \\
- -o -name '*.gschema.xml.in.in' |sort`;
+ -o -name '*.gschema.xml.in.in' \\
+ | sort`;
## For perl files add the following:
# -o -name '*.pl'
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index a3d3331..0bfdc58 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -19,6 +19,10 @@ src/libqof/qof/qofquery-deserial.c
src/libqof/qof/qofquery-serialize.c
src/libqof/qof/qofsql.c
+# These we don't want to translate because they're experimental:
+src/gnc/.*
+src/optional/gtkmm/.*
+
# The scheme files are handled by intl-scm/guile-strings.c because
# intltool wouldn't scan scheme files. They're here now because
# intltool 0.50 *does* scan them, and it creates an error during make
commit 0ddd9db0a213ef24186df4353aa6ae9fd26d6939
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Aug 8 13:31:29 2014 -0700
Use perl instead of grep to scan POTFILES.ignore and POTFILES.skip
No point in shelling out of perl to do what perl does best; besides, grep
has environment settings that can break our parsing of the result.
diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in
index 3615a2d..919cfc4 100644
--- a/make-gnucash-potfiles.in
+++ b/make-gnucash-potfiles.in
@@ -14,9 +14,18 @@ use File::Basename;
# Note: These are perl regexp patterns, *not* normal shell wildcards!
my @ignorepatterns = ('gw-', 'test', 'experimental', 'python-bindings', 'swig-.*\.c');
+my (@skipped_files, @ignored_files);
+open(IN, "< @-SRCDIR-@/po/POTFILES.skip");
+while (<IN>) {
+ push @skipped_files, $_ unless $_ =~ /^\#/;
+}
+close IN;
+open(IN, "< @-SRCDIR-@/po/POTFILES.ignore");
+while (<IN>) {
+ push @ignored_files, $_ unless $_ =~ /^\#/;
+}
+close IN;
-my @skipped_files = `grep -v \# @-SRCDIR-@/po/POTFILES.skip`;
-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' \\
Summary of changes:
make-gnucash-potfiles.in | 19 +++++++++++++++----
po/POTFILES.in | 22 +++++++++++++++++++++-
po/POTFILES.skip | 21 +++++----------------
3 files changed, 41 insertions(+), 21 deletions(-)
More information about the gnucash-changes
mailing list