Christian Stimming's i18n patch updating de.po and fixing some

problems in reports.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3868 57a11ea4-9604-0410-9ed3-97b8803252fd

src/scm/html-style-sheet.scm

@@ -229,5 +229,5 @@
   (hash-ref *gnc:_style-sheets_* tname))
 
 (define (gnc:html-style-sheet-remove sheet)
-  (if (not (string=? (gnc:html-style-sheet-name sheet) (_ "Default")))
+  (if (not (string=? (gnc:html-style-sheet-name sheet) (N_ "Default")))
       (hash-remove! *gnc:_style-sheets_* (gnc:html-style-sheet-name sheet))))

src/scm/options-utilities.scm

@@ -35,7 +35,7 @@
     options  
     (gnc:make-date-option
      pagename optname 
-     sort-tag (_ "Select a date to report on")
+     sort-tag (N_ "Select a date to report on")
      (lambda ()
        (cons 'absolute 
 	     (gnc:timepair-end-day-time     
@@ -51,7 +51,7 @@
    (gnc:make-date-option
     pagename name-from 
     (string-append sort-tag "a")
-    (_ "Start of reporting period")
+    (N_ "Start of reporting period")
     (lambda ()
       (cons 'absolute 
             (gnc:get-start-cal-year)))
@@ -61,7 +61,7 @@
    (gnc:make-date-option
     pagename name-to
     (string-append sort-tag "b")
-    (_ "End of reporting period")
+    (N_ "End of reporting period")
     (lambda ()
       (cons 'absolute 
             (gnc:timepair-end-day-time     
@@ -76,12 +76,12 @@
    options
    (gnc:make-multichoice-option
     pagename optname
-    sort-tag (_ "The amount of time between data points") default
+    sort-tag (N_ "The amount of time between data points") default
-    (list (vector 'DayDelta (_ "Day") (_ "Day"))
+    (list (vector 'DayDelta (N_ "Day") (N_ "Day"))
-	  (vector 'WeekDelta (_ "Week") (_ "Week"))
+	  (vector 'WeekDelta (N_ "Week") (N_ "Week"))
-	  (vector 'TwoWeekDelta (_ "2Week") (_ "Two Week"))
+	  (vector 'TwoWeekDelta (N_ "2Week") (N_ "Two Week"))
-	  (vector 'MonthDelta (_ "Month") (_ "Month"))
+	  (vector 'MonthDelta (N_ "Month") (N_ "Month"))
-	  (vector 'YearDelta (_ "Year") (_ "Year"))
+	  (vector 'YearDelta (N_ "Year") (N_ "Year"))
 	  ))))
 
 ;; A multichoice option intended to chose the account level. Different
@@ -98,19 +98,19 @@
     help-string
     default-depth
     (list (list->vector
-	   (list 'all (_ "All") (_ "All accounts")))
+	   (list 'all (N_ "All") (N_ "All accounts")))
 	  (list->vector
-	   (list 1 "1" (_ "Top-level")))
+	   (list 1 "1" (N_ "Top-level")))
 	  (list->vector
-	   (list 2 "2" (_ "Second-level")))
+	   (list 2 "2" (N_ "Second-level")))
 	  (list->vector
-	   (list 3 "3" (_ "Third-level")))
+	   (list 3 "3" (N_ "Third-level")))
 	  (list->vector
-	   (list 4 "4" (_ "Fourth-level")))
+	   (list 4 "4" (N_ "Fourth-level")))
 	  (list->vector
-	   (list 5 "5" (_ "Fourth-level")))
+	   (list 5 "5" (N_ "Fourth-level")))
 	  (list->vector
-	   (list 6 "6" (_ "Sixth-level")))))))
+	   (list 6 "6" (N_ "Sixth-level")))))))
 
 ;; These help for selecting a bunch of accounts.
 (define (gnc:options-add-account-selection! 
@@ -120,7 +120,7 @@
   (gnc:options-add-account-levels!
    options pagename name-display-depth 
    (string-append sort-tag "a")
-   (_ "Show accounts to this depth, overriding any other option.") 
+   (N_ "Show accounts to this depth, overriding any other option.") 
    default-depth)
     
   (gnc:register-option 
@@ -128,7 +128,7 @@
    (gnc:make-simple-boolean-option
     pagename name-show-subaccounts
     (string-append sort-tag "b")
-    (_ "Override account-selection and show sub-accounts of all selected accounts?") 
+    (N_ "Override account-selection and show sub-accounts of all selected accounts?") 
     #t))
 
   ;; Semantics of the account selection, as used in the
@@ -141,7 +141,7 @@
    (gnc:make-account-list-option
     pagename name-accounts
     (string-append sort-tag "c")
-    (_ "Report on these accounts, if display depth allows.")
+    (N_ "Report on these accounts, if display depth allows.")
     default-accounts
     #f #t)))
 
@@ -153,7 +153,7 @@
     options  
     (gnc:make-simple-boolean-option
      pagename optname
-     sort-tag (_ "Include sub-account balances in printed balance?") #t)))
+     sort-tag (N_ "Include sub-account balances in printed balance?") #t)))
 
 ;; The single checkbox whether to group the accounts into main
 ;; categories and ahow a subtotal for those.
@@ -163,7 +163,7 @@
     options  
     (gnc:make-simple-boolean-option
      pagename optname
-     sort-tag (_ "Group the accounts in main categories?") default?)))
+     sort-tag (N_ "Group the accounts in main categories?") default?)))
 
 ;; To let the user select a currency for the report.
 (define (gnc:options-add-currency!
@@ -173,7 +173,7 @@
    (gnc:make-currency-option 
     pagename name-report-currency
     sort-tag 
-    (_ "Select the currency to display the values of this report in.")
+    (N_ "Select the currency to display the values of this report in.")
     (gnc:option-value
      (gnc:lookup-global-option "International"
                                "Default Currency")))))
@@ -188,7 +188,7 @@
    (gnc:make-simple-boolean-option
     pagename name-show-foreign
     (string-append sort-tag "a")
-    (_ "Display the account's foreign currency amount?") #f))
+    (N_ "Display the account's foreign currency amount?") #f))
 
   (gnc:options-add-currency! options pagename name-report-currency 
 			     (string-append sort-tag "b")))
@@ -202,7 +202,7 @@
    (gnc:make-number-range-option
     pagename name-width
     (string-append sort-tag "a")
-    (_ "Width of plot in pixels.") default-width
+    (N_ "Width of plot in pixels.") default-width
     100 1000 0 1))
 
   (gnc:register-option
@@ -210,6 +210,6 @@
    (gnc:make-number-range-option
     pagename name-height
     (string-append sort-tag "b")
-    (_ "Height of plot in pixels.") default-height
+    (N_ "Height of plot in pixels.") default-height
     100 1000 0 1)))
 

src/scm/report/category-barchart.scm

@@ -72,7 +72,7 @@
        (gnc:make-account-list-option
 	pagename-accounts optname-accounts
 	"a"
-	(N_ "Select accounts to calculate income on")
+	(N_ "Report on these accounts, if chosen account level allows.")
 	(lambda ()
 	  (gnc:filter-accountlist-type 
 	   (if is-income? '(income) '(expense))

src/scm/report/income-expense-graph.scm

@@ -18,7 +18,7 @@
       (pagename-display (N_ "Display"))
       (optname-inc-exp (N_ "Show Income/Expense"))
       (optname-show-profit (N_ "Show Net Profit"))
-      (optname-stacked (N_ "Stacked"))
+      (optname-stacked (N_ "Use Stacked Bars"))
       (optname-plot-width (N_ "Plot Width"))
       (optname-plot-height (N_ "Plot Height")))
 
@@ -41,7 +41,7 @@
        (gnc:make-account-list-option
 	pagename-general optname-accounts
 	"c"
-	(N_ "Select accounts to calculate income on")
+	(N_ "Report on these accounts, if chosen account level allows.")
 	(lambda ()
 	  (filter
 	   gnc:account-is-inc-exp?
@@ -67,7 +67,7 @@
       (add-option
        (gnc:make-simple-boolean-option
         pagename-display optname-stacked
-        "ba" (N_ "Show barchart as stacked?") #f))
+        "ba" (N_ "Show barchart as stacked barchart?") #f))
 
       (gnc:options-add-plot-size! 
        options pagename-display 
@@ -210,7 +210,7 @@
    ;; The name of this report. This will be used, among other things,
    ;; for making its menu item in the main menu. You need to use the
    ;; untranslated value here!
-   'name (N_ "Income/Expense Graph")
+   'name (N_ "Income/Expense Chart")
 
    ;; The options generator function defined above.
    'options-generator options-generator

src/scm/report/income-or-expense-pie.scm

@@ -15,7 +15,7 @@
       (optname-levels (N_ "Show Accounts until level"))
       (optname-report-currency (N_ "Report's currency"))
 
-      (pagename-display (N_ "Display Format"))
+      (pagename-display (N_ "Display"))
       (optname-fullname (N_ "Show long account names"))
       (optname-show-total (N_ "Show Totals"))
       (optname-slices (N_ "Maximum Slices"))
@@ -40,7 +40,7 @@
        (gnc:make-account-list-option
 	pagename-general optname-accounts
 	"b"
-	(N_ "Select accounts to calculate income on")
+	(N_ "Report on these accounts, if chosen account level allows.")
 	(lambda ()
 	  (gnc:filter-accountlist-type 
 	   (if is-income? '(income) '(expense))
@@ -57,15 +57,9 @@
        (N_ "Show accounts to this depth and not further") 
        2)
 
-      (add-option
+      (gnc:options-add-currency! 
-       (gnc:make-currency-option
+       options pagename-general optname-report-currency "d")
-	pagename-general optname-report-currency
+      
-	"d"
-	(N_ "Select the display value for the currency")
-	(gnc:option-value
-	 (gnc:lookup-global-option "International"
-				   "Default Currency"))))
-
       (add-option
        (gnc:make-simple-boolean-option
         pagename-display optname-fullname

src/scm/report/portfolio.scm

@@ -36,14 +36,9 @@
 	(lambda (accounts) (list  #t (filter gnc:account-is-stock? accounts)))
 	#t))
 
-      (add-option
+      (gnc:options-add-currency! 
-       (gnc:make-currency-option
+       options (N_ "General" "Report Currency") "c")
-	(N_ "General" "Report Currency")
+
-	"c"
-	(N_ "Select the displayed currency")
-	(gnc:option-value
-	 (gnc:lookup-global-option "International"
-				   "Default Currency"))))
 
       (gnc:options-set-default-section options "General")      
       options))