Remove widget GncCombott - Part2

Remove tip entry for gnc:make-multichoice-option in SCM files and
change some of the multichoice items to that of the removed tip

gnucash/report/options-utilities.scm

@@ -63,14 +63,13 @@
    (gnc:make-multichoice-option
     pagename optname
     sort-tag (N_ "The amount of time between data points.") default
-    (list (vector 'DayDelta (N_ "Day") (N_ "One Day."))
+    (list (vector 'DayDelta (N_ "One Day"))
-	  (vector 'WeekDelta (N_ "Week") (N_ "One Week."))
+          (vector 'WeekDelta (N_ "One Week"))
-	  (vector 'TwoWeekDelta (N_ "2Week") (N_ "Two Weeks."))
+          (vector 'TwoWeekDelta (N_ "Two Weeks"))
-	  (vector 'MonthDelta (N_ "Month") (N_ "One Month."))
+          (vector 'MonthDelta (N_ "One Month"))
-	  (vector 'QuarterDelta (N_ "Quarter") (N_ "One Quarter."))
+          (vector 'QuarterDelta (N_ "One Quarter"))
-	  (vector 'HalfYearDelta (N_ "Half Year") (N_ "Half Year."))
+          (vector 'HalfYearDelta (N_ "Half Year"))
-	  (vector 'YearDelta (N_ "Year") (N_ "One Year."))
+          (vector 'YearDelta (N_ "One Year"))))))
-	  ))))
 
 ;; A multichoice option intended to chose the account level. Different
 ;; from the other functions the help string can still be given. Used
@@ -82,13 +81,13 @@
    options  
    (gnc:make-multichoice-option
     pagename name-display-depth sort-tag help-string default-depth
-    (list (vector 'all (N_ "All") (N_ "All accounts"))
+    (list (vector 'all (N_ "All"))
-	  (vector 1 "1" (N_ "Top-level."))
+          (vector 1 "1")
-	  (vector 2 "2" (N_ "Second-level."))
+          (vector 2 "2")
-	  (vector 3 "3" (N_ "Third-level."))
+          (vector 3 "3")
-	  (vector 4 "4" (N_ "Fourth-level."))
+          (vector 4 "4")
-	  (vector 5 "5" (N_ "Fifth-level."))
+          (vector 5 "5")
-	  (vector 6 "6" (N_ "Sixth-level."))))))
+          (vector 6 "6")))))
 
 ;; These help for selecting a bunch of accounts.
 (define (gnc:options-add-account-selection! 
@@ -142,19 +141,10 @@
    (gnc:make-multichoice-option
     pagename optname
     sort-tag (N_ "The source of price information.") default
-    (list (vector 'average-cost
+    (list (vector 'average-cost (N_ "Average cost of purchases by volume-weighted"))
-		  (N_ "Average Cost")
+          (vector 'weighted-average (N_ "Weighted average of all past currency transactions"))
-		  (N_ "The volume-weighted average cost of purchases."))
+          (vector 'pricedb-latest (N_ "Most recent"))
-          (vector 'weighted-average 
+          (vector 'pricedb-nearest (N_ "Nearest to report date"))))))
-		  (N_ "Weighted Average")
-		  (N_ "The weighted average of all currency transactions of the past."))
-	  (vector 'pricedb-latest 
-		  (N_ "Most recent")
-		  (N_ "The most recent recorded price."))
-	  (vector 'pricedb-nearest
-		  (N_ "Nearest in time")
-		  (N_ "The price recorded nearest in time to the report date."))
-	  ))))
 
 ;; The width- and height- options for charts
 (define (gnc:options-add-plot-size!
@@ -188,15 +178,15 @@
     (N_ "Choose the marker for each data point.")
     default
     (list
-     (vector 'diamond (N_ "Diamond") (N_ "Hollow diamond"))
+     (vector 'diamond (N_ "Diamond"))
-     (vector 'circle (N_ "Circle") (N_ "Hollow circle"))
+     (vector 'circle (N_ "Circle"))
-     (vector 'square (N_ "Square") (N_ "Hollow square"))
+     (vector 'square (N_ "Square"))
-     (vector 'cross (N_ "Cross") (N_ "Cross"))
+     (vector 'cross (N_ "Cross"))
-     (vector 'plus (N_ "Plus") (N_ "Plus"))
+     (vector 'plus (N_ "Plus"))
-     (vector 'dash (N_ "Dash") (N_ "Dash"))
+     (vector 'dash (N_ "Dash"))
-     (vector 'filleddiamond (N_ "Filled diamond") (N_ "Diamond filled with color"))
+     (vector 'filleddiamond (N_ "Filled diamond"))
-     (vector 'filledcircle (N_ "Filled circle") (N_ "Circle filled with color"))
+     (vector 'filledcircle (N_ "Filled circle"))
-     (vector 'filledsquare (N_ "Filled square") (N_ "Square filled with color"))))))
+     (vector 'filledsquare (N_ "Filled square"))))))
 
 
 (define (gnc:options-add-sort-method!
@@ -209,9 +199,9 @@
     (N_ "Choose the method for sorting accounts.")
     default
     (list
-     (vector 'acct-code (N_ "Account Code") (N_ "Alphabetical by account code."))
+     (vector 'acct-code (N_ "Alphabetical by account code"))
-     (vector 'alphabetical (N_ "Alphabetical") (N_ "Alphabetical by account name."))
+     (vector 'alphabetical (N_ "Alphabetical by account name"))
-     (vector 'amount (N_ "Amount") (N_ "By amount, largest to smallest."))))))
+     (vector 'amount (N_ "Amount, largest to smallest"))))))
 
 
 ;; These control the calculation and view mode of subtotal balances
@@ -227,17 +217,16 @@
     ;; usually the option name is: (N_ "Parent account balances")
     optname-parent-balance-mode
     (string-append sort-tag "a")
-    (N_ "How to show the balances of parent accounts.")
+    (string-join
+     (list
+      (G_ "How to show the balances of parent accounts.")
+      (G_ "Account Balance in the parent account, excluding any subaccounts.")
+      (G_ "Do not show any balances of parent accounts."))
+      "\n* ")
     'immediate-bal
-    (list (vector 'immediate-bal
+    (list (vector 'immediate-bal (N_ "Account Balance"))
-		  (N_ "Account Balance")
+          (vector 'recursive-bal (N_ "Calculate Subtotal"))
-		  (N_ "Show only the balance in the parent account, excluding any subaccounts."))
+          (vector 'omit-bal (N_ "Do not show")))))
-	  (vector 'recursive-bal
-		  (N_ "Subtotal")
-		  (N_ "Calculate the subtotal for this parent account and all of its subaccounts, and show this as the parent account balance."))
-	  (vector 'omit-bal
-		  (N_ "Do not show")
-		  (N_ "Do not show any balances of parent accounts.")))))
   (gnc:register-option
    options
    (gnc:make-multichoice-option
@@ -245,11 +234,12 @@
     ;; usually the option name is: (N_ "Parent account subtotals")
     optname-parent-total-mode
     (string-append sort-tag "b")
-    (N_ "How to show account subtotals for parent accounts.")
+    (string-join
+     (list
+      (G_ "How to show account subtotals for parent accounts.")
+      (G_ "Show subtotals for selected parent accounts which have subaccounts.")
+      (G_ "Do not show any subtotals for parent accounts."))
+      "\n* ")
     'f
-    (list (vector 't
+    (list (vector 't (N_ "Show subtotals"))
-		  (N_ "Show subtotals")
+          (vector 'f (N_ "Do not show"))))))
-		  (N_ "Show subtotals for selected parent accounts which have subaccounts."))
-	  (vector 'f
-		  (N_ "Do not show")
-		  (N_ "Do not show any subtotals for parent accounts."))))))

gnucash/report/report-core.scm

@@ -295,9 +295,7 @@ not found.")))
            (lambda (ss)
              (vector
               (string->symbol (gnc:html-style-sheet-name ss))
-              (gnc:html-style-sheet-name ss)
+              (gnc:html-style-sheet-name ss)))
-              (string-append (gnc:html-style-sheet-name ss)
-                             " " (G_ "stylesheet."))))
            (gnc:get-html-style-sheets)))))
 
     (let ((options (if (procedure? generator)

gnucash/report/reports/aging.scm

@@ -345,9 +345,9 @@ more than one currency. This report is not designed to cope with this possibilit
       (N_ "Sort companies by.")
       'name
       (list 
-       (vector 'name (N_ "Name") (N_ "Name of the company."))
+       (vector 'name (N_ "Name of the company"))
-       (vector 'total (N_ "Total Owed") (N_ "Total amount owed to/from Company."))
+       (vector 'total (N_ "Total amount owed to/from Company"))
-       (vector 'oldest-bracket (N_ "Bracket Total Owed") (N_ "Amount owed in oldest bracket - if same go to next oldest.")))))
+       (vector 'oldest-bracket (N_ "Bracket Total Owed")))))
 
     (add-option 
      (gnc:make-multichoice-option
@@ -357,8 +357,8 @@ more than one currency. This report is not designed to cope with this possibilit
        (N_ "Sort order.")
        'increasing
        (list
-        (vector 'increasing (N_ "Ascending") (N_ "0 .. 999,999.99, A .. Z."))
+        (vector 'increasing (N_ "Ascending"))
-        (vector 'decreasing (N_ "Descending") (N_ "999,999.99 .. 0, Z .. A.")))))
+        (vector 'decreasing (N_ "Descending")))))
 
     (add-option
      (gnc:make-simple-boolean-option
@@ -385,8 +385,8 @@ totals to report currency.")
        (N_ "Leading date.")
        'duedate
        (list
-         (vector 'duedate (N_ "Due Date") (N_ "Due date is leading.")) ;; Should be using standard label for due date?
+         (vector 'duedate (N_ "Due Date"))
-         (vector 'postdate (N_ "Post Date") (N_ "Post date is leading."))))) ;; Should be using standard label for post date?
+         (vector 'postdate (N_ "Post Date")))))
 
 	  ;; display tab options
 

gnucash/report/reports/example/daily-reports.scm

@@ -55,7 +55,7 @@
 (define optname-price-source (N_ "Price Source"))
 
 (define optname-accounts (N_ "Accounts"))
-(define optname-levels (N_ "Show Accounts until level"))
+(define optname-levels (N_ "Levels of Subaccounts"))
 (define optname-subacct (N_ "Include Sub-Accounts"))
 
 (define optname-show-total (N_ "Show Totals"))

gnucash/report/reports/example/hello-world.scm

@@ -66,18 +66,10 @@
      (gnc:make-multichoice-option
       (N_ "Hello, World!") (N_ "Multi Choice Option")
       "b" (N_ "This is a multi choice option.") 'third
-      (list (vector 'first
+      (list (vector 'first (N_ "First Option"))
-                    (N_ "First Option")
+            (vector 'second (N_ "Second Option"))
-                    (N_ "Help for first option."))
+            (vector 'third (N_ "Third Option"))
-            (vector 'second
+            (vector 'fourth (N_ "Fourth Options")))))
-                    (N_ "Second Option")
-                    (N_ "Help for second option."))
-            (vector 'third
-                    (N_ "Third Option")
-                    (N_ "Help for third option."))
-            (vector 'fourth
-                    (N_ "Fourth Options")
-                    (N_ "The fourth option rules!")))))
     
     ;; This is a string option. Users can type anything they want
     ;; as a value. The default value is "Hello, World". This is

gnucash/report/reports/locale-specific/de_DE/taxtxf.scm

@@ -151,24 +151,16 @@
     gnc:pagename-general (N_ "Alternate Period")
     "c" (N_ "Override or modify From: & To:.")
     (if after-tax-day 'from-to 'last-year)
-    (list (vector 'from-to (N_ "Use From - To") (N_ "Use From - To period."))
+    (list (vector 'from-to (N_ "Use From - To"))
-          (vector '1st-est (N_ "1st Est Tax Quarter") (N_ "Jan 1 - Mar 31."))
+          (vector '1st-est (N_ "1st Est Tax Quarter (Jan 1 - Mar 31)"))
-          (vector '2nd-est (N_ "2nd Est Tax Quarter") (N_ "Apr 1 - May 31."))
+          (vector '2nd-est (N_ "2nd Est Tax Quarter (Apr 1 - May 31)"))
-          (vector '3rd-est (N_ "3rd Est Tax Quarter") (N_ "Jun 1 - Aug 31."))
+          (vector '3rd-est (N_ "3rd Est Tax Quarter (Jun 1 - Aug 31)"))
-          (vector '4th-est (N_ "4th Est Tax Quarter") (N_ "Sep 1 - Dec 31."))
+          (vector '4th-est (N_ "4th Est Tax Quarter (Sep 1 - Dec 31)"))
-          (vector 'last-year (N_ "Last Year") (N_ "Last Year."))
+          (vector 'last-year (N_ "Last Year"))
-          (vector '1st-last
+          (vector '1st-last (N_ "Last Yr 1st Est Tax Qtr (Jan 1 - Mar 31)"))
-                  (N_ "Last Yr 1st Est Tax Qtr")
+          (vector '2nd-last (N_ "Last Yr 2nd Est Tax Qtr (Apr 1 - May 31)"))
-                  (N_ "Jan 1 - Mar 31, Last year."))
+          (vector '3rd-last (N_ "Last Yr 3rd Est Tax Qtr (Jun 1 - Aug 31)"))
-          (vector '2nd-last
+          (vector '4th-last (N_ "Last Yr 4th Est Tax Qtr (Sep 1 - Dec 31)")))))
-                  (N_ "Last Yr 2nd Est Tax Qtr")
-                  (N_ "Apr 1 - May 31, Last year."))
-          (vector '3rd-last
-                  (N_ "Last Yr 3rd Est Tax Qtr")
-                  (N_ "Jun 1 - Aug 31, Last year."))
-          (vector '4th-last
-                  (N_ "Last Yr 4th Est Tax Qtr")
-                  (N_ "Sep 1 - Dec 31, Last year.")))))
 
   (gnc:register-tax-option
    (gnc:make-account-list-option

gnucash/report/reports/locale-specific/us/taxtxf.scm

@@ -181,30 +181,22 @@
     gnc:pagename-general (N_ "Alternate Period")
     "c" (N_ "Override or modify From: & To:.")
     (if after-tax-day 'from-to 'last-year)
-    (list (vector 'from-to (N_ "Use From - To") (N_ "Use From - To period."))
+    (list (vector 'from-to (N_ "Use From - To"))
-          (vector '1st-est (N_ "1st Est Tax Quarter") (N_ "Jan 1 - Mar 31."))
+          (vector '1st-est (N_ "1st Est Tax Quarter (Jan 1 - Mar 31)"))
-          (vector '2nd-est (N_ "2nd Est Tax Quarter") (N_ "Apr 1 - May 31."))
+          (vector '2nd-est (N_ "2nd Est Tax Quarter (Apr 1 - May 31)"))
           ;; Translators: The US tax quarters are different from
           ;; actual year's quarters! See the definition of
           ;; tax-qtr-real-qtr-year variable above.
-          (vector '3rd-est (N_ "3rd Est Tax Quarter") (N_ "Jun 1 - Aug 31."))
+          (vector '3rd-est (N_ "3rd Est Tax Quarter (Jun 1 - Aug 31)"))
-          (vector '4th-est (N_ "4th Est Tax Quarter") (N_ "Sep 1 - Dec 31."))
+          (vector '4th-est (N_ "4th Est Tax Quarter (Sep 1 - Dec 31)"))
-          (vector 'last-year (N_ "Last Year") (N_ "Last Year."))
+          (vector 'last-year (N_ "Last Year"))
-          (vector '1st-last
+          (vector '1st-last (N_ "Last Yr 1st Est Tax Qtr (Jan 1 - Mar 31)"))
-                  (N_ "Last Yr 1st Est Tax Qtr")
+          (vector '2nd-last (N_ "Last Yr 2nd Est Tax Qtr (Apr 1 - May 31)"))
-                  (N_ "Jan 1 - Mar 31, Last year."))
+          ;; Translators: The US tax quarters are different from
-          (vector '2nd-last
+          ;; actual year's quarters! See the definition of
-                  (N_ "Last Yr 2nd Est Tax Qtr")
+          ;; tax-qtr-real-qtr-year variable above.
-                  (N_ "Apr 1 - May 31, Last year."))
+          (vector '3rd-last (N_ "Last Yr 3rd Est Tax Qtr (Jun 1 - Aug 31)"))
-          (vector '3rd-last
+          (vector '4th-last (N_ "Last Yr 4th Est Tax Qtr (Sep 1 - Dec 31)")))))
-                  (N_ "Last Yr 3rd Est Tax Qtr")
-                  ;; Translators: The US tax quarters are different from
-                  ;; actual year's quarters! See the definition of
-                  ;; tax-qtr-real-qtr-year variable above.
-                  (N_ "Jun 1 - Aug 31, Last year."))
-          (vector '4th-last
-                  (N_ "Last Yr 4th Est Tax Qtr")
-                  (N_ "Sep 1 - Dec 31, Last year.")))))
 
   (gnc:register-tax-option
    (gnc:make-account-list-option
@@ -259,9 +251,9 @@
     "m" (N_ "Select date to use for PriceDB lookups.")
     'conv-to-tran-date
     (list (list->vector
-           (list 'conv-to-tran-date (N_ "Nearest transaction date") (N_ "Use nearest to transaction date.")))
+           (list 'conv-to-tran-date (N_ "Nearest to transaction date")))
           (list->vector
-           (list 'conv-to-report-date (N_ "Nearest report date") (N_ "Use nearest to report date.")))
+           (list 'conv-to-report-date (N_ "Nearest to report date")))
     )))
 
   #t

gnucash/report/reports/standard/account-piecharts.scm

@@ -68,7 +68,7 @@ balance at a given time"))
 (define optname-price-source (N_ "Price Source"))
 
 (define optname-accounts (N_ "Accounts"))
-(define optname-levels (N_ "Show Accounts until level"))
+(define optname-levels (N_ "Levels of Subaccounts"))
 
 (define optname-fullname (N_ "Show long names"))
 (define optname-show-total (N_ "Show Totals"))
@@ -114,21 +114,10 @@ balance at a given time"))
           gnc:pagename-general optname-averaging
           "f" opthelp-averaging
           'None
-          (list (vector 'None
+          (list (vector 'None (N_ "No Averaging"))
-                        (N_ "No Averaging")
+                (vector 'YearDelta (N_ "Yearly"))
-                        (N_ "Just show the amounts, without any averaging."))
+                (vector 'MonthDelta (N_ "Monthly"))
-                (vector 'YearDelta
+                (vector 'WeekDelta (N_ "Weekly"))))))
-                        (N_ "Yearly")
-                        (N_ "Show the average yearly amount during the reporting period."))
-                (vector 'MonthDelta
-                        (N_ "Monthly")
-                        (N_ "Show the average monthly amount during the reporting period."))
-                (vector 'WeekDelta
-                        (N_ "Weekly")
-                        (N_ "Show the average weekly amount during the reporting period."))
-                )
-          ))
-        )
 
     (add-option
      (gnc:make-account-list-option
@@ -149,7 +138,7 @@ balance at a given time"))
     (if depth-based?
       (gnc:options-add-account-levels!
        options gnc:pagename-accounts optname-levels "b"
-       (N_ "Show accounts to this depth and not further.")
+       (N_ "Maximum number of levels in the account tree displayed.")
        2))
 
     (add-option

gnucash/report/reports/standard/account-summary.scm

@@ -90,8 +90,13 @@
   (N_ "Maximum number of levels in the account tree displayed."))
 (define optname-bottom-behavior (N_ "Depth limit behavior"))
 (define opthelp-bottom-behavior
-  (N_ "How to treat accounts which exceed the specified depth limit (if any)."))
+    (string-join
-
+     (list
+      (G_ "How to treat accounts which exceed the specified depth limit (if any).")
+      (G_ "Show the total balance, including balances in subaccounts, of any account at the depth limit.")
+      (G_ "Raise accounts deeper than the depth limit to the depth limit.")
+      (G_ "Omit any accounts deeper than the depth limit."))
+      "\n* "))
 (define optname-parent-balance-mode (N_ "Parent account balances"))
 (define optname-parent-total-mode (N_ "Parent account subtotals"))
 
@@ -186,15 +191,9 @@
       gnc:pagename-accounts optname-bottom-behavior
       "c" opthelp-bottom-behavior 'summarize
       (list
-       (vector 'summarize
+       (vector 'summarize (N_ "Recursive Balance"))
-               (N_ "Recursive Balance")
+       (vector 'flatten (N_ "Raise Accounts"))
-               (N_ "Show the total balance, including balances in subaccounts, of any account at the depth limit."))
+       (vector 'truncate (N_ "Omit Accounts")))))
-       (vector 'flatten
-               (N_ "Raise Accounts")
-               (N_ "Shows accounts deeper than the depth limit at the depth limit."))
-       (vector 'truncate
-               (N_ "Omit Accounts")
-               (N_ "Disregard completely any accounts deeper than the depth limit.")))))
 
     ;; all about currencies
     (gnc:options-add-currency!

gnucash/report/reports/standard/advanced-portfolio.scm

@@ -79,28 +79,16 @@ by preventing negative stock balances.<br/>")
      (gnc:make-multichoice-option
       gnc:pagename-general optname-price-source
       "d" (N_ "The source of price information.") 'pricedb-nearest
-      (list (vector 'pricedb-latest
+      (list (vector 'pricedb-latest (N_ "Most recent"))
-		    (N_ "Most recent")
+            (vector 'pricedb-nearest (N_ "Nearest to report date")))))
-		    (N_ "The most recent recorded price."))
-	    (vector 'pricedb-nearest
-		    (N_ "Nearest in time")
-		    (N_ "The price recorded nearest in time to the report date."))
-	    )))
 
     (add-option
      (gnc:make-multichoice-option
       gnc:pagename-general optname-basis-method
       "e" (N_ "Basis calculation method.") 'average-basis
-      (list (vector 'average-basis
+      (list (vector 'average-basis (N_ "Average cost of all shares"))
-		    (N_ "Average")
+            (vector 'fifo-basis (N_ "First-in first-out"))
-		    (N_ "Use average cost of all shares for basis."))
+            (vector 'filo-basis (N_ "Last-in first-out")))))
-	    (vector 'fifo-basis
-		    (N_ "FIFO")
-		    (N_ "Use first-in first-out method for basis."))
-	    (vector 'filo-basis
-		    (N_ "LIFO")
-		    (N_ "Use last-in first-out method for basis."))
-	    )))
 
     (add-option
      (gnc:make-simple-boolean-option
@@ -112,16 +100,9 @@ by preventing negative stock balances.<br/>")
      (gnc:make-multichoice-option
       gnc:pagename-general optname-brokerage-fees
       "g" (N_ "How to report commissions and other brokerage fees.") 'include-in-basis
-      (list (vector 'include-in-basis
+      (list (vector 'include-in-basis (N_ "Include in basis"))
-                    (N_ "Include in basis")
+            (vector 'include-in-gain (N_ "Include in gain/loss"))
-                    (N_ "Include brokerage fees in the basis for the asset."))
+            (vector 'ignore-brokerage (N_ "Omit from report")))))
-            (vector 'include-in-gain
-                    (N_ "Include in gain")
-                    (N_  "Include brokerage fees in the gain and loss but not in the basis."))
-            (vector 'ignore-brokerage
-                    (N_ "Ignore")
-                    (N_ "Ignore brokerage fees entirely."))
-            )))
 
     (gnc:register-option
       options

gnucash/report/reports/standard/balsheet-eg.scm

@@ -141,9 +141,9 @@
 (define opthelp-report-title (N_ "Title for this report."))
 
 (define optname-date    (N_ "Balance Sheet Date"))
-(define optname-columns (N_ "1- or 2-column report"))
+(define optname-columns (N_ "Report format"))
 (define opthelp-columns
-  (N_ "The balance sheet can be displayed with either 1 or 2 columns. 'auto' means that the layout will be adjusted to fit the width of the page."))
+  (N_ "The balance sheet can be displayed with either 1 or 2 columns."))
 
 (define optname-depth-limit (N_ "Levels of Subaccounts"))
 (define opthelp-depth-limit (N_ "Maximum number of levels in the account tree displayed."))
@@ -215,24 +215,15 @@
     (add-option (gnc:make-multichoice-option
                   display-page optname-columns
                   "a" opthelp-columns 'onecol
-                  (list (vector 'autocols
+                  (list (vector 'autocols (N_ "Adjust the layout to fit the width of the screen or page"))
-                                (N_ "Auto")
+                        (vector 'onecol (N_ "Display liabilities and equity below assets"))
-                                (N_ "Adjust the layout to fit the width of the screen or page."))
+                        (vector 'twocols (N_ "Display assets on the left, liabilities and equity on the right")))))
-                        (vector 'onecol
-                                (N_ "One")
-                                (N_ "Display liabilities and equity below assets."))
-                        (vector 'twocols
-                                (N_ "Two")
-                                (N_ "Display assets on the left, liabilities and equity on the right.")))))
     (add-option (gnc:make-multichoice-option
                   display-page optname-neg-format
                   "b" opthelp-neg-format 'negsign
-                  (list (vector 'negsign
+                  (list (vector 'negsign (N_ "Sign: -$10.00"))
-                                (N_ "Sign")
+                        (vector 'negbrackets (N_ "Brackets: ($10.00)")))))
-                                (N_ "Prefix negative amounts with a minus sign, e.g. -$10.00."))
+
-                        (vector 'negbrackets
-                                (N_ "Brackets")
-                                (N_ "Surround negative amounts with brackets, e.g. ($100.00).")))))
     (add-option (gnc:make-string-option display-page optname-font-family "c"
                                         opthelp-font-family "sans"))
     (add-option (gnc:make-string-option display-page optname-font-size "d"

gnucash/report/reports/standard/balsheet-pnl.scm

@@ -243,12 +243,8 @@ also show overall period profit & loss."))
       gnc:pagename-general optname-options-summary
       "d" opthelp-options-summary
       'never
-      (list (vector 'always
+      (list (vector 'always (G_ "Always"))
-                    (G_ "Always")
+            (vector 'never (G_ "Never")))))
-                    (G_ "Always display summary."))
-            (vector 'never
-                    (G_ "Never")
-                    (G_ "Disable report summary.")))))
 
     ;; accounts to work on
     (add-option

gnucash/report/reports/standard/budget-barchart.scm

@@ -151,14 +151,10 @@
     (add-option
      (gnc:make-multichoice-option
       gnc:pagename-display optname-chart-type "b"
-      (N_ "This is a multi choice option.") 'bars
+      (N_ "Select which chart type to use.") 'bars
       (list
-       (vector 'bars
+       (vector 'bars (N_ "Bar Chart"))
-               (N_ "Barchart")
+       (vector 'lines (N_ "Line Chart")))))
-               (N_ "Show the report as a bar chart."))
-       (vector 'lines
-               (N_ "Linechart")
-               (N_ "Show the report as a line chart.")))))
 
     (gnc:options-add-plot-size!
      options gnc:pagename-display

gnucash/report/reports/standard/category-barchart.scm

@@ -73,7 +73,7 @@ developing over time"))
 (define optname-price-source (N_ "Price Source"))
 
 (define optname-accounts (N_ "Accounts"))
-(define optname-levels (N_ "Show Accounts until level"))
+(define optname-levels (N_ "Levels of Subaccounts"))
 
 (define optname-fullname (N_ "Show long account names"))
 
@@ -116,18 +116,10 @@ developing over time"))
           gnc:pagename-general optname-averaging
           "e" opthelp-averaging
           'None
-          (list (vector 'None
+          (list (vector 'None (N_ "No Averaging"))
-                        (N_ "No Averaging")
+                (vector 'MonthDelta (N_ "Monthly"))
-                        (N_ "Just show the amounts, without any averaging."))
+                (vector 'WeekDelta (N_ "Weekly"))
-                (vector 'MonthDelta
+                (vector 'DayDelta (N_ "Daily"))))))
-                        (N_ "Monthly")
-                        (N_ "Show the average monthly amount during the reporting period."))
-                (vector 'WeekDelta
-                        (N_ "Weekly")
-                        (N_ "Show the average weekly amount during the reporting period."))
-                (vector 'DayDelta
-                        (N_ "Daily")
-                        (N_ "Show the average daily amount during the reporting period."))))))
 
 
     ;; Accounts tab
@@ -147,7 +139,7 @@ developing over time"))
 
     (gnc:options-add-account-levels!
      options gnc:pagename-accounts optname-levels "c"
-     (N_ "Show accounts to this depth and not further.")
+     (N_ "Maximum number of levels in the account tree displayed.")
      2)
 
     ;; Display tab
@@ -159,14 +151,10 @@ developing over time"))
     (add-option
      (gnc:make-multichoice-option
       gnc:pagename-display optname-chart-type
-      "b" "Select which chart type to use"
+      "b" "Select which chart type to use."
       'barchart
-      (list (vector 'barchart
+      (list (vector 'barchart (N_ "Bar Chart"))
-                    (N_ "Bar Chart")
+            (vector 'linechart (N_ "Line Chart")))))
-                    (N_ "Use bar charts."))
-            (vector 'linechart
-                    (N_ "Line Chart")
-                    (N_ "Use line charts.")))))
 
     (add-option
      (gnc:make-simple-boolean-option

gnucash/report/reports/standard/customer-summary.scm

@@ -67,8 +67,7 @@
 
 ;; The line break in the next expression will suppress above comments as translator comments.
 
-(define optname-show-zero-lines
+(define optname-show-zero-lines (N_ "Show Lines with All Zeros"))
-  (N_ "Show Lines with All Zeros"))
 (define opthelp-show-zero-lines (N_ "Show the table lines with customers which did not have any transactions in the reporting period, hence would show all zeros in the columns."))
 (define optname-show-inactive (N_ "Show Inactive Customers"))
 (define opthelp-show-inactive (N_ "Include customers that have been marked inactive."))
@@ -76,7 +75,7 @@
 (define optname-sortkey (N_ "Sort Column"))
 (define opthelp-sortkey (N_ "Choose the column by which the result table is sorted."))
 (define optname-sortascending (N_ "Sort Order"))
-(define opthelp-sortascending (N_ "Choose the ordering of the column sort: Either ascending or descending."))
+(define opthelp-sortascending (N_ "Choose the ordering of the column sort."))
 
 
 (define (options-generator)
@@ -114,22 +113,11 @@
     "a" opthelp-sortkey
     'customername
     (list
-     (vector 'customername
+     (vector 'customername (N_ "Customer Name"))
-             (N_ "Customer Name")
+     (vector 'profit (N_ "Profit"))
-             (N_ "Sort alphabetically by customer name."))
+     (vector 'markup (N_ "Markup (which is profit amount divided by sales)"))
-     (vector 'profit
+     (vector 'sales (N_ "Sales"))
-             (N_ "Profit")
+     (vector 'expense (N_ "Expense")))))
-             (N_ "Sort by profit amount."))
-     (vector 'markup
-             ;; Translators: "Markup" is profit amount divided by sales amount
-             (N_ "Markup")
-             (N_ "Sort by markup (which is profit amount divided by sales)."))
-     (vector 'sales
-             (N_ "Sales")
-             (N_ "Sort by sales amount."))
-     (vector 'expense
-             (N_ "Expense")
-             (N_ "Sort by expense amount.")))))
 
   (add-option
    (gnc:make-multichoice-option
@@ -137,12 +125,8 @@
     "b" opthelp-sortascending
     'ascend
     (list
-     (vector 'ascend
+     (vector 'ascend (N_ "Ascending"))
-             (N_ "Ascending")
+     (vector 'descend (N_ "Descending")))))
-             (N_ "A to Z, smallest to largest."))
-     (vector 'descend
-             (N_ "Descending")
-             (N_ "Z to A, largest to smallest.")))))
 
   (add-option
    (gnc:make-simple-boolean-option

gnucash/report/reports/standard/income-gst-statement.scm

@@ -155,20 +155,23 @@ 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" (G_ "Report Format") 'default
+    "a"
-    (list (vector 'default
+    (string-join
-                  (G_ "Default Format")
+     (list
-                  (G_ "Default Format"))
+      (G_ "Report Format")
-          (vector 'au-bas
+      (G_ "Default Format")
-                  (G_ "Australia BAS")
+      (G_ "Australia Business Activity Statement. Specify sales, \
-                  (G_ "Australia Business Activity Statement. Specify sales, \
+purchase and tax accounts.")
-purchase and tax accounts."))
+      (G_ "UK VAT Return. Specify sales, purchase and tax \
-          (vector 'uk-vat
-                  (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
+with *EUGOODS* in the account description."))
+     "\n* ")
+    'default
+    (list (vector 'default (G_ "Default Format"))
+          (vector 'au-bas (G_ "Australia BAS"))
+          (vector 'uk-vat (G_ "UK VAT Return")))
+     #f
     (lambda (x)
       (for-each
        (match-lambda
@@ -292,7 +295,7 @@ with *EUGOODS* in the account description."))) #f
     ;;         start-dual-column?   - unused in GST report
     ;;         friendly-heading-fn  - unused in GST report
 
-    (case (opt-val pagename-format "Report format")
+    (case (opt-val pagename-format "Report Format")
       ((default)
        (let* ((net-sales (lambda (s) (myneg (split-adder s accounts-sales))))
               (tax-sales (lambda (s) (myneg (split-adder s accounts-tax-collected))))

gnucash/report/reports/standard/invoice.scm

@@ -109,26 +109,14 @@
       (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 (G_ "Client or vendor name, address and ID"))))
-  (list (cons 'client (list (cons 'text (G_ "Their details"))
+        (cons 'company (list (cons 'text (G_ "Company name, address and tax-ID"))))
-                            (cons 'tip (G_ "Client or vendor name, address and ID"))))
+        (cons 'invoice (list (cons 'text (G_ "Invoice date, due date, billing ID, terms, job details"))))
+        (cons 'today (list (cons 'text (G_ "Today's date"))))
+        (cons 'picture (list (cons 'text (G_ "Picture"))))
 
-        ;; Translators: "Our details" refer to the book owner's details i.e. name/address/tax-ID
+        ;; Translators: "Empty space" refers to invoice header section being left blank
-        (cons 'company (list (cons 'text (G_ "Our details"))
+        (cons 'none (list (cons 'text (G_ "Empty space"))))))
-                             (cons 'tip (G_ "Company name, address and tax-ID"))))
-
-        (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 (G_ "Today's date"))
-                           (cons 'tip (G_ "Today's date"))))
-
-        (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 (G_ "(empty)"))
-                          (cons 'tip (G_ "Empty space"))))))
 
 (define variant-list
   (list
@@ -172,8 +160,7 @@
    (lambda (item)
      (vector
       (car item)
-      (keylist-get-info keylist (car item) 'text)
+      (keylist-get-info keylist (car item) 'text)))
-      (keylist-get-info keylist (car item) 'tip)))
    keylist))
 
 (define (multiline-to-html-text str)

gnucash/report/reports/standard/new-aging.scm

@@ -92,22 +92,16 @@ exist but have no suitable transactions."))
      (gnc:make-multichoice-option
       gnc:pagename-general optname-sort-by "i" (N_ "Sort companies by.") 'name
       (list
-       (vector 'name
+       (vector 'name (N_ "Name of the company"))
-               (N_ "Name")
+       (vector 'total (N_ "Total amount owed to/from Company"))
-               (N_ "Name of the company."))
+       (vector 'oldest-bracket (N_ "Bracket Total Owed")))))
-       (vector 'total
-               (N_ "Total Owed")
-               (N_ "Total amount owed to/from Company."))
-       (vector 'oldest-bracket
-               (N_ "Bracket Total Owed")
-               (N_ "Amount owed in oldest bracket - if same go to next oldest.")))))
 
     (add-option
      (gnc:make-multichoice-option
       gnc:pagename-general optname-sort-order "ia" (N_ "Sort order.") 'increasing
       (list
-       (vector 'increasing (N_ "Ascending") (N_ "Alphabetical order"))
+       (vector 'increasing (N_ "Ascending"))
-       (vector 'decreasing (N_ "Descending") (N_ "Reverse alphabetical order")))))
+       (vector 'decreasing (N_ "Descending")))))
 
     (add-option
      (gnc:make-simple-boolean-option
@@ -119,14 +113,8 @@ exist but have no suitable transactions."))
      (gnc:make-multichoice-option
       gnc:pagename-general optname-date-driver "k" (N_ "Leading date.") 'duedate
       (list
-       ;; Should be using standard label for due date?
+       (vector 'duedate (N_ "Due Date"))
-       (vector 'duedate
+       (vector 'postdate (N_ "Post Date")))))
-               (N_ "Due Date")
-               (N_ "Due date is leading."))
-       ;; Should be using standard label for post date?
-       (vector 'postdate
-               (N_ "Post Date")
-               (N_ "Post date is leading.")))))
 
     (gnc:options-set-default-section options "General")
 
@@ -413,12 +401,8 @@ exist but have no suitable transactions."))
      (gnc:make-multichoice-option
       gnc:pagename-display optname-addr-source "a" (N_ "Address source.") 'billing
       (list
-       (vector 'billing
+       (vector 'billing (N_ "Billing address"))
-               (N_ "Billing")
+       (vector 'shipping (N_ "Shipping address")))))
-               (N_ "Address fields from billing address."))
-       (vector 'shipping
-               (N_ "Shipping")
-               (N_ "Address fields from shipping address.")))))
     options))
 
 (define (payables-renderer report-obj)

gnucash/report/reports/standard/new-owner-report.scm

@@ -944,17 +944,18 @@
   (gnc:register-inv-option
    (gnc:make-multichoice-option
     (N_ "Display Columns") linked-txns-header
-    "hc" (N_ "Show linked transactions") 'none
+    "hc"
-    (list (vector 'none
+    (string-join
-                  (N_ "Disabled")
+     (list
-                  (N_ "Linked transactions are hidden."))
+      (G_ "Show linked transactions")
-          (vector 'simple
+      (G_ "Linked transactions are hidden.")
-                  (N_ "Simple")
+      (G_ "Invoices show if paid, payments show invoice numbers.")
-                  (N_ "Invoices show if paid, payments show invoice numbers."))
+      (G_ "Invoices show list of payments, payments show list of invoices and amounts."))
-          (vector 'detailed
+      "\n* ")
-                  (N_ "Detailed")
+    'none
-                  (N_ "Invoices show list of payments, payments show list of \
+    (list (vector 'none (N_ "Disabled"))
-invoices and amounts.")))))
+          (vector 'simple (N_ "Simple"))
+          (vector 'detailed (N_ "Detailed")))))
 
   (gnc:register-inv-option
    (gnc:make-simple-boolean-option
@@ -966,14 +967,8 @@ invoices and amounts.")))))
     gnc:pagename-general optname-date-driver "k"
     (N_ "Leading date.") 'duedate
     (list
-     ;; Should be using standard label for due date?
+     (vector 'duedate (N_ "Due Date"))
-     (vector 'duedate
+     (vector 'postdate (N_ "Post Date")))))
-             (N_ "Due Date")
-             (N_ "Due date is leading."))
-     ;; Should be using standard label for post date?
-     (vector 'postdate
-             (N_ "Post Date")
-             (N_ "Post date is leading.")))))
 
   (gnc:options-set-default-section gnc:*report-options* "General")
 

gnucash/report/reports/standard/owner-report.scm

@@ -609,8 +609,8 @@
     (N_ "Leading date.") 
     'duedate 
     (list 
-     (vector 'duedate (N_ "Due Date") (N_ "Due date is leading.")) ;; Should be using standard label for due date? 
+     (vector 'duedate (N_ "Due Date"))
-     (vector 'postdate (N_ "Post Date") (N_ "Post date is leading."))))) ;; Should be using standard label for post date? 
+     (vector 'postdate (N_ "Post Date")))))
 
   (gnc:options-set-default-section gnc:*report-options* "General")
 

gnucash/report/reports/standard/price-scatter.scm

@@ -77,16 +77,9 @@
       pagename-price optname-price-source
       "f" (N_ "The source of price information.") 
       'actual-transactions
-      (list (vector 'weighted-average 
+      (list (vector 'weighted-average (N_ "Weighted Average"))
-                    (N_ "Weighted Average")
+            (vector 'actual-transactions (N_ "Actual Transactions"))
-                    (N_ "The weighted average of all currency transactions of the past."))
+            (vector 'pricedb (N_ "Price Database")))))
-            (vector 'actual-transactions
-                    (N_ "Actual Transactions")
-                    (N_ "The instantaneous price of actual currency transactions in the past."))
-            (vector 'pricedb
-                    (N_ "Price Database")
-                    (N_ "The recorded prices."))
-            )))
 
     (add-option
      (gnc:make-simple-boolean-option

gnucash/report/reports/standard/receivables.scm

@@ -65,8 +65,8 @@
         (N_ "Address source.")
         'billing
         (list
-         (vector 'billing (N_ "Billing") (N_ "Address fields from billing address."))
+         (vector 'billing (N_ "Billing address"))
-         (vector 'shipping (N_ "Shipping") (N_ "Address fields from shipping address.")))))
+         (vector 'shipping (N_ "Shipping address")))))
 
     (aging-options-generator options)))
 

gnucash/report/reports/standard/register.scm

@@ -399,8 +399,8 @@
     "ia" (N_ "Display the amount?")
     'double
     (list
-     (vector 'single (N_ "Single") (N_ "Single Column Display."))
+     (vector 'single (N_ "Single Column"))
-     (vector 'double (N_ "Double") (N_ "Two Column Display.")))))
+     (vector 'double (N_ "Two Columns")))))
 
   (gnc:register-reg-option
    (gnc:make-simple-boolean-option

gnucash/report/reports/standard/test/test-income-gst.scm

@@ -318,21 +318,21 @@
                  (cons   60 (get-acct "Purchases VAT"))))
 
     (let ((options (default-testing-options)))
-      (set-option! options "Format" "Report format" 'default)
+      (set-option! options "Format" "Report Format" 'default)
       (let ((sxml (options->sxml options "ukvat-default-format")))
         (test-equal "ukvat-default-format"
           '("Grand Total" "$1,735.00" "$1,475.00" "$260.00"
             "$654.00" "$545.00" "$109.00")
           (sxml->table-row-col sxml 1 -1 #f)))
 
-      (set-option! options "Format" "Report format" 'uk-vat)
+      (set-option! options "Format" "Report Format" 'uk-vat)
       (let ((sxml (options->sxml options "ukvat-return-format")))
         (test-equal "ukvat-return-format"
           '("Grand Total" "$220.00" "$40.00" "$260.00" "$109.00"
             "$151.00" "$1,475.00" "$545.00" "$100.00" "$200.00")
           (sxml->table-row-col sxml 1 -1 #f)))
 
-      (set-option! options "Format" "Report format" 'au-bas)
+      (set-option! options "Format" "Report Format" 'au-bas)
       (let ((sxml (options->sxml options "aubas-return-format")))
         (test-equal "aubas-return-format"
           '("Grand Total" "$1,735.00" "$260.00" "$109.00")

gnucash/report/reports/standard/test/test-standard-category-report.scm

@@ -97,7 +97,7 @@
     (set-option income-options gnc:pagename-general "Price Source" 'pricedb-nearest)
     (set-option income-options gnc:pagename-general "Report's currency"  (gnc-default-report-currency))
     (set-option income-options gnc:pagename-accounts "Accounts" (list my-income-account))
-    (set-option income-options gnc:pagename-accounts "Show Accounts until level"  'all)
+    (set-option income-options gnc:pagename-accounts "Levels of Subaccounts"  'all)
 
     (let ((sxml (gnc:options->sxml uuid income-options "test-standard-category-report"
                                    "single-txn-test" #:strip-tag "script")))
@@ -140,7 +140,7 @@
     (set-option income-options gnc:pagename-general "Price Source" 'pricedb-nearest)
     (set-option income-options gnc:pagename-general "Report's currency"  (gnc-default-report-currency))
     (set-option income-options gnc:pagename-accounts "Accounts" (list my-income-account))
-    (set-option income-options gnc:pagename-accounts "Show Accounts until level"  'all)
+    (set-option income-options gnc:pagename-accounts "Levels of Subaccounts"  'all)
 
     (test-begin "multiplier test")
     (set-option income-options gnc:pagename-general "Show Average" 'WeekDelta)
@@ -230,7 +230,7 @@
     (set-option expense-options gnc:pagename-general "Price Source" 'pricedb-nearest)
     (set-option expense-options gnc:pagename-general "Report's currency"  (gnc-default-report-currency))
     (set-option expense-options gnc:pagename-accounts "Accounts" leaf-expense-accounts)
-    (set-option expense-options gnc:pagename-accounts "Show Accounts until level" 2)
+    (set-option expense-options gnc:pagename-accounts "Levels of Subaccounts" 2)
     (let ((sxml (gnc:options->sxml expense-report-uuid expense-options "test-standard-category-report"
                                    "multi--test" #:strip-tag "script")))
       (test-begin "multi-acct-test")
@@ -267,7 +267,7 @@
       (set-option asset-options gnc:pagename-general "Price Source" 'pricedb-nearest)
       (set-option asset-options gnc:pagename-general "Report's currency"  (gnc-default-report-currency))
       (set-option asset-options gnc:pagename-accounts "Accounts" (list my-asset-account))
-      (set-option asset-options gnc:pagename-accounts "Show Accounts until level"  'all)
+      (set-option asset-options gnc:pagename-accounts "Levels of Subaccounts"  'all)
       (let ((sxml (gnc:options->sxml uuid asset-options "test-standard-category-report"
                                      "asset-test" #:strip-tag "script")))
         (test-begin "asset-renderer")
@@ -309,7 +309,7 @@
     (set-option liability-options gnc:pagename-general "Price Source" 'pricedb-nearest)
     (set-option liability-options gnc:pagename-general "Report's currency"  (gnc-default-report-currency))
     (set-option liability-options gnc:pagename-accounts "Accounts" (list liabil-acc))
-    (set-option liability-options gnc:pagename-accounts "Show Accounts until level"  'all)
+    (set-option liability-options gnc:pagename-accounts "Levels of Subaccounts"  'all)
 
     (let ((sxml (gnc:options->sxml uuid liability-options "test-standard-category-report"
                                    "liability-test" #:strip-tag "script")))

gnucash/report/reports/standard/trial-balance.scm

@@ -200,15 +200,9 @@
       gnc:pagename-general optname-report-variant
       "d" opthelp-report-variant
       'current
-      (list (vector 'current
+      (list (vector 'current (N_ "General journal exact balances"))
-                    (N_ "Current Trial Balance")
+            (vector 'pre-adj (N_ "No adjusting/closing entries"))
-                    (N_ "Uses the exact balances in the general journal"))
+            (vector 'work-sheet (N_ "Full end-of-period work sheet")))))
-            (vector 'pre-adj
-                    (N_ "Pre-adjustment Trial Balance")
-                    (N_ "Ignores Adjusting/Closing entries"))
-            (vector 'work-sheet
-                    (N_ "Work Sheet")
-                    (N_ "Creates a complete end-of-period work sheet")))))
 
     ;; accounts to work on
     (add-option

gnucash/report/stylesheets/footer.scm

@@ -102,15 +102,9 @@
       (N_ "Images")
       (N_ "Heading Alignment") "c" (N_ "Banner for top of report.")
       'left
-      (list (vector 'left
+      (list (vector 'left (N_ "Left"))
-                    (N_ "Left")
+            (vector 'center (N_ "Center"))
-                    (N_ "Align the banner to the left."))
+            (vector 'right (N_ "Right")))))
-            (vector 'center
-                    (N_ "Center")
-                    (N_ "Align the banner in the center."))
-            (vector 'right
-                    (N_ "Right")
-                    (N_ "Align the banner to the right.")))))
 
     (opt-register
      (gnc:make-pixmap-option

gnucash/report/stylesheets/head-or-tail.scm

@@ -149,16 +149,9 @@
       (N_ "Images")
       (N_ "Heading Alignment") "c" (N_ "Banner for top of report.")
       'left
-      (list (vector 'left
+      (list (vector 'left (N_ "Left"))
-                    (N_ "Left")
+            (vector 'center (N_ "Center"))
-                    (N_ "Align the banner to the left."))
+            (vector 'right (N_ "Right")))))
-            (vector 'center
-                    (N_ "Center")
-                    (N_ "Align the banner in the center."))
-            (vector 'right
-                    (N_ "Right")
-                    (N_ "Align the banner to the right."))
-            )))
     (opt-register
      (gnc:make-pixmap-option
       (N_ "Images")

gnucash/report/trep-engine.scm

@@ -155,7 +155,6 @@ in the Options panel."))
   ;;  'sortkey             - sort parameter sent via qof-query
   ;;  'split-sortvalue     - function retrieves number/string for comparing splits
   ;;  'text                - text displayed in Display tab
-  ;;  'tip                 - tooltip displayed in Display tab
   ;;  'renderer-fn         - helper function to select subtotal/subheading renderer
   ;;       behaviour varies according to sortkey.
   ;;       account-types converts split->account
@@ -167,28 +166,24 @@ in the Options panel."))
               (cons 'split-sortvalue
                     (compose gnc-account-get-full-name xaccSplitGetAccount))
               (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 (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 (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 (G_ "Reconciled Date"))
-              (cons 'tip (G_ "Sort by the Reconciled Date."))
               (cons 'renderer-fn #f))
 
         (list 'reconciled-status
@@ -197,7 +192,6 @@ in the Options panel."))
                                        (length (memv (xaccSplitGetReconcile s)
                                                      (map car reconcile-list)))))
               (cons 'text (G_ "Reconciled Status"))
-              (cons 'tip (G_ "Sort by the Reconciled Status"))
               (cons 'renderer-fn (lambda (s)
                                    (assv-ref reconcile-list
                                              (xaccSplitGetReconcile s)))))
@@ -206,28 +200,24 @@ in the Options panel."))
               (cons 'sortkey (list QUERY-DEFAULT-SORT))
               (cons 'split-sortvalue #f)
               (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 (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 (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 (G_ "Amount"))
-              (cons 'tip (G_ "Sort by amount."))
               (cons 'renderer-fn #f))
 
         (list 'description
@@ -235,7 +225,6 @@ in the Options panel."))
               (cons 'split-sortvalue (compose xaccTransGetDescription
                                               xaccSplitGetParent))
               (cons 'text (G_ "Description"))
-              (cons 'tip (G_ "Sort by description."))
               (cons 'renderer-fn (compose xaccTransGetDescription xaccSplitGetParent)))
 
         (if split-action?
@@ -243,42 +232,36 @@ in the Options panel."))
                   (cons 'sortkey (list SPLIT-ACTION))
                   (cons 'split-sortvalue xaccSplitGetAction)
                   (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 (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 (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 (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 (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 (G_ "None"))
-              (cons 'tip (G_ "Do not sort."))
               (cons 'renderer-fn #f))))
 
 (define (time64-year t64)
@@ -302,7 +285,6 @@ in the Options panel."))
   ;; Defines the different date sorting keys, as an association-list. Each entry:
   ;;  'split-sortvalue     - func retrieves number/string used for comparing splits
   ;;  'text                - text displayed in Display tab
-  ;;  'tip                 - tooltip displayed in Display tab
   ;;  'renderer-fn         - func retrieves string for subtotal/subheading renderer
   ;;         #f means the date sortkey is not grouped
   ;;         otherwise it converts split->string
@@ -311,21 +293,18 @@ in the Options panel."))
          (cons 'split-sortvalue #f)
          (cons 'date-sortvalue #f)
          (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 (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 (G_ "Weekly"))
-         (cons 'tip (G_ "Weekly."))
          (cons 'renderer-fn (compose gnc:date-get-week-year-string
                                      gnc-localtime
                                      split->time64)))
@@ -334,7 +313,6 @@ in the Options panel."))
          (cons 'split-sortvalue (lambda (s) (time64-month (split->time64 s))))
          (cons 'date-sortvalue time64-month)
          (cons 'text (G_ "Monthly"))
-         (cons 'tip (G_ "Monthly."))
          (cons 'renderer-fn (compose gnc:date-get-month-year-string
                                      gnc-localtime
                                      split->time64)))
@@ -343,7 +321,6 @@ in the Options panel."))
          (cons 'split-sortvalue (lambda (s) (time64-quarter (split->time64 s))))
          (cons 'date-sortvalue time64-quarter)
          (cons 'text (G_ "Quarterly"))
-         (cons 'tip (G_ "Quarterly."))
          (cons 'renderer-fn (compose gnc:date-get-quarter-year-string
                                      gnc-localtime
                                      split->time64)))
@@ -352,7 +329,6 @@ in the Options panel."))
          (cons 'split-sortvalue (lambda (s) (time64-year (split->time64 s))))
          (cons 'date-sortvalue time64-year)
          (cons 'text (G_ "Yearly"))
-         (cons 'tip (G_ "Yearly."))
          (cons 'renderer-fn (compose gnc:date-get-year-string
                                      gnc-localtime
                                      split->time64)))))
@@ -360,49 +336,40 @@ in the Options panel."))
 (define filter-list
   (list
    (list 'none
-         (cons 'text (G_ "None"))
+         (cons 'text (G_ "Do not do any filtering")))
-         (cons 'tip (G_ "Do not do any filtering.")))
 
    (list 'include
-         (cons 'text (G_ "Include Transactions to/from Filter Accounts"))
+         (cons 'text (G_ "Include Transactions to/from Filter Accounts")))
-         (cons 'tip (G_ "Include transactions to/from filter accounts only.")))
 
    (list 'exclude
-         (cons 'text (G_ "Exclude Transactions to/from 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 'how (logand CLEARED-ALL (lognot CLEARED-VOIDED)))
-         (cons 'text (G_ "Non-void only"))
+         (cons 'text (G_ "Non-void only")))
-         (cons 'tip (G_ "Show only non-voided transactions.")))
 
    (list 'void-only
          (cons 'how CLEARED-VOIDED)
-         (cons 'text (G_ "Void only"))
+         (cons 'text (G_ "Void only")))
-         (cons 'tip (G_ "Show only voided transactions.")))
 
    (list 'both
          (cons 'how CLEARED-ALL)
-         (cons 'text (G_ "Both"))
+         (cons 'text (G_ "Both (and include void transactions in totals)")))))
-         (cons 'tip (G_ "Show both (and include void transactions in totals).")))))
 
 (define show-closing-list
   (list
    (list 'exclude-closing
          (cons 'text (G_ "Exclude closing transactions"))
-         (cons 'tip (G_ "Exclude closing transactions from report."))
          (cons 'closing-match #f))
 
    (list 'include-both
          (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 (G_ "Show closing transactions only"))
-         (cons 'tip (G_ "Show only closing transactions."))
          (cons 'closing-match #t))))
 
 (define reconcile-status-list
@@ -412,53 +379,42 @@ in the Options panel."))
   ;;      (logior CLEARED-NO CLEARED-CLEARED) for unreconciled & cleared
   (list
    (list 'all
-         (cons 'text (G_ "All"))
+         (cons 'text (G_ "Show All Transactions"))
-         (cons 'tip (G_ "Show All Transactions"))
          (cons 'filter-types CLEARED-ALL))
 
    (list 'unreconciled
-         (cons 'text (G_ "Unreconciled"))
+         (cons 'text (G_ "Unreconciled only"))
-         (cons 'tip (G_ "Unreconciled only"))
          (cons 'filter-types CLEARED-NO))
 
    (list 'cleared
-         (cons 'text (G_ "Cleared"))
+         (cons 'text (G_ "Cleared only"))
-         (cons 'tip (G_ "Cleared only"))
          (cons 'filter-types CLEARED-CLEARED))
 
    (list 'reconciled
-         (cons 'text (G_ "Reconciled"))
+         (cons 'text (G_ "Reconciled only"))
-         (cons 'tip (G_ "Reconciled only"))
          (cons 'filter-types CLEARED-RECONCILED))))
 
 
 (define ascending-list
   (list
    (list 'ascend
-         (cons 'text (G_ "Ascending"))
+         (cons 'text (G_ "Ascending")))
-         (cons 'tip (G_ "Smallest to largest, earliest to latest.")))
    (list 'descend
-         (cons 'text (G_ "Descending"))
+         (cons 'text (G_ "Descending")))))
-         (cons 'tip (G_ "Largest to smallest, latest to earliest.")))))
 
 (define sign-reverse-list
   (list
    (list 'global
          (cons 'text (G_ "Use Global Preference"))
-         (cons 'tip (G_ "Use reversing option specified in global preference."))
          (cons 'acct-types #f))
    (list 'none
-         (cons 'text (G_ "None"))
+         (cons 'text (G_ "Don't change any displayed amounts"))
-         (cons 'tip (G_ "Don't change any displayed amounts."))
          (cons 'acct-types '()))
    (list 'income-expense
          (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 (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
                                  ACCT-TYPE-INCOME)))))
@@ -471,8 +427,7 @@ Credit Card, and Income accounts."))
    (lambda (item)
      (vector
       (car item)
-      (keylist-get-info keylist (car item) 'text)
+      (keylist-get-info keylist (car item) 'text)))
-      (keylist-get-info keylist (car item) 'tip)))
    keylist))
 
 (define (SUBTOTAL-ENABLED? sortkey split-action?)
@@ -593,15 +548,9 @@ Credit Card, and Income accounts."))
     ;; This is an alist of conditions for displaying the infobox
     ;; 'no-match for empty-report
     ;; 'match for generated report
-    (list (vector 'no-match
+    (list (vector 'no-match (G_ "If no transactions matched"))
-                  (G_ "If no transactions matched")
+          (vector 'always (G_ "Always"))
-                  (G_ "Display summary if no transactions were matched."))
+          (vector 'never (G_ "Never")))))
-          (vector 'always
-                  (G_ "Always")
-                  (G_ "Always display summary."))
-          (vector 'never
-                  (G_ "Never")
-                  (G_ "Disable report summary.")))))
 
   ;; Filtering Options
 
@@ -1026,12 +975,8 @@ be excluded from periodic reporting.")
       gnc:pagename-display optname-detail-level
       "h" (G_ "Amount of detail to display per transaction.")
       disp-detail-level?
-      (list (vector 'multi-line
+      (list (vector 'multi-line (G_ "One split per line"))
-                    (G_ "Multi-Line")
+            (vector 'single (G_ "One transaction per line")))
-                    (G_ "Display all splits in a transaction on a separate line."))
-            (vector 'single
-                    (G_ "Single")
-                    (G_ "Display one line per transaction, merging multiple splits where required.")))
       #f
       (lambda (x)
         (set! disp-detail-level? x)
@@ -1043,9 +988,9 @@ be excluded from periodic reporting.")
       "m" (G_ "Display the amount?")
       amount-value
       (list
-       (vector 'none   (G_ "None") (G_ "No amount display."))
+       (vector 'none   (G_ "Hide"))
-       (vector 'single (G_ "Single") (G_ "Single Column Display."))
+       (vector 'single (G_ "Single Column"))
-       (vector 'double (G_ "Double") (G_ "Two Column Display.")))
+       (vector 'double (G_ "Two Columns")))
       #f
       (lambda (x)
         (set! amount-value x)