r19366 - gnucash/trunk/src - Bug #556713: Fix inconsistency in report options
Christian Stimming
cstim at code.gnucash.org
Wed Jul 14 16:21:40 EDT 2010
Author: cstim
Date: 2010-07-14 16:21:40 -0400 (Wed, 14 Jul 2010)
New Revision: 19366
Trac: http://svn.gnucash.org/trac/changeset/19366
Modified:
gnucash/trunk/src/app-utils/date-utilities.scm
gnucash/trunk/src/business/business-reports/aging.scm
gnucash/trunk/src/report/standard-reports/average-balance.scm
gnucash/trunk/src/report/standard-reports/balsheet-eg.scm
gnucash/trunk/src/report/standard-reports/general-ledger.scm
gnucash/trunk/src/report/standard-reports/transaction.scm
Log:
Bug #556713: Fix inconsistency in report options
The attached patch should fix the remaining outstanding issues of this bug.
Applying this patch now would break string freeze.
Modified: gnucash/trunk/src/app-utils/date-utilities.scm
===================================================================
--- gnucash/trunk/src/app-utils/date-utilities.scm 2010-07-14 19:54:11 UTC (rev 19365)
+++ gnucash/trunk/src/app-utils/date-utilities.scm 2010-07-14 20:21:40 UTC (rev 19366)
@@ -673,63 +673,63 @@
(N_ "Start of this year"))
(gnc:reldate-string-db
'store 'start-cal-year-desc
- (N_ "Start of the current calendar year"))
+ (N_ "First day of the current calendar year"))
(gnc:reldate-string-db
'store 'end-cal-year-string
(N_ "End of this year"))
(gnc:reldate-string-db
'store 'end-cal-year-desc
- (N_ "End of the current calendar year"))
+ (N_ "Last day of the current calendar year"))
(gnc:reldate-string-db
'store 'start-prev-year-string
(N_ "Start of previous year"))
(gnc:reldate-string-db
'store 'start-prev-year-desc
- (N_ "Beginning of the previous calendar year"))
+ (N_ "First day of the previous calendar year"))
(gnc:reldate-string-db
'store 'end-prev-year-string
(N_ "End of previous year"))
(gnc:reldate-string-db
'store 'end-prev-year-desc
- (N_ "End of the Previous Year"))
+ (N_ "Last day of the previous calendar year"))
(gnc:reldate-string-db
'store 'start-accounting-period-string
- (N_ "Start of Financial Period"))
+ (N_ "Start of accounting period"))
(gnc:reldate-string-db
'store 'start-accounting-period-desc
- (N_ "Start of the accounting period, as set in the global preferences"))
+ (N_ "First day of the accounting period, as set in the global preferences"))
(gnc:reldate-string-db
'store 'end-accounting-period-string
- (N_ "End of Financial Period"))
+ (N_ "End of accounting period"))
(gnc:reldate-string-db
'store 'end-accounting-period-desc
- (N_ "End of the accounting period, as set in the global preferences"))
+ (N_ "Last day of the accounting period, as set in the global preferences"))
(gnc:reldate-string-db
'store 'start-this-month-string
(N_ "Start of this month"))
(gnc:reldate-string-db
'store 'start-this-month-desc
- (N_ "Start of the current month"))
+ (N_ "First day of the current month"))
(gnc:reldate-string-db
'store 'end-this-month-string
(N_ "End of this month"))
(gnc:reldate-string-db
'store 'end-this-month-desc
- (N_ "End of the current month"))
+ (N_ "Last day of the current month"))
(gnc:reldate-string-db
'store 'start-prev-month-string
(N_ "Start of previous month"))
(gnc:reldate-string-db
'store 'start-prev-month-desc
- (N_ "The beginning of the previous month"))
+ (N_ "First day of the previous month"))
(gnc:reldate-string-db
'store 'end-prev-month-string
@@ -743,28 +743,28 @@
(N_ "Start of current quarter"))
(gnc:reldate-string-db
'store 'start-current-quarter-desc
- (N_ "The start of the latest quarterly accounting period"))
+ (N_ "First day of the current quarterly accounting period"))
(gnc:reldate-string-db
'store 'end-current-quarter-string
(N_ "End of current quarter"))
(gnc:reldate-string-db
'store 'end-current-quarter-desc
- (N_ "The end of the latest quarterly accounting period"))
+ (N_ "Last day of the current quarterly accounting period"))
(gnc:reldate-string-db
'store 'start-prev-quarter-string
(N_ "Start of previous quarter"))
(gnc:reldate-string-db
'store 'start-prev-quarter-desc
- (N_ "The start of the previous quarterly accounting period"))
+ (N_ "First day of the previous quarterly accounting period"))
(gnc:reldate-string-db
'store 'end-prev-quarter-string
(N_ "End of previous quarter"))
(gnc:reldate-string-db
'store 'end-prev-quarter-desc
- (N_ "End of previous quarterly accounting period"))
+ (N_ "Last day of previous quarterly accounting period"))
(gnc:reldate-string-db
'store 'today-string
Modified: gnucash/trunk/src/business/business-reports/aging.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/aging.scm 2010-07-14 19:54:11 UTC (rev 19365)
+++ gnucash/trunk/src/business/business-reports/aging.scm 2010-07-14 20:21:40 UTC (rev 19366)
@@ -44,8 +44,8 @@
(define optname-sort-order (N_ "Sort Order"))
(define optname-report-currency (N_ "Report's currency"))
(define optname-price-source (N_ "Price Source"))
-(define optname-multicurrency-totals (N_ "Show Multi-currency Totals?"))
-(define optname-show-zeros (N_ "Show zero balance items?"))
+(define optname-multicurrency-totals (N_ "Show Multi-currency Totals"))
+(define optname-show-zeros (N_ "Show zero balance items"))
;; The idea is: have a hash with the key being the contact name
;; (In future this might be GUID'ed, but for now it's a string
Modified: gnucash/trunk/src/report/standard-reports/average-balance.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/average-balance.scm 2010-07-14 19:54:11 UTC (rev 19365)
+++ gnucash/trunk/src/report/standard-reports/average-balance.scm 2010-07-14 20:21:40 UTC (rev 19366)
@@ -21,7 +21,7 @@
(define optname-report-currency (N_ "Report's currency"))
(define optname-price-source (N_ "Price Source"))
(define optname-subacct (N_ "Include Sub-Accounts"))
-(define optname-internal (N_ "Exclude transactions between selected accounts?"))
+(define optname-internal (N_ "Exclude transactions between selected accounts"))
;;;;;;;;;;;;;;;;;;;;;;;;;
;; Options
Modified: gnucash/trunk/src/report/standard-reports/balsheet-eg.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/balsheet-eg.scm 2010-07-14 19:54:11 UTC (rev 19365)
+++ gnucash/trunk/src/report/standard-reports/balsheet-eg.scm 2010-07-14 20:21:40 UTC (rev 19366)
@@ -282,7 +282,7 @@
(define optname-depth-limit (N_ "Levels of Subaccounts"))
(define opthelp-depth-limit (N_ "Maximum number of levels in the account tree displayed"))
-(define optname-flatten? (N_ "Flatten list to depth limit?"))
+(define optname-flatten? (N_ "Flatten list to depth limit"))
(define opthelp-flatten?
(N_ "Displays accounts which exceed the depth limit at the depth limit"))
Modified: gnucash/trunk/src/report/standard-reports/general-ledger.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/general-ledger.scm 2010-07-14 19:54:11 UTC (rev 19365)
+++ gnucash/trunk/src/report/standard-reports/general-ledger.scm 2010-07-14 20:21:40 UTC (rev 19366)
@@ -63,7 +63,7 @@
(set-option!
gnc:pagename-accounts (N_ "Filter Type") 'none)
(set-option!
- gnc:pagename-accounts (N_ "Void Transactions?") 'non-void-only)
+ gnc:pagename-accounts (N_ "Void Transactions") 'non-void-only)
;; set options in the display tab...
(for-each
@@ -77,10 +77,10 @@
(list (N_ "Description") #t)
(list (N_ "Memo") #f)
(list (N_ "Account Name") #f)
- (list (N_ "Use Full Account Name?") #f)
+ (list (N_ "Use Full Account Name") #f)
(list (N_ "Account Code") #f)
(list (N_ "Other Account Name") #f)
- (list (N_ "Use Full Other Account Name?") #f)
+ (list (N_ "Use Full Other Account Name") #f)
(list (N_ "Other Account Code") #f)
(list (N_ "Shares") #f)
(list (N_ "Price") #f)
@@ -88,7 +88,7 @@
(list (N_ "Amount") 'double)
(list (N_ "Running Balance") #t)
(list (N_ "Totals") #f)
- (list (N_ "Sign Reverses?") 'credit-accounts)
+ (list (N_ "Sign Reverses") 'credit-accounts)
)
)
@@ -106,8 +106,8 @@
;; One list per option here with: option-name, default-value
(list
(list (N_ "Primary Key") 'account-code)
- (list (N_ "Show Full Account Name?") #f)
- (list (N_ "Show Account Code?") #t)
+ (list (N_ "Show Full Account Name") #f)
+ (list (N_ "Show Account Code") #t)
(list (N_ "Primary Subtotal") #t)
(list (N_ "Primary Subtotal for Date Key") 'none)
(list (N_ "Primary Sort Order") 'ascend)
Modified: gnucash/trunk/src/report/standard-reports/transaction.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/transaction.scm 2010-07-14 19:54:11 UTC (rev 19365)
+++ gnucash/trunk/src/report/standard-reports/transaction.scm 2010-07-14 20:21:40 UTC (rev 19366)
@@ -52,7 +52,7 @@
(define optname-sec-sortkey (N_ "Secondary Key"))
(define optname-sec-subtotal (N_ "Secondary Subtotal"))
(define optname-sec-date-subtotal (N_ "Secondary Subtotal for Date Key"))
-(define optname-void-transactions (N_ "Void Transactions?"))
+(define optname-void-transactions (N_ "Void Transactions"))
(define optname-table-export (N_ "Table for Exporting"))
(define optname-common-currency (N_ "Common Currency"))
(define optname-currency (N_ "Report's currency"))
@@ -386,7 +386,7 @@
(vector-set! column-list 10 #t))))
(if (opt-val (N_ "Display") (N_ "Running Balance"))
(vector-set! column-list 11 #t))
- (if (opt-val (N_ "Display") (N_ "Use Full Account Name?"))
+ (if (opt-val (N_ "Display") (N_ "Use Full Account Name"))
(vector-set! column-list 12 #t))
(if (opt-val (N_ "Display") (N_ "Memo"))
(vector-set! column-list 13 #t))
@@ -394,11 +394,11 @@
(vector-set! column-list 14 #t))
(if (opt-val (N_ "Display") (N_ "Other Account Code"))
(vector-set! column-list 15 #t))
- (if (opt-val (N_ "Display") (N_ "Use Full Other Account Name?"))
+ (if (opt-val (N_ "Display") (N_ "Use Full Other Account Name"))
(vector-set! column-list 16 #t))
- (if (opt-val (N_ "Sorting") (N_ "Show Account Code?"))
+ (if (opt-val (N_ "Sorting") (N_ "Show Account Code"))
(vector-set! column-list 17 #t))
- (if (opt-val (N_ "Sorting") (N_ "Show Full Account Name?"))
+ (if (opt-val (N_ "Sorting") (N_ "Show Full Account Name"))
(vector-set! column-list 18 #t))
(if (opt-val (N_ "Display") (N_ "Notes"))
(vector-set! column-list 19 #t))
@@ -761,14 +761,14 @@
(gnc:register-trep-option
(gnc:make-simple-boolean-option
- pagename-sorting (N_ "Show Full Account Name?")
+ pagename-sorting (N_ "Show Full Account Name")
"a1"
(N_ "Show the full account name for subtotals and subtitles?")
#f))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
- pagename-sorting (N_ "Show Account Code?")
+ pagename-sorting (N_ "Show Account Code")
"a2"
(N_ "Show the account code for subtotals and subtitles?")
#f))
@@ -847,11 +847,11 @@
(list (N_ "Description") "c" (N_ "Display the description?") #t)
(list (N_ "Notes") "d2" (N_ "Display the notes if the memo is unavailable?") #t)
(list (N_ "Account Name") "e" (N_ "Display the account name?") #f)
- (list (N_ "Use Full Account Name?") "f" (N_ "Display the full account name") #t)
+ (list (N_ "Use Full Account Name") "f" (N_ "Display the full account name") #t)
(list (N_ "Account Code") "g" (N_ "Display the account code") #f)
(list (N_ "Other Account Name") "h" (N_ "Display the other account name?\
(if this is a split transaction, this parameter is guessed).") #f)
- (list (N_ "Use Full Other Account Name?") "i" (N_ "Display the full account name") #t)
+ (list (N_ "Use Full Other Account Name") "i" (N_ "Display the full account name") #t)
(list (N_ "Other Account Code") "j" (N_ "Display the other account code") #f)
(list (N_ "Shares") "k" (N_ "Display the number of shares?") #f)
(list (N_ "Price") "l" (N_ "Display the shares price?") #f)
@@ -884,7 +884,7 @@
(gnc:register-trep-option
(gnc:make-multichoice-option
- gnc:pagename-display (N_ "Sign Reverses?")
+ gnc:pagename-display (N_ "Sign Reverses")
"p" (N_ "Reverse amount display for certain account types")
'credit-accounts
(list
@@ -955,7 +955,7 @@
(cdr (assq (gnc:option-value
(gnc:lookup-option options
(N_ "Display")
- (N_ "Sign Reverses?")))
+ (N_ "Sign Reverses")))
account-types-to-reverse-assoc-list)))
More information about the gnucash-changes
mailing list