gnucash master: Fix spaces for some strings not correctly picked up by xgettext.scm script.
Geert Janssens
janssens-geert at telenet.be
Sat Apr 5 08:26:45 EDT 2014
Hi Cristian,
Thank you for working on improving the translation status of GnuCash.
I notice in this commit you have realigned a number of variables (by changing spaces into tabs).
Was that intentional ?
If so can you do this in a separate commit ? The changes here make it more difficult to spot
what the real meat of the commit was (changing the bad spaces in strings).
Also I personally prefer to use spaces for indentation instead of tabs. The width of a tab is
highly editor dependent. So what appears as nicely aligned in one editor may look totally
misaligned in another. It usually looks misaligned on a diff as well (as the mail message shows).
Geert
On Saturday 05 April 2014 03:42:49 Cristian Marchi wrote:
> Updated via https://github.com/Gnucash/gnucash/commit/52ab2d52
> (commit) from https://github.com/Gnucash/gnucash/commit/5bd7d2e7
> (commit)
>
>
>
> commit 52ab2d527d7304995737cfe7d4ba01e9e7328bc5
> Author: Cristian Marchi <cri79 at libero.it>
> Date: Sat Apr 5 14:17:52 2014 +0200
>
> Fix spaces for some strings not correctly picked up by
> xgettext.scm script.
>
> diff --git a/src/report/business-reports/taxinvoice.scm
> b/src/report/business-reports/taxinvoice.scm index a1b2da2..106f8d7
> 100644
> --- a/src/report/business-reports/taxinvoice.scm
> +++ b/src/report/business-reports/taxinvoice.scm
> @@ -100,7 +100,7 @@
> (define optname-row-address (N_ "row: Address"))
> (define optname-row-contact (N_ "row: Contact"))
> (define optname-row-invoice-number (N_ "row: Invoice Number"))
> -(define optname-row-company-name (N_ "row: Company Name"))
> +(define optname-row-company-name (N_ "row: Company Name"))
> (define optname-report-currency (N_ "Report Currency"))
> (define optname-invoice-number-text (N_ "Invoice number text"))
> (define optname-to-text (N_ "To text"))
> @@ -114,26 +114,26 @@
> (define optname-border-color-th (N_ "table-header-border-color"))
> (define optname-border-color-td (N_ "table-cell-border-color"))
> (define optname-extra-css (N_ "Embedded CSS"))
> -(define optname-report-title (N_ "Report title"))
> -(define optname-template-file (N_ "Template file"))
> -(define optname-css-file (N_ "CSS stylesheet file"))
> -(define optname-heading-font (N_ "Heading font"))
> -(define optname-text-font (N_ "Text font"))
> -(define optname-logofile (N_ "Logo filename"))
> -(define optname-logo-width (N_ "Logo width"))
> -(define optname-units (N_ "Units"))
> -(define optname-qty (N_ "Qty"))
> -(define optname-unit-price (N_ "Unit Price"))
> -(define optname-disc-rate (N_ "Discount Rate"))
> -(define optname-disc-amount (N_ "Discount Amount"))
> -(define optname-net-price (N_ "Net Price"))
> -(define optname-tax-rate (N_ "Tax Rate"))
> -(define optname-tax-amount (N_ "Tax Amount"))
> -(define optname-total-price (N_ "Total Price"))
> -(define optname-subtotal (N_ "Sub-total"))
> -(define optname-amount-due (N_ "Amount Due"))
> -(define optname-payment-recd (N_ "Payment received text"))
> -(define optname-extra-notes (N_ "Extra notes"))
> +(define optname-report-title (N_ "Report title"))
> +(define optname-template-file (N_ "Template file"))
> +(define optname-css-file (N_ "CSS stylesheet file"))
> +(define optname-heading-font (N_ "Heading font"))
> +(define optname-text-font (N_ "Text font"))
> +(define optname-logofile (N_ "Logo filename"))
> +(define optname-logo-width (N_ "Logo width"))
> +(define optname-units (N_ "Units"))
> +(define optname-qty (N_ "Qty"))
> +(define optname-unit-price (N_ "Unit Price"))
> +(define optname-disc-rate (N_ "Discount Rate"))
> +(define optname-disc-amount (N_ "Discount Amount"))
> +(define optname-net-price (N_ "Net Price"))
> +(define optname-tax-rate (N_ "Tax Rate"))
> +(define optname-tax-amount (N_ "Tax Amount"))
> +(define optname-total-price (N_ "Total Price"))
> +(define optname-subtotal (N_ "Sub-total"))
> +(define optname-amount-due (N_ "Amount Due"))
> +(define optname-payment-recd (N_ "Payment received text"))
> +(define optname-extra-notes (N_ "Extra notes"))
>
> ; Choose only customer invoices
> ; (This doesn't work very nicely -- all invoices and bills
> @@ -213,30 +213,30 @@
> (add-option (gnc:make-string-option
> headingpage optname-disc-amount "f" "" (_ "Discount
> Amount"))) (add-option (gnc:make-string-option
> - headingpage optname-net-price "g" "" (_
> "Net Price"))) + headingpage optname-net-price "g" ""
> (_ "Net Price"))) (add-option (gnc:make-string-option
> headingpage optname-tax-rate "h" "" (_ "Tax Rate")))
> (add-option (gnc:make-string-option
> headingpage optname-tax-amount "i" "" (_ "Tax
> Amount"))) (add-option (gnc:make-string-option
> - headingpage optname-total-price "j" "" (_
> "Total Price"))) + headingpage optname-total-price
> "j" "" (_ "Total Price"))) (add-option (gnc:make-string-option
> headingpage2 optname-subtotal "a" "" (_
> "Sub-total"))) (add-option (gnc:make-string-option
> - headingpage2 optname-amount-due "b" "" (_
> "Amount Due"))) + headingpage2 optname-amount-due "b"
> "" (_ "Amount Due"))) (add-option (gnc:make-string-option
> headingpage2 optname-payment-recd "c" ""
> (_ "Payment received, thank you")))
> (add-option
> (gnc:make-string-option headingpage2 optname-invoice-number-text -
> "d" "" (N_ "Invoice number: ")))
> + "d" "" (N_ "Invoice number: ")))
> (add-option (gnc:make-string-option headingpage2 optname-to-text
> "e" "" (N_ "To: ")))
> (add-option (gnc:make-string-option headingpage2 optname-ref-text
> - "f" "" (N_ "Your ref: ")))
> + "f" "" (N_ "Your ref: ")))
> (add-option
> (gnc:make-string-option headingpage2 optname-jobnumber-text - "g"
> "" (N_ "Job number: ")))
> + "g" "" (N_ "Job number: ")))
> (add-option
> (gnc:make-string-option headingpage2 optname-jobname-text - "h" ""
> (N_ "Job name: ")))
> + "h" "" (N_ "Job name: ")))
>
> (add-option (gnc:make-text-option
> notespage optname-extra-notes "a"
>
>
More information about the gnucash-devel
mailing list