IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Christopher Lam 2022-08-09 18:15:23 +08:00
commit 6ba912ee0d
6 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnucash/gnome-utils/gnc-tree-view-price.c
View File

@ -762,7 +762,7 @@ get_selected_prices_helper (GtkTreeModel *s_model,
price = gnc_tree_model_price_get_price (GNC_TREE_MODEL_PRICE(model),
&iter);
if (price)
*return_list = g_list_append(*return_list, price);
*return_list = g_list_prepend (*return_list, price);
}
/*
@ -780,7 +780,7 @@ gnc_tree_view_price_get_selected_prices (GncTreeViewPrice *view)
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view));
gtk_tree_selection_selected_foreach(selection, get_selected_prices_helper, &return_list);
return return_list;
return g_list_reverse (return_list);
}
static void
@ -805,7 +805,7 @@ get_selected_commodity_helper (GtkTreeModel *s_model,
commodity = gnc_tree_model_price_get_commodity (GNC_TREE_MODEL_PRICE(model), &iter);
if (commodity)
*return_list = g_list_append(*return_list, commodity);
*return_list = g_list_prepend (*return_list, commodity);
}
/*
@ -824,5 +824,5 @@ gnc_tree_view_price_get_selected_commodities (GncTreeViewPrice *view)
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view));
gtk_tree_selection_selected_foreach (selection, get_selected_commodity_helper, &return_list);
return return_list;
return g_list_reverse (return_list);
}

2
gnucash/report/trep-engine.scm
View File

@ -1893,7 +1893,7 @@ be excluded from periodic reporting.")
(else (gnc:error "unknown sortvalue"))))
(define list-of-rows (sort (delete 'row-total (grid-rows grid)) <?))
(define list-of-cols (sort (delete 'col-total (grid-cols grid)) <?))
(define row-average-enabled? (pair? (cdr list-of-cols)))
(define row-average-enabled? (and (pair? list-of-cols) (pair? (cdr list-of-cols))))
(define (monetary-div monetary divisor)
(and monetary
(let* ((amount (gnc:gnc-monetary-amount monetary))

27
libgnucash/app-utils/gnc-sx-instance-model.c
View File

@ -451,7 +451,7 @@ static void
_build_list_from_hash_elts(gpointer key, gpointer value, gpointer user_data)
{
GList **list = (GList**)user_data;
*list = g_list_insert_sorted(*list, value, _compare_GncSxVariables);
*list = g_list_prepend (*list, value);
}
GList *
@ -459,13 +459,14 @@ gnc_sx_instance_get_variables(GncSxInstance *inst)
{
GList *vars = NULL;
g_hash_table_foreach(inst->variable_bindings, _build_list_from_hash_elts, &vars);
return vars;
return g_list_sort (vars, _compare_GncSxVariables);
}
static GncSxInstances*
_gnc_sx_gen_instances(gpointer *data, gpointer user_data)
{
GncSxInstances *instances = g_new0(GncSxInstances, 1);
GList *instlist = NULL;
SchedXaction *sx = (SchedXaction*)data;
const GDate *range_end = (const GDate*)user_data;
GDate creation_end, remind_end;
@ -493,8 +494,7 @@ _gnc_sx_gen_instances(gpointer *data, gpointer user_data)
seq_num = gnc_sx_get_instance_count(sx, postponed->data);
inst = gnc_sx_instance_new(instances, SX_INSTANCE_STATE_POSTPONED,
&inst_date, postponed->data, seq_num);
instances->instance_list =
g_list_append(instances->instance_list, inst);
instlist = g_list_prepend (instlist, inst);
gnc_sx_destroy_temporal_state(temporal_state);
temporal_state = gnc_sx_clone_temporal_state(postponed->data);
gnc_sx_incr_temporal_state(sx, temporal_state);
@ -512,7 +512,7 @@ _gnc_sx_gen_instances(gpointer *data, gpointer user_data)
seq_num = gnc_sx_get_instance_count(sx, temporal_state);
inst = gnc_sx_instance_new(instances, SX_INSTANCE_STATE_TO_CREATE,
&cur_date, temporal_state, seq_num);
instances->instance_list = g_list_append(instances->instance_list, inst);
instlist = g_list_prepend (instlist, inst);
gnc_sx_incr_temporal_state(sx, temporal_state);
cur_date = xaccSchedXactionGetNextInstance(sx, temporal_state);
}
@ -526,12 +526,15 @@ _gnc_sx_gen_instances(gpointer *data, gpointer user_data)
seq_num = gnc_sx_get_instance_count(sx, temporal_state);
inst = gnc_sx_instance_new(instances, SX_INSTANCE_STATE_REMINDER,
&cur_date, temporal_state, seq_num);
instances->instance_list = g_list_append(instances->instance_list,
inst);
instlist = g_list_prepend (instlist, inst);
gnc_sx_incr_temporal_state(sx, temporal_state);
cur_date = xaccSchedXactionGetNextInstance(sx, temporal_state);
}
instances->instance_list = g_list_reverse (instlist);
gnc_sx_destroy_temporal_state (temporal_state);
return instances;
}
@ -848,7 +851,7 @@ _find_unreferenced_vars(gchar *key,
!g_hash_table_lookup_extended(cb_pair->hash, key, NULL, NULL))
{
DEBUG("variable [%s] not found", key);
cb_pair->list = g_list_append(cb_pair->list, key);
cb_pair->list = g_list_prepend (cb_pair->list, key);
}
}
@ -928,7 +931,7 @@ gnc_sx_instance_model_update_sx_instances(GncSxInstanceModel *model, SchedXactio
removed_cb_data.hash = new_instances->variable_names;
removed_cb_data.list = NULL;
g_hash_table_foreach(existing->variable_names, (GHFunc)_find_unreferenced_vars, &removed_cb_data);
removed_var_names = removed_cb_data.list;
removed_var_names = g_list_reverse (removed_cb_data.list);
}
DEBUG("%d removed variables", g_list_length(removed_var_names));
@ -938,7 +941,7 @@ gnc_sx_instance_model_update_sx_instances(GncSxInstanceModel *model, SchedXactio
added_cb_data.hash = existing->variable_names;
added_cb_data.list = NULL;
g_hash_table_foreach(new_instances->variable_names, (GHFunc)_find_unreferenced_vars, &added_cb_data);
added_var_names = added_cb_data.list;
added_var_names = g_list_reverse (added_cb_data.list);
}
DEBUG("%d added variables", g_list_length(added_var_names));
@ -1556,7 +1559,7 @@ gnc_sx_instance_model_set_variable(GncSxInstanceModel *model,
static void
_list_from_hash_elts(gpointer key, gpointer value, GList **result_list)
{
*result_list = g_list_append(*result_list, value);
*result_list = g_list_prepend (*result_list, value);
}
GList*
@ -1584,7 +1587,7 @@ gnc_sx_instance_model_check_variables(GncSxInstanceModel *model)
GncSxVariableNeeded *need = g_new0(GncSxVariableNeeded, 1);
need->instance = inst;
need->variable = var;
rtn = g_list_append(rtn, need);
rtn = g_list_prepend (rtn, need);
}
}
g_list_free(var_list);

6
po/de.po
View File

@ -39,7 +39,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2022-08-01 20:19+0000\n"
"PO-Revision-Date: 2022-08-06 19:20+0000\n"
"Last-Translator: Christian Wehling <christian.wehling@web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/gnucash/"
"de/>\n"
@ -17955,11 +17955,11 @@ msgstr "Online Kurse"
#: gnucash/gtkbuilder/dialog-price.glade:12
msgid "Bid"
msgstr "Geldkurs"
msgstr "Geldkurs (Ihr Verkauf)"
#: gnucash/gtkbuilder/dialog-price.glade:15
msgid "Ask"
msgstr "Briefkurs"
msgstr "Briefkurs (Ihr Kauf)"
#: gnucash/gtkbuilder/dialog-price.glade:18
msgid "Last"

23
po/eu.po
View File

@ -3,23 +3,24 @@
# Copyright (C) 2005 Free Software Foundation, Inc.
# Mikel Olasagasti Uranga, 2005
# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
#
# Enrique Ayesta Perojo <eayesta@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.11-2\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2005-08-05 10:45+0200\n"
"Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
"Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
"PO-Revision-Date: 2022-08-05 14:15+0000\n"
"Last-Translator: Enrique Ayesta Perojo <eayesta@gmail.com>\n"
"Language-Team: Basque <https://hosted.weblate.org/projects/gnucash/gnucash/"
"eu/>\n"
"Language: eu\n"
"MIME-Version: 1.0\n"
"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.14-dev\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.9.1\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@ -31164,7 +31165,7 @@ msgstr ""
#: libgnucash/engine/policy.c:62
msgid "Manually select lots."
msgstr ""
msgstr "Aukeratu sortak eskuz."
#: libgnucash/engine/qofbookslots.h:66
#, fuzzy
@ -31211,7 +31212,7 @@ msgstr "_Ezabatu kontua"
#. Translators: " + " is an separator in a list of string-representations of recurrence frequencies
#: libgnucash/engine/Recurrence.c:511
msgid " + "
msgstr ""
msgstr " + "
#. Translators: %u is the recurrence multiplier, i.e. this
#. event should occur every %u'th week.
@ -31235,7 +31236,7 @@ msgstr "azken eguna"
#: libgnucash/engine/Recurrence.c:674
#, c-format
msgid "%s %s"
msgstr ""
msgstr "%s %s"
#. Translators: %d is the number of Recurrences in the list.
#: libgnucash/engine/Recurrence.c:727

14
po/hu.po
View File

@ -10,10 +10,10 @@
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.11-2\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2022-07-14 15:50+0000\n"
"PO-Revision-Date: 2022-08-08 22:21+0000\n"
"Last-Translator: mocsa <csaba@feltoltve.hu>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/gnucash/"
"gnucash/hu/>\n"
@ -3723,9 +3723,8 @@ msgid "Archive old data using accounting periods"
msgstr "Régi adatok archíválása könyvelési időszakok használatával"
#: gnucash/gnome/gnc-plugin-basic-commands.c:191
#, fuzzy
msgid "_Price Database"
msgstr "Ár adatbázis"
msgstr "Árfolyam-adatbázis"
#: gnucash/gnome/gnc-plugin-basic-commands.c:192
msgid "View and edit the prices for stocks and mutual funds"
@ -17623,7 +17622,7 @@ msgstr "_Dátum"
#: gnucash/gtkbuilder/dialog-price.glade:781
#: gnucash/report/reports/standard/price-scatter.scm:82
msgid "Price Database"
msgstr "Ár adatbázis"
msgstr "Árfolyam-adatbázis"
#: gnucash/gtkbuilder/dialog-price.glade:828
msgid "Add a new price."
@ -21336,9 +21335,8 @@ msgid "Import _Prices from a CSV file..."
msgstr "Tranzakciók importálása szöveges fájlból"
#: gnucash/import-export/csv-imp/gnc-plugin-csv-import.c:61
#, fuzzy
msgid "Import Prices from a CSV file"
msgstr "Tranzakciók importálása szöveges fájlból"
msgstr "Árfolyamok CSV-fájlból"
#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:134
#, fuzzy