gnucash stable: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Wed May 17 13:15:21 EDT 2023
Updated via https://github.com/Gnucash/gnucash/commit/32e1d664 (commit)
via https://github.com/Gnucash/gnucash/commit/4df662af (commit)
via https://github.com/Gnucash/gnucash/commit/a63247ba (commit)
via https://github.com/Gnucash/gnucash/commit/3957272e (commit)
from https://github.com/Gnucash/gnucash/commit/b17fa732 (commit)
commit 32e1d664c801152dc8db652f7dd572ec0eef382f
Merge: b17fa7322d 4df662afae
Author: John Ralls <jralls at ceridwen.us>
Date: Wed May 17 12:09:07 2023 -0500
Merge Richard Cohen's 'fix-typos' into stable.
commit 4df662afae2045a935d541cbff2d9cedc65a1591
Author: Richard Cohen <richard at daijobu.co.uk>
Date: Sat May 13 13:08:07 2023 +0100
Fix the typo in function name "new_query_for_addresss"
diff --git a/libgnucash/app-utils/gnc-addr-quickfill.c b/libgnucash/app-utils/gnc-addr-quickfill.c
index 114323d7a0..a5508741ed 100644
--- a/libgnucash/app-utils/gnc-addr-quickfill.c
+++ b/libgnucash/app-utils/gnc-addr-quickfill.c
@@ -134,7 +134,7 @@ static void address_cb(gpointer data, gpointer user_data)
/** Creates a new query that searches for all GncAddress items in the
* current book. */
-static QofQuery *new_query_for_addresss(QofBook *book)
+static QofQuery *new_query_for_address(QofBook *book)
{
QofQuery *query = qof_query_create_for (GNC_ID_ADDRESS);
g_assert(book);
@@ -148,7 +148,7 @@ static QofQuery *new_query_for_addresss(QofBook *book)
static AddressQF* build_shared_quickfill (QofBook *book, const char * key)
{
AddressQF *result;
- QofQuery *query = new_query_for_addresss(book);
+ QofQuery *query = new_query_for_address(book);
GList *entries = qof_query_run(query);
/* g_warning("Found %d GncAddress items", g_list_length (entries)); */
commit a63247ba49048a2c28c1a62facc1071a483fa278
Author: Richard Cohen <richard at daijobu.co.uk>
Date: Sat May 13 13:02:24 2023 +0100
Fix a typo in French Canadian account template
diff --git a/data/accounts/fr_CA/acctchrt_revenus.gnucash-xea b/data/accounts/fr_CA/acctchrt_revenus.gnucash-xea
index f010a77e4c..76377d091b 100644
--- a/data/accounts/fr_CA/acctchrt_revenus.gnucash-xea
+++ b/data/accounts/fr_CA/acctchrt_revenus.gnucash-xea
@@ -77,7 +77,7 @@
<act:parent type="new">e5e6414e2da9abb0d11a675a1244e380</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>Commisssions</act:name>
+ <act:name>Commissions</act:name>
<act:id type="new">4dbd931cbbd8483c717a98897f00a65b</act:id>
<act:type>INCOME</act:type>
<act:commodity>
commit 3957272ef04d082315ddf38c57be9f6b5cf76e80
Author: Richard Cohen <richard at daijobu.co.uk>
Date: Tue Jan 31 18:16:33 2023 +0000
Fix some typos in comments
diff --git a/bindings/guile/gnc-optiondb.i b/bindings/guile/gnc-optiondb.i
index d8ec8dfc0f..d757f66c55 100644
--- a/bindings/guile/gnc-optiondb.i
+++ b/bindings/guile/gnc-optiondb.i
@@ -2129,7 +2129,7 @@ gnc_register_multichoice_callback_option(GncOptionDBPtr& db,
});
}
- /** Tailred for gnc:generate-restore-forms.
+ /** Tailored for gnc:generate-restore-forms.
* @param section_op A function to be called on each section name
* @param option_op a function to be called on each option
*/
diff --git a/gnucash/gnome-utils/dialog-preferences.c b/gnucash/gnome-utils/dialog-preferences.c
index c24eee64e7..2904d011e9 100644
--- a/gnucash/gnome-utils/dialog-preferences.c
+++ b/gnucash/gnome-utils/dialog-preferences.c
@@ -622,7 +622,7 @@ gnc_prefs_move_grid_entry (GtkWidget *child,
/** At dialog creation time, this function will be called once per
- * adds-in. It performs the work of adding the page into the main
+ * add-in. It performs the work of adding the page into the main
* dialog. It handles both the case of a full page being added to
* the dialog, and a partial page being added.
*
diff --git a/gnucash/gnome-utils/dialog-utils.c b/gnucash/gnome-utils/dialog-utils.c
index e19f51209b..a231fc82fa 100644
--- a/gnucash/gnome-utils/dialog-utils.c
+++ b/gnucash/gnome-utils/dialog-utils.c
@@ -298,7 +298,7 @@ gnc_window_adjust_for_screen(GtkWindow * window)
}
/********************************************************************\
- * Sets the alignament of a Label Widget, GTK3 version specific. *
+ * Sets the alignment of a Label Widget, GTK3 version specific. *
* *
* Args: widget - the label widget to set alignment on *
* xalign - x alignment *
@@ -431,7 +431,7 @@ gnc_gdate_in_valid_range (GDate *test_date, gboolean warn)
if (warn && !ret)
{
- // Transators: Use your locale date format here!
+ // Translators: Use your locale date format here!
gchar *dialog_msg = _("The entered date is out of the range "
"01/01/1400 - 31/12/9999, resetting to this year");
gchar *dialog_title = _("Date out of range");
diff --git a/gnucash/gnome-utils/dialog-utils.h b/gnucash/gnome-utils/dialog-utils.h
index e89aee3a7d..c72e77d1e9 100644
--- a/gnucash/gnome-utils/dialog-utils.h
+++ b/gnucash/gnome-utils/dialog-utils.h
@@ -69,7 +69,7 @@ void gnc_save_window_size (const char *section, GtkWindow *window);
void gnc_window_adjust_for_screen (GtkWindow * window);
/********************************************************************\
- * Sets the alignament of a Label Widget, GTK3 version specific. *
+ * Sets the alignment of a Label Widget, GTK3 version specific. *
* *
* Args: widget - the label widget to set alignment on *
* xalign - x alignment *
diff --git a/gnucash/gnome-utils/gnc-splash.c b/gnucash/gnome-utils/gnc-splash.c
index b274035f12..2e66334811 100644
--- a/gnucash/gnome-utils/gnc-splash.c
+++ b/gnucash/gnome-utils/gnc-splash.c
@@ -175,7 +175,7 @@ gnc_update_splash_screen (const gchar *string, double percentage)
round(gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(progress_bar)) * 100.0);
if (percentage >= 0 && percentage <= 100.0 &&
round(percentage) == curr_fraction)
- return; // No change so don't wast time running the main loop
+ return; // No change so don't waste time running the main loop
if (percentage <= 0)
{
diff --git a/gnucash/gnucash.cpp b/gnucash/gnucash.cpp
index 6c54baed91..856e4d2beb 100644
--- a/gnucash/gnucash.cpp
+++ b/gnucash/gnucash.cpp
@@ -158,7 +158,7 @@ scm_run_gnucash (void *data, [[maybe_unused]] int argc, [[maybe_unused]] char **
Gnucash::gnc_load_scm_config();
/* Setting-up the report menu must come after the module
- loading but before the gui initializat*ion. */
+ loading but before the gui initialization. */
gnc_plugin_report_system_new();
/* TODO: After some more guile-extraction, this should happen even
diff --git a/gnucash/report/options-utilities.scm b/gnucash/report/options-utilities.scm
index eb81c1272f..d05bde7ed5 100644
--- a/gnucash/report/options-utilities.scm
+++ b/gnucash/report/options-utilities.scm
@@ -164,7 +164,7 @@
(N_ "Height of plot, 10 - 100 in percent, above in pixels.")
height)))
-;; A multicoice option for the marker of a scatter plot.
+;; A multichoice option for the marker of a scatter plot.
(define (gnc:options-add-marker-choice!
options pagename optname sort-tag default)
(gnc-register-multichoice-option (gnc:optiondb options)
diff --git a/libgnucash/backend/sql/gnc-sql-backend.cpp b/libgnucash/backend/sql/gnc-sql-backend.cpp
index cee7d5cdd0..6fc8cde97f 100644
--- a/libgnucash/backend/sql/gnc-sql-backend.cpp
+++ b/libgnucash/backend/sql/gnc-sql-backend.cpp
@@ -337,7 +337,7 @@ GncSqlBackend::load (QofBook* book, QofBackendLoadType loadType)
});
m_postload_commodities.clear();
- /* Mark the sessoion as clean -- though it should never be marked
+ /* Mark the session as clean -- though it should never be marked
* dirty with this backend
*/
qof_book_mark_session_saved (book);
diff --git a/libgnucash/engine/AccountP.h b/libgnucash/engine/AccountP.h
index 9de148482e..ef9fed9550 100644
--- a/libgnucash/engine/AccountP.h
+++ b/libgnucash/engine/AccountP.h
@@ -66,7 +66,7 @@ typedef enum
typedef struct AccountPrivate
{
/* The accountName is an arbitrary string assigned by the user.
- * It is intended to a short, 5 to 30 character long string that
+ * It is intended to be a short, 5 to 30 character long string that
* is displayed by the GUI as the account mnemonic.
*/
const char *accountName;
diff --git a/libgnucash/engine/qofsession.cpp b/libgnucash/engine/qofsession.cpp
index 5ae072fc8f..79b5569fa6 100644
--- a/libgnucash/engine/qofsession.cpp
+++ b/libgnucash/engine/qofsession.cpp
@@ -1,5 +1,5 @@
/********************************************************************\
- * qofsesssion.cpp -- session access (connection to backend) *
+ * qofsession.cpp -- session access (connection to backend) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
Summary of changes:
bindings/guile/gnc-optiondb.i | 2 +-
data/accounts/fr_CA/acctchrt_revenus.gnucash-xea | 2 +-
gnucash/gnome-utils/dialog-preferences.c | 2 +-
gnucash/gnome-utils/dialog-utils.c | 4 ++--
gnucash/gnome-utils/dialog-utils.h | 2 +-
gnucash/gnome-utils/gnc-splash.c | 2 +-
gnucash/gnucash.cpp | 2 +-
gnucash/report/options-utilities.scm | 2 +-
libgnucash/app-utils/gnc-addr-quickfill.c | 4 ++--
libgnucash/backend/sql/gnc-sql-backend.cpp | 2 +-
libgnucash/engine/AccountP.h | 2 +-
libgnucash/engine/qofsession.cpp | 2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
More information about the gnucash-changes
mailing list