aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 792947 - Missing translatable strings

Browse Source 
In addition
- the icon was restored on the new account button while importing
- an unused button was removed from the Tip of the day window
- a couple of whitespace issues were fixed

bug fixup
pull/271/head
Geert Janssens 8 years ago
parent f319a8e2a4
commit 4aa1062045
6 changed files with 91 additions and 90 deletions
Show Stats Download Patch File Download Diff File

17
gnucash/gnome-utils/gtkbuilder/dialog-totd.glade
Unescape View File

@ -51,20 +51,6 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel-button">
<property name="label" translatable="yes">_Cancel</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="close-button">
<property name="label" translatable="yes">_Close</property>
@ -77,7 +63,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
<property name="position">2</property>
</packing>
</child>
</object>
@ -192,7 +178,6 @@
<action-widgets>
<action-widget response="2">back-button</action-widget>
<action-widget response="1">forward-button</action-widget>
<action-widget response="-6">cancel-button</action-widget>
<action-widget response="-7">close-button</action-widget>
</action-widgets>
</object>

133
gnucash/import-export/dialog-import.glade
Unescape View File

@ -2,50 +2,10 @@
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkBox" id="account_picker_content">
<object class="GtkImage" id="account_new_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label847715">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Please select or create an appropriate GnuCash account for:</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="online_id_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Online account ID here...</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="account_tree_sw">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<property name="icon_name">gnc-account-new</property>
</object>
<object class="GtkDialog" id="account_picker_dialog">
<property name="visible">True</property>
@ -67,12 +27,14 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="newbutton">
<property name="label">gnc-new-account</property>
<property name="label">New _Account...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="image">account_new_icon</property>
<property name="use_underline">True</property>
<property name="always_show_image">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -82,7 +44,7 @@
</child>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">_Cancel</property>
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -97,7 +59,7 @@
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">_OK</property>
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -138,6 +100,51 @@
<action-widget response="-5">okbutton</action-widget>
</action-widgets>
</object>
<object class="GtkBox" id="account_picker_content">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label847715">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Please select or create an appropriate GnuCash account for:</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="online_id_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Online account ID here...</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="account_tree_sw">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<object class="GtkAdjustment" id="atm_fee_adj">
<property name="upper">1000</property>
<property name="value">2</property>
@ -179,7 +186,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="okbutton1">
<property name="label">_OK</property>
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -301,7 +308,7 @@
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="pref/dialogs.import.generic/enable-skip">
<property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Enable skip transaction action</property>
<property name="label" translatable="yes" comments="Preferences-&gt;Online Banking:Generic">Enable skip transaction action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -321,7 +328,7 @@
</child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.import.generic/enable-update">
<property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Enable update match action</property>
<property name="label" translatable="yes" comments="Preferences-&gt;Online Banking:Generic">Enable update match action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -437,9 +444,10 @@
<child>
<object class="GtkLabel" id="label847789">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Commercial ATM _fees threshold</property>
<property name="label" translatable="yes" comments="Preferences-&gt;Online Banking:Generic">Commercial ATM _fees threshold</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.import.generic/atm-fee-threshold</property>
</object>
@ -451,9 +459,10 @@
<child>
<object class="GtkLabel" id="label847788">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Auto-c_lear threshold</property>
<property name="label" translatable="yes" comments="Preferences-&gt;Online Banking:Generic">Auto-c_lear threshold</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.import.generic/auto-clear-threshold</property>
</object>
@ -465,9 +474,10 @@
<child>
<object class="GtkLabel" id="label847787">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Auto-_add threshold</property>
<property name="label" translatable="yes" comments="Preferences-&gt;Online Banking:Generic">Auto-_add threshold</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.import.generic/auto-add-threshold</property>
</object>
@ -479,9 +489,10 @@
<child>
<object class="GtkLabel" id="label847786">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Match _display threshold</property>
<property name="label" translatable="yes" comments="Preferences-&gt;Online Banking:Generic">Match _display threshold</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.import.generic/match-threshold</property>
</object>
@ -492,7 +503,7 @@
</child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.import.generic/use-bayes">
<property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Use _bayesian matching</property>
<property name="label" translatable="yes" comments="Preferences-&gt;Online Banking:Generic">Use _bayesian matching</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -512,7 +523,7 @@
</child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.import.generic/auto-create-commodity">
<property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Automatically create new commodities</property>
<property name="label" translatable="yes" comments="Preferences-&gt;Online Banking:Generic">Automatically create new commodities</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -572,7 +583,7 @@
</child>
<child>
<object class="GtkButton" id="cancel_button1">
<property name="label">_Cancel</property>
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -587,7 +598,7 @@
</child>
<child>
<object class="GtkButton" id="ok_button1">
<property name="label">_OK</property>
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -616,6 +627,7 @@
<child>
<object class="GtkLabel" id="label847772">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Dialog Select matching transactions">Imported transaction's first split:</property>
<property name="justify">center</property>
</object>
@ -650,6 +662,7 @@
<child>
<object class="GtkLabel" id="label847766">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Dialog Select matching transactions">Potential splits matching the selected transaction: </property>
<property name="justify">center</property>
</object>
@ -727,7 +740,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="matcher_help_close">
<property name="label">_Close</property>
<property name="label" translatable="yes">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -1131,7 +1144,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="matcher_cancel">
<property name="label">_Cancel</property>
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -1147,7 +1160,7 @@
</child>
<child>
<object class="GtkButton" id="matcher_ok">
<property name="label">_OK</property>
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -1164,7 +1177,7 @@
</child>
<child>
<object class="GtkButton" id="matcher__help">
<property name="label">_Help</property>
<property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>

1
gnucash/import-export/import-account-matcher.c
Unescape View File

@ -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 */

2
gnucash/import-export/qif-imp/dialog-account-picker.glade
Unescape View File

@ -155,7 +155,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="newbutton">
<property name="label">gnc-new-account</property>
<property name="label">gnc-account-new</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>

6
gnucash/report/standard-reports/account-piecharts.scm
Unescape View File

@ -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

22
gnucash/report/standard-reports/income-gst-statement.scm
Unescape View File

@ -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 <i>Edit report options</i> 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 <i>Edit report options</i> 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

Write Preview
Loading…
Cancel
Save