Merge branch 'maint'

.github/workflows/ci-tests.yml

@@ -45,12 +45,14 @@ jobs:
       uses: actions/checkout@v2
     - name: Install apt utils
       run: sudo apt-get install -y --no-install-recommends apt-utils
-    - name: Upgrade apt
+    - name: Update apt
       run: |
+        sudo sed -i -e 's/^# deb-src/deb-src/' /etc/apt/sources.list
         sudo apt-get update -y
-        sudo apt-get upgrade -y
     - name: Install additional dependencies
-      run: sudo apt-get install -y cmake libxslt-dev xsltproc ninja-build libboost-all-dev libgtk-3-dev guile-3.0-dev libgwengui-gtk3-dev libaqbanking-dev libofx-dev libdbi-dev libdbd-sqlite3 libwebkit2gtk-4.0-dev  googletest
+      run: |
+           sudo apt-get build-dep -y gnucash
+           sudo apt-get install ninja-build guile-3.0-dev libboost-program-options-dev
     - name: Install language packs.
       run: sudo apt-get --reinstall install -y language-pack-en language-pack-fr
     - run: |

CMakeLists.txt

@@ -818,6 +818,9 @@ dist_add_generated (${BUILDING_FROM_VCS} ChangeLog)
 ############################ BEGIN MAKE DIST #################
 
 set(PACKAGE_PREFIX "${PROJECT_NAME}-${PROJECT_VERSION}")
+if (PROJECT_DESCRIPTION)
+  string(APPEND PACKAGE_PREFIX "-${PROJECT_DESCRIPTION}")
+endif()
 set(DIST_FILE "${PACKAGE_PREFIX}.tar")
 
 set(toplvl_DIST_local ${gnucash_DOCS}

bindings/python/gnucash_business.py

@@ -248,7 +248,7 @@ methods_return_instance_lists(
 
 # Customer
 Customer.add_constructor_and_methods_with_prefix('gncCustomer', 'Create')
-Customer.add_method('gncOwnerApplyPayment', 'ApplyPayment')
+Customer.add_method('gncOwnerApplyPaymentSecs', 'ApplyPayment')
 
 customer_dict = {
                     'GetAddr' : Address,

bindings/python/time64.i

@@ -109,6 +109,8 @@
         PyDateTime_IMPORT;
         struct tm t;
         gnc_localtime_r(&$1, &t);
+        printf("\nConverting %d hours and %d minutes in zone %ld %s to python local time\n",
+               t.tm_hour, t.tm_min, t.tm_gmtoff/3600, t.tm_isdst ? "DST" : "STD");
         $result = PyDateTime_FromDateAndTime(t.tm_year + 1900, t.tm_mon + 1,
                                              t.tm_mday, t.tm_hour, t.tm_min,
                                              t.tm_sec, 0);

cmake/CMakeLists.txt

@@ -10,5 +10,5 @@ endif()
 
 set_dist_list(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in
     configure-appdata.cmake configure-gnucash-desktop.cmake configure-manpage.cmake
-    git2version-info.cmake version-info2env.cmake
+    configure-totd.cmake git2version-info.cmake version-info2env.cmake
 )

cmake/configure-manpage.cmake

@@ -12,5 +12,4 @@
 
 include (${SRC_DIR}/cmake/version-info2env.cmake)
 versioninfo2env (${VCS_INFO_FILE})
-configure_file(${SRC} ${DST} )
-configure_file(${DST} ${DATADIR_BUILD}/gnucash/${DST} COPYONLY)
+configure_file(${SRC} ${DATADIR_BUILD}/gnucash/${DST} )

cmake/configure-totd.cmake

@@ -0,0 +1,24 @@
+# Command to configure the gnucash man page
+# These commands are store in a separate cmake file as they have to be
+# rerun depending on build conditions, not depending on cmake conditions
+# (such as did the version string change or not)
+#
+# The following environment variables are used and should be properly set
+# by the calling code:
+# - SRC_DIR (source code directory containing tip_of_the_day.list.c)
+# - DST_DIR (build dir to write tip_of_the_day.list to)
+# - SRC (full path to tip_of_the_day.list.c)
+# - DST (target filename)
+# - CMAKE_C_COMPILER (path to C compiler, used to parse the input file)
+file(REMOVE ${DST_DIR}/${TOTD})
+execute_process(
+    COMMAND ${CMAKE_C_COMPILER} -E -P -x c -DN_\(x\)=x -o ${TOTD}.tmp ${SRC}
+)
+
+file(STRINGS ${TOTD}.tmp TIP_OF_THE_DAY_LINES)
+set(TOTD_OUTPUT "")
+foreach(line ${TIP_OF_THE_DAY_LINES})
+  string(REGEX REPLACE "^ *\"" "" line2 "${line}")
+  string(REGEX REPLACE "\" *$" "" line3 "${line2}")
+  file(APPEND ${DST_DIR}/${TOTD} "${line3}\n")
+endforeach()

doc/CMakeLists.txt

@@ -19,40 +19,35 @@ endforeach()
 
 # Generate the tip of the day file.
 
-execute_process(
-    COMMAND ${CMAKE_C_COMPILER} -E -P -x c -DN_\(x\)=x -o ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp ${CMAKE_CURRENT_SOURCE_DIR}/tip_of_the_day.list.c
+set (totd "tip_of_the_day.list")
+add_custom_command(OUTPUT ${DATADIR_BUILD}/gnucash/${totd}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${totd}.c
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND}
+        -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/${totd}.c
+        -D TOTD=${totd}
+        -D DST_DIR=${DATADIR_BUILD}/gnucash
+        -D CMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -P ${CMAKE_SOURCE_DIR}/cmake/configure-totd.cmake
 )
+add_custom_target(totd ALL DEPENDS ${DATADIR_BUILD}/gnucash/${totd})
 
-file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp TIP_OF_THE_DAY_LINES)
+install(FILES ${DATADIR_BUILD}/gnucash/tip_of_the_day.list DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash)
 
-set(TOTD_OUTPUT "")
-foreach(line ${TIP_OF_THE_DAY_LINES})
-  string(REGEX REPLACE "^ *\"" "" line2 "${line}")
-  string(REGEX REPLACE "\" *$" "" line3 "${line2}")
-  list(APPEND TOTD_OUTPUT "${line3}\n")
-endforeach()
-
-string(CONCAT FINAL_TOTD ${TOTD_OUTPUT})
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list "${FINAL_TOTD}")
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash)
-
-file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list
-  DESTINATION ${DATADIR_BUILD}/gnucash)
+# Generate manpages.
 
 foreach (manpage gnucash gnucash-cli)
