From 2b6beb7b0a17760d0c478352e6473fc39dfe672b Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Sun, 6 Oct 2002 15:35:54 +0000 Subject: [PATCH] * Rename a bunch of reports as per Chris Lyttle's suggestions git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7278 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 3 +++ src/report/locale-specific/us/taxtxf.scm | 2 +- src/report/report-system/report.scm | 8 +++----- src/report/standard-reports/net-barchart.scm | 2 +- src/report/standard-reports/pnl.scm | 2 +- src/report/utility-reports/welcome-to-gnucash.scm | 10 +++++----- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c945d4b1f1..a5ad82b55f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2002-10-06 Derek Atkins + * Rename a bunch of reports as per Chris Lyttle's suggestions + 2002-10-06 David Hampton * src/gnome-utils/dialog-utils.c (gnc_handle_date_accelerator): If diff --git a/src/report/locale-specific/us/taxtxf.scm b/src/report/locale-specific/us/taxtxf.scm index 9dd343089b1..e2278df64d8 100644 --- a/src/report/locale-specific/us/taxtxf.scm +++ b/src/report/locale-specific/us/taxtxf.scm @@ -783,7 +783,7 @@ (gnc:define-report 'version 1 - 'name (N_ "Tax Report / TXF Export") + 'name (N_ "Tax Report & TXF Export") ;;'menu-path (list gnc:menuname-taxes) 'menu-tip (N_ "Taxable Income / Deductible Expenses / Export to .TXF file") 'options-generator tax-options-generator diff --git a/src/report/report-system/report.scm b/src/report/report-system/report.scm index 57f413d192b..de544867e87 100644 --- a/src/report/report-system/report.scm +++ b/src/report/report-system/report.scm @@ -37,12 +37,10 @@ ;; Define those strings here to make changes easier and avoid typos. (define gnc:menuname-reports (N_ "_Reports")) -(define gnc:menuname-asset-liability - (N_ "_Assets & Liabilities")) -(define gnc:menuname-income-expense - (N_ "_Income & Expense")) +(define gnc:menuname-asset-liability (N_ "_Assets & Liabilities")) +(define gnc:menuname-income-expense (N_ "_Income & Expense")) (define gnc:menuname-taxes (N_ "_Taxes")) -(define gnc:menuname-utility (N_ "_Utility")) +(define gnc:menuname-utility (N_ "_Sample & Custom")) (define gnc:pagename-general (N_ "General")) (define gnc:pagename-accounts (N_ "Accounts")) (define gnc:pagename-display (N_ "Display")) diff --git a/src/report/standard-reports/net-barchart.scm b/src/report/standard-reports/net-barchart.scm index 216c8f73d8f..69ed5d2e897 100644 --- a/src/report/standard-reports/net-barchart.scm +++ b/src/report/standard-reports/net-barchart.scm @@ -363,7 +363,7 @@ (gnc:define-report 'version 1 - 'name (N_ "Income/Expense Chart") + 'name (N_ "Income & Expense Chart") 'menu-path (list gnc:menuname-income-expense) 'options-generator (lambda () (options-generator #t)) 'renderer (lambda (report-obj) (net-renderer report-obj #t))) diff --git a/src/report/standard-reports/pnl.scm b/src/report/standard-reports/pnl.scm index 97f855c2b48..949d5bce72f 100644 --- a/src/report/standard-reports/pnl.scm +++ b/src/report/standard-reports/pnl.scm @@ -211,7 +211,7 @@ (gnc:define-report 'version 1 - 'name (N_ "Profit And Loss") + 'name (N_ "Profit & Loss") 'menu-path (list gnc:menuname-income-expense) 'options-generator pnl-options-generator 'renderer pnl-renderer) diff --git a/src/report/utility-reports/welcome-to-gnucash.scm b/src/report/utility-reports/welcome-to-gnucash.scm index cc6b4b84698..7a39868edf1 100644 --- a/src/report/utility-reports/welcome-to-gnucash.scm +++ b/src/report/utility-reports/welcome-to-gnucash.scm @@ -30,11 +30,11 @@ (define (gnc:make-welcome-report) (let* ((view (gnc:make-report "Multicolumn View")) - (sub-welcome (gnc:make-report "Welcome to GnuCash 1.6")) + (sub-welcome (gnc:make-report "Welcome to GnuCash")) (sub-accounts (gnc:make-report "Account Summary")) (sub-expense-pie (gnc:make-report "Expense Accounts")) (sub-income-pie (gnc:make-report "Income Accounts")) - (sub-bar (gnc:make-report "Income/Expense Chart")) + (sub-bar (gnc:make-report "Income & Expense Chart")) (options #f)) (define (set-option! section name value) @@ -42,7 +42,7 @@ (gnc:lookup-option options section name) value)) (set! options (gnc:report-options (gnc:find-report view))) - (set-option! "General" "Report name" (_ "Welcome to GnuCash 1.6")) + (set-option! "General" "Report name" (_ "Welcome to GnuCash")) (set-option! "General" "Number of columns" 2) ;; mark the reports as needing to be saved @@ -78,13 +78,13 @@ (gnc:html-document-add-object! doc (gnc:make-html-text - (gnc:html-markup-h2 (_ "Welcome to GnuCash 1.6!")) + (gnc:html-markup-h2 (_ "Welcome to GnuCash 1.8!")) (gnc:html-markup-p (_ "GnuCash 1.6 has lots of nice features. Here are a few.")))) doc)) (gnc:define-report - 'name (N_ "Welcome to GnuCash 1.6") + 'name (N_ "Welcome to GnuCash") 'in-menu? #f 'options-generator options 'renderer renderer)