IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: Fix incorrect N_ and _ handling

Browse Source
This commit is contained in:
Christopher Lam 2017-12-11 06:16:27 +08:00
parent c26af85e82
commit 0854caba95
1 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
gnucash/report/standard-reports/transaction.scm
View File

@ -104,8 +104,8 @@
(define NO-MATCHING-TRANS-TEXT (_ "No transactions were found that \ (define NO-MATCHING-TRANS-TEXT (_ "No transactions were found that \
match the time interval and account selection specified \ match the time interval and account selection specified \
in the Options panel.")) in the Options panel."))
(define NO-MATCHING-ACCT-HEADER (N_ "No matching accounts found")) (define NO-MATCHING-ACCT-HEADER (_ "No matching accounts found"))
(define NO-MATCHING-ACCT-TEXT (N_ "No account were found that match the \ (define NO-MATCHING-ACCT-TEXT (_ "No account were found that match the \
options specified in the Options panels.")) options specified in the Options panels."))
@ -129,87 +129,87 @@ options specified in the Options panels."))
;; ;;
(list (cons 'account-name (list (cons 'sortkey (list SPLIT-ACCT-FULLNAME)) (list (cons 'account-name (list (cons 'sortkey (list SPLIT-ACCT-FULLNAME))
(cons 'split-sortvalue (lambda (a) (gnc-account-get-full-name (xaccSplitGetAccount a)))) (cons 'split-sortvalue (lambda (a) (gnc-account-get-full-name (xaccSplitGetAccount a))))
(cons 'text (N_ "Account Name")) (cons 'text (_ "Account Name"))
(cons 'tip (N_ "Sort & subtotal by account name.")) (cons 'tip (_ "Sort & subtotal by account name."))
(cons 'renderer-key 'account))) (cons 'renderer-key 'account)))
(cons 'account-code (list (cons 'sortkey (list SPLIT-ACCOUNT ACCOUNT-CODE-)) (cons 'account-code (list (cons 'sortkey (list SPLIT-ACCOUNT ACCOUNT-CODE-))
(cons 'split-sortvalue (lambda (a) (xaccAccountGetCode (xaccSplitGetAccount a)))) (cons 'split-sortvalue (lambda (a) (xaccAccountGetCode (xaccSplitGetAccount a))))
(cons 'text (N_ "Account Code")) (cons 'text (_ "Account Code"))
(cons 'tip (N_ "Sort & subtotal by account code.")) (cons 'tip (_ "Sort & subtotal by account code."))
(cons 'renderer-key 'account))) (cons 'renderer-key 'account)))
(cons 'date (list (cons 'sortkey (list SPLIT-TRANS TRANS-DATE-POSTED)) (cons 'date (list (cons 'sortkey (list SPLIT-TRANS TRANS-DATE-POSTED))
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "Date")) (cons 'text (_ "Date"))
(cons 'tip (N_ "Sort by date.")) (cons 'tip (_ "Sort by date."))
(cons 'renderer-key #f))) (cons 'renderer-key #f)))
(cons 'reconciled-date (list (cons 'sortkey (list SPLIT-DATE-RECONCILED)) (cons 'reconciled-date (list (cons 'sortkey (list SPLIT-DATE-RECONCILED))
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "Reconciled Date")) (cons 'text (_ "Reconciled Date"))
(cons 'tip (N_ "Sort by the Reconciled Date.")) (cons 'tip (_ "Sort by the Reconciled Date."))
(cons 'renderer-key #f))) (cons 'renderer-key #f)))
(cons 'register-order (list (cons 'sortkey (list QUERY-DEFAULT-SORT)) (cons 'register-order (list (cons 'sortkey (list QUERY-DEFAULT-SORT))
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "Register Order")) (cons 'text (_ "Register Order"))
(cons 'tip (N_ "Sort as in the register.")) (cons 'tip (_ "Sort as in the register."))
(cons 'renderer-key #f))) (cons 'renderer-key #f)))
(cons 'corresponding-acc-name (list (cons 'sortkey (list SPLIT-CORR-ACCT-NAME)) (cons 'corresponding-acc-name (list (cons 'sortkey (list SPLIT-CORR-ACCT-NAME))
(cons 'split-sortvalue (lambda (a) (xaccSplitGetCorrAccountFullName a))) (cons 'split-sortvalue (lambda (a) (xaccSplitGetCorrAccountFullName a)))
(cons 'text (N_ "Other Account Name")) (cons 'text (_ "Other Account Name"))
(cons 'tip (N_ "Sort by account transferred from/to's name.")) (cons 'tip (_ "Sort by account transferred from/to's name."))
(cons 'renderer-key 'other-acc))) (cons 'renderer-key 'other-acc)))
(cons 'corresponding-acc-code (list (cons 'sortkey (list SPLIT-CORR-ACCT-CODE)) (cons 'corresponding-acc-code (list (cons 'sortkey (list SPLIT-CORR-ACCT-CODE))
(cons 'split-sortvalue (lambda (a) (xaccSplitGetCorrAccountCode a))) (cons 'split-sortvalue (lambda (a) (xaccSplitGetCorrAccountCode a)))
(cons 'text (N_ "Other Account Code")) (cons 'text (_ "Other Account Code"))
(cons 'tip (N_ "Sort by account transferred from/to's code.")) (cons 'tip (_ "Sort by account transferred from/to's code."))
(cons 'renderer-key 'other-acct))) (cons 'renderer-key 'other-acct)))
(cons 'amount (list (cons 'sortkey (list SPLIT-VALUE)) (cons 'amount (list (cons 'sortkey (list SPLIT-VALUE))
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "Amount")) (cons 'text (_ "Amount"))
(cons 'tip (N_ "Sort by amount.")) (cons 'tip (_ "Sort by amount."))
(cons 'renderer-key #f))) (cons 'renderer-key #f)))
(cons 'description (list (cons 'sortkey (list SPLIT-TRANS TRANS-DESCRIPTION)) (cons 'description (list (cons 'sortkey (list SPLIT-TRANS TRANS-DESCRIPTION))
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "Description")) (cons 'text (_ "Description"))
(cons 'tip (N_ "Sort by description.")) (cons 'tip (_ "Sort by description."))
(cons 'renderer-key #f))) (cons 'renderer-key #f)))
(if (qof-book-use-split-action-for-num-field (gnc-get-current-book)) (if (qof-book-use-split-action-for-num-field (gnc-get-current-book))
(cons 'number (list (cons 'sortkey (list SPLIT-ACTION)) (cons 'number (list (cons 'sortkey (list SPLIT-ACTION))
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "Number/Action")) (cons 'text (_ "Number/Action"))
(cons 'tip (N_ "Sort by check number/action.")) (cons 'tip (_ "Sort by check number/action."))
(cons 'renderer-key #f))) (cons 'renderer-key #f)))
(cons 'number (list (cons 'sortkey (list SPLIT-TRANS TRANS-NUM)) (cons 'number (list (cons 'sortkey (list SPLIT-TRANS TRANS-NUM))
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "Number")) (cons 'text (_ "Number"))
(cons 'tip (N_ "Sort by check/transaction number.")) (cons 'tip (_ "Sort by check/transaction number."))
(cons 'renderer-key #f)))) (cons 'renderer-key #f))))
(cons 't-number (list (cons 'sortkey (list SPLIT-TRANS TRANS-NUM)) (cons 't-number (list (cons 'sortkey (list SPLIT-TRANS TRANS-NUM))
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "Transaction Number")) (cons 'text (_ "Transaction Number"))
(cons 'tip (N_ "Sort by transaction number.")) (cons 'tip (_ "Sort by transaction number."))
(cons 'renderer-key #f))) (cons 'renderer-key #f)))
(cons 'memo (list (cons 'sortkey (list SPLIT-MEMO)) (cons 'memo (list (cons 'sortkey (list SPLIT-MEMO))
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "Memo")) (cons 'text (_ "Memo"))
(cons 'tip (N_ "Sort by memo.")) (cons 'tip (_ "Sort by memo."))
(cons 'renderer-key #f))) (cons 'renderer-key #f)))
(cons 'none (list (cons 'sortkey '()) (cons 'none (list (cons 'sortkey '())
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "None")) (cons 'text (_ "None"))
(cons 'tip (N_ "Do not sort.")) (cons 'tip (_ "Do not sort."))
(cons 'renderer-key #f))))) (cons 'renderer-key #f)))))
@ -232,61 +232,61 @@ options specified in the Options panels."))
(list (list
(cons 'none (list (cons 'none (list
(cons 'split-sortvalue #f) (cons 'split-sortvalue #f)
(cons 'text (N_ "None")) (cons 'text (_ "None"))
(cons 'tip (N_ "None.")) (cons 'tip (_ "None."))
(cons 'renderer-key #f))) (cons 'renderer-key #f)))
(cons 'weekly (list (cons 'weekly (list
(cons 'split-sortvalue split-week) (cons 'split-sortvalue split-week)
(cons 'text (N_ "Weekly")) (cons 'text (_ "Weekly"))
(cons 'tip (N_ "Weekly.")) (cons 'tip (_ "Weekly."))
(cons 'renderer-key 'week))) (cons 'renderer-key 'week)))
(cons 'monthly (list (cons 'monthly (list
(cons 'split-sortvalue split-month) (cons 'split-sortvalue split-month)
(cons 'text (N_ "Monthly")) (cons 'text (_ "Monthly"))
(cons 'tip (N_ "Monthly.")) (cons 'tip (_ "Monthly."))
(cons 'renderer-key 'month))) (cons 'renderer-key 'month)))
(cons 'quarterly (list (cons 'quarterly (list
(cons 'split-sortvalue split-quarter) (cons 'split-sortvalue split-quarter)
(cons 'text (N_ "Quarterly")) (cons 'text (_ "Quarterly"))
(cons 'tip (N_ "Quarterly.")) (cons 'tip (_ "Quarterly."))
(cons 'renderer-key 'quarter))) (cons 'renderer-key 'quarter)))
(cons 'yearly (list (cons 'yearly (list
(cons 'split-sortvalue split-year) (cons 'split-sortvalue split-year)
(cons 'text (N_ "Yearly")) (cons 'text (_ "Yearly"))
(cons 'tip (N_ "Yearly.")) (cons 'tip (_ "Yearly."))
(cons 'renderer-key 'year))))) (cons 'renderer-key 'year)))))
(define filter-list (define filter-list
(list (list
(cons 'none (list (cons 'none (list
(cons 'text (N_ "None")) (cons 'text (_ "None"))
(cons 'tip (N_ "Do not do any filtering.")))) (cons 'tip (_ "Do not do any filtering."))))
(cons 'include (list (cons 'include (list
(cons 'text (N_ "Include Transactions to/from Filter Accounts")) (cons 'text (_ "Include Transactions to/from Filter Accounts"))
(cons 'tip (N_ "Include transactions to/from filter accounts only.")))) (cons 'tip (_ "Include transactions to/from filter accounts only."))))
(cons 'exclude (list (cons 'exclude (list
(cons 'text (N_ "Exclude Transactions to/from Filter Accounts")) (cons 'text (_ "Exclude Transactions to/from Filter Accounts"))
(cons 'tip (N_ "Exclude transactions to/from all filter accounts.")))))) (cons 'tip (_ "Exclude transactions to/from all filter accounts."))))))
(define show-void-list (define show-void-list
(list (list
(cons 'non-void-only (list (cons 'non-void-only (list
(cons 'text (N_ "Non-void only")) (cons 'text (_ "Non-void only"))
(cons 'tip (N_ "Show only non-voided transactions.")))) (cons 'tip (_ "Show only non-voided transactions."))))
(cons 'void-only (list (cons 'void-only (list
(cons 'text (N_ "Void only")) (cons 'text (_ "Void only"))
(cons 'tip (N_ "Show only voided transactions.")))) (cons 'tip (_ "Show only voided transactions."))))
(cons 'both (list (cons 'both (list
(cons 'text (N_ "Both")) (cons 'text (_ "Both"))
(cons 'tip (N_ "Show both (and include void transactions in totals).")))))) (cons 'tip (_ "Show both (and include void transactions in totals)."))))))
(define reconcile-status-list (define reconcile-status-list
;; value will be either #f to disable reconciled-status filter ;; value will be either #f to disable reconciled-status filter
@ -294,30 +294,30 @@ options specified in the Options panels."))
;; be '(#\c #\y) to retrieve list of cleared and reconciled splits. ;; be '(#\c #\y) to retrieve list of cleared and reconciled splits.
(list (list
(cons #f (list (cons #f (list
(cons 'text (N_ "All")) (cons 'text (_ "All"))
(cons 'tip (N_ "Show All Transactions")))) (cons 'tip (_ "Show All Transactions"))))
(cons '(#\n) (list (cons '(#\n) (list
(cons 'text (N_ "Unreconciled")) (cons 'text (_ "Unreconciled"))
(cons 'tip (N_ "Unreconciled only")))) (cons 'tip (_ "Unreconciled only"))))
(cons '(#\c) (list (cons '(#\c) (list
(cons 'text (N_ "Cleared")) (cons 'text (_ "Cleared"))
(cons 'tip (N_ "Cleared only")))) (cons 'tip (_ "Cleared only"))))
(cons '(#\y) (list (cons '(#\y) (list
(cons 'text (N_ "Reconciled")) (cons 'text (_ "Reconciled"))
(cons 'tip (N_ "Reconciled only")))))) (cons 'tip (_ "Reconciled only"))))))
(define ascending-list (define ascending-list
(list (list
(cons 'ascend (list (cons 'ascend (list
(cons 'text (N_ "Ascending")) (cons 'text (_ "Ascending"))
(cons 'tip (N_ "Smallest to largest, earliest to latest.")))) (cons 'tip (_ "Smallest to largest, earliest to latest."))))
(cons 'descend (list (cons 'descend (list
(cons 'text (N_ "Descending")) (cons 'text (_ "Descending"))
(cons 'tip (N_ "Largest to smallest, latest to earliest.")))))) (cons 'tip (_ "Largest to smallest, latest to earliest."))))))
(define sign-reverse-list (define sign-reverse-list
(list (list
@ -328,18 +328,18 @@ options specified in the Options panels."))
(cons 'acct-types #f))) (cons 'acct-types #f)))
(cons 'none (cons 'none
(list (list
(cons 'text (N_ "None")) (cons 'text (_ "None"))
(cons 'tip (N_ "Don't change any displayed amounts.")) (cons 'tip (_ "Don't change any displayed amounts."))
(cons 'acct-types '()))) (cons 'acct-types '())))
(cons 'income-expense (cons 'income-expense
(list (list
(cons 'text (N_ "Income and Expense")) (cons 'text (_ "Income and Expense"))
(cons 'tip (N_ "Reverse amount display for Income and Expense Accounts.")) (cons 'tip (_ "Reverse amount display for Income and Expense Accounts."))
(cons 'acct-types (list ACCT-TYPE-INCOME ACCT-TYPE-EXPENSE)))) (cons 'acct-types (list ACCT-TYPE-INCOME ACCT-TYPE-EXPENSE))))
(cons 'credit-accounts (cons 'credit-accounts
(list (list
(cons 'text (N_ "Credit Accounts")) (cons 'text (_ "Credit Accounts"))
(cons 'tip (N_ "Reverse amount display for Liability, Payable, Equity, \ (cons 'tip (_ "Reverse amount display for Liability, Payable, Equity, \
Credit Card, and Income accounts.")) Credit Card, and Income accounts."))
(cons 'acct-types (list ACCT-TYPE-LIABILITY ACCT-TYPE-PAYABLE (cons 'acct-types (list ACCT-TYPE-LIABILITY ACCT-TYPE-PAYABLE
ACCT-TYPE-EQUITY ACCT-TYPE-CREDIT ACCT-TYPE-EQUITY ACCT-TYPE-CREDIT
@ -374,7 +374,7 @@ Credit Card, and Income accounts."))
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-complex-boolean-option (gnc:make-complex-boolean-option
gnc:pagename-general optname-common-currency gnc:pagename-general optname-common-currency
"e" (N_ "Convert all transactions into a common currency.") #f "e" (_ "Convert all transactions into a common currency.") #f
#f #f
(lambda (x) (lambda (x)
(begin (begin
@ -391,19 +391,19 @@ Credit Card, and Income accounts."))
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-simple-boolean-option (gnc:make-simple-boolean-option
gnc:pagename-general optname-orig-currency gnc:pagename-general optname-orig-currency
"f1" (N_ "Also show original currency amounts") #f)) "f1" (_ "Also show original currency amounts") #f))
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-simple-boolean-option (gnc:make-simple-boolean-option
gnc:pagename-general optname-table-export gnc:pagename-general optname-table-export
"g" (N_ "Formats the table suitable for cut & paste exporting with extra cells.") #f)) "g" (_ "Formats the table suitable for cut & paste exporting with extra cells.") #f))
;; Filtering Options ;; Filtering Options
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-string-option (gnc:make-string-option
pagename-filter optname-account-matcher pagename-filter optname-account-matcher
"a5" (N_ "Match only accounts whose fullname is matched e.g. ':Travel' will match \ "a5" (_ "Match only accounts whose fullname is matched e.g. ':Travel' will match \
Expenses:Travel:Holiday and Expenses:Business:Travel. It can be left blank, which will \ Expenses:Travel:Holiday and Expenses:Business:Travel. It can be left blank, which will \
disable the matcher.") disable the matcher.")
"")) ""))
@ -412,7 +412,7 @@ disable the matcher.")
(gnc:make-simple-boolean-option (gnc:make-simple-boolean-option
pagename-filter optname-account-matcher-regex pagename-filter optname-account-matcher-regex
"a6" "a6"
(N_ "By default the account matcher will search substring only. Set this to true to \ (_ "By default the account matcher will search substring only. Set this to true to \
enable full POSIX regular expressions capabilities. 'Car|Flights' will match both \ 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. \ Expenses:Car and Expenses:Flights. Use a period (.) to match a single character e.g. \
'20../.' will match 'Travel 2017/1 London'. ") '20../.' will match 'Travel 2017/1 London'. ")
@ -421,7 +421,7 @@ Expenses:Car and Expenses:Flights. Use a period (.) to match a single character
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-string-option (gnc:make-string-option
pagename-filter optname-transaction-matcher pagename-filter optname-transaction-matcher
"i1" (N_ "Match only transactions whose substring is matched e.g. '#gift' \ "i1" (_ "Match only transactions whose substring is matched e.g. '#gift' \
will find all transactions with #gift in description, notes or memo. It can be left \ will find all transactions with #gift in description, notes or memo. It can be left \
blank, which will disable the matcher.") blank, which will disable the matcher.")
"")) ""))
@ -430,7 +430,7 @@ blank, which will disable the matcher.")
(gnc:make-simple-boolean-option (gnc:make-simple-boolean-option
pagename-filter optname-transaction-matcher-regex pagename-filter optname-transaction-matcher-regex
"i2" "i2"
(N_ "By default the transaction matcher will search substring only. Set this to true to \ (_ "By default the transaction matcher will search substring only. Set this to true to \
enable full POSIX regular expressions capabilities. '#work|#family' will match both \ enable full POSIX regular expressions capabilities. '#work|#family' will match both \
tags within description, notes or memo. ") tags within description, notes or memo. ")
#f)) #f))
@ -438,7 +438,7 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-option (gnc:make-multichoice-option
pagename-filter optname-reconcile-status pagename-filter optname-reconcile-status
"j1" (N_ "Filter by reconcile status.") "j1" (_ "Filter by reconcile status.")
#f #f
(keylist->vectorlist reconcile-status-list))) (keylist->vectorlist reconcile-status-list)))
@ -455,7 +455,7 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-account-list-option (gnc:make-account-list-option
gnc:pagename-accounts optname-accounts gnc:pagename-accounts optname-accounts
"a" (N_ "Report on these accounts.") "a" (_ "Report on these accounts.")
;; select, by default, no accounts! Selecting all accounts will ;; select, by default, no accounts! Selecting all accounts will
;; always imply an insanely long waiting time upon opening, and it ;; always imply an insanely long waiting time upon opening, and it
;; is almost never useful. So we instead display the normal error ;; is almost never useful. So we instead display the normal error
@ -468,7 +468,7 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-account-list-option (gnc:make-account-list-option
gnc:pagename-accounts optname-filterby gnc:pagename-accounts optname-filterby
"c1" (N_ "Filter on these accounts.") "c1" (_ "Filter on these accounts.")
(lambda () (lambda ()
'()) '())
#f #t)) #f #t))
@ -476,7 +476,7 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-callback-option (gnc:make-multichoice-callback-option
gnc:pagename-accounts optname-filtertype gnc:pagename-accounts optname-filtertype
"c" (N_ "Filter account.") "c" (_ "Filter account.")
'none 'none
(keylist->vectorlist filter-list) (keylist->vectorlist filter-list)
#f #f
@ -548,7 +548,7 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-callback-option (gnc:make-multichoice-callback-option
pagename-sorting optname-prime-sortkey pagename-sorting optname-prime-sortkey
"a" (N_ "Sort by this criterion first.") "a" (_ "Sort by this criterion first.")
prime-sortkey prime-sortkey
key-choice-list #f key-choice-list #f
(lambda (x) (lambda (x)
@ -559,28 +559,28 @@ tags within description, notes or memo. ")
(gnc:make-simple-boolean-option (gnc:make-simple-boolean-option
pagename-sorting optname-full-account-name pagename-sorting optname-full-account-name
"j1" "j1"
(N_ "Show the full account name for subtotals and subheadings?") (_ "Show the full account name for subtotals and subheadings?")
#f)) #f))
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-simple-boolean-option (gnc:make-simple-boolean-option
pagename-sorting optname-show-account-code pagename-sorting optname-show-account-code
"j2" "j2"
(N_ "Show the account code for subtotals and subheadings?") (_ "Show the account code for subtotals and subheadings?")
#f)) #f))
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-simple-boolean-option (gnc:make-simple-boolean-option
pagename-sorting optname-show-account-description pagename-sorting optname-show-account-description
"j3" "j3"
(N_ "Show the account description for subheadings?") (_ "Show the account description for subheadings?")
#f)) #f))
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-complex-boolean-option (gnc:make-complex-boolean-option
pagename-sorting optname-prime-subtotal pagename-sorting optname-prime-subtotal
"e5" "e5"
(N_ "Subtotal according to the primary key?") (_ "Subtotal according to the primary key?")
prime-sortkey-subtotal-true #f prime-sortkey-subtotal-true #f
(lambda (x) (lambda (x)
(set! prime-sortkey-subtotal-true x) (set! prime-sortkey-subtotal-true x)
@ -589,14 +589,14 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-option (gnc:make-multichoice-option
pagename-sorting optname-prime-date-subtotal pagename-sorting optname-prime-date-subtotal
"e2" (N_ "Do a date subtotal.") "e2" (_ "Do a date subtotal.")
'monthly 'monthly
date-subtotal-choice-list)) date-subtotal-choice-list))
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-option (gnc:make-multichoice-option
pagename-sorting optname-prime-sortorder pagename-sorting optname-prime-sortorder
"e" (N_ "Order of primary sorting.") "e" (_ "Order of primary sorting.")
'ascend 'ascend
ascending-choice-list)) ascending-choice-list))
@ -605,7 +605,7 @@ tags within description, notes or memo. ")
(gnc:make-multichoice-callback-option (gnc:make-multichoice-callback-option
pagename-sorting optname-sec-sortkey pagename-sorting optname-sec-sortkey
"f" "f"
(N_ "Sort by this criterion second.") (_ "Sort by this criterion second.")
sec-sortkey sec-sortkey
key-choice-list #f key-choice-list #f
(lambda (x) (lambda (x)
@ -616,7 +616,7 @@ tags within description, notes or memo. ")
(gnc:make-complex-boolean-option (gnc:make-complex-boolean-option
pagename-sorting optname-sec-subtotal pagename-sorting optname-sec-subtotal
"i5" "i5"
(N_ "Subtotal according to the secondary key?") (_ "Subtotal according to the secondary key?")
sec-sortkey-subtotal-true #f sec-sortkey-subtotal-true #f
(lambda (x) (lambda (x)
(set! sec-sortkey-subtotal-true x) (set! sec-sortkey-subtotal-true x)
@ -625,14 +625,14 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-option (gnc:make-multichoice-option
pagename-sorting optname-sec-date-subtotal pagename-sorting optname-sec-date-subtotal
"i2" (N_ "Do a date subtotal.") "i2" (_ "Do a date subtotal.")
'monthly 'monthly
date-subtotal-choice-list)) date-subtotal-choice-list))
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-option (gnc:make-multichoice-option
pagename-sorting optname-sec-sortorder pagename-sorting optname-sec-sortorder
"i" (N_ "Order of Secondary sorting.") "i" (_ "Order of Secondary sorting.")
'ascend 'ascend
ascending-choice-list))) ascending-choice-list)))
@ -677,37 +677,37 @@ tags within description, notes or memo. ")
;; One list per option here with: option-name, sort-tag, ;; One list per option here with: option-name, sort-tag,
;; help-string, default-value ;; help-string, default-value
(list (list
(list (N_ "Date") "a" (N_ "Display the date?") #t) (list (N_ "Date") "a" (_ "Display the date?") #t)
(list (N_ "Reconciled Date") "a2" (N_ "Display the reconciled date?") #f) (list (N_ "Reconciled Date") "a2" (_ "Display the reconciled date?") #f)
(if BOOK-SPLIT-ACTION (if BOOK-SPLIT-ACTION
(list (N_ "Num/Action") "b" (N_ "Display the check number?") #t) (list (N_ "Num/Action") "b" (_ "Display the check number?") #t)
(list (N_ "Num") "b" (N_ "Display the check number?") #t)) (list (N_ "Num") "b" (_ "Display the check number?") #t))
(list (N_ "Description") "c" (N_ "Display the description?") #t) (list (N_ "Description") "c" (_ "Display the description?") #t)
(list (N_ "Notes") "d2" (N_ "Display the notes if the memo is unavailable?") #t) (list (N_ "Notes") "d2" (_ "Display the notes if the memo is unavailable?") #t)
;; account name option appears here ;; account name option appears here
(list (N_ "Use Full Account Name") "f" (N_ "Display the full account name?") #t) (list (N_ "Use Full Account Name") "f" (_ "Display the full account name?") #t)
(list (N_ "Account Code") "g" (N_ "Display the account code?") #f) (list (N_ "Account Code") "g" (_ "Display the account code?") #f)
;; other account name option appears here ;; other account name option appears here
(list (N_ "Use Full Other Account Name") "i" (N_ "Display the full account name?") #f) (list (N_ "Use Full Other Account Name") "i" (_ "Display the full account name?") #f)
(list (N_ "Other Account Code") "j" (N_ "Display the other account code?") #f) (list (N_ "Other Account Code") "j" (_ "Display the other account code?") #f)
(list (N_ "Shares") "k" (N_ "Display the number of shares?") #f) (list (N_ "Shares") "k" (_ "Display the number of shares?") #f)
(list (N_ "Price") "l" (N_ "Display the shares price?") #f) (list (N_ "Price") "l" (_ "Display the shares price?") #f)
;; note the "Amount" multichoice option in between here ;; note the "Amount" multichoice option in between here
(list (N_ "Running Balance") "n" (N_ "Display a running balance?") #f) (list (N_ "Running Balance") "n" (_ "Display a running balance?") #f)
(list (N_ "Totals") "o" (N_ "Display the totals?") #t))) (list (N_ "Totals") "o" (_ "Display the totals?") #t)))
(if BOOK-SPLIT-ACTION (if BOOK-SPLIT-ACTION
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-simple-boolean-option (gnc:make-simple-boolean-option
gnc:pagename-display (N_ "Trans Number") gnc:pagename-display (N_ "Trans Number")
"b2" (N_ "Display the trans number?") #f))) "b2" (_ "Display the trans number?") #f)))
;; Add an option to display the memo, and disable the notes option ;; Add an option to display the memo, and disable the notes option
;; when memos are not included. ;; when memos are not included.
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-complex-boolean-option (gnc:make-complex-boolean-option
gnc:pagename-display (N_ "Memo") gnc:pagename-display (N_ "Memo")
"d" (N_ "Display the memo?") #t "d" (_ "Display the memo?") #t
disp-memo? disp-memo?
(lambda (x) (lambda (x)
(set! disp-memo? x) (set! disp-memo? x)
@ -717,7 +717,7 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-complex-boolean-option (gnc:make-complex-boolean-option
gnc:pagename-display (N_ "Account Name") gnc:pagename-display (N_ "Account Name")
"e" (N_ "Display the account name?") #t "e" (_ "Display the account name?") #t
disp-accname? disp-accname?
(lambda (x) (lambda (x)
(set! disp-accname? x) (set! disp-accname? x)
@ -727,7 +727,7 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-complex-boolean-option (gnc:make-complex-boolean-option
gnc:pagename-display (N_ "Other Account Name") gnc:pagename-display (N_ "Other Account Name")
"h5" (N_ "Display the other account name? (if this is a split transaction, this parameter is guessed).") #f "h5" (_ "Display the other account name? (if this is a split transaction, this parameter is guessed).") #f
disp-other-accname? disp-other-accname?
(lambda (x) (lambda (x)
(set! disp-other-accname? x) (set! disp-other-accname? x)
@ -736,14 +736,14 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-callback-option (gnc:make-multichoice-callback-option
gnc:pagename-display optname-detail-level gnc:pagename-display optname-detail-level
"h" (N_ "Amount of detail to display per transaction.") "h" (_ "Amount of detail to display per transaction.")
'single 'single
(list (vector 'multi-line (list (vector 'multi-line
(N_ "Multi-Line") (_ "Multi-Line")
(N_ "Display all splits in a transaction on a separate line.")) (_ "Display all splits in a transaction on a separate line."))
(vector 'single (vector 'single
(N_ "Single") (_ "Single")
(N_ "Display one line per transaction, merging multiple splits where required."))) (_ "Display one line per transaction, merging multiple splits where required.")))
#f #f
(lambda (x) (lambda (x)
(set! detail-is-single? (eq? x 'single)) (set! detail-is-single? (eq? x 'single))
@ -752,12 +752,12 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-callback-option (gnc:make-multichoice-callback-option
gnc:pagename-display (N_ "Amount") gnc:pagename-display (N_ "Amount")
"m" (N_ "Display the amount?") "m" (_ "Display the amount?")
'single 'single
(list (list
(vector 'none (N_ "None") (N_ "No amount display.")) (vector 'none (_ "None") (_ "No amount display."))
(vector 'single (N_ "Single") (N_ "Single Column Display.")) (vector 'single (_ "Single") (_ "Single Column Display."))
(vector 'double (N_ "Double") (N_ "Two Column Display."))) (vector 'double (_ "Double") (_ "Two Column Display.")))
#f #f
(lambda (x) (lambda (x)
(set! amount-is-single? (eq? x 'single)) (set! amount-is-single? (eq? x 'single))
@ -766,7 +766,7 @@ tags within description, notes or memo. ")
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-option (gnc:make-multichoice-option
gnc:pagename-display (N_ "Sign Reverses") gnc:pagename-display (N_ "Sign Reverses")
"m1" (N_ "Reverse amount display for certain account types.") "m1" (_ "Reverse amount display for certain account types.")
'global 'global
(keylist->vectorlist sign-reverse-list)))) (keylist->vectorlist sign-reverse-list))))
@ -920,15 +920,15 @@ tags within description, notes or memo. ")
;; merge? to merge with the next cell (ie for debit/credit cells) ;; merge? to merge with the next cell (ie for debit/credit cells)
;; merging-function - function (usually gnc-numeric-add/sub-fixed to apply to dual-subtotal ;; merging-function - function (usually gnc-numeric-add/sub-fixed to apply to dual-subtotal
(if (column-uses? 'amount-single) (if (column-uses? 'amount-single)
(list (vector (header-commodity (N_ "Amount")) (list (vector (header-commodity (_ "Amount"))
amount #t #t amount #t #t
(vector #f #f))) (vector #f #f)))
'()) '())
(if (column-uses? 'amount-double) (if (column-uses? 'amount-double)
(list (vector (header-commodity (N_ "Debit")) (list (vector (header-commodity (_ "Debit"))
debit-amount #f #t debit-amount #f #t
(vector #t gnc-numeric-add)) (vector #t gnc-numeric-add))
(vector (header-commodity (N_ "Credit")) (vector (header-commodity (_ "Credit"))
credit-amount #f #t credit-amount #f #t
(vector #f gnc-numeric-sub))) (vector #f gnc-numeric-sub)))
'()) '())
@ -951,7 +951,7 @@ tags within description, notes or memo. ")
'()) '())
(if (column-uses? 'running-balance) (if (column-uses? 'running-balance)
(list (vector (N_ "Running Balance") (list (vector (_ "Running Balance")
running-balance #t #f running-balance #t #f
(vector #f #f))) (vector #f #f)))
'())))) '()))))
@ -1545,11 +1545,11 @@ tags within description, notes or memo. ")
(highlight (highlight
(string-append optname-account-matcher (string-append optname-account-matcher
(if (opt-val pagename-filter optname-account-matcher-regex) (if (opt-val pagename-filter optname-account-matcher-regex)
(N_ " regex") (_ " regex")
"")) ""))
account-matcher) account-matcher)
(highlight (highlight
(N_ "Accounts produced") (_ "Accounts produced")
(string-join (map xaccAccountGetName c_account_1) ", ")))) (string-join (map xaccAccountGetName c_account_1) ", "))))
(if (eq? filter-mode 'none) (if (eq? filter-mode 'none)
"" ""
@ -1562,7 +1562,7 @@ tags within description, notes or memo. ")
(highlight (highlight
(string-append optname-transaction-matcher (string-append optname-transaction-matcher
(if (opt-val pagename-filter optname-transaction-matcher-regex) (if (opt-val pagename-filter optname-transaction-matcher-regex)
(N_ " regex") (_ " regex")
"")) ""))
transaction-matcher))) transaction-matcher)))
(if reconcile-status-filter (if reconcile-status-filter