gnucash maint: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Tue Mar 31 15:50:06 EDT 2020
Updated via https://github.com/Gnucash/gnucash/commit/90d3e6c6 (commit)
via https://github.com/Gnucash/gnucash/commit/ee87b808 (commit)
from https://github.com/Gnucash/gnucash/commit/0d0fddcf (commit)
commit 90d3e6c6721ffb3f7e53adfd8bbd2f1b6933cb3d
Merge: 0d0fddcfc ee87b8081
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Mar 31 21:26:24 2020 +0200
Merge branch PR #675 into maint
commit ee87b8081ddd942ddf28f053574e36d2995fbf41
Author: Yuri Chornoivan <yurchor at ukr.net>
Date: Mon Mar 30 16:21:06 2020 +0300
Fix minor typos
diff --git a/gnucash/gnome-utils/account-quickfill.h b/gnucash/gnome-utils/account-quickfill.h
index a9a280acd..8e8e7e2a1 100644
--- a/gnucash/gnome-utils/account-quickfill.h
+++ b/gnucash/gnome-utils/account-quickfill.h
@@ -50,7 +50,7 @@ typedef gboolean (*AccountBoolCB) (Account *, gpointer);
/** Create/fetch a quickfill of account names.
*
* The quickfill is created out of all of the subaccounts
- * the the account group, filtered by the 'skip_cb' callback.
+ * in the account group, filtered by the 'skip_cb' callback.
* If 'skip_cb' is not NULL, and if it returns TRUE when passed
* a particular account, then that account won't be included in
* the quickfill. The 'cb_data' is passed to the callback.
diff --git a/gnucash/gnome-utils/dialog-commodity.c b/gnucash/gnome-utils/dialog-commodity.c
index 74675a985..722d216b6 100644
--- a/gnucash/gnome-utils/dialog-commodity.c
+++ b/gnucash/gnome-utils/dialog-commodity.c
@@ -624,7 +624,7 @@ gnc_ui_update_namespace_picker (GtkWidget *cbwe,
}
}
- /* Next insert insert "All non-currency" entry if requested */
+ /* Next insert "All non-currency" entry if requested */
if (mode == DIAG_COMM_NON_CURRENCY_SELECT || mode == DIAG_COMM_ALL)
{
gtk_list_store_append(GTK_LIST_STORE(model), &iter);
diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index ec1b03fcc..7bc829085 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -2413,7 +2413,7 @@ gnc_options_dialog_destroy(GNCOptionWin * win)
* You probably want to end with something like:
* gtk_widget_show_all(*enclosing);
*
- * If you can can detect state changes for your widget's value, you should also
+ * If you can detect state changes for your widget's value, you should also
* gnc_option_changed_widget_cb() upon changes.
*
* The widget you return from this function should be the widget in
diff --git a/gnucash/gnome-utils/dialog-preferences.c b/gnucash/gnome-utils/dialog-preferences.c
index 34ddfe456..4a6e26484 100644
--- a/gnucash/gnome-utils/dialog-preferences.c
+++ b/gnucash/gnome-utils/dialog-preferences.c
@@ -591,7 +591,7 @@ gnc_preferences_build_page (gpointer data,
gnc_prefs_build_widget_table(builder, dialog);
/* Connect the signals in this glade file. The dialog is passed in
- * so the the callback can find "interesting" widgets from other
+ * so the callback can find "interesting" widgets from other
* glade files if necessary (via the GPREFS_WIDGET_HASH hash table). */
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, dialog);
@@ -859,7 +859,7 @@ file_chooser_clear_cb (GtkButton *button, gpointer user_data)
GtkWidget *fcb_new;
gchar *boxname;
- /* We need to distroy the GtkFileChooserButton and recreate as there
+ /* We need to destroy the GtkFileChooserButton and recreate as there
does not seem to be away of resetting the folder path to NONE */
box = gtk_widget_get_parent (GTK_WIDGET(fcb));
gtk_widget_destroy (GTK_WIDGET(fcb));
diff --git a/gnucash/gnome-utils/dialog-reset-warnings.c b/gnucash/gnome-utils/dialog-reset-warnings.c
index c6b0602cf..bef26bfa2 100644
--- a/gnucash/gnome-utils/dialog-reset-warnings.c
+++ b/gnucash/gnome-utils/dialog-reset-warnings.c
@@ -327,7 +327,7 @@ show_handler (const char *class_name, gint component_id,
ENTER(" ");
if (!rw_dialog)
{
- LEAVE("no data strucure");
+ LEAVE("no data structure");
return(FALSE);
}
diff --git a/gnucash/gnome-utils/dialog-totd.c b/gnucash/gnome-utils/dialog-totd.c
index 4c5e5995c..cc1712238 100644
--- a/gnucash/gnome-utils/dialog-totd.c
+++ b/gnucash/gnome-utils/dialog-totd.c
@@ -271,7 +271,7 @@ show_handler (const char *class_name, gint component_id,
ENTER(" ");
if (!totd_dialog)
{
- LEAVE("no data strucure");
+ LEAVE("no data structure");
return(FALSE);
}
diff --git a/gnucash/gnome-utils/gnc-embedded-window.c b/gnucash/gnome-utils/gnc-embedded-window.c
index 7682aeafc..bf2873be9 100644
--- a/gnucash/gnome-utils/gnc-embedded-window.c
+++ b/gnucash/gnome-utils/gnc-embedded-window.c
@@ -198,7 +198,7 @@ gnc_embedded_window_class_init (GncEmbeddedWindowClass *klass)
*
* The "page_changed" signal is emitted when a new page is
* selected in the notebook of a GncEmbeddedWindow. This can be
- * used to to adjust menu actions based upon which page is
+ * used to adjust menu actions based upon which page is
* currently displayed in a window.
*/
embedded_window_signals[PAGE_CHANGED] =
diff --git a/gnucash/gnome-utils/gnc-file.h b/gnucash/gnome-utils/gnc-file.h
index d32a0fb36..eb38e705b 100644
--- a/gnucash/gnome-utils/gnc-file.h
+++ b/gnucash/gnome-utils/gnc-file.h
@@ -105,7 +105,7 @@
* will inform the user of the error.
*
* The gnc_file_quit() routine will close out and destroy the current session.
- * The user WILL NOT BE PROMPTED to confirm this action, or do do
+ * The user WILL NOT BE PROMPTED to confirm this action, or do
* any kind of saving beforehand.
*
* HISTORY:
diff --git a/gnucash/gnome-utils/gnc-gobject-utils.c b/gnucash/gnome-utils/gnc-gobject-utils.c
index 8b3b67622..ed0608ff9 100644
--- a/gnucash/gnome-utils/gnc-gobject-utils.c
+++ b/gnucash/gnome-utils/gnc-gobject-utils.c
@@ -127,7 +127,7 @@ gnc_gobject_tracking_remember (GObject *object, GObjectClass *klass)
g_return_if_fail(G_IS_OBJECT(object));
/* Little dance here to handle startup conditions. During object
- * initialization the object type changes as each each parent class
+ * initialization the object type changes as each parent class
* is initialized. The class passed to the initialization function
* is always the ultimate class of the object. */
if (klass == NULL)
diff --git a/gnucash/gnome-utils/gnc-keyring.c b/gnucash/gnome-utils/gnc-keyring.c
index ce0e3b55d..99d5b9c3c 100644
--- a/gnucash/gnome-utils/gnc-keyring.c
+++ b/gnucash/gnome-utils/gnc-keyring.c
@@ -139,7 +139,7 @@ void gnc_keyring_set_password (const gchar *access_method,
strlen(server), server, /* servername */
strlen(access_method),
access_method, /* securitydomain */
- strlen(user), user, /* acountname */
+ strlen(user), user, /* accountname */
strlen(service), service, /* path */
port, /* port */
kSecProtocolTypeAny, /* protocol */
diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
index f6ebdc762..b2e8e7ab1 100644
--- a/gnucash/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -2514,7 +2514,7 @@ gnc_main_window_class_init (GncMainWindowClass *klass)
*
* The "page_changed" signal is emitted when a new page is
* selected in the notebook of a GncMainWindow. This can be
- * used to to adjust menu actions based upon which page is
+ * used to adjust menu actions based upon which page is
* currently displayed in a window.
*/
main_window_signals[PAGE_CHANGED] =
diff --git a/gnucash/gnome-utils/gnc-main-window.h b/gnucash/gnome-utils/gnc-main-window.h
index ae230020e..e09edb048 100644
--- a/gnucash/gnome-utils/gnc-main-window.h
+++ b/gnucash/gnome-utils/gnc-main-window.h
@@ -424,7 +424,7 @@ GtkWidget *gnc_book_options_dialog_cb (gboolean modal, gchar *title,
/**
* Processes selected options in the Book Options dialog: checks book_currency
- * and use_split_action_for_num to see if features kvp shuold be set. To be used
+ * and use_split_action_for_num to see if features kvp should be set. To be used
* where ever a new book situation requires book option selection (e.g., not
* just in Book Options dialog opened from main window but also in new-file
* assistant).
diff --git a/gnucash/gnome-utils/gnc-menu-extensions.h b/gnucash/gnome-utils/gnc-menu-extensions.h
index f08e96dca..122e3bd76 100644
--- a/gnucash/gnome-utils/gnc-menu-extensions.h
+++ b/gnucash/gnome-utils/gnc-menu-extensions.h
@@ -46,7 +46,7 @@ void gnc_extension_invoke_cb (SCM extension, SCM window);
/** This function stores a menu item/callback for later insertion into
* the application menus,
*
- * @param extension A scheme object descrubing the menu to be
+ * @param extension A scheme object describing the menu to be
* inserted. Functions written in C should use the gnc-plugin code.
*/
void gnc_add_scm_extension(SCM extension);
diff --git a/gnucash/gnome-utils/gnc-plugin-page.h b/gnucash/gnome-utils/gnc-plugin-page.h
index a10e72881..e976c71bf 100644
--- a/gnucash/gnome-utils/gnc-plugin-page.h
+++ b/gnucash/gnome-utils/gnc-plugin-page.h
@@ -423,7 +423,7 @@ void gnc_plugin_page_set_page_color (GncPluginPage *page, const char *color);
/** Set up the page_changed callback for when the current page is changed.
- * This will store a pointer to the page focus funtion passed as a parameter
+ * This will store a pointer to the page focus function passed as a parameter
* so that it can be used in setting up the g_idle_add
*
* @param page The page the callback is setup for.
diff --git a/gnucash/gnome-utils/gnc-tree-model-account.c b/gnucash/gnome-utils/gnc-tree-model-account.c
index c0044b6d9..f29a356a9 100644
--- a/gnucash/gnome-utils/gnc-tree-model-account.c
+++ b/gnucash/gnome-utils/gnc-tree-model-account.c
@@ -129,7 +129,7 @@ gnc_tree_model_account_update_color (gpointer gsettings, gchar *key, gpointer us
model = user_data;
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
- // destroy/recreate the cached acount value hash to force update
+ // destroy/recreate the cached account value hash to force update
g_hash_table_destroy (priv->account_values_hash);
priv->account_values_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_free);
@@ -252,7 +252,7 @@ gnc_tree_model_account_dispose (GObject *object)
if (priv->negative_color)
g_free (priv->negative_color);
- // destroy the cached acount values
+ // destroy the cached account values
g_hash_table_destroy (priv->account_values_hash);
gnc_prefs_remove_cb_by_func (GNC_PREFS_GROUP_GENERAL, GNC_PREF_NEGATIVE_IN_RED,
@@ -599,7 +599,7 @@ gnc_tree_model_account_clear_cache (GncTreeModelAccount *model)
{
GncTreeModelAccountPrivate *priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
- // destroy the cached acount values and recreate
+ // destroy the cached account values and recreate
g_hash_table_destroy (priv->account_values_hash);
priv->account_values_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_free);
diff --git a/gnucash/gnome-utils/gnc-tree-model-selection.h b/gnucash/gnome-utils/gnc-tree-model-selection.h
index b213430eb..c06e469e1 100644
--- a/gnucash/gnome-utils/gnc-tree-model-selection.h
+++ b/gnucash/gnome-utils/gnc-tree-model-selection.h
@@ -31,7 +31,7 @@
* GtkTreeViews allow the creation of columns in any order, not just
* the order they appear in the underlying model. The most likely use
* of this code will have the first view column mapped to this extra
- * boolean model column, and the column value diaplayed by a checkbox.
+ * boolean model column, and the column value displayed by a checkbox.
*/
#ifndef __GNC_TREE_MODEL_SELECTION_H
diff --git a/gnucash/gnome-utils/gnc-tree-view-account.c b/gnucash/gnome-utils/gnc-tree-view-account.c
index 5efa3d20d..b6a483168 100644
--- a/gnucash/gnome-utils/gnc-tree-view-account.c
+++ b/gnucash/gnome-utils/gnc-tree-view-account.c
@@ -1574,7 +1574,7 @@ gnc_tree_view_account_set_selected_accounts (GncTreeViewAccount *view,
}
/*
- * Selects all sub-accounts of an acccount.
+ * Selects all sub-accounts of an account.
*/
void
gnc_tree_view_account_select_subaccounts (GncTreeViewAccount *view,
diff --git a/gnucash/gnome-utils/gnc-tree-view-account.h b/gnucash/gnome-utils/gnc-tree-view-account.h
index db9279a98..7f0d6532f 100644
--- a/gnucash/gnome-utils/gnc-tree-view-account.h
+++ b/gnucash/gnome-utils/gnc-tree-view-account.h
@@ -406,7 +406,7 @@ Account * gnc_tree_view_account_get_selected_account (GncTreeViewAccount *view);
/** This function selects an account in the account tree view. All
* other accounts will be unselected. In addition, this function
- * collapses the entitre tree and then expands only the path to the
+ * collapses the entire tree and then expands only the path to the
* selected account, making the item easy to find. In general, this
* routine only need be called when initially putting up a window
* containing an account tree view widget.
@@ -439,7 +439,7 @@ GList * gnc_tree_view_account_get_selected_accounts (GncTreeViewAccount *view);
/** This function selects a set of accounts in the account tree view.
* All other accounts will be unselected. In addition, this function
- * collapses the entitre tree and then expands only the path to the
+ * collapses the entire tree and then expands only the path to the
* selected accounts, making them easy to find. In general, this
* routine only need be called when initially putting up a window
* containing an account tree view widget.
diff --git a/gnucash/gnome-utils/gnc-tree-view-owner.h b/gnucash/gnome-utils/gnc-tree-view-owner.h
index 9998d78bf..a0c213ad1 100644
--- a/gnucash/gnome-utils/gnc-tree-view-owner.h
+++ b/gnucash/gnome-utils/gnc-tree-view-owner.h
@@ -258,7 +258,7 @@ GncOwner * gnc_tree_view_owner_get_selected_owner (GncTreeViewOwner *view);
/** This function selects an owner in the owner tree view. All
* other owners will be unselected. In addition, this function
- * collapses the entitre tree and then expands only the path to the
+ * collapses the entire tree and then expands only the path to the
* selected owner, making the item easy to find. In general, this
* routine only need be called when initially putting up a window
* containing an owner tree view widget.
diff --git a/gnucash/gnome-utils/gnc-tree-view-price.h b/gnucash/gnome-utils/gnc-tree-view-price.h
index 155acb07a..740a2c260 100644
--- a/gnucash/gnome-utils/gnc-tree-view-price.h
+++ b/gnucash/gnome-utils/gnc-tree-view-price.h
@@ -177,7 +177,7 @@ GNCPrice * gnc_tree_view_price_get_selected_price (GncTreeViewPrice *view);
/** This function selects an price in the price tree view. All
* other prices will be unselected. In addition, this function
- * collapses the entitre tree and then expands only the path to the
+ * collapses the entire tree and then expands only the path to the
* selected price, making the item easy to find. In general, this
* routine only need be called when initially putting up a window
* containing an price tree view widget.
diff --git a/gnucash/gnome-utils/gnc-tree-view-split-reg.c b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
index 22c34544d..533c3293b 100644
--- a/gnucash/gnome-utils/gnc-tree-view-split-reg.c
+++ b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
@@ -592,7 +592,7 @@ gnc_tree_view_split_reg_pref_changed (gpointer prefs, gchar *pref, gpointer user
/* Define which columns are in which views */
static ViewCol *
-gnc_tree_view_split_reg_get_colummn_list (GncTreeModelSplitReg *model)
+gnc_tree_view_split_reg_get_column_list (GncTreeModelSplitReg *model)
{
DEBUG("Model-type is %d", model->type);
@@ -1024,7 +1024,7 @@ gnc_tree_view_split_reg_new_with_model (GncTreeModelSplitReg *model)
gnc_tree_view_set_sort_user_data (GNC_TREE_VIEW (view), s_model);
/* Set up the columns */
- gnc_tree_view_split_reg_set_cols (view, model, gnc_tree_view_split_reg_get_colummn_list (model));
+ gnc_tree_view_split_reg_set_cols (view, model, gnc_tree_view_split_reg_get_column_list (model));
PINFO("#### Before View connected to Model ####");
diff --git a/gnucash/gnome-utils/gnc-tree-view.h b/gnucash/gnome-utils/gnc-tree-view.h
index 65d91b5cb..c31d383b7 100644
--- a/gnucash/gnome-utils/gnc-tree-view.h
+++ b/gnucash/gnome-utils/gnc-tree-view.h
@@ -79,7 +79,7 @@ GType gnc_tree_view_get_type (void);
#define REAL_TITLE "real_title"
/* The name of this column to use when saving the view's state. It is
- * used internally to map this colum's properties to the saved state. */
+ * used internally to map this column's properties to the saved state. */
#define PREF_NAME "pref-name"
/* A column with this attribute set cannot be hidden from view. Valid
diff --git a/gnucash/gnome/dialog-find-account.c b/gnucash/gnome/dialog-find-account.c
index f978cfa9e..23e6f5c68 100644
--- a/gnucash/gnome/dialog-find-account.c
+++ b/gnucash/gnome/dialog-find-account.c
@@ -494,7 +494,7 @@ show_handler (const char *klass, gint component_id,
ENTER(" ");
if (!facc_dialog)
{
- LEAVE("No data strucure");
+ LEAVE("No data structure");
return(FALSE);
}
gtk_window_present (GTK_WINDOW(facc_dialog->window));
diff --git a/gnucash/gnome/dialog-imap-editor.c b/gnucash/gnome/dialog-imap-editor.c
index 5bc4962c5..bbb7f8c21 100644
--- a/gnucash/gnome/dialog-imap-editor.c
+++ b/gnucash/gnome/dialog-imap-editor.c
@@ -772,7 +772,7 @@ show_handler (const char *klass, gint component_id,
ENTER(" ");
if (!imap_dialog)
{
- LEAVE("No data strucure");
+ LEAVE("No data structure");
return(FALSE);
}
gtk_window_present (GTK_WINDOW(imap_dialog->dialog));
diff --git a/gnucash/gnome/dialog-lot-viewer.c b/gnucash/gnome/dialog-lot-viewer.c
index 14f2683c4..c58bb6118 100644
--- a/gnucash/gnome/dialog-lot-viewer.c
+++ b/gnucash/gnome/dialog-lot-viewer.c
@@ -317,7 +317,7 @@ lv_select_row (GNCLotViewer *lv,
}
/* ======================================================================== */
-/* Un-select a row the the lot list */
+/* Un-select a row of the lot list */
static void
lv_unselect_row (GNCLotViewer *lv)
diff --git a/gnucash/gnome/dialog-payment.c b/gnucash/gnome/dialog-payment.c
index 2f952451d..f0f8a4f94 100644
--- a/gnucash/gnome/dialog-payment.c
+++ b/gnucash/gnome/dialog-payment.c
@@ -1084,7 +1084,7 @@ gnc_payment_leave_amount_cb (G_GNUC_UNUSED GtkWidget *widget,
gnc_payment_window_check_payment (pw);
}
-/* Select the list of accoutns to show in the tree */
+/* Select the list of accounts to show in the tree */
static void
gnc_payment_set_account_types (GncTreeViewAccount *tree)
{
diff --git a/gnucash/gnome/dialog-price-edit-db.c b/gnucash/gnome/dialog-price-edit-db.c
index d6ce1d1b8..25b916fb8 100644
--- a/gnucash/gnome/dialog-price-edit-db.c
+++ b/gnucash/gnome/dialog-price-edit-db.c
@@ -801,7 +801,7 @@ show_handler (const char *klass, gint component_id,
ENTER(" ");
if (!pdb_dialog)
{
- LEAVE("no data strucure");
+ LEAVE("no data structure");
return(FALSE);
}
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 0c311aea4..a2376fe2b 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -1155,7 +1155,7 @@ get_filter_default_num_of_days (GNCLedgerDisplayType ledger_type)
/* For setting the focus on a register page, the default gnc_plugin
* function for 'focus_page' is overridden so that the page focus
- * can be condionally set. This is to allow for enabling the setting
+ * can be conditionally set. This is to allow for enabling the setting
* of the sheet focus only when the page is the current one.
*/
static void
diff --git a/gnucash/gnome/gnc-split-reg.c b/gnucash/gnome/gnc-split-reg.c
index 12dcfe5e5..a8dfff138 100644
--- a/gnucash/gnome/gnc-split-reg.c
+++ b/gnucash/gnome/gnc-split-reg.c
@@ -569,7 +569,7 @@ gsr_redraw_all_cb (GnucashRegister *g_reg, gpointer data)
commodity = xaccAccountGetCommodity( leader );
- /* no EURO converson, if account is already EURO or no EURO currency */
+ /* no EURO conversion, if account is already EURO or no EURO currency */
if (commodity != NULL)
euro = (gnc_is_euro_currency( commodity ) &&
(strncasecmp(gnc_commodity_get_mnemonic(commodity), "EUR", 3)));
diff --git a/gnucash/gnome/gnc-split-reg2.c b/gnucash/gnome/gnc-split-reg2.c
index 8e88572c3..1b372bf69 100644
--- a/gnucash/gnome/gnc-split-reg2.c
+++ b/gnucash/gnome/gnc-split-reg2.c
@@ -517,7 +517,7 @@ gsr2_redraw_all_cb (GncTreeViewSplitReg *view, gpointer user_data)
commodity = xaccAccountGetCommodity( leader );
- /* no EURO converson, if account is already EURO or no EURO currency */
+ /* no EURO conversion, if account is already EURO or no EURO currency */
if (commodity != NULL)
euro = (gnc_is_euro_currency( commodity ) &&
(strncasecmp(gnc_commodity_get_mnemonic(commodity), "EUR", 3)));
diff --git a/gnucash/gnome/reconcile-view.c b/gnucash/gnome/reconcile-view.c
index 2aa489a36..d600bca9c 100644
--- a/gnucash/gnome/reconcile-view.c
+++ b/gnucash/gnome/reconcile-view.c
@@ -584,7 +584,7 @@ gnc_reconcile_view_toggle_children (Account *account, GNCReconcileView *view, Sp
other_account = xaccSplitGetAccount (other_split);
if (other_split == split)
continue;
- /* Check this 'other' account in in the same hierarchy */
+ /* Check this 'other' account is in the same hierarchy */
if (!g_list_find (child_accounts, other_account))
continue;
/* Search our sibling view for this split first. We search the
diff --git a/gnucash/import-export/bi-import/dialog-bi-import.c b/gnucash/import-export/bi-import/dialog-bi-import.c
index d6b3fd610..d2e0ec03c 100644
--- a/gnucash/import-export/bi-import/dialog-bi-import.c
+++ b/gnucash/import-export/bi-import/dialog-bi-import.c
@@ -81,8 +81,8 @@ static char * un_escape(char *str);
that matches each field of the import row and the user selected field
separators (, or ;), optionally with the fields enclosed in quotes.
- If the match is succesful, the fields of the import row are transferred to
- a row in the GtkListStore store. If the the match is not succesful, the
+ If the match is successful, the fields of the import row are transferred to
+ a row in the GtkListStore store. If the match is not successful, the
row is ignored. Maintains information about number of rows imported,
the number of rows ignored, and the actual ignored rows.
@@ -175,7 +175,7 @@ gnc_bi_import_read_file (const gchar * filename, const gchar * parser_regexp,
line_utf8 = g_locale_to_utf8 (line, -1, NULL, NULL, NULL);
// parse the line
- match_info = NULL; // it seems, that in contrast to documentation, match_info is not alsways set -> g_match_info_free will segfault
+ match_info = NULL; // it seems, that in contrast to documentation, match_info is not always set -> g_match_info_free will segfault
if (g_regex_match (regexpat, line_utf8, 0, &match_info))
{
// match found
diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index 33a4cd1c1..6abc594bb 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -1803,7 +1803,7 @@ csv_tximp_acct_match_text_parse (std::string acct_name)
void
CsvImpTransAssist::acct_match_select(GtkTreeModel *model, GtkTreeIter* iter)
{
- // Get the the stored string and account (if any)
+ // Get the stored string and account (if any)
gchar *text = nullptr;
Account *account = nullptr;
gtk_tree_model_get (model, iter, MAPPING_STRING, &text,
diff --git a/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
index ee5cc3bd1..1b8cf6721 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
@@ -708,7 +708,7 @@ void GncPreSplit::create_split (Transaction* trans)
if (taccount)
{
/* Note: the current importer assumes at most 2 splits. This means the second split amount
- * will be the negative of the the first split amount.
+ * will be the negative of the first split amount.
*/
auto inv_price = m_price;
if (m_price)
diff --git a/gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp b/gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
index b8936961f..faf8cea75 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
@@ -122,7 +122,7 @@ public:
* match those of another one (the "parent"). Note this function is *not*
* symmetrical. This instance can have empty properties and still be considered
* part of the parent if the other properties match the parent's.
- * A fully empty instance will will equally be considered part of the parent.
+ * A fully empty instance will equally be considered part of the parent.
*
* This function is intended to discover multi-split transaction lines in an import
* file where the first line defines the transaction (with a first split) and subsequent
diff --git a/gnucash/import-export/csv-imp/gnc-import-tx.hpp b/gnucash/import-export/csv-imp/gnc-import-tx.hpp
index ae72d66b6..ffa8a035a 100644
--- a/gnucash/import-export/csv-imp/gnc-import-tx.hpp
+++ b/gnucash/import-export/csv-imp/gnc-import-tx.hpp
@@ -98,7 +98,7 @@ struct ErrorList;
* the result of this step can be queried from tokenizer
* - the user should now map the columns to types, which is stored in column_types
* - last step is convert the mapped columns into a list of transactions
- * - this list will then be passed on the the generic importer for further processing */
+ * - this list will then be passed on the generic importer for further processing */
class GncTxImport
{
public:
diff --git a/gnucash/import-export/customer-import/dialog-customer-import.c b/gnucash/import-export/customer-import/dialog-customer-import.c
index 322a59de6..adc7bea1c 100644
--- a/gnucash/import-export/customer-import/dialog-customer-import.c
+++ b/gnucash/import-export/customer-import/dialog-customer-import.c
@@ -139,7 +139,7 @@ gnc_customer_import_read_file (const gchar *filename, const gchar *parser_regexp
line_utf8 = g_locale_to_utf8 (line, -1, NULL, NULL, NULL);
// parse the line
- match_info = NULL; // it seems, that in contrast to documentation, match_info is not alsways set -> g_match_info_free will segfault
+ match_info = NULL; // it seems, that in contrast to documentation, match_info is not always set -> g_match_info_free will segfault
if (g_regex_match (regexpat, line_utf8, 0, &match_info))
{
// match found
diff --git a/gnucash/import-export/log-replay/gnc-log-replay.h b/gnucash/import-export/log-replay/gnc-log-replay.h
index 734a1c5a3..767702a36 100644
--- a/gnucash/import-export/log-replay/gnc-log-replay.h
+++ b/gnucash/import-export/log-replay/gnc-log-replay.h
@@ -29,7 +29,7 @@
/** The gnc_file_log_replay() routine will pop up a standard file
* selection dialogue asking the user to pick a log file to replay. If one
- * is selected the the .log file is opened and read. It's contents
+ * is selected the .log file is opened and read. Its contents
* are then silently merged in the current log file. */
void gnc_file_log_replay (GtkWindow *parent);
#endif
diff --git a/gnucash/import-export/ofx/gnc-ofx-import.h b/gnucash/import-export/ofx/gnc-ofx-import.h
index dfc8547dd..e1fce0c90 100644
--- a/gnucash/import-export/ofx/gnc-ofx-import.h
+++ b/gnucash/import-export/ofx/gnc-ofx-import.h
@@ -29,7 +29,7 @@
/** The gnc_file_ofx_import() routine will pop up a standard file
* selection dialogue asking the user to pick a OFX/QFX file. If one
- * is selected the the OFX file is opened and read. It's contents
+ * is selected the OFX file is opened and read. Its contents
* are merged into the existing session (if any). The current
* session continues to remain open for editing. */
void gnc_file_ofx_import (GtkWindow *parent);
diff --git a/gnucash/import-export/qif-imp/assistant-qif-import.c b/gnucash/import-export/qif-imp/assistant-qif-import.c
index ddaea8853..c595a0a66 100644
--- a/gnucash/import-export/qif-imp/assistant-qif-import.c
+++ b/gnucash/import-export/qif-imp/assistant-qif-import.c
@@ -1371,7 +1371,7 @@ gnc_ui_qif_import_cancel_cb (GtkAssistant *gtkassistant, gpointer user_data)
if (!g_strcmp0 (pagename, "summary_page"))
{
/* Hitting the window close button on the summary page should not
- invoke a cancel action. The import has finised at that point. */
+ invoke a cancel action. The import has finished at that point. */
gnc_ui_qif_import_close_cb (gtkassistant, user_data);
}
else
diff --git a/gnucash/import-export/qif-imp/assistant-qif-import.h b/gnucash/import-export/qif-imp/assistant-qif-import.h
index 10861a755..a70830a5b 100644
--- a/gnucash/import-export/qif-imp/assistant-qif-import.h
+++ b/gnucash/import-export/qif-imp/assistant-qif-import.h
@@ -36,7 +36,7 @@ SCM gnc_ui_qif_import_assistant_get_mappings(QIFImportWindow * w);
/* The gnc_file_qif_import() routine will pop up a standard file
* selection dialogue asking the user to pick a QIF file. If one
- * is selected then the QIF file is opened and read. It's contents
+ * is selected then the QIF file is opened and read. Its contents
* are merged into the existing session (if any). The current
* session continues to remain open for editing. */
void gnc_file_qif_import (void);
diff --git a/gnucash/register/ledger-core/split-register-model.c b/gnucash/register/ledger-core/split-register-model.c
index 3d82233f8..a8e9640df 100644
--- a/gnucash/register/ledger-core/split-register-model.c
+++ b/gnucash/register/ledger-core/split-register-model.c
@@ -2194,7 +2194,7 @@ gnc_split_register_confirm (VirtualLocation virt_loc, gpointer user_data)
}
title = _("Change transaction containing a reconciled split?");
message_format =
- _("The transaction you are about to change is contains reconciled splits in the following accounts:\n%s"
+ _("The transaction you are about to change contains reconciled splits in the following accounts:\n%s"
"\n\nAre you sure you want to continue with this change ?");
message = g_strdup_printf (message_format, acc_list);
diff --git a/gnucash/register/ledger-core/split-register.c b/gnucash/register/ledger-core/split-register.c
index 802658185..f4ae8770a 100644
--- a/gnucash/register/ledger-core/split-register.c
+++ b/gnucash/register/ledger-core/split-register.c
@@ -1453,7 +1453,7 @@ gnc_split_register_save_to_scm (SplitRegister *reg,
/* use the changed flag to avoid heavy-weight updates
* of the split & transaction fields. This will help
- * cut down on uneccessary register redraws. */
+ * cut down on unneccessary register redraws. */
if (!gnc_table_current_cursor_changed (reg->table, FALSE))
return FALSE;
diff --git a/gnucash/register/ledger-core/split-register.h b/gnucash/register/ledger-core/split-register.h
index 095168e4e..76cb5abfd 100644
--- a/gnucash/register/ledger-core/split-register.h
+++ b/gnucash/register/ledger-core/split-register.h
@@ -549,7 +549,7 @@ gboolean gnc_split_register_is_blank_split (SplitRegister *reg, Split *split);
void gnc_split_register_change_blank_split_ref (SplitRegister *reg, Split *split);
/** Pop up the exchange-rate dialog, maybe, for the current split.
- * If force_dialog is TRUE, the forces the dialog to to be called.
+ * If force_dialog is TRUE, the forces the dialog to be called.
* If the dialog does not complete successfully, then return TRUE.
* Return FALSE in all other cases (meaning "move on")
*/
diff --git a/gnucash/register/register-core/numcell.c b/gnucash/register/register-core/numcell.c
index 9f7de7c0e..ff92adfbe 100644
--- a/gnucash/register/register-core/numcell.c
+++ b/gnucash/register/register-core/numcell.c
@@ -1,5 +1,5 @@
/********************************************************************\
- * numcell.c -- number handling cell incl. accelarator key support *
+ * numcell.c -- number handling cell incl. accelerator key support *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
diff --git a/gnucash/register/register-core/numcell.h b/gnucash/register/register-core/numcell.h
index dd62d3f38..3ec75c47d 100644
--- a/gnucash/register/register-core/numcell.h
+++ b/gnucash/register/register-core/numcell.h
@@ -1,5 +1,5 @@
/********************************************************************\
- * numcell.h -- number handling cell incl. accelarator key support *
+ * numcell.h -- number handling cell incl. accelerator key support *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
diff --git a/gnucash/register/register-core/table-allgui.c b/gnucash/register/register-core/table-allgui.c
index 88d31eb7e..d55cbf24f 100644
--- a/gnucash/register/register-core/table-allgui.c
+++ b/gnucash/register/register-core/table-allgui.c
@@ -1022,7 +1022,7 @@ gnc_table_virtual_loc_valid(Table *table,
return FALSE;
/* verify that offsets are valid. This may occur if the app that is
- * using the table has a paritally initialized cursor. (probably due
+ * using the table has a partially initialized cursor. (probably due
* to a programming error, but maybe they meant to do this). */
if ((0 > virt_loc.phys_row_offset) || (0 > virt_loc.phys_col_offset))
return FALSE;
diff --git a/gnucash/report/jqplot/jquery.jqplot.js b/gnucash/report/jqplot/jquery.jqplot.js
index 1b68a685e..c24286a0d 100644
--- a/gnucash/report/jqplot/jquery.jqplot.js
+++ b/gnucash/report/jqplot/jquery.jqplot.js
@@ -1899,7 +1899,7 @@
// series data.
this._stackData = [];
// array that holds the data to be plotted. This will be the series data
- // merged with the the appropriate data from _stackData according to the stackAxis.
+ // merged with the appropriate data from _stackData according to the stackAxis.
this._plotData = [];
this._width = null;
this._height = null;
@@ -3223,7 +3223,7 @@
}
- // function to check if event location is over a area area
+ // function to check if event location is over an area
function checkIntersection(gridpos, plot) {
var series = plot.series;
var i, j, k, s, r, x, y, theta, sm, sa, minang, maxang;
diff --git a/gnucash/report/jqplot/jquery.js b/gnucash/report/jqplot/jquery.js
index 1e8f661f0..5dfd65bac 100644
--- a/gnucash/report/jqplot/jquery.js
+++ b/gnucash/report/jqplot/jquery.js
@@ -3000,7 +3000,7 @@ jQuery.event = {
if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
- // Call a native DOM method on the target with the same name name as the event.
+ // Call a native DOM method on the target with the same name as the event.
// Can't use an .isFunction() check here because IE6/7 fails that test.
// Don't do default actions on window, that's where global variables be (#6170)
if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
diff --git a/gnucash/report/standard-reports/balsheet-pnl.scm b/gnucash/report/standard-reports/balsheet-pnl.scm
index bed290824..c0dfb125f 100644
--- a/gnucash/report/standard-reports/balsheet-pnl.scm
+++ b/gnucash/report/standard-reports/balsheet-pnl.scm
@@ -803,7 +803,7 @@ also show overall period profit & loss."))
;; this function will convert the monetary found at col-idx
;; into report-currency if the latter exists. The price
- ;; applicable the the col-idx column is used. If the monetary
+ ;; applicable to the col-idx column is used. If the monetary
;; cannot be converted (eg. missing price) then it is not converted.
(convert-curr-fn
(lambda (monetary col-idx)
Summary of changes:
gnucash/gnome-utils/account-quickfill.h | 2 +-
gnucash/gnome-utils/dialog-commodity.c | 2 +-
gnucash/gnome-utils/dialog-options.c | 2 +-
gnucash/gnome-utils/dialog-preferences.c | 4 ++--
gnucash/gnome-utils/dialog-reset-warnings.c | 2 +-
gnucash/gnome-utils/dialog-totd.c | 2 +-
gnucash/gnome-utils/gnc-embedded-window.c | 2 +-
gnucash/gnome-utils/gnc-file.h | 2 +-
gnucash/gnome-utils/gnc-gobject-utils.c | 2 +-
gnucash/gnome-utils/gnc-keyring.c | 2 +-
gnucash/gnome-utils/gnc-main-window.c | 2 +-
gnucash/gnome-utils/gnc-main-window.h | 2 +-
gnucash/gnome-utils/gnc-menu-extensions.h | 2 +-
gnucash/gnome-utils/gnc-plugin-page.h | 2 +-
gnucash/gnome-utils/gnc-tree-model-account.c | 6 +++---
gnucash/gnome-utils/gnc-tree-model-selection.h | 2 +-
gnucash/gnome-utils/gnc-tree-view-account.c | 2 +-
gnucash/gnome-utils/gnc-tree-view-account.h | 4 ++--
gnucash/gnome-utils/gnc-tree-view-owner.h | 2 +-
gnucash/gnome-utils/gnc-tree-view-price.h | 2 +-
gnucash/gnome-utils/gnc-tree-view-split-reg.c | 4 ++--
gnucash/gnome-utils/gnc-tree-view.h | 2 +-
gnucash/gnome/dialog-find-account.c | 2 +-
gnucash/gnome/dialog-imap-editor.c | 2 +-
gnucash/gnome/dialog-lot-viewer.c | 2 +-
gnucash/gnome/dialog-payment.c | 2 +-
gnucash/gnome/dialog-price-edit-db.c | 2 +-
gnucash/gnome/gnc-plugin-page-register.c | 2 +-
gnucash/gnome/gnc-split-reg.c | 2 +-
gnucash/gnome/gnc-split-reg2.c | 2 +-
gnucash/gnome/reconcile-view.c | 2 +-
gnucash/import-export/bi-import/dialog-bi-import.c | 6 +++---
gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp | 2 +-
gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp | 2 +-
gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp | 2 +-
gnucash/import-export/csv-imp/gnc-import-tx.hpp | 2 +-
gnucash/import-export/customer-import/dialog-customer-import.c | 2 +-
gnucash/import-export/log-replay/gnc-log-replay.h | 2 +-
gnucash/import-export/ofx/gnc-ofx-import.h | 2 +-
gnucash/import-export/qif-imp/assistant-qif-import.c | 2 +-
gnucash/import-export/qif-imp/assistant-qif-import.h | 2 +-
gnucash/register/ledger-core/split-register-model.c | 2 +-
gnucash/register/ledger-core/split-register.c | 2 +-
gnucash/register/ledger-core/split-register.h | 2 +-
gnucash/register/register-core/numcell.c | 2 +-
gnucash/register/register-core/numcell.h | 2 +-
gnucash/register/register-core/table-allgui.c | 2 +-
gnucash/report/jqplot/jquery.jqplot.js | 4 ++--
gnucash/report/jqplot/jquery.js | 2 +-
gnucash/report/standard-reports/balsheet-pnl.scm | 2 +-
50 files changed, 58 insertions(+), 58 deletions(-)
More information about the gnucash-changes
mailing list