gnucash maint: [guile-3] change _ to G_
Christopher Lam
clam at code.gnucash.org
Sun Jul 12 08:40:15 EDT 2020
Updated via https://github.com/Gnucash/gnucash/commit/428c8c50 (commit)
from https://github.com/Gnucash/gnucash/commit/a0c1fd61 (commit)
commit 428c8c501c1da46af7b2312c15ae21c61bf0bb0a
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jul 12 19:01:28 2020 +0800
[guile-3] change _ to G_
In guile-3 _ is a reserved symbol. Change to G_ by guile gettext
convention.
diff --git a/bindings/guile/core-utils.scm b/bindings/guile/core-utils.scm
index 53d363dad..b64dd80ce 100644
--- a/bindings/guile/core-utils.scm
+++ b/bindings/guile/core-utils.scm
@@ -24,22 +24,23 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash core-utils))
+(define-module (gnucash core-utils)
+ #:export (N_
+ G_
+ gnc:version))
;; Guile 2 needs to find the symbols from the extension at compile time already
-(eval-when
- (compile load eval expand)
- (load-extension "libgnucash-guile" "gnc_guile_bindings_init"))
+(eval-when (compile load eval expand)
+ (load-extension "libgnucash-guile" "gnc_guile_bindings_init"))
(use-modules (sw_core_utils))
-; Export the swig-wrapped symbols in the public interface of this module
-(let ((i (module-public-interface (current-module))))
- (module-use! i (resolve-interface '(sw_core_utils))))
+;; Export the swig-wrapped symbols in the public interface of this module
+(module-use! (module-public-interface (current-module))
+ (resolve-interface '(sw_core_utils)))
+
+(define gnc:version (gnc-version))
-(define-public gnc:version (gnc-version))
;; gettext functions
-(define-public _ gnc:gettext)
-(define-syntax N_
- (syntax-rules ()
- ((_ x) x)))
-(export N_)
+(define G_ gnc:gettext)
+(define-syntax-rule (N_ x) x)
+
diff --git a/gnucash/gnome/report-menus.scm b/gnucash/gnome/report-menus.scm
index 7fb920417..c230ed08e 100644
--- a/gnucash/gnome/report-menus.scm
+++ b/gnucash/gnome/report-menus.scm
@@ -54,7 +54,7 @@
(template (cdr item))
(report-guid (gnc:report-template-report-guid template))
(menu-tip (or (gnc:report-template-menu-tip template)
- (format #f (_ "Display the ~a report") (_ menu-name))))
+ (format #f (G_ "Display the ~a report") (G_ menu-name))))
(menu-path (append (list gnc:menuname-reports)
(or (gnc:report-template-menu-path template)
'()))))
diff --git a/gnucash/import-export/qif-imp/qif-dialog-utils.scm b/gnucash/import-export/qif-imp/qif-dialog-utils.scm
index 944ada69e..ad6aa53f9 100644
--- a/gnucash/import-export/qif-imp/qif-dialog-utils.scm
+++ b/gnucash/import-export/qif-imp/qif-dialog-utils.scm
@@ -30,14 +30,14 @@
(string-append brokerage (gnc-get-account-separator-string) security))
(define (default-dividend-acct brokerage security)
- (string-append (_ "Income") (gnc-get-account-separator-string)
- (_ "Dividends") (gnc-get-account-separator-string)
+ (string-append (G_ "Income") (gnc-get-account-separator-string)
+ (G_ "Dividends") (gnc-get-account-separator-string)
brokerage (gnc-get-account-separator-string)
security))
(define (default-interest-acct brokerage security)
- (string-append (_ "Income") (gnc-get-account-separator-string)
- (_ "Interest") (gnc-get-account-separator-string)
+ (string-append (G_ "Income") (gnc-get-account-separator-string)
+ (G_ "Interest") (gnc-get-account-separator-string)
brokerage
(if (string=? security "")
""
@@ -45,49 +45,49 @@
security))))
(define (default-capital-return-acct brokerage security)
- (string-append (_ "Income") (gnc-get-account-separator-string)
- (_ "Cap Return") (gnc-get-account-separator-string)
+ (string-append (G_ "Income") (gnc-get-account-separator-string)
+ (G_ "Cap Return") (gnc-get-account-separator-string)
brokerage (gnc-get-account-separator-string)
security))
(define (default-cglong-acct brokerage security)
- (string-append (_ "Income") (gnc-get-account-separator-string)
- (_ "Cap. gain (long)") (gnc-get-account-separator-string)
+ (string-append (G_ "Income") (gnc-get-account-separator-string)
+ (G_ "Cap. gain (long)") (gnc-get-account-separator-string)
brokerage (gnc-get-account-separator-string)
security))
(define (default-cgmid-acct brokerage security)
- (string-append (_ "Income") (gnc-get-account-separator-string)
- (_ "Cap. gain (mid)") (gnc-get-account-separator-string)
+ (string-append (G_ "Income") (gnc-get-account-separator-string)
+ (G_ "Cap. gain (mid)") (gnc-get-account-separator-string)
brokerage (gnc-get-account-separator-string)
security))
(define (default-cgshort-acct brokerage security)
- (string-append (_ "Income") (gnc-get-account-separator-string)
- (_ "Cap. gain (short)") (gnc-get-account-separator-string)
+ (string-append (G_ "Income") (gnc-get-account-separator-string)
+ (G_ "Cap. gain (short)") (gnc-get-account-separator-string)
brokerage (gnc-get-account-separator-string)
security))
(define (default-equity-holding security)
- (string-append (_ "Equity") (gnc-get-account-separator-string)
- (_ "Retained Earnings")))
+ (string-append (G_ "Equity") (gnc-get-account-separator-string)
+ (G_ "Retained Earnings")))
(define (default-equity-account)
- (string-append (_ "Equity") (gnc-get-account-separator-string)
- (_ "Retained Earnings")))
+ (string-append (G_ "Equity") (gnc-get-account-separator-string)
+ (G_ "Retained Earnings")))
(define (default-commission-acct brokerage)
- (string-append (_ "Expenses") (gnc-get-account-separator-string)
- (_ "Commissions") (gnc-get-account-separator-string)
+ (string-append (G_ "Expenses") (gnc-get-account-separator-string)
+ (G_ "Commissions") (gnc-get-account-separator-string)
brokerage))
(define (default-margin-interest-acct brokerage)
- (string-append (_ "Expenses") (gnc-get-account-separator-string)
- (_ "Margin Interest") (gnc-get-account-separator-string)
+ (string-append (G_ "Expenses") (gnc-get-account-separator-string)
+ (G_ "Margin Interest") (gnc-get-account-separator-string)
brokerage))
(define (default-unspec-acct)
- (_ "Unspecified"))
+ (G_ "Unspecified"))
;; The following investment actions implicitly specify
;; the two accounts involved in the transaction.
diff --git a/gnucash/import-export/qif-imp/qif-file.scm b/gnucash/import-export/qif-imp/qif-file.scm
index 035be5747..373812f77 100644
--- a/gnucash/import-export/qif-imp/qif-file.scm
+++ b/gnucash/import-export/qif-imp/qif-file.scm
@@ -82,7 +82,7 @@
;; This procedure simplifies handling of warnings.
(define (mywarn . args)
(let ((str (gnc:list-display-to-string
- (append (list (_ "Line") " " line-num ": ") args))))
+ (append (list (G_ "Line") " " line-num ": ") args))))
(set! private-retval (list #t str))
(qif-import:log progress-dialog "qif-file:read-file" str)))
@@ -90,10 +90,10 @@
;; This procedure simplifies handling of failures
(define (myfail . args)
(let ((str (gnc:list-display-to-string
- (append (list (_ "Line") " " line-num ": ") args))))
+ (append (list (G_ "Line") " " line-num ": ") args))))
(set! private-retval (list #f str))
(qif-import:log progress-dialog "qif-file:read-file"
- (string-append str "\n" (_ "Read aborted.")))
+ (string-append str "\n" (G_ "Read aborted.")))
(set! abort-read #t)))
(define (strip-bom)
@@ -127,7 +127,7 @@
(if progress-dialog
(gnc-progress-dialog-set-sub progress-dialog
- (string-append (_ "Reading") " " path)))
+ (string-append (G_ "Reading") " " path)))
(with-input-from-file path
(lambda ()
@@ -157,12 +157,12 @@
(begin
(set! value (gnc-utf8-strip-invalid-strdup value))
(mywarn
- (_ "Some characters have been discarded.")
- " " (_"Converted to: ") value))
+ (G_ "Some characters have been discarded.")
+ " " (G_"Converted to: ") value))
(begin
(mywarn
- (_ "Some characters have been converted according to your locale.")
- " " (_"Converted to: ") converted-value)
+ (G_ "Some characters have been converted according to your locale.")
+ " " (G_"Converted to: ") converted-value)
(set! value converted-value)))))
(if (eq? tag #\!)
@@ -220,7 +220,7 @@
(if (string-match "^option:"
(symbol->string qstate-type))
(begin
- (mywarn (_ "Ignoring unknown option") " '"
+ (mywarn (G_ "Ignoring unknown option") " '"
qstate-type "'")
(set! qstate-type old-qstate))))))
@@ -354,8 +354,8 @@
(if (qif-xtn:date current-xtn)
(qif-file:add-xtn! self current-xtn)
;; The date is missing! Warn the user.
- (mywarn (_ "Date required.") " "
- (_ "Discarding this transaction.")))
+ (mywarn (G_ "Date required.") " "
+ (G_ "Discarding this transaction.")))
;;(write current-xtn) (newline)
(set! current-xtn (make-qif-xtn))
@@ -387,7 +387,7 @@
(set! current-xtn (make-qif-class)))
(else
- (mywarn (_ "Ignoring class line") ": " line))))
+ (mywarn (G_ "Ignoring class line") ": " line))))
;;;;;;;;;;;;;;;;;;
@@ -455,7 +455,7 @@
(set! current-xtn (make-qif-cat)))
(else
- (mywarn (_ "Ignoring category line") ": " line))))
+ (mywarn (G_ "Ignoring category line") ": " line))))
;;;;;;;;;;;;;;;;;;;
@@ -486,7 +486,7 @@
(set! current-xtn (make-qif-stock-symbol)))
(else
- (mywarn (_ "Ignoring security line") ": " line))))
+ (mywarn (G_ "Ignoring security line") ": " line))))
;; trying to sneak one by, eh?
@@ -494,7 +494,7 @@
(if (and (not qstate-type)
(not (string=? (string-trim line) "")))
(myfail
- (_ "File does not appear to be in QIF format")
+ (G_ "File does not appear to be in QIF format")
": " line)))))
;; Report the progress.
@@ -670,18 +670,18 @@
(qif-import:log progress-dialog
"qif-file:parse-fields"
(string-append (case t
- ((date) (_ "Transaction date"))
- ((split-amounts) (_ "Transaction amount"))
- ((share-price) (_ "Share price"))
- ((num-shares) (_ "Share quantity"))
- ((action) (_ "Investment action"))
- ((cleared) (_ "Reconciliation status"))
- ((commission) (_ "Commission"))
- ((acct-type) (_ "Account type"))
- ((tax-class) (_ "Tax class"))
- ((budget-amt) (_ "Category budget amount"))
- ((budget) (_ "Account budget amount"))
- ((limit) (_ "Credit limit"))
+ ((date) (G_ "Transaction date"))
+ ((split-amounts) (G_ "Transaction amount"))
+ ((share-price) (G_ "Share price"))
+ ((num-shares) (G_ "Share quantity"))
+ ((action) (G_ "Investment action"))
+ ((cleared) (G_ "Reconciliation status"))
+ ((commission) (G_ "Commission"))
+ ((acct-type) (G_ "Account type"))
+ ((tax-class) (G_ "Tax class"))
+ ((budget-amt) (G_ "Category budget amount"))
+ ((budget) (G_ "Account budget amount"))
+ ((limit) (G_ "Credit limit"))
(else (symbol->string t)))
": " e)))
;; Save the error condition.
@@ -694,7 +694,7 @@
;;
;; Fields of categories.
;;
- (set-sub (_ "Parsing categories"))
+ (set-sub (G_ "Parsing categories"))
;; The category tasks will be 5% of the overall parsing effort.
(start-sub 0.05)
@@ -726,7 +726,7 @@
;;
;; Fields of accounts
;;
- (set-sub (_ "Parsing accounts"))
+ (set-sub (G_ "Parsing accounts"))
;; The account tasks will be 5% of the overall parsing effort.
(start-sub 0.05)
@@ -767,7 +767,7 @@
;;
;; fields of transactions
;;
- (set-sub (_ "Parsing transactions"))
+ (set-sub (G_ "Parsing transactions"))
;; Transaction parsing takes up the rest of the overall parsing effort.
(start-sub 1)
@@ -943,7 +943,7 @@
((or (not formats)
(null? formats))
;; Data was not in any of the supplied formats.
- (errorproc errortype (_ "Unrecognized or inconsistent format."))
+ (errorproc errortype (G_ "Unrecognized or inconsistent format."))
(set! retval #f)
(set! do-parsing #f))
@@ -985,7 +985,7 @@
(begin
(set! retval #f)
(errorproc errortype
- (_ "Parsing failed.")))))))
+ (G_ "Parsing failed.")))))))
(set! work-done (+ 1 work-done))
(reporter (/ work-done work-to-do)))
objects))
@@ -1026,9 +1026,9 @@
(if (not (eq? errortype 'date))
(errorproc errortype
(gnc:list-display-to-string (list
- (_ "Parse ambiguity between formats") " "
+ (G_ "Parse ambiguity between formats") " "
formats "\n"
- (format #f (_ "Value '~a' could be ~a or ~a.")
+ (format #f (G_ "Value '~a' could be ~a or ~a.")
parsed
(printer parsed)
(printer this-parsed))))))))))
diff --git a/gnucash/import-export/qif-imp/qif-merge-groups.scm b/gnucash/import-export/qif-imp/qif-merge-groups.scm
index c8bdd1215..660e4a052 100644
--- a/gnucash/import-export/qif-imp/qif-merge-groups.scm
+++ b/gnucash/import-export/qif-imp/qif-merge-groups.scm
@@ -87,7 +87,7 @@
(when progress-dialog
(gnc-progress-dialog-set-sub progress-dialog
- (_ "Finding duplicate transactions")))
+ (G_ "Finding duplicate transactions")))
(let loop ((new-splits new-splits)
(work-done 0)
diff --git a/gnucash/import-export/qif-imp/qif-parse.scm b/gnucash/import-export/qif-imp/qif-parse.scm
index 8e646b550..261c10212 100644
--- a/gnucash/import-export/qif-imp/qif-parse.scm
+++ b/gnucash/import-export/qif-imp/qif-parse.scm
@@ -142,7 +142,7 @@
(list "oth s" GNC-ASSET-TYPE GNC-BANK-TYPE GNC-CASH-TYPE)
(list "mutual" GNC-BANK-TYPE)))
(or (assoc-ref string-map-alist (string-downcase! (string-trim-both read-value)))
- (let ((msg (format #f (_ "Unrecognized account type '~s'. Defaulting to Bank.")
+ (let ((msg (format #f (G_ "Unrecognized account type '~s'. Defaulting to Bank.")
read-value)))
(errorproc errortype msg)
(list GNC-BANK-TYPE))))
@@ -205,7 +205,7 @@
(and read-value
(let ((sym (string->symbol (string-downcase (string-trim-both read-value)))))
(or (any (lambda (lst) (and (memq sym lst) (car lst))) action-map)
- (let ((msg (format #f (_ "Unrecognized action '~a'.") read-value)))
+ (let ((msg (format #f (G_ "Unrecognized action '~a'.") read-value)))
(errorproc errortype msg))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -224,7 +224,7 @@
(not (string-null? read-value))
(let* ((secondchar (string-ref read-value 0)))
(or (any (lambda (m) (and (memq secondchar (cdr m)) (car m))) maplist)
- (let ((msg (format #f (_ "Unrecognized status '~a'. Defaulting to uncleared.")
+ (let ((msg (format #f (G_ "Unrecognized status '~a'. Defaulting to uncleared.")
read-value)))
(errorproc errortype msg))))))
diff --git a/gnucash/import-export/qif-imp/qif-to-gnc.scm b/gnucash/import-export/qif-imp/qif-to-gnc.scm
index 8f56df80a..82d4745f5 100644
--- a/gnucash/import-export/qif-imp/qif-to-gnc.scm
+++ b/gnucash/import-export/qif-imp/qif-to-gnc.scm
@@ -193,7 +193,7 @@
(xaccAccountSetName new-acct new-name)
(xaccAccountSetDescription
new-acct
- (_ "QIF import: Name conflict with another account."))))
+ (G_ "QIF import: Name conflict with another account."))))
;; Set the account type.
(xaccAccountSetType new-acct
@@ -282,7 +282,7 @@
(if progress-dialog
(gnc-progress-dialog-set-sub progress-dialog
- (_ "Preparing to convert your QIF data")))
+ (G_ "Preparing to convert your QIF data")))
;; Build a list of all accounts to create for the import tree.
;; We need to iterate over the account, category, and payee/memo
@@ -333,7 +333,7 @@
;; Build a local account tree to hold converted transactions.
(if progress-dialog
(gnc-progress-dialog-set-sub progress-dialog
- (_ "Creating accounts")))
+ (G_ "Creating accounts")))
;; Sort the account list on the depth of the account path. If a
;; short part is explicitly mentioned, make sure it gets created
@@ -382,7 +382,7 @@
;; duplicates. marked transactions/splits won't get imported.
(if progress-dialog
(gnc-progress-dialog-set-sub progress-dialog
- (_ "Matching transfers between accounts")))
+ (G_ "Matching transfers between accounts")))
(if (> (length markable-xtns) 1)
(let xloop ((xtn (car markable-xtns))
(rest (cdr markable-xtns)))
@@ -400,7 +400,7 @@
(lambda (qif-file)
(if progress-dialog
(gnc-progress-dialog-set-sub progress-dialog
- (string-append (_ "Converting") " "
+ (string-append (G_ "Converting") " "
(qif-file:path qif-file))))
(for-each
(lambda (xtn)
@@ -480,7 +480,7 @@
((not qif-date)
(qif-import:log progress-dialog
"qif-import:qif-xtn-to-gnc-xtn"
- (_ "Missing transaction date."))
+ (G_ "Missing transaction date."))
(throw 'bad-date
"qif-import:qif-xtn-to-gnc-xtn"
"Missing transaction date."
diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm
index 3b6168d11..3aa76d3e1 100644
--- a/gnucash/price-quotes.scm
+++ b/gnucash/price-quotes.scm
@@ -403,7 +403,7 @@
prices)))
(define (show-error msg)
- (gnc:gui-error msg (_ msg)))
+ (gnc:gui-error msg (G_ msg)))
;; Add the alphavantage api key to the environment. This value is taken from
;; the Online Quotes preference tab
@@ -453,7 +453,7 @@ Run 'gnc-fq-update' as root to install them.")))
((memq 'need-alphavantage-key fq-results)
(set! keep-going? #f)
(gnc-error-dialog
- window (format #f (_ "ERROR: ALPHAVANTAGE_API_KEY must be set for currency and quotes; see ~A")
+ window (format #f (G_ "ERROR: ALPHAVANTAGE_API_KEY must be set for currency and quotes; see ~A")
"https://wiki.gnucash.org/wiki/Online_Quotes#Source_Alphavantage.2C_US")))
((memq 'system-error fq-results)
@@ -485,18 +485,18 @@ Run 'gnc-fq-update' as root to install them.")))
(gnc-verify-dialog
window #t (with-output-to-string
(lambda ()
- (display (_ "Unable to retrieve quotes for these items:"))
+ (display (G_ "Unable to retrieve quotes for these items:"))
(display "\n ")
(display (string-join problem-syms "\n "))
(newline)
- (display (_ "Continue using only the good quotes?")))))))
+ (display (G_ "Continue using only the good quotes?")))))))
(else
(set! keep-going? #f)
(gnc-error-dialog
window (with-output-to-string
(lambda ()
- (display (_ "Unable to retrieve quotes for these items:"))
+ (display (G_ "Unable to retrieve quotes for these items:"))
(display "\n ")
(display (string-join problem-syms "\n ")))))))))
@@ -511,11 +511,11 @@ Run 'gnc-fq-update' as root to install them.")))
window #t
(with-output-to-string
(lambda ()
- (display (_ "Unable to create prices for these items:"))
+ (display (G_ "Unable to create prices for these items:"))
(display "\n ")
(display (string-join (filter string? prices) "\n "))
(newline)
- (display (_ "Add remaining good quotes?"))))))
+ (display (G_ "Add remaining good quotes?"))))))
(gnc:warn
(with-output-to-string
(lambda ()
@@ -533,7 +533,7 @@ Run 'gnc-fq-update' as root to install them.")))
(cond
((list? sources)
;; Translators: ~A is the version string
- (format #t (_ "Found Finance::Quote version ~A.") (car sources))
+ (format #t (G_ "Found Finance::Quote version ~A.") (car sources))
(newline)
(gnc:msg "Found Finance::Quote version " (car sources))
(gnc-quote-source-set-fq-installed (car sources) (cdr sources))))))
diff --git a/gnucash/report/eguile.scm b/gnucash/report/eguile.scm
index 0649bce6d..96a351d5c 100644
--- a/gnucash/report/eguile.scm
+++ b/gnucash/report/eguile.scm
@@ -152,7 +152,7 @@
(define (eguile-file-to-string infile environment)
(cond
((not (access? infile R_OK))
- (format #f (_ "Template file \"~a\" can not be read") infile))
+ (format #f (G_ "Template file \"~a\" can not be read") infile))
(else
(let ((script (with-input-from-file infile
(lambda ()
diff --git a/gnucash/report/html-acct-table.scm b/gnucash/report/html-acct-table.scm
index 7ef9ed684..7871e4581 100644
--- a/gnucash/report/html-acct-table.scm
+++ b/gnucash/report/html-acct-table.scm
@@ -591,13 +591,13 @@
(balance-mode (or (get-val env 'balance-mode) 'post-closing))
(closing-pattern (or (get-val env 'closing-pattern)
(list
- (list 'str (_ "Closing Entries"))
+ (list 'str (G_ "Closing Entries"))
(list 'cased #f)
(list 'regexp #f)
(list 'closing #t))))
(adjusting-pattern (or (get-val env 'adjusting-pattern)
(list
- (list 'str (_ "Adjusting Entries"))
+ (list 'str (G_ "Adjusting Entries"))
(list 'cased #f)
(list 'regexp #f))))
(report-budget (or (get-val env 'report-budget) #f))
@@ -790,7 +790,7 @@
(not children-displayed?)
(and (gnc-commodity-collector-allzero? recursive-bal)
(eq? zero-mode 'omit-leaf-acct)))
- (let ((lbl-txt (gnc:make-html-text (_ "Total") " ")))
+ (let ((lbl-txt (gnc:make-html-text (G_ "Total") " ")))
(apply gnc:html-text-append! lbl-txt (gnc:html-text-body label))
(if (eq? subtotal-mode 'canonically-tabbed)
(set! disp-depth (+ disp-depth 1))
diff --git a/gnucash/report/html-chart.scm b/gnucash/report/html-chart.scm
index 147bcc3b3..70d3d49ea 100644
--- a/gnucash/report/html-chart.scm
+++ b/gnucash/report/html-chart.scm
@@ -414,7 +414,7 @@ document.getElementById(chartid).onclick = function(evt) {
(push (format #f "var currsym = ~s;\n" (gnc:html-chart-currency-symbol chart)))
(push (format #f "var chartid = 'chart-~a';\n" id))
(push (format #f "var jumpid = 'jump-~a';\n" id))
- (push (format #f "var loadstring = ~s;\n" (_ "Load")))
+ (push (format #f "var loadstring = ~s;\n" (G_ "Load")))
(push (format #f "var chartjsoptions = ~a;\n\n"
(get-options-string chart)))
diff --git a/gnucash/report/html-style-sheet.scm b/gnucash/report/html-style-sheet.scm
index 6af6ea150..39127fe1c 100644
--- a/gnucash/report/html-style-sheet.scm
+++ b/gnucash/report/html-style-sheet.scm
@@ -97,7 +97,7 @@
(open gnc:current-saved-stylesheets
(logior O_WRONLY O_CREAT O_TRUNC)))))
(if (not port)
- (gnc:warn (_ "Can't save style sheet"))
+ (gnc:warn (G_ "Can't save style sheet"))
(begin
(hash-fold
(lambda (id ss-obj p)
diff --git a/gnucash/report/html-utilities.scm b/gnucash/report/html-utilities.scm
index 61812ca9d..5f44213d2 100644
--- a/gnucash/report/html-utilities.scm
+++ b/gnucash/report/html-utilities.scm
@@ -215,15 +215,15 @@
(gnc:html-table-set-col-headers!
table (list (gnc:make-html-table-header-cell/size
1 2 (if (null? (cdr comm-list))
- (_ "Exchange rate")
- (_ "Exchange rates"))))))
+ (G_ "Exchange rate")
+ (G_ "Exchange rates"))))))
table))
(define (gnc:html-make-generic-budget-warning report-title-string)
(gnc:html-make-generic-simple-warning
report-title-string
- (_ "No budgets exist. You must create at least one budget.")))
+ (G_ "No budgets exist. You must create at least one budget.")))
(define (gnc:html-make-generic-simple-warning report-title-string message)
@@ -243,7 +243,7 @@
(gnc-build-url URL-TYPE-OPTIONS
(string-append "report-id=" (format #f "~a" report-id))
"")
- (_ "Edit report options")))))
+ (G_ "Edit report options")))))
(define* (gnc:html-render-options-changed options #:optional plaintext?)
;; options -> html-object or string, depending on plaintext?. This
@@ -259,7 +259,7 @@
(catch 'wrong-type-arg
(lambda () (proc d))
(const #f)))
- (or (and (boolean? d) (if d (_ "Enabled") (_ "Disabled")))
+ (or (and (boolean? d) (if d (G_ "Enabled") (G_ "Disabled")))
(and (null? d) "null")
(and (list? d) (string-join (map disp d) ", "))
(and (pair? d) (format #f "~a . ~a"
@@ -303,7 +303,7 @@
(let ((p (gnc:make-html-text)))
(gnc:html-text-append!
p
- (gnc:html-markup-h2 (string-append (_ report-title-string) ":"))
+ (gnc:html-markup-h2 (string-append (G_ report-title-string) ":"))
(gnc:html-markup-h2 warning-title-string)
(gnc:html-markup-p warning-string)
(gnc:html-make-options-link report-id))
@@ -315,23 +315,23 @@
report-title-string
report-id
""
- (_ "This report requires you to specify certain report options.")))
+ (G_ "This report requires you to specify certain report options.")))
(define (gnc:html-make-no-account-warning
report-title-string report-id)
(gnc:html-make-generic-warning
report-title-string
report-id
- (_ "No accounts selected")
- (_ "This report requires accounts to be selected in the report options.")))
+ (G_ "No accounts selected")
+ (G_ "This report requires accounts to be selected in the report options.")))
(define (gnc:html-make-empty-data-warning
report-title-string report-id)
(gnc:html-make-generic-warning
report-title-string
report-id
- (_ "No data")
- (_ "The selected accounts contain no data/transactions (or only zeroes) for the selected time period")))
+ (G_ "No data")
+ (G_ "The selected accounts contain no data/transactions (or only zeroes) for the selected time period")))
(define (gnc:html-js-include file)
(format #f
diff --git a/gnucash/report/report-core.scm b/gnucash/report/report-core.scm
index 97556a624..ee6bbb444 100644
--- a/gnucash/report/report-core.scm
+++ b/gnucash/report/report-core.scm
@@ -126,11 +126,11 @@
;; define strings centrally to ease code clarity
(define rpterr-dupe
- (_ "One of your reports has a report-guid that is a duplicate. Please check the report system, especially your saved reports, for a report with this report-guid: "))
-(define rpterr-guid1 (_ "Wrong report definition: "))
-(define rpterr-guid2 (_ " Report is missing a GUID."))
+ (G_ "One of your reports has a report-guid that is a duplicate. Please check the report system, especially your saved reports, for a report with this report-guid: "))
+(define rpterr-guid1 (G_ "Wrong report definition: "))
+(define rpterr-guid2 (G_ " Report is missing a GUID."))
(define rptwarn-legacy
- (_ "Some reports stored in a legacy format were found. This format is not supported anymore so these reports may not have been restored properly."))
+ (G_ "Some reports stored in a legacy format were found. This format is not supported anymore so these reports may not have been restored properly."))
(define (gui-error str)
(if (gnucash-ui-is-running)
(gnc-error-dialog '() str)
@@ -201,7 +201,7 @@ not found.")))
(gnc:make-string-option
gnc:pagename-general gnc:optname-reportname "0a"
(N_ "Enter a descriptive name for this report.")
- (_ (gnc:report-template-name report-template))))
+ (G_ (gnc:report-template-name report-template))))
(stylesheet
(gnc:make-multichoice-option
gnc:pagename-general gnc:optname-stylesheet "0b"
@@ -213,7 +213,7 @@ not found.")))
(string->symbol (gnc:html-style-sheet-name ss))
(gnc:html-style-sheet-name ss)
(string-append (gnc:html-style-sheet-name ss)
- " " (_ "stylesheet."))))
+ " " (G_ "stylesheet."))))
(gnc:get-html-style-sheets)))))
(let ((options (if (procedure? generator)
diff --git a/gnucash/report/report-utilities.scm b/gnucash/report/report-utilities.scm
index 0859bd85f..1ceb1276d 100644
--- a/gnucash/report/report-utilities.scm
+++ b/gnucash/report/report-utilities.scm
@@ -98,24 +98,24 @@
(define (gnc:account-get-type-string-plural type)
(assoc-ref
(list
- (cons ACCT-TYPE-BANK (_ "Bank"))
- (cons ACCT-TYPE-CASH (_ "Cash"))
- (cons ACCT-TYPE-CREDIT (_ "Credits"))
- (cons ACCT-TYPE-ASSET (_ "Assets"))
- (cons ACCT-TYPE-LIABILITY (_ "Liabilities"))
- (cons ACCT-TYPE-STOCK (_ "Stocks"))
- (cons ACCT-TYPE-MUTUAL (_ "Mutual Funds"))
- (cons ACCT-TYPE-CURRENCY (_ "Currencies"))
- (cons ACCT-TYPE-INCOME (_ "Income"))
- (cons ACCT-TYPE-EXPENSE (_ "Expenses"))
- (cons ACCT-TYPE-EQUITY (_ "Equities"))
- (cons ACCT-TYPE-CHECKING (_ "Checking"))
- (cons ACCT-TYPE-SAVINGS (_ "Savings"))
- (cons ACCT-TYPE-MONEYMRKT (_ "Money Market"))
- (cons ACCT-TYPE-RECEIVABLE (_ "Accounts Receivable"))
- (cons ACCT-TYPE-PAYABLE (_ "Accounts Payable"))
- (cons ACCT-TYPE-CREDITLINE (_ "Credit Lines"))
- (cons ACCT-TYPE-TRADING (_ "Trading Accounts")))
+ (cons ACCT-TYPE-BANK (G_ "Bank"))
+ (cons ACCT-TYPE-CASH (G_ "Cash"))
+ (cons ACCT-TYPE-CREDIT (G_ "Credits"))
+ (cons ACCT-TYPE-ASSET (G_ "Assets"))
+ (cons ACCT-TYPE-LIABILITY (G_ "Liabilities"))
+ (cons ACCT-TYPE-STOCK (G_ "Stocks"))
+ (cons ACCT-TYPE-MUTUAL (G_ "Mutual Funds"))
+ (cons ACCT-TYPE-CURRENCY (G_ "Currencies"))
+ (cons ACCT-TYPE-INCOME (G_ "Income"))
+ (cons ACCT-TYPE-EXPENSE (G_ "Expenses"))
+ (cons ACCT-TYPE-EQUITY (G_ "Equities"))
+ (cons ACCT-TYPE-CHECKING (G_ "Checking"))
+ (cons ACCT-TYPE-SAVINGS (G_ "Savings"))
+ (cons ACCT-TYPE-MONEYMRKT (G_ "Money Market"))
+ (cons ACCT-TYPE-RECEIVABLE (G_ "Accounts Receivable"))
+ (cons ACCT-TYPE-PAYABLE (G_ "Accounts Payable"))
+ (cons ACCT-TYPE-CREDITLINE (G_ "Credit Lines"))
+ (cons ACCT-TYPE-TRADING (G_ "Trading Accounts")))
type))
;; Get the list of all different commodities that are used within the
@@ -605,16 +605,16 @@
(define (gnc:report-starting report-name)
(gnc-window-show-progress (format #f
- (_ "Building '~a' report ...")
- (_ report-name))
+ (G_ "Building '~a' report ...")
+ (G_ report-name))
0))
(define (gnc:report-render-starting report-name)
(gnc-window-show-progress (format #f
- (_ "Rendering '~a' report ...")
+ (G_ "Rendering '~a' report ...")
(if (string-null? report-name)
- (_ "Untitled")
- (_ report-name)))
+ (G_ "Untitled")
+ (G_ report-name)))
0))
(define (gnc:report-percent-done percent)
diff --git a/gnucash/report/reports/aging.scm b/gnucash/report/reports/aging.scm
index 7e9165c8e..16a1824bb 100644
--- a/gnucash/report/reports/aging.scm
+++ b/gnucash/report/reports/aging.scm
@@ -222,7 +222,7 @@
"\nClient Currency:" (gnc:strify (company-get-currency company-info)))))
(gnc-error-dialog '() error-str)
(gnc:error error-str)
- (cons #f (format #f (_ "Transactions relating to '~a' contain \
+ (cons #f (format #f (G_ "Transactions relating to '~a' contain \
more than one currency. This report is not designed to cope with this possibility.") (gncOwnerGetName owner))))
(begin
(gnc:debug "it's an old company")
@@ -554,24 +554,24 @@ copying this report to a spreadsheet for use in a mail merge.")
;; more general interval scheme in this report
(define make-heading-list
(list
- (_ "Company")
- (_ "Current")
- (_ "0-30 days")
- (_ "31-60 days")
- (_ "61-90 days")
- (_ "91+ days")
- (_ "Total")))
+ (G_ "Company")
+ (G_ "Current")
+ (G_ "0-30 days")
+ (G_ "31-60 days")
+ (G_ "61-90 days")
+ (G_ "91+ days")
+ (G_ "Total")))
;; following cols are optional
-;; (_ "Address Name")
-;; (_ "Address 1")
-;; (_ "Address 2")
-;; (_ "Address 3")
-;; (_ "Address 4")
-;; (_ "Phone")
-;; (_ "Fax")
-;; (_ "Email")
-;; (_ "Active")
+;; (G_ "Address Name")
+;; (G_ "Address 1")
+;; (G_ "Address 2")
+;; (G_ "Address 3")
+;; (G_ "Address 4")
+;; (G_ "Phone")
+;; (G_ "Fax")
+;; (G_ "Email")
+;; (G_ "Active")
;; Make a list of commodity collectors for column totals
@@ -698,23 +698,23 @@ copying this report to a spreadsheet for use in a mail merge.")
;; add optional column headings
(if disp-addr-name
- (set! heading-list (append heading-list (list (_ "Address Name")))))
+ (set! heading-list (append heading-list (list (G_ "Address Name")))))
(if disp-addr1
- (set! heading-list (append heading-list (list (_ "Address 1")))))
+ (set! heading-list (append heading-list (list (G_ "Address 1")))))
(if disp-addr2
- (set! heading-list (append heading-list (list (_ "Address 2")))))
+ (set! heading-list (append heading-list (list (G_ "Address 2")))))
(if disp-addr3
- (set! heading-list (append heading-list (list (_ "Address 3")))))
+ (set! heading-list (append heading-list (list (G_ "Address 3")))))
(if disp-addr4
- (set! heading-list (append heading-list (list (_ "Address 4")))))
+ (set! heading-list (append heading-list (list (G_ "Address 4")))))
(if disp-addr-phone
- (set! heading-list (append heading-list (list (_ "Phone")))))
+ (set! heading-list (append heading-list (list (G_ "Phone")))))
(if disp-addr-fax
- (set! heading-list (append heading-list (list (_ "Fax")))))
+ (set! heading-list (append heading-list (list (G_ "Fax")))))
(if disp-addr-email
- (set! heading-list (append heading-list (list (_ "Email")))))
+ (set! heading-list (append heading-list (list (G_ "Email")))))
(if disp-active
- (set! heading-list (append heading-list (list (_ "Active")))))
+ (set! heading-list (append heading-list (list (G_ "Active")))))
;; set default title
(gnc:html-document-set-title! document report-title)
@@ -790,7 +790,7 @@ copying this report to a spreadsheet for use in a mail merge.")
(addr-fax (gncAddressGetFax addr))
(addr-email (gncAddressGetEmail addr))
(company-active (if (gncOwnerGetActive owner)
- (_ "Y") (_ "N")))
+ (G_ "Y") (G_ "N")))
(opt-fld-list '())
)
;; (gnc:debug "aging-renderer: disp-addr-source=" disp-addr-source
@@ -847,7 +847,7 @@ copying this report to a spreadsheet for use in a mail merge.")
;; add the totals
(gnc:html-table-append-row!
table
- (cons (_ "Total") (convert-collectors total-collector-list
+ (cons (G_ "Total") (convert-collectors total-collector-list
report-currency
exchange-fn
multi-totals-p)))
@@ -857,7 +857,7 @@ copying this report to a spreadsheet for use in a mail merge.")
(gnc:html-document-add-object!
document
(gnc:make-html-text
- (_ "No valid account selected. Click on the Options button and select the account to use."))))
+ (G_ "No valid account selected. Click on the Options button and select the account to use."))))
(qof-query-destroy query)
(gnc:report-finished)
document))
diff --git a/gnucash/report/reports/example/average-balance.scm b/gnucash/report/reports/example/average-balance.scm
index a34776760..10fdd53a4 100644
--- a/gnucash/report/reports/example/average-balance.scm
+++ b/gnucash/report/reports/example/average-balance.scm
@@ -146,9 +146,9 @@
(define columns
;; Watch out -- these names should be consistent with the display
;; option where you choose them, otherwise users are confused.
- (list (_ "Period start") (_ "Period end") (_ "Average")
- (_ "Maximum") (_ "Minimum") (_ "Gain")
- (_ "Loss") (_ "Profit") ))
+ (list (G_ "Period start") (G_ "Period end") (G_ "Average")
+ (G_ "Maximum") (G_ "Minimum") (G_ "Gain")
+ (G_ "Loss") (G_ "Profit") ))
(define (analyze-splits splits balances daily-dates interval-dates
diff --git a/gnucash/report/reports/example/daily-reports.scm b/gnucash/report/reports/example/daily-reports.scm
index f82e99ad9..b34ccd2e0 100644
--- a/gnucash/report/reports/example/daily-reports.scm
+++ b/gnucash/report/reports/example/daily-reports.scm
@@ -187,9 +187,9 @@
;; in src/engine/FreqSpeq.c. For now, we simply use
;; the normal translations, which show up in the glade
;; file src/gnome-utils/gtkbuilder/gnc-frequency.glade anyway.
- (days-of-week (list (_"Sunday") (_"Monday")
- (_"Tuesday") (_"Wednesday")
- (_"Thursday") (_"Friday") (_"Saturday"))))
+ (days-of-week (list (G_ "Sunday") (G_ "Monday")
+ (G_ "Tuesday") (G_ "Wednesday")
+ (G_ "Thursday") (G_ "Friday") (G_ "Saturday"))))
(gnc:debug daily-totals)
@@ -285,7 +285,7 @@
report-title
(string-append
(format #f
- (_ "~a to ~a")
+ (G_ "~a to ~a")
(qof-print-date from-date)
(qof-print-date to-date))
(if show-total?
diff --git a/gnucash/report/reports/example/hello-world.scm b/gnucash/report/reports/example/hello-world.scm
index 90eb52829..59783c3af 100644
--- a/gnucash/report/reports/example/hello-world.scm
+++ b/gnucash/report/reports/example/hello-world.scm
@@ -324,7 +324,7 @@ option like this.")
;; translation of the given string is available for the
;; current locale, then the translation is returned,
;; otherwise the original string is returned.
- (gnc:html-document-set-title! document (_ "Hello, World"))
+ (gnc:html-document-set-title! document (G_ "Hello, World"))
;; we make a "text object" to add a bunch of text to.
;; the function gnc:make-html-text can take any number of
@@ -339,68 +339,68 @@ option like this.")
(gnc:make-html-text
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "This is a sample GnuCash report. \
+ (G_ "This is a sample GnuCash report. \
See the guile (scheme) source code in the scm/report directory \
for details on writing your own reports, \
or extending existing reports.")))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "For help on writing reports, or to contribute your brand \
+ (G_ "For help on writing reports, or to contribute your brand \
new, totally cool report, consult the mailing list ~a.")
(gnc:html-markup-anchor
"mailto:gnucash-devel at gnucash.org"
(gnc:html-markup-tt "gnucash-devel at gnucash.org")))
- (_ "For details on subscribing to that list, see <https://www.gnucash.org/>.")
- (_ "You can learn more about writing scheme at <https://www.scheme.com/tspl2d/>."))
+ (G_ "For details on subscribing to that list, see <https://www.gnucash.org/>.")
+ (G_ "You can learn more about writing scheme at <https://www.scheme.com/tspl2d/>."))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The current time is ~a.")
+ (G_ "The current time is ~a.")
(gnc:html-markup-b time-string)))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The boolean option is ~a.")
- (gnc:html-markup-b (if bool-val (_ "true") (_ "false")))))
+ (G_ "The boolean option is ~a.")
+ (gnc:html-markup-b (if bool-val (G_ "true") (G_ "false")))))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The radio button option is ~a.")
+ (G_ "The radio button option is ~a.")
(gnc:html-markup-b radio-val)))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The multi-choice option is ~a.")
+ (G_ "The multi-choice option is ~a.")
(gnc:html-markup-b (symbol->string mult-val))))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The string option is ~a.")
+ (G_ "The string option is ~a.")
(gnc:html-markup-b string-val)))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The date option is ~a.")
+ (G_ "The date option is ~a.")
(gnc:html-markup-b date-string)))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The date and time option is ~a.")
+ (G_ "The date and time option is ~a.")
(gnc:html-markup-b date-string2)))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The relative date option is ~a.")
+ (G_ "The relative date option is ~a.")
(gnc:html-markup-b rel-date-string)))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The combination date option is ~a.")
+ (G_ "The combination date option is ~a.")
(gnc:html-markup-b combo-date-string)))
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The number option is ~a.")
+ (G_ "The number option is ~a.")
(gnc:html-markup-b (number->string num-val))))
;; Here we print the value of the number option formatted as
@@ -411,7 +411,7 @@ new, totally cool report, consult the mailing list ~a.")
;; it yourself -- it will be wrong in other locales.
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "The number option formatted as currency is ~a.")
+ (G_ "The number option formatted as currency is ~a.")
(gnc:html-markup-b
(xaccPrintAmount
(inexact->exact num-val)
@@ -423,7 +423,7 @@ new, totally cool report, consult the mailing list ~a.")
(gnc:html-document-add-object!
document
(gnc:make-html-text
- (gnc:html-markup-p (_ "Items you selected:"))))
+ (gnc:html-markup-p (G_ "Items you selected:"))))
(if (not (null? list-val))
(let ((table (gnc:make-html-table)))
@@ -432,12 +432,12 @@ new, totally cool report, consult the mailing list ~a.")
(gnc:html-table-set-style! table "table"
'attribute (list "style" "width:200px"))
(gnc:html-table-set-caption! table
- (_ "List items selected"))
+ (G_ "List items selected"))
(gnc:html-document-add-object! document table))
(let ((txt (gnc:make-html-text)))
(gnc:html-text-append!
txt
- (gnc:html-markup-p (_ "(You selected no list items.)")))
+ (gnc:html-markup-p (G_ "(You selected no list items.)")))
(gnc:html-document-add-object! document txt)))
;; here's a bullet list of accounts. We can mark up the
@@ -473,17 +473,17 @@ new, totally cool report, consult the mailing list ~a.")
(gnc:html-document-add-object!
document
(gnc:make-html-text
- (gnc:html-markup-p (_ "You have selected no accounts.")))))
+ (gnc:html-markup-p (G_ "You have selected no accounts.")))))
(gnc:html-document-add-object!
document
(gnc:make-html-text
- (gnc:html-markup-anchor (gnc-build-url URL-TYPE-HELP "gnucash-guide" "") (_ "Display help"))))
+ (gnc:html-markup-anchor (gnc-build-url URL-TYPE-HELP "gnucash-guide" "") (G_ "Display help"))))
(gnc:html-document-add-object!
document
(gnc:make-html-text
- (gnc:html-markup-p (_ "Have a nice day!"))))
+ (gnc:html-markup-p (G_ "Have a nice day!"))))
document)))
diff --git a/gnucash/report/reports/example/sample-graphs.scm b/gnucash/report/reports/example/sample-graphs.scm
index 53fda5051..7242f8ae3 100644
--- a/gnucash/report/reports/example/sample-graphs.scm
+++ b/gnucash/report/reports/example/sample-graphs.scm
@@ -33,7 +33,7 @@
;; Add this module to enable translatable strings
;; Use (N_ string) to mark string for translation (it won't be translated on the spot)
-;; Use (_ string) to use a translation of this string if it exists.
+;; Use (G_ string) to use a translation of this string if it exists.
(use-modules (gnucash core-utils))
;; It's common to define frequently used strings once
@@ -135,26 +135,26 @@
(let ((document (gnc:make-html-document)))
- (gnc:html-document-set-title! document (_ reportname))
+ (gnc:html-document-set-title! document (G_ reportname))
(gnc:html-document-add-object!
document
- (gnc:make-html-text (gnc:html-markup-p (_ "Pie:"))))
+ (gnc:make-html-text (gnc:html-markup-p (G_ "Pie:"))))
(gnc:html-document-add-object! document (simple-pie-chart))
(gnc:html-document-add-object!
document
- (gnc:make-html-text (gnc:html-markup-p (_ "Bar, normal:"))))
+ (gnc:make-html-text (gnc:html-markup-p (G_ "Bar, normal:"))))
(gnc:html-document-add-object! document (simple-bar-chart #f))
(gnc:html-document-add-object!
document
- (gnc:make-html-text (gnc:html-markup-p (_ "Bar, stacked:"))))
+ (gnc:make-html-text (gnc:html-markup-p (G_ "Bar, stacked:"))))
(gnc:html-document-add-object! document (simple-bar-chart #t))
(gnc:html-document-add-object!
document
- (gnc:make-html-text (gnc:html-markup-p (_ "Scatter:"))))
+ (gnc:make-html-text (gnc:html-markup-p (G_ "Scatter:"))))
(gnc:html-document-add-object! document (simple-scatter-chart))
document))
@@ -179,11 +179,11 @@
;; The name in the menu
;; (only necessary if it differs from the name)
- 'menu-name (_ reportname)
+ 'menu-name (G_ reportname)
;; A tip that is used to provide additional information about the
;; report to the user.
- 'menu-tip (_ reportname)
+ 'menu-tip (G_ reportname)
;; A path describing where to put the report in the menu system.
;; In this case, it's going under the utility menu.
diff --git a/gnucash/report/reports/example/welcome-to-gnucash.scm b/gnucash/report/reports/example/welcome-to-gnucash.scm
index 4c8c0abe5..6675312ae 100644
--- a/gnucash/report/reports/example/welcome-to-gnucash.scm
+++ b/gnucash/report/reports/example/welcome-to-gnucash.scm
@@ -25,7 +25,7 @@
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
-(use-modules (gnucash core-utils)) ; for gnc:version and (_ ...)
+(use-modules (gnucash core-utils)) ; for gnc:version and (G_ ...)
(use-modules (gnucash app-utils))
(use-modules (gnucash report))
@@ -38,10 +38,10 @@
doc
(gnc:make-html-text
(gnc:html-markup-h2
- (format #f (_ "Welcome to GnuCash ~a !")
+ (format #f (G_ "Welcome to GnuCash ~a !")
gnc:version))
(gnc:html-markup-p
- (format #f (_ "GnuCash ~a has lots of nice features. Here are a few.")
+ (format #f (G_ "GnuCash ~a has lots of nice features. Here are a few.")
gnc:version))))
doc))
diff --git a/gnucash/report/reports/locale-specific/de_DE/taxtxf.scm b/gnucash/report/reports/locale-specific/de_DE/taxtxf.scm
index 5e8b1bc95..f729f2316 100644
--- a/gnucash/report/reports/locale-specific/de_DE/taxtxf.scm
+++ b/gnucash/report/reports/locale-specific/de_DE/taxtxf.scm
@@ -69,7 +69,7 @@
(define-module (gnucash reports locale-specific de_DE taxtxf))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
-(use-modules (gnucash core-utils)) ; for gnc:version and (_ ...)
+(use-modules (gnucash core-utils)) ; for gnc:version and (G_ ...)
(use-modules (gnucash app-utils))
(use-modules (gnucash locale de_DE tax))
(use-modules (gnucash report))
@@ -262,7 +262,7 @@
(gnc:html-markup-p
(gnc:html-markup
"blue"
- (_ "WARNING: There are duplicate TXF codes assigned\
+ (G_ "WARNING: There are duplicate TXF codes assigned\
to some accounts. Only TXF codes with payer sources may be repeated."))))
(map (lambda (s)
(gnc:html-text-append!
@@ -287,10 +287,10 @@
(gnc:html-table-prepend-row!
table
(append (list (gnc:make-html-table-header-cell/markup
- "account-header" (_ "Account Name")))
+ "account-header" (G_ "Account Name")))
(make-sub-headers max-level)
(list (gnc:make-html-table-header-cell/markup
- "number-header" (_ "Total"))))))
+ "number-header" (G_ "Total"))))))
(define (make-sub-headers max-level)
(if (<= max-level 1)
@@ -828,7 +828,7 @@
"center"
(gnc:html-markup-p
(gnc:html-markup/format
- (_ "Period from ~a to ~a") from-date to-date)))))
+ (G_ "Period from ~a to ~a") from-date to-date)))))
(gnc:html-document-add-object!
doc (gnc:make-html-text
@@ -871,17 +871,17 @@ Gehen Sie zu Bearbeiten -> Optionen Steuerbericht, um Konten entsprechend einzur
'options-generator tax-options-generator
'renderer (lambda (report-obj)
(generate-tax-or-txf
- (_ "Taxable Income / Deductible Expenses")
- (_ "This report shows your Taxable Income and \
+ (G_ "Taxable Income / Deductible Expenses")
+ (G_ "This report shows your Taxable Income and \
Deductible Expenses.")
report-obj
#t
#f))
- 'export-types (list (cons (_ "XML") 'txf))
+ 'export-types (list (cons (G_ "XML") 'txf))
'export-thunk (lambda (report-obj choice file-name)
(generate-tax-or-txf
- (_ "Taxable Income / Deductible Expenses")
- (_ "This page shows your Taxable Income and \
+ (G_ "Taxable Income / Deductible Expenses")
+ (G_ "This page shows your Taxable Income and \
Deductible Expenses.")
report-obj
#f
diff --git a/gnucash/report/reports/locale-specific/us/taxtxf.scm b/gnucash/report/reports/locale-specific/us/taxtxf.scm
index 22886628e..cce8e174d 100644
--- a/gnucash/report/reports/locale-specific/us/taxtxf.scm
+++ b/gnucash/report/reports/locale-specific/us/taxtxf.scm
@@ -101,7 +101,7 @@
(define-module (gnucash reports locale-specific us taxtxf))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
-(use-modules (gnucash core-utils)) ; for gnc:version and (_ ...)
+(use-modules (gnucash core-utils)) ; for gnc:version and (G_ ...)
(use-modules (gnucash app-utils))
(use-modules (gnucash locale us tax))
(use-modules (gnucash gnome-utils))
@@ -3371,8 +3371,8 @@
'options-generator tax-options-generator
'renderer (lambda (report-obj)
(generate-tax-schedule
- (_ "Taxable Income/Deductible Expenses")
- (_ "This report shows transaction detail for your accounts \
+ (G_ "Taxable Income/Deductible Expenses")
+ (G_ "This report shows transaction detail for your accounts \
related to Income Taxes.")
report-obj
#t
@@ -3380,8 +3380,8 @@ related to Income Taxes.")
'export-types (list (cons "TXF" 'txf))
'export-thunk (lambda (report-obj choice file-name)
(generate-tax-schedule
- (_ "Taxable Income/Deductible Expenses")
- (_ "This page shows transaction detail for relevant \
+ (G_ "Taxable Income/Deductible Expenses")
+ (G_ "This page shows transaction detail for relevant \
Income Tax accounts.")
report-obj
#f
diff --git a/gnucash/report/reports/standard/account-piecharts.scm b/gnucash/report/reports/standard/account-piecharts.scm
index c8dc53b96..6bbec4cfb 100644
--- a/gnucash/report/reports/standard/account-piecharts.scm
+++ b/gnucash/report/reports/standard/account-piecharts.scm
@@ -410,9 +410,9 @@ balance at a given time"))
;; accordingly.
(report-title
(case averaging-selection
- ((YearDelta) (string-append report-title " " (_ "Yearly Average")))
- ((MonthDelta) (string-append report-title " " (_ "Monthly Average")))
- ((WeekDelta) (string-append report-title " " (_ "Weekly Average")))
+ ((YearDelta) (string-append report-title " " (G_ "Yearly Average")))
+ ((MonthDelta) (string-append report-title " " (G_ "Monthly Average")))
+ ((WeekDelta) (string-append report-title " " (G_ "Weekly Average")))
(else report-title)))
(combined '())
(other-anchor "")
@@ -488,7 +488,7 @@ balance at a given time"))
(sum (apply + (unzip1 finish))))
(set! combined
(append start
- (list (list sum (_ "Other")))))
+ (list (list sum (G_ "Other")))))
(if depth-based?
(let ((options (gnc:make-report-options report-guid))
(id #f))
@@ -541,11 +541,11 @@ balance at a given time"))
(string-append
(if do-intervals?
(format #f
- (_ "~a to ~a")
+ (G_ "~a to ~a")
(qof-print-date from-date)
(qof-print-date to-date))
(format #f
- (_ "Balance at ~a")
+ (G_ "Balance at ~a")
(qof-print-date to-date)))
(if show-total?
(let ((total (apply + (unzip1 combined))))
diff --git a/gnucash/report/reports/standard/account-summary.scm b/gnucash/report/reports/standard/account-summary.scm
index 4442f9b0a..0ea163838 100644
--- a/gnucash/report/reports/standard/account-summary.scm
+++ b/gnucash/report/reports/standard/account-summary.scm
@@ -145,7 +145,7 @@
(add-option
(gnc:make-string-option
gnc:pagename-general optname-report-title
- "a" opthelp-report-title (_ reportname)))
+ "a" opthelp-report-title (G_ reportname)))
(add-option
(gnc:make-string-option
gnc:pagename-general optname-party-name
@@ -322,7 +322,7 @@
company-name " " report-title " "
(if sx?
;; Translators: This is part of the report title, which is capitalzed in English, but not all other languages
- (format #f (_ "For Period Covering ~a to ~a")
+ (format #f (G_ "For Period Covering ~a to ~a")
(qof-print-date from-date)
(qof-print-date to-date))
(qof-print-date to-date))))
@@ -403,10 +403,10 @@
build-table
(map make-header
(append
- (if show-code? (list (_ "Code")) '())
- (if show-type? (list (_ "Type")) '())
- (if show-desc? (list (_ "Description")) '())
- (list (_ "Account title")))))
+ (if show-code? (list (G_ "Code")) '())
+ (if show-type? (list (G_ "Type")) '())
+ (if show-desc? (list (G_ "Description")) '())
+ (list (G_ "Account title")))))
;; add any fields to be displayed before the account name
(if show-code? (add-col 'account-code))
(if show-type? (add-col 'account-type-string))
@@ -418,7 +418,7 @@
account-cols))
(when show-bals?
(gnc:html-table-set-cell/tag!
- build-table 0 (+ cur-col account-cols) "number-header" (_ "Balance")))
+ build-table 0 (+ cur-col account-cols) "number-header" (G_ "Balance")))
(let rowloop ((row 0))
(when (< row table-rows)
(gnc:html-table-set-row-markup!
@@ -433,7 +433,7 @@
(set! cur-col (+ cur-col hold-table-width))
(when show-notes?
(gnc:html-table-set-cell/tag!
- build-table 0 cur-col "number-header" (_ "Notes"))
+ build-table 0 cur-col "number-header" (G_ "Notes"))
(add-col 'account-notes))
(gnc:html-document-add-object! doc build-table)
diff --git a/gnucash/report/reports/standard/advanced-portfolio.scm b/gnucash/report/reports/standard/advanced-portfolio.scm
index 66d6d50c4..ef0be616c 100644
--- a/gnucash/report/reports/standard/advanced-portfolio.scm
+++ b/gnucash/report/reports/standard/advanced-portfolio.scm
@@ -1004,8 +1004,8 @@ by preventing negative stock balances.<br/>")
(lambda (foreign domestic date)
(find-price (gnc-pricedb-lookup-nearest-in-time-any-currency-t64
pricedb foreign (time64CanonicalDayTime date)) domestic)))))
- (headercols (list (_ "Account")))
- (totalscols (list (gnc:make-html-table-cell/markup "total-label-cell" (_ "Total"))))
+ (headercols (list (G_ "Account")))
+ (totalscols (list (gnc:make-html-table-cell/markup "total-label-cell" (G_ "Total"))))
(sum-total-moneyin (gnc-numeric-zero))
(sum-total-income (gnc-numeric-zero))
(sum-total-both-gains (gnc-numeric-zero))
@@ -1016,37 +1016,37 @@ by preventing negative stock balances.<br/>")
;;begin building lists for which columns to display
(if show-symbol
- (begin (append! headercols (list (_ "Symbol")))
+ (begin (append! headercols (list (G_ "Symbol")))
(append! totalscols (list " "))))
(if show-listing
- (begin (append! headercols (list (_ "Listing")))
+ (begin (append! headercols (list (G_ "Listing")))
(append! totalscols (list " "))))
(if show-shares
- (begin (append! headercols (list (_ "Shares")))
+ (begin (append! headercols (list (G_ "Shares")))
(append! totalscols (list " "))))
(if show-price
- (begin (append! headercols (list (_ "Price")))
+ (begin (append! headercols (list (G_ "Price")))
(append! totalscols (list " "))))
(append! headercols (list " "
- (_ "Basis")
- (_ "Value")
- (_ "Money In")
- (_ "Money Out")
- (_ "Realized Gain")
- (_ "Unrealized Gain")
- (_ "Total Gain")
- (_ "Rate of Gain")
- (_ "Income")))
+ (G_ "Basis")
+ (G_ "Value")
+ (G_ "Money In")
+ (G_ "Money Out")
+ (G_ "Realized Gain")
+ (G_ "Unrealized Gain")
+ (G_ "Total Gain")
+ (G_ "Rate of Gain")
+ (G_ "Income")))
(if (not (eq? handle-brokerage-fees 'ignore-brokerage))
- (append! headercols (list (_ "Brokerage Fees"))))
+ (append! headercols (list (G_ "Brokerage Fees"))))
- (append! headercols (list (_ "Total Return")
- (_ "Rate of Return")))
+ (append! headercols (list (G_ "Total Return")
+ (G_ "Rate of Return")))
(append! totalscols (list " "))
@@ -1144,14 +1144,14 @@ by preventing negative stock balances.<br/>")
(gnc:html-document-add-object! document table)
(if (hashq-ref warnings 'warn-price-dirty)
(gnc:html-document-append-objects! document
- (list (gnc:make-html-text (_ "* this commodity data was built using transaction pricing instead of the price list."))
+ (list (gnc:make-html-text (G_ "* this commodity data was built using transaction pricing instead of the price list."))
(gnc:make-html-text (gnc:html-markup-br))
- (gnc:make-html-text (_ "If you are in a multi-currency situation, the exchanges may not be correct.")))))
+ (gnc:make-html-text (G_ "If you are in a multi-currency situation, the exchanges may not be correct.")))))
(if (hashq-ref warnings 'warn-no-price)
(gnc:html-document-append-objects! document
(list (gnc:make-html-text (if (hashq-ref warnings 'warn-price-dirty) (gnc:html-markup-br) ""))
- (gnc:make-html-text (_ "** this commodity has no price and a price of 1 has been used.")))))
+ (gnc:make-html-text (G_ "** this commodity has no price and a price of 1 has been used.")))))
)
;if no accounts selected.
diff --git a/gnucash/report/reports/standard/balance-forecast.scm b/gnucash/report/reports/standard/balance-forecast.scm
index 09bd47cd1..94506ecae 100644
--- a/gnucash/report/reports/standard/balance-forecast.scm
+++ b/gnucash/report/reports/standard/balance-forecast.scm
@@ -35,7 +35,7 @@
(define reportname (N_ "Balance Forecast"))
(define optname-accounts (N_ "Accounts"))
-(define opthelp-accounts (_ "Report on these accounts."))
+(define opthelp-accounts (G_ "Report on these accounts."))
(define optname-from-date (N_ "Start Date"))
(define optname-to-date (N_ "End Date"))
@@ -47,25 +47,25 @@
(define optname-plot-width (N_ "Plot Width"))
(define optname-plot-height (N_ "Plot Height"))
(define optname-show-markers (N_ "Data markers?"))
-(define opthelp-show-markers (_ "Display a mark for each data point."))
+(define opthelp-show-markers (G_ "Display a mark for each data point."))
(define optname-show-reserve (N_ "Show reserve line"))
-(define opthelp-show-reserve (_ "Show reserve line"))
+(define opthelp-show-reserve (G_ "Show reserve line"))
(define optname-reserve (N_ "Reserve amount"))
-(define opthelp-reserve (_ "The reserve amount is set to a \
+(define opthelp-reserve (G_ "The reserve amount is set to a \
minimum balance desired"))
(define optname-show-target (N_ "Show target line"))
-(define opthelp-show-target (_ "Show target line"))
+(define opthelp-show-target (G_ "Show target line"))
(define optname-target (N_ "Target amount above reserve"))
-(define opthelp-target (_ "The target is used to plan for \
+(define opthelp-target (G_ "The target is used to plan for \
a future large purchase, which will be added as a line above the \
reserve amount."))
(define optname-show-minimum (N_ "Show future minimum"))
-(define opthelp-show-minimum (_ "The future minimum will add, for each \
+(define opthelp-show-minimum (G_ "The future minimum will add, for each \
date point, a projected minimum balance including scheduled transactions."))
; Options generator
@@ -233,7 +233,7 @@ date point, a projected minimum balance including scheduled transactions."))
(when show-minimum
(gnc:html-chart-add-data-series!
chart
- (_ "Minimum")
+ (G_ "Minimum")
(let loop ((balances balances) (result '()))
(if (null? balances) (reverse! result)
(loop (cdr balances) (cons (apply min balances) result))))
@@ -244,7 +244,7 @@ date point, a projected minimum balance including scheduled transactions."))
;; Balance line (do this here so it draws over the minimum line)
(gnc:html-chart-add-data-series!
- chart (_ "Balance") balances "#0A0"
+ chart (G_ "Balance") balances "#0A0"
'fill #f
'borderWidth 1.5
'pointRadius markers)
@@ -252,7 +252,7 @@ date point, a projected minimum balance including scheduled transactions."))
;; Target line
(when show-target
(gnc:html-chart-add-data-series!
- chart (_ "Target")
+ chart (G_ "Target")
(make-list (length intervals) (+ reserve target))
"#FF0"
'fill #f
@@ -262,7 +262,7 @@ date point, a projected minimum balance including scheduled transactions."))
;; Reserve line
(when show-reserve
(gnc:html-chart-add-data-series!
- chart (_ "Reserve") (make-list (length intervals) reserve)
+ chart (G_ "Reserve") (make-list (length intervals) reserve)
"#F00"
'fill #f
'borderWidth 1.5
@@ -272,7 +272,7 @@ date point, a projected minimum balance including scheduled transactions."))
;; Set the chart titles
(gnc:html-chart-set-title!
chart (list report-title
- (format #f (_ "~a to ~a")
+ (format #f (G_ "~a to ~a")
(qof-print-date from-date) (qof-print-date to-date))))
;; Set the chart size
(gnc:html-chart-set-width! chart plot-width)
diff --git a/gnucash/report/reports/standard/balance-sheet.scm b/gnucash/report/reports/standard/balance-sheet.scm
index 80db72f75..dddc7dfdc 100644
--- a/gnucash/report/reports/standard/balance-sheet.scm
+++ b/gnucash/report/reports/standard/balance-sheet.scm
@@ -154,7 +154,7 @@
(add-option
(gnc:make-string-option
gnc:pagename-general optname-report-title
- "a" opthelp-report-title (_ reportname)))
+ "a" opthelp-report-title (G_ reportname)))
(add-option
(gnc:make-string-option
gnc:pagename-general optname-party-name
@@ -383,11 +383,11 @@
(let* ((liability-table
(gnc:make-html-acct-table/env/accts table-env liability-accounts)))
(when label-liabilities?
- (add-subtotal-line parent-table (_ "Liabilities") #f #f))
+ (add-subtotal-line parent-table (G_ "Liabilities") #f #f))
(gnc:html-table-add-account-balances parent-table liability-table params)
(when total-liabilities?
(add-subtotal-line
- parent-table (_ "Total Liabilities") #f liability-balance))
+ parent-table (G_ "Total Liabilities") #f liability-balance))
(add-rule parent-table)))
(define (get-total-value-fn account)
@@ -482,10 +482,10 @@
(gnc:report-percent-done 80)
(when label-assets?
- (add-subtotal-line left-table (_ "Assets") #f #f))
+ (add-subtotal-line left-table (G_ "Assets") #f #f))
(gnc:html-table-add-account-balances left-table asset-table params)
(when total-assets?
- (add-subtotal-line left-table (_ "Total Assets") #f asset-balance))
+ (add-subtotal-line left-table (G_ "Total Assets") #f asset-balance))
(when report-form?
(add-rule left-table)
@@ -499,29 +499,29 @@
(gnc:report-percent-done 88)
(when label-equity?
- (add-subtotal-line right-table (_ "Equity") #f #f))
+ (add-subtotal-line right-table (G_ "Equity") #f #f))
(gnc:html-table-add-account-balances right-table equity-table params)
;; we omit retained earnings & unrealized gains
;; from the balance report, if zero, since they
;; are not present on normal balance sheets
(unless (gnc-commodity-collector-allzero? retained-earnings)
(add-subtotal-line right-table
- (_ "Retained Earnings")
- (_ "Retained Losses")
+ (G_ "Retained Earnings")
+ (G_ "Retained Losses")
retained-earnings))
(unless (gnc-commodity-collector-allzero? trading-balance)
(add-subtotal-line right-table
- (_ "Trading Gains")
- (_ "Trading Losses")
+ (G_ "Trading Gains")
+ (G_ "Trading Losses")
trading-balance))
(unless (gnc-commodity-collector-allzero? unrealized-gain-collector)
(add-subtotal-line right-table
- (_ "Unrealized Gains")
- (_ "Unrealized Losses")
+ (G_ "Unrealized Gains")
+ (G_ "Unrealized Losses")
unrealized-gain-collector))
(when total-equity?
(add-subtotal-line
- right-table (_ "Total Equity") #f total-equity-balance))
+ right-table (G_ "Total Equity") #f total-equity-balance))
(add-rule right-table)
@@ -531,7 +531,7 @@
total-liabilities? liability-balance))
(add-subtotal-line
- right-table (gnc:html-string-sanitize (_ "Total Liabilities & Equity"))
+ right-table (gnc:html-string-sanitize (G_ "Total Liabilities & Equity"))
#f liability-plus-equity)
(gnc:html-document-add-object!
diff --git a/gnucash/report/reports/standard/balsheet-eg.scm b/gnucash/report/reports/standard/balsheet-eg.scm
index 40ccb80ae..4383e647a 100644
--- a/gnucash/report/reports/standard/balsheet-eg.scm
+++ b/gnucash/report/reports/standard/balsheet-eg.scm
@@ -140,7 +140,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; All the options stuff starts here
-(define reportname (_ "Balance Sheet (eguile)"))
+(define reportname (G_ "Balance Sheet (eguile)"))
;; define all option's names and help text so that they are properly
;; defined in *one* place.
@@ -383,10 +383,10 @@
;; Reason 1: zero Imbalance a/c
;; The line break in the next expressions will suppress comments as translator comments.
(string-prefix?
- (_ "Imbalance") (xaccAccountGetName (accrec-account accrec)))
+ (G_ "Imbalance") (xaccAccountGetName (accrec-account accrec)))
;; Reason 2: zero Orphan a/c
(string-prefix?
- (_ "Orphan") (xaccAccountGetName (accrec-account accrec))))))
+ (G_ "Orphan") (xaccAccountGetName (accrec-account accrec))))))
(define (flattened-acc-depth acc)
;; Accounts deeper than required get moved to the requested depth
diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm
index 4269ab2aa..843283d1c 100644
--- a/gnucash/report/reports/standard/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -49,7 +49,7 @@
(define FOOTER-TEXT
(gnc:make-html-text
- (_ "WARNING: Foreign currency conversions, and unrealized gains
+ (G_ "WARNING: Foreign currency conversions, and unrealized gains
calculations are not confirmed correct. This report may be modified
without notice. Bug reports are very welcome at
https://bugs.gnucash.org/")))
@@ -134,32 +134,32 @@ also show overall period profit & loss."))
(define periodlist
(list
(list 'disabled
- (cons 'text (_ "Disabled"))
- (cons 'tip (_ "Disabled")))
+ (cons 'text (G_ "Disabled"))
+ (cons 'tip (G_ "Disabled")))
(list 'YearDelta
- (cons 'text (_ "Year"))
- (cons 'tip (_ "One year.")))
+ (cons 'text (G_ "Year"))
+ (cons 'tip (G_ "One year.")))
(list 'HalfYearDelta
- (cons 'text (_ "Half Year"))
- (cons 'tip (_ "Half Year.")))
+ (cons 'text (G_ "Half Year"))
+ (cons 'tip (G_ "Half Year.")))
(list 'QuarterDelta
- (cons 'text (_ "Quarter"))
- (cons 'tip (_ "One Quarter.")))
+ (cons 'text (G_ "Quarter"))
+ (cons 'tip (G_ "One Quarter.")))
(list 'MonthDelta
- (cons 'text (_ "Month"))
- (cons 'tip (_ "One Month.")))
+ (cons 'text (G_ "Month"))
+ (cons 'tip (G_ "One Month.")))
(list 'TwoWeekDelta
- (cons 'text (_ "2Week"))
- (cons 'tip (_ "Two Weeks.")))
+ (cons 'text (G_ "2Week"))
+ (cons 'tip (G_ "Two Weeks.")))
(list 'WeekDelta
- (cons 'text (_ "Week"))
- (cons 'tip (_ "One Week.")))))
+ (cons 'text (G_ "Week"))
+ (cons 'tip (G_ "One Week.")))))
(define (keylist->vectorlist keylist)
(map
@@ -235,11 +235,11 @@ also show overall period profit & loss."))
"d" opthelp-options-summary
'never
(list (vector 'always
- (_ "Always")
- (_ "Always display summary."))
+ (G_ "Always")
+ (G_ "Always display summary."))
(vector 'never
- (_ "Never")
- (_ "Disable report summary.")))))
+ (G_ "Never")
+ (G_ "Disable report summary.")))))
;; accounts to work on
(add-option
@@ -493,7 +493,7 @@ also show overall period profit & loss."))
(disable-account-indent? (gnc-account-get-full-name account))
(else (xaccAccountGetName account))))
(acct-label (if (and (not virtual?) total?)
- (string-append (_ "Total For ") acct-name)
+ (string-append (G_ "Total For ") acct-name)
acct-name))
(acct-url (and account-anchor?
(not total?)
@@ -649,7 +649,7 @@ also show overall period profit & loss."))
(if show-total?
(add-indented-row 0
- (string-append (_ "Total For ") title)
+ (string-append (G_ "Total For ") title)
"total-label-cell"
"primary-subheading"
maxindent
@@ -841,7 +841,7 @@ also show overall period profit & loss."))
(format #f "~a ~a "
(gnc:monetary->string orig-monetary)
(gnc-commodity-get-nice-symbol common-currency))
- (_ "missing")))))
+ (G_ "missing")))))
(gnc:html-text-append! cell (gnc:html-markup-br)))
commodities)
(gnc:make-html-table-cell/markup "number-cell" cell))))
@@ -905,7 +905,7 @@ also show overall period profit & loss."))
(display report-title)
(display " ")
(if (or (not (eq? incr 'disabled)) (eq? report-type 'pnl))
- (format #t (_ "~a to ~a")
+ (format #t (G_ "~a to ~a")
(qof-print-date startdate) (qof-print-date enddate))
(display (qof-print-date enddate))))))
@@ -1076,49 +1076,49 @@ also show overall period profit & loss."))
))))
(unless (eq? incr 'disabled)
- (add-to-table multicol-table-left (_ "Date") '()
+ (add-to-table multicol-table-left (G_ "Date") '()
#:get-col-header-fn get-col-header-fn
#:show-accounts? #f
#:show-total? #f)
(if enable-dual-columns?
- (add-to-table multicol-table-right (_ "Date") '()
+ (add-to-table multicol-table-right (G_ "Date") '()
#:get-col-header-fn get-col-header-fn
#:show-accounts? #f
#:show-total? #f)))
(unless (null? asset-accounts)
- (add-to-table multicol-table-left (_ "Asset") asset-accounts))
+ (add-to-table multicol-table-left (G_ "Asset") asset-accounts))
(unless (null? liability-accounts)
- (add-to-table multicol-table-right (_ "Liability") liability-accounts
+ (add-to-table multicol-table-right (G_ "Liability") liability-accounts
#:negate-amounts? #t))
(add-to-table
- multicol-table-right (_ "Equity")
+ multicol-table-right (G_ "Equity")
(append equity-accounts
(cond
(use-trading-accts? trading-accounts)
- (common-currency (list (vector (_ "Unrealized Gains")
+ (common-currency (list (vector (G_ "Unrealized Gains")
unrealized-gain-fn)))
(else '()))
(if (null? income-expense)
'()
- (list (vector (_ "Retained Earnings")
+ (list (vector (G_ "Retained Earnings")
retained-earnings-fn))))
#:negate-amounts? #t)
- (add-to-table multicol-table-right (_ "Liability and Equity")
+ (add-to-table multicol-table-right (G_ "Liability and Equity")
(append liability-accounts
equity-accounts
(cond
(use-trading-accts? trading-accounts)
- (common-currency (list (vector (_ "Unrealized Gains")
+ (common-currency (list (vector (G_ "Unrealized Gains")
unrealized-gain-fn)))
(else '()))
(if (null? income-expense)
'()
- (list (vector (_ "Retained Earnings")
+ (list (vector (G_ "Retained Earnings")
retained-earnings-fn))))
#:negate-amounts? #t
#:show-title? #f
@@ -1126,7 +1126,7 @@ also show overall period profit & loss."))
#:show-total? #t)
(if (and common-currency show-rates?)
- (add-to-table multicol-table-right (_ "Exchange Rates")
+ (add-to-table multicol-table-right (G_ "Exchange Rates")
asset-liability
#:get-col-header-fn get-exchange-rates-fn
#:show-accounts? #f
@@ -1136,7 +1136,7 @@ also show overall period profit & loss."))
(gnc:html-document-add-object!
doc
(gnc:make-html-text
- (gnc:html-markup-anchor chart (_ "Barchart")))))))
+ (gnc:html-markup-anchor chart (G_ "Barchart")))))))
((eq? report-type 'pnl)
(let* ((include-overall-period? (get-option gnc:pagename-general
@@ -1205,7 +1205,7 @@ also show overall period profit & loss."))
(header (gnc:make-html-text
(qof-print-date (car datepair))
(gnc:html-markup-br)
- (_ " to ")
+ (G_ " to ")
(qof-print-date (cdr datepair))))
(cell (gnc:make-html-table-cell/markup
"total-label-cell" header)))
@@ -1248,33 +1248,33 @@ also show overall period profit & loss."))
get-cell-anchor-fn)))))
(unless (eq? incr 'disabled)
- (add-to-table multicol-table-left (_ "Period") '()
+ (add-to-table multicol-table-left (G_ "Period") '()
#:get-col-header-fn get-col-header-fn
#:show-accounts? #f
#:show-total? #f)
(if enable-dual-columns?
- (add-to-table multicol-table-right (_ "Period") '()
+ (add-to-table multicol-table-right (G_ "Period") '()
#:get-col-header-fn get-col-header-fn
#:show-accounts? #f
#:show-total? #f)))
(unless (null? income-accounts)
- (add-to-table multicol-table-left (_ "Income") income-accounts
+ (add-to-table multicol-table-left (G_ "Income") income-accounts
#:negate-amounts? #t))
(unless (null? expense-accounts)
- (add-to-table multicol-table-right (_ "Expense") expense-accounts))
+ (add-to-table multicol-table-right (G_ "Expense") expense-accounts))
(unless (or (null? income-accounts)
(null? expense-accounts))
- (add-to-table multicol-table-left (_ "Net Income")
+ (add-to-table multicol-table-left (G_ "Net Income")
income-expense
#:show-accounts? #f
#:negate-amounts? #t
#:force-total? #t))
(if (and common-currency show-rates?)
- (add-to-table multicol-table-left (_ "Exchange Rates")
+ (add-to-table multicol-table-left (G_ "Exchange Rates")
income-expense
#:get-col-header-fn get-exchange-rates-fn
#:show-accounts? #f
@@ -1303,8 +1303,8 @@ also show overall period profit & loss."))
;; doc " table, td{ border-width: 1px; border-style:solid; border-color: lightgray; border-collapse: collapse}")
doc))
-(define balsheet-reportname (_ "Balance Sheet (Multicolumn)"))
-(define pnl-reportname (_ "Income Statement (Multicolumn)"))
+(define balsheet-reportname (G_ "Balance Sheet (Multicolumn)"))
+(define pnl-reportname (G_ "Income Statement (Multicolumn)"))
(gnc:define-report
'version 1
diff --git a/gnucash/report/reports/standard/budget-balance-sheet.scm b/gnucash/report/reports/standard/budget-balance-sheet.scm
index 14a01971e..d50a7a0d7 100644
--- a/gnucash/report/reports/standard/budget-balance-sheet.scm
+++ b/gnucash/report/reports/standard/budget-balance-sheet.scm
@@ -122,7 +122,7 @@
(add-option
(gnc:make-string-option
gnc:pagename-general optname-report-title
- "a" opthelp-report-title (_ reportname)))
+ "a" opthelp-report-title (G_ reportname)))
(add-option
(gnc:make-string-option
gnc:pagename-general optname-party-name
@@ -661,7 +661,7 @@
(gnc:html-table-append-row! right-table space)))
(gnc:report-percent-done 80)
- (if label-assets? (add-subtotal-line left-table (_ "Assets") #f #f))
+ (if label-assets? (add-subtotal-line left-table (G_ "Assets") #f #f))
(set! asset-table
(gnc:make-html-acct-table/env/accts
(append table-env (list (list 'get-balance-fn asset-get-balance-fn)))
@@ -673,16 +673,16 @@
(if new-existing?
(begin
(add-subtotal-line
- left-table (_ "Existing Assets") #f existing-assets)
+ left-table (G_ "Existing Assets") #f existing-assets)
(add-subtotal-line
- left-table (_ "Allocated Assets") #f allocated-assets)))
+ left-table (G_ "Allocated Assets") #f allocated-assets)))
(if (not (gnc-commodity-collector-allzero? unallocated-assets))
(add-subtotal-line
- left-table (_ "Unallocated Assets") #f unallocated-assets))
+ left-table (G_ "Unallocated Assets") #f unallocated-assets))
(add-subtotal-line
- left-table (_ "Total Assets") #f asset-balance)))
+ left-table (G_ "Total Assets") #f asset-balance)))
(if report-form?
(add-rule left-table))
@@ -691,7 +691,7 @@
(gnc:report-percent-done 85)
(if label-liabilities?
- (add-subtotal-line right-table (_ "Liabilities") #f #f))
+ (add-subtotal-line right-table (G_ "Liabilities") #f #f))
(set! liability-table
(gnc:make-html-acct-table/env/accts
(append table-env
@@ -705,22 +705,22 @@
(begin
(add-subtotal-line
right-table
- (_ "Existing Liabilities")
+ (G_ "Existing Liabilities")
#f
existing-liabilities)
(add-subtotal-line
- right-table (_ "New Liabilities") #f new-liabilities)))
+ right-table (G_ "New Liabilities") #f new-liabilities)))
(add-subtotal-line
- right-table (_ "Total Liabilities") #f liability-balance)))
+ right-table (G_ "Total Liabilities") #f liability-balance)))
(add-rule right-table)
(gnc:report-percent-done 88)
(if label-equity?
(add-subtotal-line
- right-table (_ "Equity") #f #f))
+ right-table (G_ "Equity") #f #f))
(set! equity-table
(gnc:make-html-acct-table/env/accts
(append table-env
@@ -736,27 +736,27 @@
(begin
(add-subtotal-line
right-table
- (_ "Existing Retained Earnings")
- (_ "Existing Retained Losses")
+ (G_ "Existing Retained Earnings")
+ (G_ "Existing Retained Losses")
existing-retained-earnings)
(add-subtotal-line
right-table
- (_ "New Retained Earnings")
- (_ "New Retained Losses")
+ (G_ "New Retained Earnings")
+ (G_ "New Retained Losses")
new-retained-earnings)))
(add-subtotal-line
right-table
- (_ "Total Retained Earnings")
- (_ "Total Retained Losses")
+ (G_ "Total Retained Earnings")
+ (G_ "Total Retained Losses")
retained-earnings))
(if (not (gnc-commodity-collector-allzero? unrealized-gain))
(add-subtotal-line right-table
- (_ "Unrealized Gains")
- (_ "Unrealized Losses")
+ (G_ "Unrealized Gains")
+ (G_ "Unrealized Losses")
unrealized-gain))
@@ -765,19 +765,19 @@
(if new-existing?
(begin
(add-subtotal-line
- right-table (_ "Existing Equity") #f existing-equity)
+ right-table (G_ "Existing Equity") #f existing-equity)
(add-subtotal-line
- right-table (_ "New Equity") #f new-equity)))
+ right-table (G_ "New Equity") #f new-equity)))
(add-subtotal-line
- right-table (_ "Total Equity") #f equity-balance)))
+ right-table (G_ "Total Equity") #f equity-balance)))
(add-rule right-table)
(add-subtotal-line
right-table
- (gnc:html-string-sanitize (_ "Total Liabilities & Equity"))
+ (gnc:html-string-sanitize (G_ "Total Liabilities & Equity"))
#f
liability-plus-equity)
diff --git a/gnucash/report/reports/standard/budget-barchart.scm b/gnucash/report/reports/standard/budget-barchart.scm
index 28abf4099..b61a55a0e 100644
--- a/gnucash/report/reports/standard/budget-barchart.scm
+++ b/gnucash/report/reports/standard/budget-barchart.scm
@@ -213,18 +213,18 @@
(list (xaccAccountGetName acct)
;; Translators: Bgt and Act refer to budgeted and
;; actual total amounts.
- (format #f (_ "Bgt: ~a Act: ~a")
+ (format #f (G_ "Bgt: ~a Act: ~a")
(amount->monetary bgt-sum)
(amount->monetary act-sum)))
(list (xaccAccountGetName acct))))
(gnc:html-chart-set-data-labels! chart (reverse dates-list))
(gnc:html-chart-add-data-series! chart
- (_ "Actual")
+ (G_ "Actual")
(reverse act-vals)
"#FF4136"
'fill (eq? chart-type 'bars))
(gnc:html-chart-add-data-series! chart
- (_ "Budget")
+ (G_ "Budget")
(reverse bgt-vals)
"#0074D9"
'fill (eq? chart-type 'bars))
diff --git a/gnucash/report/reports/standard/budget-flow.scm b/gnucash/report/reports/standard/budget-flow.scm
index 17de16e9e..c8a9961c1 100644
--- a/gnucash/report/reports/standard/budget-flow.scm
+++ b/gnucash/report/reports/standard/budget-flow.scm
@@ -165,7 +165,7 @@
(gnc:sum-collector-commodity act-total report-currency exchange-fn)))
(gnc:html-table-add-budget-row!
html-table "total-number-cell"
- (string-append (_ "Total") ":")
+ (string-append (G_ "Total") ":")
bgt-total-numeric act-total-numeric)
(gnc:html-table-append-row!
@@ -244,7 +244,7 @@
;; Display Grand Total
(gnc:html-table-add-budget-row!
html-table "total-number-cell"
- (string-append (_ "Total") ":") bgt-total-numeric act-total-numeric))))
+ (string-append (G_ "Total") ":") bgt-total-numeric act-total-numeric))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; budget-renderer
@@ -303,7 +303,7 @@
;; Display Title Name - Budget - Period
(gnc:html-document-set-title!
- doc (format #f (_ "~a: ~a - ~a")
+ doc (format #f (G_ "~a: ~a - ~a")
report-name (gnc-budget-get-name budget)
(qof-print-date (gnc-budget-get-period-start-date
budget (1- period)))))
diff --git a/gnucash/report/reports/standard/budget-income-statement.scm b/gnucash/report/reports/standard/budget-income-statement.scm
index ee74c94ed..2e2978b56 100644
--- a/gnucash/report/reports/standard/budget-income-statement.scm
+++ b/gnucash/report/reports/standard/budget-income-statement.scm
@@ -141,7 +141,7 @@
(add-option
(gnc:make-string-option
gnc:pagename-general optname-report-title
- "a" opthelp-report-title (_ reportname)))
+ "a" opthelp-report-title (G_ reportname)))
(add-option
(gnc:make-string-option
gnc:pagename-general optname-party-name
@@ -439,7 +439,7 @@
(gnc:html-document-add-object!
doc (gnc:html-make-generic-simple-warning
report-title
- (_ "Reporting range end period cannot be less than start period."))))
+ (G_ "Reporting range end period cannot be less than start period."))))
(else
;; Get all the balances for each of the account types.
@@ -507,20 +507,20 @@
(let ((table (gnc:make-html-table)))
(gnc:html-table-append-row! table space)
(when label-revenue?
- (add-subtotal-line table (_ "Revenues") #f #f))
+ (add-subtotal-line table (G_ "Revenues") #f #f))
(gnc:html-table-add-account-balances table revenue-table params)
(when total-revenue?
- (add-subtotal-line table (_ "Total Revenue") #f revenue-total))
+ (add-subtotal-line table (G_ "Total Revenue") #f revenue-total))
table))
(exp-table
(let ((table (gnc:make-html-table)))
(gnc:html-table-append-row! table space)
(when label-expense?
- (add-subtotal-line table (_ "Expenses") #f #f))
+ (add-subtotal-line table (G_ "Expenses") #f #f))
(gnc:html-table-add-account-balances table expense-table params)
(when total-expense?
- (add-subtotal-line table (_ "Total Expenses") #f expense-total))
+ (add-subtotal-line table (G_ "Total Expenses") #f expense-total))
table))
(budget-name (gnc-budget-get-name budget))
@@ -528,12 +528,12 @@
(period-for
(cond
((not use-budget-period-range?)
- (format #f (_ "for Budget ~a") budget-name))
+ (format #f (G_ "for Budget ~a") budget-name))
((= user-budget-period-start user-budget-period-end)
- (format #f (_ "for Budget ~a Period ~d")
+ (format #f (G_ "for Budget ~a Period ~d")
budget-name user-budget-period-start))
(else
- (format #f (_ "for Budget ~a Periods ~d - ~d")
+ (format #f (G_ "for Budget ~a Periods ~d - ~d")
budget-name user-budget-period-start
user-budget-period-end)))))
@@ -561,8 +561,8 @@
(report-line
(if standard-order? exp-table inc-table)
- (string-append (_ "Net income") " " period-for)
- (string-append (_ "Net loss") " " period-for)
+ (string-append (G_ "Net income") " " period-for)
+ (string-append (G_ "Net loss") " " period-for)
net-income
(* 2 (1- tree-depth)) exchange-fn #f #f)
diff --git a/gnucash/report/reports/standard/budget.scm b/gnucash/report/reports/standard/budget.scm
index b97ae5fab..43d6faee6 100644
--- a/gnucash/report/reports/standard/budget.scm
+++ b/gnucash/report/reports/standard/budget.scm
@@ -505,9 +505,9 @@
html-table 0 current-col
(cond
((eq? (car column-list) 'total)
- (_ "Total"))
+ (G_ "Total"))
((list? (car column-list))
- (format #f (_ "~a to ~a")
+ (format #f (G_ "~a to ~a")
(period-to-date-string (car (car column-list)))
(period-to-date-string (last (car column-list)))))
(else
@@ -531,17 +531,17 @@
(gnc:html-table-set-cell/tag!
html-table 1 col0 "centered-label-cell"
;; Translators: Abbreviation for "Budget" amount
- (_ "Bgt")))
+ (G_ "Bgt")))
(when show-actual?
(gnc:html-table-set-cell/tag!
html-table 1 col1 "centered-label-cell"
;; Translators: Abbreviation for "Actual" amount
- (_ "Act")))
+ (G_ "Act")))
(when show-diff?
(gnc:html-table-set-cell/tag!
html-table 1 col2 "centered-label-cell"
;; Translators: Abbreviation for "Difference" amount
- (_ "Diff")))
+ (G_ "Diff")))
(loop (cdr column-list)
col3))))))
@@ -771,7 +771,7 @@
;; budget will report on budgeted and actual
;; amounts from the beginning of budget, instead
;; of only using the budget-period amounts.
- (if accumulate? (_ "using accumulated amounts")
+ (if accumulate? (G_ "using accumulated amounts")
"")))
;; We do this in two steps: First the account names... the
diff --git a/gnucash/report/reports/standard/cash-flow.scm b/gnucash/report/reports/standard/cash-flow.scm
index 98992f9e7..623f71998 100644
--- a/gnucash/report/reports/standard/cash-flow.scm
+++ b/gnucash/report/reports/standard/cash-flow.scm
@@ -185,7 +185,7 @@
doc (string-append
(get-option gnc:pagename-general gnc:optname-reportname)
" - "
- (format #f (_ "~a to ~a")
+ (format #f (G_ "~a to ~a")
(qof-print-date from-date-t64) (qof-print-date to-date-t64))))
(if (not (null? accounts))
@@ -200,8 +200,8 @@
(if (and (= (gnc-account-get-current-depth account) tree-depth)
(pair? (gnc-account-get-children account)))
(if show-subaccts?
- (_ "~a and subaccounts")
- (_ "~a and selected subaccounts"))
+ (G_ "~a and subaccounts")
+ (G_ "~a and selected subaccounts"))
"~a")
(gnc:html-markup-anchor
(gnc:account-anchor-text account)
@@ -251,7 +251,7 @@
(gnc:html-document-add-object!
doc
- (gnc:make-html-text (_ "Selected Accounts")))
+ (gnc:make-html-text (G_ "Selected Accounts")))
(gnc:html-document-add-object!
doc
@@ -265,7 +265,7 @@
table
"primary-subheading"
(list
- (_ "Money into selected accounts comes from")
+ (G_ "Money into selected accounts comes from")
""))
(add-accounts-flow money-in-accounts money-in-alist)
@@ -274,7 +274,7 @@
table
"grand-total"
(list
- (gnc:make-html-table-header-cell/markup "text-cell" (_ "Money In"))
+ (gnc:make-html-table-header-cell/markup "text-cell" (G_ "Money In"))
(gnc:make-html-table-header-cell/markup
"total-number-cell"
(gnc:sum-collector-commodity
@@ -286,7 +286,7 @@
table
"primary-subheading"
(list
- (_ "Money out of selected accounts goes to")
+ (G_ "Money out of selected accounts goes to")
""))
(add-accounts-flow money-out-accounts money-out-alist)
@@ -295,7 +295,7 @@
table
"grand-total"
(list
- (gnc:make-html-table-header-cell/markup "text-cell" (_ "Money Out"))
+ (gnc:make-html-table-header-cell/markup "text-cell" (G_ "Money Out"))
(gnc:make-html-table-header-cell/markup
"total-number-cell"
(gnc:sum-collector-commodity
@@ -307,7 +307,7 @@
table
"grand-total"
(list
- (gnc:make-html-table-header-cell/markup "text-cell" (_ "Difference"))
+ (gnc:make-html-table-header-cell/markup "text-cell" (G_ "Difference"))
(gnc:make-html-table-header-cell/markup
"total-number-cell"
(gnc:sum-collector-commodity
diff --git a/gnucash/report/reports/standard/cashflow-barchart.scm b/gnucash/report/reports/standard/cashflow-barchart.scm
index b3415783d..9f0e0bf1b 100644
--- a/gnucash/report/reports/standard/cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/cashflow-barchart.scm
@@ -279,7 +279,7 @@
(gnc:html-chart-set-title!
chart (list report-title
(format #f
- (_ "~a to ~a")
+ (G_ "~a to ~a")
(qof-print-date from-date-t64)
(qof-print-date to-date-t64))))
(gnc:html-chart-set-width! chart width)
@@ -294,19 +294,19 @@
(gnc:html-chart-set-data-labels! chart date-string-list)
(if show-in?
(gnc:html-chart-add-data-series! chart
- (_ "Money In")
+ (G_ "Money In")
(map gnc:gnc-monetary-amount in-list)
"#0074D9"
'urls cashflow-urls))
(if show-out?
(gnc:html-chart-add-data-series! chart
- (_ "Money Out")
+ (G_ "Money Out")
(map gnc:gnc-monetary-amount out-list)
"#FF4136"
'urls cashflow-urls))
(if show-net?
(gnc:html-chart-add-data-series! chart
- (_ "Net Flow")
+ (G_ "Net Flow")
(map gnc:gnc-monetary-amount net-list)
"#2ECC40"
'urls cashflow-urls))
@@ -328,13 +328,13 @@
(if (and non-zeros show-table?)
(let* ((table (gnc:make-html-table)))
(gnc:html-table-set-col-headers!
- table (append (list (_ "Date"))
- (if show-in? (list (_ "Money In")) '())
- (if show-out? (list (_ "Money Out")) '())
- (if show-net? (list (_ "Net Flow")) '())))
+ table (append (list (G_ "Date"))
+ (if show-in? (list (G_ "Money In")) '())
+ (if show-out? (list (G_ "Money Out")) '())
+ (if show-net? (list (G_ "Net Flow")) '())))
(gnc:html-document-add-object!
- doc (gnc:make-html-text (gnc:html-markup-h3 (_ "Overview:"))))
+ doc (gnc:make-html-text (gnc:html-markup-h3 (G_ "Overview:"))))
(gnc:html-table-append-column! table (append date-string-list (list "Total")))
(if show-in?
diff --git a/gnucash/report/reports/standard/category-barchart.scm b/gnucash/report/reports/standard/category-barchart.scm
index 26389e1b3..50fe2ea76 100644
--- a/gnucash/report/reports/standard/category-barchart.scm
+++ b/gnucash/report/reports/standard/category-barchart.scm
@@ -301,9 +301,9 @@ developing over time"))
;; accordingly.
(report-title
(case averaging-selection
- ((MonthDelta) (string-append report-title " " (_ "Monthly Average")))
- ((WeekDelta) (string-append report-title " " (_ "Weekly Average")))
- ((DayDelta) (string-append report-title " " (_ "Daily Average")))
+ ((MonthDelta) (string-append report-title " " (G_ "Monthly Average")))
+ ((WeekDelta) (string-append report-title " " (G_ "Weekly Average")))
+ ((DayDelta) (string-append report-title " " (G_ "Daily Average")))
(else report-title)))
(currency-frac (gnc-commodity-get-fraction report-currency))
;; This is the list of date intervals to calculate.
@@ -509,8 +509,8 @@ developing over time"))
chart (list report-title
(format #f
(if do-intervals?
- (_ "~a to ~a")
- (_ "Balances ~a to ~a"))
+ (G_ "~a to ~a")
+ (G_ "Balances ~a to ~a"))
(qof-print-date from-date-t64)
(qof-print-date to-date-t64))))
@@ -532,7 +532,7 @@ developing over time"))
(apply zip (map cadr finish)))))
(set! all-data
(append start
- (list (list (_ "Other") other-sum))))
+ (list (list (G_ "Other") other-sum))))
(let* ((options (gnc:make-report-options reportguid)))
;; now copy all the options
(gnc:options-copy-values
@@ -630,7 +630,7 @@ developing over time"))
(gnc:html-table-set-col-headers!
table
(append
- (list (_ "Date"))
+ (list (G_ "Date"))
(map
(lambda (col)
(cond
@@ -639,7 +639,7 @@ developing over time"))
(else (xaccAccountGetName col))))
(map car all-data))
(if cols>1?
- (list (_ "Grand Total"))
+ (list (G_ "Grand Total"))
'())))
(gnc:html-document-add-object! document table))))
diff --git a/gnucash/report/reports/standard/customer-summary.scm b/gnucash/report/reports/standard/customer-summary.scm
index 138ffa0dd..d89986e65 100644
--- a/gnucash/report/reports/standard/customer-summary.scm
+++ b/gnucash/report/reports/standard/customer-summary.scm
@@ -288,10 +288,10 @@
(type-str (N_ "Customer")))
(gnc:html-document-set-title!
- document (string-append (_ type-str) " " (_ "Report")))
+ document (string-append (G_ type-str) " " (G_ "Report")))
(gnc:html-document-set-title!
- document (format #f (_ "~a ~a - ~a")
+ document (format #f (G_ "~a ~a - ~a")
report-title
(qof-print-date start-date)
(qof-print-date end-date)))
@@ -311,19 +311,19 @@
(gnc:html-document-add-object!
document
(gnc:make-html-text
- (_ "No valid customer found."))))
+ (G_ "No valid customer found."))))
(else
(let ((all-splits (query #f all-accounts start-date end-date))
(table (gnc:make-html-table))
(total-sales (gnc:make-commodity-collector))
(total-expense (gnc:make-commodity-collector))
- (headings (cons* (_ "Customer")
- (_ "Profit")
- (_ "Markup")
- (_ "Sales")
+ (headings (cons* (G_ "Customer")
+ (G_ "Profit")
+ (G_ "Markup")
+ (G_ "Sales")
(if show-column-expense?
- (list (_ "Expense"))
+ (list (G_ "Expense"))
'())))
(results (map
(lambda (owner)
@@ -399,7 +399,7 @@
(unless (and (zero? profit) (zero? sales))
(set! sortingtable
(cons (vector
- (_ "No Customer") comm markup profit sales expense #f)
+ (G_ "No Customer") comm markup profit sales expense #f)
sortingtable)))))
commodities))
@@ -473,9 +473,9 @@
(markup (markup-percent profit sales)))
(add-row (if commodities>1?
(format #f "~a (~a)"
- (_ "Total")
+ (G_ "Total")
(gnc-commodity-get-mnemonic comm))
- (_ "Total"))
+ (G_ "Total"))
comm markup
(gnc:make-gnc-monetary comm profit)
(gnc:make-gnc-monetary comm sales)
diff --git a/gnucash/report/reports/standard/dashboard.scm b/gnucash/report/reports/standard/dashboard.scm
index 175e6fce4..6b3061c29 100644
--- a/gnucash/report/reports/standard/dashboard.scm
+++ b/gnucash/report/reports/standard/dashboard.scm
@@ -27,7 +27,7 @@
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
-(use-modules (gnucash core-utils)) ; for gnc:version and (_ ...)
+(use-modules (gnucash core-utils)) ; for gnc:version and (G_ ...)
(use-modules (gnucash app-utils))
(use-modules (gnucash report))
@@ -49,7 +49,7 @@
(gnc:option-set-value
(gnc:lookup-option options section name) value))
- (set-option! "General" "Report name" (_ "Dashboard"))
+ (set-option! "General" "Report name" (G_ "Dashboard"))
(set-option! "General" "Number of columns" 2)
;; mark the reports as needing to be saved
diff --git a/gnucash/report/reports/standard/equity-statement.scm b/gnucash/report/reports/standard/equity-statement.scm
index 881f680a6..ce13efc1c 100644
--- a/gnucash/report/reports/standard/equity-statement.scm
+++ b/gnucash/report/reports/standard/equity-statement.scm
@@ -106,7 +106,7 @@
(add-option
(gnc:make-string-option
(N_ "General") optname-report-title
- "a" opthelp-report-title (_ reportname)))
+ "a" opthelp-report-title (G_ reportname)))
(add-option
(gnc:make-string-option
(N_ "General") optname-party-name
@@ -166,7 +166,7 @@
(add-option
(gnc:make-string-option
pagename-entries optname-closing-pattern
- "a" opthelp-closing-pattern (_ "Closing Entries")))
+ "a" opthelp-closing-pattern (G_ "Closing Entries")))
(add-option
(gnc:make-simple-boolean-option
pagename-entries optname-closing-casing
@@ -299,7 +299,7 @@
(gnc:html-document-set-title!
doc (format #f
(string-append "~a ~a "
- (_ "For Period Covering ~a to ~a"))
+ (G_ "For Period Covering ~a to ~a"))
company-name report-title
(qof-print-date start-date-printable)
(qof-print-date end-date)))
@@ -420,7 +420,7 @@
;; Create the account table below where its
;; percentage time can be tracked.
(build-table (gnc:make-html-table)) ;; gnc:html-table
- (period-for (string-append " " (_ "for Period"))))
+ (period-for (string-append " " (G_ "for Period"))))
;; a helper to add a line to our report
(define (add-report-line
@@ -447,43 +447,43 @@
(add-report-line
build-table
- (string-append (_ "Capital") ", " (qof-print-date start-date-printable))
+ (string-append (G_ "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)
+ (string-append (G_ "Net income") period-for)
+ (string-append (G_ "Net loss") period-for)
net-income 0 end-exchange-fn #f #f)
(add-report-line
build-table
- (string-append (_ "Investments") period-for) #f
+ (string-append (G_ "Investments") period-for) #f
investments 0 end-exchange-fn #f #f)
(add-report-line
build-table
- (string-append (_ "Withdrawals") period-for)
+ (string-append (G_ "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")
+ (G_ "Unrealized Gains")
+ (G_ "Unrealized Losses")
net-unrealized-gains
0 end-exchange-fn #f #f))
(add-report-line
build-table
- (_ "Increase in capital")
- (_ "Decrease in capital")
+ (G_ "Increase in capital")
+ (G_ "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
+ (string-append (G_ "Capital") ", " (qof-print-date end-date)) #f
end-total-equity
1 end-exchange-fn #f "primary-subheading")
diff --git a/gnucash/report/reports/standard/general-journal.scm b/gnucash/report/reports/standard/general-journal.scm
index 9068adb1c..9ec1c6370 100644
--- a/gnucash/report/reports/standard/general-journal.scm
+++ b/gnucash/report/reports/standard/general-journal.scm
@@ -79,8 +79,8 @@
(list "query" (gnc-query2scm query)) ;; think this wants an scm...
(list "journal" #t)
(list "double" #t)
- (list "debit-string" (_ "Debit"))
- (list "credit-string" (_ "Credit"))
+ (list "debit-string" (G_ "Debit"))
+ (list "credit-string" (G_ "Credit"))
)
)
;; we'll leave query malloc'd in case this is required by the C side...
@@ -115,7 +115,7 @@
;; just delegate rendering to the Register Report renderer...
(let* ((renderer (gnc:report-template-renderer/report-guid regrptguid #f))
(doc (renderer report-obj)))
- (gnc:html-document-set-title! doc (_ reportname))
+ (gnc:html-document-set-title! doc (G_ reportname))
doc))
(gnc:define-report
diff --git a/gnucash/report/reports/standard/general-ledger.scm b/gnucash/report/reports/standard/general-ledger.scm
index ee8a357c4..c76a52292 100644
--- a/gnucash/report/reports/standard/general-ledger.scm
+++ b/gnucash/report/reports/standard/general-ledger.scm
@@ -143,7 +143,7 @@
;; just delegate rendering to the Transaction Report renderer...
(let ((document ((gnc:report-template-renderer/report-guid xactrptguid xactrptname)
report-obj)))
- (gnc:html-document-set-title! document (_ reportname))
+ (gnc:html-document-set-title! document (G_ reportname))
document))
(gnc:define-report
diff --git a/gnucash/report/reports/standard/income-gst-statement.scm b/gnucash/report/reports/standard/income-gst-statement.scm
index bd4a04f8e..76f34c808 100644
--- a/gnucash/report/reports/standard/income-gst-statement.scm
+++ b/gnucash/report/reports/standard/income-gst-statement.scm
@@ -45,7 +45,7 @@
(gnc:make-html-text
(gnc:html-markup-p
- (_ "This report is useful to calculate periodic business tax \
+ (G_ "This report is useful to calculate periodic business tax \
payable/receivable from authorities. From 'Edit report options', \
choose your business sales and purchase accounts. Each transaction \
may contain, in addition to the asset, liability, A/Payable or \
@@ -53,22 +53,22 @@ A/Receivable accounts, a split to a tax account, e.g. Income:Sales \
-$1000, A/Receivable $1100, Liability:GST on Sales -$100."))
(gnc:html-markup-p
- (_ "These tax accounts can either be populated using the standard register, or from Business Invoices and Bills \
+ (G_ "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 correctly. Please see the documentation."))
(gnc:html-markup-p
- (_ "From the Report Options, you will need to select the accounts which will \
+ (G_ "From the Report Options, you will need to select the accounts which will \
hold the GST/VAT taxes collected or paid. These accounts must contain splits which document the \
monies which are wholly sent or claimed from tax authorities during periodic GST/VAT returns. These \
accounts must be of type ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on sales."))
(gnc:html-markup-p
- (_ "Note the UK variant may specify EU VAT accounts may be tagged \
+ (G_ "Note the UK variant may specify EU VAT accounts may be tagged \
with *EUVAT* in the VAT account description. EU Goods sales and purchase \
accounts may be tagged with *EUGOODS* in the account description."))
(gnc:html-markup-p
- (_ "This message will be removed when tax accounts are specified."))))
+ (G_ "This message will be removed when tax accounts are specified."))))
(define* (gst-statement-renderer rpt #:optional export-type file-name)
(define (opt-val section name)
@@ -156,17 +156,17 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
options
(gnc:make-multichoice-callback-option
pagename-format (N_ "Report format")
- "a" (_ "Report Format") 'default
+ "a" (G_ "Report Format") 'default
(list (vector 'default
- (_ "default format")
- (_ "default format"))
+ (G_ "default format")
+ (G_ "default format"))
(vector 'au-bas
- (_ "Australia BAS")
- (_ "Australia BAS. Specify sales, purchase and tax \
+ (G_ "Australia BAS")
+ (G_ "Australia BAS. Specify sales, purchase and tax \
accounts."))
(vector 'uk-vat
- (_ "UK VAT Return")
- (_ "UK VAT Return. Specify sales, purchase and tax \
+ (G_ "UK VAT Return")
+ (G_ "UK VAT Return. Specify sales, purchase and tax \
accounts. EU rules may be used. Denote EU VAT accounts *EUVAT* in \
account description, and denote EU goods sales and purchases accounts \
with *EUGOODS* in the account description."))) #f
@@ -310,25 +310,25 @@ with *EUGOODS* in the account description."))) #f
(append
;; Translators: "Gross Sales" refer to Net Sales + GST/VAT on Sales
- (list (vector (_ "Gross Sales") tot-sales #f #t #f #f))
+ (list (vector (G_ "Gross Sales") tot-sales #f #t #f #f))
(if (opt-val pagename-format "Individual sales columns")
(map
(lambda (acc)
(vector (xaccAccountGetName acc) (account-adder-neg acc) #f #t #f #f))
accounts-sales)
- (list (vector (_ "Net Sales") net-sales #f #t #f #f)))
+ (list (vector (G_ "Net Sales") net-sales #f #t #f #f)))
(if (opt-val pagename-format "Individual tax columns")
(map
(lambda (acc)
(vector (xaccAccountGetName acc) (account-adder-neg acc) #f #t #f #f))
accounts-tax-collected)
- (list (vector (_ "Tax on Sales") tax-sales #f #t #f #f)))
+ (list (vector (G_ "Tax on Sales") tax-sales #f #t #f #f)))
;; Translators: "Gross Purchases" refer to Net Purchase +
;; GST/VAT on Purchase
- (list (vector (_ "Gross Purchases") tot-purch #f #t #f #f))
+ (list (vector (G_ "Gross Purchases") tot-purch #f #t #f #f))
(if (opt-val pagename-format "Individual purchases columns")
(map
@@ -336,7 +336,7 @@ with *EUGOODS* in the account description."))) #f
(vector (xaccAccountGetName acc) (account-adder acc) #f #t #f #f))
accounts-purchases)
(list
- (vector (_ "Net Purchases") net-purch #f #t #f #f)))
+ (vector (G_ "Net Purchases") net-purch #f #t #f #f)))
(if (opt-val pagename-format "Individual tax columns")
(map
@@ -344,13 +344,13 @@ with *EUGOODS* in the account description."))) #f
(vector (xaccAccountGetName acc) (account-adder acc) #f #t #f #f))
accounts-tax-paid)
(list
- (vector (_ "Tax on Purchases") tax-purch #f #t #f #f)))
+ (vector (G_ "Tax on Purchases") tax-purch #f #t #f #f)))
(if (opt-val pagename-format "Gross Balance")
;; Translators: "Gross Balance" refer to "Gross Sales
;; minus Gross Purchases" in GST Report
(list
- (vector (_ "Gross Balance") tot-bal #f #t #f #f))
+ (vector (G_ "Gross Balance") tot-bal #f #t #f #f))
'())
;; Note: Net income = net balance - other costs
@@ -358,14 +358,14 @@ with *EUGOODS* in the account description."))) #f
;; Translators: "Net Balance" refer to Net Sales - Net
;; Purchases in GST Report
(list
- (vector (_ "Net Balance") net-bal #f #t #f #f))
+ (vector (G_ "Net Balance") net-bal #f #t #f #f))
'())
(if (opt-val pagename-format "Tax payable")
;; Translators: "Tax Payable" refer to the difference
;; GST Sales - GST Purchases
(list
- (vector (_ "Tax payable") tax-diff #f #t #f #f))
+ (vector (G_ "Tax payable") tax-diff #f #t #f #f))
'()))))
((au-bas)
diff --git a/gnucash/report/reports/standard/income-statement.scm b/gnucash/report/reports/standard/income-statement.scm
index 9d2e8b1d3..93988525d 100644
--- a/gnucash/report/reports/standard/income-statement.scm
+++ b/gnucash/report/reports/standard/income-statement.scm
@@ -146,7 +146,7 @@
(add-option
(gnc:make-string-option
gnc:pagename-general optname-report-title
- "a" opthelp-report-title (_ reportname)))
+ "a" opthelp-report-title (G_ reportname)))
(add-option
(gnc:make-string-option
gnc:pagename-general optname-party-name
@@ -265,7 +265,7 @@
(add-option
(gnc:make-string-option
pagename-entries optname-closing-pattern
- "a" opthelp-closing-pattern (_ "Closing Entries")))
+ "a" opthelp-closing-pattern (G_ "Closing Entries")))
(add-option
(gnc:make-simple-boolean-option
pagename-entries optname-closing-casing
@@ -404,7 +404,7 @@
(gnc:html-table-append-ruler! table (* 2 tree-depth)))
(gnc:html-document-set-title!
- doc (format #f (string-append "~a ~a " (_ "For Period Covering ~a to ~a"))
+ doc (format #f (string-append "~a ~a " (G_ "For Period Covering ~a to ~a"))
company-name report-title
(qof-print-date start-date-printable)
(qof-print-date end-date)))
@@ -478,7 +478,7 @@
(trading-table
(gnc:make-html-acct-table/env/accts table-env trading-accounts))
- (period-for (string-append " " (_ "for Period"))))
+ (period-for (string-append " " (G_ "for Period"))))
;; a helper to add a line to our report
(define (add-report-line
@@ -502,28 +502,28 @@
(gnc:report-percent-done 80)
(when label-revenue?
- (add-subtotal-line inc-table (_ "Revenues") #f #f))
+ (add-subtotal-line inc-table (G_ "Revenues") #f #f))
(gnc:html-table-add-account-balances inc-table revenue-table params)
(when total-revenue?
- (add-subtotal-line inc-table (_ "Total Revenue") #f revenue-total))
+ (add-subtotal-line inc-table (G_ "Total Revenue") #f revenue-total))
(gnc:report-percent-done 85)
(when label-expense?
- (add-subtotal-line exp-table (_ "Expenses") #f #f))
+ (add-subtotal-line exp-table (G_ "Expenses") #f #f))
(gnc:html-table-add-account-balances exp-table expense-table params)
(when total-expense?
- (add-subtotal-line exp-table (_ "Total Expenses") #f expense-total))
+ (add-subtotal-line exp-table (G_ "Total Expenses") #f expense-total))
(when label-trading?
- (add-subtotal-line tra-table (_ "Trading") #f #f))
+ (add-subtotal-line tra-table (G_ "Trading") #f #f))
(gnc:html-table-add-account-balances tra-table trading-table params)
(when total-trading?
- (add-subtotal-line tra-table (_ "Total Trading") #f trading-total))
+ (add-subtotal-line tra-table (G_ "Total Trading") #f trading-total))
(add-report-line
(if standard-order? exp-table inc-table)
- (string-append (_ "Net income") period-for)
- (string-append (_ "Net loss") period-for)
+ (string-append (G_ "Net income") period-for)
+ (string-append (G_ "Net loss") period-for)
net-income (* 2 (1- tree-depth)) exchange-fn #f #f)
;; add the sections in the desired order to document
diff --git a/gnucash/report/reports/standard/invoice.scm b/gnucash/report/reports/standard/invoice.scm
index 585f7fb0c..ce31b615a 100644
--- a/gnucash/report/reports/standard/invoice.scm
+++ b/gnucash/report/reports/standard/invoice.scm
@@ -85,50 +85,50 @@
(define (make-heading-list column-vector)
(append
(addif (date-col column-vector)
- (_ "Date"))
+ (G_ "Date"))
(addif (description-col column-vector)
- (_ "Description"))
+ (G_ "Description"))
(addif (action-col column-vector)
- (_ "Action"))
+ (G_ "Action"))
(addif (quantity-col column-vector)
- (_ "Quantity"))
+ (G_ "Quantity"))
(addif (price-col column-vector)
- (_ "Unit Price"))
+ (G_ "Unit Price"))
(addif (discount-col column-vector)
- (_ "Discount"))
+ (G_ "Discount"))
(addif (tax-col column-vector)
- (_ "Taxable"))
+ (G_ "Taxable"))
(addif (taxvalue-col column-vector)
- (_ "Tax Amount"))
+ (G_ "Tax Amount"))
(addif (value-col column-vector)
- (_ "Total"))))
+ (G_ "Total"))))
(define (monetary-or-percent numeric currency entry-type)
(if (eqv? entry-type GNC-AMT-TYPE-PERCENT)
- (string-append (gnc:default-html-gnc-numeric-renderer numeric #f) " " (_ "%"))
+ (string-append (gnc:default-html-gnc-numeric-renderer numeric #f) " " (G_ "%"))
(gnc:make-gnc-monetary currency numeric)))
(define layout-key-list
;; Translators: "Their details" refer to the invoice 'other party' details i.e. client/vendor name/address/ID
- (list (cons 'client (list (cons 'text (_ "Their details"))
- (cons 'tip (_ "Client or vendor name, address and ID"))))
+ (list (cons 'client (list (cons 'text (G_ "Their details"))
+ (cons 'tip (G_ "Client or vendor name, address and ID"))))
;; Translators: "Our details" refer to the book owner's details i.e. name/address/tax-ID
- (cons 'company (list (cons 'text (_ "Our details"))
- (cons 'tip (_ "Company name, address and tax-ID"))))
+ (cons 'company (list (cons 'text (G_ "Our details"))
+ (cons 'tip (G_ "Company name, address and tax-ID"))))
- (cons 'invoice (list (cons 'text (_ "Invoice details"))
- (cons 'tip (_ "Invoice date, due date, billing ID, terms, job details"))))
+ (cons 'invoice (list (cons 'text (G_ "Invoice details"))
+ (cons 'tip (G_ "Invoice date, due date, billing ID, terms, job details"))))
- (cons 'today (list (cons 'text (_ "Today's date"))
- (cons 'tip (_ "Today's date"))))
+ (cons 'today (list (cons 'text (G_ "Today's date"))
+ (cons 'tip (G_ "Today's date"))))
- (cons 'picture (list (cons 'text (_ "Picture"))
- (cons 'tip (_ "Picture"))))
+ (cons 'picture (list (cons 'text (G_ "Picture"))
+ (cons 'tip (G_ "Picture"))))
;; Translators: "(empty)" refers to invoice header section being left blank
- (cons 'none (list (cons 'text (_ "(empty)"))
- (cons 'tip (_ "Empty space"))))))
+ (cons 'none (list (cons 'text (G_ "(empty)"))
+ (cons 'tip (G_ "Empty space"))))))
(define variant-list
(list
@@ -274,7 +274,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(gnc:make-text-option
(N_ "Display") (N_ "Payable to string")
"ua2" (N_ "The phrase for specifying to whom payments should be made.")
- (_ "Please make all checks payable to")))
+ (G_ "Please make all checks payable to")))
(gnc:register-inv-option
(gnc:make-complex-boolean-option
@@ -287,7 +287,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(gnc:make-text-option
(N_ "Display") (N_ "Company contact string")
"ub2" (N_ "The phrase used to introduce the company contact.")
- (_ "Please direct all enquiries to")))
+ (G_ "Please direct all enquiries to")))
(gnc:register-inv-option
(gnc:make-number-range-option
@@ -341,7 +341,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(gnc:make-text-option
(N_ "Display") (N_ "Extra Notes")
"u" (N_ "Extra notes to put on the invoice.")
- (_ "Thank you for your patronage!")))
+ (G_ "Thank you for your patronage!")))
(gnc:register-inv-option
(gnc:make-multichoice-option
@@ -433,7 +433,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(qof-print-date (xaccTransGetDate t)))
(addif (description-col used-columns)
- (_ "Payment, thank you!"))
+ (G_ "Payment, thank you!"))
(list (gnc:make-html-table-cell/size/markup
1 (- (max 3 (num-columns-required used-columns))
@@ -488,7 +488,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(and (gncEntryGetBillTaxable entry)
(gncEntryGetBillTaxTable entry)))
;; Translators: This "T" is displayed in the taxable column, if this entry contains tax
- (_ "T") ""))
+ (G_ "T") ""))
(addif (taxvalue-col used-columns)
(gnc:make-html-table-cell/markup
@@ -535,7 +535,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(if display-subtotal?
(add-subtotal-row (gncInvoiceGetTotalSubtotal invoice)
- "grand-total" (_ "Net Price")))
+ "grand-total" (G_ "Net Price")))
(if display-all-taxes
(for-each
@@ -548,10 +548,10 @@ for styling the invoice. Please see the exported report for the CSS class names.
;; nope, just show the total tax.
(add-subtotal-row (gncInvoiceGetTotalTax invoice)
- "grand-total" (_ "Tax")))
+ "grand-total" (G_ "Tax")))
(add-subtotal-row (gncInvoiceGetTotal invoice)
- "grand-total" (_ "Total Price"))
+ "grand-total" (G_ "Total Price"))
(total-collector 'add currency (gncInvoiceGetTotal invoice))
@@ -571,7 +571,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
splits)))
(add-subtotal-row (cadr (total-collector 'getpair currency #f))
- "grand-total" (_ "Amount Due")))
+ "grand-total" (G_ "Amount Due")))
(begin
@@ -600,19 +600,19 @@ for styling the invoice. Please see the exported report for the CSS class names.
(begin
(gnc:html-table-append-row!
invoice-details-table
- (make-date-row (_ "Date") (gncInvoiceGetDatePosted invoice) date-format))
+ (make-date-row (G_ "Date") (gncInvoiceGetDatePosted invoice) date-format))
(if (opt-val "Display" "Due Date")
(gnc:html-table-append-row!
invoice-details-table
- (make-date-row (_ "Due Date") (gncInvoiceGetDateDue invoice) date-format))))
+ (make-date-row (G_ "Due Date") (gncInvoiceGetDateDue invoice) date-format))))
(gnc:html-table-append-row! invoice-details-table
(gnc:make-html-table-cell/size
1 2 (gnc:make-html-span/markup
"invoice-in-progress"
(gnc:make-html-text
- (_ "Invoice in progress..."))))))
+ (G_ "Invoice in progress..."))))))
(if (opt-val "Display" "Billing ID")
(let ((billing-id (gncInvoiceGetBillingID invoice)))
@@ -620,7 +620,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(begin
(gnc:html-table-append-row! invoice-details-table
(list
- (_ "Reference:")
+ (G_ "Reference:")
(gnc:make-html-div/markup
"div-align-right"
(multiline-to-html-text billing-id))))
@@ -632,7 +632,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(if (and terms (not (string-null? terms)))
(gnc:html-table-append-row! invoice-details-table
(list
- (_ "Terms:")
+ (G_ "Terms:")
(gnc:make-html-div/markup
"div-align-right"
(multiline-to-html-text terms)))))))
@@ -642,12 +642,12 @@ for styling the invoice. Please see the exported report for the CSS class names.
(not (string-null? jobnumber)))
(begin
(gnc:html-table-append-row! invoice-details-table
- (list (_ "Job number:")
+ (list (G_ "Job number:")
(gnc:make-html-div/markup
"div-align-right"
jobnumber)))
(gnc:html-table-append-row! invoice-details-table
- (list (_ "Job name:")
+ (list (G_ "Job name:")
(gnc:make-html-div/markup
"div-align-right"
jobname)))))
@@ -693,7 +693,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(if (and reference (not (string-null? reference)))
(gnc:html-table-append-row! table
(list (string-append
- (_ "REF") " "
+ (G_ "REF") " "
reference))))))
orders)
@@ -771,7 +771,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
(if (null? invoice)
(gnc:html-document-add-object! document
(gnc:make-html-text
- (_ "No valid invoice selected. Click on the Options button and select the invoice to use.")))
+ (G_ "No valid invoice selected. Click on the Options button and select the invoice to use.")))
(let* ((book (gncInvoiceGetBook invoice))
(owner (gncInvoiceGetOwner invoice))
(type (gncInvoiceGetType invoice))
@@ -780,20 +780,20 @@ for styling the invoice. Please see the exported report for the CSS class names.
(credit-note? (memv type (list GNC-INVOICE-CUST-CREDIT-NOTE GNC-INVOICE-VEND-CREDIT-NOTE GNC-INVOICE-EMPL-CREDIT-NOTE)))
(default-title (cond
((eqv? type GNC-INVOICE-VEND-INVOICE)
- (_ "Bill"))
+ (G_ "Bill"))
((eqv? type GNC-INVOICE-EMPL-INVOICE)
- (_ "Expense Voucher"))
+ (G_ "Expense Voucher"))
((memv type (list GNC-INVOICE-CUST-CREDIT-NOTE
GNC-INVOICE-VEND-CREDIT-NOTE
GNC-INVOICE-EMPL-CREDIT-NOTE))
- (_ "Credit Note"))
+ (G_ "Credit Note"))
(else
- (_ "Invoice"))))
+ (G_ "Invoice"))))
(title (if (string-null? custom-title) default-title custom-title))
;; 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"
- (invoice-title (format #f (_"~a #~a") title (gncInvoiceGetID invoice)))
+ (invoice-title (format #f (G_"~a #~a") title (gncInvoiceGetID invoice)))
(layout-lookup-table (list (cons 'none #f)
(cons 'picture (gnc:make-html-div/markup
"picture"
diff --git a/gnucash/report/reports/standard/job-report.scm b/gnucash/report/reports/standard/job-report.scm
index c5900b5b7..f78710e09 100644
--- a/gnucash/report/reports/standard/job-report.scm
+++ b/gnucash/report/reports/standard/job-report.scm
@@ -85,17 +85,17 @@
(define (make-heading-list column-vector)
(let ((heading-list '()))
(if (date-col column-vector)
- (addto! heading-list (_ date-header)))
+ (addto! heading-list (G_ date-header)))
(if (date-due-col column-vector)
- (addto! heading-list (_ due-date-header)))
+ (addto! heading-list (G_ due-date-header)))
(if (num-col column-vector)
- (addto! heading-list (_ reference-header)))
+ (addto! heading-list (G_ reference-header)))
(if (type-col column-vector)
- (addto! heading-list (_ type-header)))
+ (addto! heading-list (G_ type-header)))
(if (memo-col column-vector)
- (addto! heading-list (_ desc-header)))
+ (addto! heading-list (G_ desc-header)))
(if (value-col column-vector)
- (addto! heading-list (_ amount-header)))
+ (addto! heading-list (G_ amount-header)))
(reverse heading-list)))
@@ -156,10 +156,10 @@
(gnc:html-table-set-col-headers!
table
- (list (_ "0-30 days")
- (_ "31-60 days")
- (_ "61-90 days")
- (_ "91+ days")))
+ (list (G_ "0-30 days")
+ (G_ "31-60 days")
+ (G_ "61-90 days")
+ (G_ "91+ days")))
(gnc:html-table-append-row!
table
@@ -203,7 +203,7 @@
(begin
(set! printed? #t)
(if (not (gnc-numeric-zero-p total))
- (let ((row (make-row column-vector start-date #f "" (_ "Balance") ""
+ (let ((row (make-row column-vector start-date #f "" (G_ "Balance") ""
(gnc:make-gnc-monetary (xaccTransGetCurrency txn) total)))
(row-style (if odd-row? "normal-row" "alternate-row")))
(gnc:html-table-append-row/markup! table row-style (reverse row))
@@ -236,8 +236,8 @@
(gnc:invoice-anchor-text invoice)
inv-str))
inv-str))
- ((equal? type TXN-TYPE-PAYMENT) (_ "Payment, thank you!"))
- (else (_ "Unknown"))))
+ ((equal? type TXN-TYPE-PAYMENT) (G_ "Payment, thank you!"))
+ (else (G_ "Unknown"))))
)
(if reverse?
@@ -315,8 +315,8 @@
(append (cons (gnc:make-html-table-cell/markup
"total-label-cell"
(if (gnc-numeric-negative-p total)
- (_ "Total Credit")
- (_ "Total Due")))
+ (G_ "Total Credit")
+ (G_ "Total Due")))
'())
(list (gnc:make-html-table-cell/size/markup
1 (value-col used-columns)
@@ -400,7 +400,7 @@
(define (job-options-generator)
(options-generator (list ACCT-TYPE-RECEIVABLE) GNC-OWNER-JOB
- (_ "Invoice") #f))
+ (G_ "Invoice") #f))
(define (setup-query q owner account end-date)
(let* ((guid (gncOwnerReturnGUID owner)))
@@ -498,16 +498,16 @@
(cond
((eqv? type GNC-OWNER-CUSTOMER)
(set! type-str (N_ "Customer"))
- (set! report-title-str (_ "Customer Report")))
+ (set! report-title-str (G_ "Customer Report")))
((eqv? type GNC-OWNER-JOB)
(set! type-str (N_ "Job"))
- (set! report-title-str (_ "Job Report")))
+ (set! report-title-str (G_ "Job Report")))
((eqv? type GNC-OWNER-VENDOR)
(set! type-str (N_ "Vendor"))
- (set! report-title-str (_ "Vendor Report")))
+ (set! report-title-str (G_ "Vendor Report")))
((eqv? type GNC-OWNER-EMPLOYEE)
(set! type-str (N_ "Employee"))
- (set! report-title-str (_ "Employee Report"))))
+ (set! report-title-str (G_ "Employee Report"))))
(gnc:html-document-set-title! document report-title-str)
@@ -540,7 +540,7 @@
(set!
table
(gnc:make-html-text
- (_ "No valid account selected. Click on the Options button and select the account to use."))))
+ (G_ "No valid account selected. Click on the Options button and select the account to use."))))
(gnc:html-document-add-object!
document
@@ -556,7 +556,7 @@
document
(gnc:make-html-text
(string-append
- (_ "Date Range")
+ (G_ "Date Range")
": "
(qof-print-date start-date)
" - "
@@ -573,16 +573,16 @@
(string-append
(cond
((eqv? type GNC-OWNER-CUSTOMER)
- (_ "No valid customer selected."))
+ (G_ "No valid customer selected."))
((eqv? type GNC-OWNER-JOB)
- (_ "No valid job selected."))
+ (G_ "No valid job selected."))
((eqv? type GNC-OWNER-VENDOR)
- (_ "No valid vendor selected."))
+ (G_ "No valid vendor selected."))
((eqv? type GNC-OWNER-EMPLOYEE)
- (_ "No valid employee selected."))
+ (G_ "No valid employee selected."))
(else ""))
" "
- (_ "Click on the \"Options\" button to select a company.")))))
+ (G_ "Click on the \"Options\" button to select a company.")))))
(qof-query-destroy query)
document))
diff --git a/gnucash/report/reports/standard/net-charts.scm b/gnucash/report/reports/standard/net-charts.scm
index 4a44e9cc9..fd838dcef 100644
--- a/gnucash/report/reports/standard/net-charts.scm
+++ b/gnucash/report/reports/standard/net-charts.scm
@@ -330,7 +330,7 @@
(gnc:html-chart-set-height! chart height)
(gnc:html-chart-set-title!
chart (list report-title
- (format #f (_ "~a to ~a")
+ (format #f (G_ "~a to ~a")
(qof-print-date from-date-t64)
(qof-print-date to-date-t64))))
(gnc:html-chart-set-y-axis-label!
@@ -346,7 +346,7 @@
(when show-sep?
(gnc:html-chart-add-data-series!
chart
- (if inc-exp? (_ "Income") (_ "Assets"))
+ (if inc-exp? (G_ "Income") (G_ "Assets"))
(map gnc:gnc-monetary-amount minuend-balances)
"#0074D9"
'fill (not linechart?)
@@ -362,12 +362,12 @@
(list gnc:pagename-general
gnc:optname-reportname
(if inc-exp?
- (_ "Income Chart")
- (_ "Asset Chart"))))))
+ (G_ "Income Chart")
+ (G_ "Asset Chart"))))))
(gnc:html-chart-add-data-series!
chart
- (if inc-exp? (_ "Expense") (_ "Liabilities"))
+ (if inc-exp? (G_ "Expense") (G_ "Liabilities"))
(map - (map gnc:gnc-monetary-amount subtrahend-balances))
"#FF4136"
'fill (not linechart?)
@@ -383,13 +383,13 @@
(list gnc:pagename-general
gnc:optname-reportname
(if inc-exp?
- (_ "Expense Chart")
- (_ "Liability Chart")))))))
+ (G_ "Expense Chart")
+ (G_ "Liability Chart")))))))
(when show-net?
(gnc:html-chart-add-data-series!
chart
- (if inc-exp? (_ "Net Profit") (_ "Net Worth"))
+ (if inc-exp? (G_ "Net Profit") (G_ "Net Worth"))
(map gnc:gnc-monetary-amount difference-balances)
"#2ECC40"
'fill (not linechart?)
@@ -413,16 +413,16 @@
(gnc:html-table-set-col-headers!
table
(append
- (list (_ "Date"))
+ (list (G_ "Date"))
(if show-sep?
(if inc-exp?
- (list (_ "Income") (_ "Expense"))
- (list (_ "Assets") (_ "Liabilities")))
+ (list (G_ "Income") (G_ "Expense"))
+ (list (G_ "Assets") (G_ "Liabilities")))
'())
(if show-net?
(if inc-exp?
- (list (_ "Net Profit"))
- (list (_ "Net Worth")))
+ (list (G_ "Net Profit"))
+ (list (G_ "Net Worth")))
'())))
(gnc:html-table-append-column! table date-string-list)
(when show-sep?
diff --git a/gnucash/report/reports/standard/new-aging.scm b/gnucash/report/reports/standard/new-aging.scm
index a03483b0f..c6f497749 100644
--- a/gnucash/report/reports/standard/new-aging.scm
+++ b/gnucash/report/reports/standard/new-aging.scm
@@ -60,10 +60,10 @@ copying this report to a spreadsheet for use in a mail merge."))
(list (N_ "Address Email") "i" (N_ "Display Email."))
(list (N_ "Active") "j" (N_ "Display Active status."))))
-(define no-APAR-account (_ "No valid A/Payable or A/Receivable \
+(define no-APAR-account (G_ "No valid A/Payable or A/Receivable \
account found. Please ensure valid AP/AR account exists."))
-(define empty-APAR-accounts (_ "A/Payable or A/Receivable accounts \
+(define empty-APAR-accounts (G_ "A/Payable or A/Receivable accounts \
exist but have no suitable transactions."))
(define num-buckets 6)
@@ -160,7 +160,7 @@ exist but have no suitable transactions."))
(gncAddressGetPhone addr)
(gncAddressGetFax addr)
(gncAddressGetEmail addr)
- (if (gncOwnerGetActive owner) (_ "Y") (_ "N")))))
+ (if (gncOwnerGetActive owner) (G_ "Y") (G_ "N")))))
(else address-list-names))))
(fold-right (lambda (opt elt prev) (if opt (cons elt prev) prev))
'() address-list-options result-list)))
@@ -189,14 +189,14 @@ exist but have no suitable transactions."))
(gnc:option-value (gnc:lookup-option options section name)))
(define make-heading-list
- (list (_ "Company")
- (_ "Pre-Payment")
- (_ "Current")
- (_ "0-30 days")
- (_ "31-60 days")
- (_ "61-90 days")
- (_ "91+ days")
- (_ "Total")))
+ (list (G_ "Company")
+ (G_ "Pre-Payment")
+ (G_ "Current")
+ (G_ "0-30 days")
+ (G_ "31-60 days")
+ (G_ "61-90 days")
+ (G_ "91+ days")
+ (G_ "Total")))
(let* ((type (if receivable ACCT-TYPE-RECEIVABLE ACCT-TYPE-PAYABLE))
(accounts (filter (lambda (acc) (eqv? (xaccAccountGetType acc) type))
@@ -319,7 +319,7 @@ exist but have no suitable transactions."))
(append
(if accounts>1? '(#f) '())
(list (gnc:make-html-table-cell/markup
- "total-label-cell" (_ "Total")))
+ "total-label-cell" (G_ "Total")))
(map
(lambda (amt)
(gnc:make-html-table-cell/markup
@@ -337,7 +337,7 @@ exist but have no suitable transactions."))
(gnc:html-document-add-object!
document
(gnc:make-html-text
- (_ "Please note some transactions were not processed")
+ (G_ "Please note some transactions were not processed")
(gnc:html-markup-ol
(map
(lambda (invalid-split)
@@ -370,7 +370,7 @@ exist but have no suitable transactions."))
(let ((type (xaccTransGetTxnType (xaccSplitGetParent this))))
(lp rest
acc-totals
- (cons (list (format #f (_ "Invalid Txn Type ~a") type) this)
+ (cons (list (format #f (G_ "Invalid Txn Type ~a") type) this)
invalid-splits)
owners-and-aging)))
@@ -380,7 +380,7 @@ exist but have no suitable transactions."))
(gnc:warn "split " this " has no owner")
(lp rest
acc-totals
- (cons (list (_ "Payment has no owner") this) invalid-splits)
+ (cons (list (G_ "Payment has no owner") this) invalid-splits)
owners-and-aging))
((this . _)
diff --git a/gnucash/report/reports/standard/new-owner-report.scm b/gnucash/report/reports/standard/new-owner-report.scm
index 086ee3a79..a71d812e9 100644
--- a/gnucash/report/reports/standard/new-owner-report.scm
+++ b/gnucash/report/reports/standard/new-owner-report.scm
@@ -85,23 +85,23 @@
(list
(list GNC-OWNER-CUSTOMER
(N_ "Customer")
- (_ "No valid customer selected.")
- (_ "This report requires a customer to be selected."))
+ (G_ "No valid customer selected.")
+ (G_ "This report requires a customer to be selected."))
(list GNC-OWNER-EMPLOYEE
(N_ "Employee")
- (_ "No valid employee selected.")
- (_ "This report requires a employee to be selected."))
+ (G_ "No valid employee selected.")
+ (G_ "This report requires a employee to be selected."))
(list GNC-OWNER-JOB
(N_ "Job")
- (_ "No valid job selected.")
- (_ "This report requires a job to be selected."))
+ (G_ "No valid job selected.")
+ (G_ "This report requires a job to be selected."))
(list GNC-OWNER-VENDOR
(N_ "Vendor")
- (_ "No valid vendor selected.")
- (_ "This report requires a vendor to be selected."))))
+ (G_ "No valid vendor selected.")
+ (G_ "This report requires a vendor to be selected."))))
(define (get-info key)
(assv-ref owner-string-alist key))
@@ -200,19 +200,19 @@
(formal? (gnc-prefs-get-bool GNC-PREFS-GROUP-GENERAL
GNC-PREF-ACCOUNTING-LABELS)))
(if (date-col column-vector)
- (addto! heading-list (_ date-header)))
+ (addto! heading-list (G_ date-header)))
(if (date-due-col column-vector)
- (addto! heading-list (_ due-date-header)))
+ (addto! heading-list (G_ due-date-header)))
(if (ref-col column-vector)
- (addto! heading-list (_ reference-header)))
+ (addto! heading-list (G_ reference-header)))
(if (type-col column-vector)
- (addto! heading-list (_ type-header)))
+ (addto! heading-list (G_ type-header)))
(if (desc-col column-vector)
- (addto! heading-list (_ desc-header)))
+ (addto! heading-list (G_ desc-header)))
(if (sale-col column-vector)
- (addto! heading-list (_ sale-header)))
+ (addto! heading-list (G_ sale-header)))
(if (tax-col column-vector)
- (addto! heading-list (_ tax-header)))
+ (addto! heading-list (G_ tax-header)))
(if (debit-col column-vector)
(addto! heading-list
(if formal? debit-header (gnc-account-get-debit-string acct-type))))
@@ -220,20 +220,20 @@
(addto! heading-list
(if formal? credit-header (gnc-account-get-credit-string acct-type))))
(if (bal-col column-vector)
- (addto! heading-list (_ balance-header)))
+ (addto! heading-list (G_ balance-header)))
(case link-option
((simple)
- (addto! heading-list (_ linked-txns-header)))
+ (addto! heading-list (G_ linked-txns-header)))
((detailed)
(if (< 0 (num-cols column-vector 'mid-spac)) (addto! heading-list #f))
- (if (date-col column-vector) (addto! heading-list (_ "Date")))
- (if (ref-col column-vector) (addto! heading-list (_ "Reference")))
- (if (type-col column-vector) (addto! heading-list (_ "Type")))
- (if (desc-col column-vector) (addto! heading-list (_ "Description")))
+ (if (date-col column-vector) (addto! heading-list (G_ "Date")))
+ (if (ref-col column-vector) (addto! heading-list (G_ "Reference")))
+ (if (type-col column-vector) (addto! heading-list (G_ "Type")))
+ (if (desc-col column-vector) (addto! heading-list (G_ "Description")))
(if (or (debit-col column-vector) (credit-col column-vector))
- (addto! heading-list (_ "Partial Amount")))
+ (addto! heading-list (G_ "Partial Amount")))
(if (or (debit-col column-vector) (credit-col column-vector))
- (addto! heading-list (_ "Amount")))))
+ (addto! heading-list (G_ "Amount")))))
(reverse heading-list)))
(define num-buckets 6)
@@ -283,9 +283,9 @@
(invoice (gncInvoiceGetInvoiceFromTxn txn)))
(cond
((txn-is-invoice? txn) (gncInvoiceGetTypeString invoice))
- ((txn-is-payment? txn) (if refund? (_ "Refund") (_ "Payment")))
- ((txn-is-link? txn) (_ "Link"))
- (else (_ "Unknown")))))
+ ((txn-is-payment? txn) (if refund? (G_ "Refund") (G_ "Payment")))
+ ((txn-is-link? txn) (G_ "Link"))
+ (else (G_ "Unknown")))))
;; input: list of html-text elements
;; output: a cell with html-text interleaved with <br> tags
@@ -304,13 +304,13 @@
splits num-buckets to-date date-type (not payable?))))
(gnc:html-table-set-col-headers!
- table (list (_ "Pre-Payment")
- (_ "Current")
- (_ "0-30 days")
- (_ "31-60 days")
- (_ "61-90 days")
- (_ "91+ days")
- (_ "Total")))
+ table (list (G_ "Pre-Payment")
+ (G_ "Current")
+ (G_ "0-30 days")
+ (G_ "31-60 days")
+ (G_ "61-90 days")
+ (G_ "91+ days")
+ (G_ "Total")))
(gnc:html-table-append-row!
table (map (lambda (entry) (gnc:make-gnc-monetary currency entry))
@@ -332,9 +332,9 @@
(append
;; Translators: ~a History refers to main details table in owner
;; report. ~a will be replaced with Customer, Vendor or Employee.
- (addif (< 0 lhs) (make-heading lhs (format #f (_ "~a History") owner-desc)) )
+ (addif (< 0 lhs) (make-heading lhs (format #f (G_ "~a History") owner-desc)) )
(addif (< 0 mid) (make-heading mid #f))
- (addif (< 0 rhs) (make-heading rhs (_ "Linked Details"))))))
+ (addif (< 0 rhs) (make-heading rhs (G_ "Linked Details"))))))
;;
;; Make a row list based on the visible columns
;;
@@ -488,7 +488,7 @@
table "grand-total"
(append
(addif (< 0 period-span) (gnc:make-html-table-cell/markup
- "total-label-cell" (_ "Period Totals")))
+ "total-label-cell" (G_ "Period Totals")))
(addif (< 1 period-span) (gnc:make-html-table-cell/size
1 (1- period-span) #f))
(addif (sale-col used-columns) (make-cell sale))
@@ -508,8 +508,8 @@
(gnc:make-html-table-cell/markup
"total-label-cell"
(if (negative? total)
- (_ "Total Credit")
- (_ "Total Due"))))
+ (G_ "Total Credit")
+ (G_ "Total Due"))))
(addif (< 1 grand-span)
(gnc:make-html-table-cell/size/markup
1 (1- grand-span)
@@ -528,7 +528,7 @@
payable? date-type currency)))))
(define (add-balance-row odd-row? total)
- (add-row table odd-row? used-columns start-date #f "" (_ "Balance") ""
+ (add-row table odd-row? used-columns start-date #f "" (G_ "Balance") ""
currency total #f #f #f #f #f
link-option (case link-option
((none) '(()))
@@ -547,7 +547,7 @@
(if (gncInvoiceIsPaid invoice)
result
(cons (make-link-desc-amount
- (_ "UNPAID")
+ (G_ "UNPAID")
(gnc:make-gnc-monetary
currency (AP-negate (gnc-lot-get-balance lot)))
(gncInvoiceReturnGUID invoice))
@@ -683,7 +683,7 @@
(if (zero? overpayment)
'()
(list (make-link-desc-amount
- (_ "Pre-Payment")
+ (G_ "Pre-Payment")
(gnc:make-gnc-monetary currency overpayment)
(gncTransGetGUID txn))))))
@@ -784,7 +784,7 @@
(gncInvoiceReturnGUID invoice)
link-option
(case link-option
- ((simple) (list (list (and (gncInvoiceIsPaid invoice) (_ "Paid")))))
+ ((simple) (list (list (and (gncInvoiceIsPaid invoice) (G_ "Paid")))))
((detailed) (make-invoice->payments-table invoice))
(else '(()))))
@@ -1021,7 +1021,7 @@ invoices and amounts.")))))
GNC-OWNER-CUSTOMER)
ACCT-TYPE-RECEIVABLE
ACCT-TYPE-PAYABLE)))
- (report-title (string-append (_ owner-descr) " " (_ "Report"))))
+ (report-title (string-append (G_ owner-descr) " " (G_ "Report"))))
(cond
((not (gncOwnerIsValid owner))
@@ -1036,8 +1036,8 @@ invoices and amounts.")))))
(gnc:html-make-generic-warning
(string-append report-title ": " (gncOwnerGetName owner))
(gnc:report-id report-obj)
- (_ "No valid account found")
- (_ "This report requires a valid AP/AR account to be available."))))
+ (G_ "No valid account found")
+ (G_ "This report requires a valid AP/AR account to be available."))))
(else
(setup-query query owner accounts end-date (eqv? GNC-OWNER-JOB type))
@@ -1060,9 +1060,9 @@ invoices and amounts.")))))
(gnc:html-document-add-object!
document
(gnc:make-html-text
- (gnc:html-markup-h2 (_ "No transactions found."))
+ (gnc:html-markup-h2 (G_ "No transactions found."))
(gnc:html-markup-p
- (format #f (_ "No transactions were found associated with the ~a.")
+ (format #f (G_ "No transactions were found associated with the ~a.")
(string-downcase (car (get-info type)))))
(gnc:html-make-options-link (gnc:report-id report-obj)))))
@@ -1090,7 +1090,7 @@ invoices and amounts.")))))
1 (length headings)
(gnc:make-html-text
(gnc:html-markup-h3
- (string-append (_ "Account") ": "
+ (string-append (G_ "Account") ": "
(xaccAccountGetName account)))))))
(add-owner-table table splits account start-date end-date
@@ -1123,7 +1123,7 @@ invoices and amounts.")))))
(gnc:html-document-add-object!
document (gnc:make-html-text
- (string-append (_ "Date Range") ": " (qof-print-date start-date)
+ (string-append (G_ "Date Range") ": " (qof-print-date start-date)
" - " (qof-print-date end-date))))
(make-break! document)
diff --git a/gnucash/report/reports/standard/owner-report.scm b/gnucash/report/reports/standard/owner-report.scm
index 119c0f5bf..c2ef11b91 100644
--- a/gnucash/report/reports/standard/owner-report.scm
+++ b/gnucash/report/reports/standard/owner-report.scm
@@ -77,18 +77,18 @@
;; Error strings in case there is no (valid) selection (translated)
(define (invalid-selection-title-string owner-type)
- (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "No valid customer selected."))
- ((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "No valid employee selected."))
+ (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (G_ "No valid customer selected."))
+ ((eqv? owner-type GNC-OWNER-EMPLOYEE) (G_ "No valid employee selected."))
;; FALL THROUGH
(else
- (_ "No valid company selected."))))
+ (G_ "No valid company selected."))))
(define (invalid-selection-string owner-type)
- (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "This report requires a customer to be selected."))
- ((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "This report requires a employee to be selected."))
+ (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (G_ "This report requires a customer to be selected."))
+ ((eqv? owner-type GNC-OWNER-EMPLOYEE) (G_ "This report requires a employee to be selected."))
;; FALL THROUGH
(else
- (_ "This report requires a company to be selected."))))
+ (G_ "This report requires a company to be selected."))))
;; Html formatted error message documents
(define (gnc:html-make-no-owner-warning
@@ -104,17 +104,17 @@
(gnc:html-make-generic-warning
report-title-string
report-id
- (_ "No valid account selected")
- (_ "This report requires a valid account to be selected.")))
+ (G_ "No valid account selected")
+ (G_ "This report requires a valid account to be selected.")))
;; Document names, used in report names (translated)
(define (doctype-str owner-type)
- (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "Customer"))
- ((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "Employee"))
+ (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (G_ "Customer"))
+ ((eqv? owner-type GNC-OWNER-EMPLOYEE) (G_ "Employee"))
;; FALL THROUGH
(else
- (_ "Vendor"))))
+ (G_ "Vendor"))))
(define (date-col columns-used)
(vector-ref columns-used 0))
@@ -169,25 +169,25 @@
(define (make-heading-list column-vector)
(let ((heading-list '()))
(if (date-col column-vector)
- (addto! heading-list (_ date-header)))
+ (addto! heading-list (G_ date-header)))
(if (date-due-col column-vector)
- (addto! heading-list (_ due-date-header)))
+ (addto! heading-list (G_ due-date-header)))
(if (num-col column-vector)
- (addto! heading-list (_ reference-header)))
+ (addto! heading-list (G_ reference-header)))
(if (type-col column-vector)
- (addto! heading-list (_ type-header)))
+ (addto! heading-list (G_ type-header)))
(if (memo-col column-vector)
- (addto! heading-list (_ desc-header)))
+ (addto! heading-list (G_ desc-header)))
(if (sale-col column-vector)
- (addto! heading-list (_ sale-header)))
+ (addto! heading-list (G_ sale-header)))
(if (tax-col column-vector)
- (addto! heading-list (_ tax-header)))
+ (addto! heading-list (G_ tax-header)))
(if (credit-col column-vector)
- (addto! heading-list (_ credit-header)))
+ (addto! heading-list (G_ credit-header)))
(if (debit-col column-vector)
- (addto! heading-list (_ debit-header)))
+ (addto! heading-list (G_ debit-header)))
(if (value-col column-vector)
- (addto! heading-list (_ amount-header)))
+ (addto! heading-list (G_ amount-header)))
(reverse heading-list)))
@@ -256,11 +256,11 @@
(gnc:html-table-set-col-headers!
table
- (list (_ "Current")
- (_ "0-30 days")
- (_ "31-60 days")
- (_ "61-90 days")
- (_ "91+ days")))
+ (list (G_ "Current")
+ (G_ "0-30 days")
+ (G_ "31-60 days")
+ (G_ "61-90 days")
+ (G_ "91+ days")))
(gnc:html-table-append-row!
table
@@ -316,7 +316,7 @@
(begin
(set! printed? #t)
(if (and (value-col column-vector) (not (gnc-numeric-zero-p total)))
- (let ((row (make-row column-vector start-date #f "" (_ "Balance") ""
+ (let ((row (make-row column-vector start-date #f "" (G_ "Balance") ""
(gnc:make-gnc-monetary (xaccTransGetCurrency txn) total) "" "" "" ""))
(row-style (if odd-row? "normal-row" "alternate-row")))
(gnc:html-table-append-row/markup! table row-style (reverse row))
@@ -350,12 +350,12 @@
(gnc:html-markup-anchor
(gnc:invoice-anchor-text invoice)
(gncInvoiceGetTypeString invoice)))
- (_ "Unknown")))
+ (G_ "Unknown")))
((equal? type TXN-TYPE-PAYMENT)
(gnc:make-html-text
(gnc:html-markup-anchor
- (gnc:split-anchor-text split) (_ "Payment"))))
- (else (_ "Unknown"))))
+ (gnc:split-anchor-text split) (G_ "Payment"))))
+ (else (G_ "Unknown"))))
)
(if reverse?
@@ -460,7 +460,7 @@
"grand-total"
(append (cons (gnc:make-html-table-cell/markup
"total-label-cell"
- (_ "Period Totals"))
+ (G_ "Period Totals"))
'())
(let ((row-contents '())
@@ -502,8 +502,8 @@
(append (cons (gnc:make-html-table-cell/markup
"total-label-cell"
(if (gnc-numeric-negative-p total)
- (_ "Total Credit")
- (_ "Total Due")))
+ (G_ "Total Credit")
+ (G_ "Total Due")))
'())
(list (gnc:make-html-table-cell/size/markup
1 (value-col used-columns)
@@ -740,7 +740,7 @@
(owner-descr (owner-string type))
(date-type (opt-val gnc:pagename-general optname-date-driver))
(owner (opt-val owner-page owner-descr))
- (report-title (string-append (doctype-str type) " " (_ "Report"))))
+ (report-title (string-append (doctype-str type) " " (G_ "Report"))))
(if (not (gncOwnerIsValid owner))
(gnc:html-document-add-object!
document
@@ -765,7 +765,7 @@
document (gnc:html-markup
"span"
(doctype-str type)
- " " (_ "Report:") " "
+ " " (G_ "Report:") " "
(gnc:html-markup-anchor
(gnc:owner-anchor-text owner)
(gncOwnerGetName owner))))
@@ -792,7 +792,7 @@
document
(gnc:make-html-text
(string-append
- (_ "Date Range")
+ (G_ "Date Range")
": "
(qof-print-date start-date)
" - "
diff --git a/gnucash/report/reports/standard/portfolio.scm b/gnucash/report/reports/standard/portfolio.scm
index 5046518d5..6e8cc04af 100644
--- a/gnucash/report/reports/standard/portfolio.scm
+++ b/gnucash/report/reports/standard/portfolio.scm
@@ -250,12 +250,12 @@
(gnc:html-table-set-col-headers!
table
- (list (_ "Account")
- (_ "Symbol")
- (_ "Listing")
- (_ "Units")
- (_ "Price")
- (_ "Value")))
+ (list (G_ "Account")
+ (G_ "Symbol")
+ (G_ "Listing")
+ (G_ "Units")
+ (G_ "Price")
+ (G_ "Value")))
(table-add-stock-rows
table accounts to-date currency
@@ -275,7 +275,7 @@
table
"grand-total"
(list (gnc:make-html-table-cell/markup
- "total-label-cell" (_ "Total"))
+ "total-label-cell" (G_ "Total"))
(gnc:make-html-table-cell/size/markup
1 5 "total-number-cell"
(gnc:make-gnc-monetary currency amount)))))
diff --git a/gnucash/report/reports/standard/price-scatter.scm b/gnucash/report/reports/standard/price-scatter.scm
index 49f7962bf..d50326528 100644
--- a/gnucash/report/reports/standard/price-scatter.scm
+++ b/gnucash/report/reports/standard/price-scatter.scm
@@ -197,7 +197,7 @@
(gnc-commodity-get-mnemonic base-commodity)
" - "
(format #f
- (_ "~a to ~a")
+ (G_ "~a to ~a")
(qof-print-date from-date)
(qof-print-date to-date)))))
(gnc:html-chart-set-width! chart width)
@@ -219,11 +219,11 @@
(gnc-commodity-get-mnemonic amount-commodity))
(gnc:html-chart-set-x-axis-label!
chart (case interval
- ((DayDelta) (_ "Days"))
- ((WeekDelta) (_ "Weeks"))
- ((TwoWeekDelta) (_ "Double-Weeks"))
- ((MonthDelta) (_ "Months"))
- ((YearDelta) (_ "Years"))))
+ ((DayDelta) (G_ "Days"))
+ ((WeekDelta) (G_ "Weeks"))
+ ((TwoWeekDelta) (G_ "Double-Weeks"))
+ ((MonthDelta) (G_ "Months"))
+ ((YearDelta) (G_ "Years"))))
(gnc:html-chart-set!
chart '(options scales xAxes (0) type) 'linear)
@@ -283,11 +283,11 @@
(format #f "~2,2f ~a = ~a"
(car datum)
(case interval
- ((DayDelta) (_ "Days"))
- ((WeekDelta) (_ "Weeks"))
- ((TwoWeekDelta) (_ "Double-Weeks"))
- ((MonthDelta) (_ "Months"))
- ((YearDelta) (_ "Years")))
+ ((DayDelta) (G_ "Days"))
+ ((WeekDelta) (G_ "Weeks"))
+ ((TwoWeekDelta) (G_ "Double-Weeks"))
+ ((MonthDelta) (G_ "Months"))
+ ((YearDelta) (G_ "Years")))
(gnc:monetary->string
(gnc:make-gnc-monetary
amount-commodity
@@ -295,7 +295,7 @@
data))
(gnc:html-chart-add-data-series!
- chart (_ "Price")
+ chart (G_ "Price")
(map
(lambda (datum)
(list
@@ -313,28 +313,28 @@
(cond
((null? data)
(make-warning
- (_ "No data")
- (_ "There is no price information available for the \
+ (G_ "No data")
+ (G_ "There is no price information available for the \
selected commodities in the selected time period.")))
((<= (length data) 1)
(make-warning
- (_ "Only one price")
- (_ "There was only one single price found for the \
+ (G_ "Only one price")
+ (G_ "There was only one single price found for the \
selected commodities in the selected time period. This doesn't give \
a useful plot.")))
((apply equal? (map cadr data))
(make-warning
- (_ "All Prices equal")
- (_ "All the prices found are equal. \
+ (G_ "All Prices equal")
+ (G_ "All the prices found are equal. \
This would result in a plot with one straight line. \
Unfortunately, the plotting tool can't handle that.")))
((apply equal? (map car data))
(make-warning
- (_ "All Prices at the same date")
- (_ "All the prices found are from the same date. \
+ (G_ "All Prices at the same date")
+ (G_ "All the prices found are from the same date. \
This would result in a plot with one straight line. \
Unfortunately, the plotting tool can't handle that.")))
@@ -343,8 +343,8 @@ Unfortunately, the plotting tool can't handle that.")))
;; warning if report-currency == price-commodity
(make-warning
- (_ "Identical commodities")
- (_ "Your selected commodity and the currency of the report \
+ (G_ "Identical commodities")
+ (G_ "Your selected commodity and the currency of the report \
are identical. It doesn't make sense to show prices for identical \
commodities.")))
diff --git a/gnucash/report/reports/standard/receipt.scm b/gnucash/report/reports/standard/receipt.scm
index d02a2939c..468b75405 100644
--- a/gnucash/report/reports/standard/receipt.scm
+++ b/gnucash/report/reports/standard/receipt.scm
@@ -107,37 +107,37 @@
(N_ "The format for the date->string conversion for today's date.")
;; Translators: Boost::date_time format string
;; "%l:%M %P, %e %B %Y" means " 9:56 pm, 19 June 2019"
- (_ "%l:%M %P, %e %B %Y")))
+ (G_ "%l:%M %P, %e %B %Y")))
;; Heading options
(add-option (gnc:make-string-option
; page / name / orderkey / tooltip / default
- headingpage optname-report-title "a" "" (_ "Invoice")))
+ headingpage optname-report-title "a" "" (G_ "Invoice")))
(add-option (gnc:make-string-option
- headingpage optname-units "b" "" (_ "Units")))
+ headingpage optname-units "b" "" (G_ "Units")))
(add-option (gnc:make-string-option
- headingpage optname-qty "c" "" (_ "Qty")))
+ headingpage optname-qty "c" "" (G_ "Qty")))
(add-option (gnc:make-string-option
- headingpage optname-unit-price "d" "" (_ "Unit Price")))
+ headingpage optname-unit-price "d" "" (G_ "Unit Price")))
(add-option (gnc:make-string-option
- headingpage optname-disc-rate "e" "" (_ "Discount Rate")))
+ headingpage optname-disc-rate "e" "" (G_ "Discount Rate")))
(add-option (gnc:make-string-option
- headingpage optname-disc-amount "f" "" (_ "Discount Amount")))
+ headingpage optname-disc-amount "f" "" (G_ "Discount Amount")))
(add-option (gnc:make-string-option
- headingpage optname-net-price "g" "" (_ "Net Price")))
+ headingpage optname-net-price "g" "" (G_ "Net Price")))
(add-option (gnc:make-string-option
- headingpage optname-tax-rate "h" "" (_ "Tax Rate")))
+ headingpage optname-tax-rate "h" "" (G_ "Tax Rate")))
(add-option (gnc:make-string-option
- headingpage optname-tax-amount "i" "" (_ "Tax Amount")))
+ headingpage optname-tax-amount "i" "" (G_ "Tax Amount")))
(add-option (gnc:make-string-option
- headingpage optname-total-price "j" "" (_ "Total Price")))
+ headingpage optname-total-price "j" "" (G_ "Total Price")))
(add-option (gnc:make-string-option
- headingpage2 optname-subtotal "a" "" (_ "Sub-total")))
+ headingpage2 optname-subtotal "a" "" (G_ "Sub-total")))
(add-option (gnc:make-string-option
- headingpage2 optname-amount-due "b" "" (_ "Amount Due")))
+ headingpage2 optname-amount-due "b" "" (G_ "Amount Due")))
(add-option (gnc:make-string-option
headingpage2 optname-payment-recd "c" ""
- (_ "Payment received, thank you!")))
+ (G_ "Payment received, thank you!")))
(add-option (gnc:make-text-option
notespage optname-extra-notes "a"
diff --git a/gnucash/report/reports/standard/reconcile-report.scm b/gnucash/report/reports/standard/reconcile-report.scm
index 1d975bd07..208d7b31d 100644
--- a/gnucash/report/reports/standard/reconcile-report.scm
+++ b/gnucash/report/reports/standard/reconcile-report.scm
@@ -56,7 +56,7 @@
(define reconcile-report-instructions
(gnc:make-html-text
- (_ "The reconcile report is designed to be similar to the formal \
+ (G_ "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.")
@@ -83,10 +83,10 @@ to the Reconciliation Date.")
(and (not (positive? (split-amount s)))
(gnc:monetary-neg (amount s))))))
;; similar to default-calculated-cells but disable dual-subtotals.
- (list (vector (_ "Funds In")
+ (list (vector (G_ "Funds In")
debit-amount #f #t #f
(const "") #t)
- (vector (_ "Funds Out")
+ (vector (G_ "Funds Out")
credit-amount #f #t #f
(const "") #f))))
@@ -100,7 +100,7 @@ to the Reconciliation Date.")
(gnc:define-report
'version 1
- 'name (_ "Reconciliation Report")
+ 'name (G_ "Reconciliation Report")
'report-guid "e45218c6d76f11e7b5ef0800277ef320"
'options-generator reconcile-report-options-generator
;; the renderer is the same as trep, however we're using a different
diff --git a/gnucash/report/reports/standard/register.scm b/gnucash/report/reports/standard/register.scm
index 080fa759b..89dc1ba5b 100644
--- a/gnucash/report/reports/standard/register.scm
+++ b/gnucash/report/reports/standard/register.scm
@@ -126,27 +126,27 @@
(let ((heading-list '()))
(gnc:debug "Column-vector" column-vector)
(if (date-col column-vector)
- (addto! heading-list (_ "Date")))
+ (addto! heading-list (G_ "Date")))
(if (num-col column-vector)
(addto! heading-list (if action-for-num?
(if ledger-type?
- (_ "T-Num")
- (_ "Num/Action"))
- (_ "Num"))))
+ (G_ "T-Num")
+ (G_ "Num/Action"))
+ (G_ "Num"))))
(if (description-col column-vector)
- (addto! heading-list (_ "Description")))
+ (addto! heading-list (G_ "Description")))
(if (memo-col column-vector)
- (addto! heading-list (_ "Memo")))
+ (addto! heading-list (G_ "Memo")))
(if (account-col column-vector)
(addto! heading-list (if multi-rows?
- (_ "Account")
- (_ "Transfer"))))
+ (G_ "Account")
+ (G_ "Transfer"))))
(if (shares-col column-vector)
- (addto! heading-list (_ "Shares")))
+ (addto! heading-list (G_ "Shares")))
(if (lot-col column-vector)
- (addto! heading-list (_ "Lot")))
+ (addto! heading-list (G_ "Lot")))
(if (price-col column-vector)
- (addto! heading-list (_ "Price")))
+ (addto! heading-list (G_ "Price")))
(if (amount-single-col column-vector)
(addto! heading-list amount-string))
(if (debit-col column-vector)
@@ -154,13 +154,13 @@
(if (credit-col column-vector)
(addto! heading-list credit-string))
(if (value-single-col column-vector)
- (addto! heading-list (_ "Value")))
+ (addto! heading-list (G_ "Value")))
(if (value-debit-col column-vector)
- (addto! heading-list (_ "Debit Value")))
+ (addto! heading-list (G_ "Debit Value")))
(if (value-credit-col column-vector)
- (addto! heading-list (_ "Credit Value")))
+ (addto! heading-list (G_ "Credit Value")))
(if (balance-col column-vector)
- (addto! heading-list (_ "Balance")))
+ (addto! heading-list (G_ "Balance")))
(reverse heading-list)))
(define (add-split-row table split column-vector row-style transaction-info?
@@ -224,8 +224,8 @@
((2) (gnc-account-get-full-name
(xaccSplitGetAccount
(xaccSplitGetOtherSplit split))))
- ((1) (_ "None"))
- (else (_ "-- Split Transaction --"))))))))
+ ((1) (G_ "None"))
+ (else (G_ "-- Split Transaction --"))))))))
(if (shares-col column-vector)
(addto! row-contents
(gnc:make-html-table-cell/markup
@@ -366,9 +366,9 @@
(gnc:register-reg-option
(gnc:make-internal-option "__reg" "double" #f))
(gnc:register-reg-option
- (gnc:make-internal-option "__reg" "debit-string" (_ "Debit")))
+ (gnc:make-internal-option "__reg" "debit-string" (G_ "Debit")))
(gnc:register-reg-option
- (gnc:make-internal-option "__reg" "credit-string" (_ "Credit")))
+ (gnc:make-internal-option "__reg" "credit-string" (G_ "Credit")))
(gnc:register-reg-option
(gnc:make-string-option
@@ -578,18 +578,18 @@
;; ----------------------------------
((null? splits)
(when reg-report-show-totals?
- (add-subtotal-row (_ "Total Debits") leader table used-columns
+ (add-subtotal-row (G_ "Total Debits") leader table used-columns
debit-collector "grand-total" #f)
- (add-subtotal-row (_ "Total Credits") leader table used-columns
+ (add-subtotal-row (G_ "Total Credits") leader table used-columns
credit-collector "grand-total" #f)
- (add-subtotal-row (_ "Total Value Debits") leader table used-columns
+ (add-subtotal-row (G_ "Total Value Debits") leader table used-columns
debit-value "grand-total" #t)
- (add-subtotal-row (_ "Total Value Credits") leader table used-columns
+ (add-subtotal-row (G_ "Total Value Credits") leader table used-columns
credit-value "grand-total" #t))
(when ledger-type?
- (add-subtotal-row (_ "Net Change") leader table used-columns
+ (add-subtotal-row (G_ "Net Change") leader table used-columns
total-collector "grand-total" #f))
- (add-subtotal-row (_ "Value Change") leader table used-columns
+ (add-subtotal-row (G_ "Value Change") leader table used-columns
total-value "grand-total" #t))
;; The general journal has a split that doesn't have an account
@@ -662,7 +662,7 @@
(table (make-split-table splits
(gnc:report-options report-obj)
debit-string credit-string
- (_ "Amount"))))
+ (G_ "Amount"))))
(gnc:html-document-set-title! document title)
(gnc:html-document-add-object! document table)
(qof-query-destroy query))
diff --git a/gnucash/report/reports/standard/taxinvoice.scm b/gnucash/report/reports/standard/taxinvoice.scm
index dcb795e22..6cfe0df42 100644
--- a/gnucash/report/reports/standard/taxinvoice.scm
+++ b/gnucash/report/reports/standard/taxinvoice.scm
@@ -67,7 +67,7 @@
(if pc? (format #t "~a%" (pctot 'total #f)))
(if (and amt? pc?) (display " + "))
(if amt? (display-comm-coll-total amttot #f))
- (if (equal? amt? pc? #f) (display (_ "n/a")))))))
+ (if (equal? amt? pc? #f) (display (G_ "n/a")))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Define all the options
@@ -170,47 +170,47 @@
;; Heading options
(add-option (gnc:make-string-option
; page / name / orderkey / tooltip / default
- headingpage optname-report-title "a" "" (_ "Invoice")))
+ headingpage optname-report-title "a" "" (G_ "Invoice")))
(add-option (gnc:make-string-option
- headingpage optname-units "b" "" (_ "Units")))
+ headingpage optname-units "b" "" (G_ "Units")))
(add-option (gnc:make-string-option
- headingpage optname-qty "c" "" (_ "Qty")))
+ headingpage optname-qty "c" "" (G_ "Qty")))
(add-option (gnc:make-string-option
- headingpage optname-unit-price "d" "" (_ "Unit Price")))
+ headingpage optname-unit-price "d" "" (G_ "Unit Price")))
(add-option (gnc:make-string-option
- headingpage optname-disc-rate "e" "" (_ "Discount Rate")))
+ headingpage optname-disc-rate "e" "" (G_ "Discount Rate")))
(add-option (gnc:make-string-option
- headingpage optname-disc-amount "f" "" (_ "Discount Amount")))
+ headingpage optname-disc-amount "f" "" (G_ "Discount Amount")))
(add-option (gnc:make-string-option
- headingpage optname-net-price "g" "" (_ "Net Price")))
+ headingpage optname-net-price "g" "" (G_ "Net Price")))
(add-option (gnc:make-string-option
- headingpage optname-tax-rate "h" "" (_ "Tax Rate")))
+ headingpage optname-tax-rate "h" "" (G_ "Tax Rate")))
(add-option (gnc:make-string-option
- headingpage optname-tax-amount "i" "" (_ "Tax Amount")))
+ headingpage optname-tax-amount "i" "" (G_ "Tax Amount")))
(add-option (gnc:make-string-option
- headingpage optname-total-price "j" "" (_ "Total Price")))
+ headingpage optname-total-price "j" "" (G_ "Total Price")))
(add-option (gnc:make-string-option
- headingpage2 optname-subtotal "a" "" (_ "Sub-total")))
+ headingpage2 optname-subtotal "a" "" (G_ "Sub-total")))
(add-option (gnc:make-string-option
- headingpage2 optname-amount-due "b" "" (_ "Amount Due")))
+ headingpage2 optname-amount-due "b" "" (G_ "Amount Due")))
(add-option (gnc:make-string-option
headingpage2 optname-payment-recd "c" ""
- (_ "Payment received, thank you!")))
+ (G_ "Payment received, thank you!")))
(add-option (gnc:make-string-option headingpage2 optname-invoice-number-text
- "d" "" (_ "Invoice number: ")))
+ "d" "" (G_ "Invoice number: ")))
(add-option (gnc:make-string-option headingpage2 optname-to-text
- "e" "" (_ "To: ")))
+ "e" "" (G_ "To: ")))
(add-option (gnc:make-string-option headingpage2 optname-ref-text
- "f" "" (_ "Your ref: ")))
+ "f" "" (G_ "Your ref: ")))
(add-option (gnc:make-string-option headingpage2 optname-jobnumber-text
- "g" "" (_ "Job number: ")))
+ "g" "" (G_ "Job number: ")))
(add-option (gnc:make-string-option headingpage2 optname-jobname-text
- "h" "" (_ "Job name: ")))
+ "h" "" (G_ "Job name: ")))
(add-option (gnc:make-text-option
notespage optname-extra-notes "a"
- (_ "Notes added at end of invoice -- may contain HTML markup.")
- (_ "Thank you for your patronage!")))
+ (G_ "Notes added at end of invoice -- may contain HTML markup.")
+ (G_ "Thank you for your patronage!")))
(add-option (gnc:make-text-option notespage optname-extra-css "b"
(N_ "Embedded CSS.") "h1.coyname { text-align: left; }"))
@@ -306,14 +306,14 @@
(gnc:option-set-value option value)))
(let ((options (options-generator)))
- (set-opt options headingpage optname-report-title (_ "Tax Invoice"))
- (set-opt options headingpage optname-unit-price (_ "Unit"))
- (set-opt options headingpage optname-tax-rate (_ "GST Rate"))
- (set-opt options headingpage optname-tax-amount (_ "GST Amount"))
- (set-opt options headingpage2 optname-amount-due (_ "Amount Due (inc GST)"))
- (set-opt options headingpage2 optname-invoice-number-text (_ "Invoice #: "))
- (set-opt options headingpage2 optname-ref-text (_ "Reference: "))
- (set-opt options headingpage2 optname-jobname-text (_ "Engagement: "))
+ (set-opt options headingpage optname-report-title (G_ "Tax Invoice"))
+ (set-opt options headingpage optname-unit-price (G_ "Unit"))
+ (set-opt options headingpage optname-tax-rate (G_ "GST Rate"))
+ (set-opt options headingpage optname-tax-amount (G_ "GST Amount"))
+ (set-opt options headingpage2 optname-amount-due (G_ "Amount Due (inc GST)"))
+ (set-opt options headingpage2 optname-invoice-number-text (G_ "Invoice #: "))
+ (set-opt options headingpage2 optname-ref-text (G_ "Reference: "))
+ (set-opt options headingpage2 optname-jobname-text (G_ "Engagement: "))
(set-opt options notespage optname-extra-css "h1.coyname { text-align: right; margin-bottom: 0px ; font-size: 200%; } h2.invoice { text-align: left; margin-bottom: 0px ; font-size: 500%; }")
options))
diff --git a/gnucash/report/reports/standard/trial-balance.scm b/gnucash/report/reports/standard/trial-balance.scm
index ce800ab14..18b06f8ab 100644
--- a/gnucash/report/reports/standard/trial-balance.scm
+++ b/gnucash/report/reports/standard/trial-balance.scm
@@ -183,7 +183,7 @@
(add-option
(gnc:make-string-option
(N_ "General") optname-report-title
- "a" opthelp-report-title (_ reportname)))
+ "a" opthelp-report-title (G_ reportname)))
(add-option
(gnc:make-string-option
(N_ "General") optname-party-name
@@ -276,7 +276,7 @@
(add-option
(gnc:make-string-option
pagename-entries optname-adjusting-pattern
- "a" opthelp-adjusting-pattern (_ "Adjusting Entries")))
+ "a" opthelp-adjusting-pattern (G_ "Adjusting Entries")))
(add-option
(gnc:make-simple-boolean-option
pagename-entries optname-adjusting-casing
@@ -288,7 +288,7 @@
(add-option
(gnc:make-string-option
pagename-entries optname-closing-pattern
- "d" opthelp-closing-pattern (_ "Closing Entries")))
+ "d" opthelp-closing-pattern (G_ "Closing Entries")))
(add-option
(gnc:make-simple-boolean-option
pagename-entries optname-closing-casing
@@ -401,7 +401,7 @@
;; exchange rates calculation parameters
(exchange-fn
(gnc:case-exchange-fn price-source report-commodity end-date))
- (period-for (string-append " " (_ "for Period"))))
+ (period-for (string-append " " (G_ "for Period"))))
(gnc:html-document-set-title!
doc (if (eq? report-variant 'current)
@@ -409,7 +409,7 @@
company-name report-title
(qof-print-date end-date))
(format #f (string-append "~a ~a "
- (_ "For Period Covering ~a to ~a"))
+ (G_ "For Period Covering ~a to ~a"))
company-name report-title
(qof-print-date start-date-printable)
(qof-print-date end-date))))
@@ -566,11 +566,11 @@
(if (eq? report-variant 'work-sheet)
(let* ((headings
(list
- (_ "Trial Balance")
- (_ "Adjustments")
- (_ "Adjusted Trial Balance")
- (_ "Income Statement")
- (_ "Balance Sheet")))
+ (G_ "Trial Balance")
+ (G_ "Adjustments")
+ (G_ "Adjusted Trial Balance")
+ (G_ "Income Statement")
+ (G_ "Balance Sheet")))
(parent-headings #f))
(set! parent-headings
(apply append
@@ -589,13 +589,13 @@
;; add the DEBIT/CREDIT headers
(let* ((debit-cell
(gnc:make-html-table-cell/markup
- "th" (_ "Debit")))
+ "th" (G_ "Debit")))
(credit-cell
(gnc:make-html-table-cell/markup
- "th" (_ "Credit")))
+ "th" (G_ "Credit")))
(row (append
(list (gnc:make-html-table-cell/markup
- "th" (_ "Account Name")))
+ "th" (G_ "Account Name")))
(gnc:html-make-empty-cells (- account-cols 1))
(list debit-cell)
(list credit-cell)))
@@ -731,8 +731,8 @@
report-commodity exchange-fn show-fcur?)))
(add-line build-table
(if credit?
- (_ "Unrealized Gains")
- (_ "Unrealized Losses"))
+ (G_ "Unrealized Gains")
+ (G_ "Unrealized Losses"))
neg-unrealized-gain-collector)
(when (eq? report-variant 'work-sheet)
;; make table line wide enough
@@ -857,7 +857,7 @@
exchange-fn show-fcur?))
(gnc:html-table-add-labeled-amount-line!
build-table tbl-width "primary-subheading" #f
- (if is-credit? (_ "Net Income") (_ "Net Loss"))
+ (if is-credit? (G_ "Net Income") (G_ "Net Loss"))
0 1 "total-label-cell" is-entry
(+ account-cols (* 2 is-col) (if is-credit? 0 1))
1 "total-number-cell")
diff --git a/gnucash/report/reports/standard/view-column.scm b/gnucash/report/reports/standard/view-column.scm
index 516e6cba5..bdce7dd08 100644
--- a/gnucash/report/reports/standard/view-column.scm
+++ b/gnucash/report/reports/standard/view-column.scm
@@ -128,8 +128,8 @@
(gnc:html-table-cell-append-objects!
contents-cell
(gnc:make-html-text
- (gnc:html-markup-h3 (_ "Report error"))
- (_ "An error occurred while running the report.")
+ (gnc:html-markup-h3 (G_ "Report error"))
+ (G_ "An error occurred while running the report.")
(gnc:html-markup "pre" gnc:last-captured-error))))
;; increment the alloc number for each occupied row
@@ -156,14 +156,14 @@
URL-TYPE-OPTIONS
(format #f "report-id=~a" (car report-info))
"")
- (_ "Edit Options"))
+ (G_ "Edit Options"))
" "
(gnc:html-markup-anchor
(gnc-build-url
URL-TYPE-REPORT
(format #f "id=~a" (car report-info))
"")
- (_ "Single Report")))))
+ (G_ "Single Report")))))
;; add the report-table to the toplevel-cell
(gnc:html-table-cell-append-objects!
diff --git a/gnucash/report/reports/support/balsheet-eg.eguile.scm b/gnucash/report/reports/support/balsheet-eg.eguile.scm
index 301962959..e8b8849d2 100644
--- a/gnucash/report/reports/support/balsheet-eg.eguile.scm
+++ b/gnucash/report/reports/support/balsheet-eg.eguile.scm
@@ -110,7 +110,7 @@
maxdepth
(accrec-depth accrec)
(if (> (accrec-depth accrec) 1) rshift 0)
- (string-append (_ "Total") " " (accrec-namelink accrec))
+ (string-append (G_ "Total") " " (accrec-namelink accrec))
(format-comm-coll-total (accrec-subtotal-cc accrec))
(<= (accrec-depth accrec) 1) ; total?
(> (accrec-depth accrec) 0))))) ; leftoverrule?
@@ -164,29 +164,29 @@
(rshift-ie 0)
(balancing-cc (gnc:make-commodity-collector))
(etl-cc (gnc:make-commodity-collector)))
- (accrec-set-namelink! accrec-as (_ "Assets Accounts"))
+ (accrec-set-namelink! accrec-as (G_ "Assets Accounts"))
(accrec-set-placeholder?! accrec-as #t)
(balancing-cc 'merge (accrec-subtotal-cc accrec-as) #f)
(if (and (one-depth-1 accrec-as)
(> (accrec-treedepth accrec-as) 1))
(set! rshift-as 1))
- (accrec-set-namelink! accrec-li (_ "Liability Accounts"))
+ (accrec-set-namelink! accrec-li (G_ "Liability Accounts"))
(accrec-set-placeholder?! accrec-li #t)
(etl-cc 'merge (accrec-subtotal-cc accrec-li) #f)
(if (and (one-depth-1 accrec-li)
(> (accrec-treedepth accrec-li) 1))
(set! rshift-li 1))
- (accrec-set-namelink! accrec-eq (_ "Equity Accounts"))
+ (accrec-set-namelink! accrec-eq (G_ "Equity Accounts"))
(accrec-set-placeholder?! accrec-eq #t)
(etl-cc 'merge (accrec-subtotal-cc accrec-eq) #f)
- (accrec-set-namelink! accrec-tr (_ "Trading Accounts"))
+ (accrec-set-namelink! accrec-tr (G_ "Trading Accounts"))
(accrec-set-placeholder?! accrec-tr #t)
(etl-cc 'merge (accrec-subtotal-cc accrec-tr) #f)
(balancing-cc 'minusmerge etl-cc #f)
(accrec-set-namelink! accrec-ie
(if (gnc-numeric-negative-p (accrec-balance-num accrec-ie))
- (_ "Retained Losses")
- (_ "Retained Earnings")))
+ (G_ "Retained Losses")
+ (G_ "Retained Earnings")))
(accrec-set-placeholder?! accrec-ie #t)
(balancing-cc 'minusmerge (accrec-subtotal-cc accrec-ie) #f)
(if (and (one-depth-1 accrec-eq)
@@ -246,7 +246,7 @@
(hrule (* maxdepth 2))
(display-acc-row
maxdepth 0 0
- (_ "Total Equity, Trading, and Liabilities")
+ (G_ "Total Equity, Trading, and Liabilities")
(format-comm-coll-total etl-cc)
#t #f)
(hrule (* maxdepth 2))
@@ -255,7 +255,7 @@
(if (not (gnc-commodity-collector-allzero? balancing-cc))
(display-acc-row
maxdepth 0 0
- (_ "Imbalance Amount")
+ (G_ "Imbalance Amount")
(format-comm-coll-total balancing-cc)
#t #f))
@@ -272,7 +272,7 @@
(if (not (null? xlist))
(begin
?>
-<p><?scm:d (_ "<strong>Exchange Rates</strong> used for this report") ?>
+<p><?scm:d (G_ "<strong>Exchange Rates</strong> used for this report") ?>
<table border="0">
<?scm
(for-each
diff --git a/gnucash/report/reports/support/receipt.eguile.scm b/gnucash/report/reports/support/receipt.eguile.scm
index c11c1ac13..1957e3812 100644
--- a/gnucash/report/reports/support/receipt.eguile.scm
+++ b/gnucash/report/reports/support/receipt.eguile.scm
@@ -88,7 +88,7 @@
<html dir='auto'>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
-<title><?scm:d (_ "Invoice") ?> <?scm:d invoiceid ?></title>
+<title><?scm:d (G_ "Invoice") ?> <?scm:d invoiceid ?></title>
<link rel="stylesheet" href="<?scm:d opt-css-file ?>" type="text/css">
<!-- Note that the external stylesheet file is overridden by this following: -->
@@ -121,7 +121,7 @@
<!-- header texts -->
- <h1><?scm:d (nbsp (_ "Invoice No.")) ?> <?scm:d invoiceid ?></h1>
+ <h1><?scm:d (nbsp (G_ "Invoice No.")) ?> <?scm:d invoiceid ?></h1>
<h2><?scm:d (gnc-print-time64 (gnc:get-today) opt-date-format) ?></h2>
<p> </p>
<?scm (if (not (string=? billcontact "")) (begin ?>
@@ -140,8 +140,8 @@
<table border="0" width="100%" class="entries">
<thead>
<tr>
- <th align="left" ><?scm:d (_ "Date") ?></th>
- <th align="left" ><?scm:d (_ "Descr.") ?></th>
+ <th align="left" ><?scm:d (G_ "Date") ?></th>
+ <th align="left" ><?scm:d (G_ "Descr.") ?></th>
<th align="right"><?scm:d opt-qty-heading ?></th>
<th align="right"><?scm:d opt-unit-price-heading ?></th>
<th align="right"><?scm:d opt-net-price-heading ?></th>
@@ -275,15 +275,15 @@
; 'mainline' code: check for a valid invoice, then display the report
(cond
((null? opt-invoice)
- (display (string-append "<h2>" (_ "Receipt") "</h2>"))
- (display (string-append "<p>" (_ "No invoice has been selected -- please use the Options menu to select one.") "</p>")))
+ (display (string-append "<h2>" (G_ "Receipt") "</h2>"))
+ (display (string-append "<p>" (G_ "No invoice has been selected -- please use the Options menu to select one.") "</p>")))
((not (eqv? GNC-OWNER-CUSTOMER
(gncOwnerGetType
(gncOwnerGetEndOwner
(gncInvoiceGetOwner opt-invoice)))))
- (display (string-append "<h2>" (_ "Receipt") "</h2>"))
- (display (string-append "<p>" (_ "This report is designed for customer (sales) invoices only. Please use the Options menu to select an <em>Invoice</em>, not a Bill or Expense Voucher.") "</p>")))
+ (display (string-append "<h2>" (G_ "Receipt") "</h2>"))
+ (display (string-append "<p>" (G_ "This report is designed for customer (sales) invoices only. Please use the Options menu to select an <em>Invoice</em>, not a Bill or Expense Voucher.") "</p>")))
(else
(display-report opt-invoice)))
diff --git a/gnucash/report/reports/support/taxinvoice.eguile.scm b/gnucash/report/reports/support/taxinvoice.eguile.scm
index 16c3b290e..c8d316adf 100644
--- a/gnucash/report/reports/support/taxinvoice.eguile.scm
+++ b/gnucash/report/reports/support/taxinvoice.eguile.scm
@@ -103,7 +103,7 @@
<html dir='auto'>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
-<title><?scm:d (_ "Invoice") ?> <?scm:d invoiceid ?></title>
+<title><?scm:d (G_ "Invoice") ?> <?scm:d invoiceid ?></title>
<link rel="stylesheet" href="<?scm:d (make-file-url opt-css-file) ?>" type="text/css">
<!-- Note that the external stylesheet file is overridden by this following: -->
@@ -146,7 +146,7 @@
</td>
<?scm )) ?>
<td align="left">
- <h1 class="coyname"><?scm:d (or coyname (_ "Company Name")) ?></h1>
+ <h1 class="coyname"><?scm:d (or coyname (G_ "Company Name")) ?></h1>
</td>
<td align="right"><h2 class="invoice"><?scm:d opt-report-title ?>
<?scm (if opt-invnum-next-to-title (begin ?><?scm:d (nbsp invoiceid) ?><?scm )) ?>
@@ -172,25 +172,25 @@
<?scm )) ?>
<?scm (if coyphone (begin ?>
<tr>
- <td align="right"><?scm:d (_ "Phone") ?>: </td>
+ <td align="right"><?scm:d (G_ "Phone") ?>: </td>
<td align="right"><?scm:d coyphone ?></td>
</tr>
<?scm )) ?>
<?scm (if coyfax (begin ?>
<tr>
- <td align="right"><?scm:d (_ "Fax") ?>: </td>
+ <td align="right"><?scm:d (G_ "Fax") ?>: </td>
<td align="right"><?scm:d coyfax ?></td>
</tr>
<?scm )) ?>
<?scm (if coyemail (begin ?>
<tr>
- <td align="right"><?scm:d (_ "Email") ?>: </td>
+ <td align="right"><?scm:d (G_ "Email") ?>: </td>
<td align="right"><?scm:d coyemail ?></td>
</tr>
<?scm )) ?>
<?scm (if coyurl (begin ?>
<tr>
- <td align="right"><?scm:d (_ "Website") ?>: </td>
+ <td align="right"><?scm:d (G_ "Website") ?>: </td>
<td align="right"><?scm:d coyurl ?></td>
</tr>
<?scm )) ?>
@@ -222,15 +222,15 @@
<?scm )) ?>
<?scm (if (not isposted) (begin ?>
<tr>
- <td colspan="2" align="right"><?scm:d (_ "Invoice in progress...") ?></td>
+ <td colspan="2" align="right"><?scm:d (G_ "Invoice in progress...") ?></td>
</tr>
<?scm ) (begin ?>
<tr>
- <td align="right"><?scm:d (nbsp (_ "Invoice Date")) ?>: </td>
+ <td align="right"><?scm:d (nbsp (G_ "Invoice Date")) ?>: </td>
<td align="right"><?scm:d (nbsp (gnc-print-time64 postdate dateformat)) ?></td>
</tr>
<tr>
- <td align="right"><?scm:d (nbsp (_ "Due Date")) ?>: </td>
+ <td align="right"><?scm:d (nbsp (G_ "Due Date")) ?>: </td>
<td align="right"><?scm:d (nbsp (gnc-print-time64 duedate dateformat)) ?></td>
</tr> <?scm )) ?>
<?scm (if (not (string=? billingid "")) (begin ?>
@@ -265,9 +265,9 @@
<thead>
<tr bgcolor="#ccc" valign="bottom">
<?scm (if opt-col-date (begin ?>
- <th align="center" ><?scm:d (_ "Date") ?></th>
+ <th align="center" ><?scm:d (G_ "Date") ?></th>
<?scm (set! tbl_cols (+ tbl_cols 1)) )) ?>
- <th align="left" width="80%"><?scm:d (_ "Description") ?></th>
+ <th align="left" width="80%"><?scm:d (G_ "Description") ?></th>
<?scm (if (and units? opt-col-units) (begin ?>
<th align="left"><?scm:d opt-units-heading ?></th>
<?scm (set! tbl_cols (+ tbl_cols 1)) )) ?>
@@ -420,8 +420,8 @@
(cond
((null? opt-invoice)
- (display (string-append "<h2>" (_ "Tax Invoice") "</h2>"))
- (display (string-append "<p>" (_ "No invoice has been selected -- please use the Options menu to select one.") "</p>")))
+ (display (string-append "<h2>" (G_ "Tax Invoice") "</h2>"))
+ (display (string-append "<p>" (G_ "No invoice has been selected -- please use the Options menu to select one.") "</p>")))
(else
(display-report opt-invoice)))
diff --git a/gnucash/report/stylesheets/css.scm b/gnucash/report/stylesheets/css.scm
index b0d7b7311..edbb87b7a 100644
--- a/gnucash/report/stylesheets/css.scm
+++ b/gnucash/report/stylesheets/css.scm
@@ -206,7 +206,7 @@ td.highlight {
(gnc:html-document-set-style-text! ssdoc default-css)
(gnc:html-document-add-object!
ssdoc (gnc:make-html-text
- (_ "</style is disallowed in CSS. Using default CSS."))))
+ (G_ "</style is disallowed in CSS. Using default CSS."))))
(else
(gnc:html-document-set-style-text! ssdoc all-css)))
diff --git a/gnucash/report/stylesheets/footer.scm b/gnucash/report/stylesheets/footer.scm
index 5e1d0b6c8..ea344bd98 100644
--- a/gnucash/report/stylesheets/footer.scm
+++ b/gnucash/report/stylesheets/footer.scm
@@ -374,13 +374,13 @@
(gnc:make-html-text
(gnc:html-markup-h3 headline)
(gnc:html-markup-br)
- (_ "Prepared by: ")
+ (G_ "Prepared by: ")
(gnc:html-markup-b preparer)
(gnc:html-markup-br)
- (_ "Prepared for: ")
+ (G_ "Prepared for: ")
(gnc:html-markup-b prepared-for)
(gnc:html-markup-br)
- (_ "Date: ")
+ (G_ "Date: ")
(qof-print-date
(current-time)))
diff --git a/gnucash/report/stylesheets/head-or-tail.scm b/gnucash/report/stylesheets/head-or-tail.scm
index 655402655..ff4e7ef96 100644
--- a/gnucash/report/stylesheets/head-or-tail.scm
+++ b/gnucash/report/stylesheets/head-or-tail.scm
@@ -37,7 +37,7 @@
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
-(use-modules (gnucash core-utils)) ; for gnc:version and (_ ...)
+(use-modules (gnucash core-utils)) ; for gnc:version and (G_ ...)
(use-modules (gnucash app-utils))
(use-modules (gnucash report))
(use-modules (gnucash html))
@@ -429,7 +429,7 @@
;; print preparer info as additional header info
(gnc:make-html-text
(gnc:html-markup-i
- (_ "Prepared by: ")
+ (G_ "Prepared by: ")
(gnc:html-markup-b preparer))
(gnc:html-markup-br))
" ")
@@ -437,7 +437,7 @@
;; print receiver info as additional header info
(gnc:make-html-text
(gnc:html-markup-i
- (_ "Prepared for: ")
+ (G_ "Prepared for: ")
(gnc:html-markup-b prepared-for)
(gnc:html-markup-br)))
" ")
@@ -446,14 +446,14 @@
(if show-time?
(gnc:make-html-text
(gnc:html-markup-i
- (_ "Report Creation Date: ")
+ (G_ "Report Creation Date: ")
(qof-print-date (gnc:get-today))
" "
(gnc-print-time64 (current-time) "%X %Z"))
(gnc:html-markup-br))
(gnc:make-html-text
(gnc:html-markup-i
- (_ "Report Creation Date: ")
+ (G_ "Report Creation Date: ")
(qof-print-date (gnc:get-today)))
(gnc:html-markup-br)))
" ")
@@ -523,7 +523,7 @@
;; print preparer info as additional header info
(gnc:make-html-text
(gnc:html-markup-i
- (_ "Prepared by: ")
+ (G_ "Prepared by: ")
(gnc:html-markup-b preparer))
(gnc:html-markup-br))
" ")
@@ -531,7 +531,7 @@
;; print receiver info as additional header info
(gnc:make-html-text
(gnc:html-markup-i
- (_ "Prepared for: ")
+ (G_ "Prepared for: ")
(gnc:html-markup-b prepared-for))
(gnc:html-markup-br))
" ")
@@ -540,14 +540,14 @@
(if show-time?
(gnc:make-html-text
(gnc:html-markup-i
- (_ "Report Creation Date: ")
+ (G_ "Report Creation Date: ")
(qof-print-date (gnc:get-today))
" "
(gnc-print-time64 (current-time) "%X %Z"))
(gnc:html-markup-br))
(gnc:make-html-text
(gnc:html-markup-i
- (_ "Report Creation Date: ")
+ (G_ "Report Creation Date: ")
(qof-print-date (gnc:get-today))
(gnc:html-markup-br))))
" ")
@@ -555,7 +555,7 @@
;; print the GnuCash version string as additional header info
(gnc:make-html-text
(gnc:html-markup-i
- (_ "GnuCash ")
+ (G_ "GnuCash ")
gnc:version)
(gnc:html-markup-br))
" ")
diff --git a/gnucash/report/trep-engine.scm b/gnucash/report/trep-engine.scm
index fa9c0f619..fd067b3fc 100644
--- a/gnucash/report/trep-engine.scm
+++ b/gnucash/report/trep-engine.scm
@@ -105,8 +105,8 @@
(define def:primary-subtotal-style "primary-subheading")
(define def:secondary-subtotal-style "secondary-subheading")
-(define NO-MATCHING-TRANS-HEADER (_ "No matching transactions found"))
-(define NO-MATCHING-TRANS-TEXT (_ "No transactions were found that \
+(define NO-MATCHING-TRANS-HEADER (G_ "No matching transactions found"))
+(define NO-MATCHING-TRANS-TEXT (G_ "No transactions were found that \
match the time interval and account selection specified \
in the Options panel."))
@@ -121,11 +121,11 @@ in the Options panel."))
(list 'account-name 'account-code))
(define reconcile-list
- (list (cons #\n (_ "Unreconciled"))
- (cons #\c (_ "Cleared"))
- (cons #\y (_ "Reconciled"))
- (cons #\f (_ "Frozen"))
- (cons #\v (_ "Voided"))))
+ (list (cons #\n (G_ "Unreconciled"))
+ (cons #\c (G_ "Cleared"))
+ (cons #\y (G_ "Reconciled"))
+ (cons #\f (G_ "Frozen"))
+ (cons #\v (G_ "Voided"))))
(define (sortkey-list split-action?)
;; Defines the different sorting keys, as an association-list
@@ -144,29 +144,29 @@ in the Options panel."))
(cons 'sortkey (list SPLIT-ACCT-FULLNAME))
(cons 'split-sortvalue
(compose gnc-account-get-full-name xaccSplitGetAccount))
- (cons 'text (_ "Account Name"))
- (cons 'tip (_ "Sort & subtotal by account name."))
+ (cons 'text (G_ "Account Name"))
+ (cons 'tip (G_ "Sort & subtotal by account name."))
(cons 'renderer-fn xaccSplitGetAccount))
(list 'account-code
(cons 'sortkey (list SPLIT-ACCOUNT ACCOUNT-CODE-))
(cons 'split-sortvalue (compose xaccAccountGetCode xaccSplitGetAccount))
- (cons 'text (_ "Account Code"))
- (cons 'tip (_ "Sort & subtotal by account code."))
+ (cons 'text (G_ "Account Code"))
+ (cons 'tip (G_ "Sort & subtotal by account code."))
(cons 'renderer-fn xaccSplitGetAccount))
(list 'date
(cons 'sortkey (list SPLIT-TRANS TRANS-DATE-POSTED))
(cons 'split-sortvalue (compose xaccTransGetDate xaccSplitGetParent))
- (cons 'text (_ "Date"))
- (cons 'tip (_ "Sort by date."))
+ (cons 'text (G_ "Date"))
+ (cons 'tip (G_ "Sort by date."))
(cons 'renderer-fn #f))
(list 'reconciled-date
(cons 'sortkey (list SPLIT-DATE-RECONCILED))
(cons 'split-sortvalue xaccSplitGetDateReconciled)
- (cons 'text (_ "Reconciled Date"))
- (cons 'tip (_ "Sort by the Reconciled Date."))
+ (cons 'text (G_ "Reconciled Date"))
+ (cons 'tip (G_ "Sort by the Reconciled Date."))
(cons 'renderer-fn #f))
(list 'reconciled-status
@@ -174,8 +174,8 @@ in the Options panel."))
(cons 'split-sortvalue (lambda (s)
(length (memv (xaccSplitGetReconcile s)
(map car reconcile-list)))))
- (cons 'text (_ "Reconciled Status"))
- (cons 'tip (_ "Sort by the Reconciled Status"))
+ (cons 'text (G_ "Reconciled Status"))
+ (cons 'tip (G_ "Sort by the Reconciled Status"))
(cons 'renderer-fn (lambda (s)
(assv-ref reconcile-list
(xaccSplitGetReconcile s)))))
@@ -183,80 +183,80 @@ in the Options panel."))
(list 'register-order
(cons 'sortkey (list QUERY-DEFAULT-SORT))
(cons 'split-sortvalue #f)
- (cons 'text (_ "Register Order"))
- (cons 'tip (_ "Sort as in the register."))
+ (cons 'text (G_ "Register Order"))
+ (cons 'tip (G_ "Sort as in the register."))
(cons 'renderer-fn #f))
(list 'corresponding-acc-name
(cons 'sortkey (list SPLIT-CORR-ACCT-NAME))
(cons 'split-sortvalue xaccSplitGetCorrAccountFullName)
- (cons 'text (_ "Other Account Name"))
- (cons 'tip (_ "Sort by account transferred from/to's name."))
+ (cons 'text (G_ "Other Account Name"))
+ (cons 'tip (G_ "Sort by account transferred from/to's name."))
(cons 'renderer-fn (compose xaccSplitGetAccount xaccSplitGetOtherSplit)))
(list 'corresponding-acc-code
(cons 'sortkey (list SPLIT-CORR-ACCT-CODE))
(cons 'split-sortvalue xaccSplitGetCorrAccountCode)
- (cons 'text (_ "Other Account Code"))
- (cons 'tip (_ "Sort by account transferred from/to's code."))
+ (cons 'text (G_ "Other Account Code"))
+ (cons 'tip (G_ "Sort by account transferred from/to's code."))
(cons 'renderer-fn (compose xaccSplitGetAccount xaccSplitGetOtherSplit)))
(list 'amount
(cons 'sortkey (list SPLIT-VALUE))
(cons 'split-sortvalue xaccSplitGetValue)
- (cons 'text (_ "Amount"))
- (cons 'tip (_ "Sort by amount."))
+ (cons 'text (G_ "Amount"))
+ (cons 'tip (G_ "Sort by amount."))
(cons 'renderer-fn #f))
(list 'description
(cons 'sortkey (list SPLIT-TRANS TRANS-DESCRIPTION))
(cons 'split-sortvalue (compose xaccTransGetDescription
xaccSplitGetParent))
- (cons 'text (_ "Description"))
- (cons 'tip (_ "Sort by description."))
+ (cons 'text (G_ "Description"))
+ (cons 'tip (G_ "Sort by description."))
(cons 'renderer-fn (compose xaccTransGetDescription xaccSplitGetParent)))
(if split-action?
(list 'number
(cons 'sortkey (list SPLIT-ACTION))
(cons 'split-sortvalue xaccSplitGetAction)
- (cons 'text (_ "Number/Action"))
- (cons 'tip (_ "Sort by check number/action."))
+ (cons 'text (G_ "Number/Action"))
+ (cons 'tip (G_ "Sort by check number/action."))
(cons 'renderer-fn #f))
(list 'number
(cons 'sortkey (list SPLIT-TRANS TRANS-NUM))
(cons 'split-sortvalue (compose xaccTransGetNum xaccSplitGetParent))
- (cons 'text (_ "Number"))
- (cons 'tip (_ "Sort by check/transaction number."))
+ (cons 'text (G_ "Number"))
+ (cons 'tip (G_ "Sort by check/transaction number."))
(cons 'renderer-fn #f)))
(list 't-number
(cons 'sortkey (list SPLIT-TRANS TRANS-NUM))
(cons 'split-sortvalue (compose xaccTransGetNum xaccSplitGetParent))
- (cons 'text (_ "Transaction Number"))
- (cons 'tip (_ "Sort by transaction number."))
+ (cons 'text (G_ "Transaction Number"))
+ (cons 'tip (G_ "Sort by transaction number."))
(cons 'renderer-fn #f))
(list 'memo
(cons 'sortkey (list SPLIT-MEMO))
(cons 'split-sortvalue xaccSplitGetMemo)
- (cons 'text (_ "Memo"))
- (cons 'tip (_ "Sort by memo."))
+ (cons 'text (G_ "Memo"))
+ (cons 'tip (G_ "Sort by memo."))
(cons 'renderer-fn xaccSplitGetMemo))
(list 'notes
(cons 'sortkey #f)
(cons 'split-sortvalue (compose xaccTransGetNotes xaccSplitGetParent))
- (cons 'text (_ "Notes"))
- (cons 'tip (_ "Sort by transaction notes."))
+ (cons 'text (G_ "Notes"))
+ (cons 'tip (G_ "Sort by transaction notes."))
(cons 'renderer-fn (compose xaccTransGetNotes xaccSplitGetParent)))
(list 'none
(cons 'sortkey '())
(cons 'split-sortvalue #f)
- (cons 'text (_ "None"))
- (cons 'tip (_ "Do not sort."))
+ (cons 'text (G_ "None"))
+ (cons 'tip (G_ "Do not sort."))
(cons 'renderer-fn #f))))
(define (time64-year t64)
@@ -288,22 +288,22 @@ in the Options panel."))
(list 'none
(cons 'split-sortvalue #f)
(cons 'date-sortvalue #f)
- (cons 'text (_ "None"))
- (cons 'tip (_ "None."))
+ (cons 'text (G_ "None"))
+ (cons 'tip (G_ "None."))
(cons 'renderer-fn #f))
(list 'daily
(cons 'split-sortvalue (lambda (s) (time64-day (split->time64 s))))
(cons 'date-sortvalue time64-day)
- (cons 'text (_ "Daily"))
- (cons 'tip (_ "Daily."))
+ (cons 'text (G_ "Daily"))
+ (cons 'tip (G_ "Daily."))
(cons 'renderer-fn (lambda (s) (qof-print-date (split->time64 s)))))
(list 'weekly
(cons 'split-sortvalue (lambda (s) (time64-week (split->time64 s))))
(cons 'date-sortvalue time64-week)
- (cons 'text (_ "Weekly"))
- (cons 'tip (_ "Weekly."))
+ (cons 'text (G_ "Weekly"))
+ (cons 'tip (G_ "Weekly."))
(cons 'renderer-fn (compose gnc:date-get-week-year-string
gnc-localtime
split->time64)))
@@ -311,8 +311,8 @@ in the Options panel."))
(list 'monthly
(cons 'split-sortvalue (lambda (s) (time64-month (split->time64 s))))
(cons 'date-sortvalue time64-month)
- (cons 'text (_ "Monthly"))
- (cons 'tip (_ "Monthly."))
+ (cons 'text (G_ "Monthly"))
+ (cons 'tip (G_ "Monthly."))
(cons 'renderer-fn (compose gnc:date-get-month-year-string
gnc-localtime
split->time64)))
@@ -320,8 +320,8 @@ in the Options panel."))
(list 'quarterly
(cons 'split-sortvalue (lambda (s) (time64-quarter (split->time64 s))))
(cons 'date-sortvalue time64-quarter)
- (cons 'text (_ "Quarterly"))
- (cons 'tip (_ "Quarterly."))
+ (cons 'text (G_ "Quarterly"))
+ (cons 'tip (G_ "Quarterly."))
(cons 'renderer-fn (compose gnc:date-get-quarter-year-string
gnc-localtime
split->time64)))
@@ -329,8 +329,8 @@ in the Options panel."))
(list 'yearly
(cons 'split-sortvalue (lambda (s) (time64-year (split->time64 s))))
(cons 'date-sortvalue time64-year)
- (cons 'text (_ "Yearly"))
- (cons 'tip (_ "Yearly."))
+ (cons 'text (G_ "Yearly"))
+ (cons 'tip (G_ "Yearly."))
(cons 'renderer-fn (compose gnc:date-get-year-string
gnc-localtime
split->time64)))))
@@ -338,46 +338,46 @@ in the Options panel."))
(define filter-list
(list
(list 'none
- (cons 'text (_ "None"))
- (cons 'tip (_ "Do not do any filtering.")))
+ (cons 'text (G_ "None"))
+ (cons 'tip (G_ "Do not do any filtering.")))
(list 'include
- (cons 'text (_ "Include Transactions to/from Filter Accounts"))
- (cons 'tip (_ "Include transactions to/from filter accounts only.")))
+ (cons 'text (G_ "Include Transactions to/from Filter Accounts"))
+ (cons 'tip (G_ "Include transactions to/from filter accounts only.")))
(list 'exclude
- (cons 'text (_ "Exclude Transactions to/from Filter Accounts"))
- (cons 'tip (_ "Exclude transactions to/from all filter accounts.")))))
+ (cons 'text (G_ "Exclude Transactions to/from Filter Accounts"))
+ (cons 'tip (G_ "Exclude transactions to/from all filter accounts.")))))
(define show-void-list
(list
(list 'non-void-only
- (cons 'text (_ "Non-void only"))
- (cons 'tip (_ "Show only non-voided transactions.")))
+ (cons 'text (G_ "Non-void only"))
+ (cons 'tip (G_ "Show only non-voided transactions.")))
(list 'void-only
- (cons 'text (_ "Void only"))
- (cons 'tip (_ "Show only voided transactions.")))
+ (cons 'text (G_ "Void only"))
+ (cons 'tip (G_ "Show only voided transactions.")))
(list 'both
- (cons 'text (_ "Both"))
- (cons 'tip (_ "Show both (and include void transactions in totals).")))))
+ (cons 'text (G_ "Both"))
+ (cons 'tip (G_ "Show both (and include void transactions in totals).")))))
(define show-closing-list
(list
(list 'exclude-closing
- (cons 'text (_ "Exclude closing transactions"))
- (cons 'tip (_ "Exclude closing transactions from report."))
+ (cons 'text (G_ "Exclude closing transactions"))
+ (cons 'tip (G_ "Exclude closing transactions from report."))
(cons 'closing-match #f))
(list 'include-both
- (cons 'text (_ "Show both closing and regular transactions"))
- (cons 'tip (_ "Show both (and include closing transactions in totals)."))
+ (cons 'text (G_ "Show both closing and regular transactions"))
+ (cons 'tip (G_ "Show both (and include closing transactions in totals)."))
(cons 'closing-match 'both))
(list 'closing-only
- (cons 'text (_ "Show closing transactions only"))
- (cons 'tip (_ "Show only closing transactions."))
+ (cons 'text (G_ "Show closing transactions only"))
+ (cons 'tip (G_ "Show only closing transactions."))
(cons 'closing-match #t))))
(define reconcile-status-list
@@ -387,52 +387,52 @@ in the Options panel."))
;; (logior CLEARED-NO CLEARED-CLEARED) for unreconciled & cleared
(list
(list 'all
- (cons 'text (_ "All"))
- (cons 'tip (_ "Show All Transactions"))
+ (cons 'text (G_ "All"))
+ (cons 'tip (G_ "Show All Transactions"))
(cons 'filter-types #f))
(list 'unreconciled
- (cons 'text (_ "Unreconciled"))
- (cons 'tip (_ "Unreconciled only"))
+ (cons 'text (G_ "Unreconciled"))
+ (cons 'tip (G_ "Unreconciled only"))
(cons 'filter-types CLEARED-NO))
(list 'cleared
- (cons 'text (_ "Cleared"))
- (cons 'tip (_ "Cleared only"))
+ (cons 'text (G_ "Cleared"))
+ (cons 'tip (G_ "Cleared only"))
(cons 'filter-types CLEARED-CLEARED))
(list 'reconciled
- (cons 'text (_ "Reconciled"))
- (cons 'tip (_ "Reconciled only"))
+ (cons 'text (G_ "Reconciled"))
+ (cons 'tip (G_ "Reconciled only"))
(cons 'filter-types CLEARED-RECONCILED))))
(define ascending-list
(list
(list 'ascend
- (cons 'text (_ "Ascending"))
- (cons 'tip (_ "Smallest to largest, earliest to latest.")))
+ (cons 'text (G_ "Ascending"))
+ (cons 'tip (G_ "Smallest to largest, earliest to latest.")))
(list 'descend
- (cons 'text (_ "Descending"))
- (cons 'tip (_ "Largest to smallest, latest to earliest.")))))
+ (cons 'text (G_ "Descending"))
+ (cons 'tip (G_ "Largest to smallest, latest to earliest.")))))
(define sign-reverse-list
(list
(list 'global
- (cons 'text (_ "Use Global Preference"))
- (cons 'tip (_ "Use reversing option specified in global preference."))
+ (cons 'text (G_ "Use Global Preference"))
+ (cons 'tip (G_ "Use reversing option specified in global preference."))
(cons 'acct-types #f))
(list 'none
- (cons 'text (_ "None"))
- (cons 'tip (_ "Don't change any displayed amounts."))
+ (cons 'text (G_ "None"))
+ (cons 'tip (G_ "Don't change any displayed amounts."))
(cons 'acct-types '()))
(list 'income-expense
- (cons 'text (_ "Income and Expense"))
- (cons 'tip (_ "Reverse amount display for Income and Expense Accounts."))
+ (cons 'text (G_ "Income and Expense"))
+ (cons 'tip (G_ "Reverse amount display for Income and Expense Accounts."))
(cons 'acct-types (list ACCT-TYPE-INCOME ACCT-TYPE-EXPENSE)))
(list 'credit-accounts
- (cons 'text (_ "Credit Accounts"))
- (cons 'tip (_ "Reverse amount display for Liability, Payable, Equity, \
+ (cons 'text (G_ "Credit Accounts"))
+ (cons 'tip (G_ "Reverse amount display for Liability, Payable, Equity, \
Credit Card, and Income accounts."))
(cons 'acct-types (list ACCT-TYPE-LIABILITY ACCT-TYPE-PAYABLE
ACCT-TYPE-EQUITY ACCT-TYPE-CREDIT
@@ -532,7 +532,7 @@ Credit Card, and Income accounts."))
(gnc:register-trep-option
(gnc:make-complex-boolean-option
gnc:pagename-general optname-common-currency
- "e" (_ "Convert all transactions into a common currency.") #f
+ "e" (G_ "Convert all transactions into a common currency.") #f
#f
(lambda (x)
(gnc-option-db-set-option-selectable-by-name
@@ -546,38 +546,38 @@ Credit Card, and Income accounts."))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
gnc:pagename-general optname-orig-currency
- "f1" (_ "Also show original currency amounts") #f))
+ "f1" (G_ "Also show original currency amounts") #f))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
gnc:pagename-general optname-table-export
- "g" (_ "Formats the table suitable for cut & paste exporting with extra cells.")
+ "g" (G_ "Formats the table suitable for cut & paste exporting with extra cells.")
#f))
(gnc:register-trep-option
(gnc:make-multichoice-option
gnc:pagename-general optname-infobox-display
- "h" (_ "Add summary of options.")
+ "h" (G_ "Add summary of options.")
'no-match
;; This is an alist of conditions for displaying the infobox
;; 'no-match for empty-report
;; 'match for generated report
(list (vector 'no-match
- (_ "If no transactions matched")
- (_ "Display summary if no transactions were matched."))
+ (G_ "If no transactions matched")
+ (G_ "Display summary if no transactions were matched."))
(vector 'always
- (_ "Always")
- (_ "Always display summary."))
+ (G_ "Always")
+ (G_ "Always display summary."))
(vector 'never
- (_ "Never")
- (_ "Disable report summary.")))))
+ (G_ "Never")
+ (G_ "Disable report summary.")))))
;; Filtering Options
(gnc:register-trep-option
(gnc:make-string-option
pagename-filter optname-account-matcher
- "a5" (_ "Show only accounts whose full name matches this filter e.g. ':Travel' will match \
+ "a5" (G_ "Show only accounts whose full name matches this filter e.g. ':Travel' will match \
Expenses:Travel:Holiday and Expenses:Business:Travel. It can be left blank, which will \
disable the filter.")
""))
@@ -586,7 +586,7 @@ disable the filter.")
(gnc:make-simple-boolean-option
pagename-filter optname-account-matcher-regex
"a6"
- (_ "By default the account filter will search substring only. Set this to true to \
+ (G_ "By default the account filter will search substring only. Set this to true to \
enable full POSIX regular expressions capabilities. 'Car|Flights' will match both \
Expenses:Car and Expenses:Flights. Use a period (.) to match a single character e.g. \
'20../.' will match 'Travel 2017/1 London'. ")
@@ -595,7 +595,7 @@ Expenses:Car and Expenses:Flights. Use a period (.) to match a single character
(gnc:register-trep-option
(gnc:make-string-option
pagename-filter optname-transaction-matcher
- "i1" (_ "Show only transactions where description, notes, or memo matches this filter.
+ "i1" (G_ "Show only transactions where description, notes, or memo matches this filter.
e.g. '#gift' will find all transactions with #gift in description, notes or memo. It can be left \
blank, which will disable the filter.")
""))
@@ -604,7 +604,7 @@ blank, which will disable the filter.")
(gnc:make-simple-boolean-option
pagename-filter optname-transaction-matcher-regex
"i2"
- (_ "By default the transaction filter will search substring only. Set this to true to \
+ (G_ "By default the transaction filter will search substring only. Set this to true to \
enable full POSIX regular expressions capabilities. '#work|#family' will match both \
tags within description, notes or memo. ")
#f))
@@ -613,20 +613,20 @@ tags within description, notes or memo. ")
(gnc:make-simple-boolean-option
pagename-filter optname-transaction-matcher-exclude
"i3"
- (_ "If this option is selected, transactions matching filter are excluded.")
+ (G_ "If this option is selected, transactions matching filter are excluded.")
#f))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
pagename-filter optname-transaction-matcher-caseinsensitive
"i4"
- (_ "If this option is selected, transactions matching filter is not case sensitive.")
+ (G_ "If this option is selected, transactions matching filter is not case sensitive.")
#f))
(gnc:register-trep-option
(gnc:make-multichoice-option
pagename-filter optname-reconcile-status
- "j1" (_ "Filter by reconcile status.")
+ "j1" (G_ "Filter by reconcile status.")
'all
(keylist->vectorlist reconcile-status-list)))
@@ -640,7 +640,7 @@ tags within description, notes or memo. ")
(gnc:register-trep-option
(gnc:make-multichoice-option
pagename-filter optname-closing-transactions
- "l" (_ "By default most users should not include closing \
+ "l" (G_ "By default most users should not include closing \
transactions in a transaction report. Closing transactions are \
transfers from income and expense accounts to equity, and must usually \
be excluded from periodic reporting.")
@@ -653,7 +653,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-account-list-option
gnc:pagename-accounts optname-accounts
- "a" (_ "Report on these accounts.")
+ "a" (G_ "Report on these accounts.")
;; select, by default, no accounts! Selecting all accounts will
;; always imply an insanely long waiting time upon opening, and it
;; is almost never useful. So we instead display the normal error
@@ -666,7 +666,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-account-list-option
gnc:pagename-accounts optname-filterby
- "c1" (_ "Filter on these accounts.")
+ "c1" (G_ "Filter on these accounts.")
(lambda ()
'())
#f #t))
@@ -674,7 +674,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-multichoice-callback-option
gnc:pagename-accounts optname-filtertype
- "c" (_ "Filter account.")
+ "c" (G_ "Filter account.")
'none
(keylist->vectorlist filter-list)
#f
@@ -767,7 +767,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-multichoice-callback-option
pagename-sorting optname-prime-sortkey
- "a" (_ "Sort by this criterion first.")
+ "a" (G_ "Sort by this criterion first.")
prime-sortkey
key-choice-list #f
(lambda (x)
@@ -778,49 +778,49 @@ be excluded from periodic reporting.")
(gnc:make-simple-boolean-option
pagename-sorting optname-full-account-name
"j1"
- (_ "Show the full account name for subtotals and subheadings?")
+ (G_ "Show the full account name for subtotals and subheadings?")
#f))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
pagename-sorting optname-show-account-code
"j2"
- (_ "Show the account code for subtotals and subheadings?")
+ (G_ "Show the account code for subtotals and subheadings?")
#f))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
pagename-sorting optname-show-account-description
"j3"
- (_ "Show the account description for subheadings?")
+ (G_ "Show the account description for subheadings?")
#f))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
pagename-sorting optname-show-informal-headers
"j4"
- (_ "Show the informal headers for debit/credit accounts?")
+ (G_ "Show the informal headers for debit/credit accounts?")
#f))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
pagename-sorting optname-indenting
"j5"
- (_ "Add indenting columns with grouping and subtotals?")
+ (G_ "Add indenting columns with grouping and subtotals?")
#t))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
pagename-sorting optname-show-subtotals-only
"j6"
- (_ "Show subtotals only, hiding transactional detail?")
+ (G_ "Show subtotals only, hiding transactional detail?")
#f))
(gnc:register-trep-option
(gnc:make-complex-boolean-option
pagename-sorting optname-prime-subtotal
"e5"
- (_ "Subtotal according to the primary key?")
+ (G_ "Subtotal according to the primary key?")
prime-sortkey-subtotal-true #f
(lambda (x)
(set! prime-sortkey-subtotal-true x)
@@ -829,7 +829,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-multichoice-callback-option
pagename-sorting optname-prime-date-subtotal
- "e2" (_ "Do a date subtotal.")
+ "e2" (G_ "Do a date subtotal.")
prime-date-subtotal
date-subtotal-choice-list #f
(lambda (x)
@@ -839,7 +839,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-multichoice-option
pagename-sorting optname-prime-sortorder
- "e" (_ "Order of primary sorting.")
+ "e" (G_ "Order of primary sorting.")
'ascend
ascending-choice-list))
@@ -848,7 +848,7 @@ be excluded from periodic reporting.")
(gnc:make-multichoice-callback-option
pagename-sorting optname-sec-sortkey
"f"
- (_ "Sort by this criterion second.")
+ (G_ "Sort by this criterion second.")
sec-sortkey
key-choice-list #f
(lambda (x)
@@ -859,7 +859,7 @@ be excluded from periodic reporting.")
(gnc:make-complex-boolean-option
pagename-sorting optname-sec-subtotal
"i5"
- (_ "Subtotal according to the secondary key?")
+ (G_ "Subtotal according to the secondary key?")
sec-sortkey-subtotal-true #f
(lambda (x)
(set! sec-sortkey-subtotal-true x)
@@ -868,7 +868,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-multichoice-callback-option
pagename-sorting optname-sec-date-subtotal
- "i2" (_ "Do a date subtotal.")
+ "i2" (G_ "Do a date subtotal.")
sec-date-subtotal
date-subtotal-choice-list #f
(lambda (x)
@@ -878,7 +878,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-multichoice-option
pagename-sorting optname-sec-sortorder
- "i" (_ "Order of Secondary sorting.")
+ "i" (G_ "Order of Secondary sorting.")
'ascend
ascending-choice-list)))
@@ -932,39 +932,39 @@ be excluded from periodic reporting.")
;; One list per option here with: option-name, sort-tag,
;; help-string, default-value
(list
- (list (N_ "Date") "a" (_ "Display the date?") #t)
- (list (N_ "Reconciled Date") "a2" (_ "Display the reconciled date?") #f)
+ (list (N_ "Date") "a" (G_ "Display the date?") #t)
+ (list (N_ "Reconciled Date") "a2" (G_ "Display the reconciled date?") #f)
(if BOOK-SPLIT-ACTION
- (list (N_ "Num/Action") "b" (_ "Display the check number?") #t)
- (list (N_ "Num") "b" (_ "Display the check number?") #t))
- (list (N_ "Description") "c" (_ "Display the description?") #t)
- (list (N_ "Notes") "d2" (_ "Display the notes if the memo is unavailable?") #t)
+ (list (N_ "Num/Action") "b" (G_ "Display the check number?") #t)
+ (list (N_ "Num") "b" (G_ "Display the check number?") #t))
+ (list (N_ "Description") "c" (G_ "Display the description?") #t)
+ (list (N_ "Notes") "d2" (G_ "Display the notes if the memo is unavailable?") #t)
;; account name option appears here
- (list (N_ "Use Full Account Name") "f" (_ "Display the full account name?") #t)
- (list (N_ "Account Code") "g" (_ "Display the account code?") #f)
+ (list (N_ "Use Full Account Name") "f" (G_ "Display the full account name?") #t)
+ (list (N_ "Account Code") "g" (G_ "Display the account code?") #f)
;; other account name option appears here
- (list (N_ "Use Full Other Account Name") "i" (_ "Display the full account name?") #f)
- (list (N_ "Other Account Code") "j" (_ "Display the other account code?") #f)
- (list (N_ "Shares") "k" (_ "Display the number of shares?") #f)
- (list (N_ "Association") "l5" (_ "Display the transaction association") #f)
- (list (N_ "Price") "l" (_ "Display the shares price?") #f)
+ (list (N_ "Use Full Other Account Name") "i" (G_ "Display the full account name?") #f)
+ (list (N_ "Other Account Code") "j" (G_ "Display the other account code?") #f)
+ (list (N_ "Shares") "k" (G_ "Display the number of shares?") #f)
+ (list (N_ "Association") "l5" (G_ "Display the transaction association") #f)
+ (list (N_ "Price") "l" (G_ "Display the shares price?") #f)
;; note the "Amount" multichoice option in between here
- (list optname-grid "m5" (_ "Display a subtotal summary table.") #f)
- (list (N_ "Running Balance") "n" (_ "Display a running balance?") #f)
- (list (N_ "Totals") "o" (_ "Display the totals?") #t)))
+ (list optname-grid "m5" (G_ "Display a subtotal summary table.") #f)
+ (list (N_ "Running Balance") "n" (G_ "Display a running balance?") #f)
+ (list (N_ "Totals") "o" (G_ "Display the totals?") #t)))
(when BOOK-SPLIT-ACTION
(gnc:register-trep-option
(gnc:make-simple-boolean-option
gnc:pagename-display (N_ "Trans Number")
- "b2" (_ "Display the trans number?") #f)))
+ "b2" (G_ "Display the trans number?") #f)))
;; Add an option to display the memo, and disable the notes option
;; when memos are not included.
(gnc:register-trep-option
(gnc:make-complex-boolean-option
gnc:pagename-display (N_ "Memo")
- "d" (_ "Display the memo?") disp-memo?
+ "d" (G_ "Display the memo?") disp-memo?
disp-memo?
(lambda (x)
(set! disp-memo? x)
@@ -974,7 +974,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-complex-boolean-option
gnc:pagename-display (N_ "Account Name")
- "e" (_ "Display the account name?") disp-accname?
+ "e" (G_ "Display the account name?") disp-accname?
disp-accname?
(lambda (x)
(set! disp-accname? x)
@@ -984,7 +984,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-complex-boolean-option
gnc:pagename-display (N_ "Other Account Name")
- "h5" (_ "Display the other account name? (if this is a split transaction, this parameter is guessed).") disp-other-accname?
+ "h5" (G_ "Display the other account name? (if this is a split transaction, this parameter is guessed).") disp-other-accname?
disp-other-accname?
(lambda (x)
(set! disp-other-accname? x)
@@ -993,14 +993,14 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-multichoice-callback-option
gnc:pagename-display optname-detail-level
- "h" (_ "Amount of detail to display per transaction.")
+ "h" (G_ "Amount of detail to display per transaction.")
disp-detail-level?
(list (vector 'multi-line
- (_ "Multi-Line")
- (_ "Display all splits in a transaction on a separate line."))
+ (G_ "Multi-Line")
+ (G_ "Display all splits in a transaction on a separate line."))
(vector 'single
- (_ "Single")
- (_ "Display one line per transaction, merging multiple splits where required.")))
+ (G_ "Single")
+ (G_ "Display one line per transaction, merging multiple splits where required.")))
#f
(lambda (x)
(set! disp-detail-level? x)
@@ -1009,12 +1009,12 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-multichoice-callback-option
gnc:pagename-display (N_ "Amount")
- "m" (_ "Display the amount?")
+ "m" (G_ "Display the amount?")
amount-value
(list
- (vector 'none (_ "None") (_ "No amount display."))
- (vector 'single (_ "Single") (_ "Single Column Display."))
- (vector 'double (_ "Double") (_ "Two Column Display.")))
+ (vector 'none (G_ "None") (G_ "No amount display."))
+ (vector 'single (G_ "Single") (G_ "Single Column Display."))
+ (vector 'double (G_ "Double") (G_ "Two Column Display.")))
#f
(lambda (x)
(set! amount-value x)
@@ -1023,12 +1023,12 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-simple-boolean-option
gnc:pagename-display (N_ "Enable links")
- "m2" (_ "Enable hyperlinks in amounts.") #t))
+ "m2" (G_ "Enable hyperlinks in amounts.") #t))
(gnc:register-trep-option
(gnc:make-multichoice-option
gnc:pagename-display (N_ "Sign Reverses")
- "m1" (_ "Reverse amount display for certain account types.")
+ "m1" (G_ "Reverse amount display for certain account types.")
'global
(keylist->vectorlist sign-reverse-list))))
@@ -1147,7 +1147,7 @@ be excluded from periodic reporting.")
(left-cols-list
(append
(add-if (column-uses? 'date)
- (vector (_ "Date")
+ (vector (G_ "Date")
(lambda (split transaction-row?)
(and transaction-row?
(gnc:make-html-table-cell/markup
@@ -1157,7 +1157,7 @@ be excluded from periodic reporting.")
(xaccSplitGetParent split))))))))
(add-if (column-uses? 'reconciled-date)
- (vector (_ "Reconciled Date")
+ (vector (G_ "Reconciled Date")
(lambda (split transaction-row?)
(let ((reconcile-date
(and (char=? (xaccSplitGetReconcile split) #\y)
@@ -1171,8 +1171,8 @@ be excluded from periodic reporting.")
(vector (if (and BOOK-SPLIT-ACTION
(opt-val gnc:pagename-display
(N_ "Trans Number")))
- (_ "Num/T-Num")
- (_ "Num"))
+ (G_ "Num/T-Num")
+ (G_ "Num"))
(lambda (split transaction-row?)
(let* ((trans (xaccSplitGetParent split))
(num (gnc-get-num-action trans split))
@@ -1190,7 +1190,7 @@ be excluded from periodic reporting.")
"text-cell" num-string))))))
(add-if (column-uses? 'description)
- (vector (_ "Description")
+ (vector (G_ "Description")
(lambda (split transaction-row?)
(define trans (xaccSplitGetParent split))
(and transaction-row?
@@ -1200,8 +1200,8 @@ be excluded from periodic reporting.")
(add-if (column-uses? 'memo)
(vector (if (column-uses? 'notes)
- (string-append (_ "Memo") "/" (_ "Notes"))
- (_ "Memo"))
+ (string-append (G_ "Memo") "/" (G_ "Notes"))
+ (G_ "Memo"))
(lambda (split transaction-row?)
(define trans (xaccSplitGetParent split))
(define memo (xaccSplitGetMemo split))
@@ -1210,7 +1210,7 @@ be excluded from periodic reporting.")
memo))))
(add-if (or (column-uses? 'account-name) (column-uses? 'account-code))
- (vector (_ "Account")
+ (vector (G_ "Account")
(lambda (split transaction-row?)
(account-namestring
(xaccSplitGetAccount split)
@@ -1220,7 +1220,7 @@ be excluded from periodic reporting.")
(add-if (or (column-uses? 'other-account-name)
(column-uses? 'other-account-code))
- (vector (_ "Transfer from/to")
+ (vector (G_ "Transfer from/to")
(lambda (split transaction-row?)
(and (< 1 (xaccTransCountSplits
(xaccSplitGetParent split)))
@@ -1232,7 +1232,7 @@ be excluded from periodic reporting.")
(column-uses? 'other-account-full-name))))))
(add-if (column-uses? 'shares)
- (vector (_ "Shares")
+ (vector (G_ "Shares")
(lambda (split transaction-row?)
(gnc:make-html-table-cell/markup
"number-cell"
@@ -1250,11 +1250,11 @@ be excluded from periodic reporting.")
(gnc:html-transaction-association-anchor
(xaccSplitGetParent split)
;; Translators: 'A' is short for Association
- (_ "A"))
- (_ "A"))))))))
+ (G_ "A"))
+ (G_ "A"))))))))
(add-if (column-uses? 'price)
- (vector (_ "Price")
+ (vector (G_ "Price")
(lambda (split transaction-row?)
(gnc:make-html-table-cell/markup
"number-cell"
@@ -1340,39 +1340,39 @@ be excluded from periodic reporting.")
;; start-dual-column? #t: merge with next cell for subtotal table.
(if (column-uses? 'amount-single)
- (list (vector (header-commodity (_ "Amount"))
+ (list (vector (header-commodity (G_ "Amount"))
converted-amount #t #t #f
(lambda (a) "") #f))
'())
(if (column-uses? 'amount-double)
- (list (vector (header-commodity (_ "Debit"))
+ (list (vector (header-commodity (G_ "Debit"))
converted-debit-amount #f #t #t
friendly-debit #t)
- (vector (header-commodity (_ "Credit"))
+ (vector (header-commodity (G_ "Credit"))
converted-credit-amount #f #t #f
friendly-credit #f))
'())
(if (and (column-uses? 'amount-original-currency)
(column-uses? 'amount-single))
- (list (vector (_ "Amount")
+ (list (vector (G_ "Amount")
original-amount #t #t #f
(lambda (a) "") #f))
'())
(if (and (column-uses? 'amount-original-currency)
(column-uses? 'amount-double))
- (list (vector (_ "Debit")
+ (list (vector (G_ "Debit")
original-debit-amount #f #t #t
friendly-debit #t)
- (vector (_ "Credit")
+ (vector (G_ "Credit")
original-credit-amount #f #t #f
friendly-credit #f))
'())
(if (column-uses? 'running-balance)
- (list (vector (_ "Running Balance")
+ (list (vector (G_ "Running Balance")
running-balance #t #f #f
'bal-bf #f))
'()))))
@@ -1421,7 +1421,7 @@ be excluded from periodic reporting.")
(memq sortkey ACCOUNT-SORTING-TYPES))
;; Translators: Balance b/f stands for "Balance
;; brought forward".
- (string-append data ": " (_ "Balance b/f"))
+ (string-append data ": " (G_ "Balance b/f"))
data))
(renderer-fn (keylist-get-info
(sortkey-list BOOK-SPLIT-ACTION)
@@ -1577,7 +1577,7 @@ be excluded from periodic reporting.")
(data-columns (car list-of-commodities))))
(loop "" (cdr list-of-commodities))))))
- (define (total-string str) (string-append (_ "Total For ") str))
+ (define (total-string str) (string-append (G_ "Total For ") str))
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; renderers
@@ -1588,7 +1588,7 @@ be excluded from periodic reporting.")
show-account-name? show-account-full-name?)
;;# on multi-line splits we can get an empty ('()) account
(if (null? account)
- (_ "Split Transaction")
+ (G_ "Split Transaction")
(with-output-to-string
(lambda ()
(when show-account-code?
@@ -1646,7 +1646,7 @@ be excluded from periodic reporting.")
(render-generic sortkey split)))))
(define (render-grand-total)
- (_ "Grand Total"))
+ (G_ "Grand Total"))
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; add-split-row
@@ -1905,7 +1905,7 @@ be excluded from periodic reporting.")
(append
(list (cond
((positive? commodity-idx) "")
- ((eq? row 'row-total) (_ "Grand Total"))
+ ((eq? row 'row-total) (G_ "Grand Total"))
(else (cdr row))))
(map (lambda (col) (make-table-cell row col commodity-idx 1))
list-of-cols)
@@ -1919,8 +1919,8 @@ be excluded from periodic reporting.")
(gnc:html-table-set-col-headers!
table (append (list "")
(map cdr list-of-cols)
- (list (_ "Total"))
- (if row-average-enabled? (list (_ "Average")) '())))
+ (list (G_ "Total"))
+ (if row-average-enabled? (list (G_ "Average")) '())))
(gnc:html-table-set-style!
table "th"
'attribute (list "class" "column-heading-right"))
@@ -2115,13 +2115,13 @@ be excluded from periodic reporting.")
((symbol? account-matcher-regexp)
(gnc:html-make-generic-warning
report-title (gnc:report-id report-obj)
- (string-append (_ "Error") " " (symbol->string account-matcher-regexp))
+ (string-append (G_ "Error") " " (symbol->string account-matcher-regexp))
""))
((symbol? transaction-matcher-regexp)
(gnc:html-make-generic-warning
report-title (gnc:report-id report-obj)
- (string-append (_ "Error") " " (symbol->string transaction-matcher-regexp))
+ (string-append (G_ "Error") " " (symbol->string transaction-matcher-regexp))
""))))
;; if an empty-report-message is passed by a derived report to
@@ -2225,7 +2225,7 @@ be excluded from periodic reporting.")
(gnc:html-markup-h3
(format #f
;; Translators: Both ~a's are dates
- (_ "From ~a to ~a")
+ (G_ "From ~a to ~a")
(qof-print-date begindate)
(qof-print-date enddate)))))
@@ -2270,8 +2270,8 @@ be excluded from periodic reporting.")
;; Translators: ~a error type, ~a filename, ~s error details
(let ((fmt (N_ "error ~a during csv output to ~a: ~s")))
(gnc:gui-error (format #f fmt key filename args)
- (format #f (_ fmt) key filename args)))))
- (gnc:gui-error csvlist (_ csvlist))))))
+ (format #f (G_ fmt) key filename args)))))
+ (gnc:gui-error csvlist (G_ csvlist))))))
(unless (and subtotal-table?
(opt-val pagename-sorting optname-show-subtotals-only))
diff --git a/libgnucash/app-utils/c-interface.scm b/libgnucash/app-utils/c-interface.scm
index 45d7f2e72..486b4d442 100644
--- a/libgnucash/app-utils/c-interface.scm
+++ b/libgnucash/app-utils/c-interface.scm
@@ -80,6 +80,6 @@
(define string-hash (make-hash-table))
(lambda args
(match args
- (('lookup key) (_ (hash-ref string-hash key)))
+ (('lookup key) (G_ (hash-ref string-hash key)))
(('store key string) (hash-set! string-hash key string))
(_ (gnc:warn "string-database: bad action")))))
diff --git a/libgnucash/app-utils/date-utilities.scm b/libgnucash/app-utils/date-utilities.scm
index e24c077d4..e600e5ddd 100644
--- a/libgnucash/app-utils/date-utilities.scm
+++ b/libgnucash/app-utils/date-utilities.scm
@@ -86,7 +86,7 @@
(let* ((beginweekt64 (* (gnc:time64-get-week (gnc-mktime datevec)) 7 86400))
(begin-string (qof-print-date (+ beginweekt64 (* 3 86400))))
(end-string (qof-print-date (+ beginweekt64 (* 9 86400)))))
- (format #f (_ "~a to ~a") begin-string end-string)))
+ (format #f (G_ "~a to ~a") begin-string end-string)))
;; is leap year?
(define (gnc:leap-year? year)
@@ -422,11 +422,11 @@
(let ((rel-date-data (hash-ref gnc:relative-date-hash date-symbol)))
(if rel-date-data
((gnc:reldate-get-fn rel-date-data))
- (let* ((msg (_ "Tried to look up an undefined date symbol \
+ (let* ((msg (G_ "Tried to look up an undefined date symbol \
'~a'. This report was probably saved by a later version of GnuCash. \
Defaulting to today."))
(conmsg (format #f msg date-symbol))
- (uimsg (format #f (_ msg) date-symbol)))
+ (uimsg (format #f (G_ msg) date-symbol)))
(gnc:gui-warn conmsg uimsg)
(current-time)))))
diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index 7ec149bd6..4719a40b7 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -27,7 +27,7 @@
GnuCash. One of the newer ~a options '~a' is not available, fallback to \
the option '~a'."))
(console-msg (format #f template type newoption fallback))
- (ui-msg (format #f (_ template) type newoption fallback)))
+ (ui-msg (format #f (G_ template) type newoption fallback)))
(gnc:gui-warn console-msg ui-msg)))
(define (gnc:make-option
diff --git a/libgnucash/tax/us/txf.scm b/libgnucash/tax/us/txf.scm
index 45e6a9fc6..cf24785ec 100644
--- a/libgnucash/tax/us/txf.scm
+++ b/libgnucash/tax/us/txf.scm
@@ -95,7 +95,7 @@
(define (gnc:txf-get-help categories code)
(or (assv-ref txf-help-strings code)
- (_ "No help available.")))
+ (G_ "No help available.")))
(define (gnc:txf-get-codes categories tax-entity-type)
(and-let* ((sym (string->symbol tax-entity-type))
Summary of changes:
bindings/guile/core-utils.scm | 27 +-
gnucash/gnome/report-menus.scm | 2 +-
gnucash/import-export/qif-imp/qif-dialog-utils.scm | 42 +--
gnucash/import-export/qif-imp/qif-file.scm | 68 ++--
gnucash/import-export/qif-imp/qif-merge-groups.scm | 2 +-
gnucash/import-export/qif-imp/qif-parse.scm | 6 +-
gnucash/import-export/qif-imp/qif-to-gnc.scm | 12 +-
gnucash/price-quotes.scm | 16 +-
gnucash/report/eguile.scm | 2 +-
gnucash/report/html-acct-table.scm | 6 +-
gnucash/report/html-chart.scm | 2 +-
gnucash/report/html-style-sheet.scm | 2 +-
gnucash/report/html-utilities.scm | 22 +-
gnucash/report/report-core.scm | 12 +-
gnucash/report/report-utilities.scm | 46 +--
gnucash/report/reports/aging.scm | 58 ++--
gnucash/report/reports/example/average-balance.scm | 6 +-
gnucash/report/reports/example/daily-reports.scm | 8 +-
gnucash/report/reports/example/hello-world.scm | 46 +--
gnucash/report/reports/example/sample-graphs.scm | 16 +-
.../report/reports/example/welcome-to-gnucash.scm | 6 +-
.../reports/locale-specific/de_DE/taxtxf.scm | 20 +-
.../report/reports/locale-specific/us/taxtxf.scm | 10 +-
.../report/reports/standard/account-piecharts.scm | 12 +-
.../report/reports/standard/account-summary.scm | 16 +-
.../report/reports/standard/advanced-portfolio.scm | 42 +--
.../report/reports/standard/balance-forecast.scm | 24 +-
gnucash/report/reports/standard/balance-sheet.scm | 28 +-
gnucash/report/reports/standard/balsheet-eg.scm | 6 +-
gnucash/report/reports/standard/balsheet-pnl.scm | 88 ++---
.../reports/standard/budget-balance-sheet.scm | 46 +--
.../report/reports/standard/budget-barchart.scm | 6 +-
gnucash/report/reports/standard/budget-flow.scm | 6 +-
.../reports/standard/budget-income-statement.scm | 22 +-
gnucash/report/reports/standard/budget.scm | 12 +-
gnucash/report/reports/standard/cash-flow.scm | 18 +-
.../report/reports/standard/cashflow-barchart.scm | 18 +-
.../report/reports/standard/category-barchart.scm | 16 +-
.../report/reports/standard/customer-summary.scm | 22 +-
gnucash/report/reports/standard/dashboard.scm | 4 +-
.../report/reports/standard/equity-statement.scm | 28 +-
.../report/reports/standard/general-journal.scm | 6 +-
gnucash/report/reports/standard/general-ledger.scm | 2 +-
.../reports/standard/income-gst-statement.scm | 42 +--
.../report/reports/standard/income-statement.scm | 24 +-
gnucash/report/reports/standard/invoice.scm | 90 ++---
gnucash/report/reports/standard/job-report.scm | 54 +--
gnucash/report/reports/standard/net-charts.scm | 26 +-
gnucash/report/reports/standard/new-aging.scm | 30 +-
.../report/reports/standard/new-owner-report.scm | 98 +++---
gnucash/report/reports/standard/owner-report.scm | 72 ++--
gnucash/report/reports/standard/portfolio.scm | 14 +-
gnucash/report/reports/standard/price-scatter.scm | 44 +--
gnucash/report/reports/standard/receipt.scm | 28 +-
.../report/reports/standard/reconcile-report.scm | 8 +-
gnucash/report/reports/standard/register.scm | 52 +--
gnucash/report/reports/standard/taxinvoice.scm | 58 ++--
gnucash/report/reports/standard/trial-balance.scm | 32 +-
gnucash/report/reports/standard/view-column.scm | 8 +-
.../report/reports/support/balsheet-eg.eguile.scm | 20 +-
gnucash/report/reports/support/receipt.eguile.scm | 16 +-
.../report/reports/support/taxinvoice.eguile.scm | 26 +-
gnucash/report/stylesheets/css.scm | 2 +-
gnucash/report/stylesheets/footer.scm | 6 +-
gnucash/report/stylesheets/head-or-tail.scm | 20 +-
gnucash/report/trep-engine.scm | 374 ++++++++++-----------
libgnucash/app-utils/c-interface.scm | 2 +-
libgnucash/app-utils/date-utilities.scm | 6 +-
libgnucash/app-utils/options.scm | 2 +-
libgnucash/tax/us/txf.scm | 2 +-
70 files changed, 1008 insertions(+), 1007 deletions(-)
More information about the gnucash-changes
mailing list