I18n improvements: Don't mark single characters for translation.

Also, all of the split sentences should be refactored into printf-like
strings where the variable words must be inserted through %s etc, but I'm
too lazy to do this for now. Also, this file us/taxtxf.scm is used in the
U.S. *only*, so it is fine to not translate it anyway.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18049 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2009-04-14 09:04:15 +00:00
parent 3db99810fc
commit c1d564d0e6

View File

@ -323,7 +323,7 @@
(gnc:html-text-append! description (gnc:html-markup-b (gnc:html-text-append! description (gnc:html-markup-b
total-line-text)) total-line-text))
(gnc:html-text-append! description (gnc:html-markup-b (gnc:html-text-append! description (gnc:html-markup-b
(_ " "))) " "))
(gnc:html-text-append! total (gnc:html-markup-b (gnc:html-text-append! total (gnc:html-markup-b
total-amount)) total-amount))
(let ((description-cell (if (or tax_code? transaction-details?) (let ((description-cell (if (or tax_code? transaction-details?)
@ -524,7 +524,7 @@
(xaccSplitGetSharePrice split) (xaccSplitGetSharePrice split)
) )
print-info) print-info)
(_ ")") ")"
) )
) )
) )
@ -541,7 +541,7 @@
(_ " on ") (_ " on ")
(strftime "%Y-%b-%d" (strftime "%Y-%b-%d"
(localtime (car pricedb-lookup-price-time))) (localtime (car pricedb-lookup-price-time)))
(_ ")") ")"
) )
"")) ""))
) )
@ -704,7 +704,7 @@
"" ""
(string-append (_ " (Account Commodity: ") (string-append (_ " (Account Commodity: ")
(gnc-commodity-get-mnemonic account-commodity) (gnc-commodity-get-mnemonic account-commodity)
(_ ")"))) ")"))
(if show-TXF-data? (if show-TXF-data?
(let* ((pns (if (or (eq? 'parent code-pns) (let* ((pns (if (or (eq? 'parent code-pns)
(eq? 'current code-pns)) (eq? 'current code-pns))
@ -720,13 +720,13 @@
(if (eq? line "") (if (eq? line "")
"" ""
(string-append (string-append
(_ " (TXF Parameter: ") line (_ ")"))) (_ " (TXF Parameter: ") line ")"))
(if (eq? line "") (if (eq? line "")
(string-append (string-append
(_ " (TXF Parameter: ") pns (_ ")")) (_ " (TXF Parameter: ") pns ")")
(string-append (string-append
(_ " (TXF Parameters: ") pns (_", ") (_ " (TXF Parameters: ") pns ", "
line (_ ")")))) line ")")))
) )
""))) "")))
(print-info (gnc-account-print-info account #f)) (print-info (gnc-account-print-info account #f))
@ -760,10 +760,10 @@
(action-memo (if (and (string=? action "") (string=? memo "")) (action-memo (if (and (string=? action "") (string=? memo ""))
"" ""
(begin (begin
(string-append (_ "/") action (string-append "/" action
(if (string=? memo "") (if (string=? memo "")
"" ""
(string-append (_ ":") memo)))))) (string-append ":" memo))))))
(notes-act-memo (string-append notes action-memo)) (notes-act-memo (string-append notes action-memo))
(trans-currency (xaccTransGetCurrency parent)) (trans-currency (xaccTransGetCurrency parent))
(splt-amount (xaccSplitGetAmount split)) (splt-amount (xaccSplitGetAmount split))
@ -975,12 +975,12 @@
account-name account-name
(if (not (gnc-commodity-equiv account-commodity (if (not (gnc-commodity-equiv account-commodity
USD-currency)) USD-currency))
(string-append (_ " (") (string-append " ("
amnt-acct-curr amnt-acct-curr
(_ " In ") (_ " In ")
(gnc-commodity-get-mnemonic (gnc-commodity-get-mnemonic
account-commodity) account-commodity)
(_ ") ")) ") ")
""))) "")))
) )
(render-total-row table (render-total-row table
@ -1524,10 +1524,10 @@
(set! need-tax-code-header? #t) (set! need-tax-code-header? #t)
(set! tax-code-header-printed? #f) (set! tax-code-header-printed? #f)
(set! tax-code-text (set! tax-code-text
(string-append description (_ " (") (string-append description " ("
current-tax-code (_ ")"))) current-tax-code ")"))
(set! tax-code-heading-text (set! tax-code-heading-text
(string-append description (_ " (") (string-append description " ("
current-tax-code current-tax-code
(if show-TXF-data? (if show-TXF-data?
(string-append (string-append
@ -1540,8 +1540,8 @@
(gnc:get-txf-pns tax-code (gnc:get-txf-pns tax-code
(eq? ACCT-TYPE-INCOME (eq? ACCT-TYPE-INCOME
type)))) type))))
(_ "Y") "Y"
(_ "N")) "N")
(_ ", TXF Format ") (_ ", TXF Format ")
(number->string (number->string
(gnc:get-txf-format tax-code (gnc:get-txf-format tax-code
@ -1550,15 +1550,15 @@
(_ ", Multiple Copies ") (_ ", Multiple Copies ")
(if (gnc:get-txf-multiple tax-code (if (gnc:get-txf-multiple tax-code
(eq? ACCT-TYPE-INCOME type)) (eq? ACCT-TYPE-INCOME type))
(_ "Y") "Y"
(_ "N")) "N")
(_ ", Special Dates ") (_ ", Special Dates ")
(if (txf-special-split? tax-code) (if (txf-special-split? tax-code)
(_ "Y") "Y"
(_ "N")) "N")
) )
"") "")
(_ ")"))) ")"))
) )
(set! saved-tax-code-text tax-code-text) (set! saved-tax-code-text tax-code-text)
) )
@ -1629,9 +1629,9 @@
file-name file-name
(_ ". The error is: ") (_ ". The error is: ")
(symbol->string key) (symbol->string key)
(_ " - ") " - "
(car (caddr args)) (car (caddr args))
(_ ".") "."
)) ))
#f))) #f)))
) )
@ -1841,7 +1841,7 @@ and Deductible Expenses.")
report-obj report-obj
#t #t
#f)) #f))
'export-types (list (cons (_ "TXF") 'txf)) 'export-types (list (cons "TXF" 'txf))
'export-thunk (lambda (report-obj choice file-name) 'export-thunk (lambda (report-obj choice file-name)
(generate-tax-schedule (generate-tax-schedule
(_ "Taxable Income/Deductible Expenses") (_ "Taxable Income/Deductible Expenses")