gnucash master: Multiple changes pushed
Christopher Lam
clam at code.gnucash.org
Mon Sep 30 10:15:49 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/98be5c87 (commit)
via https://github.com/Gnucash/gnucash/commit/2684e51d (commit)
via https://github.com/Gnucash/gnucash/commit/72dc9bd3 (commit)
via https://github.com/Gnucash/gnucash/commit/545454e3 (commit)
via https://github.com/Gnucash/gnucash/commit/18c79a8a (commit)
via https://github.com/Gnucash/gnucash/commit/b481e2ea (commit)
via https://github.com/Gnucash/gnucash/commit/e579f6af (commit)
via https://github.com/Gnucash/gnucash/commit/c21d173c (commit)
via https://github.com/Gnucash/gnucash/commit/99b5d79a (commit)
via https://github.com/Gnucash/gnucash/commit/fd6b102f (commit)
via https://github.com/Gnucash/gnucash/commit/1da86a5f (commit)
via https://github.com/Gnucash/gnucash/commit/187d3833 (commit)
via https://github.com/Gnucash/gnucash/commit/82e9b14d (commit)
via https://github.com/Gnucash/gnucash/commit/bb4aa19a (commit)
from https://github.com/Gnucash/gnucash/commit/ae3bb989 (commit)
commit 98be5c87a4860d953ff24bb485ee48a27b8f5c72
Merge: ae3bb9892 2684e51db
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 22:15:08 2019 +0800
Merge branch 'maint'
diff --cc gnucash/report/reports/standard/test/CMakeLists.txt
index 810050ae3,839fa946a..5e2d56017
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@@ -15,9 -15,8 +15,10 @@@ set(scm_test_with_srfi64_SOURCE
test-budget.scm
test-register.scm
test-trial-balance.scm
+ test-equity-statement.scm
test-average-balance.scm
+ test-invoice.scm
+ test-owner-report.scm
test-portfolios.scm
)
diff --cc gnucash/report/reports/standard/test/test-equity-statement.scm
index 000000000,610a58c2f..a25a6da6e
mode 000000,100644..100644
--- a/gnucash/report/reports/standard/test/test-equity-statement.scm
+++ b/gnucash/report/reports/standard/test/test-equity-statement.scm
@@@ -1,0 -1,120 +1,120 @@@
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; This program is free software; you can redistribute it and/or
+ ;; modify it under the terms of the GNU General Public License as
+ ;; published by the Free Software Foundation; either version 2 of
+ ;; the License, or (at your option) any later version.
+ ;;
+ ;; This program is distributed in the hope that it will be useful,
+ ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ;; GNU General Public License for more details.
+ ;;
+ ;; You should have received a copy of the GNU General Public License
+ ;; along with this program; if not, contact:
+ ;;
+ ;; Free Software Foundation Voice: +1-617-542-5942
+ ;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
+ ;; Boston, MA 02110-1301, USA gnu at gnu.org
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+ (use-modules (srfi srfi-1))
+ (use-modules (srfi srfi-14))
+ (use-modules (srfi srfi-64))
+ (use-modules (gnucash gnc-module))
+ (use-modules (gnucash engine test srfi64-extras))
+
+ ;; Guile 2 needs to load external modules at compile time
+ ;; otherwise the N_ syntax-rule won't be found at compile time
+ ;; causing the test to fail
+ ;; That's what the wrapper below is meant for:
+
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
++(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
+
+ (use-modules (gnucash utilities))
+ (use-modules (gnucash report report-system))
+ (use-modules (gnucash app-utils))
+ (use-modules (gnucash engine))
+ (use-modules (sw_engine))
-(use-modules (gnucash report standard-reports equity-statement))
-(use-modules (gnucash report report-system test test-extras))
-(use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
++(use-modules (gnucash reports standard equity-statement))
++(use-modules (gnucash report stylesheets plain))
++(use-modules (tests test-engine-extras))
++(use-modules (tests test-report-extras))
+
+ ;; Explicitly set locale to make the report output predictable
+ (setlocale LC_ALL "C")
+ (define uuid "c2a996c8970f43448654ca84f17dda24")
+
+ (define (run-test)
+ (test-runner-factory gnc:test-runner)
+ (test-begin "equity-statement")
+ (test-equity-statement)
+ (test-end "equity-statement"))
+
+ (define (set-option options page tag value)
+ ((gnc:option-setter (gnc:lookup-option options page tag)) value))
+
+ (define (teardown)
+ (gnc-clear-current-session))
+
+ (define (options->sxml options test-title)
+ (gnc:options->sxml uuid options "test-equity-statement" test-title))
+
+ (define (test-equity-statement)
+ (let* ((options (gnc:make-report-options uuid))
+ (account-alist (create-test-data))
+ (gbp-bank (assoc-ref account-alist "GBP Bank"))
+ (usd-bank (assoc-ref account-alist "Bank"))
+ (expense (assoc-ref account-alist "Expenses"))
+ (equity (assoc-ref account-alist "Equity"))
+ (income (assoc-ref account-alist "Income"))
+ (bank (assoc-ref account-alist "Bank")))
+
+ (gnc-commodity-set-user-symbol
+ (xaccAccountGetCommodity gbp-bank)
+ "#")
+
+ (let ((closing-txn (env-transfer #f 30 06 2003 expense equity
+ 111 #:description "Closing Entries")))
+ (xaccTransSetIsClosingTxn closing-txn #t))
+
+ (env-transfer #f 01 06 2003 expense equity
+ 33 #:description "Adjusting Entries")
+ (env-transfer #f 01 07 2003 income equity
+ -2500 #:description "Adjusting Entries")
+
+ (set-option options "General" "Start Date"
+ (cons 'absolute (gnc-dmy2time64 01 01 1970)))
+ (set-option options "General" "End Date"
+ (cons 'absolute (gnc-dmy2time64 01 01 2005)))
+ (let ((sxml (options->sxml options "current")))
+ (test-equal "current table has 22 cells"
+ 14
+ (length (sxml->table-row-col sxml 1 #f #f)))
+
+ (test-equal "capital"
+ '("Capital, 01/01/70" "$29.00")
+ (sxml->table-row-col sxml 1 2 #f))
+
+ (test-equal "income"
+ '("Net income for Period" "$620.00")
+ (sxml->table-row-col sxml 1 3 #f))
+
+ (test-equal "investments"
+ '("Investments for Period" "$2,722.00")
+ (sxml->table-row-col sxml 1 4 #f))
+
+ (test-equal "withdrawals"
+ '("Withdrawals for Period" "$255.00")
+ (sxml->table-row-col sxml 1 5 #f))
+
+ (test-equal "unrealized"
+ '("Unrealized Losses" "$0.25")
+ (sxml->table-row-col sxml 1 6 #f))
+
+ (test-equal "inc/dec in capital"
+ '("Increase in capital" "$3,086.75")
+ (sxml->table-row-col sxml 1 7 #f))
+
+ (test-equal "capital end"
+ '("Capital, 01/01/05" "$3,115.75")
+ (sxml->table-row-col sxml 1 8 #f)))))
commit 2684e51dbf12d3cf3a9aa4d3c7c9f22f5278e9d2
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 16:34:28 2019 +0800
[reports][API] gnc:make-html-table-cell/min-width
A better version of 5aa59e0ce - new API call to create a table-cell
with min-width style attribute. Can be used by balsheet-pnl as
well.
diff --git a/gnucash/report/report-system/html-table.scm b/gnucash/report/report-system/html-table.scm
index 7d6d5c762..ceedb8ece 100644
--- a/gnucash/report/report-system/html-table.scm
+++ b/gnucash/report/report-system/html-table.scm
@@ -73,6 +73,12 @@
(gnc:make-html-table-cell-internal rowspan colspan markup
objects (gnc:make-html-style-table)))
+(define (gnc:make-html-table-cell/min-width px)
+ (let ((cell (gnc:make-html-table-cell)))
+ (gnc:html-table-cell-set-style!
+ cell "td" 'attribute (list "style" (format #f "min-width:~apx" px)))
+ cell))
+
(define (gnc:make-html-table-header-cell . objects)
(gnc:make-html-table-cell-internal 1 1 "th" objects
(gnc:make-html-style-table)))
diff --git a/gnucash/report/report-system/report-system.scm b/gnucash/report/report-system/report-system.scm
index ceee70e11..16726290d 100644
--- a/gnucash/report/report-system/report-system.scm
+++ b/gnucash/report/report-system/report-system.scm
@@ -563,6 +563,7 @@
(export gnc:make-html-table-header-cell)
(export gnc:make-html-table-header-cell/markup)
(export gnc:make-html-table-header-cell/size)
+(export gnc:make-html-table-cell/min-width)
(export gnc:html-table-cell?)
(export gnc:html-table-cell-rowspan)
(export gnc:html-table-cell-set-rowspan!)
diff --git a/gnucash/report/standard-reports/balance-sheet.scm b/gnucash/report/standard-reports/balance-sheet.scm
index b7699f2bf..912524740 100644
--- a/gnucash/report/standard-reports/balance-sheet.scm
+++ b/gnucash/report/standard-reports/balance-sheet.scm
@@ -473,13 +473,10 @@
(equity-table
(gnc:make-html-acct-table/env/accts table-env equity-accounts)))
- (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
- (gnc:html-table-cell-set-style!
- wide "text-cell" 'attribute '("style" "min-width:60px"))
- (let ((space (make-list tree-depth wide)))
- (gnc:html-table-append-row! left-table space)
- (unless report-form?
- (gnc:html-table-append-row! right-table space))))
+ (let ((space (make-list tree-depth (gnc:make-html-table-cell/min-width 60))))
+ (gnc:html-table-append-row! left-table space)
+ (unless report-form?
+ (gnc:html-table-append-row! right-table space)))
(gnc:report-percent-done 80)
(when label-assets?
diff --git a/gnucash/report/standard-reports/balsheet-pnl.scm b/gnucash/report/standard-reports/balsheet-pnl.scm
index bca8f5ad4..8d06801b1 100644
--- a/gnucash/report/standard-reports/balsheet-pnl.scm
+++ b/gnucash/report/standard-reports/balsheet-pnl.scm
@@ -419,11 +419,7 @@ also show overall period profit & loss."))
(loop (cons (thunk) result) (1- n)))))
(define (make-narrow-cell)
- (let ((narrow (gnc:make-html-table-cell/markup "text-cell" #f)))
- (gnc:html-table-cell-set-style!
- narrow "text-cell"
- 'attribute '("style" "width:1px"))
- narrow))
+ (gnc:make-html-table-cell/min-width 1))
(define (add-indented-row indent label label-markup amount-indent rest)
(when (or (not depth-limit) (<= indent depth-limit))
diff --git a/gnucash/report/standard-reports/budget-balance-sheet.scm b/gnucash/report/standard-reports/budget-balance-sheet.scm
index b5edc5e1f..1d1cb6029 100644
--- a/gnucash/report/standard-reports/budget-balance-sheet.scm
+++ b/gnucash/report/standard-reports/budget-balance-sheet.scm
@@ -653,16 +653,13 @@
(list 'rule-mode use-rules?)
)
)
-
- (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
- (gnc:html-table-cell-set-style!
- wide "text-cell" 'attribute '("style" "min-width:60px"))
- (let ((space (make-list tree-depth wide)))
- (gnc:html-table-append-row! left-table space)
- (unless report-form?
- (gnc:html-table-append-row! right-table space))))
-
- (gnc:report-percent-done 80)
+
+ (let ((space (make-list tree-depth (gnc:make-html-table-cell/min-width 60))))
+ (gnc:html-table-append-row! left-table space)
+ (unless report-form?
+ (gnc:html-table-append-row! right-table space)))
+
+ (gnc:report-percent-done 80)
(if label-assets? (add-subtotal-line left-table (_ "Assets") #f #f))
(set! asset-table
(gnc:make-html-acct-table/env/accts
diff --git a/gnucash/report/standard-reports/budget-income-statement.scm b/gnucash/report/standard-reports/budget-income-statement.scm
index 635fb57ea..d26085212 100644
--- a/gnucash/report/standard-reports/budget-income-statement.scm
+++ b/gnucash/report/standard-reports/budget-income-statement.scm
@@ -582,11 +582,9 @@
)
)
- (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
- (gnc:html-table-cell-set-style!
- wide "text-cell" 'attribute '("style" "min-width:60px"))
- (gnc:html-table-append-row! inc-table (make-list tree-depth wide))
- (gnc:html-table-append-row! exp-table (make-list tree-depth wide)))
+ (let ((space (make-list tree-depth (gnc:make-html-table-cell/min-width 60))))
+ (gnc:html-table-append-row! inc-table space)
+ (gnc:html-table-append-row! exp-table space))
(gnc:report-percent-done 80)
(if label-revenue?
diff --git a/gnucash/report/standard-reports/equity-statement.scm b/gnucash/report/standard-reports/equity-statement.scm
index 51387b545..85ad4cc85 100644
--- a/gnucash/report/standard-reports/equity-statement.scm
+++ b/gnucash/report/standard-reports/equity-statement.scm
@@ -440,10 +440,8 @@
(gnc:report-percent-done 30)
- (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
- (gnc:html-table-cell-set-style!
- wide "text-cell" 'attribute '("style" "min-width:60px"))
- (gnc:html-table-append-row! build-table (make-list 2 wide)))
+ (gnc:html-table-append-row!
+ build-table (make-list 2 (gnc:make-html-table-cell/min-width 60)))
(gnc:report-percent-done 80)
diff --git a/gnucash/report/standard-reports/income-statement.scm b/gnucash/report/standard-reports/income-statement.scm
index 035b57b5c..d5477685d 100644
--- a/gnucash/report/standard-reports/income-statement.scm
+++ b/gnucash/report/standard-reports/income-statement.scm
@@ -548,12 +548,10 @@
)
)
- (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
- (gnc:html-table-cell-set-style!
- wide "text-cell" 'attribute '("style" "min-width:60px"))
- (gnc:html-table-append-row! inc-table (make-list tree-depth wide))
- (gnc:html-table-append-row! exp-table (make-list tree-depth wide))
- (gnc:html-table-append-row! tra-table (make-list tree-depth wide)))
+ (let ((space (make-list tree-depth (gnc:make-html-table-cell/min-width 60))))
+ (gnc:html-table-append-row! inc-table space)
+ (gnc:html-table-append-row! exp-table space)
+ (gnc:html-table-append-row! tra-table space))
(gnc:report-percent-done 80)
(if label-revenue?
diff --git a/gnucash/report/standard-reports/trial-balance.scm b/gnucash/report/standard-reports/trial-balance.scm
index 3ca1dd62e..48f879179 100644
--- a/gnucash/report/standard-reports/trial-balance.scm
+++ b/gnucash/report/standard-reports/trial-balance.scm
@@ -557,13 +557,10 @@
(let* ((env (gnc:html-acct-table-get-row-env acct-table 0)))
(set! account-cols (get-val env 'account-cols)))
- (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f))
- (ncols (+ account-cols (if (eq? report-variant 'work-sheet) 10 2))))
- (gnc:html-table-cell-set-style!
- wide "text-cell" 'attribute '("style" "min-width:60px"))
- (let ((space (make-list ncols wide)))
- (gnc:html-table-append-row! build-table space)
- (set! header-rows (1+ header-rows))))
+ (let* ((ncols (+ account-cols (if (eq? report-variant 'work-sheet) 10 2)))
+ (space (make-list ncols (gnc:make-html-table-cell/min-width 60))))
+ (gnc:html-table-append-row! build-table space)
+ (set! header-rows (1+ header-rows)))
;; add the double-column headers if required
(if (eq? report-variant 'work-sheet)
commit 72dc9bd301a762ccf22c67296842dd868c2b37ad
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 15:22:23 2019 +0800
[budget-income-statement] remove dead code
indent & tabbing are constants, refactor them out
diff --git a/gnucash/report/standard-reports/budget-income-statement.scm b/gnucash/report/standard-reports/budget-income-statement.scm
index e73b42fad..635fb57ea 100644
--- a/gnucash/report/standard-reports/budget-income-statement.scm
+++ b/gnucash/report/standard-reports/budget-income-statement.scm
@@ -71,8 +71,6 @@
(define opthelp-budget-period-end
(N_ "Select a budget period that ends the reporting range."))
-;; FIXME this could use an indent option
-
(define optname-accounts (N_ "Accounts"))
(define opthelp-accounts
(N_ "Report on these accounts, if display depth allows."))
@@ -384,8 +382,6 @@
optname-two-column))
(standard-order? (get-option gnc:pagename-display
optname-standard-order))
- (indent 0)
- (tabbing #f)
;; decompose the account list
(split-up-accounts (gnc:decompose-accountlist accounts))
@@ -406,41 +402,23 @@
(gnc:case-exchange-fn price-source report-commodity date-t64))
)
- ;; Wrapper to call gnc:html-table-add-labeled-amount-line!
- ;; with the proper arguments.
(define (add-subtotal-line table pos-label neg-label signed-balance)
- (define allow-same-column-totals #t)
- (let* ((neg? (and signed-balance
- neg-label
- (gnc-numeric-negative-p
+ (let* ((neg? (and signed-balance neg-label
+ (negative?
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
signed-balance report-commodity exchange-fn)))))
(label (if neg? (or neg-label pos-label) pos-label))
- (balance (if neg?
- (gnc:collector- signed-balance)
- signed-balance))
- )
+ (balance (if neg? (gnc:collector- signed-balance) signed-balance)))
(gnc:html-table-add-labeled-amount-line!
- table
- (+ indent (* tree-depth 2)
- (if (equal? tabbing 'canonically-tabbed) 1 0))
- "primary-subheading"
- (and (not allow-same-column-totals) balance use-rules?)
- label indent 1 "total-label-cell"
+ table (* tree-depth 2) "primary-subheading" #f label 0 1 "total-label-cell"
(gnc:sum-collector-commodity balance report-commodity exchange-fn)
- (+ indent (* tree-depth 2) (- 0 1)
- (if (equal? tabbing 'canonically-tabbed) 1 0))
- 1 "total-number-cell")
- )
- )
+ (1- (* tree-depth 2)) 1 "total-number-cell")))
;; wrapper around gnc:html-table-append-ruler!
(define (add-rule table)
(gnc:html-table-append-ruler!
- table
- (+ (* 2 tree-depth)
- (if (equal? tabbing 'canonically-tabbed) 1 0))))
+ table (* 2 tree-depth)))
(cond
((null? accounts)
@@ -507,34 +485,20 @@
;; a helper to add a line to our report
(define (report-line
- table pos-label neg-label amount col
- exchange-fn rule? row-style)
- (let* ((neg? (and amount
- neg-label
- (gnc-numeric-negative-p
+ table pos-label neg-label amount col exchange-fn rule? row-style)
+ (let* ((neg? (and amount neg-label
+ (negative?
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
amount report-commodity exchange-fn)))))
(label (if neg? (or neg-label pos-label) pos-label))
- (pos-bal (if neg?
- (gnc:collector- amount)
- amount))
+ (abs-amt (if neg? (gnc:collector- amount) amount))
(bal (gnc:sum-collector-commodity
- pos-bal report-commodity exchange-fn))
- (balance
- (cond
- ((gnc:uniform-commodity? pos-bal report-commodity) bal)
- (show-fcur? (gnc-commodity-table pos-bal report-commodity
- exchange-fn))
- (else bal)))
- (column (or col 0))
- )
+ abs-amt report-commodity exchange-fn)))
(gnc:html-table-add-labeled-amount-line!
table (* 2 tree-depth) row-style rule?
label 0 1 "text-cell"
- bal (+ col 1) 1 "number-cell")
- )
- )
+ bal (1+ col) 1 "number-cell")))
(gnc:report-percent-done 5)
commit 545454e347687a4de5931557766f5596140a76f6
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 15:21:32 2019 +0800
[income-statement] remove dead code
indent and tabbing are constant, refactor them out
diff --git a/gnucash/report/standard-reports/income-statement.scm b/gnucash/report/standard-reports/income-statement.scm
index c3d1ea5d1..035b57b5c 100644
--- a/gnucash/report/standard-reports/income-statement.scm
+++ b/gnucash/report/standard-reports/income-statement.scm
@@ -58,7 +58,6 @@
(define optname-start-date (N_ "Start Date"))
(define optname-end-date (N_ "End Date"))
-;; FIXME this could use an indent option
(define optname-accounts (N_ "Accounts"))
(define opthelp-accounts
@@ -363,12 +362,8 @@
(list (list 'str closing-str)
(list 'cased closing-cased)
(list 'regexp closing-regexp)
- (list 'closing #t)
- )
- )
- (indent 0)
- (tabbing #f)
-
+ (list 'closing #t)))
+
;; decompose the account list
(split-up-accounts (gnc:decompose-accountlist accounts))
(revenue-accounts (assoc-ref split-up-accounts ACCT-TYPE-INCOME))
@@ -392,7 +387,6 @@
;; Wrapper to call gnc:html-table-add-labeled-amount-line!
;; with the proper arguments.
(define (add-subtotal-line table pos-label neg-label signed-balance)
- (define allow-same-column-totals #t)
(let* ((neg? (and signed-balance
neg-label
(gnc-numeric-negative-p
@@ -400,32 +394,15 @@
(gnc:sum-collector-commodity
signed-balance report-commodity exchange-fn)))))
(label (if neg? (or neg-label pos-label) pos-label))
- (balance (if neg?
- (let ((bal (gnc:make-commodity-collector)))
- (bal 'minusmerge signed-balance #f)
- bal)
- signed-balance))
- )
+ (balance (if neg? (gnc:collector- signed-balance) signed-balance)))
(gnc:html-table-add-labeled-amount-line!
- table
- (+ indent (* tree-depth 2)
- (if (equal? tabbing 'canonically-tabbed) 1 0))
- "primary-subheading"
- (and (not allow-same-column-totals) balance use-rules?)
- label indent 1 "total-label-cell"
+ table (* tree-depth 2) "primary-subheading" #f label 0 1 "total-label-cell"
(gnc:sum-collector-commodity balance report-commodity exchange-fn)
- (+ indent (* tree-depth 2) (- 0 1)
- (if (equal? tabbing 'canonically-tabbed) 1 0))
- 1 "total-number-cell")
- )
- )
+ (1- (* tree-depth 2)) 1 "total-number-cell")))
;; wrapper around gnc:html-table-append-ruler!
(define (add-rule table)
- (gnc:html-table-append-ruler!
- table
- (+ (* 2 tree-depth)
- (if (equal? tabbing 'canonically-tabbed) 1 0))))
+ (gnc:html-table-append-ruler! table (* 2 tree-depth)))
(gnc:html-document-set-title!
doc (format #f
commit 18c79a8a6a777aef531e5a277af205462a23d683
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 15:21:14 2019 +0800
[trial-balance] remove dead code
diff --git a/gnucash/report/standard-reports/trial-balance.scm b/gnucash/report/standard-reports/trial-balance.scm
index c5db01864..3ca1dd62e 100644
--- a/gnucash/report/standard-reports/trial-balance.scm
+++ b/gnucash/report/standard-reports/trial-balance.scm
@@ -72,7 +72,6 @@
(define optname-end-date (N_ "Date of Report"))
(define optname-report-variant (N_ "Report variation"))
(define opthelp-report-variant (N_ "Kind of trial balance to generate."))
-;; FIXME this needs an indent option
(define optname-accounts (N_ "Accounts"))
(define opthelp-accounts
@@ -361,7 +360,6 @@
(show-rates? (get-option pagename-commodities optname-show-rates))
(show-zb-accts? #t)
(use-links? (get-option gnc:pagename-display optname-account-links))
- (indent 0)
;; decompose the account list
(split-up-accounts (gnc:decompose-accountlist accounts))
commit b481e2ea7b0e27e6b14b712dca9381e6b34e5305
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 15:20:55 2019 +0800
[budget-balance-sheet] remove dead code
indent and tabbing are constant, refactor them out
diff --git a/gnucash/report/standard-reports/budget-balance-sheet.scm b/gnucash/report/standard-reports/budget-balance-sheet.scm
index 276e7903f..b5edc5e1f 100644
--- a/gnucash/report/standard-reports/budget-balance-sheet.scm
+++ b/gnucash/report/standard-reports/budget-balance-sheet.scm
@@ -48,7 +48,6 @@
(define optname-report-form (N_ "Single column Balance Sheet"))
(define opthelp-report-form
(N_ "Print liability/equity section in the same column under the assets section as opposed to a second column right of the assets section."))
-;; FIXME this needs an indent option
(define optname-accounts (N_ "Accounts"))
(define opthelp-accounts
@@ -333,8 +332,6 @@
optname-account-links))
(use-rules? (get-option gnc:pagename-display
optname-use-rules))
- (indent 0)
- (tabbing #f)
;; decompose the account list
(split-up-accounts (gnc:decompose-accountlist accounts))
@@ -359,42 +356,24 @@
(gnc:case-exchange-fn price-source report-commodity date-t64))
)
- ;; Wrapper to call gnc:html-table-add-labeled-amount-line!
- ;; with the proper arguments.
(define (add-subtotal-line table pos-label neg-label signed-balance)
- (define allow-same-column-totals #t)
- (let* ((neg? (and signed-balance
- neg-label
- (gnc-numeric-negative-p
+ (let* ((neg? (and signed-balance neg-label
+ (negative?
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
signed-balance report-commodity exchange-fn)))))
(label (if neg? (or neg-label pos-label) pos-label))
- (balance (if neg?
- (gnc:collector- signed-balance)
- signed-balance))
- )
+ (balance (if neg? (gnc:collector- signed-balance) signed-balance)))
(gnc:html-table-add-labeled-amount-line!
- table
- (+ indent (* tree-depth 2)
- (if (equal? tabbing 'canonically-tabbed) 1 0))
- "primary-subheading"
- (and (not allow-same-column-totals) balance use-rules?)
- label indent 1 "total-label-cell"
+ table (* tree-depth 2) "primary-subheading" #f label 0 1 "total-label-cell"
(gnc:sum-collector-commodity balance report-commodity exchange-fn)
- (+ indent (* tree-depth 2) (- 0 1)
- (if (equal? tabbing 'canonically-tabbed) 1 0))
- 1 "total-number-cell")
- )
- )
-
+ (1- (* tree-depth 2)) 1 "total-number-cell")))
+
;; Wrapper around gnc:html-table-append-ruler! since we call it so
;; often.
(define (add-rule table)
(gnc:html-table-append-ruler!
- table
- (+ (* 2 tree-depth)
- (if (equal? tabbing 'canonically-tabbed) 1 0))))
+ table (* 2 tree-depth)))
(cond
((null? accounts)
commit e579f6af56813e9ea71efa80197f382ab986dad6
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 15:19:30 2019 +0800
[balance-sheet] remove dead code
diff --git a/gnucash/report/standard-reports/balance-sheet.scm b/gnucash/report/standard-reports/balance-sheet.scm
index 771c5a81c..b7699f2bf 100644
--- a/gnucash/report/standard-reports/balance-sheet.scm
+++ b/gnucash/report/standard-reports/balance-sheet.scm
@@ -356,9 +356,7 @@
(gnc:sum-collector-commodity
signed-balance report-commodity exchange-fn)))))
(label (if neg? (or neg-label pos-label) pos-label))
- (balance (if neg?
- (gnc:collector- signed-balance)
- signed-balance)))
+ (balance (if neg? (gnc:collector- signed-balance) signed-balance)))
(gnc:html-table-add-labeled-amount-line!
table (* tree-depth 2) "primary-subheading" #f label 0 1 "total-label-cell"
(gnc:sum-collector-commodity balance report-commodity exchange-fn)
@@ -475,9 +473,6 @@
(equity-table
(gnc:make-html-acct-table/env/accts table-env equity-accounts)))
- (define (get-total-balance-fn account)
- (gnc:account-get-comm-balance-at-date account reportdate #f))
-
(let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
(gnc:html-table-cell-set-style!
wide "text-cell" 'attribute '("style" "min-width:60px"))
commit c21d173c0679ee45c3b48bf711c275581a4b2f89
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 15:21:50 2019 +0800
[equity-statement] remove dead code
* 'balance' in add-report-line was defined but never used
* capital/drawing accounts are not defined. remove.
diff --git a/gnucash/report/standard-reports/equity-statement.scm b/gnucash/report/standard-reports/equity-statement.scm
index c233af468..51387b545 100644
--- a/gnucash/report/standard-reports/equity-statement.scm
+++ b/gnucash/report/standard-reports/equity-statement.scm
@@ -265,20 +265,13 @@
(equity-accounts
(assoc-ref split-up-accounts ACCT-TYPE-EQUITY))
- ;; N.B.: equity-accounts will also contain drawing accounts
- ;; these must still be split-out and itemized separately
- (capital-accounts #f)
- (drawing-accounts #f)
-
(closing-pattern
(list (list 'str closing-str)
(list 'cased closing-cased)
(list 'regexp closing-regexp)
(list 'positive #f)
- (list 'closing #t)
- )
- )
-
+ (list 'closing #t)))
+
(doc (gnc:make-html-document))
;; exchange rates calculation parameters
(start-exchange-fn
@@ -364,14 +357,7 @@
(gnc:accounts-get-comm-total-assets
equity-accounts get-end-balance-fn))
- ;; these variables wont be used until gnucash gets
- ;; conta account types
- (start-capital-balance #f)
- (end-capital-balance #f)
- (start-drawing-balance #f)
- (end-drawing-balance #f)
-
- (start-book-balance
+ (start-book-balance
(gnc:collector+ start-asset-balance
neg-start-liability-balance
neg-start-equity-balance
@@ -440,31 +426,17 @@
(define (add-report-line
table pos-label neg-label amount col
exchange-fn rule? row-style)
- (let* ((neg? (and amount
- neg-label
- (gnc-numeric-negative-p
+ (let* ((neg? (and amount neg-label
+ (negative?
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
amount report-commodity exchange-fn)))))
(label (if neg? (or neg-label pos-label) pos-label))
- (pos-bal (if neg?
- (gnc:collector- amount)
- amount))
- (bal (gnc:sum-collector-commodity
- pos-bal report-commodity exchange-fn))
- (balance
- (cond
- ((gnc:uniform-commodity? pos-bal report-commodity) bal)
- (show-fcur? (gnc-commodity-table
- pos-bal report-commodity exchange-fn))
- (else bal)))
- (column (or col 0)))
+ (pos-bal (if neg? (gnc:collector- amount) amount)))
(gnc:html-table-add-labeled-amount-line!
- table 3 row-style rule?
- label 0 1 "text-cell"
- bal (+ col 1) 1 "number-cell")
- )
- )
+ table 3 row-style rule? label 0 1 "text-cell"
+ (gnc:sum-collector-commodity pos-bal report-commodity exchange-fn)
+ (1+ col) 1 "number-cell")))
(gnc:report-percent-done 30)
commit 99b5d79a448626ec3cc26842016fbce3ce97398a
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 15:30:20 2019 +0800
[equity-statement] compact and rename to add-report-line
diff --git a/gnucash/report/standard-reports/equity-statement.scm b/gnucash/report/standard-reports/equity-statement.scm
index a148c11b1..c233af468 100644
--- a/gnucash/report/standard-reports/equity-statement.scm
+++ b/gnucash/report/standard-reports/equity-statement.scm
@@ -437,8 +437,8 @@
(period-for (string-append " " (_ "for Period"))))
;; a helper to add a line to our report
- (define (report-line
- table pos-label neg-label amount col
+ (define (add-report-line
+ table pos-label neg-label amount col
exchange-fn rule? row-style)
(let* ((neg? (and amount
neg-label
@@ -468,67 +468,56 @@
(gnc:report-percent-done 30)
- (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
+ (let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
(gnc:html-table-cell-set-style!
wide "text-cell" 'attribute '("style" "min-width:60px"))
(gnc:html-table-append-row! build-table (make-list 2 wide)))
-
- (gnc:report-percent-done 80)
-
- (report-line
- build-table
- (string-append (_ "Capital") ", "
- (qof-print-date start-date-printable))
- #f start-total-equity
- 1 start-exchange-fn #f "primary-subheading"
- )
- (report-line
- build-table
- (string-append (_ "Net income") period-for)
- (string-append (_ "Net loss") period-for)
- net-income
- 0 end-exchange-fn #f #f
- )
- (report-line
- build-table
- (string-append (_ "Investments") period-for)
- #f
- investments
- 0 end-exchange-fn #f #f
- )
- (report-line
- build-table
- (string-append (_ "Withdrawals") period-for)
- #f
- withdrawals
- 0 end-exchange-fn #f #f
- )
- (or (gnc-commodity-collector-allzero? net-unrealized-gains)
- (report-line
- build-table
- (_ "Unrealized Gains")
- (_ "Unrealized Losses")
- net-unrealized-gains
- 0 end-exchange-fn #f #f
- )
- )
- (report-line
- build-table
- (_ "Increase in capital")
- (_ "Decrease in capital")
- capital-increase
- 1 end-exchange-fn use-rules? #f
- )
- (report-line
- build-table
- (string-append (_ "Capital") ", "
- (qof-print-date end-date))
- #f
- end-total-equity
- 1 end-exchange-fn #f "primary-subheading"
- )
-
- (gnc:html-document-add-object! doc build-table)
+
+ (gnc:report-percent-done 80)
+
+ (add-report-line
+ build-table
+ (string-append (_ "Capital") ", " (qof-print-date start-date-printable))
+ #f start-total-equity 1 start-exchange-fn #f "primary-subheading")
+
+ (add-report-line
+ build-table
+ (string-append (_ "Net income") period-for)
+ (string-append (_ "Net loss") period-for)
+ net-income 0 end-exchange-fn #f #f)
+
+ (add-report-line
+ build-table
+ (string-append (_ "Investments") period-for) #f
+ investments 0 end-exchange-fn #f #f)
+
+ (add-report-line
+ build-table
+ (string-append (_ "Withdrawals") period-for)
+ #f withdrawals 0 end-exchange-fn #f #f)
+
+ (unless (gnc-commodity-collector-allzero? net-unrealized-gains)
+ (add-report-line
+ build-table
+ (_ "Unrealized Gains")
+ (_ "Unrealized Losses")
+ net-unrealized-gains
+ 0 end-exchange-fn #f #f))
+
+ (add-report-line
+ build-table
+ (_ "Increase in capital")
+ (_ "Decrease in capital")
+ capital-increase
+ 1 end-exchange-fn use-rules? #f)
+
+ (add-report-line
+ build-table
+ (string-append (_ "Capital") ", " (qof-print-date end-date)) #f
+ end-total-equity
+ 1 end-exchange-fn #f "primary-subheading")
+
+ (gnc:html-document-add-object! doc build-table)
;; add currency information if requested
(gnc:report-percent-done 90)
commit fd6b102f8e3c719ef675e08559aa3ebb23c122d6
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 13:46:06 2019 +0800
[equity-statement] compact functions
diff --git a/gnucash/report/standard-reports/equity-statement.scm b/gnucash/report/standard-reports/equity-statement.scm
index 8698d44ec..a148c11b1 100644
--- a/gnucash/report/standard-reports/equity-statement.scm
+++ b/gnucash/report/standard-reports/equity-statement.scm
@@ -532,31 +532,25 @@
;; add currency information if requested
(gnc:report-percent-done 90)
- (and show-rates?
- (let* ((curr-tbl (gnc:make-html-table))
- (headers (list
- (qof-print-date start-date-printable)
- (qof-print-date end-date)
- )
- )
- (then (gnc:html-make-exchangerates
- report-commodity start-exchange-fn accounts))
- (now (gnc:html-make-exchangerates
- report-commodity end-exchange-fn accounts))
- )
-
- (gnc:html-table-set-col-headers! curr-tbl headers)
- (gnc:html-table-set-style!
- curr-tbl "table" 'attribute '("border" "1"))
- (gnc:html-table-set-style!
- then "table" 'attribute '("border" "0"))
- (gnc:html-table-set-style!
- now "table" 'attribute '("border" "0"))
- (gnc:html-table-append-ruler! build-table 3)
- (gnc:html-table-append-row! curr-tbl (list then now))
- (gnc:html-document-add-object! doc curr-tbl)
- )
- )
+ (when show-rates?
+ (let* ((curr-tbl (gnc:make-html-table))
+ (headers (list
+ (qof-print-date start-date-printable)
+ (qof-print-date end-date)))
+ (then (gnc:html-make-exchangerates
+ report-commodity start-exchange-fn accounts))
+ (now (gnc:html-make-exchangerates
+ report-commodity end-exchange-fn accounts)))
+ (gnc:html-table-set-col-headers! curr-tbl headers)
+ (gnc:html-table-set-style!
+ curr-tbl "table" 'attribute '("border" "1"))
+ (gnc:html-table-set-style!
+ then "table" 'attribute '("border" "0"))
+ (gnc:html-table-set-style!
+ now "table" 'attribute '("border" "0"))
+ (gnc:html-table-append-ruler! build-table 3)
+ (gnc:html-table-append-row! curr-tbl (list then now))
+ (gnc:html-document-add-object! doc curr-tbl)))
(gnc:report-percent-done 100)))
commit 1da86a5fe4266699f79e1ab60d27e5b342beb3a7
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Sep 30 13:50:12 2019 +0800
[equity-statement] define vars in formals instead of set!
diff --git a/gnucash/report/standard-reports/equity-statement.scm b/gnucash/report/standard-reports/equity-statement.scm
index 8287e014d..8698d44ec 100644
--- a/gnucash/report/standard-reports/equity-statement.scm
+++ b/gnucash/report/standard-reports/equity-statement.scm
@@ -269,10 +269,7 @@
;; these must still be split-out and itemized separately
(capital-accounts #f)
(drawing-accounts #f)
- (investments #f)
- (withdrawals #f)
- (net-investment #f)
- (income-expense-closing #f)
+
(closing-pattern
(list (list 'str closing-str)
(list 'cased closing-cased)
@@ -291,7 +288,21 @@
(gnc:case-exchange-fn
price-source report-commodity end-date))
)
-
+
+ (define (unrealized-gains-at-date book-balance exchange-fn date)
+ (define weighted-fn
+ (gnc:case-exchange-fn 'weighted-average report-commodity date))
+ (gnc:monetaries-add
+ (gnc:sum-collector-commodity book-balance report-commodity exchange-fn)
+ (gnc:monetary-neg
+ (gnc:sum-collector-commodity book-balance report-commodity weighted-fn))))
+
+ (define (get-start-balance-fn account)
+ (gnc:account-get-comm-balance-at-date account start-date #f))
+
+ (define (get-end-balance-fn account)
+ (gnc:account-get-comm-balance-at-date account end-date #f))
+
(gnc:html-document-set-title!
doc (format #f
(string-append "~a ~a "
@@ -311,54 +322,120 @@
reportname (gnc:report-id report-obj)))
;; Get all the balances for each account group.
- (let* ((book-balance #f) ;; assets - liabilities - equity, norm 0
- (start-asset-balance #f)
- (end-asset-balance #f)
- (neg-start-liability-balance #f) ;; credit balances are < 0
- (neg-end-liability-balance #f)
- (neg-pre-start-retained-earnings #f)
- (neg-pre-end-retained-earnings #f)
- (neg-net-income #f)
- (net-income #f)
-
- (neg-start-equity-balance #f)
- (neg-end-equity-balance #f)
-
+ (let* ((start-asset-balance
+ (gnc:accounts-get-comm-total-assets
+ asset-accounts get-start-balance-fn))
+
+ (end-asset-balance
+ (gnc:accounts-get-comm-total-assets
+ asset-accounts get-end-balance-fn))
+
+ (neg-start-liability-balance
+ (gnc:accounts-get-comm-total-assets
+ liability-accounts get-start-balance-fn))
+
+ (neg-end-liability-balance
+ (gnc:accounts-get-comm-total-assets
+ liability-accounts get-end-balance-fn))
+
+ (neg-pre-start-retained-earnings
+ (gnc:accountlist-get-comm-balance-at-date-with-closing
+ income-expense-accounts start-date))
+
+ (neg-pre-end-retained-earnings
+ (gnc:accountlist-get-comm-balance-at-date-with-closing
+ income-expense-accounts end-date))
+
+ (income-expense-closing
+ (gnc:account-get-trans-type-balance-interval-with-closing
+ income-expense-accounts closing-pattern start-date end-date))
+
+ (net-income
+ (gnc:collector-
+ income-expense-closing
+ (gnc:accountlist-get-comm-balance-interval-with-closing
+ income-expense-accounts start-date end-date)))
+
+ (neg-start-equity-balance
+ (gnc:accounts-get-comm-total-assets
+ equity-accounts get-start-balance-fn))
+
+ (neg-end-equity-balance
+ (gnc:accounts-get-comm-total-assets
+ equity-accounts get-end-balance-fn))
+
;; these variables wont be used until gnucash gets
;; conta account types
(start-capital-balance #f)
(end-capital-balance #f)
(start-drawing-balance #f)
(end-drawing-balance #f)
-
- (start-book-balance #f)
- (end-book-balance #f)
-
- (start-unrealized-gains #f)
- (end-unrealized-gains #f)
- (net-unrealized-gains #f)
-
- (equity-closing #f)
- (neg-pre-closing-equity #f)
-
- (capital-increase #f)
-
- (start-total-equity #f)
- (end-total-equity #f)
-
+
+ (start-book-balance
+ (gnc:collector+ start-asset-balance
+ neg-start-liability-balance
+ neg-start-equity-balance
+ neg-pre-start-retained-earnings))
+
+ (end-book-balance
+ (gnc:collector+ end-asset-balance
+ neg-end-liability-balance
+ neg-end-equity-balance
+ neg-pre-end-retained-earnings))
+
+ (start-unrealized-gains
+ (unrealized-gains-at-date start-book-balance
+ start-exchange-fn
+ start-date))
+
+ (net-unrealized-gains
+ (unrealized-gains-at-date end-book-balance
+ end-exchange-fn
+ end-date))
+
+ (equity-closing
+ (gnc:account-get-trans-type-balance-interval-with-closing
+ equity-accounts closing-pattern start-date end-date))
+
+ (neg-pre-closing-equity
+ (gnc:collector- neg-end-equity-balance
+ equity-closing))
+
+ (net-investment
+ (gnc:collector- neg-start-equity-balance
+ neg-pre-closing-equity))
+
+ ;; calculate investments & draws...
+ ;; do a transaction query and classify the splits by dr/cr.
+ ;; assume that positive shares on an equity account are debits
+ ;; withdrawals = investments - (investments - withdrawals)
+ ;; investments = withdrawals + (investments - withdrawals)
+ (withdrawals
+ (account-get-total-flow 'in equity-accounts start-date end-date))
+
+ (investments
+ (gnc:collector+ net-investment withdrawals))
+
+ (capital-increase
+ (gnc:collector+ net-income
+ investments
+ net-unrealized-gains
+ (gnc:collector- withdrawals)))
+
+ (start-total-equity
+ (gnc:collector- start-unrealized-gains
+ neg-start-equity-balance
+ neg-pre-start-retained-earnings))
+
+ (end-total-equity
+ (gnc:collector+ start-total-equity
+ capital-increase))
+
;; Create the account table below where its
;; percentage time can be tracked.
(build-table (gnc:make-html-table)) ;; gnc:html-table
- (get-start-balance-fn
- (lambda (account)
- (gnc:account-get-comm-balance-at-date
- account start-date #f)))
- (get-end-balance-fn
- (lambda (account)
- (gnc:account-get-comm-balance-at-date
- account end-date #f)))
(period-for (string-append " " (_ "for Period"))))
-
+
;; a helper to add a line to our report
(define (report-line
table pos-label neg-label amount col
@@ -388,177 +465,9 @@
bal (+ col 1) 1 "number-cell")
)
)
-
- ;; sum any unrealized gains
- ;;
- ;; Hm... unrealized gains.... This is when you purchase
- ;; something and its value increases/decreases (prior to
- ;; your selling it) and you have to reflect that on your
- ;; balance sheet.
- ;;
- ;; I *think* a decrease in the value of a liability or
- ;; equity constitutes an unrealized loss. I'm unsure about
- ;; that though....
- ;;
- (define (unrealized-gains-at-date book-balance exchange-fn date)
- (define weighted-fn
- (gnc:case-exchange-fn 'weighted-average report-commodity date))
- (gnc:monetaries-add (gnc:sum-collector-commodity
- book-balance report-commodity exchange-fn)
- (gnc:monetary-neg
- (gnc:sum-collector-commodity
- book-balance report-commodity weighted-fn))))
-
- ;; If you ask me, any outstanding(TM) retained earnings and
- ;; unrealized gains should be added directly into equity,
- ;; both at the start and end dates of the reporting period.
- (gnc:report-percent-done 4)
-
- ;; start and end asset balances
- (set! start-asset-balance
- (gnc:accounts-get-comm-total-assets
- asset-accounts get-start-balance-fn)) ; OK
- (set! end-asset-balance
- (gnc:accounts-get-comm-total-assets
- asset-accounts get-end-balance-fn)) ; OK
-
- ;; start and end liability balances
- (set! neg-start-liability-balance
- (gnc:accounts-get-comm-total-assets
- liability-accounts get-start-balance-fn)) ; OK
- (set! neg-end-liability-balance
- (gnc:accounts-get-comm-total-assets
- liability-accounts get-end-balance-fn)) ; OK
-
- ;; start and end retained earnings (income - expenses)
- (set! neg-pre-start-retained-earnings
- (gnc:accountlist-get-comm-balance-at-date-with-closing
- income-expense-accounts start-date)) ; OK
- (set! neg-pre-end-retained-earnings
- (gnc:accountlist-get-comm-balance-at-date-with-closing
- income-expense-accounts end-date)) ; OK
- ;; neg-pre-end-retained-earnings is not used to calculate
- ;; profit but is used to calculate unrealized gains
-
- ;; calculate net income
- ;; first, ask out how much profit/loss was closed
- (set! income-expense-closing
- (gnc:account-get-trans-type-balance-interval-with-closing
- income-expense-accounts closing-pattern
- start-date end-date)
- )
- ;; find retained earnings for the period
- (set! neg-net-income
- (gnc:accountlist-get-comm-balance-interval-with-closing
- income-expense-accounts
- start-date end-date)) ; OK
- ;; revert the income/expense to its pre-closing balance
- (neg-net-income 'minusmerge income-expense-closing #f)
- (set! net-income (gnc:make-commodity-collector))
- (net-income 'minusmerge neg-net-income #f)
- ;; now we know the net income for the period
-
- ;; start and end (unadjusted) equity balances
- (set! neg-start-equity-balance
- (gnc:accounts-get-comm-total-assets
- equity-accounts get-start-balance-fn)) ; OK
- (set! neg-end-equity-balance
- (gnc:accounts-get-comm-total-assets
- equity-accounts get-end-balance-fn)) ; OK
- ;; neg-end-equity-balance is used to calculate unrealized
- ;; gains and investments/withdrawals
-
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- ;;
- ;; believe it or not, i think this part is right...
- ;;
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ;; start and end unrealized gains
- (set! start-book-balance (gnc:make-commodity-collector))
- (start-book-balance 'merge start-asset-balance #f)
- (start-book-balance 'merge neg-start-liability-balance #f)
- (start-book-balance 'merge neg-start-equity-balance #f)
- (start-book-balance 'merge neg-pre-start-retained-earnings #f) ; OK
-
- (set! end-book-balance (gnc:make-commodity-collector))
- (end-book-balance 'merge end-asset-balance #f)
- (end-book-balance 'merge neg-end-liability-balance #f)
- (end-book-balance 'merge neg-end-equity-balance #f)
- (end-book-balance 'merge neg-pre-end-retained-earnings #f) ; OK
-
- (set! start-unrealized-gains
- (unrealized-gains-at-date start-book-balance
- start-exchange-fn
- start-date)) ; OK
- ;; I suspect that unrealized gains (since never realized)
- ;; must be counted from forever-ago....
- ;; ...yep, this appears to be correct.
- (set! start-unrealized-gains (gnc:make-commodity-collector))
- (set! end-unrealized-gains
- (unrealized-gains-at-date end-book-balance
- end-exchange-fn
- end-date)) ; OK
-
- ;; unrealized gains accrued during the reporting period...
- (set! net-unrealized-gains (gnc:make-commodity-collector))
- (net-unrealized-gains 'merge end-unrealized-gains #f)
- (net-unrealized-gains 'minusmerge start-unrealized-gains #f) ; OK
-
- ;;
- ;; calculate investments & draws...
- ;;
- ;; since, as this time, GnuCash does not have any
- ;; contra-account types, i'm gonna have to fudge this a
- ;; bit... i'll do a transaction query and classify the
- ;; splits by debit/credit.
- ;;
- ;; withdrawals = investments - (investments - withdrawals)
- ;; investments = withdrawals + (investments - withdrawals)
- ;;
- ;; assume that positive shares on an equity account are debits...
- ;;
-
- (set! equity-closing
- (gnc:account-get-trans-type-balance-interval-with-closing
- equity-accounts closing-pattern
- start-date end-date)
- )
- (set! neg-pre-closing-equity (gnc:make-commodity-collector))
- (neg-pre-closing-equity 'merge neg-end-equity-balance #f)
- (neg-pre-closing-equity 'minusmerge equity-closing #f)
-
- (set! net-investment (gnc:make-commodity-collector)) ;; 0
- (net-investment 'minusmerge neg-pre-closing-equity #f);; > 0
- (net-investment 'merge neg-start-equity-balance #f) ;; net increase
-
- (set! withdrawals
- (account-get-total-flow 'in equity-accounts start-date end-date))
- (set! investments (gnc:make-commodity-collector))
- (investments 'merge net-investment #f)
- (investments 'merge withdrawals #f)
-
- ;; increase in equity
- (set! capital-increase (gnc:make-commodity-collector))
- (capital-increase 'merge net-income #f)
- (capital-increase 'merge investments #f)
- (capital-increase 'minusmerge withdrawals #f)
- (capital-increase 'merge net-unrealized-gains #f)
-
- ;; starting total equity
- (set! start-total-equity (gnc:make-commodity-collector))
- (start-total-equity 'minusmerge neg-start-equity-balance #f)
- (start-total-equity 'minusmerge neg-pre-start-retained-earnings #f)
- (start-total-equity 'merge start-unrealized-gains #f) ; OK
-
- ;; ending total equity
- (set! end-total-equity (gnc:make-commodity-collector))
- (end-total-equity 'merge start-total-equity #f)
- (end-total-equity 'merge capital-increase #f) ; OK
-
(gnc:report-percent-done 30)
-
+
(let ((wide (gnc:make-html-table-cell/markup "text-cell" #f)))
(gnc:html-table-cell-set-style!
wide "text-cell" 'attribute '("style" "min-width:60px"))
commit 187d383385b68030de13713f9ac6c5543929e1a5
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Sep 29 23:29:31 2019 +0800
[test-equity-statement] initial commit
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index 600105681..839fa946a 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@@ -15,6 +15,7 @@ set(scm_test_with_srfi64_SOURCES
test-budget.scm
test-register.scm
test-trial-balance.scm
+ test-equity-statement.scm
test-average-balance.scm
test-portfolios.scm
)
diff --git a/gnucash/report/standard-reports/test/test-equity-statement.scm b/gnucash/report/standard-reports/test/test-equity-statement.scm
new file mode 100644
index 000000000..610a58c2f
--- /dev/null
+++ b/gnucash/report/standard-reports/test/test-equity-statement.scm
@@ -0,0 +1,120 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, contact:
+;;
+;; Free Software Foundation Voice: +1-617-542-5942
+;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
+;; Boston, MA 02110-1301, USA gnu at gnu.org
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(use-modules (srfi srfi-1))
+(use-modules (srfi srfi-14))
+(use-modules (srfi srfi-64))
+(use-modules (gnucash gnc-module))
+(use-modules (gnucash engine test srfi64-extras))
+
+;; Guile 2 needs to load external modules at compile time
+;; otherwise the N_ syntax-rule won't be found at compile time
+;; causing the test to fail
+;; That's what the wrapper below is meant for:
+
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+
+(use-modules (gnucash utilities))
+(use-modules (gnucash report report-system))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash engine))
+(use-modules (sw_engine))
+(use-modules (gnucash report standard-reports equity-statement))
+(use-modules (gnucash report report-system test test-extras))
+(use-modules (gnucash report stylesheets))
+(use-modules (gnucash engine test test-extras))
+
+;; Explicitly set locale to make the report output predictable
+(setlocale LC_ALL "C")
+(define uuid "c2a996c8970f43448654ca84f17dda24")
+
+(define (run-test)
+ (test-runner-factory gnc:test-runner)
+ (test-begin "equity-statement")
+ (test-equity-statement)
+ (test-end "equity-statement"))
+
+(define (set-option options page tag value)
+ ((gnc:option-setter (gnc:lookup-option options page tag)) value))
+
+(define (teardown)
+ (gnc-clear-current-session))
+
+(define (options->sxml options test-title)
+ (gnc:options->sxml uuid options "test-equity-statement" test-title))
+
+(define (test-equity-statement)
+ (let* ((options (gnc:make-report-options uuid))
+ (account-alist (create-test-data))
+ (gbp-bank (assoc-ref account-alist "GBP Bank"))
+ (usd-bank (assoc-ref account-alist "Bank"))
+ (expense (assoc-ref account-alist "Expenses"))
+ (equity (assoc-ref account-alist "Equity"))
+ (income (assoc-ref account-alist "Income"))
+ (bank (assoc-ref account-alist "Bank")))
+
+ (gnc-commodity-set-user-symbol
+ (xaccAccountGetCommodity gbp-bank)
+ "#")
+
+ (let ((closing-txn (env-transfer #f 30 06 2003 expense equity
+ 111 #:description "Closing Entries")))
+ (xaccTransSetIsClosingTxn closing-txn #t))
+
+ (env-transfer #f 01 06 2003 expense equity
+ 33 #:description "Adjusting Entries")
+ (env-transfer #f 01 07 2003 income equity
+ -2500 #:description "Adjusting Entries")
+
+ (set-option options "General" "Start Date"
+ (cons 'absolute (gnc-dmy2time64 01 01 1970)))
+ (set-option options "General" "End Date"
+ (cons 'absolute (gnc-dmy2time64 01 01 2005)))
+ (let ((sxml (options->sxml options "current")))
+ (test-equal "current table has 22 cells"
+ 14
+ (length (sxml->table-row-col sxml 1 #f #f)))
+
+ (test-equal "capital"
+ '("Capital, 01/01/70" "$29.00")
+ (sxml->table-row-col sxml 1 2 #f))
+
+ (test-equal "income"
+ '("Net income for Period" "$620.00")
+ (sxml->table-row-col sxml 1 3 #f))
+
+ (test-equal "investments"
+ '("Investments for Period" "$2,722.00")
+ (sxml->table-row-col sxml 1 4 #f))
+
+ (test-equal "withdrawals"
+ '("Withdrawals for Period" "$255.00")
+ (sxml->table-row-col sxml 1 5 #f))
+
+ (test-equal "unrealized"
+ '("Unrealized Losses" "$0.25")
+ (sxml->table-row-col sxml 1 6 #f))
+
+ (test-equal "inc/dec in capital"
+ '("Increase in capital" "$3,086.75")
+ (sxml->table-row-col sxml 1 7 #f))
+
+ (test-equal "capital end"
+ '("Capital, 01/01/05" "$3,115.75")
+ (sxml->table-row-col sxml 1 8 #f)))))
commit 82e9b14dc5fde111821577cce546932fdb1e2418
Author: Christian Stimming <christian at cstimming.de>
Date: Sun Sep 29 21:58:42 2019 +0200
[aqbanking] Bug 797430: Avoid double init of gui
Patch by Mike Pieper. Thanks!
Explanation for why this is necessary: The previous (old) behaviour
changed in 62f7aa66. Before this commit (or when AQBANKING6 is not
set) it calls AB_JobSepaTransfer_new. For AQBANKING6 it calls
AB_Transaction_new. AB_Transaction_new is not using gui. Therefore
gui->state stays on INIT, while before it made several status changes
(=> RUNNING, FINISHED, HIDDEN). On second call to gnc_GWEN_Gui_get it
checks the state and finds it still in INIT which seems to be wrong.
So the right fix is to either use gui in AB_Transaction_new or to
remove first allocation, which is done here.
diff --git a/gnucash/import-export/aqb/gnc-ab-transfer.c b/gnucash/import-export/aqb/gnc-ab-transfer.c
index 928d97cef..153aaab36 100644
--- a/gnucash/import-export/aqb/gnc-ab-transfer.c
+++ b/gnucash/import-export/aqb/gnc-ab-transfer.c
@@ -142,6 +142,7 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
GNC_AB_JOB_STATUS job_status;
GncABImExContextImport *ieci = NULL;
+#ifndef AQBANKING6
/* Get a GUI object */
gui = gnc_GWEN_Gui_get(parent);
if (!gui)
@@ -150,6 +151,7 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
aborted = TRUE;
goto repeat;
}
+#endif
/* Let the user enter the values */
result = gnc_ab_trans_dialog_run_until_ok(td);
commit bb4aa19a3de2c7ec842c464cb3b291f31c1bfd7d
Author: Christian Stimming <christian at cstimming.de>
Date: Sun Sep 29 21:45:18 2019 +0200
[i18n] German translation update
Total: 5330 translated, 5 fuzzy, 23 untranslated.
diff --git a/po/de.po b/po/de.po
index e6512fb49..8aeface19 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,8 +24,8 @@ msgstr ""
"Project-Id-Version: GnuCash 3.6+\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
-"POT-Creation-Date: 2019-09-08 21:56+0200\n"
-"PO-Revision-Date: 2019-09-17 22:30+0200\n"
+"POT-Creation-Date: 2019-09-29 21:34+0200\n"
+"PO-Revision-Date: 2019-09-29 21:44+0200\n"
"Last-Translator: Christian Stimming <christian at cstimming.de>\n"
"Language-Team: GnuCash-de <gnucash-de at gnucash.org>\n"
"Language: de\n"
@@ -97,7 +97,7 @@ msgstr "Westeuropäisch"
#: gnucash/gtkbuilder/assistant-loan.glade:1029
#: gnucash/gtkbuilder/dialog-account.glade:832
#: gnucash/report/standard-reports/account-piecharts.scm:529
-#: gnucash/report/standard-reports/category-barchart.scm:595
+#: gnucash/report/standard-reports/category-barchart.scm:589
msgid "Other"
msgstr "Weitere"
@@ -765,9 +765,9 @@ msgstr[1] ""
"Die früheste Buchung in diesem Buch ist datiert auf %s. Mit der Auswahl von "
"oben wird die Teilung in %d Bücher durchgeführt."
-#. Translators: Run the assistent in your language to see GTK's translation of the button labels.
+#. Translators: Run the assistant in your language to see GTK's translation of the button labels.
#: gnucash/gnome/assistant-acct-period.c:369
-#, fuzzy, c-format
+#, c-format
msgid ""
"You have asked for a book to be created. This book will contain all "
"transactions up to midnight %s (for a total of %d transactions spread over "
@@ -776,13 +776,10 @@ msgid ""
" Amend the Title and Notes or Click on \"Next\" to proceed.\n"
" Click on \"Back\" to adjust the dates or \"Cancel\"."
msgstr ""
-"Sie haben ausgewählt, dass ein Buch erstellt werden soll. Das neue Buch wird "
-"alle Buchungen bis Mitternacht des %s enthalten (insgesamt %d Buchungen in "
-"%d Konten).\n"
+"Sie haben ausgewählt, dass ein Buch erstellt werden soll. Das neue Buch wird alle Buchungen bis Mitternacht des %s enthalten (insgesamt %d Buchungen in %d Konten).\n"
"\n"
-"Ändern Sie ggf. den Titel und die Bemerkungen und klicken Sie »Weiter«, um "
-"dieses Buch zu erstellen.\n"
-"Klicken Sie »Zurück«, um die Daten zu verändern oder 'Abbrechen'."
+"Ändern Sie ggf. den Titel und die Bemerkungen und klicken Sie »Weiter«, um dieses Buch zu erstellen.\n"
+"Klicken Sie »Zurück«, um die Daten zu verändern oder »Abbrechen«."
#: gnucash/gnome/assistant-acct-period.c:386
#, c-format
@@ -790,15 +787,11 @@ msgid "Period %s - %s"
msgstr "Zeitraum von %s bis %s"
#: gnucash/gnome/assistant-acct-period.c:404
-#, fuzzy, c-format
+#, c-format
msgid ""
"The book will be created with the title %s when you click on \"Apply\". "
"Click on \"Back\" to adjust, or \"Cancel\" to not create any book."
-msgstr ""
-"Das neue Buch wird mit dem Titel »%s« erstellt, wenn Sie »Anwenden« "
-"klicken.\n"
-"Klicken Sie »Zurück» zum Ändern\n"
-"oder »Abbrechen«, um doch kein Buch zu erstellen."
+msgstr "Das neue Buch wird mit dem Titel »%s« erstellt, wenn Sie »Anwenden« klicken. Klicken Sie »Zurück» zum Ändern oder »Abbrechen«, um doch kein Buch zu erstellen."
#. Translation FIXME: Can this %s-containing message please be
#. replaced by one single message? Either this closing went
@@ -950,8 +943,8 @@ msgid "via Escrow account?"
msgstr "über Treuhandkonto?"
#: gnucash/gnome/assistant-loan.cpp:930
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2903
-#: gnucash/register/ledger-core/split-register.c:2626
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2901
+#: gnucash/register/ledger-core/split-register.c:2624
msgid "Loan"
msgstr "Darlehen"
@@ -965,6 +958,7 @@ msgstr "Darlehensrechner-Option: \"%s\""
#. * header line of exported CSV files:
#. Add the columns *
#. * (keep the line break below to avoid a translator comment)
+#. account-summary:
#: gnucash/gnome/assistant-loan.cpp:1867 gnucash/gnome/dialog-lot-viewer.c:908
#: gnucash/gnome/gnc-split-reg.c:603 gnucash/gnome/reconcile-view.c:447
#: gnucash/gnome-utils/gnc-tree-view-price.c:408
@@ -997,16 +991,16 @@ msgstr "Darlehensrechner-Option: \"%s\""
#: gnucash/report/report-system/trep-engine.scm:915
#: gnucash/report/report-system/trep-engine.scm:1041
#: gnucash/report/report-system/trep-engine.scm:1122
-#: gnucash/report/standard-reports/account-summary.scm:72
+#: gnucash/report/standard-reports/account-summary.scm:83
#: gnucash/report/standard-reports/advanced-portfolio.scm:72
-#: gnucash/report/standard-reports/balsheet-pnl.scm:1039
-#: gnucash/report/standard-reports/balsheet-pnl.scm:1044
+#: gnucash/report/standard-reports/balsheet-pnl.scm:1037
+#: gnucash/report/standard-reports/balsheet-pnl.scm:1042
#: gnucash/report/standard-reports/cashflow-barchart.scm:337
-#: gnucash/report/standard-reports/category-barchart.scm:734
+#: gnucash/report/standard-reports/category-barchart.scm:728
#: gnucash/report/standard-reports/general-journal.scm:101
#: gnucash/report/standard-reports/general-ledger.scm:73
#: gnucash/report/standard-reports/general-ledger.scm:94
-#: gnucash/report/standard-reports/net-charts.scm:484
+#: gnucash/report/standard-reports/net-charts.scm:478
#: gnucash/report/standard-reports/portfolio.scm:51
#: gnucash/report/standard-reports/register.scm:129
#: gnucash/report/standard-reports/register.scm:381
@@ -1017,18 +1011,18 @@ msgstr "Datum"
#. Mark the transaction as a payment
#: gnucash/gnome/assistant-loan.cpp:1873 gnucash/gnome/assistant-loan.cpp:2852
#: gnucash/gnome/assistant-loan.cpp:2914 gnucash/gnome/assistant-loan.cpp:2927
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2864
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2905
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2910
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2921
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2862
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2903
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2908
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2919
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2993
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3079
#: gnucash/gtkbuilder/dialog-payment.glade:482
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:132
-#: gnucash/register/ledger-core/split-register.c:2587
-#: gnucash/register/ledger-core/split-register.c:2628
-#: gnucash/register/ledger-core/split-register.c:2633
-#: gnucash/register/ledger-core/split-register.c:2644
+#: gnucash/register/ledger-core/split-register.c:2585
+#: gnucash/register/ledger-core/split-register.c:2626
+#: gnucash/register/ledger-core/split-register.c:2631
+#: gnucash/register/ledger-core/split-register.c:2642
#: gnucash/report/business-reports/owner-report.scm:359
#: libgnucash/app-utils/prefs.scm:66 libgnucash/app-utils/prefs.scm:74
#: libgnucash/app-utils/prefs.scm:92 libgnucash/engine/gncOwner.c:791
@@ -1042,19 +1036,19 @@ msgid "Principal"
msgstr "Tilgung"
#: gnucash/gnome/assistant-loan.cpp:1885 gnucash/gnome/assistant-loan.cpp:2967
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2859
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2896
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2904
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2911
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2920
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2947
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2857
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2894
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2902
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2909
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2918
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2945
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:40
-#: gnucash/register/ledger-core/split-register.c:2582
-#: gnucash/register/ledger-core/split-register.c:2619
-#: gnucash/register/ledger-core/split-register.c:2627
-#: gnucash/register/ledger-core/split-register.c:2634
-#: gnucash/register/ledger-core/split-register.c:2643
-#: gnucash/register/ledger-core/split-register.c:2670
+#: gnucash/register/ledger-core/split-register.c:2580
+#: gnucash/register/ledger-core/split-register.c:2617
+#: gnucash/register/ledger-core/split-register.c:2625
+#: gnucash/register/ledger-core/split-register.c:2632
+#: gnucash/register/ledger-core/split-register.c:2641
+#: gnucash/register/ledger-core/split-register.c:2668
msgid "Interest"
msgstr "Zinsen"
@@ -1064,10 +1058,9 @@ msgstr "Treuhandzahlung"
#. Set split-action with gnc_set_num_action which is the same as
#. * xaccSplitSetAction with these arguments
-#. Translators: This string has a disambiguation prefix
#: gnucash/gnome/assistant-stock-split.c:382
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2956
-#: gnucash/register/ledger-core/split-register.c:2679
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2953
+#: gnucash/register/ledger-core/split-register.c:2676
msgctxt "Action Column"
msgid "Split"
msgstr "Aktienteilung"
@@ -1081,7 +1074,7 @@ msgstr "Fehler beim Hinzufügen des Preises."
#: gnucash/gnome/assistant-stock-split.c:573
#: gnucash/gnome/dialog-find-transactions2.c:111
#: gnucash/gnome/dialog-find-transactions.c:109
-#: gnucash/import-export/aqb/gnc-ab-utils.c:492
+#: gnucash/import-export/aqb/gnc-ab-utils.c:504
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:149
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:59
#: gnucash/import-export/import-main-matcher.c:752
@@ -1147,7 +1140,7 @@ msgstr "Bearbeiten..."
#: gnucash/gnome-search/dialog-search.c:1054
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2998
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:166
-#: gnucash/report/business-reports/invoice.scm:791
+#: gnucash/report/business-reports/invoice.scm:797
#: gnucash/report/business-reports/job-report.scm:413
#: libgnucash/app-utils/prefs.scm:91 libgnucash/engine/gncInvoice.c:1059
msgid "Bill"
@@ -1162,15 +1155,15 @@ msgstr "Auslagenerstattung"
#: gnucash/gnome/business-gnome-utils.c:225 gnucash/gnome/dialog-invoice.c:3317
#: gnucash/gnome/gnc-plugin-page-invoice.c:365
#: gnucash/gnome-search/dialog-search.c:1070
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2909
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2907
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3073
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:186
#: gnucash/gtkbuilder/dialog-invoice.glade:8
#: gnucash/gtkbuilder/dialog-invoice.glade:145
#: gnucash/gtkbuilder/dialog-invoice.glade:747
#: gnucash/gtkbuilder/dialog-invoice.glade:761
-#: gnucash/register/ledger-core/split-register.c:2632
-#: gnucash/report/business-reports/invoice.scm:799
+#: gnucash/register/ledger-core/split-register.c:2630
+#: gnucash/report/business-reports/invoice.scm:805
#: gnucash/report/business-reports/job-report.scm:405
#: gnucash/report/business-reports/job-report.scm:409
#: gnucash/report/business-reports/receipt.eguile.scm:109
@@ -1699,11 +1692,11 @@ msgstr "Ausgeglichene Buchungen"
#: gnucash/gnome/dialog-find-transactions2.c:117
#: gnucash/gnome/dialog-find-transactions.c:115
-#: gnucash/report/report-system/html-acct-table.scm:613
+#: gnucash/report/report-system/html-acct-table.scm:600
#: gnucash/report/standard-reports/balsheet-pnl.scm:345
#: gnucash/report/standard-reports/equity-statement.scm:169
#: gnucash/report/standard-reports/income-statement.scm:269
-#: gnucash/report/standard-reports/trial-balance.scm:295
+#: gnucash/report/standard-reports/trial-balance.scm:292
msgid "Closing Entries"
msgstr "Abschlussbuchungen"
@@ -1903,8 +1896,7 @@ msgstr "Buchungstext"
#: gnucash/report/report-system/trep-engine.scm:921
#: gnucash/report/report-system/trep-engine.scm:1080
#: gnucash/report/report-system/trep-engine.scm:1175
-#: gnucash/report/standard-reports/account-summary.scm:484
-#: gnucash/report/standard-reports/sx-summary.scm:485
+#: gnucash/report/standard-reports/account-summary.scm:435
msgid "Notes"
msgstr "Bemerkung"
@@ -1939,47 +1931,46 @@ msgstr "Bemerkung"
#: gnucash/report/report-system/trep-engine.scm:920
#: gnucash/report/report-system/trep-engine.scm:1046
#: gnucash/report/report-system/trep-engine.scm:1165
-#: gnucash/report/standard-reports/account-summary.scm:443
+#: gnucash/report/standard-reports/account-summary.scm:407
#: gnucash/report/standard-reports/general-journal.scm:105
#: gnucash/report/standard-reports/general-ledger.scm:77
#: gnucash/report/standard-reports/general-ledger.scm:97
#: gnucash/report/standard-reports/register.scm:137
#: gnucash/report/standard-reports/register.scm:396
-#: gnucash/report/standard-reports/sx-summary.scm:444
msgid "Description"
msgstr "Beschreibung"
#: gnucash/gnome/dialog-find-transactions2.c:229
#: gnucash/gnome/dialog-find-transactions.c:227
-#: gnucash/gnome-search/dialog-search.c:1458
+#: gnucash/gnome-search/dialog-search.c:1457
msgid "Find Transaction"
msgstr "Buchungen suchen"
-#: gnucash/gnome/dialog-imap-editor.c:381
+#: gnucash/gnome/dialog-imap-editor.c:394
msgid "Map Account NOT found"
msgstr "Zugeordnetes Konto nicht gefunden"
-#: gnucash/gnome/dialog-imap-editor.c:480
+#: gnucash/gnome/dialog-imap-editor.c:493
#: gnucash/gtkbuilder/dialog-imap-editor.glade:112
msgid "Bayesian"
msgstr "Automatisch (Bayesisch)"
#. Description
-#: gnucash/gnome/dialog-imap-editor.c:495
+#: gnucash/gnome/dialog-imap-editor.c:508
msgid "Description Field"
msgstr "Beschreibungsfeld"
#. Memo
-#: gnucash/gnome/dialog-imap-editor.c:498
+#: gnucash/gnome/dialog-imap-editor.c:511
msgid "Memo Field"
msgstr "Buchungstext-Feld"
#. CSV Account Map
-#: gnucash/gnome/dialog-imap-editor.c:501
+#: gnucash/gnome/dialog-imap-editor.c:514
msgid "CSV Account Map"
msgstr "CSV-Kontoübersicht"
-#: gnucash/gnome/dialog-imap-editor.c:538
+#: gnucash/gnome/dialog-imap-editor.c:551
msgid "Online Id"
msgstr "Online Id"
@@ -2080,7 +2071,7 @@ msgstr "Gesamt Belastung:"
#. Set the type label
#: gnucash/gnome/dialog-invoice.c:1745 gnucash/gnome/dialog-payment.c:1259
#: gnucash/gtkbuilder/dialog-invoice.glade:778
-#: gnucash/report/business-reports/invoice.scm:797
+#: gnucash/report/business-reports/invoice.scm:803
#: libgnucash/engine/gncInvoice.c:1065
msgid "Credit Note"
msgstr "Gutschrift"
@@ -2296,8 +2287,7 @@ msgstr "Bemerkungen Auslagenerstattung"
#: gnucash/report/business-reports/customer-summary.scm:73
#: gnucash/report/business-reports/job-report.scm:45
#: gnucash/report/business-reports/owner-report.scm:55
-#: gnucash/report/standard-reports/account-summary.scm:442
-#: gnucash/report/standard-reports/sx-summary.scm:443
+#: gnucash/report/standard-reports/account-summary.scm:406
msgid "Type"
msgstr "Kontoart"
@@ -2346,7 +2336,7 @@ msgstr "Auslagenerstattung suchen"
#: gnucash/gnome/dialog-invoice.c:3310
#: gnucash/gnome-search/dialog-search.c:1066
-#: gnucash/report/business-reports/invoice.scm:793
+#: gnucash/report/business-reports/invoice.scm:799
msgid "Expense Voucher"
msgstr "Auslagenerstattung"
@@ -2470,10 +2460,9 @@ msgstr "Titel"
#: gnucash/report/business-reports/job-report.scm:208
#: gnucash/report/business-reports/owner-report.scm:321
#: gnucash/report/report-system/html-utilities.scm:711
-#: gnucash/report/standard-reports/account-summary.scm:461
+#: gnucash/report/standard-reports/account-summary.scm:420
#: gnucash/report/standard-reports/balance-forecast.scm:241
#: gnucash/report/standard-reports/register.scm:163
-#: gnucash/report/standard-reports/sx-summary.scm:462
msgid "Balance"
msgstr "Saldo"
@@ -2582,8 +2571,8 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-invoice.glade:977
#: gnucash/gtkbuilder/dialog-payment.glade:40
#: gnucash/register/ledger-core/split-register-model.c:285
-#: gnucash/report/business-reports/customer-summary.scm:305
-#: gnucash/report/business-reports/customer-summary.scm:338
+#: gnucash/report/business-reports/customer-summary.scm:300
+#: gnucash/report/business-reports/customer-summary.scm:333
#: gnucash/report/business-reports/job-report.scm:548
#: gnucash/report/business-reports/owner-report.scm:74
#: gnucash/report/business-reports/owner-report.scm:115
@@ -2693,7 +2682,7 @@ msgstr "Kurse löschen?"
#: gnucash/report/standard-reports/budget-income-statement.scm:125
#: gnucash/report/standard-reports/equity-statement.scm:85
#: gnucash/report/standard-reports/income-statement.scm:118
-#: gnucash/report/standard-reports/trial-balance.scm:91
+#: gnucash/report/standard-reports/trial-balance.scm:92
msgid "Entries"
msgstr "Einträge"
@@ -3059,8 +3048,7 @@ msgid "Form Line Data: "
msgstr "Daten der Formularzeilen:"
#: gnucash/gnome/dialog-tax-info.c:286
-#: gnucash/report/standard-reports/account-summary.scm:441
-#: gnucash/report/standard-reports/sx-summary.scm:442
+#: gnucash/report/standard-reports/account-summary.scm:405
msgid "Code"
msgstr "Code"
@@ -3183,7 +3171,7 @@ msgid "Find Vendor"
msgstr "Lieferant suchen"
#: gnucash/gnome/gnc-budget-view.c:419
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2952
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2950
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2976
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:33
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:39
@@ -3191,12 +3179,12 @@ msgstr "Lieferant suchen"
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:54
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:60
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:66
-#: gnucash/register/ledger-core/split-register.c:2675
+#: gnucash/register/ledger-core/split-register.c:2673
#: gnucash/report/report-system/report-utilities.scm:116
#: gnucash/report/standard-reports/advanced-portfolio.scm:1093
#: gnucash/report/standard-reports/balsheet-pnl.scm:1230
-#: gnucash/report/standard-reports/net-charts.scm:407
-#: gnucash/report/standard-reports/net-charts.scm:487
+#: gnucash/report/standard-reports/net-charts.scm:401
+#: gnucash/report/standard-reports/net-charts.scm:481
#: libgnucash/app-utils/prefs.scm:89 libgnucash/engine/Account.cpp:4099
#: libgnucash/engine/Scrub.c:422
msgid "Income"
@@ -3206,8 +3194,8 @@ msgstr "Ertrag"
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:80
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:85
#: gnucash/report/report-system/report-utilities.scm:117
-#: gnucash/report/standard-reports/budget-income-statement.scm:673
-#: gnucash/report/standard-reports/income-statement.scm:601
+#: gnucash/report/standard-reports/budget-income-statement.scm:643
+#: gnucash/report/standard-reports/income-statement.scm:596
msgid "Expenses"
msgstr "Aufwand"
@@ -3220,18 +3208,18 @@ msgstr "Ãœberweisungen"
#: gnucash/report/business-reports/aging.scm:563
#: gnucash/report/business-reports/aging.scm:847
#: gnucash/report/business-reports/balsheet-eg.eguile.scm:120
-#: gnucash/report/business-reports/customer-summary.scm:491
-#: gnucash/report/business-reports/customer-summary.scm:493
+#: gnucash/report/business-reports/customer-summary.scm:488
+#: gnucash/report/business-reports/customer-summary.scm:490
#: gnucash/report/business-reports/invoice.scm:105
#: gnucash/report/business-reports/invoice.scm:261
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:304
-#: gnucash/report/report-system/html-acct-table.scm:878
+#: gnucash/report/report-system/html-acct-table.scm:826
#: gnucash/report/report-system/html-utilities.scm:603
#: gnucash/report/report-system/trep-engine.scm:1878
#: gnucash/report/standard-reports/advanced-portfolio.scm:1058
#: gnucash/report/standard-reports/budget-flow.scm:169
#: gnucash/report/standard-reports/budget-flow.scm:248
-#: gnucash/report/standard-reports/budget.scm:453
+#: gnucash/report/standard-reports/budget.scm:443
#: gnucash/report/standard-reports/portfolio.scm:278
msgid "Total"
msgstr "Summe"
@@ -4097,12 +4085,12 @@ msgstr "Löschen"
#: gnucash/report/report-system/report.scm:69
#: gnucash/report/report-system/trep-engine.scm:49
#: gnucash/report/standard-reports/account-piecharts.scm:69
-#: gnucash/report/standard-reports/account-summary.scm:75
+#: gnucash/report/standard-reports/account-summary.scm:85
#: gnucash/report/standard-reports/advanced-portfolio.scm:162
#: gnucash/report/standard-reports/average-balance.scm:90
#: gnucash/report/standard-reports/average-balance.scm:294
#: gnucash/report/standard-reports/balance-forecast.scm:37
-#: gnucash/report/standard-reports/balance-sheet.scm:88
+#: gnucash/report/standard-reports/balance-sheet.scm:87
#: gnucash/report/standard-reports/balsheet-pnl.scm:64
#: gnucash/report/standard-reports/budget-balance-sheet.scm:53
#: gnucash/report/standard-reports/budget-barchart.scm:39
@@ -4116,8 +4104,7 @@ msgstr "Löschen"
#: gnucash/report/standard-reports/income-statement.scm:63
#: gnucash/report/standard-reports/net-charts.scm:46
#: gnucash/report/standard-reports/portfolio.scm:69
-#: gnucash/report/standard-reports/sx-summary.scm:54
-#: gnucash/report/standard-reports/trial-balance.scm:76
+#: gnucash/report/standard-reports/trial-balance.scm:77
#: libgnucash/engine/qofbookslots.h:65
msgid "Accounts"
msgstr "Konten"
@@ -5003,8 +4990,8 @@ msgstr "Alle Buchungssätze vollständig mit allen Teilen anzeigen"
#: gnucash/gnome/gnc-plugin-page-register2.c:483
#: gnucash/gnome/gnc-plugin-page-register.c:503
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2877
-#: gnucash/register/ledger-core/split-register.c:2600
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2875
+#: gnucash/register/ledger-core/split-register.c:2598
#: gnucash/register/ledger-core/split-register-layout.c:715
#: gnucash/register/ledger-core/split-register-model.c:342
#: gnucash/report/standard-reports/register.scm:143
@@ -5141,21 +5128,21 @@ msgstr "und Unterkonten"
#: gnucash/gnome/gnc-plugin-page-register2.c:2452
#: gnucash/gnome/gnc-plugin-page-register.c:3321
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2875
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2894
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2912
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2873
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2892
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2910
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3018
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3023
#: gnucash/gtkbuilder/dialog-payment.glade:347
#: gnucash/register/ledger-core/split-register.c:2501
-#: gnucash/register/ledger-core/split-register.c:2598
-#: gnucash/register/ledger-core/split-register.c:2617
-#: gnucash/register/ledger-core/split-register.c:2635
+#: gnucash/register/ledger-core/split-register.c:2596
+#: gnucash/register/ledger-core/split-register.c:2615
+#: gnucash/register/ledger-core/split-register.c:2633
#: gnucash/report/report-system/trep-engine.scm:1320
#: gnucash/report/report-system/trep-engine.scm:1337
#: gnucash/report/standard-reports/general-journal.scm:90
#: gnucash/report/standard-reports/register.scm:371
-#: gnucash/report/standard-reports/trial-balance.scm:731
+#: gnucash/report/standard-reports/trial-balance.scm:600
#: libgnucash/app-utils/guile-util.c:850
msgid "Credit"
msgstr "Haben"
@@ -5170,7 +5157,7 @@ msgstr "Haben"
#: gnucash/report/report-system/trep-engine.scm:1334
#: gnucash/report/standard-reports/general-journal.scm:89
#: gnucash/report/standard-reports/register.scm:369
-#: gnucash/report/standard-reports/trial-balance.scm:728
+#: gnucash/report/standard-reports/trial-balance.scm:597
#: libgnucash/app-utils/guile-util.c:819
msgid "Debit"
msgstr "Soll"
@@ -5213,7 +5200,7 @@ msgstr ""
#: gnucash/gnome/gnc-plugin-page-register2.c:2988
#: gnucash/gnome/gnc-plugin-page-register.c:3906
#: gnucash/gnome-utils/gnc-tree-view-account.c:2208
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:1177
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:1175
#, c-format
msgid "Filter %s by..."
msgstr "%s filtern nach..."
@@ -5469,31 +5456,31 @@ msgstr ""
msgid "Balancing entry from reconciliation"
msgstr "Ausgleichsbuchung vom Abgleichen"
-#: gnucash/gnome/gnc-split-reg2.c:802 gnucash/gnome/gnc-split-reg.c:2464
+#: gnucash/gnome/gnc-split-reg2.c:802 gnucash/gnome/gnc-split-reg.c:2470
msgid "Present:"
msgstr "Aktueller Wert:"
-#: gnucash/gnome/gnc-split-reg2.c:803 gnucash/gnome/gnc-split-reg.c:2465
+#: gnucash/gnome/gnc-split-reg2.c:803 gnucash/gnome/gnc-split-reg.c:2471
msgid "Future:"
msgstr "Zukünftiger Wert:"
-#: gnucash/gnome/gnc-split-reg2.c:804 gnucash/gnome/gnc-split-reg.c:2466
+#: gnucash/gnome/gnc-split-reg2.c:804 gnucash/gnome/gnc-split-reg.c:2472
msgid "Cleared:"
msgstr "Bestätigt:"
-#: gnucash/gnome/gnc-split-reg2.c:805 gnucash/gnome/gnc-split-reg.c:2467
+#: gnucash/gnome/gnc-split-reg2.c:805 gnucash/gnome/gnc-split-reg.c:2473
msgid "Reconciled:"
msgstr "Abgeglichen:"
-#: gnucash/gnome/gnc-split-reg2.c:806 gnucash/gnome/gnc-split-reg.c:2468
+#: gnucash/gnome/gnc-split-reg2.c:806 gnucash/gnome/gnc-split-reg.c:2474
msgid "Projected Minimum:"
msgstr "Voraussichtliches Minimum:"
-#: gnucash/gnome/gnc-split-reg2.c:810 gnucash/gnome/gnc-split-reg.c:2472
+#: gnucash/gnome/gnc-split-reg2.c:810 gnucash/gnome/gnc-split-reg.c:2478
msgid "Shares:"
msgstr "Anteile:"
-#: gnucash/gnome/gnc-split-reg2.c:811 gnucash/gnome/gnc-split-reg.c:2473
+#: gnucash/gnome/gnc-split-reg2.c:811 gnucash/gnome/gnc-split-reg.c:2479
msgid "Current Value:"
msgstr "Aktueller Wert:"
@@ -5511,11 +5498,11 @@ msgstr ""
"Verbindlichkeiten. Die Einträge sollten nicht von Hand geändert werden, "
"sondern nur über die Menüpunkte im »Geschäft«-Menü."
-#: gnucash/gnome/gnc-split-reg2.c:937 gnucash/gnome/gnc-split-reg.c:2555
+#: gnucash/gnome/gnc-split-reg2.c:937 gnucash/gnome/gnc-split-reg.c:2561
msgid "This account register is read-only."
msgstr "Dieses Konto ist schreibgeschützt."
-#: gnucash/gnome/gnc-split-reg2.c:980 gnucash/gnome/gnc-split-reg.c:2598
+#: gnucash/gnome/gnc-split-reg2.c:980 gnucash/gnome/gnc-split-reg.c:2604
msgid ""
"This account may not be edited. If you want to edit transactions in this "
"register, please open the account options and turn off the placeholder "
@@ -5525,7 +5512,7 @@ msgstr ""
"Konto bearbeiten möchten, öffnen Sie bitte das Dialogfenster »Konto "
"Eigenschaften« und deaktivieren Sie die Option »Platzhalter-Konto«."
-#: gnucash/gnome/gnc-split-reg2.c:987 gnucash/gnome/gnc-split-reg.c:2605
+#: gnucash/gnome/gnc-split-reg2.c:987 gnucash/gnome/gnc-split-reg.c:2611
msgid ""
"One of the sub-accounts selected may not be edited. If you want to edit "
"transactions in this register, please open the sub-account options and turn "
@@ -5743,7 +5730,7 @@ msgstr ""
"Beachten Sie, dass Sie einen Buchungssatz mit abgeglichenen Buchungsteilen "
"löschen würden. Dies bedeutet, dass ihr abgeglichener Saldo verändert wird."
-#: gnucash/gnome/gnc-split-reg.c:2479
+#: gnucash/gnome/gnc-split-reg.c:2485
msgid "Sort By: "
msgstr "Sortiere nach: "
@@ -6157,27 +6144,26 @@ msgstr "Neue Buchung"
msgid "New Split"
msgstr "Neuer Buchungsteil"
-#. Translators: This string has a disambiguation prefix. Translate only the part behind '|'
-#: gnucash/gnome-search/dialog-search.c:1098
+#: gnucash/gnome-search/dialog-search.c:1097
msgctxt ""
"Item represents an unknown object type (in the sense of bill, customer, "
-"invoice, transaction, split,...)"
+"invoice, transaction, split,...)!"
msgid "New item"
msgstr "Neues Element"
#. Set the 'add criterion' button
-#: gnucash/gnome-search/dialog-search.c:1140
+#: gnucash/gnome-search/dialog-search.c:1139
#: gnucash/gnome-utils/gnc-recurrence.c:549
#: gnucash/gtkbuilder/dialog-commodities.glade:123
#: gnucash/gtkbuilder/dialog-price.glade:834
msgid "_Add"
msgstr "_Hinzufügen"
-#: gnucash/gnome-search/dialog-search.c:1150
+#: gnucash/gnome-search/dialog-search.c:1149
msgid "all criteria are met"
msgstr "Alle Kriterien werden erfüllt"
-#: gnucash/gnome-search/dialog-search.c:1151
+#: gnucash/gnome-search/dialog-search.c:1150
msgid "any criteria are met"
msgstr "Irgendeines der Kriterien wird erfüllt"
@@ -6351,7 +6337,6 @@ msgid "Match case"
msgstr "Groß-/Kleinschreibung beachten"
#: gnucash/gnome-utils/assistant-xml-encoding.c:179
-#, fuzzy
msgid ""
"\n"
"The file you are trying to load is from an older version of GnuCash. The "
@@ -6401,7 +6386,6 @@ msgid "Ambiguous character encoding"
msgstr "Zeichenkodierung der Datei unbekannt"
#: gnucash/gnome-utils/assistant-xml-encoding.c:202
-#, fuzzy
msgid ""
"The file has been loaded successfully. If you click \"Apply\" it will be "
"saved and reloaded into the main application. That way you will have a "
@@ -7305,7 +7289,7 @@ msgid "Date: "
msgstr "Datum:"
#: gnucash/gnome-utils/gnc-dense-cal.c:357
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:149
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:147
#: gnucash/gtkbuilder/dialog-sx.glade:1415
msgid "Frequency"
msgstr "Häufigkeit"
@@ -8432,55 +8416,53 @@ msgstr "Sie können vom Journal nicht in ein Kontofenster einfügen."
msgid "New top level account"
msgstr "Neues Konto der obersten Ebene"
-#. Translators: This string has a context prefix; the translation
-#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2856
-#: gnucash/register/ledger-core/split-register.c:2579
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2854
+#: gnucash/register/ledger-core/split-register.c:2577
msgctxt "Action Column"
msgid "Deposit"
msgstr "Einzahlung"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2857
-#: gnucash/register/ledger-core/split-register.c:2580
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2855
+#: gnucash/register/ledger-core/split-register.c:2578
msgid "Withdraw"
msgstr "Belastung"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2858
-#: gnucash/register/ledger-core/split-register.c:2581
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2856
+#: gnucash/register/ledger-core/split-register.c:2579
msgid "Check"
msgstr "Scheck"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2860
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2891
-#: gnucash/register/ledger-core/split-register.c:2583
-#: gnucash/register/ledger-core/split-register.c:2614
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2858
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2889
+#: gnucash/register/ledger-core/split-register.c:2581
+#: gnucash/register/ledger-core/split-register.c:2612
msgid "ATM Deposit"
msgstr "Automateneinzahlung"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2861
-#: gnucash/register/ledger-core/split-register.c:2584
-#: gnucash/register/ledger-core/split-register.c:2615
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2859
+#: gnucash/register/ledger-core/split-register.c:2582
+#: gnucash/register/ledger-core/split-register.c:2613
msgid "ATM Draw"
msgstr "Automatenauszahlung"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2862
-#: gnucash/register/ledger-core/split-register.c:2585
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2860
+#: gnucash/register/ledger-core/split-register.c:2583
msgid "Teller"
msgstr "Bankschalter"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2863
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2861
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2970
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3056
#: gnucash/register/ledger-core/gncEntryLedgerLoad.c:133
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:529
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:1093
-#: gnucash/register/ledger-core/split-register.c:2586
+#: gnucash/register/ledger-core/split-register.c:2584
#: libgnucash/app-utils/prefs.scm:72 libgnucash/app-utils/prefs.scm:83
msgid "Charge"
msgstr "Belastung"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2865
-#: gnucash/register/ledger-core/split-register.c:2588
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2863
+#: gnucash/register/ledger-core/split-register.c:2586
#: gnucash/report/business-reports/receipt.eguile.scm:292
#: gnucash/report/business-reports/receipt.eguile.scm:299
#: gnucash/report/business-reports/receipt.scm:260
@@ -8488,166 +8470,166 @@ msgstr "Belastung"
msgid "Receipt"
msgstr "Quittung"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2866
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2880
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2916
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2927
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2960
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2864
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2878
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2914
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2925
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2957
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2965
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3043
-#: gnucash/register/ledger-core/split-register.c:2589
-#: gnucash/register/ledger-core/split-register.c:2603
-#: gnucash/register/ledger-core/split-register.c:2639
-#: gnucash/register/ledger-core/split-register.c:2650
-#: gnucash/register/ledger-core/split-register.c:2683
+#: gnucash/register/ledger-core/split-register.c:2587
+#: gnucash/register/ledger-core/split-register.c:2601
+#: gnucash/register/ledger-core/split-register.c:2637
+#: gnucash/register/ledger-core/split-register.c:2648
+#: gnucash/register/ledger-core/split-register.c:2680
#: libgnucash/app-utils/prefs.scm:67 libgnucash/app-utils/prefs.scm:85
#: libgnucash/app-utils/prefs.scm:93 libgnucash/app-utils/prefs.scm:94
msgid "Increase"
msgstr "Zunahme"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2867
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2881
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2917
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2928
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2961
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2865
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2879
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2915
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2926
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2958
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2958
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3050
-#: gnucash/register/ledger-core/split-register.c:2590
-#: gnucash/register/ledger-core/split-register.c:2604
-#: gnucash/register/ledger-core/split-register.c:2640
-#: gnucash/register/ledger-core/split-register.c:2651
-#: gnucash/register/ledger-core/split-register.c:2684
+#: gnucash/register/ledger-core/split-register.c:2588
+#: gnucash/register/ledger-core/split-register.c:2602
+#: gnucash/register/ledger-core/split-register.c:2638
+#: gnucash/register/ledger-core/split-register.c:2649
+#: gnucash/register/ledger-core/split-register.c:2681
#: libgnucash/app-utils/prefs.scm:68 libgnucash/app-utils/prefs.scm:76
#: libgnucash/app-utils/prefs.scm:77 libgnucash/app-utils/prefs.scm:84
msgid "Decrease"
msgstr "Abnahme"
#. Action: Point Of Sale
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2869
-#: gnucash/register/ledger-core/split-register.c:2592
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2867
+#: gnucash/register/ledger-core/split-register.c:2590
msgid "POS"
msgstr "Karten-Terminal"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2870
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2868
#: gnucash/gnome-utils/gnc-tree-view-owner.c:442
-#: gnucash/register/ledger-core/split-register.c:2593
+#: gnucash/register/ledger-core/split-register.c:2591
#: gnucash/report/business-reports/aging.scm:708
#: gnucash/report/business-reports/taxinvoice.eguile.scm:200
msgid "Phone"
msgstr "Telefon"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2871
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2897
-#: gnucash/register/ledger-core/split-register.c:2594
-#: gnucash/register/ledger-core/split-register.c:2620
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2869
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2895
+#: gnucash/register/ledger-core/split-register.c:2592
+#: gnucash/register/ledger-core/split-register.c:2618
msgid "Online"
msgstr "Online"
#. Action: Automatic Deposit
#. Action: Automatic Deposit ?!?
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2873
-#: gnucash/register/ledger-core/split-register.c:2596
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2871
+#: gnucash/register/ledger-core/split-register.c:2594
msgid "AutoDep"
msgstr "Gutschrift"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2874
-#: gnucash/register/ledger-core/split-register.c:2597
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2872
+#: gnucash/register/ledger-core/split-register.c:2595
msgid "Wire"
msgstr "Ãœberweisung"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2876
-#: gnucash/register/ledger-core/split-register.c:2599
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2874
+#: gnucash/register/ledger-core/split-register.c:2597
msgid "Direct Debit"
msgstr "Lastschrift"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2882
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2886
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2893
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2901
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2918
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2929
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2934
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2941
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2962
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2880
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2884
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2891
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2899
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2916
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2927
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2932
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2939
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2959
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3068
-#: gnucash/register/ledger-core/split-register.c:2605
-#: gnucash/register/ledger-core/split-register.c:2609
-#: gnucash/register/ledger-core/split-register.c:2616
-#: gnucash/register/ledger-core/split-register.c:2624
-#: gnucash/register/ledger-core/split-register.c:2641
-#: gnucash/register/ledger-core/split-register.c:2652
-#: gnucash/register/ledger-core/split-register.c:2657
-#: gnucash/register/ledger-core/split-register.c:2685
+#: gnucash/register/ledger-core/split-register.c:2603
+#: gnucash/register/ledger-core/split-register.c:2607
+#: gnucash/register/ledger-core/split-register.c:2614
+#: gnucash/register/ledger-core/split-register.c:2622
+#: gnucash/register/ledger-core/split-register.c:2639
+#: gnucash/register/ledger-core/split-register.c:2650
+#: gnucash/register/ledger-core/split-register.c:2655
+#: gnucash/register/ledger-core/split-register.c:2682
#: libgnucash/app-utils/prefs.scm:69 libgnucash/app-utils/prefs.scm:70
#: libgnucash/app-utils/prefs.scm:71
msgid "Buy"
msgstr "Kauf"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2883
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2887
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2898
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2902
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2919
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2930
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2935
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2942
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2963
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2881
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2885
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2896
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2900
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2917
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2928
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2933
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2940
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2960
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2988
-#: gnucash/register/ledger-core/split-register.c:2606
-#: gnucash/register/ledger-core/split-register.c:2610
-#: gnucash/register/ledger-core/split-register.c:2621
-#: gnucash/register/ledger-core/split-register.c:2625
-#: gnucash/register/ledger-core/split-register.c:2642
-#: gnucash/register/ledger-core/split-register.c:2653
-#: gnucash/register/ledger-core/split-register.c:2658
-#: gnucash/register/ledger-core/split-register.c:2686
+#: gnucash/register/ledger-core/split-register.c:2604
+#: gnucash/register/ledger-core/split-register.c:2608
+#: gnucash/register/ledger-core/split-register.c:2619
+#: gnucash/register/ledger-core/split-register.c:2623
+#: gnucash/register/ledger-core/split-register.c:2640
+#: gnucash/register/ledger-core/split-register.c:2651
+#: gnucash/register/ledger-core/split-register.c:2656
+#: gnucash/register/ledger-core/split-register.c:2683
#: libgnucash/app-utils/prefs.scm:86 libgnucash/app-utils/prefs.scm:87
#: libgnucash/app-utils/prefs.scm:88
msgid "Sell"
msgstr "Verkauf"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2888
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2895
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2944
-#: gnucash/register/ledger-core/split-register.c:2611
-#: gnucash/register/ledger-core/split-register.c:2618
-#: gnucash/register/ledger-core/split-register.c:2667
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2886
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2893
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2942
+#: gnucash/register/ledger-core/split-register.c:2609
+#: gnucash/register/ledger-core/split-register.c:2616
+#: gnucash/register/ledger-core/split-register.c:2665
msgid "Fee"
msgstr "Gebühr"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2892
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2890
msgid "ATM Withdraw"
msgstr "Belastung"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2922
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2920
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2981
-#: gnucash/register/ledger-core/split-register.c:2645
+#: gnucash/register/ledger-core/split-register.c:2643
#: libgnucash/app-utils/prefs.scm:90
msgid "Rebate"
msgstr "Erstattung"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2923
-#: gnucash/register/ledger-core/split-register.c:2646
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2921
+#: gnucash/register/ledger-core/split-register.c:2644
msgid "Paycheck"
msgstr "Gehalt"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2936
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2934
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:72
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:76
-#: gnucash/register/ledger-core/split-register.c:2659
-#: gnucash/report/standard-reports/balance-sheet.scm:656
-#: gnucash/report/standard-reports/balsheet-pnl.scm:1057
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:812
+#: gnucash/register/ledger-core/split-register.c:2657
+#: gnucash/report/standard-reports/balance-sheet.scm:508
+#: gnucash/report/standard-reports/balsheet-pnl.scm:1055
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:746
#: libgnucash/app-utils/gnc-ui-util.c:1027 libgnucash/engine/Account.cpp:4101
msgid "Equity"
msgstr "Eigenkapital"
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2943
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2941
#: gnucash/gnome-utils/gnc-tree-view-price.c:426
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2936
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:151
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:62
-#: gnucash/register/ledger-core/split-register.c:2666
+#: gnucash/register/ledger-core/split-register.c:2664
#: gnucash/register/ledger-core/split-register-model.c:396
#: gnucash/report/business-reports/invoice.scm:241
#: gnucash/report/report-system/trep-engine.scm:929
@@ -8666,26 +8648,26 @@ msgid "Price"
msgstr "Preis"
#. Action: Dividend
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2946
-#: gnucash/register/ledger-core/split-register.c:2669
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2944
+#: gnucash/register/ledger-core/split-register.c:2667
msgid "Dividend"
msgstr "Dividenden"
#. Action: Long Term Capital Gains
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2949
-#: gnucash/register/ledger-core/split-register.c:2672
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2947
+#: gnucash/register/ledger-core/split-register.c:2670
msgid "LTCG"
msgstr "Zinsen aus langfristigen Kapitalanlagen"
#. Action: Short Term Capital Gains
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2951
-#: gnucash/register/ledger-core/split-register.c:2674
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2949
+#: gnucash/register/ledger-core/split-register.c:2672
msgid "STCG"
msgstr "Zinsen aus kurzfristigen Anlagen"
#. Action: Distribution
-#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2954
-#: gnucash/register/ledger-core/split-register.c:2677
+#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2952
+#: gnucash/register/ledger-core/split-register.c:2675
msgid "Dist"
msgstr "Ausschüttung"
@@ -8777,7 +8759,7 @@ msgstr "_Berechnen"
#: gnucash/report/report-system/trep-engine.scm:1047
#: gnucash/report/standard-reports/general-ledger.scm:79
#: gnucash/report/standard-reports/general-ledger.scm:99
-#: gnucash/report/standard-reports/trial-balance.scm:734
+#: gnucash/report/standard-reports/trial-balance.scm:603
msgid "Account Name"
msgstr "Kontobezeichnung"
@@ -8792,10 +8774,9 @@ msgstr "Devise/Wertpapier"
#: gnucash/report/report-system/trep-engine.scm:149
#: gnucash/report/report-system/trep-engine.scm:924
#: gnucash/report/report-system/trep-engine.scm:1068
-#: gnucash/report/standard-reports/account-summary.scm:104
+#: gnucash/report/standard-reports/account-summary.scm:115
#: gnucash/report/standard-reports/general-ledger.scm:81
#: gnucash/report/standard-reports/general-ledger.scm:101
-#: gnucash/report/standard-reports/sx-summary.scm:83
msgid "Account Code"
msgstr "Kontonummer"
@@ -8867,7 +8848,7 @@ msgstr "Aktuell (%s)"
#. Translators: %s is a currency mnemonic.
#: gnucash/gnome-utils/gnc-tree-view-account.c:1719
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:926
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:924
#, c-format
msgid "Balance (%s)"
msgstr "Saldo (%s)"
@@ -8926,19 +8907,17 @@ msgstr "Stückelung"
msgid "Get Quotes"
msgstr "Kurse abrufen"
-#. Translators: This string has a context prefix; the translation
-#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:409
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:407
msgctxt "Column letter for 'Get Quotes'"
msgid "Q"
msgstr "K"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:415
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:413
#: gnucash/gnome-utils/gnc-tree-view-price.c:414
msgid "Source"
msgstr "Quelle"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:420
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:418
msgid "Timezone"
msgstr "Zeitzone"
@@ -9007,9 +8986,7 @@ msgstr "E-Mail"
msgid "Active"
msgstr "Aktiv"
-#. Translators: This string has a context prefix; the translation
-#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:481
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:479
msgctxt "Column letter for 'Active'"
msgid "A"
msgstr "A"
@@ -9157,10 +9134,10 @@ msgstr "Empfangen"
# should be prefixed: "employee|Auslagen" "Aufwendungen" sonst?
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3061
#: gnucash/report/business-reports/customer-summary.scm:140
-#: gnucash/report/business-reports/customer-summary.scm:343
+#: gnucash/report/business-reports/customer-summary.scm:338
#: gnucash/report/standard-reports/balsheet-pnl.scm:1234
-#: gnucash/report/standard-reports/net-charts.scm:407
-#: gnucash/report/standard-reports/net-charts.scm:487
+#: gnucash/report/standard-reports/net-charts.scm:401
+#: gnucash/report/standard-reports/net-charts.scm:481
#: libgnucash/app-utils/prefs.scm:73 libgnucash/engine/Account.cpp:4100
#: libgnucash/engine/gncInvoice.c:1061
msgid "Expense"
@@ -9288,18 +9265,16 @@ msgstr ""
msgid "Enabled"
msgstr "Aktiv"
-#. Translators: This string has a context prefix; the translation
-#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:143
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:141
msgctxt "Single-character short column-title form of 'Enabled'"
msgid "E"
msgstr "A"
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:154
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:152
msgid "Last Occur"
msgstr "Letztes Auftreten"
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:159
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:157
msgid "Next Occur"
msgstr "Nächstes Auftreten"
@@ -11926,9 +11901,8 @@ msgstr "Zusammenfassung"
msgid "CSV Import Assistant"
msgstr "CSV Import-Assistent"
-#. Run the assistent in your language to see GTK's translation of the button labels.
+#. Run the assistant in your language to see GTK's translation of the button labels.
#: gnucash/gtkbuilder/assistant-csv-account-import.glade:33
-#, fuzzy
msgid ""
"\n"
"This assistant will help you import Accounts from a file.\n"
@@ -11947,16 +11921,9 @@ msgstr ""
"\n"
"Dieser Assistent wird Ihnen helfen, Konten aus einer Datei zu importieren.\n"
"\n"
-"Die Datei muss im dem Format vorliegen wie das, welches von GnuCash beim "
-"Export erstellt wird, da es sich um ein festes Format handelt. Falls ein "
-"Konto mit dem vollständigen Namen bisher nicht existiert, wird es erstellt, "
-"sofern die Währung oder das Wertpapier, in dem es notiert wird, bereits im "
-"Programm oder ihrer GnuCash-Datei definiert ist. Falls das Konto bereits "
-"existiert, werden vier Felder aktualisiert: Kontonummer, Beschreibung, "
-"Bemerkungen und Farbe.\n"
+"Die Datei muss im dem Format vorliegen wie das, welches von GnuCash beim CSV Export erstellt wird, da es sich um ein festes Format handelt. Falls ein Konto mit dem vollständigen Namen bisher nicht existiert, wird es erstellt, sofern die Währung oder das Wertpapier, in dem es notiert wird, bereits im Programm oder ihrer GnuCash-Datei definiert ist. Falls das Konto bereits existiert, werden vier Felder aktualisiert: Kontonummer, Beschreibung, Bemerkungen und Farbe.\n"
"\n"
-"Um fortzufahren drücken Sie 'Weiter' oder 'Abbrechen', um den Import "
-"abzubrechen.\n"
+"Um fortzufahren drücken Sie 'Weiter' oder 'Abbrechen', um den Import abzubrechen.\n"
#: gnucash/gtkbuilder/assistant-csv-account-import.glade:54
msgid "Import Account Assistant"
@@ -12197,8 +12164,8 @@ msgid "CSV Price Import"
msgstr "CSV-Kurs Import"
# Fixme quote multiword names
+#. You should localize the (british) examples to your region.
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:53
-#, fuzzy
msgid ""
"This assistant will help you import Prices from a CSV file.\n"
"\n"
@@ -12225,7 +12192,7 @@ msgid ""
"settings name and press the Save Settings button. Note you can't save to "
"built-in presets.\n"
"\n"
-"This operation is not reversable, so make sure you have a working backup.\n"
+"This operation is not reversible, so make sure you have a working backup.\n"
"\n"
"Click on \"Next\" to proceed or \"Cancel\" to Abort Import."
msgstr ""
@@ -13090,9 +13057,8 @@ msgstr "Platzhalter"
msgid "QIF Import Assistant"
msgstr "QIF-Import-Assistent"
-#. Run the assistent in your language to see GTK's translation of the button labels.
+#. Run the assistant in your language to see GTK's translation of the button labels.
#: gnucash/gtkbuilder/assistant-qif-import.glade:42
-#, fuzzy
msgid ""
"GnuCash can import financial data from QIF (Quicken Interchange Format) "
"files written by Quicken/QuickBooks, MS Money, Moneydance, and many other "
@@ -13118,9 +13084,8 @@ msgstr ""
msgid "Import QIF files"
msgstr "QIF-Datei importieren"
-#. Run the assistent in your language to see GTK's translation of the button labels.
+#. Run the assistant in your language to see GTK's translation of the button labels.
#: gnucash/gtkbuilder/assistant-qif-import.glade:66
-#, fuzzy
msgid ""
"Please select a file to load. When you click \"Next\", the file will be "
"loaded and analyzed. You may need to answer some questions about the "
@@ -13208,9 +13173,8 @@ msgstr "Kontobezeichnung:"
msgid "Set the default QIF account name"
msgstr "Den Namen des Standard QIF-Kontos setzen"
-#. Run the assistent in your language to see GTK's translation of the button labels.
+#. Run the assistant in your language to see GTK's translation of the button labels.
#: gnucash/gtkbuilder/assistant-qif-import.glade:454
-#, fuzzy
msgid ""
"Click \"Load another file\" if you have more data to import at this time. Do "
"this if you have saved your accounts to separate QIF files.\n"
@@ -13392,7 +13356,6 @@ msgid "Choose the QIF file currency and select Book Options"
msgstr "Bestimmen Sie die Währung der QIF-Datei und die Buch-Optionen"
#: gnucash/gtkbuilder/assistant-qif-import.glade:1006
-#, fuzzy
msgid ""
"Below you are asked to provide information about stocks, mutual funds, and "
"other investments that appear in the QIF file(s) you are importing. GnuCash "
@@ -13452,9 +13415,8 @@ msgstr "P_ause"
msgid "QIF Import"
msgstr "QIF-Import"
-#. Run the assistent in your language to see GTK's translation of the button labels.
+#. Run the assistant in your language to see GTK's translation of the button labels.
#: gnucash/gtkbuilder/assistant-qif-import.glade:1225
-#, fuzzy
msgid ""
"\n"
"If you are importing a QIF file from a bank or other financial institution, "
@@ -13612,7 +13574,6 @@ msgid "Stock Split Details"
msgstr "Aktienteilung Details"
#: gnucash/gtkbuilder/assistant-stock-split.glade:250
-#, fuzzy
msgid ""
"If you received a cash disbursement as a result of the stock split, enter "
"the details of that payment here. Otherwise, just click \"Next\"."
@@ -13647,7 +13608,6 @@ msgid "Cash in Lieu"
msgstr "Ausgleichsbetrag"
#: gnucash/gtkbuilder/assistant-stock-split.glade:414
-#, fuzzy
msgid ""
"If you are finished creating the stock split or merger, press \"Apply\". You "
"may also press \"Back\" to review your choices, or \"Cancel\" to quit "
@@ -13707,7 +13667,7 @@ msgid "<b>_Selected encodings</b>"
msgstr "<b>Gewählte _Zeichenkodierungen</b>"
#: gnucash/gtkbuilder/business-prefs.glade:26
-#: gnucash/report/business-reports/invoice.scm:907
+#: gnucash/report/business-reports/invoice.scm:913
#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1796
msgid "Printable Invoice"
msgstr "Druckbare Rechnung..."
@@ -13722,13 +13682,13 @@ msgid "Tax Invoice"
msgstr "Rechnung mit Steuerangaben"
#: gnucash/gtkbuilder/business-prefs.glade:32
-#: gnucash/report/business-reports/invoice.scm:916
+#: gnucash/report/business-reports/invoice.scm:922
#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1798
msgid "Easy Invoice"
msgstr "Einfache Rechnung"
#: gnucash/gtkbuilder/business-prefs.glade:35
-#: gnucash/report/business-reports/invoice.scm:925
+#: gnucash/report/business-reports/invoice.scm:931
#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1799
msgid "Fancy Invoice"
msgstr "Elegante Rechnung"
@@ -13961,8 +13921,7 @@ msgid "_Default"
msgstr "_Voreinstellung"
#: gnucash/gtkbuilder/dialog-account.glade:755
-#: gnucash/report/standard-reports/account-summary.scm:106
-#: gnucash/report/standard-reports/sx-summary.scm:85
+#: gnucash/report/standard-reports/account-summary.scm:117
msgid "Account Type"
msgstr "Kontoart"
@@ -14133,8 +14092,8 @@ msgstr "<b>Ha_uptkonto</b>"
#: gnucash/report/standard-reports/equity-statement.scm:108
#: gnucash/report/standard-reports/equity-statement.scm:112
#: gnucash/report/standard-reports/register.scm:375
-#: gnucash/report/standard-reports/trial-balance.scm:187
-#: gnucash/report/standard-reports/trial-balance.scm:191
+#: gnucash/report/standard-reports/trial-balance.scm:186
+#: gnucash/report/standard-reports/trial-balance.scm:190
#: gnucash/report/stylesheets/stylesheet-easy.scm:46
#: gnucash/report/stylesheets/stylesheet-easy.scm:52
#: gnucash/report/stylesheets/stylesheet-easy.scm:58
@@ -18147,9 +18106,8 @@ msgid "Add"
msgstr "Hinzufügen"
#: gnucash/gtkbuilder/gnc-plugin-page-budget.glade:163
-#, fuzzy
msgid "Add 'value' to current budget for each period"
-msgstr "Bearbeite das Budget für alle Perioden"
+msgstr "Den »Wert« hinzufügen in allen Perioden im aktuellen Budget"
#: gnucash/gtkbuilder/gnc-plugin-page-budget.glade:176
msgid "Multiply"
@@ -18611,7 +18569,7 @@ msgid ""
"settings name and press the Save Settings button. Note you can't save to "
"built-in presets.\n"
"\n"
-"This operation is not reversable, so make sure you have a working backup.\n"
+"This operation is not reversible, so make sure you have a working backup.\n"
"\n"
"Click on \"Next\" to proceed or \"Cancel\" to Abort Import."
msgstr ""
@@ -19234,18 +19192,18 @@ msgstr ""
"\n"
"Wollen Sie den Auftrag erneut abschicken?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:443
+#: gnucash/import-export/aqb/gnc-ab-utils.c:455
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:90
msgid "Unspecified"
msgstr "Nicht spezifiziert"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:494
+#: gnucash/import-export/aqb/gnc-ab-utils.c:506
#: gnucash/report/report-system/report-utilities.scm:108
#: libgnucash/engine/Account.cpp:4091
msgid "Bank"
msgstr "Bank"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:758
+#: gnucash/import-export/aqb/gnc-ab-utils.c:770
msgid ""
"The backend found an error during the preparation of the job. It is not "
"possible to execute this job. \n"
@@ -19265,7 +19223,7 @@ msgstr ""
"\n"
"Wollen Sie den Auftrag erneut eingeben?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:872
+#: gnucash/import-export/aqb/gnc-ab-utils.c:884
msgid ""
"The bank has sent transaction information in its response.\n"
"Do you want to import it?"
@@ -19273,7 +19231,7 @@ msgstr ""
"Der Bank-Server hat Kontoumsätze (Buchungen) in der Antwort mitgeschickt. \n"
"Wollen Sie diese jetzt importieren?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:899
+#: gnucash/import-export/aqb/gnc-ab-utils.c:911
msgid ""
"No Online Banking account found for this gnucash account. These transactions "
"will not be executed by Online Banking."
@@ -19282,7 +19240,7 @@ msgstr ""
"zugeordnet ist. Die Buchungen werden nicht als Online-Banking Aufträge "
"abgeschickt."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1001
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1013
msgid ""
"The bank has sent balance information in its response.\n"
"Do you want to import it?"
@@ -19297,7 +19255,7 @@ msgstr ""
#. * (Switzerland). If none of these techniques are available
#. * in your country, you may safely ignore strings from the
#. * import-export/hbci subdirectory.
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1103
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1115
msgid ""
"The downloaded Online Banking Balance was zero.\n"
"\n"
@@ -19314,7 +19272,7 @@ msgstr ""
"können Sie im Onlinebanking-Einrichtungs-Assistent eine höhere HBCI-Version "
"auswählen. Versuchen Sie anschließend erneut, den Saldo abzufragen."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1120
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1132
#, c-format
msgid ""
"Result of Online Banking job: \n"
@@ -19323,14 +19281,14 @@ msgstr ""
"Ergebnis der Saldenabfrage: \n"
"Gebuchter Saldo des Kontos ist %s"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1126
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1138
#, c-format
msgid "For your information: This account also has a noted balance of %s\n"
msgstr ""
"Zu Ihrer Information: Dieses Konto hat außerdem folgenden Saldo an zur "
"Ausführung vorgemerkten Aufträgen %s\n"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1133
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1145
msgid ""
"The booked balance is identical to the current reconciled balance of the "
"account."
@@ -19338,15 +19296,15 @@ msgstr ""
"Dieser gebuchte Saldo stimmt mit dem aktuellen abgeglichenen Saldo Ihres "
"Kontos überein."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1148
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1160
msgid "Reconcile account now?"
msgstr "Konto jetzt abgleichen?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1235
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1247
msgid "The bank has sent a message in its response."
msgstr "Die Bank hat eine Nachricht in ihrer Antwort mitgeschickt"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1236
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1248
msgid "Subject:"
msgstr "Betreff:"
@@ -19689,7 +19647,7 @@ msgstr "Eröffnungsdatum"
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:142
#, fuzzy
msgid "Owner-ID"
-msgstr "Mandanten"
+msgstr ""
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:143
#, fuzzy
@@ -19814,7 +19772,7 @@ msgstr "Importiert Kunden- oder Lieferantenrechnungen aus CSV-Datei."
#. Translators: %s is the file name string.
#: gnucash/import-export/csv-exp/assistant-csv-export.c:82
-#, fuzzy, c-format
+#, c-format
msgid ""
"The account tree will be exported to the file '%s' when you click \"Apply"
"\".\n"
@@ -19830,7 +19788,7 @@ msgstr ""
#. Translators: %s is the file name string and %u the number of accounts.
#: gnucash/import-export/csv-exp/assistant-csv-export.c:87
-#, fuzzy, c-format
+#, c-format
msgid ""
"When you click \"Apply\", the transactions will be exported to the file '%s' "
"and the number of accounts exported will be %u.\n"
@@ -19846,7 +19804,7 @@ msgstr ""
#. Translators: %s is the file name string.
#: gnucash/import-export/csv-exp/assistant-csv-export.c:93
-#, fuzzy, c-format
+#, c-format
msgid ""
"When you click \"Apply\", the transactions will be exported to the file "
"'%s'.\n"
@@ -19861,7 +19819,6 @@ msgstr ""
"Sie »Zurück« klicken. Mit »Abbrechen« können Sie den Export abbrechen.\n"
#: gnucash/import-export/csv-exp/assistant-csv-export.c:97
-#, fuzzy
msgid ""
"This assistant will help you export the Account Tree to a file\n"
" with the separator specified below.\n"
@@ -19876,7 +19833,6 @@ msgstr ""
"»Abbrechen« können Sie den Export abbrechen.\n"
#: gnucash/import-export/csv-exp/assistant-csv-export.c:103
-#, fuzzy
msgid ""
"This assistant will help you export the Transactions to a file\n"
" with the separator specified below.\n"
@@ -21156,8 +21112,8 @@ msgstr "Kapitalertrag (kurzfristig)"
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:73
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:77
#: gnucash/report/business-reports/balsheet-eg.eguile.scm:195
-#: gnucash/report/standard-reports/balance-sheet.scm:668
-#: gnucash/report/standard-reports/balsheet-pnl.scm:1062
+#: gnucash/report/standard-reports/balance-sheet.scm:515
+#: gnucash/report/standard-reports/balsheet-pnl.scm:1060
#: libgnucash/app-utils/gnc-ui-util.c:955
msgid "Retained Earnings"
msgstr "Erwirtschafteter Gewinn"
@@ -21475,7 +21431,9 @@ msgstr "+%"
#: gnucash/register/ledger-core/split-register-layout.c:731
msgctxt "sample"
msgid "Expenses:Automobile:Gasoline"
-msgstr "Aufwendungen 2/4:Reparatur/Instandhaltung:4805 Reparatur u. Instandh. von Anlagen/Maschinen u. Betriebs- u. Geschäftsausst."
+msgstr ""
+"Aufwendungen 2/4:Reparatur/Instandhaltung:4805 Reparatur u. Instandh. von "
+"Anlagen/Maschinen u. Betriebs- u. Geschäftsausst."
#. Translators: Abbreviation sample for Taxable?
#: gnucash/register/ledger-core/gncEntryLedgerLayout.c:132
@@ -21584,7 +21542,7 @@ msgstr "Zwischensumme"
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:122
#: gnucash/report/business-reports/invoice.scm:565
#: gnucash/report/business-reports/owner-report.scm:58
-#: libgnucash/tax/us/de_DE.scm:52
+#: libgnucash/app-utils/app-utils.scm:303
msgid "Tax"
msgstr "Steuern"
@@ -22064,11 +22022,11 @@ msgstr "Sortierreihenfolge"
#: gnucash/report/business-reports/balsheet-eg.scm:228
#: gnucash/report/report-system/trep-engine.scm:81
#: gnucash/report/standard-reports/account-piecharts.scm:66
-#: gnucash/report/standard-reports/account-summary.scm:114
+#: gnucash/report/standard-reports/account-summary.scm:125
#: gnucash/report/standard-reports/advanced-portfolio.scm:75
#: gnucash/report/standard-reports/average-balance.scm:41
#: gnucash/report/standard-reports/balance-forecast.scm:44
-#: gnucash/report/standard-reports/balance-sheet.scm:138
+#: gnucash/report/standard-reports/balance-sheet.scm:137
#: gnucash/report/standard-reports/balsheet-pnl.scm:111
#: gnucash/report/standard-reports/budget-balance-sheet.scm:103
#: gnucash/report/standard-reports/budget-flow.scm:46
@@ -22082,19 +22040,18 @@ msgstr "Sortierreihenfolge"
#: gnucash/report/standard-reports/net-charts.scm:43
#: gnucash/report/standard-reports/portfolio.scm:54
#: gnucash/report/standard-reports/price-scatter.scm:40
-#: gnucash/report/standard-reports/sx-summary.scm:93
-#: gnucash/report/standard-reports/trial-balance.scm:129
+#: gnucash/report/standard-reports/trial-balance.scm:130
msgid "Report's currency"
msgstr "Währung des Berichts"
#: gnucash/report/business-reports/aging.scm:42
#: gnucash/report/business-reports/balsheet-eg.scm:229
#: gnucash/report/standard-reports/account-piecharts.scm:67
-#: gnucash/report/standard-reports/account-summary.scm:115
+#: gnucash/report/standard-reports/account-summary.scm:126
#: gnucash/report/standard-reports/advanced-portfolio.scm:39
#: gnucash/report/standard-reports/average-balance.scm:42
#: gnucash/report/standard-reports/balance-forecast.scm:45
-#: gnucash/report/standard-reports/balance-sheet.scm:139
+#: gnucash/report/standard-reports/balance-sheet.scm:138
#: gnucash/report/standard-reports/balsheet-pnl.scm:113
#: gnucash/report/standard-reports/budget-balance-sheet.scm:104
#: gnucash/report/standard-reports/budget-flow.scm:43
@@ -22108,8 +22065,7 @@ msgstr "Währung des Berichts"
#: gnucash/report/standard-reports/net-charts.scm:44
#: gnucash/report/standard-reports/portfolio.scm:35
#: gnucash/report/standard-reports/price-scatter.scm:42
-#: gnucash/report/standard-reports/sx-summary.scm:94
-#: gnucash/report/standard-reports/trial-balance.scm:130
+#: gnucash/report/standard-reports/trial-balance.scm:131
msgid "Price Source"
msgstr "Preisberechnungsquelle"
@@ -22337,7 +22293,7 @@ msgid "Trading Accounts"
msgstr "Devisenhandel-Konten"
#: gnucash/report/business-reports/balsheet-eg.eguile.scm:194
-#: gnucash/report/standard-reports/balance-sheet.scm:669
+#: gnucash/report/standard-reports/balance-sheet.scm:516
msgid "Retained Losses"
msgstr "Erwirtschafteter Verlust"
@@ -22362,26 +22318,24 @@ msgstr "Bilanz (mit »eguile«)"
#. define all option's names and help text so that they are properly
#. defined in *one* place.
#: gnucash/report/business-reports/balsheet-eg.scm:190
-#: gnucash/report/standard-reports/account-summary.scm:66
+#: gnucash/report/standard-reports/account-summary.scm:72
#: gnucash/report/standard-reports/balance-sheet.scm:76
#: gnucash/report/standard-reports/budget-balance-sheet.scm:42
#: gnucash/report/standard-reports/budget-income-statement.scm:52
#: gnucash/report/standard-reports/equity-statement.scm:59
#: gnucash/report/standard-reports/income-statement.scm:53
-#: gnucash/report/standard-reports/sx-summary.scm:45
-#: gnucash/report/standard-reports/trial-balance.scm:64
+#: gnucash/report/standard-reports/trial-balance.scm:65
msgid "Report Title"
msgstr "Berichtstitel"
#: gnucash/report/business-reports/balsheet-eg.scm:191
-#: gnucash/report/standard-reports/account-summary.scm:67
+#: gnucash/report/standard-reports/account-summary.scm:73
#: gnucash/report/standard-reports/balance-sheet.scm:77
#: gnucash/report/standard-reports/budget-balance-sheet.scm:43
#: gnucash/report/standard-reports/budget-income-statement.scm:53
#: gnucash/report/standard-reports/equity-statement.scm:60
#: gnucash/report/standard-reports/income-statement.scm:54
-#: gnucash/report/standard-reports/sx-summary.scm:46
-#: gnucash/report/standard-reports/trial-balance.scm:65
+#: gnucash/report/standard-reports/trial-balance.scm:66
msgid "Title for this report."
msgstr "Der Titel des Berichts."
@@ -22403,33 +22357,31 @@ msgstr ""
"bedeutet, daß das Layout an die Breite der Seite angepaßt wird."
#: gnucash/report/business-reports/balsheet-eg.scm:198
-#: gnucash/report/standard-reports/account-summary.scm:78
-#: gnucash/report/standard-reports/balance-sheet.scm:91
+#: gnucash/report/standard-reports/account-summary.scm:88
+#: gnucash/report/standard-reports/balance-sheet.scm:90
#: gnucash/report/standard-reports/balsheet-pnl.scm:67
#: gnucash/report/standard-reports/budget-balance-sheet.scm:56
#: gnucash/report/standard-reports/budget-barchart.scm:49
#: gnucash/report/standard-reports/budget-income-statement.scm:79
#: gnucash/report/standard-reports/income-statement.scm:66
-#: gnucash/report/standard-reports/sx-summary.scm:57
-#: gnucash/report/standard-reports/trial-balance.scm:79
+#: gnucash/report/standard-reports/trial-balance.scm:80
msgid "Levels of Subaccounts"
msgstr "Verschachtelungstiefe Unterkonten"
#: gnucash/report/business-reports/balsheet-eg.scm:199
-#: gnucash/report/standard-reports/account-summary.scm:80
-#: gnucash/report/standard-reports/balance-sheet.scm:93
+#: gnucash/report/standard-reports/account-summary.scm:90
+#: gnucash/report/standard-reports/balance-sheet.scm:92
#: gnucash/report/standard-reports/balsheet-pnl.scm:68
#: gnucash/report/standard-reports/budget-balance-sheet.scm:58
#: gnucash/report/standard-reports/budget-barchart.scm:51
#: gnucash/report/standard-reports/budget-income-statement.scm:81
#: gnucash/report/standard-reports/income-statement.scm:68
-#: gnucash/report/standard-reports/sx-summary.scm:59
-#: gnucash/report/standard-reports/trial-balance.scm:81
+#: gnucash/report/standard-reports/trial-balance.scm:82
msgid "Maximum number of levels in the account tree displayed."
msgstr "Die maximale Verschachtelungstiefe in der Kontenhierarchie."
#: gnucash/report/business-reports/balsheet-eg.scm:200
-#: gnucash/report/standard-reports/balance-sheet.scm:94
+#: gnucash/report/standard-reports/balance-sheet.scm:93
#: gnucash/report/standard-reports/budget-balance-sheet.scm:59
#: gnucash/report/standard-reports/budget-income-statement.scm:82
#: gnucash/report/standard-reports/budget.scm:90
@@ -22438,7 +22390,7 @@ msgid "Flatten list to depth limit"
msgstr "Baumstruktur ab Tiefenlimit flach darstellen"
#: gnucash/report/business-reports/balsheet-eg.scm:202
-#: gnucash/report/standard-reports/balance-sheet.scm:96
+#: gnucash/report/standard-reports/balance-sheet.scm:95
#: gnucash/report/standard-reports/budget-balance-sheet.scm:61
#: gnucash/report/standard-reports/budget-income-statement.scm:84
#: gnucash/report/standard-reports/budget.scm:92
@@ -22461,26 +22413,24 @@ msgstr ""
"mit einem Kontostand ungleich Null, aus."
#: gnucash/report/business-reports/balsheet-eg.scm:208
-#: gnucash/report/standard-reports/account-summary.scm:99
-#: gnucash/report/standard-reports/balance-sheet.scm:112
+#: gnucash/report/standard-reports/account-summary.scm:109
+#: gnucash/report/standard-reports/balance-sheet.scm:111
#: gnucash/report/standard-reports/balsheet-pnl.scm:82
#: gnucash/report/standard-reports/budget-balance-sheet.scm:77
#: gnucash/report/standard-reports/budget-income-statement.scm:100
#: gnucash/report/standard-reports/income-statement.scm:87
-#: gnucash/report/standard-reports/sx-summary.scm:78
-#: gnucash/report/standard-reports/trial-balance.scm:125
+#: gnucash/report/standard-reports/trial-balance.scm:126
msgid "Display accounts as hyperlinks"
msgstr "Kontonamen anklickbar anzeigen"
#: gnucash/report/business-reports/balsheet-eg.scm:209
-#: gnucash/report/standard-reports/account-summary.scm:100
-#: gnucash/report/standard-reports/balance-sheet.scm:113
+#: gnucash/report/standard-reports/account-summary.scm:111
+#: gnucash/report/standard-reports/balance-sheet.scm:112
#: gnucash/report/standard-reports/balsheet-pnl.scm:83
#: gnucash/report/standard-reports/budget-balance-sheet.scm:78
#: gnucash/report/standard-reports/budget-income-statement.scm:101
#: gnucash/report/standard-reports/income-statement.scm:88
-#: gnucash/report/standard-reports/sx-summary.scm:79
-#: gnucash/report/standard-reports/trial-balance.scm:126
+#: gnucash/report/standard-reports/trial-balance.scm:127
msgid "Shows each account in the table as a hyperlink to its register window."
msgstr ""
"Zeige Konten als Hyperlinks an, die beim Anklicken das jeweilige "
@@ -22555,40 +22505,37 @@ msgid "Notes added at end of invoice -- may contain HTML markup."
msgstr "Zusätzlicher Text am Ende der Rechnung ─ darf HTML-Elemente enthalten."
#: gnucash/report/business-reports/balsheet-eg.scm:230
-#: gnucash/report/standard-reports/account-summary.scm:116
-#: gnucash/report/standard-reports/balance-sheet.scm:140
+#: gnucash/report/standard-reports/account-summary.scm:127
+#: gnucash/report/standard-reports/balance-sheet.scm:139
#: gnucash/report/standard-reports/budget-balance-sheet.scm:105
#: gnucash/report/standard-reports/budget-income-statement.scm:119
#: gnucash/report/standard-reports/equity-statement.scm:79
#: gnucash/report/standard-reports/income-statement.scm:112
-#: gnucash/report/standard-reports/sx-summary.scm:95
-#: gnucash/report/standard-reports/trial-balance.scm:131
+#: gnucash/report/standard-reports/trial-balance.scm:132
msgid "Show Foreign Currencies"
msgstr "Fremdwährungen anzeigen"
#: gnucash/report/business-reports/balsheet-eg.scm:232
-#: gnucash/report/standard-reports/account-summary.scm:118
-#: gnucash/report/standard-reports/balance-sheet.scm:142
+#: gnucash/report/standard-reports/account-summary.scm:129
+#: gnucash/report/standard-reports/balance-sheet.scm:141
#: gnucash/report/standard-reports/budget-balance-sheet.scm:107
#: gnucash/report/standard-reports/budget-income-statement.scm:121
#: gnucash/report/standard-reports/equity-statement.scm:81
#: gnucash/report/standard-reports/income-statement.scm:114
-#: gnucash/report/standard-reports/sx-summary.scm:97
-#: gnucash/report/standard-reports/trial-balance.scm:133
+#: gnucash/report/standard-reports/trial-balance.scm:134
msgid "Display any foreign currency amount in an account."
msgstr "Fremdwährungen in Konten anzeigen."
#. commodities
#: gnucash/report/business-reports/balsheet-eg.scm:235
-#: gnucash/report/standard-reports/account-summary.scm:113
-#: gnucash/report/standard-reports/balance-sheet.scm:137
+#: gnucash/report/standard-reports/account-summary.scm:124
+#: gnucash/report/standard-reports/balance-sheet.scm:136
#: gnucash/report/standard-reports/balsheet-pnl.scm:104
#: gnucash/report/standard-reports/budget-balance-sheet.scm:102
#: gnucash/report/standard-reports/budget-income-statement.scm:116
#: gnucash/report/standard-reports/equity-statement.scm:76
#: gnucash/report/standard-reports/income-statement.scm:109
-#: gnucash/report/standard-reports/sx-summary.scm:92
-#: gnucash/report/standard-reports/trial-balance.scm:128
+#: gnucash/report/standard-reports/trial-balance.scm:129
msgid "Commodities"
msgstr "Währungen/Wertpapiere"
@@ -22781,7 +22728,7 @@ msgid "Sort alphabetically by customer name."
msgstr "Alphabetisch nach Kundennamen sortieren."
#: gnucash/report/business-reports/customer-summary.scm:130
-#: gnucash/report/business-reports/customer-summary.scm:339
+#: gnucash/report/business-reports/customer-summary.scm:334
#: gnucash/report/standard-reports/average-balance.scm:128
#: gnucash/report/standard-reports/average-balance.scm:149
msgid "Profit"
@@ -22793,7 +22740,7 @@ msgstr "Sortieren nach dem Betrag des Gewinns."
#. Translators: "Markup" is profit amount divided by sales amount
#: gnucash/report/business-reports/customer-summary.scm:134
-#: gnucash/report/business-reports/customer-summary.scm:340
+#: gnucash/report/business-reports/customer-summary.scm:335
msgid "Markup"
msgstr "Gewinn/Umsatz"
@@ -22802,7 +22749,7 @@ msgid "Sort by markup (which is profit amount divided by sales)."
msgstr "Sortieren nach Bruttogewinn (Gewinn pro Umsatz)."
#: gnucash/report/business-reports/customer-summary.scm:137
-#: gnucash/report/business-reports/customer-summary.scm:341
+#: gnucash/report/business-reports/customer-summary.scm:336
msgid "Sales"
msgstr "Umsatz"
@@ -22822,28 +22769,28 @@ msgstr "Von A bis Z, von klein nach groß."
msgid "Z to A, largest to smallest."
msgstr "Von Z bis A, von groß nach klein."
-#: gnucash/report/business-reports/customer-summary.scm:308
+#: gnucash/report/business-reports/customer-summary.scm:303
#: gnucash/report/business-reports/owner-report.scm:757
#: gnucash/report/report-gnome/dialog-report-column-view.c:412
msgid "Report"
msgstr "Bericht"
# Todo: Bedeutung?
-#: gnucash/report/business-reports/customer-summary.scm:311
+#: gnucash/report/business-reports/customer-summary.scm:306
#, scheme-format
msgid "~a ~a - ~a"
msgstr "~a ~a - ~a"
-#: gnucash/report/business-reports/customer-summary.scm:331
+#: gnucash/report/business-reports/customer-summary.scm:326
msgid "No valid customer found."
msgstr "Kein passender Kunde gefunden."
-#: gnucash/report/business-reports/customer-summary.scm:418
+#: gnucash/report/business-reports/customer-summary.scm:414
msgid "No Customer"
msgstr "Kein Kunde"
# Fixme: Source Accelerator missing
-#: gnucash/report/business-reports/customer-summary.scm:529
+#: gnucash/report/business-reports/customer-summary.scm:526
msgid "Customer Summary"
msgstr "Kundenüber_sicht"
@@ -23221,7 +23168,7 @@ msgstr "Auftragsbezeichnung:"
msgid "REF"
msgstr "Referenz"
-#: gnucash/report/business-reports/invoice.scm:782
+#: gnucash/report/business-reports/invoice.scm:788
msgid ""
"No valid invoice selected. Click on the Options button and select the "
"invoice to use."
@@ -23232,7 +23179,7 @@ msgstr ""
#. Translators: This is the format of the invoice title.
#. The first ~a is "Invoice", "Credit Note"... and the second the number.
#. Replace " #" by whatever is common as number abbreviation, i.e. "~a Nr. ~a"
-#: gnucash/report/business-reports/invoice.scm:804
+#: gnucash/report/business-reports/invoice.scm:810
#, scheme-format
msgid "~a #~a"
msgstr "~a Nr. ~a"
@@ -24058,36 +24005,36 @@ msgstr ""
"zugewiesen worden. Normalerweise dürfen sich nur die TXF Codes für "
"Zahlungspflichtige wiederholen."
-#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:851
+#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:842
#, scheme-format
msgid "Period from ~a to ~a"
msgstr "Zeitraum von ~a bis ~a"
-#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:888
+#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:879
msgid "Tax Report & XML Export"
msgstr "Steuer-Bericht & Elster Export"
#. 'menu-path (list gnc:menuname-taxes)
-#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:890
+#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:881
msgid "Taxable Income / Deductible Expenses / Export to .XML file"
msgstr ""
"Besteuerte Erträge / Absetzbare Aufwendungen / Exportieren nach Elster-XML"
+#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:885
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:894
-#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:903
msgid "Taxable Income / Deductible Expenses"
msgstr "Besteuerte Erträge / Absetzbare Aufwendungen"
-#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:895
+#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:886
msgid "This report shows your Taxable Income and Deductible Expenses."
msgstr ""
"Diese Seite zeigt Ihnen zu versteuernde Erträge und absetzbare Aufwendungen."
-#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:900
+#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:891
msgid "XML"
msgstr "XML für Elster"
-#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:904
+#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:895
msgid "This page shows your Taxable Income and Deductible Expenses."
msgstr ""
"Diese Seite zeigt Ihnen zu versteuernde Erträge und absetzbare Aufwendungen."
@@ -24461,23 +24408,23 @@ msgstr "Mit diesem Dialog können Sie die Berichtsoptionen bearbeiten."
msgid "There are no options for this report."
msgstr "Es gibt für diesen Bericht keine Optionen."
-#: gnucash/report/report-gnome/window-report.c:279
+#: gnucash/report/report-gnome/window-report.c:282
#: gnucash/report/utility-reports/view-column.scm:142
msgid "Report error"
msgstr "Fehler im Bericht"
-#: gnucash/report/report-gnome/window-report.c:280
+#: gnucash/report/report-gnome/window-report.c:283
#: gnucash/report/utility-reports/view-column.scm:143
msgid "An error occurred while running the report."
msgstr "Beim Erstellen des Berichts ist ein Fehler aufgetreten."
-#: gnucash/report/report-gnome/window-report.c:312
-#: gnucash/report/report-gnome/window-report.c:334
+#: gnucash/report/report-gnome/window-report.c:318
+#: gnucash/report/report-gnome/window-report.c:340
#, c-format
msgid "Badly formed options URL: %s"
msgstr "Fehlerhafte Optionen-URL: %s"
-#: gnucash/report/report-gnome/window-report.c:322
+#: gnucash/report/report-gnome/window-report.c:328
#, c-format
msgid "Badly-formed report id: %s"
msgstr "Fehlerhafte Berichts ID: %s"
@@ -24491,8 +24438,8 @@ msgstr "Fehler aufgetreten beim Verarbeiten der Vorlage:"
msgid "Template file \"~a\" can not be read"
msgstr "Die Vorlagen-Datei »~a« konnte nicht gelesen werden."
-#: gnucash/report/report-system/html-acct-table.scm:621
-#: gnucash/report/standard-reports/trial-balance.scm:283
+#: gnucash/report/report-system/html-acct-table.scm:606
+#: gnucash/report/standard-reports/trial-balance.scm:280
msgid "Adjusting Entries"
msgstr "Anpassungsbuchungen"
@@ -24758,13 +24705,12 @@ msgstr ""
"Markierung in der Kontenauswahl?"
#: gnucash/report/report-system/options-utilities.scm:117
-#: gnucash/report/standard-reports/account-summary.scm:77
-#: gnucash/report/standard-reports/balance-sheet.scm:90
+#: gnucash/report/standard-reports/account-summary.scm:87
+#: gnucash/report/standard-reports/balance-sheet.scm:89
#: gnucash/report/standard-reports/balsheet-pnl.scm:65
#: gnucash/report/standard-reports/budget-balance-sheet.scm:55
#: gnucash/report/standard-reports/budget-income-statement.scm:78
#: gnucash/report/standard-reports/income-statement.scm:65
-#: gnucash/report/standard-reports/sx-summary.scm:56
msgid "Report on these accounts, if display depth allows."
msgstr ""
"Bericht für diese Konten erstellen, solange die Verschachtelungstiefe "
@@ -24929,8 +24875,7 @@ msgid "How to show the balances of parent accounts."
msgstr "Bestimmt die Anzeige der Salden von Konten mit Unterkonten."
#: gnucash/report/report-system/options-utilities.scm:266
-#: gnucash/report/standard-reports/account-summary.scm:102
-#: gnucash/report/standard-reports/sx-summary.scm:81
+#: gnucash/report/standard-reports/account-summary.scm:113
msgid "Account Balance"
msgstr "Kontosaldo"
@@ -25080,19 +25025,19 @@ msgstr "Stilvorlage."
#: gnucash/report/report-system/report-utilities.scm:111
#: gnucash/report/standard-reports/account-piecharts.scm:60
-#: gnucash/report/standard-reports/balance-sheet.scm:633
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:753
-#: gnucash/report/standard-reports/net-charts.scm:408
-#: gnucash/report/standard-reports/net-charts.scm:488
+#: gnucash/report/standard-reports/balance-sheet.scm:491
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:687
+#: gnucash/report/standard-reports/net-charts.scm:402
+#: gnucash/report/standard-reports/net-charts.scm:482
msgid "Assets"
msgstr "Aktiva"
#: gnucash/report/report-system/report-utilities.scm:112
#: gnucash/report/standard-reports/account-piecharts.scm:62
-#: gnucash/report/standard-reports/balance-sheet.scm:434
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:783
-#: gnucash/report/standard-reports/net-charts.scm:408
-#: gnucash/report/standard-reports/net-charts.scm:488
+#: gnucash/report/standard-reports/balance-sheet.scm:388
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:717
+#: gnucash/report/standard-reports/net-charts.scm:402
+#: gnucash/report/standard-reports/net-charts.scm:482
msgid "Liabilities"
msgstr "Verbindlichkeit"
@@ -25136,12 +25081,12 @@ msgstr "Verbindlichkeiten Konten"
msgid "Credit Lines"
msgstr "Kreditrahmen"
-#: gnucash/report/report-system/report-utilities.scm:687
+#: gnucash/report/report-system/report-utilities.scm:706
#, scheme-format
msgid "Building '~a' report ..."
msgstr "Bericht »~a« berechnen..."
-#: gnucash/report/report-system/report-utilities.scm:693
+#: gnucash/report/report-system/report-utilities.scm:712
#, scheme-format
msgid "Rendering '~a' report ..."
msgstr "Bericht »~a« darstellen..."
@@ -25237,6 +25182,7 @@ msgid "Secondary Subtotal for Date Key"
msgstr "Sekundäre Zwischensumme für Datumsschlüssel"
#. General
+#. fsts:
#. define all option's names and help text so that they are properly
#. General
#. define all option's names so that they are properly defined
@@ -25244,6 +25190,7 @@ msgstr "Sekundäre Zwischensumme für Datumsschlüssel"
#. Option names
#: gnucash/report/report-system/trep-engine.scm:76
#: gnucash/report/standard-reports/account-piecharts.scm:64
+#: gnucash/report/standard-reports/account-summary.scm:79
#: gnucash/report/standard-reports/average-balance.scm:38
#: gnucash/report/standard-reports/balance-forecast.scm:40
#: gnucash/report/standard-reports/balsheet-pnl.scm:45
@@ -25256,12 +25203,12 @@ msgstr "Sekundäre Zwischensumme für Datumsschlüssel"
#: gnucash/report/standard-reports/income-statement.scm:59
#: gnucash/report/standard-reports/net-charts.scm:40
#: gnucash/report/standard-reports/price-scatter.scm:35
-#: gnucash/report/standard-reports/sx-summary.scm:51
msgid "Start Date"
msgstr "Anfangsdatum"
#: gnucash/report/report-system/trep-engine.scm:77
#: gnucash/report/standard-reports/account-piecharts.scm:65
+#: gnucash/report/standard-reports/account-summary.scm:80
#: gnucash/report/standard-reports/average-balance.scm:39
#: gnucash/report/standard-reports/balance-forecast.scm:41
#: gnucash/report/standard-reports/balsheet-pnl.scm:46
@@ -25274,7 +25221,6 @@ msgstr "Anfangsdatum"
#: gnucash/report/standard-reports/income-statement.scm:60
#: gnucash/report/standard-reports/net-charts.scm:41
#: gnucash/report/standard-reports/price-scatter.scm:36
-#: gnucash/report/standard-reports/sx-summary.scm:52
msgid "End Date"
msgstr "Enddatum"
@@ -25694,7 +25640,7 @@ msgstr ""
#: gnucash/report/standard-reports/budget-flow.scm:88
#: gnucash/report/standard-reports/cashflow-barchart.scm:88
#: gnucash/report/standard-reports/income-gst-statement.scm:86
-#: gnucash/report/standard-reports/trial-balance.scm:78
+#: gnucash/report/standard-reports/trial-balance.scm:79
msgid "Report on these accounts."
msgstr "Den Buchungsbericht für diese Konten erstellen."
@@ -25977,7 +25923,7 @@ msgstr "Mehrteilige Buchung"
#: gnucash/report/report-system/trep-engine.scm:1591
#: gnucash/report/report-system/trep-engine.scm:1864
-#: gnucash/report/standard-reports/category-barchart.scm:743
+#: gnucash/report/standard-reports/category-barchart.scm:737
msgid "Grand Total"
msgstr "Gesamtbetrag"
@@ -26189,14 +26135,14 @@ msgstr "Durchschnitt pro Woche"
#: gnucash/report/standard-reports/account-piecharts.scm:565
#: gnucash/report/standard-reports/balance-forecast.scm:259
-#: gnucash/report/standard-reports/balsheet-pnl.scm:883
-#: gnucash/report/standard-reports/budget.scm:455
+#: gnucash/report/standard-reports/balsheet-pnl.scm:887
+#: gnucash/report/standard-reports/budget.scm:445
#: gnucash/report/standard-reports/cashflow-barchart.scm:294
#: gnucash/report/standard-reports/cash-flow.scm:191
-#: gnucash/report/standard-reports/category-barchart.scm:535
-#: gnucash/report/standard-reports/category-barchart.scm:561
+#: gnucash/report/standard-reports/category-barchart.scm:529
+#: gnucash/report/standard-reports/category-barchart.scm:555
#: gnucash/report/standard-reports/daily-reports.scm:291
-#: gnucash/report/standard-reports/net-charts.scm:369
+#: gnucash/report/standard-reports/net-charts.scm:363
#: gnucash/report/standard-reports/price-scatter.scm:202
#: libgnucash/app-utils/date-utilities.scm:90
#, scheme-format
@@ -26211,57 +26157,55 @@ msgstr "Saldo am ~a"
#. account summary report prints a table of account information,
#. optionally with clickable links to open the corresponding register
#. window.
-#: gnucash/report/standard-reports/account-summary.scm:64
+#: gnucash/report/standard-reports/account-summary.scm:69
msgid "Account Summary"
msgstr "Kontenübersicht"
-#: gnucash/report/standard-reports/account-summary.scm:69
+#: gnucash/report/standard-reports/account-summary.scm:70
+msgid "Future Scheduled Transactions Summary"
+msgstr "Zukünftige Terminierte Buchungen"
+
+#: gnucash/report/standard-reports/account-summary.scm:75
#: gnucash/report/standard-reports/balance-sheet.scm:79
#: gnucash/report/standard-reports/budget-balance-sheet.scm:45
#: gnucash/report/standard-reports/budget-income-statement.scm:55
#: gnucash/report/standard-reports/equity-statement.scm:62
#: gnucash/report/standard-reports/income-statement.scm:56
-#: gnucash/report/standard-reports/sx-summary.scm:48
-#: gnucash/report/standard-reports/trial-balance.scm:67
+#: gnucash/report/standard-reports/trial-balance.scm:68
msgid "Company name"
msgstr "Firmenname"
-#: gnucash/report/standard-reports/account-summary.scm:70
+#: gnucash/report/standard-reports/account-summary.scm:76
#: gnucash/report/standard-reports/balance-sheet.scm:80
#: gnucash/report/standard-reports/budget-balance-sheet.scm:46
#: gnucash/report/standard-reports/budget-income-statement.scm:56
#: gnucash/report/standard-reports/equity-statement.scm:63
#: gnucash/report/standard-reports/income-statement.scm:57
-#: gnucash/report/standard-reports/sx-summary.scm:49
-#: gnucash/report/standard-reports/trial-balance.scm:68
+#: gnucash/report/standard-reports/trial-balance.scm:69
msgid "Name of company/individual."
msgstr "Name der Organisation oder Person."
-#: gnucash/report/standard-reports/account-summary.scm:81
-#: gnucash/report/standard-reports/sx-summary.scm:60
+#: gnucash/report/standard-reports/account-summary.scm:91
msgid "Depth limit behavior"
msgstr "Tiefenlimit Verwendung"
-#: gnucash/report/standard-reports/account-summary.scm:83
-#: gnucash/report/standard-reports/sx-summary.scm:62
+#: gnucash/report/standard-reports/account-summary.scm:93
msgid "How to treat accounts which exceed the specified depth limit (if any)."
msgstr "Bestimmt, wie Konten unter dem Tiefenlimit behandelt werden soll."
-#: gnucash/report/standard-reports/account-summary.scm:85
-#: gnucash/report/standard-reports/balance-sheet.scm:98
+#: gnucash/report/standard-reports/account-summary.scm:95
+#: gnucash/report/standard-reports/balance-sheet.scm:97
#: gnucash/report/standard-reports/budget-balance-sheet.scm:63
#: gnucash/report/standard-reports/budget-income-statement.scm:86
#: gnucash/report/standard-reports/income-statement.scm:73
-#: gnucash/report/standard-reports/sx-summary.scm:64
msgid "Parent account balances"
msgstr "Saldo übergeordneter Konten"
-#: gnucash/report/standard-reports/account-summary.scm:86
-#: gnucash/report/standard-reports/balance-sheet.scm:99
+#: gnucash/report/standard-reports/account-summary.scm:96
+#: gnucash/report/standard-reports/balance-sheet.scm:98
#: gnucash/report/standard-reports/budget-balance-sheet.scm:64
#: gnucash/report/standard-reports/budget-income-statement.scm:87
#: gnucash/report/standard-reports/income-statement.scm:74
-#: gnucash/report/standard-reports/sx-summary.scm:65
msgid "Parent account subtotals"
msgstr "Zwischensummen für übergeordnete Konten"
@@ -26270,137 +26214,120 @@ msgstr "Zwischensummen für übergeordnete Konten"
#.
#. the fix for this really should involve passing thunks to
#. gnc:make-html-acct-table
-#: gnucash/report/standard-reports/account-summary.scm:88
-#: gnucash/report/standard-reports/balance-sheet.scm:101
+#: gnucash/report/standard-reports/account-summary.scm:98
+#: gnucash/report/standard-reports/balance-sheet.scm:100
#: gnucash/report/standard-reports/balsheet-pnl.scm:76
#: gnucash/report/standard-reports/budget-balance-sheet.scm:66
#: gnucash/report/standard-reports/budget-income-statement.scm:89
#: gnucash/report/standard-reports/income-statement.scm:76
-#: gnucash/report/standard-reports/sx-summary.scm:67
-#: gnucash/report/standard-reports/trial-balance.scm:121
+#: gnucash/report/standard-reports/trial-balance.scm:122
msgid "Include accounts with zero total balances"
msgstr "Konten, die Kontostand Null haben, mit einbeziehen."
-#: gnucash/report/standard-reports/account-summary.scm:90
-#: gnucash/report/standard-reports/balance-sheet.scm:103
+#: gnucash/report/standard-reports/account-summary.scm:100
+#: gnucash/report/standard-reports/balance-sheet.scm:102
#: gnucash/report/standard-reports/balsheet-pnl.scm:77
#: gnucash/report/standard-reports/budget-balance-sheet.scm:68
#: gnucash/report/standard-reports/budget-income-statement.scm:91
#: gnucash/report/standard-reports/income-statement.scm:78
-#: gnucash/report/standard-reports/sx-summary.scm:69
-#: gnucash/report/standard-reports/trial-balance.scm:123
+#: gnucash/report/standard-reports/trial-balance.scm:124
msgid "Include accounts with zero total (recursive) balances in this report."
msgstr "Schließe Konten mit (rekursivem) Saldo von Null mit ein."
-#: gnucash/report/standard-reports/account-summary.scm:91
-#: gnucash/report/standard-reports/balance-sheet.scm:104
+#: gnucash/report/standard-reports/account-summary.scm:101
+#: gnucash/report/standard-reports/balance-sheet.scm:103
#: gnucash/report/standard-reports/balsheet-pnl.scm:79
#: gnucash/report/standard-reports/budget-balance-sheet.scm:69
#: gnucash/report/standard-reports/budget-income-statement.scm:92
#: gnucash/report/standard-reports/income-statement.scm:79
-#: gnucash/report/standard-reports/sx-summary.scm:70
msgid "Omit zero balance figures"
msgstr "Salden ignorieren, die Null betragen"
-#: gnucash/report/standard-reports/account-summary.scm:93
-#: gnucash/report/standard-reports/balance-sheet.scm:106
+#: gnucash/report/standard-reports/account-summary.scm:103
+#: gnucash/report/standard-reports/balance-sheet.scm:105
#: gnucash/report/standard-reports/balsheet-pnl.scm:80
#: gnucash/report/standard-reports/budget-balance-sheet.scm:71
#: gnucash/report/standard-reports/budget-income-statement.scm:94
#: gnucash/report/standard-reports/income-statement.scm:81
-#: gnucash/report/standard-reports/sx-summary.scm:72
msgid "Show blank space in place of any zero balances which would be shown."
msgstr "Zeige Leerraum statt Nullen für Null-Salden an."
-#: gnucash/report/standard-reports/account-summary.scm:95
-#: gnucash/report/standard-reports/balance-sheet.scm:108
+#: gnucash/report/standard-reports/account-summary.scm:105
+#: gnucash/report/standard-reports/balance-sheet.scm:107
#: gnucash/report/standard-reports/budget-balance-sheet.scm:73
#: gnucash/report/standard-reports/budget-income-statement.scm:96
#: gnucash/report/standard-reports/equity-statement.scm:72
#: gnucash/report/standard-reports/income-statement.scm:83
-#: gnucash/report/standard-reports/sx-summary.scm:74
msgid "Show accounting-style rules"
msgstr "Linien aus Rechnungswesen anzeigen"
-#: gnucash/report/standard-reports/account-summary.scm:97
-#: gnucash/report/standard-reports/balance-sheet.scm:110
+#: gnucash/report/standard-reports/account-summary.scm:107
+#: gnucash/report/standard-reports/balance-sheet.scm:109
#: gnucash/report/standard-reports/budget-balance-sheet.scm:75
#: gnucash/report/standard-reports/budget-income-statement.scm:98
#: gnucash/report/standard-reports/equity-statement.scm:74
#: gnucash/report/standard-reports/income-statement.scm:85
-#: gnucash/report/standard-reports/sx-summary.scm:76
msgid "Use rules beneath columns of added numbers like accountants do."
msgstr ""
"Zeige Linien neben Spalten mit Salden an, wie im Rechnungswesen üblich."
-#: gnucash/report/standard-reports/account-summary.scm:103
-#: gnucash/report/standard-reports/sx-summary.scm:82
+#: gnucash/report/standard-reports/account-summary.scm:114
msgid "Show an account's balance."
msgstr "Zeige den Kontensaldo an."
-#: gnucash/report/standard-reports/account-summary.scm:105
-#: gnucash/report/standard-reports/sx-summary.scm:84
+#: gnucash/report/standard-reports/account-summary.scm:116
msgid "Show an account's account code."
msgstr "Zeige die Kontonummer an."
-#: gnucash/report/standard-reports/account-summary.scm:107
-#: gnucash/report/standard-reports/sx-summary.scm:86
+#: gnucash/report/standard-reports/account-summary.scm:118
msgid "Show an account's account type."
msgstr "Zeige die Kontenart an."
-#: gnucash/report/standard-reports/account-summary.scm:108
-#: gnucash/report/standard-reports/sx-summary.scm:87
+#: gnucash/report/standard-reports/account-summary.scm:119
msgid "Account Description"
msgstr "Kontenbeschreibung"
-#: gnucash/report/standard-reports/account-summary.scm:109
-#: gnucash/report/standard-reports/sx-summary.scm:88
+#: gnucash/report/standard-reports/account-summary.scm:120
msgid "Show an account's description."
msgstr "Zeige Kontenbeschreibung an."
-#: gnucash/report/standard-reports/account-summary.scm:110
-#: gnucash/report/standard-reports/sx-summary.scm:89
+#: gnucash/report/standard-reports/account-summary.scm:121
msgid "Account Notes"
msgstr "Kontennotizen"
-#: gnucash/report/standard-reports/account-summary.scm:111
-#: gnucash/report/standard-reports/sx-summary.scm:90
+#: gnucash/report/standard-reports/account-summary.scm:122
msgid "Show an account's notes."
msgstr "Zeige Kontennotizen an."
-#: gnucash/report/standard-reports/account-summary.scm:119
-#: gnucash/report/standard-reports/balance-sheet.scm:143
+#: gnucash/report/standard-reports/account-summary.scm:130
+#: gnucash/report/standard-reports/balance-sheet.scm:142
#: gnucash/report/standard-reports/balsheet-pnl.scm:122
#: gnucash/report/standard-reports/budget-balance-sheet.scm:108
#: gnucash/report/standard-reports/budget-income-statement.scm:122
#: gnucash/report/standard-reports/cash-flow.scm:54
#: gnucash/report/standard-reports/equity-statement.scm:82
#: gnucash/report/standard-reports/income-statement.scm:115
-#: gnucash/report/standard-reports/sx-summary.scm:98
-#: gnucash/report/standard-reports/trial-balance.scm:134
+#: gnucash/report/standard-reports/trial-balance.scm:135
msgid "Show Exchange Rates"
msgstr "Wechselkurse anzeigen"
-#: gnucash/report/standard-reports/account-summary.scm:120
-#: gnucash/report/standard-reports/balance-sheet.scm:144
+#: gnucash/report/standard-reports/account-summary.scm:131
+#: gnucash/report/standard-reports/balance-sheet.scm:143
#: gnucash/report/standard-reports/balsheet-pnl.scm:123
#: gnucash/report/standard-reports/budget-balance-sheet.scm:109
#: gnucash/report/standard-reports/budget-income-statement.scm:123
#: gnucash/report/standard-reports/cash-flow.scm:80
#: gnucash/report/standard-reports/equity-statement.scm:83
#: gnucash/report/standard-reports/income-statement.scm:116
-#: gnucash/report/standard-reports/sx-summary.scm:99
-#: gnucash/report/standard-reports/trial-balance.scm:135
+#: gnucash/report/standard-reports/trial-balance.scm:136
msgid "Show the exchange rates used."
msgstr "Zeige die verwendeten Wechselkurse an."
-#: gnucash/report/standard-reports/account-summary.scm:175
-#: gnucash/report/standard-reports/sx-summary.scm:153
+#: gnucash/report/standard-reports/account-summary.scm:190
msgid "Recursive Balance"
msgstr "Rekursiver Saldo"
-#: gnucash/report/standard-reports/account-summary.scm:176
-#: gnucash/report/standard-reports/sx-summary.scm:154
+#: gnucash/report/standard-reports/account-summary.scm:191
msgid ""
"Show the total balance, including balances in subaccounts, of any account at "
"the depth limit."
@@ -26408,29 +26335,32 @@ msgstr ""
"Zeige den Gesamt-Saldo einschließlich der Salden der Unterkonten bis zum "
"Tiefenlimit an."
-#: gnucash/report/standard-reports/account-summary.scm:178
-#: gnucash/report/standard-reports/sx-summary.scm:156
+#: gnucash/report/standard-reports/account-summary.scm:193
msgid "Raise Accounts"
msgstr "Konten höher anzeigen"
-#: gnucash/report/standard-reports/account-summary.scm:179
-#: gnucash/report/standard-reports/sx-summary.scm:157
+#: gnucash/report/standard-reports/account-summary.scm:194
msgid "Shows accounts deeper than the depth limit at the depth limit."
msgstr "Zeige Konten an, die in der Baumstruktur unter dem Tiefenlimit liegen"
-#: gnucash/report/standard-reports/account-summary.scm:181
-#: gnucash/report/standard-reports/sx-summary.scm:159
+#: gnucash/report/standard-reports/account-summary.scm:196
msgid "Omit Accounts"
msgstr "Konten überspringen"
-#: gnucash/report/standard-reports/account-summary.scm:182
-#: gnucash/report/standard-reports/sx-summary.scm:160
+#: gnucash/report/standard-reports/account-summary.scm:197
msgid "Disregard completely any accounts deeper than the depth limit."
msgstr ""
"Ignorieren Konten, die in der Baumstruktur unter dem Tiefenlimit liegen."
-#: gnucash/report/standard-reports/account-summary.scm:444
-#: gnucash/report/standard-reports/sx-summary.scm:445
+#: gnucash/report/standard-reports/account-summary.scm:324
+#: gnucash/report/standard-reports/equity-statement.scm:298
+#: gnucash/report/standard-reports/income-statement.scm:433
+#: gnucash/report/standard-reports/trial-balance.scm:414
+#, scheme-format
+msgid "For Period Covering ~a to ~a"
+msgstr "Für Periode ~a bis ~a"
+
+#: gnucash/report/standard-reports/account-summary.scm:408
msgid "Account title"
msgstr "Kontobezeichnung"
@@ -26828,7 +26758,7 @@ msgid "Reserve"
msgstr "Reserve"
#: gnucash/report/standard-reports/balance-sheet.scm:72
-#: gnucash/report/standard-reports/trial-balance.scm:702
+#: gnucash/report/standard-reports/trial-balance.scm:578
msgid "Balance Sheet"
msgstr "Bilanz"
@@ -26846,31 +26776,31 @@ msgstr ""
"Stelle die Passiva unterhalb der Aktiva statt in einer zweiten Spaltigen "
"rechts neben ihnen darstellen. (Staffel- statt Kontoform)"
-#: gnucash/report/standard-reports/balance-sheet.scm:115
+#: gnucash/report/standard-reports/balance-sheet.scm:114
#: gnucash/report/standard-reports/budget-balance-sheet.scm:80
msgid "Label the assets section"
msgstr "Abschnitt Aktiva beschriften"
-#: gnucash/report/standard-reports/balance-sheet.scm:117
+#: gnucash/report/standard-reports/balance-sheet.scm:116
#: gnucash/report/standard-reports/budget-balance-sheet.scm:82
msgid "Whether or not to include a label for the assets section."
msgstr "Zeige eine Beschriftung für den Abschnitt mit Aktiva an."
-#: gnucash/report/standard-reports/balance-sheet.scm:118
+#: gnucash/report/standard-reports/balance-sheet.scm:117
#: gnucash/report/standard-reports/budget-balance-sheet.scm:83
msgid "Include assets total"
msgstr "Summe Aktiva anzeigen"
-#: gnucash/report/standard-reports/balance-sheet.scm:120
+#: gnucash/report/standard-reports/balance-sheet.scm:119
#: gnucash/report/standard-reports/budget-balance-sheet.scm:85
msgid "Whether or not to include a line indicating total assets."
msgstr "Zeige eine Zeile für die Summe Aktiva an."
-#: gnucash/report/standard-reports/balance-sheet.scm:121
+#: gnucash/report/standard-reports/balance-sheet.scm:120
msgid "Use standard US layout"
msgstr "Kurzfristig vor Langfristig"
-#: gnucash/report/standard-reports/balance-sheet.scm:123
+#: gnucash/report/standard-reports/balance-sheet.scm:122
msgid ""
"Report section order is assets/liabilities/equity (rather than assets/equity/"
"liabilities)."
@@ -26879,86 +26809,86 @@ msgstr ""
"Eigenkapital« geordnet statt wie in Deutschland nach »Aktiva, Eigen- und "
"Fremdkapital«."
-#: gnucash/report/standard-reports/balance-sheet.scm:124
+#: gnucash/report/standard-reports/balance-sheet.scm:123
#: gnucash/report/standard-reports/budget-balance-sheet.scm:86
msgid "Label the liabilities section"
msgstr "Abschnitt Fremdkapital beschriften"
-#: gnucash/report/standard-reports/balance-sheet.scm:126
+#: gnucash/report/standard-reports/balance-sheet.scm:125
#: gnucash/report/standard-reports/budget-balance-sheet.scm:88
msgid "Whether or not to include a label for the liabilities section."
msgstr "Zeige eine Beschriftung für den Abschnitt mit Verbindlichkeiten an."
-#: gnucash/report/standard-reports/balance-sheet.scm:127
+#: gnucash/report/standard-reports/balance-sheet.scm:126
#: gnucash/report/standard-reports/budget-balance-sheet.scm:89
msgid "Include liabilities total"
msgstr "Summe Verbindlichkeiten anzeigen"
-#: gnucash/report/standard-reports/balance-sheet.scm:129
+#: gnucash/report/standard-reports/balance-sheet.scm:128
#: gnucash/report/standard-reports/budget-balance-sheet.scm:91
msgid "Whether or not to include a line indicating total liabilities."
msgstr "Zeige eine Zeile mit der Summe der Verbindlichkeiten an."
-#: gnucash/report/standard-reports/balance-sheet.scm:130
+#: gnucash/report/standard-reports/balance-sheet.scm:129
#: gnucash/report/standard-reports/budget-balance-sheet.scm:92
msgid "Label the equity section"
msgstr "Abschnitt Eigenkapital beschriften"
-#: gnucash/report/standard-reports/balance-sheet.scm:132
+#: gnucash/report/standard-reports/balance-sheet.scm:131
#: gnucash/report/standard-reports/budget-balance-sheet.scm:94
msgid "Whether or not to include a label for the equity section."
msgstr "Zeige eine Beschriftung für den Abschnitt mit Eigenkapitalkonten an."
-#: gnucash/report/standard-reports/balance-sheet.scm:133
+#: gnucash/report/standard-reports/balance-sheet.scm:132
#: gnucash/report/standard-reports/budget-balance-sheet.scm:95
msgid "Include equity total"
msgstr "Summe Eigenkapital anzeigen"
-#: gnucash/report/standard-reports/balance-sheet.scm:135
+#: gnucash/report/standard-reports/balance-sheet.scm:134
#: gnucash/report/standard-reports/budget-balance-sheet.scm:97
msgid "Whether or not to include a line indicating total equity."
msgstr "Zeige eine Zeile für das gesamte Eigenkapital an."
-#: gnucash/report/standard-reports/balance-sheet.scm:442
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:805
+#: gnucash/report/standard-reports/balance-sheet.scm:392
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:739
msgid "Total Liabilities"
msgstr "Gesamt Verbindlichkeiten"
-#: gnucash/report/standard-reports/balance-sheet.scm:640
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:774
+#: gnucash/report/standard-reports/balance-sheet.scm:494
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:708
msgid "Total Assets"
msgstr "Gesamt Aktiva"
-#: gnucash/report/standard-reports/balance-sheet.scm:674
+#: gnucash/report/standard-reports/balance-sheet.scm:520
msgid "Trading Gains"
msgstr "Gewinne Devisenhandel"
-#: gnucash/report/standard-reports/balance-sheet.scm:675
+#: gnucash/report/standard-reports/balance-sheet.scm:521
msgid "Trading Losses"
msgstr "Verluste Devisenhandel"
-#: gnucash/report/standard-reports/balance-sheet.scm:680
-#: gnucash/report/standard-reports/balsheet-pnl.scm:1060
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:847
-#: gnucash/report/standard-reports/equity-statement.scm:624
-#: gnucash/report/standard-reports/trial-balance.scm:921
+#: gnucash/report/standard-reports/balance-sheet.scm:525
+#: gnucash/report/standard-reports/balsheet-pnl.scm:1058
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:781
+#: gnucash/report/standard-reports/equity-statement.scm:600
+#: gnucash/report/standard-reports/trial-balance.scm:739
msgid "Unrealized Gains"
msgstr "Nicht realisierter Gewinn/Verlust"
-#: gnucash/report/standard-reports/balance-sheet.scm:681
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:848
-#: gnucash/report/standard-reports/equity-statement.scm:625
-#: gnucash/report/standard-reports/trial-balance.scm:922
+#: gnucash/report/standard-reports/balance-sheet.scm:526
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:782
+#: gnucash/report/standard-reports/equity-statement.scm:601
+#: gnucash/report/standard-reports/trial-balance.scm:740
msgid "Unrealized Losses"
msgstr "Nicht realisierter Verlust"
-#: gnucash/report/standard-reports/balance-sheet.scm:685
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:863
+#: gnucash/report/standard-reports/balance-sheet.scm:530
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:797
msgid "Total Equity"
msgstr "Gesamt Eigenkapital"
-#: gnucash/report/standard-reports/balance-sheet.scm:696
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:869
+#: gnucash/report/standard-reports/balance-sheet.scm:540
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:803
msgid "Total Liabilities & Equity"
msgstr "Gesamt Passiva"
@@ -27031,14 +26961,14 @@ msgstr ""
#: gnucash/report/standard-reports/balsheet-pnl.scm:90
#: gnucash/report/standard-reports/equity-statement.scm:86
#: gnucash/report/standard-reports/income-statement.scm:119
-#: gnucash/report/standard-reports/trial-balance.scm:104
+#: gnucash/report/standard-reports/trial-balance.scm:105
msgid "Closing Entries pattern"
msgstr "Muster für Abschlussbuchungen"
#: gnucash/report/standard-reports/balsheet-pnl.scm:91
#: gnucash/report/standard-reports/equity-statement.scm:88
#: gnucash/report/standard-reports/income-statement.scm:121
-#: gnucash/report/standard-reports/trial-balance.scm:106
+#: gnucash/report/standard-reports/trial-balance.scm:107
msgid "Any text in the Description column which identifies closing entries."
msgstr ""
"Textmuster in der Buchungsbeschreibung, das Abschlussbuchungen identifiziert."
@@ -27046,14 +26976,14 @@ msgstr ""
#: gnucash/report/standard-reports/balsheet-pnl.scm:92
#: gnucash/report/standard-reports/equity-statement.scm:90
#: gnucash/report/standard-reports/income-statement.scm:123
-#: gnucash/report/standard-reports/trial-balance.scm:108
+#: gnucash/report/standard-reports/trial-balance.scm:109
msgid "Closing Entries pattern is case-sensitive"
msgstr "Muster für Abschlussbuchungen unterscheidet Groß-/Kleinschreibung"
#: gnucash/report/standard-reports/balsheet-pnl.scm:93
#: gnucash/report/standard-reports/equity-statement.scm:92
#: gnucash/report/standard-reports/income-statement.scm:125
-#: gnucash/report/standard-reports/trial-balance.scm:110
+#: gnucash/report/standard-reports/trial-balance.scm:111
msgid "Causes the Closing Entries Pattern match to be case-sensitive."
msgstr ""
"Lässt das Muster für Abschlussbuchungen nach Groß-/Kleinschreibung "
@@ -27062,14 +26992,14 @@ msgstr ""
#: gnucash/report/standard-reports/balsheet-pnl.scm:94
#: gnucash/report/standard-reports/equity-statement.scm:94
#: gnucash/report/standard-reports/income-statement.scm:127
-#: gnucash/report/standard-reports/trial-balance.scm:112
+#: gnucash/report/standard-reports/trial-balance.scm:113
msgid "Closing Entries Pattern is regular expression"
msgstr "Muster für Abschlussbuchungen ist ein regulärer Ausdruck"
#: gnucash/report/standard-reports/balsheet-pnl.scm:95
#: gnucash/report/standard-reports/equity-statement.scm:96
#: gnucash/report/standard-reports/income-statement.scm:129
-#: gnucash/report/standard-reports/trial-balance.scm:114
+#: gnucash/report/standard-reports/trial-balance.scm:115
msgid ""
"Causes the Closing Entries Pattern to be treated as a regular expression."
msgstr "Lässt das Muster für Abschlussbuchungen ein regulärer Ausdruck sein."
@@ -27121,22 +27051,22 @@ msgstr "Ein Jahr."
msgid "missing"
msgstr "fehlt"
-#: gnucash/report/standard-reports/balsheet-pnl.scm:1050
+#: gnucash/report/standard-reports/balsheet-pnl.scm:1048
#: libgnucash/engine/Account.cpp:4093
msgid "Asset"
msgstr "Aktiva"
-#: gnucash/report/standard-reports/balsheet-pnl.scm:1053
+#: gnucash/report/standard-reports/balsheet-pnl.scm:1051
#: libgnucash/engine/Account.cpp:4095
msgid "Liability"
msgstr "Fremdkapital"
-#: gnucash/report/standard-reports/balsheet-pnl.scm:1067
+#: gnucash/report/standard-reports/balsheet-pnl.scm:1065
#: gnucash/report/standard-reports/balsheet-pnl.scm:1245
msgid "Exchange Rates"
msgstr "Wechselkurse"
-#: gnucash/report/standard-reports/balsheet-pnl.scm:1077
+#: gnucash/report/standard-reports/balsheet-pnl.scm:1075
#: gnucash/report/standard-reports/budget-barchart.scm:107
msgid "Barchart"
msgstr "Balkendiagramm"
@@ -27152,7 +27082,7 @@ msgid "Period"
msgstr "Periode"
#: gnucash/report/standard-reports/balsheet-pnl.scm:1238
-#: gnucash/report/standard-reports/trial-balance.scm:1140
+#: gnucash/report/standard-reports/trial-balance.scm:865
msgid "Net Income"
msgstr "Nettoertrag"
@@ -27188,55 +27118,55 @@ msgstr ""
msgid "Budget to use."
msgstr "Zu benutzendes Budget"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:765
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:699
msgid "Existing Assets"
msgstr "Bestehende Aktiva"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:767
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:701
msgid "Allocated Assets"
msgstr "Zugewiesene Aktiva"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:771
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:705
msgid "Unallocated Assets"
msgstr "Nicht verwendete Aktiva"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:797
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:731
msgid "Existing Liabilities"
msgstr "Bestehende Verbindlichkeiten"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:802
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:736
msgid "New Liabilities"
msgstr "Neue Verbindlichkeiten"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:828
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:762
msgid "Existing Retained Earnings"
msgstr "Existierende Gewinnrücklagen"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:829
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:763
msgid "Existing Retained Losses"
msgstr "Existierende Verlustvorträge"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:834
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:768
msgid "New Retained Earnings"
msgstr "Neue Gewinnrücklagen"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:835
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:769
msgid "New Retained Losses"
msgstr "Neue Verlustvorträge"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:840
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:774
msgid "Total Retained Earnings"
msgstr "Summe Gewinnrücklagen"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:841
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:775
msgid "Total Retained Losses"
msgstr "Summ Verlustvorträge"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:857
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:791
msgid "Existing Equity"
msgstr "Existierendes Eigenkapital"
-#: gnucash/report/standard-reports/budget-balance-sheet.scm:860
+#: gnucash/report/standard-reports/budget-balance-sheet.scm:794
msgid "New Equity"
msgstr "Neues Eigenkapital"
@@ -27398,59 +27328,59 @@ msgstr ""
"Konten in der normalen Reihenfolge anzeigen, also Erträge vor Aufwendungen. "
"Andernfalls zuerst die Aufwendungen, dann die Erträge anzeigen."
-#: gnucash/report/standard-reports/budget-income-statement.scm:476
+#: gnucash/report/standard-reports/budget-income-statement.scm:463
msgid "Reporting range end period cannot be less than start period."
msgstr ""
"Das Ende des Berichtsbereichs kann nicht kleiner als der Anfang sein ─ bitte "
"umtauschen."
-#: gnucash/report/standard-reports/budget-income-statement.scm:506
+#: gnucash/report/standard-reports/budget-income-statement.scm:493
#, scheme-format
msgid "for Budget ~a Period ~d"
msgstr "für Budget ~a Periode ~d"
-#: gnucash/report/standard-reports/budget-income-statement.scm:511
+#: gnucash/report/standard-reports/budget-income-statement.scm:498
#, scheme-format
msgid "for Budget ~a Periods ~d - ~d"
msgstr "für Budget ~a Perioden ~d - ~d"
-#: gnucash/report/standard-reports/budget-income-statement.scm:517
+#: gnucash/report/standard-reports/budget-income-statement.scm:504
#, scheme-format
msgid "for Budget ~a"
msgstr "für Budget ~a"
-#: gnucash/report/standard-reports/budget-income-statement.scm:659
-#: gnucash/report/standard-reports/income-statement.scm:588
+#: gnucash/report/standard-reports/budget-income-statement.scm:629
+#: gnucash/report/standard-reports/income-statement.scm:583
msgid "Revenues"
msgstr "Ertrag"
-#: gnucash/report/standard-reports/budget-income-statement.scm:668
-#: gnucash/report/standard-reports/income-statement.scm:596
+#: gnucash/report/standard-reports/budget-income-statement.scm:638
+#: gnucash/report/standard-reports/income-statement.scm:591
msgid "Total Revenue"
msgstr "Gesamt-Ertrag"
-#: gnucash/report/standard-reports/budget-income-statement.scm:682
-#: gnucash/report/standard-reports/income-statement.scm:609
+#: gnucash/report/standard-reports/budget-income-statement.scm:652
+#: gnucash/report/standard-reports/income-statement.scm:604
msgid "Total Expenses"
msgstr "Gesamt-Aufwand"
-#: gnucash/report/standard-reports/budget-income-statement.scm:688
-#: gnucash/report/standard-reports/equity-statement.scm:602
-#: gnucash/report/standard-reports/income-statement.scm:626
+#: gnucash/report/standard-reports/budget-income-statement.scm:658
+#: gnucash/report/standard-reports/equity-statement.scm:578
+#: gnucash/report/standard-reports/income-statement.scm:621
msgid "Net income"
msgstr "Netto-Ertrag"
-#: gnucash/report/standard-reports/budget-income-statement.scm:689
-#: gnucash/report/standard-reports/equity-statement.scm:603
-#: gnucash/report/standard-reports/income-statement.scm:627
+#: gnucash/report/standard-reports/budget-income-statement.scm:659
+#: gnucash/report/standard-reports/equity-statement.scm:579
+#: gnucash/report/standard-reports/income-statement.scm:622
msgid "Net loss"
msgstr "Netto-Verlust"
-#: gnucash/report/standard-reports/budget-income-statement.scm:757
+#: gnucash/report/standard-reports/budget-income-statement.scm:727
msgid "Budget Income Statement"
msgstr "Budget Einnahmenüberschussrechnung"
-#: gnucash/report/standard-reports/budget-income-statement.scm:758
+#: gnucash/report/standard-reports/budget-income-statement.scm:728
msgid "Budget Profit & Loss"
msgstr "Budget Gewinn- und Verlustrechnung"
@@ -27615,17 +27545,17 @@ msgid "Explicitly select period value with spinner below"
msgstr "Wählen Sie den Periodenwert mit dem Auswahlrad."
#. Translators: Abbreviation for "Budget" amount
-#: gnucash/report/standard-reports/budget.scm:479
+#: gnucash/report/standard-reports/budget.scm:469
msgid "Bgt"
msgstr "Budget"
#. Translators: Abbreviation for "Actual" amount
-#: gnucash/report/standard-reports/budget.scm:484
+#: gnucash/report/standard-reports/budget.scm:474
msgid "Act"
msgstr "Ist"
#. Translators: Abbreviation for "Difference" amount
-#: gnucash/report/standard-reports/budget.scm:489
+#: gnucash/report/standard-reports/budget.scm:479
msgid "Diff"
msgstr "Differenz"
@@ -27633,7 +27563,7 @@ msgstr "Differenz"
#. budget will report on budgeted and actual
#. amounts from the beginning of budget, instead
#. of only using the budget-period amounts.
-#: gnucash/report/standard-reports/budget.scm:712
+#: gnucash/report/standard-reports/budget.scm:702
msgid "using accumulated amounts"
msgstr ""
@@ -27829,8 +27759,8 @@ msgstr "Die maximale Anzahl gestapelte Balken im Diagramm."
msgid "Daily Average"
msgstr "Durchschnitt pro Tag"
-#: gnucash/report/standard-reports/category-barchart.scm:536
-#: gnucash/report/standard-reports/category-barchart.scm:562
+#: gnucash/report/standard-reports/category-barchart.scm:530
+#: gnucash/report/standard-reports/category-barchart.scm:556
#, scheme-format
msgid "Balances ~a to ~a"
msgstr "Salden ~a bis ~a"
@@ -27868,38 +27798,30 @@ msgstr "Eigenkapitalbilanz"
msgid "Report only on these accounts."
msgstr "Den Bericht nur für diese Konten erstellen."
-#: gnucash/report/standard-reports/equity-statement.scm:298
-#: gnucash/report/standard-reports/income-statement.scm:433
-#: gnucash/report/standard-reports/sx-summary.scm:312
-#: gnucash/report/standard-reports/trial-balance.scm:486
-#, scheme-format
-msgid "For Period Covering ~a to ~a"
-msgstr "Für Periode ~a bis ~a"
-
#: gnucash/report/standard-reports/equity-statement.scm:360
#: gnucash/report/standard-reports/income-statement.scm:470
-#: gnucash/report/standard-reports/trial-balance.scm:478
+#: gnucash/report/standard-reports/trial-balance.scm:406
msgid "for Period"
msgstr "für Buchungsperiode"
-#: gnucash/report/standard-reports/equity-statement.scm:595
-#: gnucash/report/standard-reports/equity-statement.scm:639
+#: gnucash/report/standard-reports/equity-statement.scm:571
+#: gnucash/report/standard-reports/equity-statement.scm:615
msgid "Capital"
msgstr "Kapital"
-#: gnucash/report/standard-reports/equity-statement.scm:609
+#: gnucash/report/standard-reports/equity-statement.scm:585
msgid "Investments"
msgstr "Investments"
-#: gnucash/report/standard-reports/equity-statement.scm:616
+#: gnucash/report/standard-reports/equity-statement.scm:592
msgid "Withdrawals"
msgstr "Abhebungen"
-#: gnucash/report/standard-reports/equity-statement.scm:632
+#: gnucash/report/standard-reports/equity-statement.scm:608
msgid "Increase in capital"
msgstr "Kapitalerhöhung"
-#: gnucash/report/standard-reports/equity-statement.scm:633
+#: gnucash/report/standard-reports/equity-statement.scm:609
msgid "Decrease in capital"
msgstr "Kapitalreduzierung"
@@ -27914,7 +27836,6 @@ msgstr "Einkommens- und Umsatzsteuererklärung"
# Todo: I18N: wrong use of \n
#: gnucash/report/standard-reports/income-gst-statement.scm:42
-#, fuzzy
msgid ""
"This report is useful to calculate periodic business tax payable/receivable "
"from authorities. From 'Edit report options' above, choose your Business "
@@ -27933,7 +27854,6 @@ msgstr ""
"Steuer -190; Aktiva:Bank 1.190"
#: gnucash/report/standard-reports/income-gst-statement.scm:48
-#, fuzzy
msgid ""
"These tax accounts can either be populated using the standard register, or "
"from Business Invoices and Bills which will require Tax Tables to be set up "
@@ -28089,22 +28009,22 @@ msgid ""
"Whether or not to include a line indicating total trading accounts balance."
msgstr "Summenzeile für die Devisenhandel-Konten anzeigen."
-#: gnucash/report/standard-reports/income-statement.scm:612
+#: gnucash/report/standard-reports/income-statement.scm:607
#: libgnucash/engine/Account.cpp:4105 libgnucash/engine/Scrub.c:430
#: libgnucash/engine/Scrub.c:495
msgid "Trading"
msgstr "Devisenhandel"
-#: gnucash/report/standard-reports/income-statement.scm:620
+#: gnucash/report/standard-reports/income-statement.scm:615
msgid "Total Trading"
msgstr "Gesamt Devisenhandel"
-#: gnucash/report/standard-reports/income-statement.scm:709
-#: gnucash/report/standard-reports/trial-balance.scm:701
+#: gnucash/report/standard-reports/income-statement.scm:704
+#: gnucash/report/standard-reports/trial-balance.scm:577
msgid "Income Statement"
msgstr "Ergebnisrechnung"
-#: gnucash/report/standard-reports/income-statement.scm:710
+#: gnucash/report/standard-reports/income-statement.scm:705
msgid "Profit & Loss"
msgstr "Gewinn- und Verlustrechnung"
@@ -28154,34 +28074,34 @@ msgstr "Reinvermögen-Balken anzeigen?"
msgid "Add grid lines."
msgstr "Gitterlinien anzeigen."
-#: gnucash/report/standard-reports/net-charts.scm:412
-#: gnucash/report/standard-reports/net-charts.scm:492
+#: gnucash/report/standard-reports/net-charts.scm:406
+#: gnucash/report/standard-reports/net-charts.scm:486
msgid "Net Profit"
msgstr "Reingewinn"
-#: gnucash/report/standard-reports/net-charts.scm:413
-#: gnucash/report/standard-reports/net-charts.scm:493
+#: gnucash/report/standard-reports/net-charts.scm:407
+#: gnucash/report/standard-reports/net-charts.scm:487
msgid "Net Worth"
msgstr "Reinvermögen"
-#: gnucash/report/standard-reports/net-charts.scm:540
+#: gnucash/report/standard-reports/net-charts.scm:534
msgid "Net Worth Barchart"
msgstr "Reinvermögen-Balkendiagramm"
-#: gnucash/report/standard-reports/net-charts.scm:548
+#: gnucash/report/standard-reports/net-charts.scm:542
msgid "Income/Expense Chart"
msgstr "Erträge/Aufwendungen-Diagramm"
-#: gnucash/report/standard-reports/net-charts.scm:550
+#: gnucash/report/standard-reports/net-charts.scm:544
msgid "Income & Expense Barchart"
msgstr "Aufwand & Ertrags-Säulendiagramm"
-#: gnucash/report/standard-reports/net-charts.scm:557
+#: gnucash/report/standard-reports/net-charts.scm:551
msgid "Net Worth Linechart"
msgstr "Reinvermögen Liniendiagramm"
-#: gnucash/report/standard-reports/net-charts.scm:567
-#: gnucash/report/standard-reports/net-charts.scm:569
+#: gnucash/report/standard-reports/net-charts.scm:561
+#: gnucash/report/standard-reports/net-charts.scm:563
msgid "Income & Expense Linechart"
msgstr "Aufwand & Ertrags-Liniendiagramm"
@@ -28308,15 +28228,11 @@ msgid "Price Scatterplot"
msgstr "Kursdiagramm"
#: gnucash/report/standard-reports/reconcile-report.scm:58
-#, fuzzy
msgid ""
"The reconcile report is designed to be similar to the formal reconciliation "
"tool. Please select the account from Report Options. Please note the dates "
"specified in the options will apply to the Reconciliation Date."
-msgstr ""
-"Der Abgleichbericht sollte dem Aussehen des Abgleichwerkzeugs ähneln.\n"
-"Bitte wählen Sie das Konto in den Berichtsoptionen. Die bei den Optionen "
-"gewählten Datumsangaben werden als Abgleichdatum verwendet."
+msgstr "Der Abgleichbericht sollte dem Aussehen des Abgleichwerkzeugs ähneln. Bitte wählen Sie das Konto in den Berichtsoptionen. Die bei den Optionen gewählten Datumsangaben werden als Abgleichdatum verwendet."
#: gnucash/report/standard-reports/reconcile-report.scm:102
msgid "Reconciliation Report"
@@ -28380,40 +28296,36 @@ msgstr "Netto-Änderung"
msgid "Value Change"
msgstr "Gesamtwert Änderung"
-#: gnucash/report/standard-reports/sx-summary.scm:43
-msgid "Future Scheduled Transactions Summary"
-msgstr "Zukünftige Terminierte Buchungen"
-
-#: gnucash/report/standard-reports/trial-balance.scm:60
-#: gnucash/report/standard-reports/trial-balance.scm:698
+#: gnucash/report/standard-reports/trial-balance.scm:61
+#: gnucash/report/standard-reports/trial-balance.scm:574
msgid "Trial Balance"
msgstr "Rohbilanz"
-#: gnucash/report/standard-reports/trial-balance.scm:70
+#: gnucash/report/standard-reports/trial-balance.scm:71
msgid "Start of Adjusting/Closing"
msgstr "Anfangsdatum Anpassung/Abschluss"
-#: gnucash/report/standard-reports/trial-balance.scm:71
+#: gnucash/report/standard-reports/trial-balance.scm:72
msgid "Date of Report"
msgstr "Berichtsdatum"
-#: gnucash/report/standard-reports/trial-balance.scm:72
+#: gnucash/report/standard-reports/trial-balance.scm:73
msgid "Report variation"
msgstr "Berichtsart"
-#: gnucash/report/standard-reports/trial-balance.scm:73
+#: gnucash/report/standard-reports/trial-balance.scm:74
msgid "Kind of trial balance to generate."
msgstr "Die Art der Rohbilanz, die berechnet werden soll."
-#: gnucash/report/standard-reports/trial-balance.scm:83
+#: gnucash/report/standard-reports/trial-balance.scm:84
msgid "Merchandising"
msgstr "Handel"
-#: gnucash/report/standard-reports/trial-balance.scm:84
+#: gnucash/report/standard-reports/trial-balance.scm:85
msgid "Gross adjustment accounts."
msgstr "Bruttobewegungskonten."
-#: gnucash/report/standard-reports/trial-balance.scm:86
+#: gnucash/report/standard-reports/trial-balance.scm:87
msgid ""
"Do not net, but show gross debit/credit adjustments to these accounts. "
"Merchandising businesses will normally select their inventory accounts here."
@@ -28422,11 +28334,11 @@ msgstr ""
"diesen Konten anzeigen. Handelsunternehmen werden hier normalerweise ihre "
"Waren-Konten wählen."
-#: gnucash/report/standard-reports/trial-balance.scm:87
+#: gnucash/report/standard-reports/trial-balance.scm:88
msgid "Income summary accounts"
msgstr "Abschlusskonten"
-#: gnucash/report/standard-reports/trial-balance.scm:89
+#: gnucash/report/standard-reports/trial-balance.scm:90
msgid ""
"Adjustments made to these accounts are gross adjusted (see above) in the "
"Adjustments, Adjusted Trial Balance, and Income Statement columns. Mostly "
@@ -28436,70 +28348,70 @@ msgstr ""
"den Spalten Anpassung, Rohbilanz und Gewinn- und Verlustrechnung "
"ausgerechnet. Dies ist vor allem nützlich für Handelsunternehmen."
-#: gnucash/report/standard-reports/trial-balance.scm:92
+#: gnucash/report/standard-reports/trial-balance.scm:93
msgid "Adjusting Entries pattern"
msgstr "Muster für Anpassungseinträge"
-#: gnucash/report/standard-reports/trial-balance.scm:94
+#: gnucash/report/standard-reports/trial-balance.scm:95
msgid "Any text in the Description column which identifies adjusting entries."
msgstr ""
"Textmuster in der Buchungsbeschreibung, welches Anpassungseinträge "
"identifiziert."
-#: gnucash/report/standard-reports/trial-balance.scm:96
+#: gnucash/report/standard-reports/trial-balance.scm:97
msgid "Adjusting Entries pattern is case-sensitive"
msgstr "Muster für Anpassungseinträge unterscheidet Groß-/Kleinschreibung"
-#: gnucash/report/standard-reports/trial-balance.scm:98
+#: gnucash/report/standard-reports/trial-balance.scm:99
msgid "Causes the Adjusting Entries Pattern match to be case-sensitive."
msgstr ""
"Lässt das Muster für Anpassungseinträge nach Groß-/Kleinschreibung "
"unterscheiden."
-#: gnucash/report/standard-reports/trial-balance.scm:100
+#: gnucash/report/standard-reports/trial-balance.scm:101
msgid "Adjusting Entries Pattern is regular expression"
msgstr "Muster für Anpassungseinträge ist ein regulärer Ausdruck"
-#: gnucash/report/standard-reports/trial-balance.scm:102
+#: gnucash/report/standard-reports/trial-balance.scm:103
msgid ""
"Causes the Adjusting Entries Pattern to be treated as a regular expression."
msgstr ""
"Lässt das Muster für Anpassungseinträge als regulären Ausdruck "
"interpretieren."
-#: gnucash/report/standard-reports/trial-balance.scm:206
+#: gnucash/report/standard-reports/trial-balance.scm:205
msgid "Current Trial Balance"
msgstr "Aktuelle Rohbilanz"
-#: gnucash/report/standard-reports/trial-balance.scm:207
+#: gnucash/report/standard-reports/trial-balance.scm:206
msgid "Uses the exact balances in the general journal"
msgstr "Verwendet die exakten Salden im Hauptbuch"
-#: gnucash/report/standard-reports/trial-balance.scm:209
+#: gnucash/report/standard-reports/trial-balance.scm:208
msgid "Pre-adjustment Trial Balance"
msgstr "Angepasste Rohbilanz"
-#: gnucash/report/standard-reports/trial-balance.scm:210
+#: gnucash/report/standard-reports/trial-balance.scm:209
msgid "Ignores Adjusting/Closing entries"
msgstr "Anpassungsbuchungen und Abschlussbuchungen ignorieren"
-#: gnucash/report/standard-reports/trial-balance.scm:212
+#: gnucash/report/standard-reports/trial-balance.scm:211
msgid "Work Sheet"
msgstr "Arbeitsblatt"
-#: gnucash/report/standard-reports/trial-balance.scm:213
+#: gnucash/report/standard-reports/trial-balance.scm:212
msgid "Creates a complete end-of-period work sheet"
msgstr "Erstellt ein vollständiges Arbeitsblatt zum Periodenende"
-#: gnucash/report/standard-reports/trial-balance.scm:699
+#: gnucash/report/standard-reports/trial-balance.scm:575
msgid "Adjustments"
msgstr "Anpassungsbuchungen"
-#: gnucash/report/standard-reports/trial-balance.scm:700
+#: gnucash/report/standard-reports/trial-balance.scm:576
msgid "Adjusted Trial Balance"
msgstr "Angepasste Rohbilanz"
-#: gnucash/report/standard-reports/trial-balance.scm:1140
+#: gnucash/report/standard-reports/trial-balance.scm:865
msgid "Net Loss"
msgstr "Nettoverlust"
@@ -29605,6 +29517,10 @@ msgstr "Ausführliches Datumsformat"
msgid "custom"
msgstr "Benutzerdefiniert"
+#: libgnucash/app-utils/app-utils.scm:304
+msgid "Tax Number"
+msgstr "Steuernummer"
+
#: libgnucash/app-utils/business-prefs.scm:24
msgid "Counters"
msgstr "Nummern-Zähler"
@@ -29895,6 +29811,10 @@ msgstr ""
"Das Budget, welches verwendet werden soll, wenn anderweitig keins angegeben "
"wurde."
+#: libgnucash/app-utils/business-prefs.scm:164
+msgid "The electronic tax number of your business"
+msgstr "Die Elster-Steuernummer Ihrer Unternehmung"
+
#: libgnucash/app-utils/date-utilities.scm:450
#, scheme-format
msgid ""
@@ -30648,19 +30568,18 @@ msgstr "Suche nach verwaisten Buchungen im Konto %s: %u von %u"
msgid "Looking for imbalances in account %s: %u of %u"
msgstr "Suche nach unausgeglichenen Buchungen im Konto %s: %u von %u"
-#. Translators: This string has a disambiguation prefix
-#: libgnucash/engine/Split.c:1613
+#: libgnucash/engine/Split.c:1612
msgctxt ""
"Displayed account code of the other account in a multi-split transaction"
msgid "Split"
msgstr "Mehrteilig"
-#: libgnucash/engine/Transaction.c:2694
+#: libgnucash/engine/Transaction.c:2695
msgid "Voided transaction"
msgstr "Ungültige Buchung"
#. Dirtying taken care of by SetReadOnly
-#: libgnucash/engine/Transaction.c:2706
+#: libgnucash/engine/Transaction.c:2707
msgid "Transaction Voided"
msgstr "Buchung ungültig gemacht"
@@ -30713,14 +30632,6 @@ msgstr "Weitere benutzbare Kurse eintragen?"
msgid "Found Finance::Quote version ~A."
msgstr "Finance::Quote Version ~A wurde gefunden."
-#: libgnucash/tax/us/de_DE.scm:53
-msgid "Tax Number"
-msgstr "Steuernummer"
-
-#: libgnucash/tax/us/txf-de_DE.scm:324
-msgid "The electronic tax number of your business"
-msgstr "Die Elster-Steuernummer Ihrer Unternehmung"
-
#: libgnucash/tax/us/txf.scm:96
msgid "No help available."
msgstr "Keine Hilfe verfügbar."
Summary of changes:
gnucash/import-export/aqb/gnc-ab-transfer.c | 2 +
gnucash/report/html-table.scm | 6 +
gnucash/report/report.scm | 1 +
gnucash/report/reports/standard/balance-sheet.scm | 18 +-
gnucash/report/reports/standard/balsheet-pnl.scm | 6 +-
.../reports/standard/budget-balance-sheet.scm | 52 +-
.../reports/standard/budget-income-statement.scm | 68 +-
.../report/reports/standard/equity-statement.scm | 530 ++++-----
.../report/reports/standard/income-statement.scm | 45 +-
.../report/reports/standard/test/CMakeLists.txt | 1 +
.../standard/test/test-equity-statement.scm | 120 ++
gnucash/report/reports/standard/trial-balance.scm | 13 +-
po/de.po | 1191 +++++++++-----------
13 files changed, 926 insertions(+), 1127 deletions(-)
create mode 100644 gnucash/report/reports/standard/test/test-equity-statement.scm
More information about the gnucash-changes
mailing list