-    add_custom_command(OUTPUT ${manpage}.1
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${manpage}.1.in ${VCS_INFO_FILE}
-    COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/${manpage}.1.in
-                            -D DST=${manpage}.1
-                            -D VCS_INFO_FILE=${VCS_INFO_FILE}
-                            -D DATADIR_BUILD=${DATADIR_BUILD}
-                            -D SRC_DIR=${CMAKE_SOURCE_DIR}
-                            -P ${CMAKE_SOURCE_DIR}/cmake/configure-manpage.cmake
+    add_custom_command(OUTPUT ${DATADIR_BUILD}/gnucash/${manpage}.1
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${manpage}.1.in ${VCS_INFO_FILE}
+        COMMAND ${CMAKE_COMMAND}
+            -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/${manpage}.1.in
+            -D DST=${manpage}.1
+            -D VCS_INFO_FILE=${VCS_INFO_FILE}
+            -D DATADIR_BUILD=${DATADIR_BUILD}
+            -D SRC_DIR=${CMAKE_SOURCE_DIR}
+            -P ${CMAKE_SOURCE_DIR}/cmake/configure-manpage.cmake
     )
-    add_custom_target(${manpage}-manpage DEPENDS ${manpage}.1)
-    dist_add_generated (${BUILDING_FROM_VCS} ${manpage}.1)
+    add_custom_target(${manpage}-manpage ALL DEPENDS ${DATADIR_BUILD}/gnucash/${manpage}.1)
 
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.1 DESTINATION  ${CMAKE_INSTALL_MANDIR}/man1)
+    install(FILES ${DATADIR_BUILD}/gnucash/${manpage}.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 endforeach()

gnucash/CMakeLists.txt

@@ -53,8 +53,6 @@ add_executable (gnucash
     ${gnucash_noinst_HEADERS}
 )
 
-add_dependencies (gnucash gnucash-manpage gnucash-cli-manpage)
-
 target_compile_definitions(gnucash PRIVATE -DG_LOG_DOMAIN=\"gnc.bin\")
 
 target_link_libraries (gnucash

gnucash/gnome-search/search-reconciled.c

@@ -159,8 +159,13 @@ static void
 toggle_changed (GtkToggleButton *button, GNCSearchReconciled *fe)
 {
     gboolean is_on = gtk_toggle_button_get_active (button);
+#ifdef __LP64__
     cleared_match_t value =
         (cleared_match_t) ((uint64_t)g_object_get_data (G_OBJECT (button), "button-value") & 0xffffffff); // Binary mask to silence void-pointer-to-enum-cast warning.
+#else
+    cleared_match_t value =
+	(cleared_match_t)g_object_get_data (G_OBJECT (button), "button-value");
+#endif
 
     if (is_on)
         fe->value |= value;

gnucash/gnome-utils/dialog-options.c

@@ -398,10 +398,14 @@ gnc_option_set_ui_value_internal (GNCOption *option, gboolean use_default)
     {
         bad_value = option_def->set_value (option, use_default, widget, value);
         if (bad_value)
-            PERR("option '%s' bad value '%s'\n",
-                 gnc_option_name (option),
-                 scm_to_locale_string (scm_object_to_string
-                                       (value, scm_c_eval_string ("write"))));
+        {
+            gchar *name = gnc_option_name (option);
+            gchar *val = scm_to_locale_string (scm_object_to_string
+                                               (value, scm_c_eval_string ("write")));
+            PERR ("option '%s' bad value '%s'\n", name, val);
+            g_free (name);
+            g_free (val);
+        }
     }
     else
         PERR("Unknown type. Ignoring.\n");

gnucash/gnome/dialog-payment.c

@@ -1004,6 +1004,7 @@ gnc_payment_ok_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data)
 
             gnc_xfer_dialog_select_to_account(xfer, pw->xfer_acct);
             gnc_xfer_dialog_set_amount(xfer, pw->amount_tot);
+            gnc_xfer_dialog_set_date (xfer, t);
 
             /* All we want is the exchange rate so prevent the user from thinking
                it makes sense to mess with other stuff */
@@ -1012,7 +1013,9 @@ gnc_payment_ok_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data)
             gnc_xfer_dialog_hide_from_account_tree(xfer);
             gnc_xfer_dialog_hide_to_account_tree(xfer);
             gnc_xfer_dialog_is_exchange_dialog(xfer, &exch);
-            gnc_xfer_dialog_run_until_done(xfer);
+
+            if (!gnc_xfer_dialog_run_until_done(xfer))
+                return; /* If the user cancels, return to the payment dialog without changes */
         }
 
         /* Perform the payment */

gnucash/gnome/gnc-plugin-page-budget.c

@@ -42,7 +42,11 @@
 #include <glib/gi18n.h>
 #include "gnc-date-edit.h"
 
+#include "swig-runtime.h"
+#include "libguile.h"
+
 #include "gnc-plugin-page-register.h"
+#include "gnc-plugin-page-report.h"
 #include "gnc-budget.h"
 #include "gnc-features.h"
 
@@ -127,6 +131,8 @@ static void gnc_plugin_page_budget_cmd_refresh (GtkAction *action,
                                                 GncPluginPageBudget *page);
 static void gnc_plugin_page_budget_cmd_budget_note (GtkAction *action,
                                                     GncPluginPageBudget *page);
+static void gnc_plugin_page_budget_cmd_budget_report (GtkAction *action,
+                                                      GncPluginPageBudget *page);
 static void allperiods_budget_helper (GtkTreeModel *model, GtkTreePath *path,
                                       GtkTreeIter *iter, gpointer data);
 
@@ -172,11 +178,17 @@ static GtkActionEntry gnc_plugin_page_budget_actions [] =
         G_CALLBACK(gnc_plugin_page_budget_cmd_allperiods_budget)
     },
     {
-        "BudgetNoteAction", "system-run", N_("Edit Note"),
+        "BudgetNoteAction", "text-x-generic", N_("Edit Note"),
         NULL,
-        N_("Edit note for the selected account and period"),
+        N_("Edit note for the selected account and period."),
         G_CALLBACK (gnc_plugin_page_budget_cmd_budget_note)
     },
+    {
+        "BudgetReportAction", "system-run", N_("Budget Report"),
+        NULL,
+        N_("Run the budget report."),
+        G_CALLBACK (gnc_plugin_page_budget_cmd_budget_report)
+    },
     /* View menu */
     {
         "ViewFilterByAction", NULL, N_("_Filter By..."), NULL, NULL,
@@ -211,6 +223,7 @@ static action_toolbar_labels toolbar_labels[] =
     { "EstimateBudgetAction",       N_("Estimate") },
     { "AllPeriodsBudgetAction",     N_("All Periods") },
     { "BudgetNoteAction",           N_("Note") },
+    { "BudgetReportAction",         N_("Run Report") },
     { NULL, NULL },
 };
 
@@ -250,6 +263,10 @@ typedef struct GncPluginPageBudgetPrivate
     gnc_numeric allValue;
     allperiods_action action;
 
+    /* the cached reportPage for this budget. note this is not saved
+       into .gcm file therefore the budget editor->report link is lost
+       upon restart. */
+    GncPluginPage *reportPage;
 } GncPluginPageBudgetPrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageBudget, gnc_plugin_page_budget, GNC_TYPE_PLUGIN_PAGE)
@@ -289,6 +306,7 @@ gnc_plugin_page_budget_new (GncBudget *budget)
     priv->budget = budget;
     priv->delete_budget = FALSE;
     priv->key = *gnc_budget_get_guid (budget);
+    priv->reportPage = NULL;
     label = g_strdup_printf ("%s: %s", _("Budget"), gnc_budget_get_name (budget));
     g_object_set (G_OBJECT(plugin_page), "page-name", label, NULL);
     g_free (label);
@@ -1268,6 +1286,44 @@ gnc_plugin_page_budget_cmd_budget_note(GtkAction *action,
     g_object_unref(G_OBJECT(builder));
 }
 
