diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-totd.glade b/gnucash/gnome-utils/gtkbuilder/dialog-totd.glade index 4515ebca53..2206248386 100644 --- a/gnucash/gnome-utils/gtkbuilder/dialog-totd.glade +++ b/gnucash/gnome-utils/gtkbuilder/dialog-totd.glade @@ -51,20 +51,6 @@ 1 - - - _Cancel - True - True - True - True - - - False - False - 2 - - _Close @@ -77,7 +63,7 @@ False False - 3 + 2 @@ -192,7 +178,6 @@ back-button forward-button - cancel-button close-button diff --git a/gnucash/import-export/dialog-import.glade b/gnucash/import-export/dialog-import.glade index 8f329fbcbd..d12dc3689b 100644 --- a/gnucash/import-export/dialog-import.glade +++ b/gnucash/import-export/dialog-import.glade @@ -2,50 +2,10 @@ - + True False - vertical - - - True - False - Please select or create an appropriate GnuCash account for: - center - - - False - False - 0 - - - - - True - False - Online account ID here... - center - - - False - False - 1 - - - - - True - True - - - - - - True - True - 2 - - + gnc-account-new True @@ -67,12 +27,14 @@ end - gnc-new-account + New _Account... True True True True + account_new_icon True + True False @@ -82,7 +44,7 @@ - _Cancel + _Cancel True True True @@ -97,7 +59,7 @@ - _OK + _OK True True True @@ -138,6 +100,51 @@ okbutton + + True + False + vertical + + + True + False + Please select or create an appropriate GnuCash account for: + center + + + False + False + 0 + + + + + True + False + Online account ID here... + center + + + False + False + 1 + + + + + True + True + + + + + + True + True + 2 + + + 1000 2 @@ -179,7 +186,7 @@ end - _OK + _OK True True True @@ -301,7 +308,7 @@ False - Enable skip transaction action + Enable skip transaction action True True False @@ -321,7 +328,7 @@ - Enable update match action + Enable update match action True True False @@ -437,9 +444,10 @@ True + False start 12 - Commercial ATM _fees threshold + Commercial ATM _fees threshold True pref/dialogs.import.generic/atm-fee-threshold @@ -451,9 +459,10 @@ True + False start 12 - Auto-c_lear threshold + Auto-c_lear threshold True pref/dialogs.import.generic/auto-clear-threshold @@ -465,9 +474,10 @@ True + False start 12 - Auto-_add threshold + Auto-_add threshold True pref/dialogs.import.generic/auto-add-threshold @@ -479,9 +489,10 @@ True + False start 12 - Match _display threshold + Match _display threshold True pref/dialogs.import.generic/match-threshold @@ -492,7 +503,7 @@ - Use _bayesian matching + Use _bayesian matching True True False @@ -512,7 +523,7 @@ - Automatically create new commodities + Automatically create new commodities True True False @@ -572,7 +583,7 @@ - _Cancel + _Cancel True True True @@ -587,7 +598,7 @@ - _OK + _OK True True True @@ -616,6 +627,7 @@ True + False Imported transaction's first split: center @@ -650,6 +662,7 @@ True + False Potential splits matching the selected transaction: center @@ -727,7 +740,7 @@ end - _Close + _Close True True True @@ -1131,7 +1144,7 @@ end - _Cancel + _Cancel True True True @@ -1147,7 +1160,7 @@ - _OK + _OK True True True @@ -1164,7 +1177,7 @@ - _Help + _Help True True True diff --git a/gnucash/import-export/import-account-matcher.c b/gnucash/import-export/import-account-matcher.c index 555ad5ef9c..4e59b98028 100644 --- a/gnucash/import-export/import-account-matcher.c +++ b/gnucash/import-export/import-account-matcher.c @@ -293,6 +293,7 @@ Account * gnc_import_select_account(GtkWidget *parent, { /* load the interface */ builder = gtk_builder_new(); + gnc_builder_add_from_file (builder, "dialog-import.glade", "account_new_icon"); gnc_builder_add_from_file (builder, "dialog-import.glade", "account_picker_dialog"); gnc_builder_add_from_file (builder, "dialog-import.glade", "account_picker_content"); /* connect the signals in the interface */ diff --git a/gnucash/import-export/qif-imp/dialog-account-picker.glade b/gnucash/import-export/qif-imp/dialog-account-picker.glade index 9a219438eb..f88bede40c 100644 --- a/gnucash/import-export/qif-imp/dialog-account-picker.glade +++ b/gnucash/import-export/qif-imp/dialog-account-picker.glade @@ -155,7 +155,7 @@ end - gnc-new-account + gnc-account-new True True True diff --git a/gnucash/report/standard-reports/account-piecharts.scm b/gnucash/report/standard-reports/account-piecharts.scm index 0fc3b860c2..c5cfdad577 100644 --- a/gnucash/report/standard-reports/account-piecharts.scm +++ b/gnucash/report/standard-reports/account-piecharts.scm @@ -158,9 +158,9 @@ balance at a given time")) (gnc:make-simple-boolean-option gnc:pagename-display optname-fullname "a" - (N_ (if depth-based? - "Show the full account name in legend?" - "Show the full security name in the legend?")) + (if depth-based? + (N_ "Show the full account name in legend?") + (N_ "Show the full security name in the legend?")) #f)) (add-option diff --git a/gnucash/report/standard-reports/income-gst-statement.scm b/gnucash/report/standard-reports/income-gst-statement.scm index b9b6e528dc..9d3171c905 100644 --- a/gnucash/report/standard-reports/income-gst-statement.scm +++ b/gnucash/report/standard-reports/income-gst-statement.scm @@ -1675,7 +1675,7 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.") ; - include/exclude splits to/from selected accounts ; - include only Invoices & Regular Transactions (i.e. remove Link & Payments) ; - disallow Closing Transactions, and - ; - substring/regex matcher for Description/Notes/Memo + ; - substring/regex matcher for Description/Notes/Memo (set! splits (filter (lambda (split) (let* ((trans (xaccSplitGetParent split)) @@ -1782,24 +1782,26 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.") document (gnc:html-make-no-account-warning report-title (gnc:report-id report-obj))) - + (gnc:html-document-add-object! document (gnc:make-html-text (gnc:html-markup-p - "This report is useful to calculate periodic business tax payable/receivable from" - " authorities. From Edit report options above, choose your Business Income and Business Expense accounts." - " Each transaction may contain, in addition to the accounts payable/receivable or bank accounts," - " a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -$100, Asset:Bank $1100.") + (_ + "This report is useful to calculate periodic business tax payable/receivable from + authorities. From Edit report options above, choose your Business Income and Business Expense accounts. + Each transaction may contain, in addition to the accounts payable/receivable or bank accounts, + a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -$100, Asset:Bank $1100.")) (gnc:html-markup-p - " These tax accounts can either be populated using the standard register, or from Business Invoices and Bills " - " which will require Business > Sales Tax Tables to be set up correctly. Please see the documentation."))) - + (_ + "These tax accounts can either be populated using the standard register, or from Business Invoices and Bills + which will require Business > Sales Tax Tables to be set up correctly. Please see the documentation.")))) + (gnc:html-document-add-object! document (gnc:make-html-text (gnc:html-markup-p TAX-SETUP-DESC)))) - + (begin (gnc:html-document-add-object! document