I18n string cleanup

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

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

@@ -142,7 +142,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-name
-      "b" opthelp-party-name (N_ "")))
+      "b" opthelp-party-name ""))
     ;; this should default to company name in (gnc:get-current-book)
     ;; does anyone know the function to get the company name??
 
@@ -467,10 +467,10 @@
 	  (gnc:html-table-append-row!
 	   build-table
 	   (append
-	    (if show-account-code? (list (N_ "Code")) '())
-	    (if show-account-type? (list (N_ "Type")) '())
-	    (if show-account-desc? (list (N_ "Description")) '())
-	    (list (N_ "Account title"))
+	    (if show-account-code? (list (_ "Code")) '())
+	    (if show-account-type? (list (_ "Type")) '())
+	    (if show-account-desc? (list (_ "Description")) '())
+	    (list (_ "Account title"))
 	    )
 	   )
 	  ;; add any fields to be displayed before the account name
@@ -486,7 +486,7 @@
 		)
 	  (if show-account-bals?
 	      (gnc:html-table-set-cell!
-	       build-table 0 (+ cur-col account-cols) (N_ "Balance"))
+	       build-table 0 (+ cur-col account-cols) (_ "Balance"))
 	      )
 	  (let ((row 0))
 	    (while (< row table-rows)
@@ -506,7 +506,7 @@
 	  (if show-account-notes?
 	      (begin
 		(gnc:html-table-set-cell!
-		 build-table 0 cur-col (N_ "Notes"))
+		 build-table 0 cur-col (_ "Notes"))
 		(add-col 'account-notes)
 		)
 	      )

src/report/standard-reports/balance-sheet.scm

@@ -83,9 +83,9 @@
 
 (define optname-date (N_ "Balance Sheet Date"))
 (define opthelp-date (N_ "Balance sheet as-of date"))
-(define optname-report-form (N_ "Report form Balance Sheet"))
+(define optname-report-form (N_ "Single column Balance Sheet"))
 (define opthelp-report-form
-  (N_ "Create report in report (as opposed to report) form"))
+  (N_ "Print liability/equity section in the same column under the assets section as opposed to a second column right of the assets section"))
 ;; FIXME this needs an indent option
 
 (define optname-accounts (N_ "Accounts to include"))
@@ -201,7 +201,7 @@
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-party-name
-      "b" opthelp-party-name (N_ "")))
+      "b" opthelp-party-name ""))
     ;; this should default to company name in (gnc:get-current-book)
     ;; does anyone know the function to get the company name??
     ;; (GnuCash is *so* well documented... sigh)
@@ -721,14 +721,14 @@
 	  (and (not (gnc:commodity-collector-allzero?
 		     retained-earnings))
 	       (add-subtotal-line right-table
-				  (N_ "Retained Earnings")
-				  (N_ "Retained Losses")
+				  (_ "Retained Earnings")
+				  (_ "Retained Losses")
 				  retained-earnings))
 	  (and (not (gnc:commodity-collector-allzero?
 		     unrealized-gain-collector))
 	       (add-subtotal-line right-table
-				  (N_ "Unrealized Gains")
-				  (N_ "Unrealized Losses")
+				  (_ "Unrealized Gains")
+				  (_ "Unrealized Losses")
 				  unrealized-gain-collector))
 	  (if total-equity?
 	      (add-subtotal-line

src/report/standard-reports/equity-statement.scm

@@ -155,7 +155,7 @@
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-party-name
-      "b" opthelp-party-name (N_ "")))
+      "b" opthelp-party-name ""))
     ;; this should default to company name in (gnc:get-current-book)
     ;; does anyone know the function to get the company name??
     ;; (GnuCash is *so* well documented... sigh)
@@ -319,7 +319,7 @@
     (gnc:html-document-set-title! 
      doc (sprintf #f
 		  (string-append "%s %s "
-				 (N_ "For Period Covering %s to %s"))
+				 (_ "For Period Covering %s to %s"))
 		  company-name report-title
                   (gnc:print-date start-date-printable)
                   (gnc:print-date end-date-tp)))