+/* From the budget editor, open the budget report. This will reuse the
+   budget report if generated from the current budget editor. Note the
+   reuse is lost when GnuCash is restarted. This link may be restored
+   by: scan the current session tabs, identify reports, checking
+   whereby report's report-type matches a budget report, and the
+   report's budget option value matches the current budget. */
+static void
+gnc_plugin_page_budget_cmd_budget_report (GtkAction *action,
+                                          GncPluginPageBudget *page)
+{
+    GncPluginPageBudgetPrivate *priv;
+
+    g_return_if_fail (GNC_IS_PLUGIN_PAGE_BUDGET (page));
+
+    priv = GNC_PLUGIN_PAGE_BUDGET_GET_PRIVATE (page);
+
+    if (priv->reportPage && GNC_IS_PLUGIN_PAGE (priv->reportPage))
+        gnc_plugin_page_report_reload (GNC_PLUGIN_PAGE_REPORT (priv->reportPage));
+    else
+    {
+        SCM func = scm_c_eval_string ("gnc:budget-report-create");
+        SCM arg = SWIG_NewPointerObj (priv->budget, SWIG_TypeQuery ("_p_budget_s"), 0);
+        int report_id;
+
+        g_return_if_fail (scm_is_procedure (func));
+
+        arg = scm_apply_0 (func, scm_list_1 (arg));
+        g_return_if_fail (scm_is_exact (arg));
+
+        report_id = scm_to_int (arg);
+        g_return_if_fail (report_id >= 0);
+
+        priv->reportPage = gnc_plugin_page_report_new (report_id);
+    }
+
+    gnc_main_window_open_page (GNC_MAIN_WINDOW (priv->dialog), priv->reportPage);
+}
+
 static void
 gnc_plugin_page_budget_cmd_view_filter_by (GtkAction *action,
                                            GncPluginPageBudget *page)

gnucash/gnome/gnc-plugin-page-report.c

@@ -1427,6 +1427,12 @@ gnc_plugin_page_report_back_cb( GtkAction *action, GncPluginPageReport *report )
     }
 }
 
