gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Dec 29 15:55:51 EST 2020
Updated via https://github.com/Gnucash/gnucash/commit/8bf306fc (commit)
via https://github.com/Gnucash/gnucash/commit/e4383c0a (commit)
via https://github.com/Gnucash/gnucash/commit/c14fae0f (commit)
via https://github.com/Gnucash/gnucash/commit/7dd39b09 (commit)
via https://github.com/Gnucash/gnucash/commit/588570fc (commit)
via https://github.com/Gnucash/gnucash/commit/6cb58394 (commit)
via https://github.com/Gnucash/gnucash/commit/9306835b (commit)
via https://github.com/Gnucash/gnucash/commit/52f2f020 (commit)
via https://github.com/Gnucash/gnucash/commit/60aededa (commit)
via https://github.com/Gnucash/gnucash/commit/5f41e87c (commit)
via https://github.com/Gnucash/gnucash/commit/f1c1fca0 (commit)
via https://github.com/Gnucash/gnucash/commit/bd7b77b9 (commit)
via https://github.com/Gnucash/gnucash/commit/b1f9e8e0 (commit)
via https://github.com/Gnucash/gnucash/commit/ef8f8bdc (commit)
from https://github.com/Gnucash/gnucash/commit/cc919b1c (commit)
commit 8bf306fc534d10485c6a9e7a04ca60893926599a
Merge: cc919b1c0 e4383c0ab
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 29 12:55:40 2020 -0800
Merge branch 'maint'
commit e4383c0ab4f587a205db50aba5762f3047ee8725
Author: Milo Ivir <mail at milotype.de>
Date: Tue Dec 29 03:29:16 2020 +0100
L10N:de: po/glossary/de.po:100.0%
Currently translated at 100.0% (199 of 199 strings)
3
Translated using Weblate (German) by Milo Ivir <mail at milotype.de>
Translation: GnuCash/Glossary
Translate-URL: https://hosted.weblate.org/projects/gnucash/glossary/de/
L10N:de: po/de.po:99.6%
Currently translated at 99.6% (5523 of 5545 strings)
329
Translated using Weblate (German) by Milo Ivir <mail at milotype.de>
Translation: GnuCash/Program
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Co-authored-by: Milo Ivir <mail at milotype.de>
diff --git a/po/de.po b/po/de.po
index 72d0d0faa..562e57657 100644
--- a/po/de.po
+++ b/po/de.po
@@ -30,8 +30,8 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-13 22:01+0100\n"
-"PO-Revision-Date: 2020-12-28 23:29+0000\n"
-"Last-Translator: Christian Wehling <christian.wehling at web.de>\n"
+"PO-Revision-Date: 2020-12-29 02:29+0000\n"
+"Last-Translator: Milo Ivir <mail at milotype.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/gnucash/"
"de/>\n"
"Language: de\n"
@@ -1880,7 +1880,7 @@ msgstr "Steuerrelevant"
#: gnucash/gnome/dialog-find-account.c:447
msgid "Search from "
-msgstr " Suchen "
+msgstr "Suche von "
#: gnucash/gnome/dialog-find-transactions2.c:107
#: gnucash/gnome/dialog-find-transactions.c:105
@@ -2104,7 +2104,7 @@ msgstr "Buchungstext"
#: gnucash/report/trep-engine.scm:972 gnucash/report/trep-engine.scm:1134
#: gnucash/report/trep-engine.scm:1242
msgid "Notes"
-msgstr "Bemerkung"
+msgstr "Bemerkungen"
#: gnucash/gnome/dialog-find-transactions2.c:229
#: gnucash/gnome/dialog-find-transactions.c:229
@@ -9037,7 +9037,7 @@ msgstr "Datei %s geöffnet. %s"
#: gnucash/gnome-utils/gnc-main-window.c:2863
msgctxt "lower case key for short cut to 'Accounts'"
msgid "a"
-msgstr ""
+msgstr "k"
#: gnucash/gnome-utils/gnc-main-window.c:2953
msgid "Unable to save to database."
@@ -16621,9 +16621,9 @@ msgid ""
"will be displayed again next time you start GnuCash. If you press the <i>No</"
"i> button, it will not be displayed again."
msgstr ""
-"Wenn Sie <i>Ja</i> klicken, wird dieses Begrüßungsfenster beim nächsten "
-"Starten von GnuCash wieder angezeigt. Wenn Sie <i>Nein</i> klicken, wird es "
-"nicht wieder angezeigt."
+"Wenn Sie <i>Ja</i> klicken, wird das Begrüßungsfenster beim nächsten Starten "
+"von GnuCash wieder angezeigt. Wenn Sie <i>Nein</i> klicken, wird es nicht "
+"wieder angezeigt."
#: gnucash/gtkbuilder/dialog-new-user.glade:211
msgid "<span size=\"larger\" weight=\"bold\">Welcome to GnuCash!</span>"
@@ -19852,7 +19852,7 @@ msgstr "Namen für neue Überweisungsvorlage"
#: gnucash/import-export/aqb/dialog-ab.glade:942
msgid " _Name of the new template:"
-msgstr "_Namen für neue Überweisungsvorlage"
+msgstr " _Namen der neuen Vorlage:"
#: gnucash/import-export/aqb/dialog-ab.glade:956
msgid "Enter a unique name for the new template."
@@ -22307,9 +22307,7 @@ msgstr "Kapitalertrag (kurzfristig)"
#: gnucash/report/reports/support/balsheet-eg.eguile.scm:189
#: libgnucash/app-utils/gnc-ui-util.c:954
msgid "Retained Earnings"
-msgstr ""
-"Einbehaltener Gewinn, Gewinnvortrag (<=2.6: -rücklagen) # TODO: ist das "
-"wirklich, was das balance sheet ausgibt?"
+msgstr "Einbehaltener Gewinn"
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:118
msgid "Commissions"
diff --git a/po/glossary/de.po b/po/glossary/de.po
index dc97e2e23..068dde53b 100644
--- a/po/glossary/de.po
+++ b/po/glossary/de.po
@@ -12,8 +12,8 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2020-12-27 01:10+0000\n"
-"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>\n"
+"PO-Revision-Date: 2020-12-29 02:29+0000\n"
+"Last-Translator: Milo Ivir <mail at milotype.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/glossary/"
"de/>\n"
"Language: de\n"
@@ -690,9 +690,7 @@ msgstr "Staffel-Form"
#. "name of an equity account (?); to be distinguished from the opening balance."
msgid "Retained Earnings"
-msgstr ""
-"Einbehaltener Gewinn, Gewinnvortrag (<=2.6: -rücklagen) # TODO: ist das "
-"wirklich, was das balance sheet ausgibt?"
+msgstr "Einbehaltener Gewinn"
#. "Create a new transaction that is the inverse of the old one. When you add the two together they completely cancel out. Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'."
msgid "reverse transaction, to (Action in the register)"
commit c14fae0f4c1bef1b0179998bec4c7538b1d7a882
Author: Christian Wehling <christian.wehling at web.de>
Date: Tue Dec 29 03:29:15 2020 +0100
L10N:de: po/de.po:99.5%
Currently translated at 99.5% (5522 of 5545 strings)
336
Translated using Weblate (German) by Christian Wehling <christian.wehling at web.de>
Translation: GnuCash/Program
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Co-authored-by: Christian Wehling <christian.wehling at web.de>
diff --git a/po/de.po b/po/de.po
index 9c079ff0a..72d0d0faa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -18,6 +18,7 @@
# K. Herbert <herbert.ka at mailo.com>, 2020.
# Milo Ivir <mail at milotype.de>, 2020.
# Alois Spitzbart <spitz234 at hotmail.com>, 2020.
+# Christian Wehling <christian.wehling at web.de>, 2020.
#
# Konventionen/Tastenkürzel:
# »Zitate«: [altgr]+[Y]/[X]
@@ -29,8 +30,8 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-13 22:01+0100\n"
-"PO-Revision-Date: 2020-12-27 01:10+0000\n"
-"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>\n"
+"PO-Revision-Date: 2020-12-28 23:29+0000\n"
+"Last-Translator: Christian Wehling <christian.wehling at web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/gnucash/"
"de/>\n"
"Language: de\n"
@@ -12531,7 +12532,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:14
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:117
msgid "Confirm Window Close"
-msgstr ""
+msgstr "Fenster schließen bestätigen"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:15
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:118
@@ -16809,11 +16810,15 @@ msgid "<b>Separator Character</b>"
msgstr "<b>Trennzeichen</b>"
#: gnucash/gtkbuilder/dialog-preferences.glade:204
+#, fuzzy
msgid ""
"Press 'Reset' to use the original account separator and close the preference "
"window\n"
"Press 'Close' to return to the preference window\n"
msgstr ""
+"Drücken Sie \"Zurücksetzen\", um das ursprüngliche Kontentrennzeichen zu "
+"verwenden und das Einstellungsfenster zu schließen\n"
+"Drücken Sie \"Schließen\", um zum Einstellungsfenster zurückzukehren\n"
#: gnucash/gtkbuilder/dialog-preferences.glade:240
msgid "GnuCash Preferences"
@@ -19471,11 +19476,15 @@ msgid "Caution!"
msgstr "Vorsicht!"
#: gnucash/gtkbuilder/window-autoclear.glade:116
+#, fuzzy
msgid ""
"This tool might be slow or abort if the number of uncleared splits is more "
"than approximately 20. In that case please clear at least some of them "
"manually."
msgstr ""
+"Dieses Tool ist möglicherweise langsam oder bricht ab, wenn die Anzahl der "
+"nicht gelöschten Splits mehr als etwa 20 beträgt. In diesem Fall löschen Sie "
+"bitte zumindest einige von ihnen manuell."
#: gnucash/gtkbuilder/window-autoclear.glade:138
#: gnucash/gtkbuilder/window-reconcile.glade:117
@@ -19491,6 +19500,8 @@ msgstr "Erzeugte Buchungen _durchsehen"
#: gnucash/gtkbuilder/window-autoclear.glade:181
msgid "Select this option to open a register tab with newly cleared splits."
msgstr ""
+"Wählen Sie diese Option, um eine Registerkarte mit kürzlich gelöschten "
+"Aufteilungen zu öffnen."
#: gnucash/gtkbuilder/window-reconcile.glade:71
msgid "<b>Reconcile Information</b>"
@@ -27457,7 +27468,7 @@ msgstr ""
#: gnucash/report/reports/standard/income-gst-statement.scm:71
msgid "This message will be removed when tax accounts are specified."
-msgstr ""
+msgstr "Diese Meldung wird entfernt, wenn Steuerkonten angegeben werden."
# Todo: Versteht keiner (ff)
#: gnucash/report/reports/standard/income-gst-statement.scm:110
@@ -27553,14 +27564,17 @@ msgid "Default Format"
msgstr "Voreingestelltes Format"
#: gnucash/report/reports/standard/income-gst-statement.scm:167
+#, fuzzy
msgid "Australia BAS"
-msgstr ""
+msgstr "Australien BAS"
#: gnucash/report/reports/standard/income-gst-statement.scm:168
msgid ""
"Australia Business Activity Statement. Specify sales, purchase and tax "
"accounts."
msgstr ""
+"Erklärung zur Geschäftstätigkeit in Australien. Geben Sie Verkaufs-, "
+"Einkaufs- und Steuerkonten an."
#: gnucash/report/reports/standard/income-gst-statement.scm:171
msgid "UK VAT Return"
commit 7dd39b0920d4a9cd7bfb56399aa870da0dc67228
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 28 13:05:26 2020 -0800
Release GnuCash 4.4.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72a30ab04..876c646ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0)
endif()
project (gnucash
- VERSION 4.3
+ VERSION 4.4
)
enable_testing()
diff --git a/NEWS b/NEWS
index 0f88711fb..699531a8a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,23 @@
Version history:
------- -------
+4.4 - 28 December 2020
+The fifth release of the 4.x stable series, a snap release to fix bug 798063.
+
+Between 4.3 and 4.4, the following bugfixes were accomplished:
+
+ Bug 798038 - Incorrect spelling in german account templates 'common' and
+ 'full' part 2: AT
+ Bug 798063 - Crash when opening SX Editor
+
+No other improvements were made.
+Deprecations
+
+ xaccAccountCountSplits: use gnc_account_has_child_splits
+ gnc:html-table-append-column!: Build a new table with all of the columns
+ and copy in the rows.
+
+Updated Translations: German, Italian, Japanese
+
4.3 - 27 December 2020
The fourth release of the 4.x stable series.
commit 588570fc6799c479381667b314a13f33f4ed782b
Merge: 6cb58394c 9306835be
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Dec 28 21:29:48 2020 +0100
Merge branch 'PR_850' into maint
commit 6cb58394cd639bd21cdb9bf49c1df4f7c94e5b1a
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 28 12:08:57 2020 -0800
Bug 798063 - Crash when opening SX Editor
Scheduled transactions place register pages in embedded windows
and their priv struct is different so treating one as a main window
crashes. Besides, the register in the SX editor would never be
read-only. Make sure we have a GncMainWindow at the beginning of
main_window_update_page_set_read_only_icon.
diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
index 864808f4a..9f962e3b6 100644
--- a/gnucash/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -2456,6 +2456,7 @@ main_window_update_page_set_read_only_icon (GncPluginPage *page,
ENTER(" ");
+ g_return_if_fail(page && page->window && GNC_IS_MAIN_WINDOW(page->window));
window = GNC_MAIN_WINDOW(page->window);
/* Get the notebook tab widget */
commit 9306835be29af6403c48efa3e7c3624d081a3a59
Author: Giuseppe Foti <foti.giuseppe at gmail.com>
Date: Sun Dec 27 17:29:14 2020 +0100
L10N:it: po/it.po:100.0%
Currently translated at 100.0% (5545 of 5545 strings)
0
Translated using Weblate (Italian) by Giuseppe Foti <foti.giuseppe at gmail.com>
Translation: GnuCash/Program
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/it/
L10N:it: po/glossary/it.po:100.0%
Currently translated at 100.0% (199 of 199 strings)
0
Translated using Weblate (Italian) by Giuseppe Foti <foti.giuseppe at gmail.com>
Translation: GnuCash/Glossary
Translate-URL: https://hosted.weblate.org/projects/gnucash/glossary/it/
L10N:it: po/it.po:100.0%
Currently translated at 100.0% (5545 of 5545 strings)
0
Translated using Weblate (Italian) by Giuseppe Foti <foti.giuseppe at gmail.com>
Translation: GnuCash/Program
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/it/
Co-authored-by: Giuseppe Foti <foti.giuseppe at gmail.com>
diff --git a/po/glossary/it.po b/po/glossary/it.po
index dc0c2867d..89a90cfc1 100644
--- a/po/glossary/it.po
+++ b/po/glossary/it.po
@@ -19,7 +19,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2020-12-26 19:29+0000\n"
+"PO-Revision-Date: 2020-12-27 14:29+0000\n"
"Last-Translator: Giuseppe Foti <foti.giuseppe at gmail.com>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/gnucash/glossary/"
"it/>\n"
@@ -208,7 +208,7 @@ msgstr "operazione: prelievo"
#. "As in: payable aging, or: receivable aging. The aging report categorizes payables or receivables based on time buckets. This gives an overview of which bills or invoices are overdue at which time in the future. "
msgid "aging"
-msgstr "scadenziario"
+msgstr "scadenzario"
#. "A sum of money"
msgid "amount"
diff --git a/po/it.po b/po/it.po
index 9a228f140..5bd421a6d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -55,7 +55,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-13 22:27+0100\n"
-"PO-Revision-Date: 2020-12-26 19:29+0000\n"
+"PO-Revision-Date: 2020-12-27 16:29+0000\n"
"Last-Translator: Giuseppe Foti <foti.giuseppe at gmail.com>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/gnucash/gnucash/"
"it/>\n"
@@ -6537,7 +6537,7 @@ msgid ""
"because that will cause your reconciled balance to be off."
msgstr ""
"Questa transazione contiene delle suddivisioni riconciliate. Modificarla non "
-"è una buona idea dato poichè il saldo riconciliato risulterà sbilanciato."
+"è una buona idea dato poiché il saldo riconciliato risulterà sbilanciato."
#. Translators: This is the confirmation button in a warning dialog
#: gnucash/gnome/gnc-split-reg.c:1238
@@ -15831,7 +15831,7 @@ msgid ""
"Enter the full name of the commodity. Example: Cisco Systems Inc., or Apple "
"Computer, Inc."
msgstr ""
-"Immettere il nome completo della commodity; per esempio: Cisco Sytems Inc, "
+"Immettere il nome completo della commodity; per esempio: Cisco Systems Inc, "
"or Apple Computer, Inc."
# Tooltip
@@ -26717,7 +26717,7 @@ msgstr "Converti tutte gli importi in un'unica valuta."
#: gnucash/report/reports/standard/balsheet-pnl.scm:123
#: gnucash/report/trep-engine.scm:104
msgid "Show original currency amount"
-msgstr "VIsualizza gli importi nella valuta originale"
+msgstr "Visualizza gli importi nella valuta originale"
#: gnucash/report/reports/standard/balsheet-pnl.scm:124
#: gnucash/report/trep-engine.scm:574
@@ -28762,11 +28762,11 @@ msgstr "Campi indirizzo dall'indirizzo di spedizione."
#: gnucash/report/reports/standard/new-aging.scm:437
msgid "Payable Aging"
-msgstr "Scadenziario dei debiti"
+msgstr "Scadenzario dei debiti"
#: gnucash/report/reports/standard/new-aging.scm:446
msgid "Receivable Aging"
-msgstr "Scadenziario dei crediti"
+msgstr "Scadenzario dei crediti"
#: gnucash/report/reports/standard/new-owner-report.scm:54
#: gnucash/report/reports/standard/owner-report.scm:55
commit 52f2f02033c5e2b32dbd284e937b8bca9924b6fc
Author: YOSHINO Yoshihito <yy.y.ja.jp at gmail.com>
Date: Sun Dec 27 17:29:14 2020 +0100
L10N:ja: po/ja.po:92.8%
Currently translated at 92.8% (5148 of 5545 strings)
510
Translated using Weblate (Japanese) by YOSHINO Yoshihito <yy.y.ja.jp at gmail.com>
Translation: GnuCash/Program
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/ja/
Co-authored-by: YOSHINO Yoshihito <yy.y.ja.jp at gmail.com>
diff --git a/po/ja.po b/po/ja.po
index c7b606393..98c6b47a4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -22,7 +22,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2020-12-13 22:01+0100\n"
-"PO-Revision-Date: 2020-12-26 20:25+0000\n"
+"PO-Revision-Date: 2020-12-27 05:29+0000\n"
"Last-Translator: YOSHINO Yoshihito <yy.y.ja.jp at gmail.com>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/gnucash/gnucash/"
"ja/>\n"
@@ -14433,7 +14433,7 @@ msgstr "éš ã—勘定科目を表示ã™ã‚‹(_H)"
#: gnucash/gtkbuilder/dialog-account.glade:972
msgid "Show accounts which have the option \"Hidden\" checked."
-msgstr " \"éš ã—勘定科目\" オプションã«ãƒã‚§ãƒƒã‚¯ãŒå…¥ã£ãŸå‹˜å®šç§‘目を表示ã—ã¾ã™ã€‚"
+msgstr "\"éš ã—勘定科目\" オプションã«ãƒã‚§ãƒƒã‚¯ãŒå…¥ã£ãŸå‹˜å®šç§‘目を表示ã—ã¾ã™ã€‚"
#: gnucash/gtkbuilder/dialog-account.glade:986
msgid "Show _unused accounts"
@@ -17435,7 +17435,7 @@ msgstr "検索(_F)"
#: gnucash/gtkbuilder/dialog-search.glade:134
msgid " Search "
-msgstr "検索 "
+msgstr " 検索 "
#: gnucash/gtkbuilder/dialog-search.glade:207
msgid "Search for items where"
commit 60aededafbbd11509cfbe0cdea452992b333d69a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Dec 28 17:23:54 2020 +0100
Bug 798038 - Incorrect spelling in german account templates 'common' and
'full' part 2: AT
Also Austria writes "Einkommensteuer"
diff --git a/data/accounts/de_AT/acctchrt_business.gnucash-xea b/data/accounts/de_AT/acctchrt_business.gnucash-xea
index 3ce69178c..27cc9a23c 100644
--- a/data/accounts/de_AT/acctchrt_business.gnucash-xea
+++ b/data/accounts/de_AT/acctchrt_business.gnucash-xea
@@ -408,7 +408,7 @@
<act:parent type="new">92e8778ae32b3fb473352cf90345b154</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>Einkommenssteuer</act:name>
+ <act:name>Einkommensteuer</act:name>
<act:id type="new">115085afb79a187b3f15a055196dbd8a</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
@@ -416,7 +416,7 @@
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:description>Einkommenssteuer</act:description>
+ <act:description>Einkommensteuer</act:description>
<act:parent type="new">92e8778ae32b3fb473352cf90345b154</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
diff --git a/data/accounts/de_AT/acctchrt_common.gnucash-xea b/data/accounts/de_AT/acctchrt_common.gnucash-xea
index b364ccd26..97122e19a 100644
--- a/data/accounts/de_AT/acctchrt_common.gnucash-xea
+++ b/data/accounts/de_AT/acctchrt_common.gnucash-xea
@@ -594,7 +594,7 @@
<act:parent type="new">073ef0026c59c96d794935e1361602d0</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>Einkommenssteuer</act:name>
+ <act:name>Einkommensteuer</act:name>
<act:id type="new">ab3b17af105254efa0aa4348773d34fc</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
@@ -602,7 +602,7 @@
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:description>Einkommenssteuer</act:description>
+ <act:description>Einkommensteuer</act:description>
<act:parent type="new">92bd7aeef848a997f1af8ac7b132035e</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
commit 5f41e87c96dee3d562ec458a0c35fa1cdb70f330
Author: b4r3t <b4r3t at gmx.de>
Date: Mon Dec 28 16:39:26 2020 +0100
L10:de: fix "Einkommensteuer"
In AT und DE mit einem "s", nur in CH mit "ss".
https://de.wikipedia.org/wiki/Einkommensteuer#Nationale_Einkommensteuern
reported by mail
diff --git a/po/de.po b/po/de.po
index 9c866c248..9c079ff0a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -18383,7 +18383,7 @@ msgstr "Erzeugte Buchungen _durchsehen"
#: gnucash/gtkbuilder/dialog-tax-info.glade:13
msgid "Income Tax Information"
-msgstr "Einkommenssteuerinformation"
+msgstr "Einkommensteuerinformation"
#: gnucash/gtkbuilder/dialog-tax-info.glade:89
msgid "<b>Income Tax Identity</b>"
@@ -27396,7 +27396,7 @@ msgstr "Sekundäre Sortierreihenfolge"
#: gnucash/report/reports/standard/income-gst-statement.scm:39
msgid "Income and GST Statement"
-msgstr "Einkommens- und Umsatzsteuererklärung"
+msgstr "Einkommen- und Umsatzsteuererklärung"
#: gnucash/report/reports/standard/income-gst-statement.scm:41
#: gnucash/report/trep-engine.scm:108
commit f1c1fca023235a8563243529dd96a792d5ac057f
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Dec 27 12:46:52 2020 +0800
[account.cpp][API] deprecate xaccAccountCountSplits
diff --git a/libgnucash/engine/Account.cpp b/libgnucash/engine/Account.cpp
index 5bcfe1a6c..090e7d837 100644
--- a/libgnucash/engine/Account.cpp
+++ b/libgnucash/engine/Account.cpp
@@ -3905,6 +3905,10 @@ xaccAccountCountSplits (const Account *acc, gboolean include_children)
{
gint64 nr, i;
+ PWARN ("xaccAccountCountSplits is deprecated and will be removed \
+in GnuCash 5.0. If testing for an empty account, use \
+xaccAccountGetSplitList(account) == NULL instead. To test descendants \
+as well, use gnc_account_and_descendants_empty.");
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), 0);
nr = g_list_length(xaccAccountGetSplitList(acc));
commit bd7b77b9002327b702f9e7b286b8f3a4dc6e0b41
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Dec 27 11:01:07 2020 +0800
[dialog-account] don't use xaccAccountCountSplits
diff --git a/gnucash/gnome-utils/dialog-account.c b/gnucash/gnome-utils/dialog-account.c
index cd2da43f4..21e839ea9 100644
--- a/gnucash/gnome-utils/dialog-account.c
+++ b/gnucash/gnome-utils/dialog-account.c
@@ -211,7 +211,7 @@ gnc_account_opening_balance_button_update (AccountWindow *aw, gnc_commodity *com
{
Account *account = aw_get_account (aw);
Account *ob_account = gnc_account_lookup_by_opening_balance (gnc_book_get_root_account (aw->book), commodity);
- gboolean has_splits = xaccAccountCountSplits (account, FALSE) > 0;
+ gboolean has_splits = (xaccAccountGetSplitList (account) != NULL);
if (xaccAccountGetType (account) != ACCT_TYPE_EQUITY)
{
commit b1f9e8e0400909b3fa22cad3a9669ecca9d4aa24
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Dec 26 23:49:06 2020 +0800
[html-table][API] deprecate gnc:html-table-append-column!
This function is inefficient. Each column appended will require
scanning every row of existing html-table, scanning the row's elements
and appending the desired data.
diff --git a/gnucash/report/html-table.scm b/gnucash/report/html-table.scm
index 91d535cac..e9206548e 100644
--- a/gnucash/report/html-table.scm
+++ b/gnucash/report/html-table.scm
@@ -415,6 +415,8 @@
(define (gnc:html-table-append-column! table newcol)
(define width (apply max (cons 0 (map length (gnc:html-table-data table)))))
(define (add-fn a b) (list-set-safe! b width a))
+ (issue-deprecation-warning "gnc:html-table-append-column! deprecated. please \
+populate html-table row-wise using gnc:html-table-append-row! instead.")
(let lp ((newcol newcol)
(olddata (reverse (gnc:html-table-data table)))
(res '())
commit ef8f8bdcd79a78ca4cd87e7c05eb546a585b2abd
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Dec 26 23:47:07 2020 +0800
Reports: don't use gnc:html-table-append-column!
This function is inefficient. Each column appended will require
scanning every row of existing html-table, scanning the row's elements
and appending the desired data.
It is much more efficient to build a html-table by append rows instead
-- html-table rows are stored in reverse, and each appended row is
built using (cons newrow existing-rows).
diff --git a/gnucash/report/reports/example/hello-world.scm b/gnucash/report/reports/example/hello-world.scm
index 59783c3af..9e73e7771 100644
--- a/gnucash/report/reports/example/hello-world.scm
+++ b/gnucash/report/reports/example/hello-world.scm
@@ -427,8 +427,10 @@ new, totally cool report, consult the mailing list ~a.")
(if (not (null? list-val))
(let ((table (gnc:make-html-table)))
- (gnc:html-table-append-column!
- table (map symbol->string list-val))
+ (for-each
+ (lambda (cell)
+ (gnc:html-table-append-row! table (list (symbol->string cell))))
+ list-val)
(gnc:html-table-set-style! table "table"
'attribute (list "style" "width:200px"))
(gnc:html-table-set-caption! table
diff --git a/gnucash/report/reports/standard/cashflow-barchart.scm b/gnucash/report/reports/standard/cashflow-barchart.scm
index 9f0e0bf1b..ad9d12b53 100644
--- a/gnucash/report/reports/standard/cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/cashflow-barchart.scm
@@ -35,6 +35,7 @@
(use-modules (gnucash app-utils))
(use-modules (gnucash reports cash-flow-calc))
(use-modules (gnucash report))
+(use-modules (srfi srfi-26))
(define reportname (N_ "Cash Flow Barchart"))
@@ -327,6 +328,17 @@
(if (and non-zeros show-table?)
(let* ((table (gnc:make-html-table)))
+
+ (define (add-row date in out net)
+ (gnc:html-table-append-row!
+ table
+ (cons date
+ (map (cut gnc:make-html-table-cell/markup "number-cell" <>)
+ (append
+ (if show-in? (list in) '())
+ (if show-out? (list out) '())
+ (if show-net? (list net) '()))))))
+
(gnc:html-table-set-col-headers!
table (append (list (G_ "Date"))
(if show-in? (list (G_ "Money In")) '())
@@ -335,22 +347,9 @@
(gnc:html-document-add-object!
doc (gnc:make-html-text (gnc:html-markup-h3 (G_ "Overview:"))))
- (gnc:html-table-append-column! table (append date-string-list (list "Total")))
-
- (if show-in?
- (gnc:html-table-append-column! table (append in-list (list total-in))))
- (if show-out?
- (gnc:html-table-append-column! table (append out-list (list total-out))))
- (if show-net?
- (gnc:html-table-append-column! table (append net-list (list total-net))))
-
- ;; set numeric columns to align right
- (for-each
- (lambda (col)
- (gnc:html-table-set-col-style!
- table col "td"
- 'attribute (list "class" "number-cell")))
- '(1 2 3))
+
+ (for-each add-row date-string-list in-list out-list net-list)
+ (add-row (G_ "Total") total-in total-out total-net)
(gnc:html-document-add-object! doc table))))
diff --git a/gnucash/report/reports/standard/net-charts.scm b/gnucash/report/reports/standard/net-charts.scm
index 71d8b38b3..1d765bb54 100644
--- a/gnucash/report/reports/standard/net-charts.scm
+++ b/gnucash/report/reports/standard/net-charts.scm
@@ -229,11 +229,7 @@
;; This exchanges the commodity-collector 'c' to one single
;; 'report-currency' according to the exchange-fn. Returns a gnc:monetary
(define (collector->monetary c date)
- (if (not (number? date))
- (throw 'wrong))
- (gnc:sum-collector-commodity
- c report-currency
- (lambda (a b) (exchange-fn a b date))))
+ (gnc:sum-collector-commodity c report-currency (cut exchange-fn <> <> date)))
;; gets an account alist balances
;; output: (list acc bal0 bal1 bal2 ...)
@@ -425,21 +421,20 @@
(list (G_ "Net Profit"))
(list (G_ "Net Worth")))
'())))
- (gnc:html-table-append-column! table date-string-list)
- (when show-sep?
- (gnc:html-table-append-column! table minuend-balances)
- (gnc:html-table-append-column! table subtrahend-balances))
- (if show-net?
- (gnc:html-table-append-column! table difference-balances))
-
- ;; set numeric columns to align right
(for-each
- (lambda (col)
- (gnc:html-table-set-col-style!
- table col "td"
- 'attribute (list "class" "number-cell")))
- '(1 2 3))
+ (lambda (date minuend subtrahend difference)
+ (gnc:html-table-append-row!
+ table
+ (cons date
+ (map
+ (cut gnc:make-html-table-cell/markup "number-cell" <>)
+ (append (if show-sep? (list minuend subtrahend) '())
+ (if show-net? (list difference) '()))))))
+ date-string-list
+ minuend-balances
+ subtrahend-balances
+ difference-balances)
(gnc:html-document-add-object! document table)))
Summary of changes:
NEWS | 18 +++++++++
data/accounts/de_AT/acctchrt_business.gnucash-xea | 4 +-
data/accounts/de_AT/acctchrt_common.gnucash-xea | 4 +-
gnucash/gnome-utils/dialog-account.c | 2 +-
gnucash/gnome-utils/gnc-main-window.c | 1 +
gnucash/report/html-table.scm | 2 +
gnucash/report/reports/example/hello-world.scm | 6 ++-
.../report/reports/standard/cashflow-barchart.scm | 31 +++++++--------
gnucash/report/reports/standard/net-charts.scm | 31 ++++++---------
libgnucash/engine/Account.cpp | 4 ++
po/de.po | 46 ++++++++++++++--------
po/glossary/de.po | 8 ++--
po/glossary/it.po | 4 +-
po/it.po | 12 +++---
po/ja.po | 6 +--
15 files changed, 105 insertions(+), 74 deletions(-)
More information about the gnucash-changes
mailing list