@@ -383,8 +383,8 @@
 		   account end-date-tp #f)))
 	       (terse-period? #t)
 	       (period-for (if terse-period?
-			       (string-append " " (N_ "for Period"))
-			       (sprintf #f (string-append ", " (N_ "%s to %s"))
+			       (string-append " " (_ "for Period"))
+			       (sprintf #f (string-append ", " (_ "%s to %s"))
 					(gnc:print-date start-date-printable)
 					(gnc:print-date end-date-tp))
 			       ))
@@ -628,28 +628,28 @@
 	  
 	  (report-line
 	   build-table
-	   (string-append (N_ "Capital") ", "
+	   (string-append (_ "Capital") ", "
 			  (gnc:print-date start-date-printable))
 	   #f start-total-equity
 	   1 start-exchange-fn #f "primary-subheading"
 	   )
 	  (report-line
 	   build-table 
-	   (string-append (N_ "Net income") period-for)
-	   (string-append (N_ "Net loss") period-for)
+	   (string-append (_ "Net income") period-for)
+	   (string-append (_ "Net loss") period-for)
 	   net-income
 	   0 end-exchange-fn #f #f
 	   )
 	  (report-line
 	   build-table 
-	   (string-append (N_ "Investments") period-for)
+	   (string-append (_ "Investments") period-for)
 	   #f
 	   investments
 	   0 end-exchange-fn #f #f
 	   )
 	  (report-line
 	   build-table 
-	   (string-append (N_ "Withdrawals") period-for)
+	   (string-append (_ "Withdrawals") period-for)
 	   #f
 	   withdrawals
 	   0 end-exchange-fn #f #f
@@ -657,22 +657,22 @@
 	  (or (gnc:commodity-collector-allzero? net-unrealized-gains)
 	      (report-line
 	       build-table 
-	       (N_ "Unrealized Gains")
-	       (N_ "Unrealized Losses")
+	       (_ "Unrealized Gains")
+	       (_ "Unrealized Losses")
 	       net-unrealized-gains
 	       0 end-exchange-fn #f #f
 	       )
 	   )
 	  (report-line
 	   build-table 
-	   (N_ "Increase in capital")
-	   (N_ "Decrease in capital")
+	   (_ "Increase in capital")
+	   (_ "Decrease in capital")
 	   capital-increase
 	   1 end-exchange-fn use-rules? #f
 	   )
 	  (report-line
 	   build-table 
-	   (string-append (N_ "Capital") ", "
+	   (string-append (_ "Capital") ", "
 			  (gnc:print-date end-date-tp))
 	   #f
 	   end-total-equity

src/report/standard-reports/general-journal.scm

@@ -35,7 +35,7 @@
 (gnc:module-load "gnucash/report/report-system" 0)
 
 (define reportname (N_ "General Journal"))
-(define regrptname "Register")
+(define regrptname (N_ "Register"))
 
 ;; report constructor
 
@@ -73,11 +73,11 @@
        (set-option! "__reg" (car l) (cadr l)))
      ;; One list per option here with: option-name, default-value
      (list
-      (list (N_ "query") (gnc:query->scm query)) ;; think this wants an scm...
-      (list (N_ "journal") #t)
-      (list (N_ "double") #t)
-      (list (N_ "debit-string") (N_ "Debit"))
-      (list (N_ "credit-string") (N_ "Credit"))
+      (list "query" (gnc:query->scm query)) ;; think this wants an scm...
+      (list "journal" #t)
+      (list "double" #t)
+      (list "debit-string" (N_ "Debit"))
+      (list "credit-string" (N_ "Credit"))
       )
      )
     ;; we'll leave query malloc'd in case this is required by the C side...

src/report/standard-reports/income-statement.scm

@@ -186,7 +186,7 @@
     (add-option
       (gnc:make-string-option
       gnc:pagename-general optname-party-name
-      "b" opthelp-party-name (N_ "")))
+      "b" opthelp-party-name ""))
     ;; this should default to company name in (gnc:get-current-book)
     ;; does anyone know the function to get the company name??
     ;; (GnuCash is *so* well documented... sigh)
@@ -468,7 +468,7 @@
     (gnc:html-document-set-title! 
      doc (sprintf #f
 		  (string-append "%s %s "
-				 (N_ "For Period Covering %s to %s"))
+				 (_ "For Period Covering %s to %s"))
 		  company-name report-title
                   (gnc:print-date start-date-printable)
                   (gnc:print-date end-date-tp)))
@@ -502,8 +502,8 @@
 	       
 	       (terse-period? #t)
 	       (period-for (if terse-period?
-			       (string-append " " (N_ "for Period"))
-			       (sprintf #f (string-append ", " (N_ "%s to %s"))
+			       (string-append " " (_ "for Period"))
+			       (sprintf #f (string-append ", " (_ "%s to %s"))
 					(gnc:print-date start-date-printable)
 					(gnc:print-date end-date-tp))
 			       )
@@ -644,8 +644,8 @@
 	  
 	  (report-line
 	   build-table 
-	   (string-append (N_ "Net income") period-for)
-	   (string-append (N_ "Net loss") period-for)
+	   (string-append (_ "Net income") period-for)
+	   (string-append (_ "Net loss") period-for)
 	   net-income
 	   (* 2 (- tree-depth 1)) exchange-fn #f #f
 	   )

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

@@ -151,7 +151,7 @@
     (add-option
       (gnc:make-string-option
       (N_ "General") optname-party-name
-      "b" opthelp-party-name (N_ "")))
+      "b" opthelp-party-name ""))
     ;; this should default to company name in (gnc:get-current-book)
     
     ;; the period over which to collect adjusting/closing entries and
@@ -385,8 +385,8 @@
 	  (gnc:case-exchange-fn price-source report-commodity end-date-tp))
 	 (terse-period? #t)
 	 (period-for (if terse-period?
-			 (string-append " " (N_ "for Period"))
-			 (sprintf #f (string-append ", " (N_ "%s to %s"))
+			 (string-append " " (_ "for Period"))
+			 (sprintf #f (string-append ", " (_ "%s to %s"))
 				  (gnc:print-date start-date-printable)
 				  (gnc:print-date end-date-tp))
 			 ))
@@ -398,7 +398,7 @@
 		      company-name report-title
 		      (gnc:print-date end-date-tp))
 	     (sprintf #f (string-append "%s %s "
-					(N_ "For Period Covering %s to %s"))
+					(_ "For Period Covering %s to %s"))
 		      company-name report-title
 		      (gnc:print-date start-date-printable)
 		      (gnc:print-date end-date-tp))
@@ -597,11 +597,11 @@
 	  (if (equal? report-variant 'work-sheet)
 	      (let* ((headings
 		      (list
-		       (N_ "Trial Balance")
-		       (N_ "Adjustments")
-		       (N_ "Adjusted Trial Balance")
-		       (N_ "Income Statement")
-		       (N_ "Balance Sheet")
+		       (_ "Trial Balance")
+		       (_ "Adjustments")
+		       (_ "Adjusted Trial Balance")
+		       (_ "Income Statement")
+		       (_ "Balance Sheet")
 		       ))
 		     (parent-headings #f)
 		     )
@@ -641,13 +641,13 @@
 	  ;; add the DEBIT/CREDIT headers
 	  (let* ((debit-cell
 		  (gnc:make-html-table-cell/markup
-		   "th" (N_ "DEBIT")))
+		   "th" (_ "Debit")))
 		 (credit-cell
 		  (gnc:make-html-table-cell/markup
-		   "th" (N_ "CREDIT")))
+		   "th" (_ "Credit")))
 		 (row (append
 		       (list (gnc:make-html-table-cell/markup
-			      "total-label-cell" (N_ "Account Name")))
+			      "total-label-cell" (_ "Account Name")))
 		       (gnc:html-make-empty-cells (- account-cols 1))
 		       (list debit-cell)
 		       (list credit-cell))
@@ -827,7 +827,7 @@
 				  acct-table)))
 		      )
 		 (add-line
-		  build-table (N_ "Unrealized Gains")
+		  build-table (_ "Unrealized Gains")
 		  neg-unrealized-gain-collector)
 		 ;; make table line wide enough
 		 (gnc:html-table-set-cell!
@@ -1057,7 +1057,7 @@
 		       exchange-fn show-fcur?))
 		(gnc:html-table-add-labeled-amount-line!
 		 build-table tbl-width "primary-subheading" #f
-		 (if is-credit? (N_ "Net Income") (N_ "Net Loss"))
+		 (if is-credit? (_ "Net Income") (_ "Net Loss"))
 		 0 1 "total-label-cell"
 		 is-entry
 		 (+ account-cols (* 2 is-col) (if is-credit? 0 1))