+void
+gnc_plugin_page_report_reload (GncPluginPageReport *report)
+{
+    gnc_plugin_page_report_reload_cb (NULL, report);
+}
+
 static void
 gnc_plugin_page_report_reload_cb( GtkAction *action, GncPluginPageReport *report )
 {

gnucash/gnome/gnc-plugin-page-report.h

@@ -75,6 +75,8 @@ GType gnc_plugin_page_report_get_type( void );
  */
 GncPluginPage *gnc_plugin_page_report_new( int reportId );
 
+void gnc_plugin_page_report_reload (GncPluginPageReport *report);
+
 // entry-point from scm menu-extension callback [gnc:menu-extension].
 void       gnc_main_window_open_report (int report_id, GncMainWindow *window);
 // directly called through from above

gnucash/gnome/gnc-plugin-page-sx-list.c

@@ -360,8 +360,6 @@ gnc_plugin_page_sx_list_create_widget (GncPluginPage *plugin_page)
     GtkWidget *vbox;
     GtkWidget *label;
     GtkWidget *swin;
-    char *markup;
-    char *text;
 
     page = GNC_PLUGIN_PAGE_SX_LIST(plugin_page);
     priv = GNC_PLUGIN_PAGE_SX_LIST_GET_PRIVATE(page);
@@ -381,12 +379,9 @@ gnc_plugin_page_sx_list_create_widget (GncPluginPage *plugin_page)
     gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
     gtk_paned_pack1( GTK_PANED(widget), vbox, TRUE, FALSE);
 
-    label = gtk_label_new(NULL);
-    text = g_strdup_printf(_("Transactions"));
-    markup = g_markup_printf_escaped ("<b> %s</b>", text);
-    gtk_label_set_markup (GTK_LABEL (label), markup);
-    g_free (markup);
-    g_free (text);
+    label = gtk_label_new (_("Transactions"));
+    gnc_widget_style_context_add_class (GTK_WIDGET(label), "gnc-class-strong");
+    gtk_widget_set_margin_start (GTK_WIDGET(label), 6);
     gnc_label_set_alignment (label, 0.0, 0);
     gtk_widget_show (label);
     gtk_box_pack_start ( GTK_BOX(vbox), label, FALSE, FALSE, 0);
@@ -444,12 +439,9 @@ gnc_plugin_page_sx_list_create_widget (GncPluginPage *plugin_page)
     gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
     gtk_paned_pack2( GTK_PANED(widget), vbox, TRUE, FALSE);
 
-    label = gtk_label_new(NULL);
-    text = g_strdup_printf(_("Upcoming Transactions"));
-    markup = g_markup_printf_escaped ("<b> %s</b>", text);
-    gtk_label_set_markup (GTK_LABEL (label), markup);
-    g_free (markup);
-    g_free (text);
+    label = gtk_label_new (_("Upcoming Transactions"));
+    gnc_widget_style_context_add_class (GTK_WIDGET(label), "gnc-class-strong");
+    gtk_widget_set_margin_start (GTK_WIDGET(label), 6);
     gnc_label_set_alignment (label, 0.0, 0);
     gtk_widget_show (label);
 

gnucash/gnucash-core-app.cpp

@@ -233,7 +233,7 @@ set_mac_locale()
     {
         lang_str = [locale objectForKey: NSLocaleLanguageCode];
         country_str = [locale objectForKey: NSLocaleCountryCode];
-	locale_str = [[[lang_str stringByAppendingString: @"_"]
+	locale_str = [ [ [lang_str stringByAppendingString: @"_"]
 		      stringByAppendingString: country_str]
                       stringByAppendingString: @".UTF-8"];
     }

gnucash/gtkbuilder/assistant-csv-export.glade

@@ -274,9 +274,10 @@ Select the type of Export required and the separator that will be used.
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Accounts&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="label" translatable="yes">Accounts</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -429,9 +430,10 @@ Select the type of Export required and the separator that will be used.
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Dates&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="label" translatable="yes">Date Range</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -441,7 +443,7 @@ Select the type of Export required and the separator that will be used.
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="show_all">
-                    <property name="label" translatable="yes">Sho_w All</property>
+                    <property name="label" translatable="yes">_Select All</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>

gnucash/gtkbuilder/assistant-csv-price-import.glade

@@ -450,8 +450,7 @@ There are two reserved names which can't be used to save custom settings:
                               <object class="GtkLabel" id="label2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">•</property>
-                                <property name="use_markup">True</property>
+                                <property name="label">•</property>
                                 <property name="wrap">True</property>
                               </object>
                               <packing>
@@ -465,7 +464,6 @@ There are two reserved names which can't be used to save custom settings:
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Double-click anywhere on the table below to insert a column break</property>
-                                <property name="use_markup">True</property>
                                 <property name="wrap">True</property>
                                 <property name="xalign">0</property>
                               </object>
@@ -478,8 +476,7 @@ There are two reserved names which can't be used to save custom settings:
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">•</property>
-                                <property name="use_markup">True</property>
+                                <property name="label">•</property>
                                 <property name="wrap">True</property>
                               </object>
                               <packing>
@@ -493,7 +490,6 @@ There are two reserved names which can't be used to save custom settings:
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Right-click anywhere in a column to modify it (widen, narrow, merge)</property>
-                                <property name="use_markup">True</property>
                                 <property name="wrap">True</property>
                                 <property name="xalign">0</property>
                               </object>
@@ -899,8 +895,10 @@ For example
                   <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Currency To&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Currency To</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
               </object>

gnucash/gtkbuilder/assistant-csv-trans-import.glade

@@ -445,8 +445,7 @@ There are two reserved names which can't be used to save custom settings:
                               <object class="GtkLabel" id="label2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">•</property>
-                                <property name="use_markup">True</property>
+                                <property name="label">•</property>
                                 <property name="wrap">True</property>
                               </object>
                               <packing>
@@ -460,7 +459,6 @@ There are two reserved names which can't be used to save custom settings:
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Double-click anywhere on the table below to insert a column break</property>
-                                <property name="use_markup">True</property>
                                 <property name="wrap">True</property>
                                 <property name="xalign">0</property>
                               </object>
@@ -473,8 +471,7 @@ There are two reserved names which can't be used to save custom settings:
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">•</property>
-                                <property name="use_markup">True</property>
+                                <property name="label">•</property>
                                 <property name="wrap">True</property>
                               </object>
                               <packing>
@@ -488,7 +485,6 @@ There are two reserved names which can't be used to save custom settings:
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Right-click anywhere in a column to modify it (widen, narrow, merge)</property>
-                                <property name="use_markup">True</property>
                                 <property name="wrap">True</property>
                                 <property name="xalign">0</property>
                               </object>

gnucash/gtkbuilder/assistant-hierarchy.glade

@@ -121,7 +121,6 @@ Please choose the currency to use for new accounts.</property>
             <property name="margin_start">6</property>
             <property name="margin_end">6</property>
             <property name="label" translatable="yes">Select language and region specific categories that correspond to the ways that you foresee you will use GnuCash. Each category you select will cause several accounts to be created.</property>
-            <property name="use_markup">True</property>
             <property name="wrap">True</property>
             <property name="width_chars">75</property>
           </object>
@@ -382,8 +381,10 @@ Please choose the currency to use for new accounts.</property>
                   <object class="GtkLabel" id="accounts_in_category_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label">&lt;b&gt;Accounts in %s&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes" comments="%s is an account template">Accounts in %s</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -424,8 +425,10 @@ Please choose the currency to use for new accounts.</property>
             <property name="halign">start</property>
             <property name="margin_start">6</property>
             <property name="margin_end">6</property>
-            <property name="label" translatable="yes">&lt;b&gt;Notes&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Notes</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -446,7 +449,7 @@ Please choose the currency to use for new accounts.</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="valign">start</property>
-                <property name="label" translatable="yes">•</property>
+                <property name="label">•</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -459,7 +462,7 @@ Please choose the currency to use for new accounts.</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="valign">start</property>
-                <property name="label" translatable="yes">•</property>
+                <property name="label">•</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>

gnucash/gtkbuilder/assistant-qif-import.glade

@@ -972,9 +972,11 @@ In the following page, you will see the text that appears in the Payee and Memo
           <object class="GtkLabel" id="book_option_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;b&gt;Book Options&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
+            <property name="label" translatable="yes">Book Options</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+        </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>

gnucash/gtkbuilder/business-prefs.glade

@@ -52,8 +52,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">General</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="left_attach">0</property>

gnucash/gtkbuilder/dialog-account-picker.glade

@@ -18,8 +18,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">&lt;b&gt;QIF Import&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">QIF Import</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="left_attach">0</property>

gnucash/gtkbuilder/dialog-account.glade

@@ -551,8 +551,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Transactions&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Transactions</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1191,8 +1193,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Identification&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Identification</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -1583,8 +1587,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Parent Account&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">_Parent Account</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>

gnucash/gtkbuilder/dialog-billterms.glade

@@ -431,8 +431,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Terms&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Terms</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>

gnucash/gtkbuilder/dialog-commodities.glade

@@ -24,9 +24,10 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Securities&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">Securities</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>

gnucash/gtkbuilder/dialog-commodity.glade

@@ -235,8 +235,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">&lt;b&gt;Security Information&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Security Information</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
               </object>
               <packing>
                 <property name="left_attach">0</property>

gnucash/gtkbuilder/dialog-customer-import-gui.glade

@@ -123,8 +123,10 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;1. Choose the file to import&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">1. Choose the file to import</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
             </child>
           </object>
@@ -305,8 +307,10 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;3. Select import options&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">3. Select import options</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
             </child>
           </object>
@@ -346,8 +350,10 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;4. Preview&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">4. Preview</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
             </child>
           </object>

gnucash/gtkbuilder/dialog-fincalc.glade

@@ -634,8 +634,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Period&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Period</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>

gnucash/gtkbuilder/dialog-import.glade

@@ -526,8 +526,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">&lt;b&gt;Colors&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Colors</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="left_attach">0</property>

gnucash/gtkbuilder/dialog-lot-viewer.glade

@@ -147,10 +147,12 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Notes&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">_Notes</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">lot_notes_text</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -389,7 +391,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="add_split_to_lot_button">
-                        <property name="label" translatable="yes">&gt;&gt;</property>
+                        <property name="label" comments="Auto-reversed for RTL writing">&gt;&gt;</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -403,7 +405,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="remove_split_from_lot_button">
-                        <property name="label" translatable="yes">&lt;&lt;</property>
+                        <property name="label" comments="Auto-reversed for RTL writing">&lt;&lt;</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>

gnucash/gtkbuilder/dialog-payment.glade

@@ -408,9 +408,11 @@ If you have selected an invoice, GnuCash will propose the amount still due for i
 
 In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
                         <property name="halign">end</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Amount&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Amount</property>
                         <property name="justify">right</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>

gnucash/gtkbuilder/dialog-preferences.glade

@@ -360,8 +360,10 @@ Press 'Close' to return to the preference window
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Start Date&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Start Date</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -373,8 +375,10 @@ Press 'Close' to return to the preference window
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;End Date&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">End Date</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -591,7 +595,7 @@ Press 'Close' to return to the preference window
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">Use only &amp;apos;debit&amp;apos; and &amp;apos;credit&amp;apos; instead of informal synonyms.</property>
+                    <property name="tooltip_markup">Use only &apos;debit&apos; and &apos;credit&apos; instead of informal synonyms.</property>
                     <property name="tooltip_text" translatable="yes">Use only 'debit' and 'credit' instead of informal synonyms.</property>
                     <property name="halign">start</property>
                     <property name="use_underline">True</property>
@@ -632,7 +636,7 @@ Press 'Close' to return to the preference window
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">Don&amp;apos;t sign reverse any accounts.</property>
+                    <property name="tooltip_markup">Don&apos;t sign reverse any accounts.</property>
                     <property name="tooltip_text" translatable="yes">Don't sign reverse any accounts.</property>
                     <property name="halign">start</property>
                     <property name="use_underline">True</property>
@@ -793,8 +797,10 @@ Press 'Close' to return to the preference window
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Account Color&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Account Color</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -995,8 +1001,10 @@ Press 'Close' to return to the preference window
                   <object class="GtkLabel" id="label104">
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Fancy Date Format&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Fancy Date Format</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1018,8 +1026,10 @@ Press 'Close' to return to the preference window
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Date Format&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Date Format</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1378,8 +1388,10 @@ many months before the current month</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes" comments="Preferences Dialog, General Tab">&lt;b&gt;General&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes" comments="Preferences Dialog, General Tab">General</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1583,7 +1595,7 @@ many months before the current month</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">Default to &amp;apos;new search&amp;apos; if fewer than this number of items is returned.</property>
+                    <property name="tooltip_markup">Default to &apos;new search&apos; if fewer than this number of items is returned.</property>
                     <property name="tooltip_text" translatable="yes">Default to 'new search' if fewer than this number of items is returned.</property>
                     <property name="invisible_char">●</property>
                     <property name="text">1</property>
@@ -2028,7 +2040,7 @@ many months before the current month</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match&amp;apos;s score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default.</property>
+                    <property name="tooltip_markup">Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match&apos;s score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default.</property>
                     <property name="tooltip_text" translatable="yes">Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match's score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default.</property>
                     <property name="halign">start</property>
                     <property name="use_underline">True</property>
@@ -2047,7 +2059,7 @@ many months before the current month</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match&amp;apos;s score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
+                    <property name="tooltip_markup">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match&apos;s score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
                     <property name="tooltip_text" translatable="yes">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
                     <property name="halign">start</property>
                     <property name="use_underline">True</property>
@@ -2064,8 +2076,10 @@ many months before the current month</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">General</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -2078,7 +2092,7 @@ many months before the current month</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores. These ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw $100, and you are charged $101,50 plus Interac fees. If you manually entered that $100, the amounts won&amp;apos;t match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match.</property>
+                    <property name="tooltip_markup">In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores. These ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw $100, and you are charged $101,50 plus Interac fees. If you manually entered that $100, the amounts won&apos;t match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match.</property>
                     <property name="tooltip_text" translatable="yes">In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores. These ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw $100, and you are charged $101,50 plus Interac fees. If you manually entered that $100, the amounts won't match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match.</property>
                     <property name="invisible_char">●</property>
                     <property name="text">2.00</property>
@@ -2101,7 +2115,7 @@ many months before the current month</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">A transaction whose best match&amp;apos;s score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
+                    <property name="tooltip_markup">A transaction whose best match&apos;s score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
                     <property name="tooltip_text" translatable="yes">A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
                     <property name="invisible_char">●</property>
                     <property name="text">6</property>
@@ -2123,7 +2137,7 @@ many months before the current month</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">A transaction whose best match&amp;apos;s score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
+                    <property name="tooltip_markup">A transaction whose best match&apos;s score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
                     <property name="tooltip_text" translatable="yes">A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
                     <property name="invisible_char">●</property>
                     <property name="text">1</property>
@@ -2332,7 +2346,7 @@ many months before the current month</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">Print &amp;apos;***&amp;apos; before and after each text field on the check.</property>
+                    <property name="tooltip_markup">Print &apos;***&apos; before and after each text field on the check.</property>
                     <property name="tooltip_text" translatable="yes">Print '***' before and after each text field on the check.</property>
                     <property name="halign">start</property>
                     <property name="use_underline">True</property>
@@ -2411,7 +2425,7 @@ many months before the current month</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">If checked, pressing the &amp;apos;Enter&amp;apos; key will move to the location of the blank transaction in the register. If clear, pressing the &amp;apos;Enter&amp;apos; key will move down one row.</property>
+                    <property name="tooltip_markup">If checked, pressing the &apos;Enter&apos; key will move to the location of the blank transaction in the register. If clear, pressing the &apos;Enter&apos; key will move down one row.</property>
                     <property name="tooltip_text" translatable="yes">If checked, pressing the 'Enter' key will move to the location of the blank transaction in the register. If clear, pressing the 'Enter' key will move down one row.</property>
                     <property name="halign">start</property>
                     <property name="use_underline">True</property>
@@ -2524,7 +2538,7 @@ many months before the current month</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">Always open the reconcile dialog using today&amp;apos;s date for the statement date, regardless of previous reconciliations.</property>
+                    <property name="tooltip_markup">Always open the reconcile dialog using today&apos;s date for the statement date, regardless of previous reconciliations.</property>
                     <property name="tooltip_text" translatable="yes">Always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations.</property>
                     <property name="halign">start</property>
                     <property name="use_underline">True</property>
@@ -2645,8 +2659,10 @@ many months before the current month</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Layout&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Layout</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -3126,8 +3142,10 @@ many months before the current month</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Default zoom level&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Default zoom level</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -3494,7 +3512,7 @@ many months before the current month</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup">Show a close button on each notebook tab. These function identically to the &amp;apos;Close&amp;apos; menu item.</property>
+                    <property name="tooltip_markup">Show a close button on each notebook tab. These function identically to the &apos;Close&apos; menu item.</property>
                     <property name="tooltip_text" translatable="yes">Show a close button on each notebook tab. These function identically to the 'Close' menu item.</property>
                     <property name="halign">start</property>
                     <property name="use_underline">True</property>
@@ -3635,8 +3653,10 @@ many months before the current month</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Online Quotes&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Online Quotes</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>

gnucash/gtkbuilder/dialog-sx.glade

@@ -827,10 +827,12 @@
                   <object class="GtkLabel" id="label847707">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Name&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Name</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -887,8 +889,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Options</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>

gnucash/gtkbuilder/dialog-tax-info.glade

@@ -86,9 +86,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">&lt;b&gt;Income Tax Identity&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">Income Tax Identity</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>

gnucash/gtkbuilder/dialog-tax-table.glade

@@ -28,8 +28,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Tax Tables&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Tax Tables</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -398,8 +400,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">&lt;b&gt;Tax Table&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Tax Table</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="left_attach">0</property>

gnucash/gtkbuilder/dialog-transfer.glade

@@ -280,8 +280,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Transfer From&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Transfer From</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -339,8 +341,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Transfer To&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Transfer To</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>

gnucash/gtkbuilder/gnc-plugin-page-register.glade

@@ -621,8 +621,10 @@ If 0, all previous days included</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">&lt;b&gt;New Transaction Information&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">New Transaction Information</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>

gnucash/gtkbuilder/gnc-plugin-page-register2.glade

@@ -70,8 +70,10 @@
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="margin_start">6</property>
-            <property name="label" translatable="yes">&lt;b&gt;New Transaction Information&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">New Transaction Information</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>

gnucash/import-export/aqb/dialog-ab-pref.glade

@@ -18,8 +18,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">&lt;b&gt;Online Banking&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Online Banking</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="left_attach">0</property>

gnucash/import-export/aqb/dialog-ab.glade

@@ -79,8 +79,10 @@
                   <object class="GtkLabel" id="label8877443">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Progress&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Progress</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -366,8 +368,10 @@
                   <object class="GtkLabel" id="label8877445">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;b&gt;From&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">From</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -468,8 +472,10 @@
                   <object class="GtkLabel" id="label8877446">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;b&gt;To&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">To</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                     <property name="xalign">0</property>
                   </object>
                   <packing>

gnucash/import-export/bi-import/dialog-bi-import.c

@@ -24,7 +24,6 @@
  * @file dialog-bi-import.c
  * @brief core import functions for invoice import plugin
  * @author Copyright (C) 2009 Sebastian Held <sebastian.held@gmx.de>
- * @author Mike Evans <mikee@saxicola.co.uk>
  * @author Rob Laan <rob.laan@chello.nl>
  */
 
@@ -789,8 +788,6 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
         gncEntrySetAction (entry, action);
         value = gnc_numeric_zero(); 
         gnc_exp_parser_parse (quantity, &value, NULL);
-        // Need to set the denom appropriately else we get stupid rounding errors.
-        value = gnc_numeric_convert (value, denom * 100, GNC_HOW_RND_NEVER);
         gncEntrySetQuantity (entry, value);
         acc = gnc_account_lookup_for_register (gnc_get_current_root_account (),
                                                account);
@@ -800,7 +797,6 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
             gncEntrySetBillAccount (entry, acc);
             value = gnc_numeric_zero();
             gnc_exp_parser_parse (price, &value, NULL);
-            value = gnc_numeric_convert (value, denom * 100, GNC_HOW_RND_NEVER);
             gncEntrySetBillPrice (entry, value);
             gncEntrySetBillTaxable (entry, text2bool (taxable));
             gncEntrySetBillTaxIncluded (entry, text2bool (taxincluded));
@@ -813,14 +809,12 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
             gncEntrySetInvAccount (entry, acc);
             value = gnc_numeric_zero();
             gnc_exp_parser_parse (price, &value, NULL);
-            value = gnc_numeric_convert (value, denom * 100, GNC_HOW_RND_NEVER);
             gncEntrySetInvPrice (entry, value);
             gncEntrySetInvTaxable (entry, text2bool (taxable));
             gncEntrySetInvTaxIncluded (entry, text2bool (taxincluded));
             gncEntrySetInvTaxTable (entry, gncTaxTableLookupByName (book, tax_table));
             value = gnc_numeric_zero();
             gnc_exp_parser_parse (discount, &value, NULL);
-            value = gnc_numeric_convert (value, denom * 100, GNC_HOW_RND_NEVER);
             gncEntrySetInvDiscount (entry, value);
             gncEntrySetInvDiscountType (entry, text2disc_type (disc_type));
             gncEntrySetInvDiscountHow (entry, text2disc_how (disc_how));

gnucash/report/reports/reports.scm

@@ -37,6 +37,7 @@
 (use-modules (gnucash reports standard new-aging))
 (use-modules (gnucash reports standard new-owner-report))
 
+(export gnc:budget-report-create)
 (export gnc:register-report-create)
 (export gnc:invoice-report-create)
 (export gnc:payables-report-create)
@@ -78,6 +79,15 @@
         0
         ))
 
+(define budget-ID "810ed4b25ef0486ea43bbd3dddb32b11")
+(define (gnc:budget-report-create budget)
+  (if (gnc:find-report-template budget-ID)
+      (let* ((options (gnc:make-report-options budget-ID))
+             (bgt-op (gnc:lookup-option options gnc:pagename-general "Budget")))
+        (gnc:option-set-value bgt-op budget)
+        (gnc:make-report budget-ID options))
+      -1))
+
 (define gnc:payables-report-create payables-report-create-internal)
 (define gnc:receivables-report-create receivables-report-create-internal)
 (define gnc:owner-report-create owner-report-create)

gnucash/ui/gnc-plugin-page-budget-ui.xml

@@ -6,6 +6,7 @@
         <menuitem name="AllPeriods" action="AllPeriodsBudgetAction"/>
         <menuitem name="Delete" action="DeleteBudgetAction"/>
         <menuitem name="Note" action="BudgetNoteAction"/>
+        <menuitem name="Report" action="BudgetReportAction"/>
       </placeholder>
       <menuitem name="Options" action="OptionsBudgetAction"/>
     </menu>
@@ -30,6 +31,7 @@
       <toolitem name="AllPeriods" action="AllPeriodsBudgetAction"/>
       <toolitem name="Delete" action="DeleteBudgetAction"/>
       <toolitem name="Note" action="BudgetNoteAction"/>
+      <toolitem name="Report" action="BudgetReportAction"/>
     </placeholder>
   </toolbar>
 </ui>

libgnucash/app-utils/gnc-ui-util.c

@@ -51,7 +51,6 @@
 #include "Transaction.h"
 #include "gnc-engine.h"
 #include "gnc-features.h"
-#include "gnc-euro.h"
 #include "gnc-hooks.h"
 #include "gnc-locale-tax.h"
 #include "gnc-session.h"
@@ -1130,51 +1129,6 @@ gnc_account_create_opening_balance (Account *account,
     return TRUE;
 }
 
-#if 0 /* Not Used */
-static void
-gnc_lconv_set_utf8 (char **p_value, char *default_value)
-{
-    char *value = *p_value;
-    *p_value = NULL;
-
-    if ((value == NULL) || (value[0] == 0))
-        value = default_value;
-
-#ifdef G_OS_WIN32
-    {
-        /* get number of resulting wide characters */
-        size_t count = mbstowcs (NULL, value, 0);
-        if (count > 0)
-        {
-            /* malloc and convert */
-            wchar_t *wvalue = g_malloc ((count + 1) * sizeof(wchar_t));
-            count = mbstowcs (wvalue, value, count + 1);
-            if (count > 0)
-            {
-                *p_value = g_utf16_to_utf8 (wvalue, -1, NULL, NULL, NULL);
-            }
-            g_free (wvalue);
-        }
-    }
-#else /* !G_OS_WIN32 */
-    *p_value = g_locale_to_utf8 (value, -1, NULL, NULL, NULL);
-#endif
-
-    if (*p_value == NULL)
-    {
-        // The g_locale_to_utf8 conversion failed. FIXME: Should we rather
-        // use an empty string instead of the default_value? Not sure.
-        *p_value = default_value;
-    }
-}
-
-static void
-gnc_lconv_set_char (char *p_value, char default_value)
-{
-    if ((p_value != NULL) && (*p_value == CHAR_MAX))
-        *p_value = default_value;
-}
-#endif /* Not Used */
 
 gnc_commodity *
 gnc_locale_default_currency_nodefault (void)
@@ -1188,13 +1142,6 @@ gnc_locale_default_currency_nodefault (void)
 
     currency = gnc_commodity_table_lookup (table, GNC_COMMODITY_NS_CURRENCY, code);
 
-    /* Some very old locales (notably on win32) still announce a euro
-       currency as default, although it has been replaced by EUR in
-       2001. We use EUR as default in that case, but the user can always
-       override from gsettings. */
-    if (gnc_is_euro_currency (currency))
-        currency = gnc_get_euro();
-
     return (currency ? currency : NULL);
 }
 
