From cfd20683ec0efe2274fed92cfcb94c6d5d8bf60f Mon Sep 17 00:00:00 2001 From: Christian Wehling Date: Sun, 24 Mar 2024 20:44:12 +0100 Subject: [PATCH 1/5] Improve translatable strings. These strings are labeled as "Source needs review" in Weblate. --- gnucash/gnome/assistant-stock-transaction.cpp | 16 ++++++++-------- gnucash/gnome/gnc-plugin-page-report.cpp | 2 +- gnucash/gtkbuilder/assistant-loan.glade | 4 ++-- gnucash/gtkbuilder/dialog-preferences.glade | 2 +- gnucash/import-export/aqb/dialog-ab.glade | 2 +- .../import-export/aqb/gnc-plugin-aqbanking.ui | 4 ++-- .../bi-import/dialog-bi-import-gui.c | 2 +- .../customer-import/dialog-customer-import-gui.c | 2 +- gnucash/report/reports/standard/invoice.scm | 2 +- gnucash/report/reports/standard/taxinvoice.scm | 6 +++--- libgnucash/engine/gnc-optiondb.cpp | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gnucash/gnome/assistant-stock-transaction.cpp b/gnucash/gnome/assistant-stock-transaction.cpp index 17219ff5bc5..4bf891137d1 100644 --- a/gnucash/gnome/assistant-stock-transaction.cpp +++ b/gnucash/gnome/assistant-stock-transaction.cpp @@ -268,9 +268,9 @@ static const TxnTypeVec long_types // Translators: this is a stock transaction describing a stock // split N_("Stock split"), - N_("Company issues additional units, thereby reducing the stock price by a divisor " - ", while keeping the total monetary value of the overall investment constant. " - "\n\nIf the split results in a cash in lieu for remainder units, please " + N_("Company issues additional units, thereby reducing the stock price by a divisor, " + "while keeping the total monetary value of the overall investment constant.\n\nIf " + "the split results in a cash in lieu for remainder units, please " "record the sale using the Stock Transaction Assistant first, then record the split.") }, { @@ -310,8 +310,8 @@ static const TxnTypeVec short_types // Translators: this is a stock transaction describing cover // buying stock, and recording capital gain/loss N_("Buy to cover short"), - N_("Buy back stock to cover short position, and record capital gain/loss. " - "\n\nIf you are unable to calculate capital gains you can enter a placeholder " + N_("Buy back stock to cover short position, and record capital gain/loss.\n\nIf " + "you are unable to calculate capital gains you can enter a placeholder " "amount and correct it in the transaction later.") }, { @@ -352,7 +352,7 @@ static const TxnTypeVec short_types N_("Company returns capital, and the short stock holder must make a compensatory " "payment for the returned capital. This reduces the cost basis (less negative, " "towards 0.00 value) without affecting # units. A distribution previously recorded " - "as a compensatory dividend is reclassified to compensatory return of capital," + "as a compensatory dividend is reclassified to compensatory return of capital, " "often due to end-of-year tax information.") }, { @@ -395,8 +395,8 @@ static const TxnTypeVec short_types // split when shorting stock N_("Stock split"), N_("Company issues additional units, thereby reducing the stock price by a divisor, " - "while keeping the total monetary value of the overall investment constant. " - "\n\nIf the split results in a cash in lieu for remainder units, please " + "while keeping the total monetary value of the overall investment constant.\n\nIf " + "the split results in a cash in lieu for remainder units, please " "record the cover buy using the Stock Transaction Assistant first, then record the split.") }, { diff --git a/gnucash/gnome/gnc-plugin-page-report.cpp b/gnucash/gnome/gnc-plugin-page-report.cpp index a700a233c2f..3a517a69c51 100644 --- a/gnucash/gnome/gnc-plugin-page-report.cpp +++ b/gnucash/gnome/gnc-plugin-page-report.cpp @@ -240,7 +240,7 @@ static GncToolBarShortNames toolbar_labels[] = /* Translators: This string is meant to be a short alternative for "Save Report Configuration As…" to be used as toolbar button label. */ { "ReportSaveAsAction", N_("Save Config As…") }, - { "FilePrintPDFAction", N_("Make Pdf") }, + { "FilePrintPDFAction", N_("Export as PDF") }, { nullptr, nullptr }, }; diff --git a/gnucash/gtkbuilder/assistant-loan.glade b/gnucash/gtkbuilder/assistant-loan.glade index 8200496930d..9db28668538 100644 --- a/gnucash/gtkbuilder/assistant-loan.glade +++ b/gnucash/gtkbuilder/assistant-loan.glade @@ -216,7 +216,7 @@ If you make a mistake or want to make changes later, you can edit the created Sc ● False False - Enter the number of months still to be paid off. This determines both the remaining principle and the duration of the scheduled transaction. + Enter the number of months still to be paid off. This determines both the remaining principal and the duration of the scheduled transaction. 1 @@ -1078,7 +1078,7 @@ If you make a mistake or want to make changes later, you can edit the created Sc True False - Review the details below and if correct press "Apply"" to create the schedule. + Review the details below and if correct press "Apply" to create the schedule. center diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade index 08f8fb2c854..dcb0e693853 100644 --- a/gnucash/gtkbuilder/dialog-preferences.glade +++ b/gnucash/gtkbuilder/dialog-preferences.glade @@ -326,7 +326,7 @@ Press 'Close' to return to the preference window True False start - <b>Summarybar Content</b> + <b>Summary Bar Content</b> True diff --git a/gnucash/import-export/aqb/dialog-ab.glade b/gnucash/import-export/aqb/dialog-ab.glade index 16f1e9270b8..1fab4381429 100644 --- a/gnucash/import-export/aqb/dialog-ab.glade +++ b/gnucash/import-export/aqb/dialog-ab.glade @@ -1727,7 +1727,7 @@ imexporter-list True True - This list contains the file formats that AQBanking knows how to import. The profile list contains specializations and is populated according to which format you select in this list. + This list contains the file formats that AqBanking knows how to import. The profile list contains specializations and is populated according to which format you select in this list. File Format diff --git a/gnucash/import-export/aqb/gnc-plugin-aqbanking.ui b/gnucash/import-export/aqb/gnc-plugin-aqbanking.ui index d506ef298b5..5adc4e454a3 100644 --- a/gnucash/import-export/aqb/gnc-plugin-aqbanking.ui +++ b/gnucash/import-export/aqb/gnc-plugin-aqbanking.ui @@ -3,9 +3,9 @@ - Import using AQBanking + Import using AqBanking gnc-plugin-aqbanking-actions.AQBankingImportAction - Import into GnuCash any file format supported by AQBanking + Import into GnuCash any file format supported by AqBanking diff --git a/gnucash/import-export/bi-import/dialog-bi-import-gui.c b/gnucash/import-export/bi-import/dialog-bi-import-gui.c index cf7c3a5e18e..07d4642f706 100644 --- a/gnucash/import-export/bi-import/dialog-bi-import-gui.c +++ b/gnucash/import-export/bi-import/dialog-bi-import-gui.c @@ -191,7 +191,7 @@ gnc_plugin_bi_import_getFilename(GtkWindow *parent) gtk_file_filter_set_name (filter, "text files (*.txt)"); gtk_file_filter_add_pattern (filter, "*.txt"); filters = g_list_append( filters, filter ); - filename = gnc_file_dialog(parent, _("Import Bills or Invoices from csv"), filters, NULL, GNC_FILE_DIALOG_IMPORT); + filename = gnc_file_dialog(parent, _("Import Bills or Invoices from CSV"), filters, NULL, GNC_FILE_DIALOG_IMPORT); return filename; } diff --git a/gnucash/import-export/customer-import/dialog-customer-import-gui.c b/gnucash/import-export/customer-import/dialog-customer-import-gui.c index 4c47612998d..2e56d85b5e0 100644 --- a/gnucash/import-export/customer-import/dialog-customer-import-gui.c +++ b/gnucash/import-export/customer-import/dialog-customer-import-gui.c @@ -169,7 +169,7 @@ gnc_plugin_customer_import_getFilename (GtkWindow *parent) gtk_file_filter_add_pattern (filter, "*.txt"); filters = g_list_append( filters, filter ); filename = gnc_file_dialog(parent, - _("Import Customers from csv"), filters, NULL, GNC_FILE_DIALOG_IMPORT); + _("Import Customers from CSV"), filters, NULL, GNC_FILE_DIALOG_IMPORT); return filename; } diff --git a/gnucash/report/reports/standard/invoice.scm b/gnucash/report/reports/standard/invoice.scm index 6036b891128..cb02e3af995 100644 --- a/gnucash/report/reports/standard/invoice.scm +++ b/gnucash/report/reports/standard/invoice.scm @@ -480,7 +480,7 @@ for styling the invoice. Please see the exported report for the CSS class names. (gnc-register-simple-boolean-option options (N_ "Display") (N_ "Use Detailed Tax Summary") - "o" (N_ "Display all tax categories separately (one per line) instead of one single tax line.?") #f) + "o" (N_ "Display all tax categories separately (one per line) instead of one single tax line?") #f) (gnc-register-simple-boolean-option options (N_ "Display") (N_ "References") diff --git a/gnucash/report/reports/standard/taxinvoice.scm b/gnucash/report/reports/standard/taxinvoice.scm index 0991f9bbc07..33ba21a74d6 100644 --- a/gnucash/report/reports/standard/taxinvoice.scm +++ b/gnucash/report/reports/standard/taxinvoice.scm @@ -317,9 +317,9 @@ (set-opt options headingpage optname-tax-rate (G_ "GST Rate")) (set-opt options headingpage optname-tax-amount (G_ "GST Amount")) (set-opt options headingpage2 optname-amount-due (G_ "Amount Due (inc GST)")) - (set-opt options headingpage2 optname-invoice-number-text (G_ "Invoice #: ")) - (set-opt options headingpage2 optname-ref-text (G_ "Reference: ")) - (set-opt options headingpage2 optname-jobname-text (G_ "Engagement: ")) + (set-opt options headingpage2 optname-invoice-number-text (G_ "Invoice #:")) + (set-opt options headingpage2 optname-ref-text (G_ "Reference:")) + (set-opt options headingpage2 optname-jobname-text (G_ "Engagement:")) (set-opt options notespage optname-extra-css "h1.coyname { text-align: right; margin-bottom: 0px ; font-size: 200%; } h2.invoice { text-align: left; margin-bottom: 0px ; font-size: 500%; }") options)) diff --git a/libgnucash/engine/gnc-optiondb.cpp b/libgnucash/engine/gnc-optiondb.cpp index f423164db7f..1c59e151f24 100644 --- a/libgnucash/engine/gnc-optiondb.cpp +++ b/libgnucash/engine/gnc-optiondb.cpp @@ -1335,11 +1335,11 @@ gnc_option_db_book_options(GncOptionDB* odb) N_("Length of time to change the used invoice report. A value of 0 means disabled."), 0.0, 0.0, 20.0, 1.0); gnc_register_taxtable_option(odb, business_section, - N_("Default Customer TaxTable"), "f1", + N_("Default Customer Tax Table"), "f1", N_("The default tax table to apply to customers."), nullptr); gnc_register_taxtable_option(odb, business_section, - N_("Default Vendor TaxTable"), "f2", + N_("Default Vendor Tax Table"), "f2", N_("The default tax table to apply to vendors."), nullptr); From cad061f601066604b87453c4fb1fc4f6c4dedb8f Mon Sep 17 00:00:00 2001 From: Christian Wehling Date: Sat, 20 Apr 2024 16:17:19 +0200 Subject: [PATCH 2/5] glade-files: Use of stylesheets for labels as recommended in the GUI-Guidelines for 'Markups in Text' in the wiki. * Replace markup elements such as <b> * Change attribute elements --- gnucash/gtkbuilder/assistant-csv-export.glade | 24 +-- .../assistant-csv-price-import.glade | 33 +++- .../assistant-csv-trans-import.glade | 20 +- gnucash/gtkbuilder/assistant-hierarchy.glade | 22 ++- gnucash/gtkbuilder/assistant-loan.glade | 2 +- gnucash/gtkbuilder/assistant-qif-import.glade | 6 +- .../gtkbuilder/assistant-stock-split.glade | 10 +- .../gtkbuilder/assistant-xml-encoding.glade | 15 +- gnucash/gtkbuilder/business-prefs.glade | 16 +- .../gtkbuilder/dialog-account-picker.glade | 6 +- gnucash/gtkbuilder/dialog-account.glade | 38 ++-- gnucash/gtkbuilder/dialog-billterms.glade | 26 ++- gnucash/gtkbuilder/dialog-commodities.glade | 6 +- gnucash/gtkbuilder/dialog-commodity.glade | 11 +- .../dialog-customer-import-gui.glade | 23 ++- gnucash/gtkbuilder/dialog-doclink.glade | 12 +- gnucash/gtkbuilder/dialog-file-access.glade | 15 +- gnucash/gtkbuilder/dialog-fincalc.glade | 21 +- gnucash/gtkbuilder/dialog-find-account.glade | 6 +- gnucash/gtkbuilder/dialog-imap-editor.glade | 5 +- gnucash/gtkbuilder/dialog-import.glade | 11 +- gnucash/gtkbuilder/dialog-lot-viewer.glade | 26 ++- gnucash/gtkbuilder/dialog-payment.glade | 36 ++-- gnucash/gtkbuilder/dialog-preferences.glade | 185 ++++++++++++------ gnucash/gtkbuilder/dialog-report.glade | 25 ++- gnucash/gtkbuilder/dialog-search.glade | 5 +- gnucash/gtkbuilder/dialog-sx.glade | 27 ++- gnucash/gtkbuilder/dialog-tax-info.glade | 31 ++- gnucash/gtkbuilder/dialog-tax-table.glade | 22 ++- gnucash/gtkbuilder/dialog-totd.glade | 5 +- gnucash/gtkbuilder/dialog-transfer.glade | 22 ++- .../gtkbuilder/gnc-plugin-page-register.glade | 6 +- gnucash/gtkbuilder/window-reconcile.glade | 5 +- .../import-export/aqb/dialog-ab-pref.glade | 6 +- gnucash/import-export/aqb/dialog-ab.glade | 23 ++- 35 files changed, 505 insertions(+), 247 deletions(-) diff --git a/gnucash/gtkbuilder/assistant-csv-export.glade b/gnucash/gtkbuilder/assistant-csv-export.glade index e29016424d9..3c882e530e6 100644 --- a/gnucash/gtkbuilder/assistant-csv-export.glade +++ b/gnucash/gtkbuilder/assistant-csv-export.glade @@ -97,9 +97,9 @@ Select the type of Export required and the separator that will be used. True False Options - - - + @@ -212,9 +212,9 @@ Select the type of Export required and the separator that will be used. True False Select Separator Character - - - + @@ -268,9 +268,9 @@ Select the type of Export required and the separator that will be used. False start Accounts - - - + False @@ -424,9 +424,9 @@ Select the type of Export required and the separator that will be used. False start Date Range - - - + False diff --git a/gnucash/gtkbuilder/assistant-csv-price-import.glade b/gnucash/gtkbuilder/assistant-csv-price-import.glade index 0a82ec8a81b..26fb2483802 100644 --- a/gnucash/gtkbuilder/assistant-csv-price-import.glade +++ b/gnucash/gtkbuilder/assistant-csv-price-import.glade @@ -190,7 +190,10 @@ There are two reserved names which can't be used to save custom settings: True False start - <b>Load and Save Settings</b> + Load and Save Settings + True False @@ -556,7 +559,10 @@ There are two reserved names which can't be used to save custom settings: False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK start - <b>File Format</b> + File Format + True @@ -778,7 +784,10 @@ For example True False start - <b>Miscellaneous</b> + Miscellaneous + True @@ -838,7 +847,10 @@ For example True False - <b>Commodity From</b> + Commodity From + True @@ -884,9 +896,9 @@ For example True False Currency To - - - + @@ -1011,8 +1023,11 @@ For example True False - <b>Press "Apply" to add the Prices. -"Cancel" to abort.</b> + Press "Apply" to add the Prices. +"Cancel" to abort. + True center True diff --git a/gnucash/gtkbuilder/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade index acc66a567fb..87a71d26ed6 100644 --- a/gnucash/gtkbuilder/assistant-csv-trans-import.glade +++ b/gnucash/gtkbuilder/assistant-csv-trans-import.glade @@ -180,7 +180,10 @@ There are two reserved names which can't be used to save custom settings: True False - <b>Load and Save Settings</b> + Load and Save Settings + True False @@ -548,7 +551,10 @@ To know which lines belong to the same transaction, the importer will compare th True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>File Format</b> + File Format + True @@ -781,7 +787,10 @@ For example True False - <b>Miscellaneous</b> + Miscellaneous + True @@ -812,7 +821,10 @@ For example True False - <b>Account</b> + Account + True diff --git a/gnucash/gtkbuilder/assistant-hierarchy.glade b/gnucash/gtkbuilder/assistant-hierarchy.glade index 7bd46bd1517..292f292cc78 100644 --- a/gnucash/gtkbuilder/assistant-hierarchy.glade +++ b/gnucash/gtkbuilder/assistant-hierarchy.glade @@ -159,7 +159,10 @@ Click 'Cancel' if you do not wish to create any new accounts now. True False - <b>Categories</b> + Categories + True @@ -307,7 +310,10 @@ Click 'Cancel' if you do not wish to create any new accounts now. True False - <b>Category Description</b> + Category Description + True @@ -374,9 +380,9 @@ Click 'Cancel' if you do not wish to create any new accounts now. True False Accounts in %s - - - + False @@ -418,9 +424,9 @@ Click 'Cancel' if you do not wish to create any new accounts now. 6 6 Notes - - - + False diff --git a/gnucash/gtkbuilder/assistant-loan.glade b/gnucash/gtkbuilder/assistant-loan.glade index 9db28668538..8be211ffa34 100644 --- a/gnucash/gtkbuilder/assistant-loan.glade +++ b/gnucash/gtkbuilder/assistant-loan.glade @@ -545,7 +545,7 @@ If you make a mistake or want to make changes later, you can edit the created Sc center True diff --git a/gnucash/gtkbuilder/assistant-qif-import.glade b/gnucash/gtkbuilder/assistant-qif-import.glade index 2908e1f3803..7cc42d30aec 100644 --- a/gnucash/gtkbuilder/assistant-qif-import.glade +++ b/gnucash/gtkbuilder/assistant-qif-import.glade @@ -941,9 +941,9 @@ In the following page, you will see the text that appears in the Payee and Memo True False Book Options - - - + False diff --git a/gnucash/gtkbuilder/assistant-stock-split.glade b/gnucash/gtkbuilder/assistant-stock-split.glade index 2ea27b0494c..9e4a1502fcd 100644 --- a/gnucash/gtkbuilder/assistant-stock-split.glade +++ b/gnucash/gtkbuilder/assistant-stock-split.glade @@ -343,7 +343,10 @@ True False - <b>_Income Account</b> + _Income Account + True True @@ -356,7 +359,10 @@ True False - <b>A_sset Account</b> + A_sset Account + True True diff --git a/gnucash/gtkbuilder/assistant-xml-encoding.glade b/gnucash/gtkbuilder/assistant-xml-encoding.glade index eebeb3b8cb6..175189c7adb 100644 --- a/gnucash/gtkbuilder/assistant-xml-encoding.glade +++ b/gnucash/gtkbuilder/assistant-xml-encoding.glade @@ -236,7 +236,10 @@ True False start - <b>S_ystem input encodings</b> + S_ystem input encodings + True True available_encs_view @@ -322,7 +325,10 @@ True False start - <b>_Custom encoding</b> + _Custom encoding + True True custom_enc_entry @@ -405,7 +411,10 @@ True False start - <b>_Selected encodings</b> + _Selected encodings + True True selected_encs_view diff --git a/gnucash/gtkbuilder/business-prefs.glade b/gnucash/gtkbuilder/business-prefs.glade index 770c973cb03..a0093ed8293 100644 --- a/gnucash/gtkbuilder/business-prefs.glade +++ b/gnucash/gtkbuilder/business-prefs.glade @@ -34,9 +34,9 @@ False start General - - - + 0 @@ -112,7 +112,10 @@ True False start - <b>Invoices</b> + Invoices + True @@ -189,7 +192,10 @@ True False start - <b>Bills</b> + Bills + True diff --git a/gnucash/gtkbuilder/dialog-account-picker.glade b/gnucash/gtkbuilder/dialog-account-picker.glade index 405e26d9b05..26252826e17 100644 --- a/gnucash/gtkbuilder/dialog-account-picker.glade +++ b/gnucash/gtkbuilder/dialog-account-picker.glade @@ -20,9 +20,9 @@ False start QIF Import - - - + 0 diff --git a/gnucash/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade index 3a97c0d15db..aa079218b54 100644 --- a/gnucash/gtkbuilder/dialog-account.glade +++ b/gnucash/gtkbuilder/dialog-account.glade @@ -444,7 +444,10 @@ True False start - <b>Sub-accounts</b> + Sub-accounts + True @@ -551,9 +554,9 @@ False start Transactions - - - + False @@ -671,7 +674,10 @@ True False start - <b>Sub-account Transactions</b> + Sub-account Transactions + True @@ -1192,9 +1198,9 @@ False start Identification - - - + 0 @@ -1703,9 +1709,9 @@ Clear the entry to have no warning. False start Balance Limit - - - + 0 @@ -1778,7 +1784,10 @@ Clear the entry to have no warning. False start start - <b>Balance Information</b> + Balance Information + True @@ -1792,7 +1801,10 @@ Clear the entry to have no warning. True False start - <b>Initial Balance Transfer</b> + Initial Balance Transfer + True diff --git a/gnucash/gtkbuilder/dialog-billterms.glade b/gnucash/gtkbuilder/dialog-billterms.glade index f2026bf15b4..88f1886d210 100644 --- a/gnucash/gtkbuilder/dialog-billterms.glade +++ b/gnucash/gtkbuilder/dialog-billterms.glade @@ -431,9 +431,9 @@ False start Terms - - - + False @@ -543,7 +543,10 @@ True False start - <b>Term Definition</b> + Term Definition + True @@ -841,7 +844,10 @@ True False start - <b>Term Definition</b> + Term Definition + True @@ -1069,7 +1075,10 @@ True False start - <b>New Billing Term</b> + New Billing Term + True @@ -1084,7 +1093,10 @@ False start 6 - <b>Term Definition</b> + Term Definition + True diff --git a/gnucash/gtkbuilder/dialog-commodities.glade b/gnucash/gtkbuilder/dialog-commodities.glade index a7d76d80b02..cb7a10bc180 100644 --- a/gnucash/gtkbuilder/dialog-commodities.glade +++ b/gnucash/gtkbuilder/dialog-commodities.glade @@ -25,9 +25,9 @@ True False Securities - - - + False diff --git a/gnucash/gtkbuilder/dialog-commodity.glade b/gnucash/gtkbuilder/dialog-commodity.glade index 630db394573..9247b71dea6 100644 --- a/gnucash/gtkbuilder/dialog-commodity.glade +++ b/gnucash/gtkbuilder/dialog-commodity.glade @@ -212,7 +212,10 @@ True False start - <b>Quote Source Information</b> + Quote Source Information + True @@ -227,9 +230,9 @@ False start Security Information - - - + 0 diff --git a/gnucash/gtkbuilder/dialog-customer-import-gui.glade b/gnucash/gtkbuilder/dialog-customer-import-gui.glade index 0bedac4e607..66f9ab64174 100644 --- a/gnucash/gtkbuilder/dialog-customer-import-gui.glade +++ b/gnucash/gtkbuilder/dialog-customer-import-gui.glade @@ -124,9 +124,9 @@ True False 1. Choose the file to import - - - + @@ -189,7 +189,10 @@ True False - <b>2. Select Import Type</b> + 2. Select Import Type + True @@ -308,9 +311,9 @@ True False 3. Select import options - - - + @@ -351,9 +354,9 @@ True False 4. Preview - - - + diff --git a/gnucash/gtkbuilder/dialog-doclink.glade b/gnucash/gtkbuilder/dialog-doclink.glade index c03da4a3e8e..04ad5f60199 100644 --- a/gnucash/gtkbuilder/dialog-doclink.glade +++ b/gnucash/gtkbuilder/dialog-doclink.glade @@ -47,9 +47,9 @@ True False Change Linked Document path head - - - + False @@ -596,9 +596,9 @@ True False All Linked Documents - - - + False diff --git a/gnucash/gtkbuilder/dialog-file-access.glade b/gnucash/gtkbuilder/dialog-file-access.glade index 7b9d83b3c80..3cd7ae693f2 100644 --- a/gnucash/gtkbuilder/dialog-file-access.glade +++ b/gnucash/gtkbuilder/dialog-file-access.glade @@ -69,7 +69,10 @@ True False - <b>Data Format</b> + Data Format + True @@ -137,7 +140,10 @@ True False - <b>File</b> + File + True @@ -278,7 +284,10 @@ True False - <b>Database Connection</b> + Database Connection + True diff --git a/gnucash/gtkbuilder/dialog-fincalc.glade b/gnucash/gtkbuilder/dialog-fincalc.glade index 60b7021368f..0a6034d651f 100644 --- a/gnucash/gtkbuilder/dialog-fincalc.glade +++ b/gnucash/gtkbuilder/dialog-fincalc.glade @@ -183,7 +183,10 @@ True False start - <b>Calculations</b> + Calculations + True @@ -511,7 +514,10 @@ True False start - <b>Payment Options</b> + Payment Options + True @@ -631,7 +637,10 @@ True False start - <b>Compounding</b> + Compounding + True right @@ -648,9 +657,9 @@ start 6 Period - - - + 0 diff --git a/gnucash/gtkbuilder/dialog-find-account.glade b/gnucash/gtkbuilder/dialog-find-account.glade index 208f4c19c12..820f77d3729 100644 --- a/gnucash/gtkbuilder/dialog-find-account.glade +++ b/gnucash/gtkbuilder/dialog-find-account.glade @@ -94,9 +94,9 @@ False 6 Search the Account List - - - + False diff --git a/gnucash/gtkbuilder/dialog-imap-editor.glade b/gnucash/gtkbuilder/dialog-imap-editor.glade index d19babd1b20..51d0ea882ba 100644 --- a/gnucash/gtkbuilder/dialog-imap-editor.glade +++ b/gnucash/gtkbuilder/dialog-imap-editor.glade @@ -103,7 +103,10 @@ True False - <b>What type of information to display?</b> + What type of information to display? + True diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade index 19e07f5cf04..15b09f0363d 100644 --- a/gnucash/gtkbuilder/dialog-import.glade +++ b/gnucash/gtkbuilder/dialog-import.glade @@ -519,9 +519,9 @@ False start Colors - - - + 0 @@ -633,7 +633,10 @@ True False - <b>Actions</b> + Actions + True diff --git a/gnucash/gtkbuilder/dialog-lot-viewer.glade b/gnucash/gtkbuilder/dialog-lot-viewer.glade index 8960efaf15b..a24d50f3b8f 100644 --- a/gnucash/gtkbuilder/dialog-lot-viewer.glade +++ b/gnucash/gtkbuilder/dialog-lot-viewer.glade @@ -151,9 +151,9 @@ _Notes True lot_notes_text - - - + 0 @@ -190,7 +190,10 @@ True False start - <b>_Title</b> + _Title + True True center @@ -220,7 +223,10 @@ True False start - <b>_Lots in This Account</b> + _Lots in This Account + True True lot_view @@ -301,7 +307,10 @@ True False start - <b>Splits _free</b> + Splits _free + True True split_free_view @@ -356,7 +365,10 @@ True False start - <b>Splits _in lot</b> + Splits _in lot + True True split_in_lot_view diff --git a/gnucash/gtkbuilder/dialog-payment.glade b/gnucash/gtkbuilder/dialog-payment.glade index 7d33a3ad05a..b015064894a 100644 --- a/gnucash/gtkbuilder/dialog-payment.glade +++ b/gnucash/gtkbuilder/dialog-payment.glade @@ -167,9 +167,9 @@ The company associated with this payment. The company associated with this payment. Partner - - - + @@ -205,9 +205,9 @@ True False Post To - - - + @@ -333,9 +333,9 @@ True False Documents - - - + @@ -417,9 +417,9 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic end Amount right - - - + 0 @@ -660,9 +660,9 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic True False Transaction Details - - - + @@ -696,9 +696,9 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic True False Transfer Account - - - + diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade index dcb0e693853..d0664990ba5 100644 --- a/gnucash/gtkbuilder/dialog-preferences.glade +++ b/gnucash/gtkbuilder/dialog-preferences.glade @@ -182,7 +182,10 @@ True False - <b>Separator Character</b> + Separator Character + True @@ -326,7 +329,10 @@ Press 'Close' to return to the preference window True False start - <b>Summary Bar Content</b> + Summary Bar Content + True @@ -376,9 +382,9 @@ Press 'Close' to return to the preference window False start Start Date - - - + 0 @@ -391,9 +397,9 @@ Press 'Close' to return to the preference window False start End Date - - - + 0 @@ -596,7 +602,10 @@ Press 'Close' to return to the preference window True False start - <b>Separator Character</b> + Separator Character + True @@ -627,7 +636,10 @@ Press 'Close' to return to the preference window True False start - <b>Labels</b> + Labels + True @@ -707,7 +719,10 @@ Press 'Close' to return to the preference window True False start - <b>Reverse Balanced Accounts</b> + Reverse Balanced Accounts + True @@ -740,7 +755,10 @@ Press 'Close' to return to the preference window True False start - <b>Default Currency</b> + Default Currency + True @@ -814,9 +832,9 @@ Press 'Close' to return to the preference window False start Account Color - - - + 0 @@ -1019,9 +1037,9 @@ Press 'Close' to return to the preference window False start Fancy Date Format - - - + 0 @@ -1044,9 +1062,9 @@ Press 'Close' to return to the preference window False start Date Format - - - + 0 @@ -1058,7 +1076,10 @@ Press 'Close' to return to the preference window True False start - <b>Time Format</b> + Time Format + True @@ -1099,7 +1120,10 @@ Press 'Close' to return to the preference window True False start - <b>Date Completion</b> + Date Completion + True @@ -1212,7 +1236,10 @@ many months before the current month True False start - <b>Numbers</b> + Numbers + True @@ -1407,9 +1434,9 @@ many months before the current month False start General - - - + 0 @@ -1520,7 +1547,10 @@ many months before the current month True False start - <b>_Retain log/backup files</b> + _Retain log/backup files + True True pref/general/retain-days @@ -1553,7 +1583,10 @@ many months before the current month True False start - <b>Files</b> + Files + True @@ -1586,7 +1619,10 @@ many months before the current month True False start - <b>Search Dialog</b> + Search Dialog + True @@ -1958,7 +1994,10 @@ many months before the current month True False start - <b>Linked Files</b> + Linked Files + True @@ -2096,9 +2135,9 @@ many months before the current month False start General - - - + 0 @@ -2388,7 +2427,10 @@ many months before the current month True False start - <b>Checks</b> + Checks + True @@ -2501,7 +2543,10 @@ many months before the current month True False start - <b>Actions</b> + Actions + True @@ -2578,7 +2623,10 @@ many months before the current month True False start - <b>Reconciling</b> + Reconciling + True @@ -2655,7 +2703,10 @@ many months before the current month True False start - <b>Graphics</b> + Graphics + True @@ -2751,9 +2802,9 @@ many months before the current month False start Layout - - - + 0 @@ -2808,7 +2859,10 @@ many months before the current month True False start - <b>Default Style</b> + Default Style + True @@ -2831,7 +2885,10 @@ many months before the current month True False start - <b>Other Defaults</b> + Other Defaults + True @@ -3085,7 +3142,10 @@ many months before the current month True False start - <b>Default Report Currency</b> + Default Report Currency + True @@ -3108,7 +3168,10 @@ many months before the current month True False start - <b>Location</b> + Location + True @@ -3153,9 +3216,9 @@ many months before the current month False start Default zoom level - - - + 0 @@ -3287,7 +3350,10 @@ many months before the current month True False start - <b>Window Geometry</b> + Window Geometry + True @@ -3358,7 +3424,10 @@ many months before the current month True False start - <b>Tab Position</b> + Tab Position + True @@ -3447,7 +3516,10 @@ many months before the current month True False start - <b>Summary Bar Position</b> + Summary Bar Position + True @@ -3508,7 +3580,10 @@ many months before the current month True False start - <b>Tabs</b> + Tabs + True @@ -3709,9 +3784,9 @@ many months before the current month False start Online Quotes - - - + 0 diff --git a/gnucash/gtkbuilder/dialog-report.glade b/gnucash/gtkbuilder/dialog-report.glade index 2aaadbd22de..04c6971f08a 100644 --- a/gnucash/gtkbuilder/dialog-report.glade +++ b/gnucash/gtkbuilder/dialog-report.glade @@ -52,7 +52,10 @@ True False start - <b>A_vailable reports</b> + A_vailable reports + True True center @@ -68,7 +71,10 @@ True False start - <b>_Selected Reports</b> + _Selected Reports + True True contents_view @@ -299,7 +305,10 @@ True False - <b>Available style sheets</b> + Available style sheets + True @@ -379,7 +388,10 @@ True False - <b>Style sheet options</b> + Style sheet options + True @@ -756,7 +768,10 @@ True False - <b>New style sheet info</b> + New style sheet info + True diff --git a/gnucash/gtkbuilder/dialog-search.glade b/gnucash/gtkbuilder/dialog-search.glade index 4323fb1b4b9..d8eaf2b50de 100644 --- a/gnucash/gtkbuilder/dialog-search.glade +++ b/gnucash/gtkbuilder/dialog-search.glade @@ -225,7 +225,10 @@ True False - <b>Match all entries</b> + Match all entries + True diff --git a/gnucash/gtkbuilder/dialog-sx.glade b/gnucash/gtkbuilder/dialog-sx.glade index 45e94d8a33f..c2752127847 100644 --- a/gnucash/gtkbuilder/dialog-sx.glade +++ b/gnucash/gtkbuilder/dialog-sx.glade @@ -505,7 +505,10 @@ True False start - <b>Since Last Run</b> + Since Last Run + True @@ -528,7 +531,10 @@ True False start - <b>Transaction Editor Defaults</b> + Transaction Editor Defaults + True @@ -870,9 +876,9 @@ Name True center - - - + False @@ -930,9 +936,9 @@ False start Options - - - + False @@ -1148,7 +1154,10 @@ True False start - <b>Occurrences</b> + Occurrences + True diff --git a/gnucash/gtkbuilder/dialog-tax-info.glade b/gnucash/gtkbuilder/dialog-tax-info.glade index 27904bfe7e1..0e836823b0f 100644 --- a/gnucash/gtkbuilder/dialog-tax-info.glade +++ b/gnucash/gtkbuilder/dialog-tax-info.glade @@ -87,9 +87,9 @@ False start Income Tax Identity - - - + False @@ -243,7 +243,10 @@ True False start - <b>_Accounts</b> + _Accounts + True True @@ -469,7 +472,10 @@ True False start - <b>Account Tax Information</b> + Account Tax Information + True @@ -512,7 +518,10 @@ True False start - <b>_TXF Categories</b> + _TXF Categories + True True @@ -615,7 +624,10 @@ True False - <b>Payer Name Source</b> + Payer Name Source + True @@ -676,7 +688,10 @@ True False - <b>Copy Number</b> + Copy Number + True diff --git a/gnucash/gtkbuilder/dialog-tax-table.glade b/gnucash/gtkbuilder/dialog-tax-table.glade index 3994f60b778..959467abd40 100644 --- a/gnucash/gtkbuilder/dialog-tax-table.glade +++ b/gnucash/gtkbuilder/dialog-tax-table.glade @@ -29,9 +29,9 @@ False start Tax Tables - - - + False @@ -139,7 +139,10 @@ True False start - <b>Tax Table Entries</b> + Tax Table Entries + True @@ -382,7 +385,10 @@ True False start - <b>Tax Table Entry</b> + Tax Table Entry + True @@ -397,9 +403,9 @@ False start Tax Table - - - + 0 diff --git a/gnucash/gtkbuilder/dialog-totd.glade b/gnucash/gtkbuilder/dialog-totd.glade index 4fab47173e1..92ba9d1ae0e 100644 --- a/gnucash/gtkbuilder/dialog-totd.glade +++ b/gnucash/gtkbuilder/dialog-totd.glade @@ -92,7 +92,10 @@ True False start - <b>Tip of the Day</b> + Tip of the Day + True True diff --git a/gnucash/gtkbuilder/dialog-transfer.glade b/gnucash/gtkbuilder/dialog-transfer.glade index 4259af83056..8335ded8282 100644 --- a/gnucash/gtkbuilder/dialog-transfer.glade +++ b/gnucash/gtkbuilder/dialog-transfer.glade @@ -77,7 +77,10 @@ True False start - <b>Basic Information</b> + Basic Information + True @@ -271,9 +274,9 @@ False start Transfer From - - - + 0 @@ -332,9 +335,9 @@ False start Transfer To - - - + 2 @@ -488,7 +491,10 @@ True False start - <b>Currency Transfer</b> + Currency Transfer + True diff --git a/gnucash/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gtkbuilder/gnc-plugin-page-register.glade index 939a0f8faa8..25d00c0634c 100644 --- a/gnucash/gtkbuilder/gnc-plugin-page-register.glade +++ b/gnucash/gtkbuilder/gnc-plugin-page-register.glade @@ -623,9 +623,9 @@ If 0, all previous days included False start New Transaction Information - - - + False diff --git a/gnucash/gtkbuilder/window-reconcile.glade b/gnucash/gtkbuilder/window-reconcile.glade index 55ec227192b..aba0b13c8ac 100644 --- a/gnucash/gtkbuilder/window-reconcile.glade +++ b/gnucash/gtkbuilder/window-reconcile.glade @@ -68,7 +68,10 @@ start 6 6 - <b>Reconcile Information</b> + Reconcile Information + True diff --git a/gnucash/import-export/aqb/dialog-ab-pref.glade b/gnucash/import-export/aqb/dialog-ab-pref.glade index 735b499912f..90817543c4e 100644 --- a/gnucash/import-export/aqb/dialog-ab-pref.glade +++ b/gnucash/import-export/aqb/dialog-ab-pref.glade @@ -20,9 +20,9 @@ False start Online Banking - - - + 0 diff --git a/gnucash/import-export/aqb/dialog-ab.glade b/gnucash/import-export/aqb/dialog-ab.glade index 1fab4381429..c1b2e638b09 100644 --- a/gnucash/import-export/aqb/dialog-ab.glade +++ b/gnucash/import-export/aqb/dialog-ab.glade @@ -81,9 +81,9 @@ False Progress 0 - - - + False @@ -208,7 +208,10 @@ True False - <b>_Log Messages</b> + _Log Messages + True True 0 @@ -368,9 +371,9 @@ False From 0 - - - + False @@ -473,9 +476,9 @@ False To 0 - - - + False From 548f6e04bd22163b8057b3dd14c5d44fb833b4d1 Mon Sep 17 00:00:00 2001 From: Christian Wehling Date: Sat, 18 May 2024 17:43:21 +0200 Subject: [PATCH 3/5] glade-files: Separate bold formatted label "Note:" ... ... from the following content. --- gnucash/gtkbuilder/assistant-hierarchy.glade | 41 ++++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/gnucash/gtkbuilder/assistant-hierarchy.glade b/gnucash/gtkbuilder/assistant-hierarchy.glade index 292f292cc78..019b0ff8fa1 100644 --- a/gnucash/gtkbuilder/assistant-hierarchy.glade +++ b/gnucash/gtkbuilder/assistant-hierarchy.glade @@ -537,9 +537,7 @@ Click 'Cancel' if you do not wish to create any new accounts now. Some accounts are marked as "Placeholder". Placeholder accounts are used to create a hierarchy of accounts and normally do not have transactions or opening balances. If you would like an account to be a placeholder account, click the checkbox for that account. -If you would like an account to have an opening balance, click on the row containing the account, then click on the opening balance field and enter the starting balance. - -<b>Note:</b> all accounts except Equity and placeholder accounts may have an opening balance. +If you would like an account to have an opening balance, click on the row containing the account, then click on the opening balance field and enter the starting balance. True True 75 @@ -551,17 +549,52 @@ If you would like an account to have an opening balance, click on the row contai 0 + + + True + False + start + 12 + 12 + Note: + + + + False + True + 1 + + + + + True + False + start + 12 + 12 + All accounts except Equity and placeholder accounts may have an opening balance. + + + False + True + 2 + + True True 12 + 12 + 6 in True True - 1 + 3 From 5f0b9008e67f15d252a86b45a893e780e57fa8f3 Mon Sep 17 00:00:00 2001 From: Christian Wehling Date: Sat, 18 May 2024 18:18:45 +0200 Subject: [PATCH 4/5] glade-files: Replace other inline formattings with stylesheets use gnc-class-title instead of <span weight="bold" size="larger"> and gnc-class-emphasis instead of <span style="italic"> --- gnucash/gtkbuilder/assistant-qif-import.glade | 20 +++++++++++++++---- gnucash/gtkbuilder/dialog-new-user.glade | 10 ++++++++-- gnucash/gtkbuilder/dialog-progress.glade | 10 ++++++++-- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/gnucash/gtkbuilder/assistant-qif-import.glade b/gnucash/gtkbuilder/assistant-qif-import.glade index 7cc42d30aec..2cadd9a5799 100644 --- a/gnucash/gtkbuilder/assistant-qif-import.glade +++ b/gnucash/gtkbuilder/assistant-qif-import.glade @@ -121,7 +121,10 @@ You will have the opportunity to load as many files as you wish, so don't worry True False - <span weight="bold" size="larger">Primary text</span> + Primary text + True True @@ -165,7 +168,10 @@ You will have the opportunity to load as many files as you wish, so don't worry True False - <span style="italic">Sub-operation text</span> + Sub-operation text + True True @@ -1063,7 +1069,10 @@ If you don't see your exchange listed, or none of the available choices are appr True False - <span weight="bold" size="larger">Primary text</span> + Primary text + True True @@ -1107,7 +1116,10 @@ If you don't see your exchange listed, or none of the available choices are appr True False - <span style="italic">Sub-operation text</span> + Sub-operation text + True True diff --git a/gnucash/gtkbuilder/dialog-new-user.glade b/gnucash/gtkbuilder/dialog-new-user.glade index 73d39d165ca..6223b34e2ae 100644 --- a/gnucash/gtkbuilder/dialog-new-user.glade +++ b/gnucash/gtkbuilder/dialog-new-user.glade @@ -84,7 +84,10 @@ True False - <span weight="bold" size="larger">Display Welcome Dialog Again?</span> + Display Welcome Dialog Again? + True @@ -207,7 +210,10 @@ True False - <span size="larger" weight="bold">Welcome to GnuCash!</span> + Welcome to GnuCash! + True diff --git a/gnucash/gtkbuilder/dialog-progress.glade b/gnucash/gtkbuilder/dialog-progress.glade index 30a9900e7fe..63b10befdff 100644 --- a/gnucash/gtkbuilder/dialog-progress.glade +++ b/gnucash/gtkbuilder/dialog-progress.glade @@ -24,7 +24,10 @@ True False - <span weight="bold" size="larger">Primary text</span> + Primary text + True True @@ -68,7 +71,10 @@ True False - <span style="italic">Sub-operation text</span> + Sub-operation text + True True From beaab58b72d897865cc162285561dd81533a69a1 Mon Sep 17 00:00:00 2001 From: Christian Wehling Date: Sat, 18 May 2024 17:48:07 +0200 Subject: [PATCH 5/5] glade-files: Replace 'italic' formatting with "" or remove it. --- gnucash/gtkbuilder/assistant-csv-trans-import.glade | 6 +++--- gnucash/gtkbuilder/dialog-new-user.glade | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnucash/gtkbuilder/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade index 87a71d26ed6..6ee655acc9f 100644 --- a/gnucash/gtkbuilder/assistant-csv-trans-import.glade +++ b/gnucash/gtkbuilder/assistant-csv-trans-import.glade @@ -1071,13 +1071,13 @@ For example 12 If you click "Next" Gnucash will perform a number of checks. -If one of those <i>checks fails</i> you'll be automatically redirected to the preview page to try and correct. +If one of those "checks fails" you'll be automatically redirected to the preview page to try and correct. On the following page you will be able to associate each transaction to a category. -If this is your <i>initial import into a new file</i>, you will first see a dialog for setting book options, since these can affect how imported data are converted to GnuCash transactions. If this is an existing file, the dialog will not be shown. +If this is your "initial import into a new file", you will first see a dialog for setting book options, since these can affect how imported data are converted to GnuCash transactions. If this is an existing file, the dialog will not be shown. -If this is the <i>first time importing</i>, you will find that all lines may need to be associated. On subsequent imports, the importer will try to associate the transactions based on previous imports. +If this is the "first time importing", you will find that all lines may need to be associated. On subsequent imports, the importer will try to associate the transactions based on previous imports. The confidence of a correct association is displayed as a colored bar. diff --git a/gnucash/gtkbuilder/dialog-new-user.glade b/gnucash/gtkbuilder/dialog-new-user.glade index 6223b34e2ae..7c0e8c15228 100644 --- a/gnucash/gtkbuilder/dialog-new-user.glade +++ b/gnucash/gtkbuilder/dialog-new-user.glade @@ -101,7 +101,7 @@ False start start - If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog will be displayed again next time you start GnuCash. If you press the <i>No</i> button, it will not be displayed again. + If you press the "Yes" button, the "Welcome to GnuCash" dialog will be displayed again next time you start GnuCash. If you press the "No" button, it will not be displayed again. True True 40 @@ -233,7 +233,7 @@ True False - There are some predefined actions available that most new users prefer to get started with GnuCash. Select one of these actions from below and click the <i>OK</i> button or press the <i>Cancel</i> button if you don't want to perform any of them. + There are some predefined actions available that most new users prefer to get started with GnuCash. Select one of these actions from below and click the "OK" button or press the "Cancel" button if you don't want to perform any of them. True True 50