r19162 - gnucash/trunk - I18n improvements: Remove colons from translatable strings. Use correct capitalization.
Christian Stimming
cstim at code.gnucash.org
Fri May 14 05:00:29 EDT 2010
Author: cstim
Date: 2010-05-14 05:00:28 -0400 (Fri, 14 May 2010)
New Revision: 19162
Trac: http://svn.gnucash.org/trac/changeset/19162
Modified:
gnucash/trunk/po/POTFILES.in
gnucash/trunk/src/app-utils/gnc-ui-util.c
gnucash/trunk/src/business/business-reports/taxinvoice.eguile.scm
gnucash/trunk/src/report/report-system/report.scm
gnucash/trunk/src/report/standard-reports/balsheet-eg.eguile.scm
gnucash/trunk/src/report/standard-reports/balsheet-eg.scm
Log:
I18n improvements: Remove colons from translatable strings. Use correct capitalization.
In most cases, the changed strings already appear somewhere else in the program,
so only very few are unfortunately now new strings even though we hoped
we could stick to the string freeze.
Modified: gnucash/trunk/po/POTFILES.in
===================================================================
--- gnucash/trunk/po/POTFILES.in 2010-05-14 08:36:59 UTC (rev 19161)
+++ gnucash/trunk/po/POTFILES.in 2010-05-14 09:00:28 UTC (rev 19162)
@@ -186,7 +186,6 @@
src/engine/Transaction.c
src/engine/TransLog.c
src/gnc-module/gnc-module.c
-src/gnome/dialog-chart-export.c
src/gnome/dialog-commodities.c
src/gnome/dialog-fincalc.c
src/gnome/dialog-find-transactions.c
@@ -202,17 +201,14 @@
src/gnome/druid-acct-period.c
src/gnome/druid-hierarchy.c
src/gnome/druid-loan.c
-src/gnome/druid-merge.c
src/gnome/druid-stock-split.c
src/gnome/glade/account.glade
src/gnome/glade/acctperiod.glade
src/gnome/glade/autoclear.glade
src/gnome/glade/budget.glade
-src/gnome/glade/chart-export.glade
src/gnome/glade/commodities.glade
src/gnome/glade/fincalc.glade
src/gnome/glade/lots.glade
-src/gnome/glade/merge.glade
src/gnome/glade/newuser.glade
src/gnome/glade/price.glade
src/gnome/glade/print.glade
@@ -519,7 +515,6 @@
src/report/utility-reports/gncmod-utility-reports.c
src/tax/us/gncmod-tax-us.c
src/gnome/gnucash.desktop.in.in
-src/libqof/backend/file/qsf-backend.c
src/libqof/qof/gnc-date.c
src/libqof/qof/qofbookslots.h
intl-scm/guile-strings.c
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c 2010-05-14 08:36:59 UTC (rev 19161)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c 2010-05-14 09:00:28 UTC (rev 19162)
@@ -478,7 +478,17 @@
{
if (!tax_related)
return NULL;
- else /* tax_related && !code */
+ /* tax_related && !code */
+ else
+ /* Translators: This and the following strings appear on
+ * the account tab if the Tax Info column is displayed,
+ * i.e. if the user wants to record the tax form number
+ * and location on that tax form which corresponds to this
+ * gnucash account. For the US Income Tax support in
+ * gnucash, each tax code that can be assigned to an
+ * account generally corresponds to a specific line number
+ * on a paper form and each form has a unique
+ * identification (e.g., Form 1040, Schedule A). */
return g_strdup (_("Tax-related but has no tax code"));
}
else /* with tax code */
Modified: gnucash/trunk/src/business/business-reports/taxinvoice.eguile.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/taxinvoice.eguile.scm 2010-05-14 08:36:59 UTC (rev 19161)
+++ gnucash/trunk/src/business/business-reports/taxinvoice.eguile.scm 2010-05-14 09:00:28 UTC (rev 19162)
@@ -173,25 +173,25 @@
<table border="0">
<?scm (if coyphone (begin ?>
<tr>
- <td align="right"><?scm:d (_ "Phone:") ?> </td>
+ <td align="right"><?scm:d (_ "Phone") ?>: </td>
<td align="right"><?scm:d coyphone ?></td>
</tr>
<?scm )) ?>
<?scm (if coyfax (begin ?>
<tr>
- <td align="right"><?scm:d (_ "Fax:") ?> </td>
+ <td align="right"><?scm:d (_ "Fax") ?>: </td>
<td align="right"><?scm:d coyfax ?></td>
</tr>
<?scm )) ?>
<?scm (if coyemail (begin ?>
<tr>
- <td align="right"><?scm:d (_ "Email:") ?> </td>
+ <td align="right"><?scm:d (_ "Email") ?>: </td>
<td align="right"><?scm:d coyemail ?></td>
</tr>
<?scm )) ?>
<?scm (if coyurl (begin ?>
<tr>
- <td align="right"><?scm:d (_ "Website:") ?> </td>
+ <td align="right"><?scm:d (_ "Website") ?>: </td>
<td align="right"><?scm:d coyurl ?></td>
</tr>
<?scm )) ?>
@@ -215,7 +215,7 @@
<td align="right">
<table border="0">
<tr>
- <td align="right" class="invnum"><big><strong><?scm:d (nbsp (_ "Invoice number:")) ?></strong></big> </td>
+ <td align="right" class="invnum"><big><strong><?scm:d (nbsp (_ "Invoice Number")) ?>:</strong></big> </td>
<td align="right" class="invnum"><big><strong><?scm:d invoiceid ?></strong></big></td>
</tr>
<?scm (if (equal? postdate (cons 0 0)) (begin ?>
@@ -224,11 +224,11 @@
</tr>
<?scm ) (begin ?>
<tr>
- <td align="right"><?scm:d (nbsp (_ "Invoice date:")) ?> </td>
+ <td align="right"><?scm:d (nbsp (_ "Invoice Date")) ?>: </td>
<td align="right"><?scm:d (gnc-print-date postdate) ?></td>
</tr>
<tr>
- <td align="right"><?scm:d (nbsp (_ "Due date:")) ?> </td>
+ <td align="right"><?scm:d (nbsp (_ "Due Date")) ?>: </td>
<td align="right"><?scm:d (gnc-print-date duedate) ?></td>
</tr>
<?scm )) ?>
@@ -387,16 +387,15 @@
; 'mainline' code: check for a valid invoice, then display the report
(if (null? opt-invoice)
(begin
- (display (_ "<h2>Tax Invoice</h2>"))
- (display (_ "<p>No invoice has been selected -- please use the Options menu to select one.")))
+ (display (string-append "<h2>" (_ "Tax Invoice") "</h2>"))
+ (display (string-append "<p>" (_ "No invoice has been selected -- please use the Options menu to select one.") "</p>")))
(let* ((owner (gncInvoiceGetOwner opt-invoice))
(endowner (gncOwnerGetEndOwner owner))
(ownertype (gncOwnerGetType endowner)))
(if (not (eqv? ownertype GNC-OWNER-CUSTOMER))
(begin
- (display (_ "<h2>Tax Invoice</h2>"))
- (display (_ "<p>This report is designed for customer (sales) invoices only.\n"))
- (display (_ "<p>Please use the Options menu to select an <em>Invoice</em>, not a Bill or Expense Voucher.")))
+ (display (string-append "<h2>" (_ "Tax Invoice") "</h2>"))
+ (display (string-append "<p>" (_ "This report is designed for customer (sales) invoices only. Please use the Options menu to select an <em>Invoice</em>, not a Bill or Expense Voucher.") "</p>")))
(display-report opt-invoice owner endowner ownertype))))
?>
Modified: gnucash/trunk/src/report/report-system/report.scm
===================================================================
--- gnucash/trunk/src/report/report-system/report.scm 2010-05-14 08:36:59 UTC (rev 19161)
+++ gnucash/trunk/src/report/report-system/report.scm 2010-05-14 09:00:28 UTC (rev 19162)
@@ -575,7 +575,10 @@
(lambda (key . args)
(gnc-error-dialog
'()
- (string-append (_ "Could not open the file: ") conf-file-name (_ ". The error is: ") (symbol->string key) " - " (car (caddr args)) "."))
+ (sprintf
+ #f (_ "Could not open the file %s. The error is: %s")
+ conf-file-name
+ (string-append (symbol->string key) " - " (car (caddr args)))))
#f))))
(define (gnc:report-save-to-savefile report)
Modified: gnucash/trunk/src/report/standard-reports/balsheet-eg.eguile.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/balsheet-eg.eguile.scm 2010-05-14 08:36:59 UTC (rev 19161)
+++ gnucash/trunk/src/report/standard-reports/balsheet-eg.eguile.scm 2010-05-14 09:00:28 UTC (rev 19162)
@@ -118,7 +118,7 @@
maxdepth
(accrec-depth accrec)
(if (> (accrec-depth accrec) 1) rshift 0)
- (string-append (_ "Total ") (accrec-namelink accrec))
+ (string-append (_ "Total") " " (accrec-namelink accrec))
(format-comm-coll-total (accrec-subtotal-cc accrec))
(<= (accrec-depth accrec) 1) ; total?
(> (accrec-depth accrec) 0))))))) ; leftoverrule?
@@ -159,7 +159,7 @@
<table border="0" cellpadding="16"><tr><td> <!-- hack for GTKHTML -->
<?scm )) ?>
<h3><?scm:d coyname ?></h3>
-<h2><?scm:d reportname ?> as at <?scm:d (gnc-print-date opt-date-tp) ?></h2>
+<h2><?scm:d reportname ?> <?scm:d (gnc-print-date opt-date-tp) ?></h2>
<?scm
;; This is where the work is done.
@@ -198,8 +198,8 @@
(balancing-cc 'minusmerge etl-cc #f)
(accrec-set-namelink! accrec-ie
(if (gnc-numeric-negative-p (accrec-balance-num accrec-ie))
- (_ "Retained earnings")
- (_ "Retained loss")))
+ (_ "Retained Earnings")
+ (_ "Retained Losses")))
(accrec-set-placeholder?! accrec-ie #t)
(balancing-cc 'minusmerge (accrec-subtotal-cc accrec-ie) #f)
(if (and (one-depth-1 accrec-eq)
@@ -268,7 +268,7 @@
(if (not (gnc-commodity-collector-allzero? balancing-cc))
(display-acc-row
maxdepth 0 0
- (_ "Imbalance amount")
+ (_ "Imbalance Amount")
(format-comm-coll-total balancing-cc)
#t #f))
Modified: gnucash/trunk/src/report/standard-reports/balsheet-eg.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/balsheet-eg.scm 2010-05-14 08:36:59 UTC (rev 19161)
+++ gnucash/trunk/src/report/standard-reports/balsheet-eg.scm 2010-05-14 09:00:28 UTC (rev 19162)
@@ -268,7 +268,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; All the options stuff starts here
-(define reportname (_ "Balance Sheet"))
+(define reportname (_ "Balance Sheet (eguile)"))
;; define all option's names and help text so that they are properly
;; defined in *one* place.
@@ -351,22 +351,22 @@
display-page optname-columns
"a" opthelp-columns 'onecol
(list (vector 'autocols
- (N_ "auto")
+ (N_ "Auto")
(N_ "Adjust the layout to fit the width of the screen or page"))
(vector 'onecol
- (N_ "one")
+ (N_ "One")
(N_ "Display liabilities and equity below assets"))
(vector 'twocols
- (N_ "two")
+ (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
- (N_ "sign")
+ (N_ "Sign")
(N_ "Prefix negative amounts with a minus sign, e.g. -$10.00"))
(vector 'negbrackets
- (N_ "brackets")
+ (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"))
@@ -528,9 +528,9 @@
(and opt-omit-zb-accts?)
;(> (accrec-depth accrec) 1))
;; Reason 1: zero Imbalance a/c
- (string-prefix? (_ "Imbalance-") (xaccAccountGetName (accrec-account accrec)))
+ (string-prefix? (_ "Imbalance") (xaccAccountGetName (accrec-account accrec)))
;; Reason 2: zero Orphan a/c
- (string-prefix? (_ "Orphan-") (xaccAccountGetName (accrec-account accrec))))))
+ (string-prefix? (_ "Orphan") (xaccAccountGetName (accrec-account accrec))))))
(define (flattened-acc-depth acc)
;; Accounts deeper than required get moved to the requested depth
@@ -708,7 +708,7 @@
(gnc:define-report
'version 1
- 'name "Balance Sheet (eguile)"
+ 'name reportname
'report-guid "2e3751edeb7544e8a20fd19e9d08bb65"
'menu-name (N_ "Balance Sheet using eguile-gnc")
'menu-tip (N_ "Display a balance sheet (using eguile template)")
More information about the gnucash-changes
mailing list