@@ -1238,8 +1185,6 @@ gnc_default_currency_common (gchar *requested_currency,
     if (currency)
     {
         mnemonic = requested_currency;
-// ??? Does anyone know what this is supposed to be doing?
-//        requested_currency = g_strdup(gnc_commodity_get_mnemonic(currency));
         g_free(mnemonic);
     }
     return currency;

libgnucash/app-utils/gnc-ui-util.h

@@ -244,9 +244,6 @@ gnc_commodity * gnc_locale_default_currency_nodefault (void);
  * "USD", but this will have nothing to do with the actual locale. */
 gnc_commodity * gnc_locale_default_currency (void);
 
-/* Returns the default ISO currency string of the current locale. */
-const char * gnc_locale_default_iso_currency_code (void);
-
 
 /** Return the default currency set by the user.  If the user's
  *  preference is invalid, then this routine will return the default

libgnucash/engine/gnc-numeric.cpp

@@ -1004,6 +1004,10 @@ gnc_numeric_convert(gnc_numeric in, int64_t denom, int how)
     {
         return convert(GncNumeric(in), denom, how);
     }
+    catch (const std::invalid_argument& err)
+    {
+        return gnc_numeric_error(GNC_ERROR_OVERFLOW);
+    }
     catch (const std::overflow_error& err)
     {
         return gnc_numeric_error(GNC_ERROR_OVERFLOW);
@@ -1012,6 +1016,10 @@ gnc_numeric_convert(gnc_numeric in, int64_t denom, int how)
     {
         return gnc_numeric_error(GNC_ERROR_OVERFLOW);
     }
+    catch (const std::domain_error& err)
+    {
+        return gnc_numeric_error(GNC_ERROR_REMAINDER);
+    }
 }
 
 

libgnucash/engine/gnc-timezone.cpp

@@ -500,7 +500,7 @@ namespace DSTRule
 
     Transition::Transition(gregorian_date date) :
 	month(date.month()), dow(date.day_of_week()),
-	week(static_cast<week_num>((7 + date.day() - date.day_of_week()) / 7))
+	week(static_cast<week_num>((6 + date.day() - date.day_of_week()) / 7))
     {}
 
     bool

libgnucash/engine/test/gtest-gnc-datetime.cpp

@@ -518,15 +518,34 @@ TEST(gnc_datetime_functions, test_date)
     EXPECT_EQ(ymd.day - (12 + atime.offset() / 3600) / 24, 13);
 }
 /* This test works only in the America/LosAngeles time zone and
- * there's no way at present to make it more flexible.
-TEST(gnc_datetime_functions, test_timezone_offset)
-{
+ * there's no straightforward way to make it more flexible. It ensures
+ * that DST in that timezone transitions correctly for each day of the
+ * week in which March begines.
+
+ TEST(gnc_datetime_functions, test_timezone_offset)
+{
+    struct Timepair
+    {
+        time64 before;
+        time64 after;
+    };
+    std::array<Timepair, 7> years{
+        Timepair{1615633140, 1615719540}, //2021, Monday
+        Timepair{1457780340, 1457866740}, //2016, Tuesday
+        Timepair{1489229940, 1489316340}, //2017, Wednesday
+        Timepair{1520679540, 1520765940}, //2018, Thursday
+        Timepair{1552129140, 1552215540}, //2019, Friday
+        Timepair{1741431540, 1741517940}, //2025, Saturday
+        Timepair{1583578740, 1583665140}  //2020, Sunday
+    };
+    for (auto year : years)
+    {
+        GncDateTime before{year.before};
+        GncDateTime after{year.after};
+//        std::cerr << before.format_iso8601() << std::endl;
+        EXPECT_EQ(-28800, before.offset());
+        EXPECT_EQ(-25200, after.offset());
+    }
 
-    GncDateTime gncdt1(1488797940); //6 Mar 2017
-    EXPECT_EQ(-28800, gncdt1.offset());
-    GncDateTime gncdt2(1489661940);  //16 Mar 2017 10:59 Z
-    EXPECT_EQ(-25200, gncdt2.offset());
-    GncDateTime gncdt3(1490525940);  //26 Mar 2017
-    EXPECT_EQ(-25200, gncdt3.offset());
 }
 */

libgnucash/quotes/gnc-fq-helper.in

@@ -23,10 +23,6 @@
 
 use strict;
 use English;
-use FileHandle;
-
-# Date::Manip provides ParseDate, ParseDateString, and UnixTime.
-use Date::Manip;
 
 =head1 NAME
 
@@ -112,15 +108,14 @@ non-zero - failure
 
 =cut
 
-# Set a base date with the current time in the current TZ:
-my $base_date = new Date::Manip::Date;
-$base_date->parse("now");
-
 # The methods we know about.  For now we assume they all have the same
 # signature so this works OK.
 
 sub check_modules {
-  my @modules = qw(Finance::Quote Date::Manip);
+
+# Date::Manip provides ParseDate, ParseDateString, and UnixTime.
+
+  my @modules = qw(FileHandle Finance::Quote Date::Manip);
   my @missing;
 
   foreach my $mod (@modules) {
@@ -149,6 +144,13 @@ sub check_modules {
   exit 1;
 }
 
+# Check for and load non-standard modules
+check_modules ();
+
+# Set a base date with the current time in the current TZ:
+my $base_date = new Date::Manip::Date;
+$base_date->parse("now");
+
 sub schemify_string {
   my($str) = @_;
 
@@ -319,9 +321,6 @@ sub parse_input_line {
 #---------------------------------------------------------------------------
 # Runtime.
 
-# Check for and load non-standard modules
-check_modules ();
-
 # Create a stockquote object.
 my $quoter = Finance::Quote->new();
 my $prgnam = "gnc-fq-helper";

po/glossary/el.po

@@ -3,14 +3,15 @@
 # Simos Xenitellis <simos@hellug.gr>, 2001.
 # THANOS SIOURDAKIS <siourdakisthanos@gmail.com>, 2020.
 # giorgos georgopoulakis <huskyaek@gmail.com>, 2021.
+# Katerina <katerina.gakou@hotmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash-glossary 1.0\n"
 "Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
 "cgi?product=GnuCash&component=Translations\n"
 "POT-Creation-Date: 2021-01-10 08:00+0100\n"
-"PO-Revision-Date: 2021-01-24 18:32+0000\n"
-"Last-Translator: giorgos georgopoulakis <huskyaek@gmail.com>\n"
+"PO-Revision-Date: 2021-03-17 15:18+0000\n"
+"Last-Translator: Katerina <katerina.gakou@hotmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/gnucash/glossary/"
 "el/>\n"
 "Language: el\n"
@@ -18,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5-dev\n"
+"X-Generator: Weblate 4.5.2-dev\n"
 
 #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
 msgid "Term (Dear translator: This file will never be visible to the user!)"
@@ -146,14 +147,12 @@ msgid "action: direct debit"
 msgstr "Ενέργεια: Άμεση ανάληψη"
 
 #. "transaction is a distribution (???)"
-#, fuzzy
 msgid "action: dist"
-msgstr "Λίστα Εικονιδίων"
+msgstr "ενέργεια: κατανομή"
 
 #. "transaction is a dividend"
-#, fuzzy
 msgid "action: div"
-msgstr "Τοποθεσία: "
+msgstr "ενέργεια: μέρισμα"
 
 #. "-"
 msgid "action: fee"
@@ -166,19 +165,16 @@ msgstr "Τοποθεσία: "
 
 # # FIX check!
 #. "-"
-#, fuzzy
 msgid "action: loan"
-msgstr "Νήσος του Ασεντιόν"
+msgstr "ενέργεια: δάνειο"
 
 #. "see: payment 1."
-#, fuzzy
 msgid "action: payment"
-msgstr "Ο_νόματα Συναρτήσεων"
+msgstr "ενέργεια: πληρωμή"
 
 #. "Point of sale"
-#, fuzzy
 msgid "action: POS"
-msgstr "Τοποθεσία: "
+msgstr "ενέργεια: POS"
 
 #. "-"
 #, fuzzy
@@ -186,19 +182,16 @@ msgid "action: rebate"
 msgstr "Aλλαγή τμήματος"
 
 #. "-"
-#, fuzzy
 msgid "action: sell"
-msgstr "Τοποθεσία: "
+msgstr "ενέργεια: πώληση"
 
 #. "-"
-#, fuzzy
 msgid "action: Teller"
-msgstr "Επιλογέας Συναρτήσεων"
+msgstr "ενέργεια: Ταμείο"
 
 #. "see: transfer 2. (=credit transfer)"
-#, fuzzy
 msgid "action: transfer"
-msgstr "Βάση ενεργειών"
+msgstr "ενέργεια: μεταφορά"
 
 #. "-"
 #, fuzzy
@@ -238,23 +231,20 @@ msgid "balance c/f"
 msgstr "Ισορροπία"
 
 #. "A written record of money received and paid out, showing the difference between the two total amounts"
-#, fuzzy
 msgid "balance sheet"
-msgstr "ενεργό φύλλο"
+msgstr "ισολογισμός"
 
 #. "To arrange for income and spending to be equal"
-#, fuzzy
 msgid "balance, to"
-msgstr "Ισορροπία"
+msgstr "ισοζυγίζω"
 
 #. "-"
-#, fuzzy
 msgid "bank"
-msgstr "Βαθμός"
+msgstr "τράπεζα"
 
 #. "A written statement of money owed for goods or services supplied. In Gnucash, a 'bill' is a statement that we received (from a vendor), whereas an 'invoice' is one that we sent out (to a customer)."
 msgid "bill"
-msgstr ""
+msgstr "απόδειξη"
 
 #. "see invoice owner"
 msgid "bill owner"
@@ -262,51 +252,46 @@ msgstr ""
 
 #. "Conditions on paying a bill. Both an invoice and a bill have billing terms. For example, you can have 'terms' of 'Net-30', where the bill is due in full in 30 days."
 msgid "billing terms"
-msgstr ""
+msgstr "όροι πληρωμής"
 
 #. "The dataset that encapsulates all the collections of entities (accounts etc.) in gnucash. The written records of the financial affairs of a business."
 msgid "Book"
-msgstr ""
+msgstr "Βιβλίο"
 
 #. "Completing the records of financial affairs for a specific time period, e.g. at the end of the year."
 msgid "book closing"
-msgstr ""
+msgstr "κλείσιμο βιβλίου"
 
 #. "An estimate or plan of the money available to somebody and how it will be spent over a period of time."
 msgid "Budget"
-msgstr ""
+msgstr "Προϋπολογισμός"
 
 #. "-"
 msgid "business (adjective)"
-msgstr ""
+msgstr "επαγγελματικός"
 
 #
 #. "as Menu Item: Headline for features that are related to small business accounting"
-#, fuzzy
 msgid "business (noun)"
-msgstr "Μεταφορά"
+msgstr "επιχείρηση"
 
 #. "Profits made from the sale of investments or property"
-#, fuzzy
 msgid "capital gains"
-msgstr "Μερικώς παγωμένο χιόνι"
+msgstr "κεφαλαιακά κέρδη"
 
 #. "Distinguishing the uppercase and lowercase letters"
-#, fuzzy
 msgid "case sensitive"
-msgstr "Πεζά/κεφαλαία διαφέρουν"
+msgstr "διαφοροποίηση κεφαλαίων / πεζών"
 
 #
 #. "Money in coins or notes"
-#, fuzzy
 msgid "cash"
-msgstr "Απορρίματα"
+msgstr "μετρητά"
 
 #
 #. "(esp. US) (= cheque) A special printed form on which one writes an order to a bank to pay a sum of money from one's account to another person"
-#, fuzzy
 msgid "check"
-msgstr "Έλεγχος"
+msgstr "επιταγή"
 
 #. "To repair unbalanced transactions and orphan splits in an account tree. Any transactions that have debits != credits will get a balancing split added (pointing to a special new account called 'Imbalance'). Any splits that do not have accounts are put into another special account called 'Orphan'. Formerly known as 'to scrub'."
 msgid "check and repair, to"

po/glossary/es.po

@@ -6,14 +6,16 @@
 # Eneko Lacunza <enlar@enlar.net>, 2004.
 # Gabriel Ortiz Severino <gabrielortizseverino@gmail.com>, 2021.
 # Pablo <ppicapietra@gmail.com>, 2021.
+# Jaime Marquínez Ferrándiz <weblate@jregistros.fastmail.net>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash-glossary 1.8.9\n"
 "Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
 "cgi?product=GnuCash&component=Translations\n"
 "POT-Creation-Date: 2021-01-10 08:00+0100\n"
-"PO-Revision-Date: 2021-02-12 02:50+0000\n"
-"Last-Translator: Pablo <ppicapietra@gmail.com>\n"
+"PO-Revision-Date: 2021-03-14 17:02+0000\n"
+"Last-Translator: Jaime Marquínez Ferrándiz <weblate@jregistros.fastmail.net>"
+"\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/gnucash/glossary/"
 "es/>\n"
 "Language: es\n"
@@ -21,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5-dev\n"
+"X-Generator: Weblate 4.5.2-dev\n"
 
 #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
 msgid "Term (Dear translator: This file will never be visible to the user!)"
@@ -255,7 +257,7 @@ msgstr "condiciones de pago"
 
 #. "The dataset that encapsulates all the collections of entities (accounts etc.) in gnucash. The written records of the financial affairs of a business."
 msgid "Book"
-msgstr ""
+msgstr "Libro"
 
 #. "Completing the records of financial affairs for a specific time period, e.g. at the end of the year."
 msgid "book closing"
@@ -263,7 +265,7 @@ msgstr ""
 
 #. "An estimate or plan of the money available to somebody and how it will be spent over a period of time."
 msgid "Budget"
-msgstr ""
+msgstr "Presupuesto"
 
 #. "-"
 msgid "business (adjective)"
@@ -345,7 +347,7 @@ msgstr "Personalizado"
 
 #. "Compact, well-structured presentation of informations. See https://en.wikipedia.org/wiki/Dashboard_(business)"
 msgid "dashboard"
-msgstr ""
+msgstr "panel de control"
 
 #. "The backend where the data is stored."
 msgid "database"
@@ -398,7 +400,7 @@ msgstr ""
 
 #. "Electronic mail. Some languages allow different writings, but each team should use only one. https://en.wikipedia.org/wiki/Email"
 msgid "email"
-msgstr ""
+msgstr "correo electrónico"
 
 #. "a person who works for somebody or a company in return for wages"
 msgid "employee"
@@ -447,7 +449,7 @@ msgstr "acción: pago"
 
 #. "Free software is a matter of liberty, not price … see https://en.wikipedia.org/wiki/Free_software"
 msgid "free software"
-msgstr ""
+msgstr "software libre"
 
 #. "An increase in wealth; profit; advantage (See also: capital gains)"
 msgid "gain"
@@ -731,7 +733,7 @@ msgstr "Descripción"
 
 #. "(In the customer summary report) The total amount of money received because something was sold."
 msgid "sales"
-msgstr ""
+msgstr "ventas"
 
 #. "To write data (typically a file) to a storage medium, such as a disk or tape."
 msgid "save, to (to a file)"
@@ -798,7 +800,7 @@ msgstr ""
 
 #. "'Value Added Tax' is the other form of sales tax."
 msgid "tax type: VAT"
-msgstr ""
+msgstr "tipo de impuesto: IVA"
 
 #. "If you create a new e.g. style sheet, you can start from a template."
 msgid "template"

po/glossary/zh_CN.po

@@ -2,14 +2,15 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Theresa Zhang <theresa7qing@sina.com>, 2021.
 # 小高 <2926295173@qq.com>, 2021.
+# jane <allfortestingwork@outlook.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash-glossary\n"
 "Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
 "cgi?product=GnuCash&component=Translations\n"
 "POT-Creation-Date: 2021-01-10 08:00+0100\n"
-"PO-Revision-Date: 2021-03-02 15:50+0000\n"
-"Last-Translator: 小高 <2926295173@qq.com>\n"
+"PO-Revision-Date: 2021-03-13 03:02+0000\n"
+"Last-Translator: jane <allfortestingwork@outlook.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "gnucash/glossary/zh_Hans/>\n"
 "Language: zh_CN\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.5\n"
+"X-Generator: Weblate 4.5.2-dev\n"
 
 # 翻译人员好，这个是不会被最终用户所见的。这是为了您，也就是翻译人员所提供的一个工具。GnuCash 是一个个人或小型企业理财的软件，是一个会计专业性比较强的软件，其中包含了很多的术语。而这里就是针对很多术语的解释。
 # 请大家务必在翻译前先浏览此文件，否则很容易出现翻译不一致的地方。如果有必须修正的术语错误，也请先修改这个文件，然后再修改软件的 po，这样后来的翻译人员就不会犯同样的出错了。请大家在翻译术语的时候，尽量参考国内会计行业术语，以方便专业人士使用。谢谢！
@@ -927,7 +928,7 @@ msgstr "科目类型：收入"
 
 #. "Usually only business users have to handle it, see https://en.wikipedia.org/wiki/Sales_tax."
 msgid "tax type: sales tax"
-msgstr ""
+msgstr "税务类型：销售税"
 
 #. "'Goods and Service Tax' is one form of sales tax."
 msgid "tax type: GST"
@@ -935,7 +936,7 @@ msgstr ""
 
 #. "'Value Added Tax' is the other form of sales tax."
 msgid "tax type: VAT"
-msgstr ""
+msgstr "税务类型：增值税（VAT）"
 
 # 如果您创建一个新样式表，您可以从模板开始。
 #. "If you create a new e.g. style sheet, you can start from a template."