gnucash master: Multiple changes pushed
Christopher Lam
clam at code.gnucash.org
Wed Aug 3 09:00:40 EDT 2022
Updated via https://github.com/Gnucash/gnucash/commit/0ef6967a (commit)
via https://github.com/Gnucash/gnucash/commit/0b5a4cd2 (commit)
via https://github.com/Gnucash/gnucash/commit/2377f7be (commit)
via https://github.com/Gnucash/gnucash/commit/05bbe9fd (commit)
via https://github.com/Gnucash/gnucash/commit/90e49cbb (commit)
via https://github.com/Gnucash/gnucash/commit/6b60ef4f (commit)
via https://github.com/Gnucash/gnucash/commit/b70fe138 (commit)
via https://github.com/Gnucash/gnucash/commit/1b845a86 (commit)
via https://github.com/Gnucash/gnucash/commit/d1aefc85 (commit)
via https://github.com/Gnucash/gnucash/commit/2443d8fa (commit)
via https://github.com/Gnucash/gnucash/commit/a43997cc (commit)
via https://github.com/Gnucash/gnucash/commit/dc77df35 (commit)
via https://github.com/Gnucash/gnucash/commit/688832b5 (commit)
via https://github.com/Gnucash/gnucash/commit/815eeb49 (commit)
via https://github.com/Gnucash/gnucash/commit/6c70f2c2 (commit)
via https://github.com/Gnucash/gnucash/commit/723dee66 (commit)
via https://github.com/Gnucash/gnucash/commit/7bc77374 (commit)
via https://github.com/Gnucash/gnucash/commit/accdf9e8 (commit)
via https://github.com/Gnucash/gnucash/commit/45aac539 (commit)
via https://github.com/Gnucash/gnucash/commit/67a1b7a8 (commit)
via https://github.com/Gnucash/gnucash/commit/78f74656 (commit)
via https://github.com/Gnucash/gnucash/commit/4906df8e (commit)
via https://github.com/Gnucash/gnucash/commit/583cd2c9 (commit)
via https://github.com/Gnucash/gnucash/commit/09e5c46d (commit)
via https://github.com/Gnucash/gnucash/commit/dea1a89e (commit)
via https://github.com/Gnucash/gnucash/commit/6cad1d16 (commit)
via https://github.com/Gnucash/gnucash/commit/edf000f4 (commit)
via https://github.com/Gnucash/gnucash/commit/ebf34395 (commit)
via https://github.com/Gnucash/gnucash/commit/7c2a2495 (commit)
via https://github.com/Gnucash/gnucash/commit/7880f9b1 (commit)
via https://github.com/Gnucash/gnucash/commit/38ec9f25 (commit)
via https://github.com/Gnucash/gnucash/commit/436110e5 (commit)
via https://github.com/Gnucash/gnucash/commit/1d5e9d4d (commit)
via https://github.com/Gnucash/gnucash/commit/b98cd009 (commit)
via https://github.com/Gnucash/gnucash/commit/5fc99aa9 (commit)
via https://github.com/Gnucash/gnucash/commit/2e81d444 (commit)
via https://github.com/Gnucash/gnucash/commit/b598375e (commit)
via https://github.com/Gnucash/gnucash/commit/9417c6cb (commit)
via https://github.com/Gnucash/gnucash/commit/e9b4e2e9 (commit)
via https://github.com/Gnucash/gnucash/commit/7e1ef4ce (commit)
via https://github.com/Gnucash/gnucash/commit/0e81d42e (commit)
via https://github.com/Gnucash/gnucash/commit/6b64c70c (commit)
via https://github.com/Gnucash/gnucash/commit/4b73dbc6 (commit)
via https://github.com/Gnucash/gnucash/commit/6c100532 (commit)
via https://github.com/Gnucash/gnucash/commit/3a6f1ab1 (commit)
via https://github.com/Gnucash/gnucash/commit/5fa4b831 (commit)
via https://github.com/Gnucash/gnucash/commit/d3a3e3e9 (commit)
via https://github.com/Gnucash/gnucash/commit/738a99f3 (commit)
via https://github.com/Gnucash/gnucash/commit/544f9100 (commit)
via https://github.com/Gnucash/gnucash/commit/0ea46fab (commit)
via https://github.com/Gnucash/gnucash/commit/7163ca46 (commit)
via https://github.com/Gnucash/gnucash/commit/861054d7 (commit)
via https://github.com/Gnucash/gnucash/commit/822ce9f1 (commit)
via https://github.com/Gnucash/gnucash/commit/4af4f407 (commit)
via https://github.com/Gnucash/gnucash/commit/08a7e940 (commit)
via https://github.com/Gnucash/gnucash/commit/c645fdc5 (commit)
via https://github.com/Gnucash/gnucash/commit/c0a14a1d (commit)
via https://github.com/Gnucash/gnucash/commit/4032407b (commit)
via https://github.com/Gnucash/gnucash/commit/b87d6eb5 (commit)
via https://github.com/Gnucash/gnucash/commit/9f303860 (commit)
via https://github.com/Gnucash/gnucash/commit/c16840b8 (commit)
via https://github.com/Gnucash/gnucash/commit/74525e91 (commit)
via https://github.com/Gnucash/gnucash/commit/078a579e (commit)
via https://github.com/Gnucash/gnucash/commit/c4e02e1b (commit)
via https://github.com/Gnucash/gnucash/commit/a2156648 (commit)
via https://github.com/Gnucash/gnucash/commit/1ee87fa4 (commit)
via https://github.com/Gnucash/gnucash/commit/0d3520f6 (commit)
via https://github.com/Gnucash/gnucash/commit/6d1f3c5a (commit)
via https://github.com/Gnucash/gnucash/commit/2bafe700 (commit)
via https://github.com/Gnucash/gnucash/commit/d4ff2ede (commit)
via https://github.com/Gnucash/gnucash/commit/fb6091fb (commit)
via https://github.com/Gnucash/gnucash/commit/3db8c56a (commit)
via https://github.com/Gnucash/gnucash/commit/6f74d4e3 (commit)
via https://github.com/Gnucash/gnucash/commit/b1071295 (commit)
via https://github.com/Gnucash/gnucash/commit/fac0cde7 (commit)
via https://github.com/Gnucash/gnucash/commit/754cb072 (commit)
via https://github.com/Gnucash/gnucash/commit/892b80f6 (commit)
via https://github.com/Gnucash/gnucash/commit/90804dcd (commit)
via https://github.com/Gnucash/gnucash/commit/db9b4ab2 (commit)
via https://github.com/Gnucash/gnucash/commit/8c1b736c (commit)
via https://github.com/Gnucash/gnucash/commit/f1adb5da (commit)
via https://github.com/Gnucash/gnucash/commit/ec3e996f (commit)
via https://github.com/Gnucash/gnucash/commit/fd12d390 (commit)
via https://github.com/Gnucash/gnucash/commit/579ba443 (commit)
via https://github.com/Gnucash/gnucash/commit/ce4768c3 (commit)
via https://github.com/Gnucash/gnucash/commit/0a8dcdcd (commit)
via https://github.com/Gnucash/gnucash/commit/d688a17e (commit)
via https://github.com/Gnucash/gnucash/commit/85af9156 (commit)
via https://github.com/Gnucash/gnucash/commit/a000c05c (commit)
via https://github.com/Gnucash/gnucash/commit/b560bb21 (commit)
via https://github.com/Gnucash/gnucash/commit/da90fa6d (commit)
via https://github.com/Gnucash/gnucash/commit/2b447d47 (commit)
via https://github.com/Gnucash/gnucash/commit/1852b078 (commit)
via https://github.com/Gnucash/gnucash/commit/625d1c06 (commit)
via https://github.com/Gnucash/gnucash/commit/a19b5ef3 (commit)
via https://github.com/Gnucash/gnucash/commit/cfc6e9d7 (commit)
from https://github.com/Gnucash/gnucash/commit/d87972e4 (commit)
commit 0ef6967a36da41a653b4562949af52b50011aaf2
Merge: 0b5a4cd29 2377f7be5
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Aug 3 20:38:41 2022 +0800
Merge branch 'maint'
commit 0b5a4cd29829dd60a0b799e5531c40c5f3e35784
Merge: d87972e43 b70fe1381
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Aug 3 20:38:08 2022 +0800
Merge branch 'maint'
diff --cc gnucash/gnome-utils/gnc-main-window.cpp
index 8eca39780,91261d767..0df8345b3
--- a/gnucash/gnome-utils/gnc-main-window.cpp
+++ b/gnucash/gnome-utils/gnc-main-window.cpp
@@@ -357,13 -342,14 +358,14 @@@ static GtkActionEntry gnc_menu_actions
/* View menu */
+ { "ViewTabPositionAction", NULL, N_("Tab P_osition"), NULL, NULL, NULL },
{
- "ViewSortByAction", NULL, N_("_Sort By..."), NULL,
- N_("Select sorting criteria for this page view"), NULL
+ "ViewSortByAction", nullptr, N_("_Sort By..."), nullptr,
+ N_("Select sorting criteria for this page view"), nullptr
},
{
- "ViewFilterByAction", NULL, N_("_Filter By..."), NULL,
- N_("Select the account types that should be displayed."), NULL
+ "ViewFilterByAction", nullptr, N_("_Filter By..."), nullptr,
+ N_("Select the account types that should be displayed."), nullptr
},
{
"ViewRefreshAction", "view-refresh", N_("_Refresh"), "<primary>r",
@@@ -2194,12 -2248,15 +2258,14 @@@ gnc_main_window_set_tab_ellipsize (GtkW
*/
static void
gnc_main_window_update_tab_width_one_page (GncPluginPage *page,
- gpointer user_data)
+ gpointer user_data)
{
- auto new_value{static_cast<int*>(user_data)};
- TabWidth *tw = user_data;
- GtkWidget *label;
++ auto tw{static_cast<TabWidth*>(user_data)};
- ENTER("page %p, visible %d", page, *new_value);
- auto label{static_cast<GtkWidget*>(g_object_get_data(G_OBJECT (page), PLUGIN_PAGE_TAB_LABEL))};
+ ENTER("page %p, tab width %d, tabs on left or right %d",
+ page, tw->tab_width, tw->tabs_left_right);
+
- label = g_object_get_data(G_OBJECT (page), PLUGIN_PAGE_TAB_LABEL);
++ auto label{static_cast<GtkWidget *>(g_object_get_data(G_OBJECT (page), PLUGIN_PAGE_TAB_LABEL))};
if (!label)
{
LEAVE("no label");
@@@ -3597,6 -3673,28 +3676,28 @@@ gnc_main_window_update_tab_position (gp
priv = GNC_MAIN_WINDOW_GET_PRIVATE (window);
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (priv->notebook), position);
+ /* Groups of radio actions use the first action for the callback and all
+ * change events so block/unblock signals on the first radio action. */
+ first_action = gtk_action_group_get_action (priv->action_group,
+ tab_pos_radio_entries[0].name);
+
+ for (i = n_tab_pos_radio_entries - 1; i > 0; i--)
+ if (tab_pos_radio_entries[i].value == position)
+ break;
+
+ position_action = gtk_action_group_get_action (priv->action_group,
+ tab_pos_radio_entries[i].name);
+
+ g_signal_handlers_block_by_func (G_OBJECT (first_action),
- G_CALLBACK (gnc_main_window_cmd_view_tab_position),
++ (gpointer)gnc_main_window_cmd_view_tab_position,
+ window);
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (position_action), TRUE);
+ g_signal_handlers_unblock_by_func (G_OBJECT (first_action),
- G_CALLBACK (gnc_main_window_cmd_view_tab_position),
++ (gpointer)gnc_main_window_cmd_view_tab_position,
+ window);
+
- gnc_main_window_update_tab_width (NULL, GNC_PREF_TAB_WIDTH, NULL);
++ gnc_main_window_update_tab_width (NULL, (char*)GNC_PREF_TAB_WIDTH, NULL);
+
LEAVE ("");
}
@@@ -4573,6 -4710,45 +4680,45 @@@ gnc_main_window_cmd_window_move_page (G
LEAVE("page moved");
}
+ static void
+ gnc_main_window_cmd_view_tab_position (GtkAction *action,
+ GtkRadioAction *current,
+ GncMainWindow *window)
+ {
- GtkPositionType value = gtk_radio_action_get_current_value(current);
++ auto value{static_cast<GtkPositionType>(gtk_radio_action_get_current_value(current))};
+
+ if (value != GTK_POS_TOP && gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_TOP))
+ gnc_prefs_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_TOP, FALSE);
+
+ if (value != GTK_POS_BOTTOM && gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_BOTTOM))
+ gnc_prefs_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_BOTTOM, FALSE);
+
+ if (value != GTK_POS_LEFT && gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_LEFT))
+ gnc_prefs_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_LEFT, FALSE);
+
+ if (value != GTK_POS_RIGHT && gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_RIGHT))
+ gnc_prefs_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_RIGHT, FALSE);
+
+ switch (value)
+ {
+ case GTK_POS_TOP:
+ gnc_prefs_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_TOP, TRUE);
+ break;
+
+ case GTK_POS_BOTTOM:
+ gnc_prefs_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_BOTTOM, TRUE);
+ break;
+
+ case GTK_POS_LEFT:
+ gnc_prefs_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_LEFT, TRUE);
+ break;
+
+ case GTK_POS_RIGHT:
+ gnc_prefs_set_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_RIGHT, TRUE);
+ break;
+ }
+ }
+
#ifndef MAC_INTEGRATION
static void
gnc_main_window_cmd_window_raise (GtkAction *action,
commit 2377f7be54e3caabac18d9b1fd3d6e79f8b74553
Author: Pedro Albuquerque <pmra at gmx.com>
Date: Tue Aug 2 18:47:13 2022 +0200
Translation update by Pedro Albuquerque <pmra at gmx.com> using Weblate
po/pt.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
1 failing checks (0.1%)
Translation: GnuCash/Program (Portuguese)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/pt/
Co-authored-by: Pedro Albuquerque <pmra at gmx.com>
diff --git a/po/pt.po b/po/pt.po
index 717a42dcf..7d7dc2bf6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,10 +6,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-03-14 06:41+0000\n"
+"PO-Revision-Date: 2022-08-02 16:47+0000\n"
"Last-Translator: Pedro Albuquerque <pmra at gmx.com>\n"
"Language-Team: Portuguese <https://hosted.weblate.org/projects/gnucash/"
"gnucash/pt/>\n"
@@ -18,7 +18,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.12-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
#: borrowed/goffice/go-charmap-sel.c:70
@@ -3227,8 +3227,7 @@ msgid "Invalid Account in Split"
msgstr "Conta inválida na parcela"
#: gnucash/gnome/dialog-sx-editor.c:760
-#, fuzzy, c-format
-#| msgid "Split with memo %s has an unparseable Credit Formula."
+#, c-format
msgid "Split with memo %s has an unparsable Credit Formula."
msgstr "Parcela com a nota %s tem uma fórmula de crédito inválida."
@@ -3237,8 +3236,7 @@ msgid "Unparsable Formula in Split"
msgstr "Fórmula de crédito inválida na parcela"
#: gnucash/gnome/dialog-sx-editor.c:776
-#, fuzzy, c-format
-#| msgid "Split with memo %s has an unparseable Debit Formula."
+#, c-format
msgid "Split with memo %s has an unparsable Debit Formula."
msgstr "Parcela com a nota %s tem uma fórmula de débito inválida."
@@ -5762,16 +5760,12 @@ msgid "_Sort By..."
msgstr "_Ordenar por..."
#: gnucash/gnome/gnc-plugin-page-register.c:490
-#, fuzzy
-#| msgid "Stock Split Assistant"
msgid "Stock Ass_istant"
-msgstr "Assistente de desdobramento de acções"
+msgstr "Assistente de acções"
#: gnucash/gnome/gnc-plugin-page-register.c:491
-#, fuzzy
-#| msgid "Stock Split Assistant"
msgid "Stock Assistant"
-msgstr "Assistente de desdobramento de acções"
+msgstr "Assistente de acções"
#: gnucash/gnome/gnc-plugin-page-register.c:510
msgid "_Go to Date"
@@ -7460,10 +7454,9 @@ msgid "New Account"
msgstr "Nova conta"
#: gnucash/gnome-utils/dialog-account.c:2193
-#, fuzzy, c-format
-#| msgid "Renumber sub-accounts"
+#, c-format
msgid "Renumber the immediate sub-accounts of '%s'?"
-msgstr "Renumerar sub-contas"
+msgstr "Renumerar sub-contas imediatas de %s?"
#: gnucash/gnome-utils/dialog-account.c:2299
#, c-format
@@ -8736,10 +8729,8 @@ msgid "Edit the global preferences of GnuCash"
msgstr "Editar as preferências globais do GnuCash"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>Posição do separador</b>"
+msgstr "P_osição do separador"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -8990,7 +8981,7 @@ msgstr "Opções do livro"
#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
-msgstr ""
+msgstr "(modificável pelo utilizador)"
#. Translators: %s will be replaced with the current year
#: gnucash/gnome-utils/gnc-main-window.c:4880
@@ -10339,10 +10330,8 @@ msgid "{1} [options] [datafile]"
msgstr "{1} [opções] [ficheirodados]"
#: gnucash/gnucash-core-app.cpp:255
-#, fuzzy
-#| msgid "GnuCash "
msgid "GnuCash Paths"
-msgstr "GnuCash "
+msgstr "Caminhos do GnuCash"
#: gnucash/gnucash-core-app.cpp:270
msgid "GnuCash {1}"
@@ -10389,10 +10378,8 @@ msgstr ""
"Pode ser chamado múltiplas vezes."
#: gnucash/gnucash-core-app.cpp:309
-#, fuzzy
-#| msgid "Show plot"
msgid "Show paths"
-msgstr "Mostrar gráfico"
+msgstr "Mostrar caminhos"
#: gnucash/gnucash-core-app.cpp:311
msgid ""
@@ -15182,22 +15169,16 @@ msgid "Interval"
msgstr "Intervalo"
#: gnucash/gtkbuilder/dialog-account.glade:2112
-#, fuzzy
-#| msgid "Number of Periods"
msgid "Number of Digits"
-msgstr "Número de perÃodos"
+msgstr "Número de algarismos"
#: gnucash/gtkbuilder/dialog-account.glade:2126
-#, fuzzy
-#| msgid ""
-#| "Renumber the immediate sub-accounts of %s? This will replace the account "
-#| "code field of each child account with a newly generated code."
msgid ""
"This will replace the account code field of each child account with a newly "
"generated code"
msgstr ""
-"Renumerar as sub-contas imediatas de %s? Isto substitui o campo de código de "
-"conta para cada conta-filho com um código gerado de novo."
+"Isto substitui o campo de código de conta para cada conta-filho com um "
+"código gerado de novo."
#: gnucash/gtkbuilder/dialog-account-picker.glade:34
msgid "_Show documentation"
@@ -15625,10 +15606,8 @@ msgstr "ISIN, CUSI_P ou outro código"
#: gnucash/gtkbuilder/dialog-commodity.glade:485
#: gnucash/gtkbuilder/dialog-commodity.glade:767
#: gnucash/gtkbuilder/dialog-price.glade:122
-#, fuzzy
-#| msgid "Namespace"
msgid "Nam_espace"
-msgstr "Espaço de nome"
+msgstr "_Espaço de nome"
#: gnucash/gtkbuilder/dialog-commodity.glade:500
msgid "_Symbol/abbreviation"
@@ -16337,10 +16316,8 @@ msgid "Green"
msgstr "Verde"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "Não imprimir detalhe da transacção"
+msgstr "Editar detalhe da transacção importada"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -19455,31 +19432,6 @@ msgid ""
msgstr "Este assistente ajuda a configurar a ligação à banca em linha."
#: gnucash/import-export/aqb/assistant-ab-initial.glade:39
-#, fuzzy
-#| msgid ""
-#| "The requirements for Online Banking vary between the different supported "
-#| "AqBanking backends, but usually you will need:\n"
-#| "* Your bank needs to grant you online access. See on their website or ask "
-#| "their customer service for how to obtain it.\n"
-#| "They should also tell you:\n"
-#| "* Your user ID that identifies you to their server, often your base "
-#| "account number;\n"
-#| "* The URL of their Online Banking server;\n"
-#| "* In some cases the routing number of your bank's branch is useful in "
-#| "this assistant;\n"
-#| "* Authentication methods vary by backend and chosen method:\n"
-#| " * FinTS PIN/TAN: Some methods require a specific gadget like a card "
-#| "reader or a mobile;\n"
-#| " * FinTS HBCI: You have to exchange the public parts of asymmetric keys "
-#| "with your bank (\"Ini-Letter\").\n"
-#| " * PayPal: registered email address, password, API signature;\n"
-#| "\n"
-#| "See https://wiki.gnucash.org/wiki/AqBanking for more details.\n"
-#| "\n"
-#| "Note: NO WARRANTIES FOR ANYTHING. Some banks run a poorly implemented "
-#| "Online Banking server. You should not rely on time-critical transfers "
-#| "through Online Banking, because sometimes the bank does not give you "
-#| "correct feedback when a transfer is rejected."
msgid ""
"The requirements for Online Banking vary between the different supported "
"AqBanking backends, but usually you will need:\n"
@@ -19509,18 +19461,11 @@ msgstr ""
"* nalguns casos, o número de encaminhamento da agência do seu banco é útil "
"neste assistente;\n"
"* os métodos de autenticação variam consoante o motor e o método escolhido:\n"
-" * FinTS PIN/TAN - alguns métodos requerem uma acção especÃfica, como um "
+"* FinTS PIN/TAN - alguns métodos requerem uma acção especÃfica, como um "
"leitor de cartões ou um telemóvel;\n"
-" * FinTS HBCI - tem de trocar as partes públicas das chaves assimétricas com "
+"* FinTS HBCI - tem de trocar as partes públicas das chaves assimétricas com "
"o seu banco (\"Ini-Letter\").\n"
-" * PayPal: endereço electrónico registado, senha, assinatura API;\n"
-"\n"
-"Veja https://wiki.gnucash.org/wiki/AqBanking para mais detalhes.\n"
-"\n"
-"Nota: SEM GARANTIAS PARA NADA. Alguns bancos gerem um servidor bancário em "
-"rede mal implementado. Não se deve confiar em transferências crÃticas com "
-"prazo através da banca em linha, porque por vezes o banco não lhe dá uma "
-"resposta correcta quando uma transferência é rejeitada."
+"* PayPal: endereço electrónico registado, senha, assinatura API;"
#. See https://wiki.gnucash.org/wiki/AqBanking for the used terminology and replace the link, if a localized version exists.
#: gnucash/import-export/aqb/assistant-ab-initial.glade:65
@@ -19528,6 +19473,8 @@ msgid ""
"See <a href=\"https://wiki.gnucash.org/wiki/AqBanking\">https://wiki.gnucash."
"org/wiki/AqBanking</a> for more details"
msgstr ""
+"Ver <a href=\"https://wiki.gnucash.org/wiki/AqBanking\">https://wiki.gnucash."
+"org/wiki/AqBanking</a> para mais detalhes"
#: gnucash/import-export/aqb/assistant-ab-initial.glade:78
msgid ""
@@ -19536,28 +19483,22 @@ msgid ""
"Online Banking, because sometimes the bank does not give you correct "
"feedback when a transfer is rejected."
msgstr ""
+"Nota: SEM GARANTIAS NENHUMAS. Alguns bancos gerem um servidor bancário em "
+"linha mal implementado. Não se deve confiar em transferências crÃticas "
+"através da banca em linha, porque por vezes, o banco não lhe dá uma resposta "
+"correcta quando uma transferência é rejeitada."
#: gnucash/import-export/aqb/assistant-ab-initial.glade:89
msgid "Initial Online Banking Setup"
msgstr "Configuração inicial da banca em linha"
#: gnucash/import-export/aqb/assistant-ab-initial.glade:111
-#, fuzzy
-#| msgid ""
-#| "The Setup of your Online Banking connection is handled by the external "
-#| "program \"AqBanking Setup Wizard\".\n"
-#| "You have to set up at least one connection before you can continue.\n"
-#| "\n"
-#| "Please press the button below to start it."
msgid ""
"The Setup of your Online Banking connection is handled by the external "
"program \"AqBanking Setup\"."
msgstr ""
"A configuração da sua ligação à banca em linha é gerida pelo programa "
-"externo \"Assistente de configuração do AqBanking\".\n"
-"Tem de configurar pelo menos uma ligação antes de continuar.\n"
-"\n"
-"Por favor, clique no botão abaixo para iniciar esse programa."
+"externo \"Assistente de configuração do AqBanking\"."
#: gnucash/import-export/aqb/assistant-ab-initial.glade:125
msgid ""
@@ -19565,43 +19506,36 @@ msgid ""
"* It ignores GnuCash's preferences like \"Close log window when finished\".\n"
"* To report issues read"
msgstr ""
+"Isto significa:\n"
+"* as preferências do GnuCash, tais como \"Fechar diário quando terminar\" "
+"serão ignoradas;\n"
+"* relatar problemas lidos."
#: gnucash/import-export/aqb/assistant-ab-initial.glade:141
msgid ""
"<a href=\"https://aquamaniac.de/rdm/projects/aqbanking/wiki/Bugreports/"
"\">https://aquamaniac.de/rdm/projects/aqbanking/wiki/Bugreports/</a>"
msgstr ""
+"<a href=\"https://aquamaniac.de/rdm/projects/aqbanking/wiki/Bugreports/\""
+">https://aquamaniac.de/rdm/projects/aqbanking/wiki/Bugreports/</a>"
#: gnucash/import-export/aqb/assistant-ab-initial.glade:157
-#, fuzzy
-#| msgid ""
-#| "The Setup of your Online Banking connection is handled by the external "
-#| "program \"AqBanking Setup Wizard\".\n"
-#| "You have to set up at least one connection before you can continue.\n"
-#| "\n"
-#| "Please press the button below to start it."
msgid ""
"You have to set up at least one connection before you can continue.\n"
"\n"
"Please press the button below to start it."
msgstr ""
-"A configuração da sua ligação à banca em linha é gerida pelo programa "
-"externo \"Assistente de configuração do AqBanking\".\n"
"Tem de configurar pelo menos uma ligação antes de continuar.\n"
"\n"
-"Por favor, clique no botão abaixo para iniciar esse programa."
+"Por favor, clique no botão abaixo para iniciar o programa."
#: gnucash/import-export/aqb/assistant-ab-initial.glade:170
-#, fuzzy
-#| msgid "_Start AqBanking Wizard"
msgid "_Start AqBanking Setup"
-msgstr "_Iniciar o assistente de configuração do AqBanking"
+msgstr "_Iniciar a configuração do AqBanking"
#: gnucash/import-export/aqb/assistant-ab-initial.glade:186
-#, fuzzy
-#| msgid "Initial Online Banking Setup"
msgid "Start Online Banking Setup"
-msgstr "Configuração inicial da banca em linha"
+msgstr "Iniciar a configuração da banca em linha"
#: gnucash/import-export/aqb/assistant-ab-initial.glade:204
msgid ""
@@ -21740,24 +21674,18 @@ msgstr "Desactivado"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "Atribuir uma conta de transferência à selecção."
+msgstr "_Atribuir uma conta de transferência à selecção"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "Descrição, notas ou memorando"
+msgstr "_Editar descrição, notas ou memorando"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "Repor predefinições"
+msgstr "_Repor todas as modificações"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
@@ -26407,16 +26335,15 @@ msgstr "Máximo número de pilhas no gráfico."
#: gnucash/report/reports/standard/category-barchart.scm:188
#: gnucash/report/reports/standard/category-barchart.scm:262
-#, fuzzy
-#| msgid "Enable chart"
msgid "Percentage chart"
-msgstr "Activar gráfico"
+msgstr "Gráfico de percentagem"
#: gnucash/report/reports/standard/category-barchart.scm:189
msgid ""
"Display account contributions as a percentage of the total value for the "
"period."
msgstr ""
+"Mostrar contribuições da conta como percentagem do valor total do perÃodo."
#: gnucash/report/reports/standard/category-barchart.scm:292
msgid "Invalid dates"
commit 05bbe9fdee10b65e5cbc2f170a184562b713c8e8
Author: Laurent Bigonville <bigon at bigon.be>
Date: Tue Aug 2 18:47:13 2022 +0200
Translation update by Laurent Bigonville <bigon at bigon.be> using Weblate
po/fr.po: 99.9% (5398 of 5400 strings; 2 fuzzy)
3 failing checks (0.1%)
Translation: GnuCash/Program (French)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/fr/
Co-authored-by: Laurent Bigonville <bigon at bigon.be>
diff --git a/po/fr.po b/po/fr.po
index 7571b60e9..d29400b57 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -25,6 +25,7 @@
# Maxime Leroy <lisacintosh at gmail.com>, 2021, 2022.
# Sébastien Ray <sebastien.ray at normalesup.org>, 2022.
# ButterflyOfFire <ButterflyOfFire at protonmail.com>, 2022.
+# Laurent Bigonville <bigon at bigon.be>, 2022.
#
# Please follow the guidelines you'll find here: https://wiki.gnucash.org/wiki/Translation
#
@@ -34,8 +35,8 @@ 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-07-23 09:57+0000\n"
-"Last-Translator: Maxime Leroy <lisacintosh at gmail.com>\n"
+"PO-Revision-Date: 2022-07-31 08:20+0000\n"
+"Last-Translator: Laurent Bigonville <bigon at bigon.be>\n"
"Language-Team: French <https://hosted.weblate.org/projects/gnucash/gnucash/"
"fr/>\n"
"Language: fr\n"
@@ -1229,7 +1230,7 @@ msgstr "Éditer..."
#: gnucash/report/reports/standard/invoice.scm:774
#: libgnucash/engine/Account.cpp:176 libgnucash/engine/gncInvoice.c:1116
msgid "Bill"
-msgstr "Facture"
+msgstr "Facture fournisseur"
#: gnucash/gnome/business-gnome-utils.c:222 gnucash/gnome/dialog-doclink.c:814
#: gnucash/gnome/dialog-invoice.c:2644 gnucash/gnome/dialog-invoice.c:2870
commit 90e49cbb50a4f960d1199d28a81abb93146a9d48
Author: Simon Arlott <weblate.simon at arlott.org>
Date: Tue Aug 2 18:47:12 2022 +0200
Translation update by Simon Arlott <weblate.simon at arlott.org> using Weblate
po/en_NZ.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (English (New Zealand))
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/en_NZ/
Translation update by Simon Arlott <weblate.simon at arlott.org> using Weblate
po/en_AU.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (English (Australia))
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/en_AU/
Translation update by Simon Arlott <weblate.simon at arlott.org> using Weblate
po/en_GB.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (English (United Kingdom))
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/en_GB/
Co-authored-by: Simon Arlott <weblate.simon at arlott.org>
diff --git a/po/en_AU.po b/po/en_AU.po
index df6479d11..33d2cde2d 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -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-06-25 15:21+0000\n"
+"PO-Revision-Date: 2022-07-30 15:51+0000\n"
"Last-Translator: Simon Arlott <weblate.simon at arlott.org>\n"
"Language-Team: English (Australia) <https://hosted.weblate.org/projects/"
"gnucash/gnucash/en_AU/>\n"
@@ -22,7 +22,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.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@@ -8719,10 +8719,8 @@ msgid "Edit the global preferences of GnuCash"
msgstr "Edit the global preferences of GnuCash"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>Tab Position</b>"
+msgstr "Tab P_osition"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -8971,7 +8969,7 @@ msgstr "Book Options"
#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
-msgstr ""
+msgstr "(user modifiable)"
#. Translators: %s will be replaced with the current year
#: gnucash/gnome-utils/gnc-main-window.c:4880
@@ -10325,10 +10323,8 @@ msgid "{1} [options] [datafile]"
msgstr "{1} [options] [datafile]"
#: gnucash/gnucash-core-app.cpp:255
-#, fuzzy
-#| msgid "GnuCash "
msgid "GnuCash Paths"
-msgstr "GnuCash "
+msgstr "GnuCash Paths"
#: gnucash/gnucash-core-app.cpp:270
msgid "GnuCash {1}"
@@ -10375,10 +10371,8 @@ msgstr ""
"This can be invoked multiple times."
#: gnucash/gnucash-core-app.cpp:309
-#, fuzzy
-#| msgid "Show plot"
msgid "Show paths"
-msgstr "Show plot"
+msgstr "Show paths"
#: gnucash/gnucash-core-app.cpp:311
msgid ""
@@ -15585,10 +15579,8 @@ msgstr "ISIN, AS_X or other code"
#: gnucash/gtkbuilder/dialog-commodity.glade:485
#: gnucash/gtkbuilder/dialog-commodity.glade:767
#: gnucash/gtkbuilder/dialog-price.glade:122
-#, fuzzy
-#| msgid "Namespace"
msgid "Nam_espace"
-msgstr "Namespace"
+msgstr "Nam_espace"
#: gnucash/gtkbuilder/dialog-commodity.glade:500
msgid "_Symbol/abbreviation"
@@ -16293,10 +16285,8 @@ msgid "Green"
msgstr "Green"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "Do not print transaction detail"
+msgstr "Edit imported transaction details"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -21623,24 +21613,18 @@ msgstr "Disabled"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "Assign a transfer account to the selection."
+msgstr "_Assign a transfer account to the selection"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "Description, Notes, or Memo"
+msgstr "_Edit description, notes, or memo"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "Reset defaults"
+msgstr "_Reset all edits"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
diff --git a/po/en_GB.po b/po/en_GB.po
index cd4a84c01..93722fda2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -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-06-25 15:21+0000\n"
+"PO-Revision-Date: 2022-07-30 15:50+0000\n"
"Last-Translator: Simon Arlott <weblate.simon at arlott.org>\n"
"Language-Team: English (United Kingdom) <https://hosted.weblate.org/projects/"
"gnucash/gnucash/en_GB/>\n"
@@ -22,7 +22,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.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@@ -8719,10 +8719,8 @@ msgid "Edit the global preferences of GnuCash"
msgstr "Edit the global preferences of GnuCash"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>Tab Position</b>"
+msgstr "Tab P_osition"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -8971,7 +8969,7 @@ msgstr "Book Options"
#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
-msgstr ""
+msgstr "(user modifiable)"
#. Translators: %s will be replaced with the current year
#: gnucash/gnome-utils/gnc-main-window.c:4880
@@ -10325,10 +10323,8 @@ msgid "{1} [options] [datafile]"
msgstr "{1} [options] [datafile]"
#: gnucash/gnucash-core-app.cpp:255
-#, fuzzy
-#| msgid "GnuCash "
msgid "GnuCash Paths"
-msgstr "GnuCash "
+msgstr "GnuCash Paths"
#: gnucash/gnucash-core-app.cpp:270
msgid "GnuCash {1}"
@@ -10375,10 +10371,8 @@ msgstr ""
"This can be invoked multiple times."
#: gnucash/gnucash-core-app.cpp:309
-#, fuzzy
-#| msgid "Show plot"
msgid "Show paths"
-msgstr "Show plot"
+msgstr "Show paths"
#: gnucash/gnucash-core-app.cpp:311
msgid ""
@@ -15585,10 +15579,8 @@ msgstr "ISIN, S_EDOL or other code"
#: gnucash/gtkbuilder/dialog-commodity.glade:485
#: gnucash/gtkbuilder/dialog-commodity.glade:767
#: gnucash/gtkbuilder/dialog-price.glade:122
-#, fuzzy
-#| msgid "Namespace"
msgid "Nam_espace"
-msgstr "Namespace"
+msgstr "Nam_espace"
#: gnucash/gtkbuilder/dialog-commodity.glade:500
msgid "_Symbol/abbreviation"
@@ -16293,10 +16285,8 @@ msgid "Green"
msgstr "Green"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "Do not print transaction detail"
+msgstr "Edit imported transaction details"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -21623,24 +21613,18 @@ msgstr "Disabled"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "Assign a transfer account to the selection."
+msgstr "_Assign a transfer account to the selection"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "Description, Notes, or Memo"
+msgstr "_Edit description, notes, or memo"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "Reset defaults"
+msgstr "_Reset all edits"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
diff --git a/po/en_NZ.po b/po/en_NZ.po
index ecab57dc0..17e5dd2f2 100644
--- a/po/en_NZ.po
+++ b/po/en_NZ.po
@@ -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-06-25 15:21+0000\n"
+"PO-Revision-Date: 2022-07-30 15:51+0000\n"
"Last-Translator: Simon Arlott <weblate.simon at arlott.org>\n"
"Language-Team: English (New Zealand) <https://hosted.weblate.org/projects/"
"gnucash/gnucash/en_NZ/>\n"
@@ -22,7 +22,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.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@@ -8719,10 +8719,8 @@ msgid "Edit the global preferences of GnuCash"
msgstr "Edit the global preferences of GnuCash"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>Tab Position</b>"
+msgstr "Tab P_osition"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -8971,7 +8969,7 @@ msgstr "Book Options"
#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
-msgstr ""
+msgstr "(user modifiable)"
#. Translators: %s will be replaced with the current year
#: gnucash/gnome-utils/gnc-main-window.c:4880
@@ -10325,10 +10323,8 @@ msgid "{1} [options] [datafile]"
msgstr "{1} [options] [datafile]"
#: gnucash/gnucash-core-app.cpp:255
-#, fuzzy
-#| msgid "GnuCash "
msgid "GnuCash Paths"
-msgstr "GnuCash "
+msgstr "GnuCash Paths"
#: gnucash/gnucash-core-app.cpp:270
msgid "GnuCash {1}"
@@ -10375,10 +10371,8 @@ msgstr ""
"This can be invoked multiple times."
#: gnucash/gnucash-core-app.cpp:309
-#, fuzzy
-#| msgid "Show plot"
msgid "Show paths"
-msgstr "Show plot"
+msgstr "Show paths"
#: gnucash/gnucash-core-app.cpp:311
msgid ""
@@ -15585,10 +15579,8 @@ msgstr "ISI_N or other code"
#: gnucash/gtkbuilder/dialog-commodity.glade:485
#: gnucash/gtkbuilder/dialog-commodity.glade:767
#: gnucash/gtkbuilder/dialog-price.glade:122
-#, fuzzy
-#| msgid "Namespace"
msgid "Nam_espace"
-msgstr "Namespace"
+msgstr "Nam_espace"
#: gnucash/gtkbuilder/dialog-commodity.glade:500
msgid "_Symbol/abbreviation"
@@ -16293,10 +16285,8 @@ msgid "Green"
msgstr "Green"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "Do not print transaction detail"
+msgstr "Edit imported transaction details"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -21623,24 +21613,18 @@ msgstr "Disabled"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "Assign a transfer account to the selection."
+msgstr "_Assign a transfer account to the selection"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "Description, Notes, or Memo"
+msgstr "_Edit description, notes, or memo"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "Reset defaults"
+msgstr "_Reset all edits"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
commit 6b60ef4f8351e9db53b41bedad69e7a5d1709136
Author: Christian Wehling <christian.wehling at web.de>
Date: Tue Aug 2 18:47:11 2022 +0200
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/de.po: 99.9% (5399 of 5400 strings; 1 fuzzy)
181 failing checks (3.3%)
Translation: GnuCash/Program (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/glossary/de.po: 99.5% (215 of 216 strings; 1 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Glossary (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/glossary/de/
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/de.po: 99.9% (5399 of 5400 strings; 1 fuzzy)
180 failing checks (3.3%)
Translation: GnuCash/Program (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/glossary/de.po: 99.5% (215 of 216 strings; 1 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Glossary (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/glossary/de/
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/de.po: 99.9% (5399 of 5400 strings; 1 fuzzy)
180 failing checks (3.3%)
Translation: GnuCash/Program (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/de.po: 99.9% (5399 of 5400 strings; 1 fuzzy)
181 failing checks (3.3%)
Translation: GnuCash/Program (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/de.po: 99.9% (5399 of 5400 strings; 1 fuzzy)
182 failing checks (3.3%)
Translation: GnuCash/Program (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Co-authored-by: Christian Wehling <christian.wehling at web.de>
diff --git a/po/de.po b/po/de.po
index 83fb6b686..381712ca8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -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-07-29 15:51+0000\n"
+"PO-Revision-Date: 2022-08-01 20:19+0000\n"
"Last-Translator: Christian Wehling <christian.wehling at web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/gnucash/"
"de/>\n"
@@ -1351,25 +1351,25 @@ msgid ""
"That commodity is currently used by at least one of your accounts. You may "
"not delete it."
msgstr ""
-"Diese Devise/Wertpapier wird von (mindestens) einem Konto benutzt. Sie "
-"können Sie daher nicht löschen."
+"Diese Währung/Wertpapier wird von (mindestens) einem Konto benutzt. Sie "
+"können es daher nicht löschen."
#: gnucash/gnome/dialog-commodities.c:197
msgid ""
"This commodity has price quotes. Are you sure you want to delete the "
"selected commodity and its price quotes?"
msgstr ""
-"Zu dieser Devise/Wertpapier existieren Kurswerte. Sind Sie sicher, dass Sie "
-"die gewählte Devise/Wertpapier und ihre Kurswerte löschen wollen?"
+"Zu dieser Währung/Wertpapier existieren Kurswerte. Sind Sie sicher, dass Sie "
+"die gewählte Währung/Wertpapier und ihre Kurswerte löschen wollen?"
#: gnucash/gnome/dialog-commodities.c:204
msgid "Are you sure you want to delete the selected commodity?"
msgstr ""
-"Sind Sie sicher, dass Sie die gewählte Devise/Wertpapier löschen wollen?"
+"Sind Sie sicher, dass Sie die gewählte Währung/Wertpapier löschen wollen?"
#: gnucash/gnome/dialog-commodities.c:213
msgid "Delete commodity?"
-msgstr "Devise/Wertpapier löschen?"
+msgstr "Währung/Wertpapier löschen?"
#: gnucash/gnome/dialog-commodities.c:217 gnucash/gnome/dialog-doclink.c:165
#: gnucash/gnome/dialog-price-edit-db.c:207
@@ -7657,7 +7657,7 @@ msgid ""
"Commodity: "
msgstr ""
"\n"
-"Devise/Wertpapier: "
+"Währung/Wertpapier: "
#. Translators: Replace here and later CUSIP by the name of your local
#. National Securities Identifying Number
@@ -7683,7 +7683,7 @@ msgstr ""
#: gnucash/gnome-utils/dialog-commodity.c:275
#: gnucash/gtkbuilder/dialog-commodity.glade:634
msgid "Select security/currency"
-msgstr "Bitte wählen Sie das Wertpapier/Devise/Währung"
+msgstr "Bitte wählen Sie ein Wertpapier/ eine Währung"
#: gnucash/gnome-utils/dialog-commodity.c:276
#: gnucash/gtkbuilder/dialog-account.glade:1265
@@ -7754,12 +7754,12 @@ msgstr "Sie können keine neue nationale Währung erstellen."
#, c-format
msgid "%s is a reserved commodity type. Please use something else."
msgstr ""
-"%s ist als Typ für Währungen oder Wertpapiere reserviert. Bitte verwenden "
-"Sie eine andere Bezeichnung."
+"%s ist als Typ für Währungen/Wertpapiere reserviert. Bitte verwenden Sie "
+"eine andere Bezeichnung."
#: gnucash/gnome-utils/dialog-commodity.c:1294
msgid "That commodity already exists."
-msgstr "Diese Devise/Wertpapier existiert bereits."
+msgstr "Diese Währung/Wertpapier existiert bereits."
#: gnucash/gnome-utils/dialog-commodity.c:1345
msgid ""
@@ -7767,7 +7767,7 @@ msgid ""
"\" for the commodity."
msgstr ""
"Sie müssen in den Feldern »Voller Name«, »Symbol/Abkürzung« und »Typ« für "
-"die Devise/Wertpapier etwas angeben."
+"die Währung/Wertpapier etwas angeben."
#: gnucash/gnome-utils/dialog-doclink-utils.c:237
msgid "Path head for files is,"
@@ -9883,7 +9883,7 @@ msgstr "Kontobezeichnung"
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2918
#: gnucash/gtkbuilder/dialog-price.glade:563
msgid "Commodity"
-msgstr "Devise/Wertpapier"
+msgstr "Währung/Wertpapier"
#: gnucash/gnome-utils/gnc-tree-view-account.c:823
#: gnucash/import-export/csv-exp/csv-tree-export.c:156
@@ -11717,9 +11717,8 @@ msgid ""
"To retrieve online quotes from Alphavantage, this key needs to be set. A key "
"can be retrieved from the Alpha Vantage website."
msgstr ""
-"Um online Börsenkurse von Alphavantage abzurufen, muss dieser Schlüssel "
-"gesetzt sein. Ein Schlüssel kann von der Alpha Vantage Webseite bezogen "
-"werden."
+"Um online Kurse von Alphavantage abzurufen, muss dieser Schlüssel gesetzt "
+"sein. Ein Schlüssel kann von der Alpha Vantage Webseite bezogen werden."
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:10
msgid "The version of these settings"
@@ -12765,17 +12764,17 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:29
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:152
msgid "Delete a commodity"
-msgstr "Eine Devise/Wertpapier löschen"
+msgstr "Eine Währung/Wertpapier löschen"
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:30
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:153
msgid "This dialog is presented before allowing you to delete a commodity."
-msgstr "Diese Rückfrage kommt vor dem Löschen einer Devise/Wertpapier."
+msgstr "Diese Rückfrage kommt vor dem Löschen einer Währung/Wertpapiers."
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:34
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:157
msgid "Delete a commodity with price quotes"
-msgstr "Eine Devise/Wertpapier mit den Kurswerten löschen"
+msgstr "Eine Währung/Wertpapier mit den Kurswerten löschen"
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:35
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:158
@@ -12783,9 +12782,9 @@ msgid ""
"This dialog is presented before allowing you to delete a commodity that has "
"price quotes attached. Deleting the commodity will delete the quotes as well."
msgstr ""
-"Diese Rückfrage kommt vor dem Löschen einer Devise/Wertpapier, wenn diese "
-"noch Kursinformationen gespeichert hat. Löschen des Wertpapiers wird die "
-"Kursinformationen ebenfalls löschen."
+"Diese Rückfrage kommt vor dem Löschen einer Währung/Wertpapier, wenn diese "
+"noch Kursinformationen gespeichert hat. Löschen von Währung/Wertpapier wird "
+"die Kursinformationen ebenfalls löschen."
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:39
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:162
@@ -13059,9 +13058,9 @@ msgid ""
"If active, non currency commodities (stocks) will be shown. Otherwise they "
"will be hidden."
msgstr ""
-"Wenn aktiviert, werden Wertpapiere in der Zusammenfassungs-Zeile angezeigt, "
-"die keine Devisen/Währungen sind. Wenn nicht aktiviert, werden nur Währungen "
-"angezeigt."
+"Wenn aktiviert, werden nur Handelsgüter (z.B. Wertpapiere) in der "
+"Zusammenfassungs-Zeile angezeigt, die keine Währungen sind. Wenn nicht "
+"aktiviert, werden nur Währungen angezeigt."
#: gnucash/gschemas/org.gnucash.GnuCash.window.pages.account.tree.gschema.xml.in:15
msgid "Use relative profit/loss starting date"
@@ -13544,13 +13543,12 @@ msgid ""
"\n"
"Click on \"Next\" to proceed or \"Cancel\" to Abort Import."
msgstr ""
-"Dieser Assistent hilft Ihnen beim Import von Kurswerten aus einer CSV "
-"Datei.\n"
+"Dieser Assistent hilft Ihnen beim Import von Kurswerten aus einer CSV Datei."
"\n"
-"Für einen erfolgreichen Import müssen mindestens Spalten vorhanden sein für "
-"»Datum«, »Betrag«, »Von Wertpapier/Devise« und »Zu Währung«.\n"
"\n"
-"Falls alle Einträge für das gleiche Wertpapier oder Währung sind, kann das "
+"Für einen erfolgreichen Import müssen mindestens Spalten vorhanden sein für "
+"»Datum«, »Betrag«, »Von Namensraum«, »Von Symbol« und »Zu Währung«. Falls "
+"alle Einträge für das gleiche Wertpapier oder Währung sind, kann das "
"vorausgewählt werden und die benötigten Spalten sind nur noch Datum und "
"Betrag.\n"
"\n"
@@ -13562,10 +13560,9 @@ msgstr ""
"oder \"EUR\",\"2019-04-18\",1.125,\"USD\"\n"
"\n"
"Es gibt eine Option zur Auswahl der Startzeile, der Endzeile sowie zur Wahl, "
-"wie viele Zeilen, ausgehend von der Startzeile, übersprungen werden sollen "
-"(z.B. für den Fall, dass Ihre Datei einen Block mit Kopfzeilen enthält). "
-"Eine weitere Option ist, bereits vorhandene Preise für den Tag zu "
-"überschreiben.\n"
+"wie viele Zeilen, ausgehend von der Startzeile, übersprungen werden sollen ("
+"z.B. für den Fall, dass Ihre Datei einen Block mit Kopfzeilen enthält). Eine "
+"weitere Option ist, bereits vorhandene Preise für den Tag zu überschreiben.\n"
"\n"
"Zu guter Letzt hat die Vorschauseite für weitere Importe Knöpfe zum "
"Speichern und Laden der Einstellungen. Sie können Ihre angepassten "
@@ -13751,7 +13748,7 @@ msgstr "<b>Verschiedenes</b>"
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:841
msgid "<b>Commodity From</b>"
-msgstr "<b>Von Devise/Wertpapier</b>"
+msgstr "<b>Von Währung/Wertpapier</b>"
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:886
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:57
@@ -15380,7 +15377,7 @@ msgstr "Be_merkung"
#: gnucash/gtkbuilder/dialog-account.glade:1430
msgid "Smallest fraction of this commodity that can be referenced."
msgstr ""
-"Kleinste Stückelung, in der diese Devise/Wertpapier gehandelt werden kann."
+"Kleinste Stückelung, in der diese Währung/Wertpapier gehandelt werden kann."
#: gnucash/gtkbuilder/dialog-account.glade:1452
msgid "Placeholde_r"
@@ -15445,8 +15442,8 @@ msgid ""
"This account holds opening balance transactions. Only one account per "
"commodity can hold opening balance transactions."
msgstr ""
-"Dieses Konto enthält die Anfangsbestand-Buchungen. Pro Währung/Aktie kann "
-"nur ein Konto die Anfangsbestand-Buchungen enthalten."
+"Dieses Konto enthält die Anfangsbestand-Buchungen. Pro Währung/Wertpapier "
+"kann nur ein Konto die Anfangsbestand-Buchungen enthalten."
#: gnucash/gtkbuilder/dialog-account.glade:1569
msgid "<b>Acco_unt Type</b>"
@@ -15804,23 +15801,23 @@ msgstr "Nationale Währungen anzeigen"
#: gnucash/gtkbuilder/dialog-commodities.glade:126
msgid "Add a new commodity."
-msgstr "Neue Devise/Wertpapier hinzufügen."
+msgstr "Neue Währung/Wertpapier hinzufügen."
#: gnucash/gtkbuilder/dialog-commodities.glade:144
msgid "Remove the current commodity."
-msgstr "Aktuelle Devise/Wertpapier entfernen."
+msgstr "Aktuelle Währung/Wertpapier entfernen."
#: gnucash/gtkbuilder/dialog-commodities.glade:162
msgid "Edit the current commodity."
-msgstr "Aktuelle Devise/Wertpapier bearbeiten."
+msgstr "Aktuelle Währung/Wertpapier bearbeiten."
#: gnucash/gtkbuilder/dialog-commodity.glade:120
msgid ""
"Enter the full name of the commodity. Example: Cisco Systems Inc., or Apple "
"Computer, Inc."
msgstr ""
-"Bitte geben Sie den vollen Namen der Devise/Wertpapier ein: z.B. »Deutsche "
-"Bank AG« oder »Google, Inc.«"
+"Bitte geben Sie den vollen Namen der Währung/Wertpapiers ein: z.B. »Deutsche "
+"Bank AG« oder »Google, Inc.«."
#: gnucash/gtkbuilder/dialog-commodity.glade:138
msgid ""
@@ -15837,7 +15834,7 @@ msgid ""
"Enter a unique code used to identify the commodity. Or, you may safely leave "
"this field blank."
msgstr ""
-"Geben Sie einen eindeutigen Code für die Devise/Wertpapier ein. Sie können "
+"Geben Sie einen eindeutigen Code für die Währung/Wertpapier ein. Sie können "
"dieses Feld aber auch leer lassen."
#: gnucash/gtkbuilder/dialog-commodity.glade:191
@@ -15845,13 +15842,13 @@ msgid ""
"Enter the smallest fraction of the commodity which can be traded. For stocks "
"which can only be traded in whole numbers, enter 1."
msgstr ""
-"Geben Sie die kleinste Stückelung an, mit der die Devise/Wertpapier "
+"Geben Sie die kleinste Stückelung an, mit der die Währung/Wertpapier "
"gehandelt werden kann. Für Wertpapiere, die nur in ganzzahligen Mengen "
"gehandelt werden, geben Sie 1 ein."
#: gnucash/gtkbuilder/dialog-commodity.glade:215
msgid "<b>Quote Source Information</b>"
-msgstr "<b>Börsenkursquelle</b>"
+msgstr "<b>Kursquelle</b>"
#: gnucash/gtkbuilder/dialog-commodity.glade:296
msgid ""
@@ -15859,9 +15856,9 @@ msgid ""
"investment categories like STOCKS and BONDS or exchange names like NASDAQ "
"and LSE."
msgstr ""
-"Wählen Sie eine Kategorie für die Devise/Wertpapier oder geben Sie eine neue "
-"ein. Sie können Anlagekategorien wie Aktien und Fonds oder Börsennamen wie "
-"DAX und NASDAQ verwenden."
+"Wählen Sie eine Kategorie für die Währung/Wertpapier oder geben Sie eine "
+"neue ein. Sie können Anlagekategorien wie Aktien und Fonds oder Börsennamen "
+"wie DAX und NASDAQ verwenden."
#: gnucash/gtkbuilder/dialog-commodity.glade:319
msgid ""
@@ -15874,7 +15871,7 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-commodity.glade:335
msgid "Type of quote source"
-msgstr "Art der Kursabruf-Quelle"
+msgstr "Art der Kursquelle"
#: gnucash/gtkbuilder/dialog-commodity.glade:348
msgid "_Display symbol"
@@ -15928,7 +15925,7 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-commodity.glade:437
msgid "_Get Online Quotes"
-msgstr "_Börsenkurse online abrufen"
+msgstr "_Kurse online abrufen"
#: gnucash/gtkbuilder/dialog-commodity.glade:456
msgid "F_raction traded"
@@ -17093,9 +17090,9 @@ msgid ""
"If checked, non-currency commodities will be shown in the summary bar. If "
"clear, only currencies will be shown."
msgstr ""
-"Wenn aktiviert, werden Wertpapiere in der Zusammenfassungs-Zeile angezeigt, "
-"die keine Devisen/Währungen sind. Wenn nicht aktiviert, werden nur Währungen "
-"angezeigt."
+"Wenn aktiviert, werden nur Handelsgüter (z.B. Wertpapiere) in der "
+"Zusammenfassungs-Zeile angezeigt, die keine Währungen sind. Wenn nicht "
+"aktiviert, werden nur Währungen angezeigt."
#: gnucash/gtkbuilder/dialog-preferences.glade:402
msgid "_Relative"
@@ -18057,7 +18054,7 @@ msgstr "Erstes Datum"
#: gnucash/gtkbuilder/dialog-price.glade:605
msgid "From these Commodities"
-msgstr "Von diesen Devisen/Wertpapieren"
+msgstr "Von diesen Währungen/Wertpapieren"
#: gnucash/gtkbuilder/dialog-price.glade:619
msgid "Keeping the last available price for option"
@@ -22069,9 +22066,9 @@ msgid ""
"Please note that the exchange code of the commodity you select will be "
"overwritten."
msgstr ""
-"Bitte wählen Sie eine Devise/Wertpapier, die zum folgenden Aktiencode passt. "
-"Achtung: Der Aktiencode der ausgewählten Devise/Wertpapier wird anschließend "
-"überschrieben."
+"Bitte wählen Sie eine Währung/Wertpapier, die zum folgenden Aktiencode "
+"passt. Achtung: Der Aktiencode der ausgewählten Währung/Wertpapier wird "
+"anschließend überschrieben."
#: gnucash/import-export/import-format-dialog.c:78
msgid "m/d/y"
@@ -22746,13 +22743,13 @@ msgstr "Buchungsdatum fehlt."
#: gnucash/price-quotes.scm:448
msgid "No commodities marked for quote retrieval."
-msgstr "Keine Devisen/Wertpapiere zum Börsenkurs-Abruf markiert."
+msgstr "Keine Währungen/Wertpapiere zum Kurs-Abruf markiert."
#: gnucash/price-quotes.scm:452 gnucash/price-quotes.scm:474
msgid "Unable to get quotes or diagnose the problem."
msgstr ""
-"Abrufen der Börsenkurse fehlgeschlagen. Genauere Diagnose ebenfalls "
-"fehlgeschlagen."
+"Das Abrufen der Kurse ist fehlgeschlagen. Eine genauere Diagnose ist nicht "
+"möglich."
#: gnucash/price-quotes.scm:456
msgid ""
@@ -22771,16 +22768,15 @@ msgstr ""
#: gnucash/price-quotes.scm:466
msgid "There was a system error while retrieving the price quotes."
-msgstr "Beim Herunterladen der Börsenkurse ist ein Systemfehler aufgetreten."
+msgstr "Beim Herunterladen der Kurse ist ein Systemfehler aufgetreten."
#: gnucash/price-quotes.scm:470
msgid "There was an unknown error while retrieving the price quotes."
-msgstr ""
-"Beim Herunterladen der Börsenkurse ist ein unbekannter Fehler aufgetreten."
+msgstr "Beim Herunterladen der Kurse ist ein unbekannter Fehler aufgetreten."
#: gnucash/price-quotes.scm:493 gnucash/price-quotes.scm:504
msgid "Unable to retrieve quotes for these items:"
-msgstr "Abrufen von Börsenkursen für diese Werte fehlgeschlagen:"
+msgstr "Abrufen von Kursen für diese Werte fehlgeschlagen:"
#: gnucash/price-quotes.scm:497
msgid "Continue using only the good quotes?"
@@ -28201,7 +28197,7 @@ msgstr "Einheiten"
#: gnucash/report/reports/standard/price-scatter.scm:42
msgid "Price of Commodity"
-msgstr "Preis der Devise/Wertpapier"
+msgstr "Preis der Währung/Wertpapiers"
#: gnucash/report/reports/standard/price-scatter.scm:44
msgid "Invert prices"
@@ -28218,7 +28214,7 @@ msgstr "Markierungsfarbe"
#: gnucash/report/reports/standard/price-scatter.scm:72
msgid "Calculate the price of this commodity."
msgstr ""
-"Die Devise/Wertpapier, für die der Preis in diesem Bericht dargestellt "
+"Die Währung/Wertpapier, für die der Preis in diesem Bericht dargestellt "
"werden soll."
#: gnucash/report/reports/standard/price-scatter.scm:80
@@ -28231,7 +28227,7 @@ msgstr "Tatsächliche Buchungen"
#: gnucash/report/reports/standard/price-scatter.scm:88
msgid "Plot commodity per currency rather than currency per commodity."
-msgstr "Devise/Wertpapier pro Währung zeichnen statt Währung pro Wertpapier."
+msgstr "Handelsgut pro Währung zeichnen statt Währung pro Handelsgut."
#: gnucash/report/reports/standard/price-scatter.scm:104
msgid "Color of the marker."
@@ -28251,23 +28247,23 @@ msgstr "Halbjahre"
#: gnucash/report/reports/standard/price-scatter.scm:222
msgid "Identical commodities"
-msgstr "Identische Devisen/Wertpapiere"
+msgstr "Identische Währungen/Wertpapiere"
#: gnucash/report/reports/standard/price-scatter.scm:223
msgid ""
"Your selected commodity and the currency of the report are identical. It "
"doesn't make sense to show prices for identical commodities."
msgstr ""
-"Die gewählte Devise/Wertpapier, deren Preis angezeigt werden soll, und die "
+"Die gewählte Währung/Wertpapier, deren Preis angezeigt werden soll, und die "
"Währung des Berichts sind identisch. Es ergibt keinen Sinn, einen Preis für "
-"identische Devisen/Wertpapiere anzuzeigen."
+"identische Währungen/Wertpapiere anzuzeigen."
#: gnucash/report/reports/standard/price-scatter.scm:261
msgid ""
"There is no price information available for the selected commodities in the "
"selected time period."
msgstr ""
-"Es ist keine Kursinformationen für die gewählte Devise/Wertpapier im "
+"Es ist keine Kursinformationen für die gewählte Währung/Wertpapier im "
"gewählten Zeitraum vorhanden."
#: gnucash/report/reports/standard/price-scatter.scm:266
@@ -28279,7 +28275,7 @@ msgid ""
"There was only one single price found for the selected commodities in the "
"selected time period. This doesn't give a useful plot."
msgstr ""
-"Es wurde nur ein einziger Preis für die gewählte Devise/Wertpapier im "
+"Es wurde nur ein einziger Preis für die gewählte Währung/Wertpapier im "
"gewählten Zeitraum gefunden. Dies ergibt kein sinnvolles Diagramm."
#: gnucash/report/reports/standard/price-scatter.scm:273
diff --git a/po/glossary/de.po b/po/glossary/de.po
index f0a9acc48..d0694c104 100644
--- a/po/glossary/de.po
+++ b/po/glossary/de.po
@@ -17,7 +17,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2021-12-05 20:11+0100\n"
-"PO-Revision-Date: 2022-07-25 20:24+0000\n"
+"PO-Revision-Date: 2022-08-01 18:18+0000\n"
"Last-Translator: Christian Wehling <christian.wehling at web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/glossary/"
"de/>\n"
@@ -314,7 +314,7 @@ msgstr "Schliessen"
#. "An article that is bought and sold. The most general term of what an account keeps track of, e.g. a currency or a stock."
msgid "commodity"
-msgstr "Handelsgut, Devise/Wertpapier (auch: Währung, Aktie, Option)"
+msgstr "Handelsgut, Währung/Wertpapier (auch: Aktie, Option, Bonds)"
# bis <=2.2.4: Börsenplatzkürzel
#. "e.g. NASDAQ"
commit b70fe1381d9c623b5ca6241d89eb3924411f9fd7
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jul 31 15:56:52 2022 +0800
Account tree: set menu sensitivities in only 1 function
diff --git a/gnucash/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c
index 72d8960d3..4bcd08dd7 100644
--- a/gnucash/gnome/gnc-plugin-page-account-tree.c
+++ b/gnucash/gnome/gnc-plugin-page-account-tree.c
@@ -367,6 +367,15 @@ static const gchar *actions_requiring_account_rw[] =
NULL
};
+/** Actions that require the selected account to have subaccounts
+ * before they are enabled, and the book is in read-write mode. */
+static const gchar *actions_requiring_subaccounts_rw[] =
+{
+ "EditRenumberSubaccountsAction",
+ "EditCascadeAccountAction",
+ NULL
+};
+
/** Actions that require an account to be selected before they are
* enabled. Those actions can be selected even if the book is in readonly mode. */
static const gchar *actions_requiring_account_always[] =
@@ -387,7 +396,6 @@ static const gchar* readonly_inactive_actions[] =
"FileAddAccountHierarchyAssistantAction",
"EditEditAccountAction",
"EditDeleteAccountAction",
- "EditRenumberSubaccountsAction",
"ActionsTransferAction",
"ActionsReconcileAction",
"ActionsAutoClearAction",
@@ -889,12 +897,24 @@ gnc_plugin_page_account_tree_destroy_widget (GncPluginPage *plugin_page)
static void update_inactive_actions(GncPluginPage *plugin_page)
{
+ GncPluginPageAccountTreePrivate *priv;
GtkActionGroup *action_group;
- gboolean is_sensitive = !qof_book_is_readonly(gnc_get_current_book());
+ Account *account = NULL;
+ gboolean allow_write = !qof_book_is_readonly(gnc_get_current_book());
+ gboolean has_account = FALSE;
+ gboolean subaccounts = FALSE;
- // We are readonly - so we have to switch particular actions to inactive.
- g_return_if_fail(plugin_page);
- g_return_if_fail(GNC_IS_PLUGIN_PAGE(plugin_page));
+ g_return_if_fail (plugin_page && GNC_IS_PLUGIN_PAGE(plugin_page));
+
+ priv = GNC_PLUGIN_PAGE_ACCOUNT_TREE_GET_PRIVATE (plugin_page);
+
+ if (gtk_tree_view_get_selection (priv->tree_view))
+ {
+ account = gnc_tree_view_account_get_selected_account (GNC_TREE_VIEW_ACCOUNT(priv->tree_view));
+ has_account = (account != NULL);
+ subaccounts = (account && gnc_account_n_children (account) != 0);
+ /* Check here for placeholder accounts, etc. */
+ }
/* Get the action group */
action_group = gnc_plugin_page_get_action_group(plugin_page);
@@ -902,7 +922,14 @@ static void update_inactive_actions(GncPluginPage *plugin_page)
/* Set the action's sensitivity */
gnc_plugin_update_actions (action_group, readonly_inactive_actions,
- "sensitive", is_sensitive);
+ "sensitive", allow_write);
+ gnc_plugin_update_actions (action_group, actions_requiring_account_rw,
+ "sensitive", allow_write && has_account);
+ gnc_plugin_update_actions (action_group, actions_requiring_account_always,
+ "sensitive", has_account);
+ gnc_plugin_update_actions (action_group, actions_requiring_subaccounts_rw,
+ "sensitive", allow_write && subaccounts);
+ g_signal_emit (plugin_page, plugin_page_signals[ACCOUNT_SELECTED], 0, account);
}
/**
@@ -1117,52 +1144,10 @@ gnc_plugin_page_account_tree_double_click_cb (GtkTreeView *treeview,
static void
gnc_plugin_page_account_tree_selection_changed_cb (GtkTreeSelection *selection,
- GncPluginPageAccountTree *page)
+ GncPluginPageAccountTree *page)
{
- GtkActionGroup *action_group;
- GtkAction *action;
- GtkTreeView *view;
- Account *account = NULL;
- gboolean sensitive;
- gboolean subaccounts;
- gboolean is_readwrite = !qof_book_is_readonly(gnc_get_current_book());
-
- g_return_if_fail(GNC_IS_PLUGIN_PAGE_ACCOUNT_TREE(page));
-
- if (!selection)
- {
- sensitive = FALSE;
- subaccounts = FALSE;
- }
- else
- {
- g_return_if_fail(GTK_IS_TREE_SELECTION(selection));
- view = gtk_tree_selection_get_tree_view (selection);
- account = gnc_tree_view_account_get_selected_account (GNC_TREE_VIEW_ACCOUNT(view));
- sensitive = (account != NULL);
-
- subaccounts = account && (gnc_account_n_children(account) != 0);
- /* Check here for placeholder accounts, etc. */
- }
-
- action_group = gnc_plugin_page_get_action_group(GNC_PLUGIN_PAGE(page));
- gnc_plugin_update_actions (action_group, actions_requiring_account_rw,
- "sensitive", is_readwrite && sensitive);
- gnc_plugin_update_actions (action_group, actions_requiring_account_always,
- "sensitive", sensitive);
- g_signal_emit (page, plugin_page_signals[ACCOUNT_SELECTED], 0, account);
-
- action = gtk_action_group_get_action (action_group, "EditRenumberSubaccountsAction");
- g_object_set (G_OBJECT(action), "sensitive",
- is_readwrite && sensitive && subaccounts, NULL);
-
- action = gtk_action_group_get_action (action_group, "EditCascadeAccountAction");
- g_object_set (G_OBJECT(action), "sensitive", subaccounts, NULL);
-
- gnc_plugin_update_actions (action_group, actions_requiring_account_rw,
- "sensitive", is_readwrite && sensitive);
- gnc_plugin_update_actions (action_group, actions_requiring_account_always,
- "sensitive", sensitive);
+ GncPluginPage *plugin_page = GNC_PLUGIN_PAGE(page);
+ update_inactive_actions (plugin_page);
}
commit 1b845a86f3064c040b998a6f22a5490cee8858d6
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Aug 1 23:44:05 2022 +0800
use gtk_entry_get_text instead of gtk_editable_get_chars
the former returns a const char* which does not need to be freed.
diff --git a/gnucash/gnome-utils/gnc-account-sel.c b/gnucash/gnome-utils/gnc-account-sel.c
index 7178336bf..93808e532 100644
--- a/gnucash/gnome-utils/gnc-account-sel.c
+++ b/gnucash/gnome-utils/gnc-account-sel.c
@@ -204,10 +204,11 @@ gas_populate_list (GNCAccountSel *gas)
GtkEntry *entry;
gint i, active = -1;
GList *accts, *ptr;
- gchar *currentSel, *name;
+ const gchar *currentSel;
+ gchar *name;
entry = GTK_ENTRY(gtk_bin_get_child (GTK_BIN(gas->combo)));
- currentSel = gtk_editable_get_chars (GTK_EDITABLE(entry), 0, -1 );
+ currentSel = gtk_entry_get_text (entry);
g_signal_handlers_block_by_func (gas->combo, combo_changed_cb , gas);
@@ -244,8 +245,6 @@ gas_populate_list (GNCAccountSel *gas)
g_signal_handlers_unblock_by_func (gas->combo, combo_changed_cb , gas);
g_list_free (atnd.outList);
- if (currentSel)
- g_free (currentSel);
}
static void
diff --git a/gnucash/gnome/dialog-customer.c b/gnucash/gnome/dialog-customer.c
index 560b54060..3fe6650dd 100644
--- a/gnucash/gnome/dialog-customer.c
+++ b/gnucash/gnome/dialog-customer.c
@@ -213,44 +213,25 @@ static void gnc_ui_to_customer (CustomerWindow *cw, GncCustomer *cust)
if (cw->dialog_type == NEW_CUSTOMER)
qof_event_gen(QOF_INSTANCE(cust), QOF_EVENT_ADD, NULL);
- gncCustomerSetID (cust, gtk_editable_get_chars
- (GTK_EDITABLE (cw->id_entry), 0, -1));
- gncCustomerSetName (cust, gtk_editable_get_chars
- (GTK_EDITABLE (cw->company_entry), 0, -1));
-
- gncAddressSetName (addr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->name_entry), 0, -1));
- gncAddressSetAddr1 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->addr1_entry), 0, -1));
- gncAddressSetAddr2 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->addr2_entry), 0, -1));
- gncAddressSetAddr3 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->addr3_entry), 0, -1));
- gncAddressSetAddr4 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->addr4_entry), 0, -1));
- gncAddressSetPhone (addr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->phone_entry), 0, -1));
- gncAddressSetFax (addr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->fax_entry), 0, -1));
- gncAddressSetEmail (addr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->email_entry), 0, -1));
-
- gncAddressSetName (shipaddr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->shipname_entry), 0, -1));
- gncAddressSetAddr1 (shipaddr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->shipaddr1_entry), 0, -1));
- gncAddressSetAddr2 (shipaddr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->shipaddr2_entry), 0, -1));
- gncAddressSetAddr3 (shipaddr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->shipaddr3_entry), 0, -1));
- gncAddressSetAddr4 (shipaddr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->shipaddr4_entry), 0, -1));
- gncAddressSetPhone (shipaddr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->shipphone_entry), 0, -1));
- gncAddressSetFax (shipaddr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->shipfax_entry), 0, -1));
- gncAddressSetEmail (shipaddr, gtk_editable_get_chars
- (GTK_EDITABLE (cw->shipemail_entry), 0, -1));
+ gncCustomerSetID (cust, gtk_entry_get_text (GTK_ENTRY (cw->id_entry)));
+ gncCustomerSetName (cust, gtk_entry_get_text (GTK_ENTRY (cw->company_entry)));
+
+ gncAddressSetName (addr, gtk_entry_get_text (GTK_ENTRY (cw->name_entry)));
+ gncAddressSetAddr1 (addr, gtk_entry_get_text (GTK_ENTRY (cw->addr1_entry)));
+ gncAddressSetAddr2 (addr, gtk_entry_get_text (GTK_ENTRY (cw->addr2_entry)));
+ gncAddressSetAddr3 (addr, gtk_entry_get_text (GTK_ENTRY (cw->addr3_entry)));
+ gncAddressSetAddr4 (addr, gtk_entry_get_text (GTK_ENTRY (cw->addr4_entry)));
+ gncAddressSetPhone (addr, gtk_entry_get_text (GTK_ENTRY (cw->phone_entry)));
+ gncAddressSetFax (addr, gtk_entry_get_text (GTK_ENTRY (cw->fax_entry)));
+ gncAddressSetEmail (addr, gtk_entry_get_text (GTK_ENTRY (cw->email_entry)));
+ gncAddressSetName (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipname_entry)));
+ gncAddressSetAddr1 (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipaddr1_entry)));
+ gncAddressSetAddr2 (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipaddr2_entry)));
+ gncAddressSetAddr3 (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipaddr3_entry)));
+ gncAddressSetAddr4 (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipaddr4_entry)));
+ gncAddressSetPhone (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipphone_entry)));
+ gncAddressSetFax (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipfax_entry)));
+ gncAddressSetEmail (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipemail_entry)));
gncCustomerSetActive (cust, gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (cw->active_check)));
diff --git a/gnucash/gnome/dialog-doclink.c b/gnucash/gnome/dialog-doclink.c
index a71c91a67..3e83a7421 100644
--- a/gnucash/gnome/dialog-doclink.c
+++ b/gnucash/gnome/dialog-doclink.c
@@ -109,12 +109,12 @@ gnc_doclink_open_uri (GtkWindow *parent, const gchar *uri)
/* =================================================================== */
static void
-location_ok_cb (GtkEditable *editable, gpointer user_data)
+location_ok_cb (GtkEntry *entry, gpointer user_data)
{
GtkWidget *ok_button = user_data;
gboolean have_scheme = FALSE;
- gchar *text = gtk_editable_get_chars (editable, 0, -1);
- GtkWidget *warning_hbox = g_object_get_data (G_OBJECT(editable), "whbox");
+ const gchar *text = gtk_entry_get_text (entry);
+ GtkWidget *warning_hbox = g_object_get_data (G_OBJECT(entry), "whbox");
if (text && *text)
{
@@ -126,7 +126,6 @@ location_ok_cb (GtkEditable *editable, gpointer user_data)
}
gtk_widget_set_visible (warning_hbox, !have_scheme);
gtk_widget_set_sensitive (ok_button, have_scheme);
- g_free (text);
}
static void
@@ -216,7 +215,7 @@ uri_type_selected_cb (GtkToggleButton *button, GtkWidget *widget)
{
if (g_strcmp0 (gtk_buildable_get_name (
GTK_BUILDABLE(parent_hbox)), "location_hbox") == 0)
- location_ok_cb (GTK_EDITABLE(widget), ok_button);
+ location_ok_cb (GTK_ENTRY (widget), ok_button);
else
file_ok_cb (GTK_BUTTON(widget), ok_button);
diff --git a/gnucash/gnome/dialog-employee.c b/gnucash/gnome/dialog-employee.c
index 9244c66f9..e4f02dfa1 100644
--- a/gnucash/gnome/dialog-employee.c
+++ b/gnucash/gnome/dialog-employee.c
@@ -129,32 +129,20 @@ static void gnc_ui_to_employee (EmployeeWindow *ew, GncEmployee *employee)
if (ew->dialog_type == NEW_EMPLOYEE)
qof_event_gen(QOF_INSTANCE(employee), QOF_EVENT_ADD, NULL);
- gncEmployeeSetID (employee, gtk_editable_get_chars
- (GTK_EDITABLE (ew->id_entry), 0, -1));
- gncEmployeeSetUsername (employee, gtk_editable_get_chars
- (GTK_EDITABLE (ew->username_entry), 0, -1));
-
- gncAddressSetName (addr, gtk_editable_get_chars
- (GTK_EDITABLE (ew->name_entry), 0, -1));
- gncAddressSetAddr1 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (ew->addr1_entry), 0, -1));
- gncAddressSetAddr2 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (ew->addr2_entry), 0, -1));
- gncAddressSetAddr3 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (ew->addr3_entry), 0, -1));
- gncAddressSetAddr4 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (ew->addr4_entry), 0, -1));
- gncAddressSetPhone (addr, gtk_editable_get_chars
- (GTK_EDITABLE (ew->phone_entry), 0, -1));
- gncAddressSetFax (addr, gtk_editable_get_chars
- (GTK_EDITABLE (ew->fax_entry), 0, -1));
- gncAddressSetEmail (addr, gtk_editable_get_chars
- (GTK_EDITABLE (ew->email_entry), 0, -1));
-
+ gncEmployeeSetID (employee, gtk_entry_get_text (GTK_ENTRY (ew->id_entry)));
+ gncEmployeeSetUsername (employee, gtk_entry_get_text (GTK_ENTRY (ew->username_entry)));
+
+ gncAddressSetName (addr, gtk_entry_get_text (GTK_ENTRY (ew->name_entry)));
+ gncAddressSetAddr1 (addr, gtk_entry_get_text (GTK_ENTRY (ew->addr1_entry)));
+ gncAddressSetAddr2 (addr, gtk_entry_get_text (GTK_ENTRY (ew->addr2_entry)));
+ gncAddressSetAddr3 (addr, gtk_entry_get_text (GTK_ENTRY (ew->addr3_entry)));
+ gncAddressSetAddr4 (addr, gtk_entry_get_text (GTK_ENTRY (ew->addr4_entry)));
+ gncAddressSetPhone (addr, gtk_entry_get_text (GTK_ENTRY (ew->phone_entry)));
+ gncAddressSetFax (addr, gtk_entry_get_text (GTK_ENTRY (ew->fax_entry)));
+ gncAddressSetEmail (addr, gtk_entry_get_text (GTK_ENTRY (ew->email_entry)));
gncEmployeeSetActive (employee, gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (ew->active_check)));
- gncEmployeeSetLanguage (employee, gtk_editable_get_chars
- (GTK_EDITABLE (ew->language_entry), 0, -1));
+ gncEmployeeSetLanguage (employee, gtk_entry_get_text (GTK_ENTRY (ew->language_entry)));
/* Parse and set the workday and rate amounts */
gncEmployeeSetWorkday (employee, gnc_amount_edit_get_amount
diff --git a/gnucash/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c
index 4f1830e9d..8307cec9f 100644
--- a/gnucash/gnome/dialog-invoice.c
+++ b/gnucash/gnome/dialog-invoice.c
@@ -399,10 +399,8 @@ static void gnc_ui_to_invoice (InvoiceWindow *iw, GncInvoice *invoice)
/* Only set these values for NEW/MOD INVOICE types */
if (iw->dialog_type != EDIT_INVOICE)
{
- gncInvoiceSetID (invoice, gtk_editable_get_chars
- (GTK_EDITABLE (iw->id_entry), 0, -1));
- gncInvoiceSetBillingID (invoice, gtk_editable_get_chars
- (GTK_EDITABLE (iw->billing_id_entry), 0, -1));
+ gncInvoiceSetID (invoice, gtk_entry_get_text (GTK_ENTRY (iw->id_entry)));
+ gncInvoiceSetBillingID (invoice, gtk_entry_get_text (GTK_ENTRY (iw->billing_id_entry)));
gncInvoiceSetTerms (invoice, iw->terms);
gncInvoiceSetDateOpened (invoice, time);
diff --git a/gnucash/gnome/dialog-job.c b/gnucash/gnome/dialog-job.c
index 459c35cac..5be6ec0ed 100644
--- a/gnucash/gnome/dialog-job.c
+++ b/gnucash/gnome/dialog-job.c
@@ -105,12 +105,9 @@ static void gnc_ui_to_job (JobWindow *jw, GncJob *job)
qof_event_gen(QOF_INSTANCE(job), QOF_EVENT_ADD, NULL);
- gncJobSetID (job, gtk_editable_get_chars (GTK_EDITABLE (jw->id_entry),
- 0, -1));
- gncJobSetName (job, gtk_editable_get_chars (GTK_EDITABLE (jw->name_entry),
- 0, -1));
- gncJobSetReference (job, gtk_editable_get_chars
- (GTK_EDITABLE (jw->desc_entry), 0, -1));
+ gncJobSetID (job, gtk_entry_get_text (GTK_ENTRY (jw->id_entry)));
+ gncJobSetName (job, gtk_entry_get_text (GTK_ENTRY (jw->name_entry)));
+ gncJobSetReference (job, gtk_entry_get_text (GTK_ENTRY (jw->desc_entry)));
gncJobSetRate (job, gnc_amount_edit_get_amount
(GNC_AMOUNT_EDIT (jw->rate_entry)));
gncJobSetActive (job, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
diff --git a/gnucash/gnome/dialog-order.c b/gnucash/gnome/dialog-order.c
index 310df41c5..f1e0ed219 100644
--- a/gnucash/gnome/dialog-order.c
+++ b/gnucash/gnome/dialog-order.c
@@ -133,16 +133,14 @@ static void gnc_ui_to_order (OrderWindow *ow, GncOrder *order)
gnc_suspend_gui_refresh ();
gncOrderBeginEdit (order);
- gncOrderSetID (order, gtk_editable_get_chars
- (GTK_EDITABLE (ow->id_entry), 0, -1));
+ gncOrderSetID (order, gtk_entry_get_text (GTK_ENTRY (ow->id_entry)));
text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(ow->notes_text));
gtk_text_buffer_get_bounds (text_buffer, &start, &end);
text = gtk_text_buffer_get_text (text_buffer, &start, &end, FALSE);
gncOrderSetNotes (order, text);
- gncOrderSetReference (order, gtk_editable_get_chars
- (GTK_EDITABLE (ow->ref_entry), 0, -1));
+ gncOrderSetReference (order, gtk_entry_get_text (GTK_ENTRY (ow->ref_entry)));
tt = gnc_date_edit_get_date (GNC_DATE_EDIT (ow->opened_date));
gncOrderSetDateOpened (order, tt);
diff --git a/gnucash/gnome/dialog-sx-editor.c b/gnucash/gnome/dialog-sx-editor.c
index fa0f9a78e..31287efdd 100644
--- a/gnucash/gnome/dialog-sx-editor.c
+++ b/gnucash/gnome/dialog-sx-editor.c
@@ -264,7 +264,7 @@ editor_ok_button_clicked_cb (GtkButton *b, GncSxEditorDialog *sxed)
static gboolean
gnc_sxed_check_name_changed (GncSxEditorDialog *sxed)
{
- char *name = gtk_editable_get_chars (GTK_EDITABLE (sxed->nameEntry), 0, -1);
+ const char *name = gtk_entry_get_text (GTK_ENTRY (sxed->nameEntry));
if (strlen (name) == 0)
return TRUE;
diff --git a/gnucash/gnome/dialog-vendor.c b/gnucash/gnome/dialog-vendor.c
index 3d5e02903..f0882281f 100644
--- a/gnucash/gnome/dialog-vendor.c
+++ b/gnucash/gnome/dialog-vendor.c
@@ -146,27 +146,17 @@ static void gnc_ui_to_vendor (VendorWindow *vw, GncVendor *vendor)
if (vw->dialog_type == NEW_VENDOR)
qof_event_gen(QOF_INSTANCE(vendor), QOF_EVENT_ADD, NULL);
- gncVendorSetID (vendor, gtk_editable_get_chars
- (GTK_EDITABLE (vw->id_entry), 0, -1));
- gncVendorSetName (vendor, gtk_editable_get_chars
- (GTK_EDITABLE (vw->company_entry), 0, -1));
-
- gncAddressSetName (addr, gtk_editable_get_chars
- (GTK_EDITABLE (vw->name_entry), 0, -1));
- gncAddressSetAddr1 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (vw->addr1_entry), 0, -1));
- gncAddressSetAddr2 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (vw->addr2_entry), 0, -1));
- gncAddressSetAddr3 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (vw->addr3_entry), 0, -1));
- gncAddressSetAddr4 (addr, gtk_editable_get_chars
- (GTK_EDITABLE (vw->addr4_entry), 0, -1));
- gncAddressSetPhone (addr, gtk_editable_get_chars
- (GTK_EDITABLE (vw->phone_entry), 0, -1));
- gncAddressSetFax (addr, gtk_editable_get_chars
- (GTK_EDITABLE (vw->fax_entry), 0, -1));
- gncAddressSetEmail (addr, gtk_editable_get_chars
- (GTK_EDITABLE (vw->email_entry), 0, -1));
+ gncVendorSetID (vendor, gtk_entry_get_text (GTK_ENTRY (vw->id_entry)));
+ gncVendorSetName (vendor, gtk_entry_get_text (GTK_ENTRY (vw->company_entry)));
+
+ gncAddressSetName (addr, gtk_entry_get_text (GTK_ENTRY (vw->name_entry)));
+ gncAddressSetAddr1 (addr, gtk_entry_get_text (GTK_ENTRY (vw->addr1_entry)));
+ gncAddressSetAddr2 (addr, gtk_entry_get_text (GTK_ENTRY (vw->addr2_entry)));
+ gncAddressSetAddr3 (addr, gtk_entry_get_text (GTK_ENTRY (vw->addr3_entry)));
+ gncAddressSetAddr4 (addr, gtk_entry_get_text (GTK_ENTRY (vw->addr4_entry)));
+ gncAddressSetPhone (addr, gtk_entry_get_text (GTK_ENTRY (vw->phone_entry)));
+ gncAddressSetFax (addr, gtk_entry_get_text (GTK_ENTRY (vw->fax_entry)));
+ gncAddressSetEmail (addr, gtk_entry_get_text (GTK_ENTRY (vw->email_entry)));
gncVendorSetActive (vendor, gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (vw->active_check)));
commit d1aefc851d0ec34500405edcfca6ef0d475dd411
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Aug 1 23:43:08 2022 +0800
[sx-book] free sx_list before g_object_unreffing sxes
diff --git a/libgnucash/engine/SX-book.c b/libgnucash/engine/SX-book.c
index d8d8c27db..15eb1943b 100644
--- a/libgnucash/engine/SX-book.c
+++ b/libgnucash/engine/SX-book.c
@@ -281,6 +281,7 @@ book_sxes_end(QofBook* book)
sxes = qof_collection_get_data(col);
if (sxes != NULL)
{
+ g_list_free (sxes->sx_list);
g_object_unref(sxes);
qof_collection_set_data(col, NULL);
}
commit 2443d8faf7c0d13a7ea564a8ee0376f2e159bcd8
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jul 31 10:19:55 2022 +0800
[import-main-matcher] tidy: free GList before going out of scope
...instead of in a separate function. This matches c++ RAII behaviour.
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index aaa0fb172..27cffb2ae 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -403,8 +403,6 @@ remove_top_matches (GNCImportMainMatcher* gui, GtkTreeModel* model, GList* confl
match_trans = g_list_remove (match_trans, match_trans->data);
gnc_import_TransInfo_set_match_list (trans_info, match_trans);
}
-
- g_list_free (conflicts);
}
static void
@@ -448,6 +446,8 @@ resolve_conflicts (GNCImportMainMatcher *info)
valid = gtk_tree_model_iter_next (model, &import_iter);
/* NOTE: The loop is guaranteed to terminate because whenever we go back to the top
* we remove at least 1 match, and there's a finite number of them. */
+
+ g_list_free (conflicts);
}
// Refresh all
commit a43997cc52edfb24a7362783675603880e848467
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jul 31 10:05:34 2022 +0800
[import-main-matcher] pull common add_string into 1 function
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 9b65f72c3..aaa0fb172 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -1086,6 +1086,17 @@ input_new_fields (GNCImportMainMatcher *info, RowInfo *rowinfo,
return retval;
}
+static inline void
+maybe_add_string (GNCImportMainMatcher *info, GHashTable *hash, const char *str)
+{
+ char *new_string;
+ if (!str || !str[0] || g_hash_table_lookup (info->desc_hash, str))
+ return;
+ new_string = g_strdup (str);
+ info->new_strings = g_list_prepend (info->new_strings, new_string);
+ g_hash_table_insert (hash, new_string, one);
+}
+
static void
gnc_gen_trans_edit_fields (GtkMenuItem *menuitem, GNCImportMainMatcher *info)
{
@@ -1128,23 +1139,13 @@ gnc_gen_trans_edit_fields (GtkMenuItem *menuitem, GNCImportMainMatcher *info)
DOWNLOADED_COL_DESCRIPTION_STYLE, style,
-1);
xaccTransSetDescription (row->trans, new_desc);
- if (*new_desc && !g_hash_table_lookup (info->desc_hash, new_desc))
- {
- char *new_string = g_strdup (new_desc);
- info->new_strings = g_list_prepend (info->new_strings, new_string);
- g_hash_table_insert (info->desc_hash, new_string, one);
- }
+ maybe_add_string (info, info->desc_hash, new_desc);
}
if (info->edit_notes)
{
xaccTransSetNotes (row->trans, new_notes);
- if (*new_notes && !g_hash_table_lookup (info->notes_hash, new_notes))
- {
- char *new_string = g_strdup (new_notes);
- info->new_strings = g_list_prepend (info->new_strings, new_string);
- g_hash_table_insert (info->notes_hash, new_string, one);
- }
+ maybe_add_string (info, info->notes_hash, new_notes);
}
if (info->edit_memo)
@@ -1156,12 +1157,7 @@ gnc_gen_trans_edit_fields (GtkMenuItem *menuitem, GNCImportMainMatcher *info)
DOWNLOADED_COL_MEMO_STYLE, style,
-1);
xaccSplitSetMemo (row->split, new_memo);
- if (*new_memo && !g_hash_table_lookup (info->memo_hash, new_memo))
- {
- char *new_string = g_strdup (new_memo);
- info->new_strings = g_list_prepend (info->new_strings, new_string);
- g_hash_table_insert (info->memo_hash, new_string, one);
- }
+ maybe_add_string (info, info->memo_hash, new_memo);
}
}
g_free (new_desc);
commit dc77df352eb694c75de14e37b54bb9db3268fad1
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jul 31 10:06:16 2022 +0800
[import-main-matcher] add comments, tidier code
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 69d77d8a8..9b65f72c3 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -1307,7 +1307,7 @@ gnc_gen_trans_view_popup_menu (GtkTreeView *treeview,
GtkWidget *menu, *menuitem;
GtkTreeModel *model;
GtkTreeSelection *selection;
- GList *selected_rows;
+ GList *selected_rows, *row_info_list;
const char *desc = NULL, *memo = NULL, *notes = NULL;
gboolean has_edits = FALSE;
@@ -1326,39 +1326,43 @@ gnc_gen_trans_view_popup_menu (GtkTreeView *treeview,
model = gtk_tree_view_get_model (treeview);
selection = gtk_tree_view_get_selection (treeview);
selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
+ row_info_list = gnc_g_list_map (selected_rows, (GncGMapFunc) row_get_info, info);
+
+ if (row_info_list) /* should never be NULL. collect from first row. */
+ {
+ RowInfo* first_rowinfo = row_info_list->data;
+ desc = xaccTransGetDescription (first_rowinfo->trans);
+ notes = xaccTransGetNotes (first_rowinfo->trans);
+ memo = xaccSplitGetMemo (first_rowinfo->split);
+ }
/* initialise */
info->edit_desc = TRUE;
info->edit_notes = TRUE;
info->edit_memo = TRUE;
- for (GList *n = selected_rows;
- (!has_edits || info->edit_desc || info->edit_notes || info->edit_memo) && n;
- n = g_list_next(n))
+ /* determine whether to enable editing fields (if all rows have
+ same field string) and resetting fields (if any row differs from
+ imported data) */
+ for (GList *n = row_info_list; n; n = g_list_next(n))
{
- RowInfo *rowinfo = row_get_info (n->data, info);
-
+ RowInfo *rowinfo = n->data;
if (!has_edits &&
(g_strcmp0 (xaccSplitGetMemo (rowinfo->split), rowinfo->orig_memo) ||
g_strcmp0 (xaccTransGetNotes (rowinfo->trans), rowinfo->orig_notes) ||
g_strcmp0 (xaccTransGetDescription (rowinfo->trans), rowinfo->orig_desc)))
has_edits = TRUE;
- if (!n->prev) /* only the first row */
- {
- desc = xaccTransGetDescription (rowinfo->trans);
- notes = xaccTransGetNotes (rowinfo->trans);
- memo = xaccSplitGetMemo (rowinfo->split);
- rowinfo_free (rowinfo);
- continue;
- }
if (info->edit_desc && g_strcmp0 (desc, xaccTransGetDescription (rowinfo->trans)))
info->edit_desc = FALSE;
if (info->edit_notes && g_strcmp0 (notes, xaccTransGetNotes (rowinfo->trans)))
info->edit_notes = FALSE;
if (info->edit_memo && g_strcmp0 (memo, xaccSplitGetMemo (rowinfo->split)))
info->edit_memo = FALSE;
- rowinfo_free (rowinfo);
+
+ /* all flags were switched. no need to scan remaining rows. */
+ if (has_edits && !info->edit_desc && !info->edit_notes && !info->edit_memo)
+ break;
}
/* Translators: Menu entry, no full stop */
@@ -1384,6 +1388,7 @@ gnc_gen_trans_view_popup_menu (GtkTreeView *treeview,
/* Note: event can be NULL here when called from view_onPopupMenu; */
gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent*)event);
+ g_list_free_full (row_info_list, (GDestroyNotify)rowinfo_free);
g_list_free_full (selected_rows, (GDestroyNotify)gtk_tree_path_free);
LEAVE ("");
}
commit 688832b5f82734fd0c28c8bdc828f25774b177a0
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 30 16:45:13 2022 -0700
Bug 798585 - segfault running sample script
The root cause of which is that on recent releases of GLib (recent
meaning 2.66 in the current Debian stable!) g_type_instance_get_private
looks in the wrong place for the private data. When running the script
in question it returned NULL and since the code didn't check for a valid
pointer, it crashed.
So this change replaces all calls to g_type_instance_get_private with
the function [type_prefix]_get_instance_private() added in glib-2.36
except for two register2 files that have been removed from master; those
are ignored to avoid unnecessary merge conflicts.
diff --git a/bindings/python/example_scripts/simple_business_create.py b/bindings/python/example_scripts/simple_business_create.py
index e0df30bb8..029a4f530 100644
--- a/bindings/python/example_scripts/simple_business_create.py
+++ b/bindings/python/example_scripts/simple_business_create.py
@@ -171,7 +171,7 @@ try:
invoice_customer.ApplyPayment(None, a6, GncNumeric(7,100),
GncNumeric(1), datetime.date.today(), "", "")
- vendor_bill_returns = book.BillLoookupByID("7")
+ vendor_bill_returns = book.BillLookupByID("7")
assert( vendor_bill_returns.GetID() == "7" )
vendor_extract = vendor_bill_returns.GetOwner()
assert( vendor_extract.GetName() == new_vendor.GetName() )
diff --git a/gnucash/gnome-search/gnc-general-search.c b/gnucash/gnome-search/gnc-general-search.c
index 0f1bc37c3..f4aed242f 100644
--- a/gnucash/gnome-search/gnc-general-search.c
+++ b/gnucash/gnome-search/gnc-general-search.c
@@ -78,7 +78,7 @@ struct _GNCGeneralSearchPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCGeneralSearch, gnc_general_search, GTK_TYPE_BOX)
#define _PRIVATE(o) \
- ((GNCGeneralSearchPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_GENERAL_SEARCH))
+ ((GNCGeneralSearchPrivate*)gnc_general_search_get_instance_private((GNCGeneralSearch*)o))
static GtkBoxClass *parent_class;
static guint general_search_signals[LAST_SIGNAL];
diff --git a/gnucash/gnome-search/search-account.c b/gnucash/gnome-search/search-account.c
index de41c7676..ecd1d803e 100644
--- a/gnucash/gnome-search/search-account.c
+++ b/gnucash/gnome-search/search-account.c
@@ -61,7 +61,7 @@ struct _GNCSearchAccountPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchAccount, gnc_search_account, GNC_TYPE_SEARCH_CORE_TYPE)
#define _PRIVATE(o) \
- ((GNCSearchAccountPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_ACCOUNT))
+ ((GNCSearchAccountPrivate*)gnc_search_account_get_instance_private((GNCSearchAccount*)o))
static GNCSearchCoreTypeClass *parent_class;
diff --git a/gnucash/gnome-search/search-boolean.c b/gnucash/gnome-search/search-boolean.c
index ddbb85aa1..496a36d15 100644
--- a/gnucash/gnome-search/search-boolean.c
+++ b/gnucash/gnome-search/search-boolean.c
@@ -56,7 +56,7 @@ struct _GNCSearchBooleanPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchBoolean, gnc_search_boolean, GNC_TYPE_SEARCH_CORE_TYPE)
#define _PRIVATE(o) \
- ((GNCSearchBooleanPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_BOOLEAN))
+ ((GNCSearchBooleanPrivate*)gnc_search_boolean_get_instance_private((GNCSearchBoolean*)o))
static GNCSearchCoreTypeClass *parent_class;
diff --git a/gnucash/gnome-search/search-core-type.c b/gnucash/gnome-search/search-core-type.c
index f3bfa5ae7..7d7ff3842 100644
--- a/gnucash/gnome-search/search-core-type.c
+++ b/gnucash/gnome-search/search-core-type.c
@@ -58,7 +58,7 @@ struct _GNCSearchCoreTypePrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchCoreType, gnc_search_core_type, G_TYPE_OBJECT)
#define _PRIVATE(o) \
- ((GNCSearchCoreTypePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_CORE_TYPE))
+ ((GNCSearchCoreTypePrivate*)gnc_search_core_type_get_instance_private((GNCSearchCoreType*)o))
static GObjectClass *parent_class;
diff --git a/gnucash/gnome-search/search-date.c b/gnucash/gnome-search/search-date.c
index 7c55f0f11..7649f7e35 100644
--- a/gnucash/gnome-search/search-date.c
+++ b/gnucash/gnome-search/search-date.c
@@ -60,7 +60,7 @@ struct _GNCSearchDatePrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchDate, gnc_search_date, GNC_TYPE_SEARCH_CORE_TYPE)
#define _PRIVATE(o) \
- ((GNCSearchDatePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_DATE))
+ ((GNCSearchDatePrivate*)gnc_search_date_get_instance_private((GNCSearchDate*)o))
static GNCSearchCoreTypeClass *parent_class;
diff --git a/gnucash/gnome-search/search-double.c b/gnucash/gnome-search/search-double.c
index 9131ef0f1..991be23a1 100644
--- a/gnucash/gnome-search/search-double.c
+++ b/gnucash/gnome-search/search-double.c
@@ -61,7 +61,7 @@ struct _GNCSearchDoublePrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchDouble, gnc_search_double, GNC_TYPE_SEARCH_CORE_TYPE)
#define _PRIVATE(o) \
- ((GNCSearchDoublePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_DOUBLE))
+ ((GNCSearchDoublePrivate*)gnc_search_double_get_instance_private((GNCSearchDouble*)o))
static GNCSearchCoreTypeClass *parent_class;
diff --git a/gnucash/gnome-search/search-int64.c b/gnucash/gnome-search/search-int64.c
index 754e10449..6c129efd8 100644
--- a/gnucash/gnome-search/search-int64.c
+++ b/gnucash/gnome-search/search-int64.c
@@ -62,7 +62,7 @@ struct _GNCSearchInt64Private
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchInt64, gnc_search_int64, GNC_TYPE_SEARCH_CORE_TYPE)
#define _PRIVATE(o) \
- ((GNCSearchInt64Private*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_INT64))
+ ((GNCSearchInt64Private*)gnc_search_int64_get_instance_private((GNCSearchInt64*)o))
static GNCSearchCoreTypeClass *parent_class;
diff --git a/gnucash/gnome-search/search-numeric.c b/gnucash/gnome-search/search-numeric.c
index f82988721..6b2a6d2d4 100644
--- a/gnucash/gnome-search/search-numeric.c
+++ b/gnucash/gnome-search/search-numeric.c
@@ -62,7 +62,7 @@ struct _GNCSearchNumericPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchNumeric, gnc_search_numeric, GNC_TYPE_SEARCH_CORE_TYPE)
#define _PRIVATE(o) \
- ((GNCSearchNumericPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_NUMERIC))
+ ((GNCSearchNumericPrivate*)gnc_search_numeric_get_instance_private((GNCSearchNumeric*)o))
static GNCSearchCoreTypeClass *parent_class;
diff --git a/gnucash/gnome-search/search-reconciled.c b/gnucash/gnome-search/search-reconciled.c
index 46dcc4b05..06599aa46 100644
--- a/gnucash/gnome-search/search-reconciled.c
+++ b/gnucash/gnome-search/search-reconciled.c
@@ -58,7 +58,7 @@ struct _GNCSearchReconciledPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchReconciled, gnc_search_reconciled, GNC_TYPE_SEARCH_CORE_TYPE)
#define _PRIVATE(o) \
- ((GNCSearchReconciledPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_RECONCILED))
+ ((GNCSearchReconciledPrivate*)gnc_search_reconciled_get_instance_private((GNCSearchReconciled*)o))
static GNCSearchCoreTypeClass *parent_class;
diff --git a/gnucash/gnome-search/search-string.c b/gnucash/gnome-search/search-string.c
index 94f77fbed..c54513ab0 100644
--- a/gnucash/gnome-search/search-string.c
+++ b/gnucash/gnome-search/search-string.c
@@ -60,7 +60,7 @@ struct _GNCSearchStringPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchString, gnc_search_string, GNC_TYPE_SEARCH_CORE_TYPE)
#define _PRIVATE(o) \
- ((GNCSearchStringPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_STRING))
+ ((GNCSearchStringPrivate*)gnc_search_string_get_instance_private((GNCSearchString*)o))
static GNCSearchCoreTypeClass *parent_class;
diff --git a/gnucash/gnome-utils/gnc-currency-edit.c b/gnucash/gnome-utils/gnc-currency-edit.c
index 9261cca5a..b2eacb92c 100644
--- a/gnucash/gnome-utils/gnc-currency-edit.c
+++ b/gnucash/gnome-utils/gnc-currency-edit.c
@@ -93,7 +93,7 @@ typedef struct _GNCCurrencyEditPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCCurrencyEdit, gnc_currency_edit, GTK_TYPE_COMBO_BOX)
#define GET_PRIVATE(o) \
- ((GNCCurrencyEditPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_CURRENCY_EDIT))
+ ((GNCCurrencyEditPrivate*)gnc_currency_edit_get_instance_private((GNCCurrencyEdit*)o))
/** @name Basic Object Implementation */
/** @{ */
diff --git a/gnucash/gnome-utils/gnc-date-format.c b/gnucash/gnome-utils/gnc-date-format.c
index 6bb01dc82..c6dc37f6a 100644
--- a/gnucash/gnome-utils/gnc-date-format.c
+++ b/gnucash/gnome-utils/gnc-date-format.c
@@ -77,7 +77,7 @@ struct _GNCDateFormatPrivate
};
#define GNC_DATE_FORMAT_GET_PRIVATE(o) \
- ((GNCDateFormatPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_DATE_FORMAT))
+ ((GNCDateFormatPrivate*)gnc_date_format_get_instance_private((GNCDateFormat*)o))
static guint date_format_signals [LAST_SIGNAL] = { 0 };
diff --git a/gnucash/gnome-utils/gnc-embedded-window.c b/gnucash/gnome-utils/gnc-embedded-window.c
index 1e57cbb2e..e0855f6f5 100644
--- a/gnucash/gnome-utils/gnc-embedded-window.c
+++ b/gnucash/gnome-utils/gnc-embedded-window.c
@@ -98,7 +98,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncEmbeddedWindow, gnc_embedded_window, GTK_TYPE_BOX,
gnc_window_embedded_window_init))
#define GNC_EMBEDDED_WINDOW_GET_PRIVATE(o) \
- ((GncEmbeddedWindowPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_EMBEDDED_WINDOW))
+ ((GncEmbeddedWindowPrivate*)gnc_embedded_window_get_instance_private((GncEmbeddedWindow*)o))
/** A holding place for all the signals generated by the embedded window
* code. */
diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
index 165a3393d..91261d767 100644
--- a/gnucash/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -247,7 +247,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncMainWindow, gnc_main_window, GTK_TYPE_WINDOW,
gnc_window_main_window_init))
#define GNC_MAIN_WINDOW_GET_PRIVATE(o) \
- ((GncMainWindowPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_MAIN_WINDOW))
+ ((GncMainWindowPrivate*)gnc_main_window_get_instance_private((GncMainWindow*)o))
/** This data structure maintains information about one action groups
* that has been installed in this window. */
diff --git a/gnucash/gnome-utils/gnc-period-select.c b/gnucash/gnome-utils/gnc-period-select.c
index b1d5c9306..3d8e03671 100644
--- a/gnucash/gnome-utils/gnc-period-select.c
+++ b/gnucash/gnome-utils/gnc-period-select.c
@@ -111,8 +111,10 @@ struct _GncPeriodSelectPrivate
GtkWidget *date_label;
};
+G_DEFINE_TYPE_WITH_PRIVATE(GncPeriodSelect, gnc_period_select, GTK_TYPE_BOX)
+
#define GNC_PERIOD_SELECT_GET_PRIVATE(o) \
- ((GncPeriodSelectPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PERIOD_SELECT))
+ ((GncPeriodSelectPrivate*)gnc_period_select_get_instance_private((GncPeriodSelect*)o))
/************************************************************/
@@ -560,8 +562,6 @@ gnc_period_select_class_init (GncPeriodSelectClass *klass)
G_PARAM_READWRITE));
}
-G_DEFINE_TYPE_WITH_PRIVATE(GncPeriodSelect, gnc_period_select, GTK_TYPE_BOX)
-
/** Initialize a new instance of a gnucash accounting period selection
* widget. This function allocates and initializes the object
* private storage space.
diff --git a/gnucash/gnome-utils/gnc-plugin-file-history.c b/gnucash/gnome-utils/gnc-plugin-file-history.c
index b7ad7cec3..00664a16d 100644
--- a/gnucash/gnome-utils/gnc-plugin-file-history.c
+++ b/gnucash/gnome-utils/gnc-plugin-file-history.c
@@ -106,7 +106,7 @@ typedef struct GncPluginFileHistoryPrivate
#define GNC_PLUGIN_FILE_HISTORY_GET_PRIVATE(o) \
- ((GncPluginFileHistoryPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_FILE_HISTORY))
+ ((GncPluginFileHistoryPrivate*)gnc_plugin_file_history_get_instance_private((GncPluginFileHistory*)o))
/************************************************************
* Other Functions *
diff --git a/gnucash/gnome-utils/gnc-plugin-manager.c b/gnucash/gnome-utils/gnc-plugin-manager.c
index b33730345..7c3b2dd82 100644
--- a/gnucash/gnome-utils/gnc-plugin-manager.c
+++ b/gnucash/gnome-utils/gnc-plugin-manager.c
@@ -44,8 +44,10 @@ typedef struct GncPluginManagerPrivate
GHashTable *plugins_table;
} GncPluginManagerPrivate;
+G_DEFINE_TYPE_WITH_PRIVATE(GncPluginManager, gnc_plugin_manager, G_TYPE_OBJECT)
+
#define GNC_PLUGIN_MANAGER_GET_PRIVATE(o) \
- ((GncPluginManagerPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_MANAGER))
+ ((GncPluginManagerPrivate*)gnc_plugin_manager_get_instance_private((GncPluginManager*)o))
enum
{
@@ -151,8 +153,6 @@ gnc_plugin_manager_get_plugin (GncPluginManager *manager,
return GNC_PLUGIN (g_hash_table_lookup (priv->plugins_table, name));
}
-G_DEFINE_TYPE_WITH_PRIVATE(GncPluginManager, gnc_plugin_manager, G_TYPE_OBJECT)
-
static void
gnc_plugin_manager_class_init (GncPluginManagerClass *klass)
{
diff --git a/gnucash/gnome-utils/gnc-plugin-menu-additions.c b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
index 8114d0598..757348448 100644
--- a/gnucash/gnome-utils/gnc-plugin-menu-additions.c
+++ b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
@@ -69,7 +69,7 @@ typedef struct GncPluginMenuAdditionsPrivate
} GncPluginMenuAdditionsPrivate;
#define GNC_PLUGIN_MENU_ADDITIONS_GET_PRIVATE(o) \
- ((GncPluginMenuAdditionsPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_MENU_ADDITIONS))
+ ((GncPluginMenuAdditionsPrivate*)gnc_plugin_menu_additions_get_instance_private((GncPluginMenuAdditions*)o))
/** Per-window private data for this plugin. This plugin is unique in
diff --git a/gnucash/gnome-utils/gnc-plugin-page.c b/gnucash/gnome-utils/gnc-plugin-page.c
index f72a5b5e1..dec6e88f0 100644
--- a/gnucash/gnome-utils/gnc-plugin-page.c
+++ b/gnucash/gnome-utils/gnc-plugin-page.c
@@ -115,7 +115,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncPluginPage, gnc_plugin_page, G_TYPE_OBJECT,
G_ADD_PRIVATE(GncPluginPage))
#define GNC_PLUGIN_PAGE_GET_PRIVATE(o) \
- ((GncPluginPagePrivate*)g_type_instance_get_private ((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE))
+ ((GncPluginPagePrivate*)gnc_plugin_page_get_instance_private((GncPluginPage*)o))
/* Create the display widget that corresponds to this plugin. This
* function will be called by the main/embedded window manipulation
diff --git a/gnucash/gnome-utils/gnc-plugin.c b/gnucash/gnome-utils/gnc-plugin.c
index 217256515..73c487fbc 100644
--- a/gnucash/gnome-utils/gnc-plugin.c
+++ b/gnucash/gnome-utils/gnc-plugin.c
@@ -65,7 +65,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncPlugin, gnc_plugin, G_TYPE_OBJECT,
G_ADD_PRIVATE(GncPlugin))
#define GNC_PLUGIN_GET_PRIVATE(o) \
- ((GncPluginPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN))
+ ((GncPluginPrivate*)gnc_plugin_get_instance_private((GncPlugin*)o))
/** Initialize the class for the new gnucash plugin object. This will
* set up any function pointers that override functions in the parent
diff --git a/gnucash/gnome-utils/gnc-query-view.c b/gnucash/gnome-utils/gnc-query-view.c
index 9dfcfd358..e6d5879b3 100644
--- a/gnucash/gnome-utils/gnc-query-view.c
+++ b/gnucash/gnome-utils/gnc-query-view.c
@@ -52,8 +52,10 @@ struct _GNCQueryViewPrivate
gint component_id;
};
+G_DEFINE_TYPE_WITH_PRIVATE(GNCQueryView, gnc_query_view, GTK_TYPE_TREE_VIEW)
+
#define GNC_QUERY_VIEW_GET_PRIVATE(o) \
- ((GNCQueryViewPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_QUERY_VIEW))
+ ((GNCQueryViewPrivate*)gnc_query_view_get_instance_private((GNCQueryView*)o))
/** Static Globals ****************************************************/
static GtkTreeViewClass *parent_class = NULL;
@@ -185,8 +187,6 @@ gnc_query_view_refresh_handler (GHashTable *changes, gpointer user_data)
gnc_query_view_set_query_sort (qview, TRUE);
}
-G_DEFINE_TYPE_WITH_PRIVATE(GNCQueryView, gnc_query_view, GTK_TYPE_TREE_VIEW)
-
static void
gnc_query_view_init (GNCQueryView *qview)
{
diff --git a/gnucash/gnome-utils/gnc-tree-model-account-types.c b/gnucash/gnome-utils/gnc-tree-model-account-types.c
index 6932c8c72..e5f50cd1c 100644
--- a/gnucash/gnome-utils/gnc-tree-model-account-types.c
+++ b/gnucash/gnome-utils/gnc-tree-model-account-types.c
@@ -56,7 +56,7 @@ typedef struct GncTreeModelAccountTypesPrivate
} GncTreeModelAccountTypesPrivate;
#define GNC_TREE_MODEL_ACCOUNT_TYPES_GET_PRIVATE(o) \
- ((GncTreeModelAccountTypesPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_ACCOUNT_TYPES))
+ ((GncTreeModelAccountTypesPrivate*)gnc_tree_model_account_types_get_instance_private((GncTreeModelAccountTypes*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome-utils/gnc-tree-model-account.c b/gnucash/gnome-utils/gnc-tree-model-account.c
index e04eac9ad..5d5d74aec 100644
--- a/gnucash/gnome-utils/gnc-tree-model-account.c
+++ b/gnucash/gnome-utils/gnc-tree-model-account.c
@@ -103,8 +103,14 @@ typedef struct GncTreeModelAccountPrivate
} GncTreeModelAccountPrivate;
+G_DEFINE_TYPE_WITH_CODE (GncTreeModelAccount,
+ gnc_tree_model_account, GNC_TYPE_TREE_MODEL,
+ G_ADD_PRIVATE (GncTreeModelAccount)
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+ gnc_tree_model_account_tree_model_init))
+
#define GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(o) \
- ((GncTreeModelAccountPrivate*)g_type_instance_get_private ((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_ACCOUNT))
+ ((GncTreeModelAccountPrivate*)gnc_tree_model_account_get_instance_private((GncTreeModelAccount*)o))
/************************************************************/
@@ -152,11 +158,6 @@ gnc_tree_model_account_update_color (gpointer gsettings, gchar *key, gpointer us
/** A pointer to the parent class of an account tree model. */
static GObjectClass *parent_class = NULL;
-G_DEFINE_TYPE_WITH_CODE (GncTreeModelAccount, gnc_tree_model_account, GNC_TYPE_TREE_MODEL,
- G_ADD_PRIVATE (GncTreeModelAccount)
- G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
- gnc_tree_model_account_tree_model_init))
-
static void
gnc_tree_model_account_class_init (GncTreeModelAccountClass *klass)
{
diff --git a/gnucash/gnome-utils/gnc-tree-model-commodity.c b/gnucash/gnome-utils/gnc-tree-model-commodity.c
index cdb6e297d..29e1ce9f4 100644
--- a/gnucash/gnome-utils/gnc-tree-model-commodity.c
+++ b/gnucash/gnome-utils/gnc-tree-model-commodity.c
@@ -102,7 +102,7 @@ typedef struct GncTreeModelCommodityPrivate
} GncTreeModelCommodityPrivate;
#define GNC_TREE_MODEL_COMMODITY_GET_PRIVATE(o) \
- ((GncTreeModelCommodityPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_COMMODITY))
+ ((GncTreeModelCommodityPrivate*)gnc_tree_model_commodity_get_instance_private((GncTreeModelCommodity*)o))
/** A pointer to the parent class of a commodity tree model. */
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome-utils/gnc-tree-model-owner.c b/gnucash/gnome-utils/gnc-tree-model-owner.c
index 620642fc7..5075a69b0 100644
--- a/gnucash/gnome-utils/gnc-tree-model-owner.c
+++ b/gnucash/gnome-utils/gnc-tree-model-owner.c
@@ -98,8 +98,14 @@ typedef struct GncTreeModelOwnerPrivate
const gchar *negative_color;
} GncTreeModelOwnerPrivate;
+G_DEFINE_TYPE_WITH_CODE(GncTreeModelOwner, gnc_tree_model_owner,
+ GNC_TYPE_TREE_MODEL,
+ G_ADD_PRIVATE(GncTreeModelOwner)
+ G_IMPLEMENT_INTERFACE(GTK_TYPE_TREE_MODEL,
+ gnc_tree_model_owner_tree_model_init))
+
#define GNC_TREE_MODEL_OWNER_GET_PRIVATE(o) \
- ((GncTreeModelOwnerPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_OWNER))
+ ((GncTreeModelOwnerPrivate*)gnc_tree_model_owner_get_instance_private((GncTreeModelOwner*)o))
/************************************************************/
@@ -146,11 +152,6 @@ gnc_tree_model_owner_class_init (GncTreeModelOwnerClass *klass)
o_class->dispose = gnc_tree_model_owner_dispose;
}
-G_DEFINE_TYPE_WITH_CODE(GncTreeModelOwner, gnc_tree_model_owner, GNC_TYPE_TREE_MODEL,
- G_ADD_PRIVATE(GncTreeModelOwner)
- G_IMPLEMENT_INTERFACE(GTK_TYPE_TREE_MODEL,
- gnc_tree_model_owner_tree_model_init))
-
static void
gnc_tree_model_owner_init (GncTreeModelOwner *model)
{
diff --git a/gnucash/gnome-utils/gnc-tree-model-price.c b/gnucash/gnome-utils/gnc-tree-model-price.c
index bca5f3067..3c2e3276c 100644
--- a/gnucash/gnome-utils/gnc-tree-model-price.c
+++ b/gnucash/gnome-utils/gnc-tree-model-price.c
@@ -132,7 +132,7 @@ typedef struct GncTreeModelPricePrivate
} GncTreeModelPricePrivate;
#define GNC_TREE_MODEL_PRICE_GET_PRIVATE(o) \
- ((GncTreeModelPricePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_PRICE))
+ ((GncTreeModelPricePrivate*)gnc_tree_model_price_get_instance_private((GncTreeModelPrice*)o))
/** A pointer to the parent class of a price tree model. */
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome-utils/gnc-tree-model-selection.c b/gnucash/gnome-utils/gnc-tree-model-selection.c
index d6734d440..98b9e2259 100644
--- a/gnucash/gnome-utils/gnc-tree-model-selection.c
+++ b/gnucash/gnome-utils/gnc-tree-model-selection.c
@@ -97,7 +97,7 @@ typedef struct GncTreeModelSelectionPrivate
} GncTreeModelSelectionPrivate;
#define GNC_TREE_MODEL_SELECTION_GET_PRIVATE(o) \
- ((GncTreeModelSelectionPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_SELECTION))
+ ((GncTreeModelSelectionPrivate*)gnc_tree_model_selection_get_instance_private((GncTreeModelSelection*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome-utils/gnc-tree-model-split-reg.c b/gnucash/gnome-utils/gnc-tree-model-split-reg.c
index 943a43c9c..c333b48b0 100644
--- a/gnucash/gnome-utils/gnc-tree-model-split-reg.c
+++ b/gnucash/gnome-utils/gnc-tree-model-split-reg.c
@@ -220,7 +220,7 @@ gtm_sr_make_iter (GncTreeModelSplitReg *model, gint f, GList *tnode, GList *snod
#define GNC_TREE_MODEL_SPLIT_REG_GET_PRIVATE(o) \
- ((GncTreeModelSplitRegPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_SPLIT_REG))
+ ((GncTreeModelSplitRegPrivate*)gnc_tree_model_split_reg_get_instance_private((GncTreeModelSplitReg*)o))
/************************************************************/
/* g_object required functions */
diff --git a/gnucash/gnome-utils/gnc-tree-model.c b/gnucash/gnome-utils/gnc-tree-model.c
index 645d1efaa..5ec81fbe0 100644
--- a/gnucash/gnome-utils/gnc-tree-model.c
+++ b/gnucash/gnome-utils/gnc-tree-model.c
@@ -51,7 +51,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncTreeModel, gnc_tree_model, G_TYPE_OBJECT,
G_ADD_PRIVATE(GncTreeModel))
#define GNC_TREE_MODEL_GET_PRIVATE(o) \
- ((GncTreeModelPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL))
+ ((GncTreeModelPrivate*)gnc_tree_model_get_instance_private((GncTreeModel*)o))
/************************************************************/
diff --git a/gnucash/gnome-utils/gnc-tree-view-account.c b/gnucash/gnome-utils/gnc-tree-view-account.c
index 03425bf05..b5b106f78 100644
--- a/gnucash/gnome-utils/gnc-tree-view-account.c
+++ b/gnucash/gnome-utils/gnc-tree-view-account.c
@@ -115,7 +115,7 @@ typedef struct GncTreeViewAccountPrivate
} GncTreeViewAccountPrivate;
#define GNC_TREE_VIEW_ACCOUNT_GET_PRIVATE(o) \
- ((GncTreeViewAccountPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_ACCOUNT))
+ ((GncTreeViewAccountPrivate*)gnc_tree_view_account_get_instance_private((GncTreeViewAccount*)o))
/************************************************************/
diff --git a/gnucash/gnome-utils/gnc-tree-view-commodity.c b/gnucash/gnome-utils/gnc-tree-view-commodity.c
index 83f06b2ed..fc011381d 100644
--- a/gnucash/gnome-utils/gnc-tree-view-commodity.c
+++ b/gnucash/gnome-utils/gnc-tree-view-commodity.c
@@ -58,7 +58,7 @@ typedef struct GncTreeViewCommodityPrivate
} GncTreeViewCommodityPrivate;
#define GNC_TREE_VIEW_COMMODITY_GET_PRIVATE(o) \
- ((GncTreeViewCommodityPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_COMMODITY))
+ ((GncTreeViewCommodityPrivate*)gnc_tree_view_commodity_get_instance_private(GncTreeViewCommodity*)o))
/************************************************************/
diff --git a/gnucash/gnome-utils/gnc-tree-view-owner.c b/gnucash/gnome-utils/gnc-tree-view-owner.c
index 6baab177b..8ef9430e5 100644
--- a/gnucash/gnome-utils/gnc-tree-view-owner.c
+++ b/gnucash/gnome-utils/gnc-tree-view-owner.c
@@ -87,7 +87,7 @@ typedef struct GncTreeViewOwnerPrivate
} GncTreeViewOwnerPrivate;
#define GNC_TREE_VIEW_OWNER_GET_PRIVATE(o) \
- ((GncTreeViewOwnerPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_OWNER))
+ ((GncTreeViewOwnerPrivate*)gnc_tree_view_owner_get_instance_private((GncTreeViewOwner*)o))
/************************************************************/
diff --git a/gnucash/gnome-utils/gnc-tree-view-price.c b/gnucash/gnome-utils/gnc-tree-view-price.c
index 06248213b..77a42457e 100644
--- a/gnucash/gnome-utils/gnc-tree-view-price.c
+++ b/gnucash/gnome-utils/gnc-tree-view-price.c
@@ -58,7 +58,7 @@ typedef struct GncTreeViewPricePrivate
} GncTreeViewPricePrivate;
#define GNC_TREE_VIEW_PRICE_GET_PRIVATE(o) \
- ((GncTreeViewPricePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_PRICE))
+ ((GncTreeViewPricePrivate*)gnc_tree_view_price_get_instance_private((GncTreeViewPrice*)o))
/************************************************************/
diff --git a/gnucash/gnome-utils/gnc-tree-view-split-reg.c b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
index bc8cd7a8c..87c0a757f 100644
--- a/gnucash/gnome-utils/gnc-tree-view-split-reg.c
+++ b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
@@ -301,7 +301,7 @@ struct GncTreeViewSplitRegPrivate
#define SHOW_SYMBOL FALSE
#define GNC_TREE_VIEW_SPLIT_REG_GET_PRIVATE(o) \
- ((GncTreeViewSplitRegPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_SPLIT_REG))
+ ((GncTreeViewSplitRegPrivate*)gnc_tree_view_split_reg_get_instance_private((GncTreeViewSplitReg*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome-utils/gnc-tree-view-sx-list.c b/gnucash/gnome-utils/gnc-tree-view-sx-list.c
index 2bbe16476..a48065e5b 100644
--- a/gnucash/gnome-utils/gnc-tree-view-sx-list.c
+++ b/gnucash/gnome-utils/gnc-tree-view-sx-list.c
@@ -59,7 +59,7 @@ typedef struct GncTreeViewSxListPrivate
} GncTreeViewSxListPrivate;
#define GNC_TREE_VIEW_SX_LIST_GET_PRIVATE(o) \
- ((GncTreeViewSxListPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_SX_LIST))
+ ((GncTreeViewSxListPrivate*)gnc_tree_view_sx_list_get_instance_private((GncTreeViewSxList*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome-utils/gnc-tree-view.c b/gnucash/gnome-utils/gnc-tree-view.c
index 0de60f806..201d770e2 100644
--- a/gnucash/gnome-utils/gnc-tree-view.c
+++ b/gnucash/gnome-utils/gnc-tree-view.c
@@ -132,7 +132,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncTreeView, gnc_tree_view, GTK_TYPE_TREE_VIEW,
G_ADD_PRIVATE(GncTreeView))
#define GNC_TREE_VIEW_GET_PRIVATE(o) \
- ((GncTreeViewPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW))
+ ((GncTreeViewPrivate*)gnc_tree_view_get_instance_private((GncTreeView*)o))
/************************************************************/
diff --git a/gnucash/gnome-utils/search-param.c b/gnucash/gnome-utils/search-param.c
index 18f54e23c..4524774ff 100644
--- a/gnucash/gnome-utils/search-param.c
+++ b/gnucash/gnome-utils/search-param.c
@@ -53,7 +53,7 @@ struct _GNCSearchParamPrivate
};
#define GNC_SEARCH_PARAM_GET_PRIVATE(o) \
- ((GNCSearchParamPrivate*)g_type_instance_get_private ((GTypeInstance*)o, GNC_TYPE_SEARCH_PARAM))
+ ((GNCSearchParamPrivate*)gnc_search_param_get_instance_private ((GNCSearchParam*)o))
typedef struct _GNCSearchParamSimplePrivate GNCSearchParamSimplePrivate;
@@ -67,7 +67,7 @@ struct _GNCSearchParamSimplePrivate
};
#define GNC_SEARCH_PARAM_SIMPLE_GET_PRIVATE(o) \
- ((GNCSearchParamSimplePrivate*)g_type_instance_get_private ((GTypeInstance*)o, GNC_TYPE_SEARCH_PARAM_SIMPLE))
+ ((GNCSearchParamSimplePrivate*)gnc_search_param_simple_get_instance_private ((GNCSearchParamSimple*)o))
typedef struct _GNCSearchParamCompoundPrivate GNCSearchParamCompoundPrivate;
@@ -80,7 +80,7 @@ struct _GNCSearchParamCompoundPrivate
};
#define GNC_SEARCH_PARAM_COMPOUND_GET_PRIVATE(o) \
- ((GNCSearchParamCompoundPrivate*)g_type_instance_get_private ((GTypeInstance*)o, GNC_TYPE_SEARCH_PARAM_COMPOUND))
+ ((GNCSearchParamCompoundPrivate*)gnc_search_param_compound_get_instance_private ((GNCSearchParamCompound*)o))
static GObjectClass *parent_gobject_class;
static GNCSearchParamClass *parent_search_param_class;
diff --git a/gnucash/gnome/gnc-budget-view.c b/gnucash/gnome/gnc-budget-view.c
index d2bc001ff..26facbe9d 100644
--- a/gnucash/gnome/gnc-budget-view.c
+++ b/gnucash/gnome/gnc-budget-view.c
@@ -178,7 +178,7 @@ struct GncBudgetViewPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncBudgetView, gnc_budget_view, GTK_TYPE_BOX)
#define GNC_BUDGET_VIEW_GET_PRIVATE(o) \
- ((GncBudgetViewPrivate*)g_type_instance_get_private ((GTypeInstance*)o, GNC_TYPE_BUDGET_VIEW))
+ ((GncBudgetViewPrivate*)gnc_budget_view_get_instance_private((GncBudgetView*)o))
/** \brief Create new gnc budget view.
diff --git a/gnucash/gnome/gnc-plugin-account-tree.c b/gnucash/gnome/gnc-plugin-account-tree.c
index fec9c2f4c..049f4e72e 100644
--- a/gnucash/gnome/gnc-plugin-account-tree.c
+++ b/gnucash/gnome/gnc-plugin-account-tree.c
@@ -74,7 +74,7 @@ typedef struct GncPluginAccountTreePrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginAccountTree, gnc_plugin_account_tree, GNC_TYPE_PLUGIN)
#define GNC_PLUGIN_ACCOUNT_TREE_GET_PRIVATE(o) \
- ((GncPluginAccountTreePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_ACCOUNT_TREE))
+ ((GncPluginAccountTreePrivate*)gnc_plugin_account_tree_get_instance_private((GncPluginAccountTree*)o))
/** A pointer to the parent class of a plugin page. */
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c
index 297880841..1f4b83a65 100644
--- a/gnucash/gnome/gnc-plugin-basic-commands.c
+++ b/gnucash/gnome/gnc-plugin-basic-commands.c
@@ -278,7 +278,7 @@ typedef struct GncPluginBasicCommandsPrivate
} GncPluginBasicCommandsPrivate;
#define GNC_PLUGIN_BASIC_COMMANDS_GET_PRIVATE(o) \
- ((GncPluginBasicCommandsPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_BASIC_COMMANDS))
+ ((GncPluginBasicCommandsPrivate*)gnc_plugin_basic_commands_get_instance_private((GncPluginBasicCommands*)o))
/** A pointer to the parent class of a plugin page. */
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome/gnc-plugin-budget.c b/gnucash/gnome/gnc-plugin-budget.c
index a186a0406..55848e2b9 100644
--- a/gnucash/gnome/gnc-plugin-budget.c
+++ b/gnucash/gnome/gnc-plugin-budget.c
@@ -101,7 +101,7 @@ typedef struct GncPluginBudgetPrivate
} GncPluginBudgetPrivate;
#define GNC_PLUGIN_BUDGET_GET_PRIVATE(o) \
- ((GncPluginBudgetPrivate*)g_type_instance_get_private ((GTypeInstance*)o, GNC_TYPE_PLUGIN_BUDGET))
+ ((GncPluginBudgetPrivate*)gnc_plugin_budget_get_instance_private((GncPluginBudget*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome/gnc-plugin-business.c b/gnucash/gnome/gnc-plugin-business.c
index 5497eff32..06d0ecf24 100644
--- a/gnucash/gnome/gnc-plugin-business.c
+++ b/gnucash/gnome/gnc-plugin-business.c
@@ -348,7 +348,7 @@ typedef struct GncPluginBusinessPrivate
} GncPluginBusinessPrivate;
#define GNC_PLUGIN_BUSINESS_GET_PRIVATE(o) \
- ((GncPluginBusinessPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_BUSINESS))
+ ((GncPluginBusinessPrivate*)gnc_plugin_business_get_instance_private((GncPluginBusiness*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c
index 4c43b1612..72d8960d3 100644
--- a/gnucash/gnome/gnc-plugin-page-account-tree.c
+++ b/gnucash/gnome/gnc-plugin-page-account-tree.c
@@ -116,7 +116,7 @@ typedef struct GncPluginPageAccountTreePrivate
} GncPluginPageAccountTreePrivate;
#define GNC_PLUGIN_PAGE_ACCOUNT_TREE_GET_PRIVATE(o) \
- ((GncPluginPageAccountTreePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_ACCOUNT_TREE))
+ ((GncPluginPageAccountTreePrivate*)gnc_plugin_page_account_tree_get_instance_private((GncPluginPageAccountTree*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome/gnc-plugin-page-budget.c b/gnucash/gnome/gnc-plugin-page-budget.c
index b30755688..8b6722c04 100644
--- a/gnucash/gnome/gnc-plugin-page-budget.c
+++ b/gnucash/gnome/gnc-plugin-page-budget.c
@@ -283,7 +283,7 @@ typedef struct GncPluginPageBudgetPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageBudget, gnc_plugin_page_budget, GNC_TYPE_PLUGIN_PAGE)
#define GNC_PLUGIN_PAGE_BUDGET_GET_PRIVATE(o) \
- ((GncPluginPageBudgetPrivate*)g_type_instance_get_private ((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_BUDGET))
+ ((GncPluginPageBudgetPrivate*)gnc_plugin_page_budget_get_instance_private((GncPluginPageBudget*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c
index badb40347..596b46900 100644
--- a/gnucash/gnome/gnc-plugin-page-invoice.c
+++ b/gnucash/gnome/gnc-plugin-page-invoice.c
@@ -478,7 +478,7 @@ typedef struct GncPluginPageInvoicePrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageInvoice, gnc_plugin_page_invoice, GNC_TYPE_PLUGIN_PAGE)
#define GNC_PLUGIN_PAGE_INVOICE_GET_PRIVATE(o) \
- ((GncPluginPageInvoicePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_INVOICE))
+ ((GncPluginPageInvoicePrivate*)gnc_plugin_page_invoice_get_instance_private((GncPluginPageInvoice*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/gnome/gnc-plugin-page-owner-tree.c b/gnucash/gnome/gnc-plugin-page-owner-tree.c
index 9c1563617..7fde41a60 100644
--- a/gnucash/gnome/gnc-plugin-page-owner-tree.c
+++ b/gnucash/gnome/gnc-plugin-page-owner-tree.c
@@ -87,8 +87,10 @@ typedef struct GncPluginPageOwnerTreePrivate
OwnerFilterDialog fd;
} GncPluginPageOwnerTreePrivate;
+G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageOwnerTree, gnc_plugin_page_owner_tree, GNC_TYPE_PLUGIN_PAGE)
+
#define GNC_PLUGIN_PAGE_OWNER_TREE_GET_PRIVATE(o) \
- ((GncPluginPageOwnerTreePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_OWNER_TREE))
+ ((GncPluginPageOwnerTreePrivate*)gnc_plugin_page_owner_tree_get_instance_private((GncPluginPageOwnerTree*)o))
static GObjectClass *parent_class = NULL;
@@ -397,8 +399,6 @@ gnc_plugin_page_owner_focus_widget (GncPluginPage *owner_plugin_page)
return FALSE;
}
-G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageOwnerTree, gnc_plugin_page_owner_tree, GNC_TYPE_PLUGIN_PAGE)
-
static void
gnc_plugin_page_owner_tree_class_init (GncPluginPageOwnerTreeClass *klass)
{
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index bfa0f671c..4e2368840 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -739,7 +739,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (GncPluginPageRegister, gnc_plugin_page_register,
GNC_TYPE_PLUGIN_PAGE)
#define GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE(o) \
- ((GncPluginPageRegisterPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_REGISTER))
+ ((GncPluginPageRegisterPrivate*)gnc_plugin_page_register_get_instance_private((GncPluginPageRegister*)o))
static GObjectClass* parent_class = NULL;
diff --git a/gnucash/gnome/gnc-plugin-page-report.c b/gnucash/gnome/gnc-plugin-page-report.c
index fea5c29c6..1ec7b2b19 100644
--- a/gnucash/gnome/gnc-plugin-page-report.c
+++ b/gnucash/gnome/gnc-plugin-page-report.c
@@ -135,7 +135,7 @@ typedef struct GncPluginPageReportPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageReport, gnc_plugin_page_report, GNC_TYPE_PLUGIN_PAGE)
#define GNC_PLUGIN_PAGE_REPORT_GET_PRIVATE(o) \
- ((GncPluginPageReportPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_REPORT))
+ ((GncPluginPageReportPrivate*)gnc_plugin_page_report_get_instance_private((GncPluginPageReport*)o))
static void gnc_plugin_page_report_class_init( GncPluginPageReportClass *klass );
static void gnc_plugin_page_report_init( GncPluginPageReport *plugin_page );
diff --git a/gnucash/gnome/gnc-plugin-page-sx-list.c b/gnucash/gnome/gnc-plugin-page-sx-list.c
index 218a5e0c3..4ea5d6e45 100644
--- a/gnucash/gnome/gnc-plugin-page-sx-list.c
+++ b/gnucash/gnome/gnc-plugin-page-sx-list.c
@@ -99,8 +99,10 @@ typedef struct GncPluginPageSxListPrivate
} GncPluginPageSxListPrivate;
+G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageSxList, gnc_plugin_page_sx_list, GNC_TYPE_PLUGIN_PAGE)
+
#define GNC_PLUGIN_PAGE_SX_LIST_GET_PRIVATE(o) \
- ((GncPluginPageSxListPrivate*)g_type_instance_get_private ((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_SX_LIST))
+ ((GncPluginPageSxListPrivate*)gnc_plugin_page_sx_list_get_instance_private((GncPluginPageSxList*)o))
static GObjectClass *parent_class = NULL;
@@ -210,8 +212,6 @@ gnc_plugin_page_sx_list_focus_widget (GncPluginPage *sx_plugin_page)
return FALSE;
}
-G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageSxList, gnc_plugin_page_sx_list, GNC_TYPE_PLUGIN_PAGE)
-
static void
gnc_plugin_page_sx_list_class_init (GncPluginPageSxListClass *klass)
{
diff --git a/gnucash/gnome/gnc-plugin-register.c b/gnucash/gnome/gnc-plugin-register.c
index 31ea43be0..44e6d8c32 100644
--- a/gnucash/gnome/gnc-plugin-register.c
+++ b/gnucash/gnome/gnc-plugin-register.c
@@ -71,7 +71,7 @@ typedef struct GncPluginRegisterPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginRegister, gnc_plugin_register, GNC_TYPE_PLUGIN)
#define GNC_PLUGIN_REGISTER_GET_PRIVATE(o) \
- ((GncPluginRegisterPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_REGISTER))
+ ((GncPluginRegisterPrivate*)gnc_plugin_register_get_instance_private((GncPluginRegister*)o))
static GObjectClass *parent_class = NULL;
static QofLogModule log_module = GNC_MOD_GUI;
diff --git a/gnucash/gnome/search-owner.c b/gnucash/gnome/search-owner.c
index 1801a742e..e8bce2a4e 100644
--- a/gnucash/gnome/search-owner.c
+++ b/gnucash/gnome/search-owner.c
@@ -60,7 +60,7 @@ typedef struct _GNCSearchOwnerPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchOwner, gnc_search_owner, GNC_TYPE_SEARCH_CORE_TYPE);
#define _PRIVATE(o) \
- ((GNCSearchOwnerPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_OWNER))
+ ((GNCSearchOwnerPrivate*)gnc_search_owner_get_instance_private((GNCSearchOwner*)o))
static GNCSearchCoreTypeClass *parent_class;
diff --git a/gnucash/html/gnc-html.c b/gnucash/html/gnc-html.c
index 4565bdaad..d1f0feecf 100644
--- a/gnucash/html/gnc-html.c
+++ b/gnucash/html/gnc-html.c
@@ -73,7 +73,7 @@ static void gnc_html_dispose( GObject* obj );
static void gnc_html_finalize( GObject* obj );
/*
#define GNC_HTML_GET_PRIVATE(o) \
- ((GncHtmlPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_HTML))
+ ((GncHtmlPrivate*)gnc_html_get_instance_private((GncHtml*)o))
*/
#define GNC_HTML_GET_PRIVATE(o) (GNC_HTML(o)->priv)
diff --git a/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
index 97b1b9f45..000dd947f 100644
--- a/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
+++ b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
@@ -77,7 +77,7 @@ typedef struct GncPluginCsvExportPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginCsvExport, gnc_plugin_csv_export, GNC_TYPE_PLUGIN)
#define GNC_PLUGIN_CSV_EXPORT_GET_PRIVATE(o) \
- ((GncPluginCsvExportPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_CSV_EXPORT))
+ ((GncPluginCsvExportPrivate*)gnc_plugin_csv_export_get_instance_private((GncPluginCsvExport*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c b/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
index 4257b2594..11a031157 100644
--- a/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
+++ b/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
@@ -72,7 +72,7 @@ typedef struct GncPluginCsvImportPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginCsvImport, gnc_plugin_csv_import, GNC_TYPE_PLUGIN)
#define GNC_PLUGIN_CSV_IMPORT_GET_PRIVATE(o) \
- ((GncPluginCsvImportPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_CSV_IMPORT))
+ ((GncPluginCsvImportPrivate*)gnc_plugin_csv_import_get_instance_private((GncPluginCsvImport*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/import-export/log-replay/gnc-plugin-log-replay.c b/gnucash/import-export/log-replay/gnc-plugin-log-replay.c
index 1356caf4e..31f980964 100644
--- a/gnucash/import-export/log-replay/gnc-plugin-log-replay.c
+++ b/gnucash/import-export/log-replay/gnc-plugin-log-replay.c
@@ -60,7 +60,7 @@ typedef struct GncPluginLogreplayPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginLogreplay, gnc_plugin_log_replay, GNC_TYPE_PLUGIN)
#define GNC_PLUGIN_LOG_REPLAY_GET_PRIVATE(o) \
- ((GncPluginLogreplayPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_LOG_REPLAY))
+ ((GncPluginLogreplayPrivate*)gnc_plugin_log_replay_get_instance_private((GncPluginLogReplay*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/import-export/ofx/gnc-plugin-ofx.c b/gnucash/import-export/ofx/gnc-plugin-ofx.c
index be07e1ecd..94e7c3e4f 100644
--- a/gnucash/import-export/ofx/gnc-plugin-ofx.c
+++ b/gnucash/import-export/ofx/gnc-plugin-ofx.c
@@ -58,7 +58,7 @@ typedef struct GncPluginOfxPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginOfx, gnc_plugin_ofx, GNC_TYPE_PLUGIN)
#define GNC_PLUGIN_OFX_GET_PRIVATE(o) \
- ((GncPluginOfxPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_OFX))
+ ((GncPluginOfxPrivate*)gnc_plugin_ofx_get_instance_private((GncPluginOfx*)o))
static GObjectClass *parent_class = NULL;
diff --git a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
index 4b73538ce..2aed0ae59 100644
--- a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
+++ b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
@@ -60,7 +60,7 @@ typedef struct GncPluginQifImportPrivate
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginQifImport, gnc_plugin_qif_import, GNC_TYPE_PLUGIN);
#define GNC_PLUGIN_QIF_IMPORT_GET_PRIVATE(o) \
- ((GncPluginQifImportPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_QIF_IMPORT))
+ ((GncPluginQifImportPrivate*)gnc_plugin_qif_import_get_instance_private((GncPluginQifImport*)o))
static GObjectClass *parent_class = NULL;
diff --git a/libgnucash/engine/Account.cpp b/libgnucash/engine/Account.cpp
index a0fcd49e1..5b80ef5a8 100644
--- a/libgnucash/engine/Account.cpp
+++ b/libgnucash/engine/Account.cpp
@@ -138,7 +138,7 @@ enum
};
#define GET_PRIVATE(o) \
- ((AccountPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_ACCOUNT))
+ ((AccountPrivate*)gnc_account_get_instance_private((Account*)o))
/* This map contains a set of strings representing the different column types. */
static const std::map<GNCAccountType, const char*> gnc_acct_debit_strs = {
diff --git a/libgnucash/engine/gnc-budget.cpp b/libgnucash/engine/gnc-budget.cpp
index 3600b3910..88847b750 100644
--- a/libgnucash/engine/gnc-budget.cpp
+++ b/libgnucash/engine/gnc-budget.cpp
@@ -91,7 +91,7 @@ typedef struct GncBudgetPrivate
} GncBudgetPrivate;
#define GET_PRIVATE(o) \
- ((GncBudgetPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_BUDGET))
+ ((GncBudgetPrivate*)gnc_budget_get_instance_private((GncBudget*)o))
struct _GncBudgetClass
{
diff --git a/libgnucash/engine/gnc-commodity.c b/libgnucash/engine/gnc-commodity.c
index df80a9b34..ac686c4b7 100644
--- a/libgnucash/engine/gnc-commodity.c
+++ b/libgnucash/engine/gnc-commodity.c
@@ -94,7 +94,7 @@ static const char*
is_unset = "unset";
#define GET_PRIVATE(o) \
- ((gnc_commodityPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_COMMODITY))
+ ((gnc_commodityPrivate*)gnc_commodity_get_instance_private((gnc_commodity*)o))
struct _GncCommodityClass
{
diff --git a/libgnucash/engine/gnc-lot.c b/libgnucash/engine/gnc-lot.c
index 7302ef136..dd0cec9dd 100644
--- a/libgnucash/engine/gnc-lot.c
+++ b/libgnucash/engine/gnc-lot.c
@@ -100,7 +100,7 @@ typedef struct GNCLotPrivate
} GNCLotPrivate;
#define GET_PRIVATE(o) \
- ((GNCLotPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_LOT))
+ ((GNCLotPrivate*)gnc_lot_get_instance_private((GNCLot*)o))
#define gnc_lot_set_guid(L,G) qof_instance_set_guid(QOF_INSTANCE(L),&(G))
@@ -399,8 +399,12 @@ gnc_lot_get_account (const GNCLot *lot)
GncInvoice * gnc_lot_get_cached_invoice (const GNCLot *lot)
{
- if (!lot) return NULL;
- return GET_PRIVATE(lot)->cached_invoice;
+ if (!lot) return NULL;
+ else
+ {
+ GNCLotPrivate *priv = GET_PRIVATE(lot);
+ return priv->cached_invoice;
+ }
}
void
diff --git a/libgnucash/engine/qofinstance.cpp b/libgnucash/engine/qofinstance.cpp
index 7f99994a9..12b7dcbfe 100644
--- a/libgnucash/engine/qofinstance.cpp
+++ b/libgnucash/engine/qofinstance.cpp
@@ -112,7 +112,7 @@ typedef struct QofInstancePrivate
} QofInstancePrivate;
#define GET_PRIVATE(o) \
- ((QofInstancePrivate*)g_type_instance_get_private((GTypeInstance*)o, QOF_TYPE_INSTANCE))
+ ((QofInstancePrivate*)qof_instance_get_instance_private((QofInstance*)o))
G_DEFINE_TYPE_WITH_PRIVATE(QofInstance, qof_instance, G_TYPE_OBJECT);
QOF_GOBJECT_FINALIZE(qof_instance);
commit 815eeb496f183265cec84d69d14c17d6416354b4
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Jul 30 23:16:24 2022 +0800
[gnc-plugin-page-register] g_slist_free param_list
If (reg->type == SEARCH_LEDGER) then the GSList* created by
qof_query_build_param_list would not be freed. This reordering avoids
allocating GSList altogether when not needed.
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index dce7893b3..bfa0f671c 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -2738,7 +2738,6 @@ static void
gnc_ppr_update_status_query (GncPluginPageRegister* page)
{
GncPluginPageRegisterPrivate* priv;
- GSList* param_list;
Query* query;
SplitRegister* reg;
@@ -2762,9 +2761,9 @@ gnc_ppr_update_status_query (GncPluginPageRegister* page)
reg = gnc_ledger_display_get_split_register (priv->ledger);
/* Remove the old status match */
- param_list = qof_query_build_param_list (SPLIT_RECONCILE, NULL);
- if (param_list && (reg->type != SEARCH_LEDGER))
+ if (reg->type != SEARCH_LEDGER)
{
+ GSList *param_list = qof_query_build_param_list (SPLIT_RECONCILE, NULL);
qof_query_purge_terms (query, param_list);
g_slist_free (param_list);
}
@@ -2802,7 +2801,6 @@ static void
gnc_ppr_update_date_query (GncPluginPageRegister* page)
{
GncPluginPageRegisterPrivate* priv;
- GSList* param_list;
Query* query;
SplitRegister* reg;
@@ -2827,9 +2825,10 @@ gnc_ppr_update_date_query (GncPluginPageRegister* page)
reg = gnc_ledger_display_get_split_register (priv->ledger);
/* Delete any existing old date spec. */
- param_list = qof_query_build_param_list (SPLIT_TRANS, TRANS_DATE_POSTED, NULL);
- if (param_list && (reg->type != SEARCH_LEDGER))
+ if (reg->type != SEARCH_LEDGER)
{
+ GSList *param_list = qof_query_build_param_list (SPLIT_TRANS,
+ TRANS_DATE_POSTED, NULL);
qof_query_purge_terms (query, param_list);
g_slist_free (param_list);
}
commit 6c70f2c22d9e72da9c20bc8511ddf816e5f05ce4
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Jul 30 23:15:08 2022 +0800
[gnucash-sheet] unref cursor
diff --git a/gnucash/register/register-gnome/gnucash-sheet.c b/gnucash/register/register-gnome/gnucash-sheet.c
index 2991e31e7..4b009dc27 100644
--- a/gnucash/register/register-gnome/gnucash-sheet.c
+++ b/gnucash/register/register-gnome/gnucash-sheet.c
@@ -817,6 +817,8 @@ gnucash_sheet_finalize (GObject *object)
g_hash_table_destroy (sheet->cursor_styles);
g_hash_table_destroy (sheet->dimensions_hash_table);
+ g_object_unref (sheet->cursor);
+
if (G_OBJECT_CLASS(sheet_parent_class)->finalize)
(*G_OBJECT_CLASS(sheet_parent_class)->finalize)(object);
}
commit 723dee66cb7274ece45f3f86dc21d79475b3c5de
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Jul 30 23:01:07 2022 +0800
[gnc-ledger-display] QofQuery destroyed
This QofQuery was copied by gnc_ledger_display_internal, therefore its
is no longer in use when out of scope.
diff --git a/gnucash/register/ledger-core/gnc-ledger-display.c b/gnucash/register/ledger-core/gnc-ledger-display.c
index 1f972f6c0..4a6988001 100644
--- a/gnucash/register/ledger-core/gnc-ledger-display.c
+++ b/gnucash/register/ledger-core/gnc-ledger-display.c
@@ -530,6 +530,8 @@ gnc_ledger_display_template_gl (char* id)
gnc_split_register_set_template_account (sr, acct);
}
+ qof_query_destroy (q);
+
LEAVE ("%p", ld);
return ld;
}
commit 7bc7737476ffc5ba1e9a64751ae17285b76ddf9c
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Jul 30 16:21:03 2022 +0800
[gnc-dense-cal] further GList* and char* leaks
- mark->name and mark->info both leaked
- fixing poorly written for loop to g_list_free tags properly
diff --git a/gnucash/gnome-utils/gnc-dense-cal.c b/gnucash/gnome-utils/gnc-dense-cal.c
index 132b9f459..9b3390dc2 100644
--- a/gnucash/gnome-utils/gnc-dense-cal.c
+++ b/gnucash/gnome-utils/gnc-dense-cal.c
@@ -821,6 +821,7 @@ gdc_free_all_mark_data(GncDenseCal *dcal)
gdc_mark_data *mark = l->data;
g_list_free (mark->ourMarks);
g_free (mark->name);
+ g_free (mark->info);
g_free (mark);
}
g_list_free(dcal->markData);
@@ -1888,26 +1889,22 @@ cleanup:
static void
gdc_add_markings(GncDenseCal *cal)
{
- GList *tags;
- tags = gnc_dense_cal_model_get_contained(cal->model);
- for (; tags != NULL; tags = tags->next)
- {
- guint tag = GPOINTER_TO_UINT(tags->data);
- gdc_add_tag_markings(cal, tag);
- }
+ GList *tags = gnc_dense_cal_model_get_contained(cal->model);
+
+ for (GList *n = tags; n; n = n->next)
+ gdc_add_tag_markings(cal, GPOINTER_TO_UINT(n->data));
+
g_list_free(tags);
}
static void
gdc_remove_markings(GncDenseCal *cal)
{
- GList *tags;
- tags = gnc_dense_cal_model_get_contained(cal->model);
- for (; tags != NULL; tags = tags->next)
- {
- guint tag = GPOINTER_TO_UINT(tags->data);
- gdc_mark_remove(cal, tag, FALSE);
- }
+ GList *tags = gnc_dense_cal_model_get_contained(cal->model);
+
+ for (GList *n = tags; n; n = n->next)
+ gdc_mark_remove(cal, GPOINTER_TO_UINT(n->data), FALSE);
+
g_list_free(tags);
}
@@ -2051,6 +2048,8 @@ gdc_mark_remove(GncDenseCal *dcal, guint mark_to_remove, gboolean redraw)
}
g_list_free(mark_data->ourMarks);
dcal->markData = g_list_remove(dcal->markData, mark_data);
+ g_free (mark_data->name);
+ g_free (mark_data->info);
g_free(mark_data);
if (redraw)
commit accdf9e852e0a539a435497acee330857c87789e
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Jul 30 13:39:34 2022 +0800
[gnc-dense-cal] leaks in markdata and GTimer
- mark->name wasn't correctly freed
- don't unnecessarily allocate GTimer
diff --git a/gnucash/gnome-utils/gnc-dense-cal.c b/gnucash/gnome-utils/gnc-dense-cal.c
index 9fca03c76..132b9f459 100644
--- a/gnucash/gnome-utils/gnc-dense-cal.c
+++ b/gnucash/gnome-utils/gnc-dense-cal.c
@@ -818,8 +818,10 @@ gdc_free_all_mark_data(GncDenseCal *dcal)
/* Remove the old mark data. */
for (l = dcal->markData; l; l = l->next)
{
- g_list_free(((gdc_mark_data*)l->data)->ourMarks);
- g_free((gdc_mark_data*)l->data);
+ gdc_mark_data *mark = l->data;
+ g_list_free (mark->ourMarks);
+ g_free (mark->name);
+ g_free (mark);
}
g_list_free(dcal->markData);
dcal->markData = NULL;
@@ -902,13 +904,14 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
cairo_t *cr;
gchar *primary_color_class, *secondary_color_class, *marker_color_class;
- timer = g_timer_new();
DEBUG("drawing");
widget = GTK_WIDGET(dcal);
if (!dcal->surface)
return;
+ timer = g_timer_new();
+
g_timer_start(timer);
cr = cairo_create (dcal->surface);
layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
commit 45aac53952092f9acb1e4e76e9d070ea739e165a
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Jul 30 13:39:20 2022 +0800
[gnc-split-reg] free tooltip text properly
diff --git a/gnucash/gnome/gnc-split-reg.c b/gnucash/gnome/gnc-split-reg.c
index 323fd857f..d6c37ce17 100644
--- a/gnucash/gnome/gnc-split-reg.c
+++ b/gnucash/gnome/gnc-split-reg.c
@@ -744,9 +744,8 @@ gsr_redraw_all_cb (GnucashRegister *g_reg, gpointer data)
gtk_widget_set_tooltip_text (GTK_WIDGET(gsr->filter_label), gsr->filter_text);
- if (old_tt_text)
- g_free (old_tt_text);
}
+ g_free (old_tt_text);
}
if (gsr->shares_label == NULL && gsr->value_label == NULL)
commit 67a1b7a873badcd1dc343e11997217941bbded6f
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Jul 30 12:52:16 2022 +0800
[gnc-sx-instance-model] free GHashTable keys when destroying
diff --git a/libgnucash/app-utils/gnc-sx-instance-model.c b/libgnucash/app-utils/gnc-sx-instance-model.c
index 75c624785..dcb51f8cb 100644
--- a/libgnucash/app-utils/gnc-sx-instance-model.c
+++ b/libgnucash/app-utils/gnc-sx-instance-model.c
@@ -207,9 +207,7 @@ gnc_sx_instance_get_variables_for_parser(GHashTable *instance_var_hash)
{
GHashTable *parser_vars;
- /* fixme: the following GHashTable should g_free keys and
- gnc_sx_variable_free the values, however this breaks SX formulas */
- parser_vars = g_hash_table_new(g_str_hash, g_str_equal);
+ parser_vars = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
g_hash_table_foreach(instance_var_hash, (GHFunc)_sx_var_to_raw_numeric, parser_vars);
return parser_vars;
}
commit 78f74656944bc3d80d56a9eba585750bc4fe18dd
Author: Christian Wehling <christian.wehling at web.de>
Date: Fri Jul 29 17:51:02 2022 +0200
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/de.po: 99.9% (5399 of 5400 strings; 1 fuzzy)
182 failing checks (3.3%)
Translation: GnuCash/Program (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Co-authored-by: Christian Wehling <christian.wehling at web.de>
diff --git a/po/de.po b/po/de.po
index 190630c1d..83fb6b686 100644
--- a/po/de.po
+++ b/po/de.po
@@ -39,8 +39,8 @@ 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-07-28 05:15+0000\n"
-"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>\n"
+"PO-Revision-Date: 2022-07-29 15:51+0000\n"
+"Last-Translator: Christian Wehling <christian.wehling at web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/gnucash/"
"de/>\n"
"Language: de\n"
@@ -8930,10 +8930,8 @@ msgid "Edit the global preferences of GnuCash"
msgstr "Die globalen Einstellungen von GnuCash bearbeiten"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>Position Reiter der Karteikarten</b>"
+msgstr "P_osition der Karteireiter"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -9185,7 +9183,7 @@ msgstr "Buch-Optionen"
#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
-msgstr ""
+msgstr "(vom Benutzer veränderbar)"
#. Translators: %s will be replaced with the current year
#: gnucash/gnome-utils/gnc-main-window.c:4880
@@ -10575,10 +10573,8 @@ msgid "{1} [options] [datafile]"
msgstr "{1} [Optionen] [Datei]"
#: gnucash/gnucash-core-app.cpp:255
-#, fuzzy
-#| msgid "GnuCash "
msgid "GnuCash Paths"
-msgstr "GnuCash "
+msgstr "GnuCash Dateipfade"
#: gnucash/gnucash-core-app.cpp:270
msgid "GnuCash {1}"
@@ -10625,10 +10621,8 @@ msgstr ""
"Kann mehrmals aufgerufen werden."
#: gnucash/gnucash-core-app.cpp:309
-#, fuzzy
-#| msgid "Show plot"
msgid "Show paths"
-msgstr "Diagramm anzeigen"
+msgstr "Dateipfade anzeigen"
#: gnucash/gnucash-core-app.cpp:311
msgid ""
@@ -15948,10 +15942,8 @@ msgstr "ISIN, _WKN oder anderer Code"
#: gnucash/gtkbuilder/dialog-commodity.glade:485
#: gnucash/gtkbuilder/dialog-commodity.glade:767
#: gnucash/gtkbuilder/dialog-price.glade:122
-#, fuzzy
-#| msgid "Namespace"
msgid "Nam_espace"
-msgstr "Namensraum"
+msgstr "Nam_ensraum"
#: gnucash/gtkbuilder/dialog-commodity.glade:500
msgid "_Symbol/abbreviation"
@@ -16670,10 +16662,8 @@ msgid "Green"
msgstr "Grün"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "Keine Buchungsdetails darstellen"
+msgstr "Importierte Buchungsdetails bearbeiten"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -22117,24 +22107,18 @@ msgstr "Inaktiv"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "Gegenkonto zu Auswahl zuweisen."
+msgstr "Gegenkonto der _Auswahl zuweisen"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "Beschreibung / Bemerkung / Buchungstext"
+msgstr "Beschreibung, Bemerkung oder Buchungstext b_earbeiten"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "Voreinstellungen"
+msgstr "Alle Änderungen _rückgängig machen"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
commit 4906df8ed84b43973a4d76431f83666f9e975b7a
Author: Avi Markovitz <avi.markovitz at gmail.com>
Date: Fri Jul 29 17:51:02 2022 +0200
Translation update by Avi Markovitz <avi.markovitz at gmail.com> using Weblate
po/he.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (Hebrew)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/he/
Co-authored-by: Avi Markovitz <avi.markovitz at gmail.com>
diff --git a/po/he.po b/po/he.po
index f5024f6cc..8d47c96d0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,7 +11,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-07-26 15:51+0000\n"
+"PO-Revision-Date: 2022-07-28 11:17+0000\n"
"Last-Translator: Avi Markovitz <avi.markovitz at gmail.com>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/gnucash/gnucash/"
"he/>\n"
@@ -8025,7 +8025,7 @@ msgstr "מעתה"
#: gnucash/gnome-utils/gnc-date-edit.c:888
msgid "Calendar"
-msgstr "לוח ×©× ×”"
+msgstr "לוח ×©× ×” ×זרחית"
#: gnucash/gnome-utils/gnc-dense-cal.c:252
msgid "12 months"
@@ -11620,7 +11620,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:165
#: gnucash/gtkbuilder/dialog-preferences.glade:1212
msgid "In the current calendar year"
-msgstr "×”×©× ×” ×”×§×œ× ×“×¨×™×ª ×”× ×•×›×—×™×ª"
+msgstr "×”×©× ×” ×”×זרחית ×”× ×•×›×—×™×ª"
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:166
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:171
@@ -11629,8 +11629,8 @@ msgid ""
"within the current calendar year or close to the current date based on a "
"sliding window starting a set number of months backwards in time."
msgstr ""
-"×›×שר ת×ריך מוזן ×œ×œ× ×©× ×” × ×™×ª×Ÿ להשלימו ×œ×©× ×” ×”×§×œ× ×“×¨×™×ª ×”× ×•×›×—×™×ª ×ו קרוב לת×ריך "
-"×”× ×•×›×—×™ בהתבסס על חלון ×”×–×–×” שמתחיל מספר מוגדר של ×—×•×“×©×™× ×חורה בזמן."
+"×›×שר ת×ריך מוזן ×œ×œ× ×©× ×”, × ×™×ª×Ÿ להשלימו ×œ×©× ×” ×”×זרחית ×”× ×•×›×—×™×ª, ×ו קרוב לת×ריך "
+"×”× ×•×›×—×™, בהתבסס על חלון־גלישה שמתחיל מספר ×—×•×“×©×™× ×ž×•×’×“×¨, ×חורה בזמן."
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:170
msgid ""
@@ -11970,12 +11970,12 @@ msgstr "הצגת ת×ריך ×”×¨×™×©×•× ×•×ª×ריך ההת×מה בבחירת
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:326
msgid "Show the calendar buttons"
-msgstr "הצגת ×œ×—×¦× ×™ לוח ×©× ×”"
+msgstr "הצגת ×œ×—×¦× ×™ לוח ×©× ×” ×זרחית"
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:327
#: gnucash/gtkbuilder/dialog-preferences.glade:3417
msgid "Show the calendar buttons Cancel, Today and Select."
-msgstr "הצגת ×œ×—×¦× ×™ לוח ×”×©× ×”, ביטול, ×”×™×•× ×•×‘×—×™×¨×”."
+msgstr "הצגת ×œ×—×¦× ×™ ביטול לוח ×”×©× ×” ×”×זרחית, ×”×™×•× ×•×‘×—×™×¨×”."
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:331
msgid "Move the selection to the blank split on expand"
@@ -16473,7 +16473,7 @@ msgstr "×›×שר ת×ריך מוזן ×œ×œ× ×©× ×”, ×”×©× ×” תושל×"
#: gnucash/gtkbuilder/dialog-preferences.glade:1218
msgid ""
"Dates will be completed so that they are within the current calendar year."
-msgstr "ת××¨×™×›×™× ×™×•×©×œ×ž×• כך שיהיו במסגרת ×”×©× ×” ×”×§×œ× ×“×¨×™×ª ×”× ×•×›×—×™×ª."
+msgstr "ת××¨×™×›×™× ×™×•×©×œ×ž×• כך שיחולו במסגרת ×”×©× ×” ×”×זרחית ×”× ×•×›×—×™×ª."
#: gnucash/gtkbuilder/dialog-preferences.glade:1231
msgid ""
@@ -17017,7 +17017,7 @@ msgstr "הצגת ת×ריכי ר_×™×©×•× ×•×”×ª×מה"
#. Register2 feature
#: gnucash/gtkbuilder/dialog-preferences.glade:3413
msgid "Show the calendar b_uttons"
-msgstr "הצגת ×œ×—×¦× ×™ לוח ש_× ×”"
+msgstr "הצגת ×œ×—×¦× ×™ לוחה ש_× ×” ×”×זרחית"
#. Register2 feature
#: gnucash/gtkbuilder/dialog-preferences.glade:3429
@@ -18785,8 +18785,8 @@ msgid ""
"Number of calendar units in the recurrence: E.g. Biweekly = every 2 weeks; "
"Quarterly = every 3 months"
msgstr ""
-"מספר יחידות ×§×œ× ×“×¨×™×•×ª במחזורי×: כלומר דו שבועי = כל שבועיי×, ×¨×‘×¢×•× ×™ = כל 3 "
-"חודשי×"
+"מספר יחידות ×œ×•×—Ö¾×©× ×”Ö¾×זרחית במחזורי×: כלומר דו שבועי = כל שבועיי×, ×¨×‘×¢×•× ×™ = "
+"כל 3 חודשי×"
#: gnucash/gtkbuilder/gnc-recurrence.glade:109
msgid "beginning on"
@@ -28940,19 +28940,19 @@ msgstr ""
#: libgnucash/app-utils/date-utilities.scm:923
msgid "First day of the current calendar year."
-msgstr "×”×™×•× ×”×¨×שון, בלוח ×”×©× ×” ×”× ×•×›×—×™×ª."
+msgstr "×”×™×•× ×”×¨×שון, בלוח ×”×©× ×” ×”×זרחית ×”× ×•×›×—×™×ª."
#: libgnucash/app-utils/date-utilities.scm:930
msgid "Last day of the current calendar year."
-msgstr "×”×™×•× ×”×חרון, בלוח ×”×©× ×” ×”× ×•×›×—×™×ª."
+msgstr "×”×™×•× ×”×חרון, בלוח ×”×©× ×” ×”×זרחית ×”× ×•×›×—×™×ª."
#: libgnucash/app-utils/date-utilities.scm:937
msgid "First day of the previous calendar year."
-msgstr "×”×™×•× ×”×¨×שון, בלוח ×”×©× ×” הקודמת."
+msgstr "×”×™×•× ×”×¨×שון, בלוח ×”×©× ×” ×”×זרחית הקודמת."
#: libgnucash/app-utils/date-utilities.scm:944
msgid "Last day of the previous calendar year."
-msgstr "×”×™×•× ×”×חרון, בלוח ×”×©× ×” הקודמת."
+msgstr "×”×™×•× ×”×חרון, בלוח ×”×©× ×” ×”×זרחית הקודמת."
#: libgnucash/app-utils/date-utilities.scm:948
msgid "Start of next year"
@@ -28960,7 +28960,7 @@ msgstr "תחילת ×”×©× ×” הב××”"
#: libgnucash/app-utils/date-utilities.scm:951
msgid "First day of the next calendar year."
-msgstr "×”×™×•× ×”×¨×שון, בבלוח ×”×©× ×” הב××”."
+msgstr "×”×™×•× ×”×¨×שון, בבלוח ×”×©× ×” ×”×זרחית הב××”."
#: libgnucash/app-utils/date-utilities.scm:955
msgid "End of next year"
commit 583cd2c9fbbab99a9577960823cb525f5168f62c
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Jul 29 17:51:01 2022 +0200
Translation update by Frank H. Ellenberger <frank.h.ellenberger at gmail.com> using Weblate
po/de.po: 99.8% (5390 of 5400 strings; 9 fuzzy)
184 failing checks (3.4%)
Translation: GnuCash/Program (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Co-authored-by: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
diff --git a/po/de.po b/po/de.po
index d8edddb3c..190630c1d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -39,8 +39,8 @@ 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-07-25 20:24+0000\n"
-"Last-Translator: Christian Wehling <christian.wehling at web.de>\n"
+"PO-Revision-Date: 2022-07-28 05:15+0000\n"
+"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/gnucash/"
"de/>\n"
"Language: de\n"
@@ -13643,7 +13643,7 @@ msgstr ""
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:193
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:183
msgid "<b>Load and Save Settings</b>"
-msgstr "<b>Lade- und Speichern-Einstellungen</b>"
+msgstr "<b>Einstellungen speichern oder laden</b>"
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:242
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:231
commit 09e5c46dfda0b53e89ceba4167ceb1c3b78931c4
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Fri Jul 29 11:28:55 2022 +0100
Remove some default 'dummy' store entries as not required.
diff --git a/gnucash/gnome/dialog-report-style-sheet.c b/gnucash/gnome/dialog-report-style-sheet.c
index bf6fe65a0..a4f8d7527 100644
--- a/gnucash/gnome/dialog-report-style-sheet.c
+++ b/gnucash/gnome/dialog-report-style-sheet.c
@@ -230,9 +230,7 @@ gnc_style_sheet_new (StyleSheetDialog * ssd)
g_assert (ssd);
- /* Erase the initial dummy entry. */
template_model = gtk_combo_box_get_model (GTK_COMBO_BOX(template_combo));
- gtk_list_store_clear (GTK_LIST_STORE(template_model));
/* put in the list of style sheet type names */
for (; !scm_is_null (templates); templates = SCM_CDR(templates))
diff --git a/gnucash/gtkbuilder/assistant-qif-import.glade b/gnucash/gtkbuilder/assistant-qif-import.glade
index 033b8075d..68012c759 100644
--- a/gnucash/gtkbuilder/assistant-qif-import.glade
+++ b/gnucash/gtkbuilder/assistant-qif-import.glade
@@ -2,27 +2,11 @@
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.22"/>
- <object class="GtkListStore" id="currency_liststore">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Dummy</col>
- </row>
- </data>
- </object>
<object class="GtkListStore" id="date_format_liststore">
<columns>
<!-- column-name item -->
<column type="gchararray"/>
</columns>
- <data>
- <row>
- <col id="0" translatable="yes">Dummy</col>
- </row>
- </data>
</object>
<object class="GtkAssistant" id="qif_import_assistant">
<property name="can-focus">False</property>
diff --git a/gnucash/gtkbuilder/dialog-report.glade b/gnucash/gtkbuilder/dialog-report.glade
index 27957c699..ab8b3b095 100644
--- a/gnucash/gtkbuilder/dialog-report.glade
+++ b/gnucash/gtkbuilder/dialog-report.glade
@@ -697,11 +697,6 @@
<!-- column-name item -->
<column type="gchararray"/>
</columns>
- <data>
- <row>
- <col id="0" translatable="yes">Dummy</col>
- </row>
- </data>
</object>
<object class="GtkDialog" id="new_style_sheet_dialog">
<property name="can-focus">False</property>
diff --git a/gnucash/import-export/qif-imp/assistant-qif-import.c b/gnucash/import-export/qif-imp/assistant-qif-import.c
index 008060162..fb1347fd0 100644
--- a/gnucash/import-export/qif-imp/assistant-qif-import.c
+++ b/gnucash/import-export/qif-imp/assistant-qif-import.c
@@ -3805,7 +3805,6 @@ gnc_ui_qif_import_assistant_make (QIFImportWindow *qif_win)
GtkWidget *box;
builder = gtk_builder_new ();
- gnc_builder_add_from_file (builder, "assistant-qif-import.glade", "currency_liststore");
gnc_builder_add_from_file (builder, "assistant-qif-import.glade", "date_format_liststore");
gnc_builder_add_from_file (builder, "assistant-qif-import.glade", "qif_import_assistant");
commit dea1a89e81853ddd6a38963e8a535bb95a9bb91e
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Fri Jul 29 10:55:44 2022 +0100
Bug 798573 - Tab Width Behaviour
Currently when the notebook tabs on the left or right, the space used
fluctuates depending on tab label width. This change sets the label
width to the preference setting when the tabs are on the left or right
but when top or bottom the width is set to the number of characters
when shorter than the preference setting so they take up less room.
diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
index 30e124926..165a3393d 100644
--- a/gnucash/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -2162,9 +2162,39 @@ gnc_main_window_update_tab_color (gpointer gsettings, gchar *pref, gpointer user
}
-/** Set the tab label ellipsize value. The special check for a zero
- * value handles the case where a user hasn't set a tab width and
- * the preference default isn't detected.
+/** This data structure allows the passing of the tab width and
+ * whether the tab layout is on the left or right.
+ */
+typedef struct
+{
+ gint tab_width;
+ gboolean tabs_left_right;
+} TabWidth;
+
+static TabWidth *
+populate_tab_width_struct (void)
+{
+ TabWidth *tw;
+
+ tw = g_new0 (TabWidth, 1);
+ tw->tab_width = gnc_prefs_get_float (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_WIDTH);
+ tw->tabs_left_right = gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_LEFT) ||
+ gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_POSITION_RIGHT);
+
+ return tw;
+}
+
+/** Set the tab label ellipsize value.
+ * When the tabs are on the left or right, the label width is set to
+ * the tab_width value. Doing this maintains a steady notepad header
+ * width for the tabs.
+ *
+ * When the tabs are on the top or bottom, the label width is set to
+ * the number of characters when shorter than tab_width so they take
+ * up less room.
+ *
+ * The special check for a zero value handles the case where a user
+ * hasn't set a tab width and the preference default isn't detected.
*
* @internal
*
@@ -2172,9 +2202,11 @@ gnc_main_window_update_tab_color (gpointer gsettings, gchar *pref, gpointer user
*
* @param tab_width Tab width the user has set in preferences.
*
+ * @param tab_left_right Whether the tab layout is on the left or right.
+ *
*/
static void
-gnc_main_window_set_tab_ellipsize (GtkWidget *label, gint tab_width)
+gnc_main_window_set_tab_ellipsize (GtkWidget *label, gint tab_width, gboolean tab_left_right)
{
const gchar *lab_text = gtk_label_get_text (GTK_LABEL(label));
@@ -2183,7 +2215,11 @@ gnc_main_window_set_tab_ellipsize (GtkWidget *label, gint tab_width)
gint text_length = g_utf8_strlen (lab_text, -1);
if (text_length < tab_width)
{
- gtk_label_set_width_chars (GTK_LABEL(label), text_length);
+ if (tab_left_right) // tabs position is left or right
+ gtk_label_set_width_chars (GTK_LABEL(label), tab_width);
+ else // tabs position is top or bottom
+ gtk_label_set_width_chars (GTK_LABEL(label), text_length);
+
gtk_label_set_ellipsize (GTK_LABEL(label), PANGO_ELLIPSIZE_NONE);
}
else
@@ -2212,19 +2248,21 @@ gnc_main_window_set_tab_ellipsize (GtkWidget *label, gint tab_width)
*/
static void
gnc_main_window_update_tab_width_one_page (GncPluginPage *page,
- gpointer user_data)
+ gpointer user_data)
{
- gint *new_value = user_data;
+ TabWidth *tw = user_data;
GtkWidget *label;
- ENTER("page %p, visible %d", page, *new_value);
+ ENTER("page %p, tab width %d, tabs on left or right %d",
+ page, tw->tab_width, tw->tabs_left_right);
+
label = g_object_get_data(G_OBJECT (page), PLUGIN_PAGE_TAB_LABEL);
if (!label)
{
LEAVE("no label");
return;
}
- gnc_main_window_set_tab_ellipsize (label, *new_value);
+ gnc_main_window_set_tab_ellipsize (label, tw->tab_width, tw->tabs_left_right);
LEAVE(" ");
}
@@ -2244,13 +2282,15 @@ gnc_main_window_update_tab_width_one_page (GncPluginPage *page,
static void
gnc_main_window_update_tab_width (gpointer prefs, gchar *pref, gpointer user_data)
{
- gint new_value;
+ TabWidth *tw;
ENTER(" ");
- new_value = gnc_prefs_get_float (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_WIDTH);
- gnc_main_window_foreach_page(
- gnc_main_window_update_tab_width_one_page,
- &new_value);
+
+ tw = populate_tab_width_struct ();
+
+ gnc_main_window_foreach_page (gnc_main_window_update_tab_width_one_page, tw);
+ g_free (tw);
+
LEAVE(" ");
}
@@ -2343,7 +2383,7 @@ main_window_update_page_name (GncPluginPage *page,
GncMainWindowPrivate *priv;
GtkWidget *label, *entry;
gchar *name, *old_page_name, *old_page_long_name;
- gint lab_width;
+ TabWidth *tw;
ENTER(" ");
@@ -2383,8 +2423,9 @@ main_window_update_page_name (GncPluginPage *page,
gtk_label_set_text(GTK_LABEL(label), name);
/* Adjust the label width for new text */
- lab_width = gnc_prefs_get_float (GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_WIDTH);
- gnc_main_window_update_tab_width_one_page (page, &lab_width);
+ tw = populate_tab_width_struct ();
+ gnc_main_window_update_tab_width_one_page (page, tw);
+ g_free (tw);
/* Update Tooltip on notebook Tab */
if (old_page_long_name && old_page_name
@@ -3200,7 +3241,7 @@ gnc_main_window_open_page (GncMainWindow *window,
const gchar *icon, *text, *color_string, *lab_text;
GtkWidget *image;
GList *tmp;
- gint width;
+ TabWidth *tw;
ENTER("window %p, page %p", window, page);
if (window)
@@ -3244,13 +3285,14 @@ gnc_main_window_open_page (GncMainWindow *window,
/*
* The page tab.
*/
- width = gnc_prefs_get_float(GNC_PREFS_GROUP_GENERAL, GNC_PREF_TAB_WIDTH);
icon = GNC_PLUGIN_PAGE_GET_CLASS(page)->tab_icon;
lab_text = gnc_plugin_page_get_page_name(page);
label = gtk_label_new (lab_text);
g_object_set_data (G_OBJECT (page), PLUGIN_PAGE_TAB_LABEL, label);
- gnc_main_window_set_tab_ellipsize (label, width);
+ tw = populate_tab_width_struct ();
+ gnc_main_window_update_tab_width_one_page (page, tw);
+ g_free (tw);
gtk_widget_show (label);
@@ -3651,6 +3693,8 @@ gnc_main_window_update_tab_position (gpointer prefs, gchar *pref, gpointer user_
G_CALLBACK (gnc_main_window_cmd_view_tab_position),
window);
+ gnc_main_window_update_tab_width (NULL, GNC_PREF_TAB_WIDTH, NULL);
+
LEAVE ("");
}
commit 6cad1d16afd487e5e4c1cbe50083828c56f3ce60
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Fri Jul 29 10:49:32 2022 +0100
Change source files gnc-ab-utils.* for spaces and tabs
diff --git a/gnucash/import-export/aqb/gnc-ab-utils.c b/gnucash/import-export/aqb/gnc-ab-utils.c
index 28e5b48e2..d6d5b01dd 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.c
+++ b/gnucash/import-export/aqb/gnc-ab-utils.c
@@ -67,17 +67,17 @@ G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
static AB_BANKING *gnc_AB_BANKING = NULL;
static gint gnc_AB_BANKING_refcount = 0;
-static gpointer join_ab_strings_cb(const gchar *str, gpointer user_data);
-static Account *gnc_ab_accinfo_to_gnc_acc(GtkWidget *parent,
- AB_IMEXPORTER_ACCOUNTINFO *account_info);
-static Account *gnc_ab_txn_to_gnc_acc(GtkWidget *parent,
- const AB_TRANSACTION *transaction);
-static const AB_TRANSACTION *txn_transaction_cb(
- const AB_TRANSACTION *element, gpointer user_data);
-static AB_IMEXPORTER_ACCOUNTINFO *txn_accountinfo_cb(
- AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data);
-static AB_IMEXPORTER_ACCOUNTINFO *bal_accountinfo_cb(
- AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data);
+static gpointer join_ab_strings_cb (const gchar *str, gpointer user_data);
+static Account *gnc_ab_accinfo_to_gnc_acc (GtkWidget *parent,
+ AB_IMEXPORTER_ACCOUNTINFO *account_info);
+static Account *gnc_ab_txn_to_gnc_acc (GtkWidget *parent,
+ const AB_TRANSACTION *transaction);
+static const AB_TRANSACTION *txn_transaction_cb (const AB_TRANSACTION *element,
+ gpointer user_data);
+static AB_IMEXPORTER_ACCOUNTINFO *txn_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element,
+ gpointer user_data);
+static AB_IMEXPORTER_ACCOUNTINFO *bal_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element,
+ gpointer user_data);
struct _GncABImExContextImport
{
@@ -102,69 +102,69 @@ static inline time64
gnc_gwen_date_to_time64 (const GNC_GWEN_DATE* date)
{
#if AQBANKING_VERSION_INT >= 59900
- int day = GWEN_Date_GetDay(date);
- int month = GWEN_Date_GetMonth(date);
- int year = GWEN_Date_GetYear(date);
+ int day = GWEN_Date_GetDay (date);
+ int month = GWEN_Date_GetMonth (date);
+ int year = GWEN_Date_GetYear (date);
/* Some banks use nominal 30-day months and set the value date as
* the day after the posted date. In February this can appear to
* be an invalid date because February has fewer than 30 days. If
* that's the case then back up a day to get a real date for
* posting.
*/
- while (month == 2 && day <= 30 && day > (is_leap_year(year) ? 29 : 28))
+ while (month == 2 && day <= 30 && day > (is_leap_year (year) ? 29 : 28))
--day;
- return gnc_dmy2time64_neutral(day, month, year);
+ return gnc_dmy2time64_neutral (day, month, year);
#else
int month, day, year;
- GWEN_Time_GetBrokenDownDate(date, &day, &month, &year);
+ GWEN_Time_GetBrokenDownDate (date, &day, &month, &year);
/* GWEN_Time_GetBrokenDownDate returns localtime(3) format; month is [0..11] */
- return gnc_dmy2time64_neutral(day, month + 1, year);
+ return gnc_dmy2time64_neutral (day, month + 1, year);
#endif
}
void
-gnc_GWEN_Init(void)
+gnc_GWEN_Init (void)
{
- gchar* gwen_logging = g_strdup(g_getenv("GWEN_LOGLEVEL"));
- gchar* aqb_logging = g_strdup(g_getenv("AQBANKING_LOGLEVEL"));
+ gchar* gwen_logging = g_strdup (g_getenv ("GWEN_LOGLEVEL"));
+ gchar* aqb_logging = g_strdup (g_getenv ("AQBANKING_LOGLEVEL"));
/* Initialize gwen library */
GWEN_Init();
/* Initialize gwen logging */
- if (gnc_prefs_get_bool(GNC_PREFS_GROUP_AQBANKING, GNC_PREF_VERBOSE_DEBUG))
+ if (gnc_prefs_get_bool (GNC_PREFS_GROUP_AQBANKING, GNC_PREF_VERBOSE_DEBUG))
{
if (!gwen_logging)
{
- GWEN_Logger_SetLevel(NULL, GWEN_LoggerLevel_Info);
- GWEN_Logger_SetLevel(GWEN_LOGDOMAIN, GWEN_LoggerLevel_Info);
+ GWEN_Logger_SetLevel (NULL, GWEN_LoggerLevel_Info);
+ GWEN_Logger_SetLevel (GWEN_LOGDOMAIN, GWEN_LoggerLevel_Info);
}
if (!aqb_logging)
- GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Debug);
+ GWEN_Logger_SetLevel (AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Debug);
}
else
{
if (!gwen_logging)
{
- GWEN_Logger_SetLevel(NULL, GWEN_LoggerLevel_Error);
- GWEN_Logger_SetLevel(GWEN_LOGDOMAIN, GWEN_LoggerLevel_Error);
+ GWEN_Logger_SetLevel (NULL, GWEN_LoggerLevel_Error);
+ GWEN_Logger_SetLevel (GWEN_LOGDOMAIN, GWEN_LoggerLevel_Error);
}
if (!aqb_logging)
- GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Warning);
+ GWEN_Logger_SetLevel (AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Warning);
}
- g_free(gwen_logging);
- g_free(aqb_logging);
+ g_free (gwen_logging);
+ g_free (aqb_logging);
gnc_GWEN_Gui_log_init();
}
void
-gnc_GWEN_Fini(void)
+gnc_GWEN_Fini (void)
{
/* Shutdown the GWEN_GUIs */
gnc_GWEN_Gui_shutdown();
- GWEN_Logger_SetLevel(NULL, GWEN_LoggerLevel_Error);
- GWEN_Logger_SetLevel(GWEN_LOGDOMAIN, GWEN_LoggerLevel_Warning);
- GWEN_Logger_SetLevel(AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Warning);
+ GWEN_Logger_SetLevel (NULL, GWEN_LoggerLevel_Error);
+ GWEN_Logger_SetLevel (GWEN_LOGDOMAIN, GWEN_LoggerLevel_Warning);
+ GWEN_Logger_SetLevel (AQBANKING_LOGDOMAIN, GWEN_LoggerLevel_Warning);
/* Finalize gwen library */
GWEN_Fini();
@@ -173,7 +173,7 @@ gnc_GWEN_Fini(void)
static GWEN_GUI *gnc_gwengui_extended_by_ABBanking;
AB_BANKING *
-gnc_AB_BANKING_new(void)
+gnc_AB_BANKING_new (void)
{
AB_BANKING *api;
@@ -184,13 +184,13 @@ gnc_AB_BANKING_new(void)
/* Init the API again. */
if (gnc_AB_BANKING_refcount == 0)
- g_return_val_if_fail(AB_Banking_Init(api) == 0, NULL);
+ g_return_val_if_fail (AB_Banking_Init (api) == 0, NULL);
}
else
{
- api = AB_Banking_new("gnucash", NULL, 0);
- g_return_val_if_fail(api, NULL);
+ api = AB_Banking_new ("gnucash", NULL, 0);
+ g_return_val_if_fail (api, NULL);
#if AQBANKING_VERSION_INT >= 59925 \
|| (AQBANKING_VERSION_INT >= 50709 && AQBANKING_VERSION_INT < 59900)
@@ -200,26 +200,26 @@ gnc_AB_BANKING_new(void)
https://www.hbci-zka.de/register/prod_register.htm (where the
registration was requested and is managed by cstim). The function call was
introduced in aqbanking-5.99.25 and aqbanking-5.7.9. */
- AB_Banking_RuntimeConfig_SetCharValue(api, "fintsRegistrationKey", "412748A1836CDD07181CE1910");
- AB_Banking_RuntimeConfig_SetCharValue(api, "fintsApplicationVersionString", PROJECT_VERSION);
+ AB_Banking_RuntimeConfig_SetCharValue (api, "fintsRegistrationKey", "412748A1836CDD07181CE1910");
+ AB_Banking_RuntimeConfig_SetCharValue (api, "fintsApplicationVersionString", PROJECT_VERSION);
#endif
#ifndef AQBANKING6
/* Check for config migration */
- if (AB_Banking_HasConf4(api) != 0)
+ if (AB_Banking_HasConf4 (api) != 0)
{
- if (AB_Banking_HasConf3(api) == 0)
+ if (AB_Banking_HasConf3 (api) == 0)
{
PINFO("gnc_AB_BANKING_new: importing aqbanking3 configuration\n");
- if (AB_Banking_ImportConf3(api) < 0)
+ if (AB_Banking_ImportConf3 (api) < 0)
{
PINFO("gnc_AB_BANKING_new: unable to import aqbanking3 configuration\n");
}
}
- else if (AB_Banking_HasConf2(api) == 0)
+ else if (AB_Banking_HasConf2 (api) == 0)
{
PINFO("gnc_AB_BANKING_new: importing aqbanking2 configuration\n");
- if (AB_Banking_ImportConf2(api) < 0)
+ if (AB_Banking_ImportConf2 (api) < 0)
{
PINFO("gnc_AB_BANKING_new: unable to import aqbanking2 configuration\n");
}
@@ -228,9 +228,9 @@ gnc_AB_BANKING_new(void)
#endif
/* Init the API */
- g_return_val_if_fail(AB_Banking_Init(api) == 0, NULL);
- gnc_gwengui_extended_by_ABBanking = GWEN_Gui_GetGui();
- AB_Gui_Extend(gnc_gwengui_extended_by_ABBanking, api);
+ g_return_val_if_fail (AB_Banking_Init (api) == 0, NULL);
+ gnc_gwengui_extended_by_ABBanking = GWEN_Gui_GetGui ();
+ AB_Gui_Extend (gnc_gwengui_extended_by_ABBanking, api);
/* Cache it */
gnc_AB_BANKING = api;
@@ -243,7 +243,7 @@ gnc_AB_BANKING_new(void)
}
void
-gnc_AB_BANKING_delete(AB_BANKING *api)
+gnc_AB_BANKING_delete (AB_BANKING *api)
{
if (!api)
api = gnc_AB_BANKING;
@@ -253,47 +253,47 @@ gnc_AB_BANKING_delete(AB_BANKING *api)
if (api == gnc_AB_BANKING)
{
gnc_AB_BANKING = NULL;
- gnc_AB_BANKING_fini(api);
+ gnc_AB_BANKING_fini (api);
}
- AB_Banking_free(api);
+ AB_Banking_free (api);
}
}
gint
-gnc_AB_BANKING_fini(AB_BANKING *api)
+gnc_AB_BANKING_fini (AB_BANKING *api)
{
if (api == gnc_AB_BANKING)
{
if (--gnc_AB_BANKING_refcount == 0)
{
if (gnc_gwengui_extended_by_ABBanking)
- AB_Gui_Unextend(gnc_gwengui_extended_by_ABBanking);
+ AB_Gui_Unextend (gnc_gwengui_extended_by_ABBanking);
gnc_gwengui_extended_by_ABBanking = NULL;
- return AB_Banking_Fini(api);
+ return AB_Banking_Fini (api);
}
}
else
{
if (gnc_gwengui_extended_by_ABBanking)
- AB_Gui_Unextend(gnc_gwengui_extended_by_ABBanking);
+ AB_Gui_Unextend (gnc_gwengui_extended_by_ABBanking);
gnc_gwengui_extended_by_ABBanking = NULL;
- return AB_Banking_Fini(api);
+ return AB_Banking_Fini (api);
}
return 0;
}
GNC_AB_ACCOUNT_SPEC *
-gnc_ab_get_ab_account(const AB_BANKING *api, Account *gnc_acc)
+gnc_ab_get_ab_account (const AB_BANKING *api, Account *gnc_acc)
{
GNC_AB_ACCOUNT_SPEC *ab_account = NULL;
const gchar *bankcode = NULL;
const gchar *accountid = NULL;
guint32 account_uid = 0;
- bankcode = gnc_ab_get_account_bankcode(gnc_acc);
- accountid = gnc_ab_get_account_accountid(gnc_acc);
+ bankcode = gnc_ab_get_account_bankcode (gnc_acc);
+ accountid = gnc_ab_get_account_accountid (gnc_acc);
account_uid = gnc_ab_get_account_uid (gnc_acc);
if (account_uid > 0)
@@ -301,7 +301,7 @@ gnc_ab_get_ab_account(const AB_BANKING *api, Account *gnc_acc)
#ifdef AQBANKING6
gint rv;
- rv = AB_Banking_GetAccountSpecByUniqueId(api, account_uid, &ab_account);
+ rv = AB_Banking_GetAccountSpecByUniqueId (api, account_uid, &ab_account);
if ( (rv<0 || !ab_account) && bankcode && *bankcode &&
accountid && *accountid)
@@ -315,22 +315,22 @@ gnc_ab_get_ab_account(const AB_BANKING *api, Account *gnc_acc)
}
return ab_account;
#else
- ab_account = AB_Banking_GetAccount(api, account_uid);
+ ab_account = AB_Banking_GetAccount (api, account_uid);
if (!ab_account && bankcode && *bankcode && accountid && *accountid)
{
PINFO("gnc_ab_get_ab_account: No AB_ACCOUNT found for UID %d, "
"trying bank code\n", account_uid);
- ab_account = AB_Banking_GetAccountByCodeAndNumber(api, bankcode,
- accountid);
+ ab_account = AB_Banking_GetAccountByCodeAndNumber (api, bankcode,
+ accountid);
}
return ab_account;
}
else if (bankcode && *bankcode && accountid && *accountid)
{
- ab_account = AB_Banking_GetAccountByCodeAndNumber(api, bankcode,
- accountid);
+ ab_account = AB_Banking_GetAccountByCodeAndNumber (api, bankcode,
+ accountid);
return ab_account;
#endif
}
@@ -339,19 +339,19 @@ gnc_ab_get_ab_account(const AB_BANKING *api, Account *gnc_acc)
}
gchar *
-gnc_AB_VALUE_to_readable_string(const AB_VALUE *value)
+gnc_AB_VALUE_to_readable_string (const AB_VALUE *value)
{
if (value)
- return g_strdup_printf("%.2f %s",
- AB_Value_GetValueAsDouble(value),
- AB_Value_GetCurrency(value));
+ return g_strdup_printf ("%.2f %s",
+ AB_Value_GetValueAsDouble (value),
+ AB_Value_GetCurrency (value));
else
- return g_strdup_printf("%.2f", 0.0);
+ return g_strdup_printf ("%.2f", 0.0);
}
gchar*
-gnc_ab_create_online_id(const gchar *bankcode, const gchar *accountnumber)
+gnc_ab_create_online_id (const gchar *bankcode, const gchar *accountnumber)
{
gchar *online_id;
@@ -364,9 +364,9 @@ gnc_ab_create_online_id(const gchar *bankcode, const gchar *accountnumber)
while (accountnumber && *accountnumber == '0')
accountnumber++;
- online_id = g_strconcat(bankcode ? bankcode : "",
- accountnumber ? accountnumber : "",
- (gchar*)NULL);
+ online_id = g_strconcat (bankcode ? bankcode : "",
+ accountnumber ? accountnumber : "",
+ (gchar*)NULL);
return online_id;
}
@@ -376,7 +376,7 @@ gnc_ab_create_online_id(const gchar *bankcode, const gchar *accountnumber)
* to the rest.
*/
static gpointer
-join_ab_strings_cb(const gchar *str, gpointer user_data)
+join_ab_strings_cb (const gchar *str, gpointer user_data)
{
gchar **acc = user_data;
gchar *tmp;
@@ -384,15 +384,15 @@ join_ab_strings_cb(const gchar *str, gpointer user_data)
if (!str || !*str)
return NULL;
- tmp = g_strdup(str);
- g_strstrip(tmp);
- gnc_utf8_strip_invalid_and_controls(tmp);
+ tmp = g_strdup (str);
+ g_strstrip (tmp);
+ gnc_utf8_strip_invalid_and_controls (tmp);
if (*acc)
{
- gchar *join = g_strjoin(" ", *acc, tmp, (gchar*) NULL);
- g_free(*acc);
- g_free(tmp);
+ gchar *join = g_strjoin (" ", *acc, tmp, (gchar*) NULL);
+ g_free (*acc);
+ g_free (tmp);
*acc = join;
}
else
@@ -403,7 +403,7 @@ join_ab_strings_cb(const gchar *str, gpointer user_data)
}
gchar *
-gnc_ab_get_remote_name(const AB_TRANSACTION *ab_trans)
+gnc_ab_get_remote_name (const AB_TRANSACTION *ab_trans)
{
#ifdef AQBANKING6
const char* ab_remote_name;
@@ -412,19 +412,19 @@ gnc_ab_get_remote_name(const AB_TRANSACTION *ab_trans)
#endif
gchar *gnc_other_name = NULL;
- g_return_val_if_fail(ab_trans, NULL);
+ g_return_val_if_fail (ab_trans, NULL);
- ab_remote_name = AB_Transaction_GetRemoteName(ab_trans);
+ ab_remote_name = AB_Transaction_GetRemoteName (ab_trans);
if (ab_remote_name)
#ifdef AQBANKING6
gnc_other_name = g_strdup(ab_remote_name);
#else
- GWEN_StringList_ForEach(ab_remote_name, join_ab_strings_cb,
- &gnc_other_name);
+ GWEN_StringList_ForEach (ab_remote_name, join_ab_strings_cb,
+ &gnc_other_name);
#endif
if (!gnc_other_name || !*gnc_other_name)
{
- g_free(gnc_other_name);
+ g_free (gnc_other_name);
gnc_other_name = NULL;
}
@@ -432,7 +432,7 @@ gnc_ab_get_remote_name(const AB_TRANSACTION *ab_trans)
}
gchar *
-gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx)
+gnc_ab_get_purpose (const AB_TRANSACTION *ab_trans, gboolean is_ofx)
{
#ifdef AQBANKING6
# if AQBANKING_VERSION_INT < 59929
@@ -445,16 +445,16 @@ gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx)
const char *ab_transactionText = NULL;
gchar *gnc_description = NULL;
- g_return_val_if_fail(ab_trans, g_strdup(""));
+ g_return_val_if_fail (ab_trans, g_strdup (""));
- if (!is_ofx && gnc_prefs_get_bool(GNC_PREFS_GROUP_AQBANKING, GNC_PREF_USE_TRANSACTION_TXT))
+ if (!is_ofx && gnc_prefs_get_bool (GNC_PREFS_GROUP_AQBANKING, GNC_PREF_USE_TRANSACTION_TXT))
{
/* According to AqBanking, some of the non-swift lines have a special
* meaning. Some banks place valuable text into the transaction text,
* hence we put this text in front of the purpose. */
- ab_transactionText = AB_Transaction_GetTransactionText(ab_trans);
+ ab_transactionText = AB_Transaction_GetTransactionText (ab_trans);
if (ab_transactionText)
- gnc_description = g_strdup(ab_transactionText);
+ gnc_description = g_strdup (ab_transactionText);
}
ab_purpose =
@@ -466,63 +466,63 @@ gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx)
#endif
(ab_trans);
if (ab_purpose)
- GWEN_StringList_ForEach(ab_purpose, join_ab_strings_cb,
- &gnc_description);
+ GWEN_StringList_ForEach (ab_purpose, join_ab_strings_cb,
+ &gnc_description);
#ifdef AQBANKING6
/* With aqbanking>=5.99, the return value must now be free'd */
- GWEN_StringList_free(ab_purpose);
+ GWEN_StringList_free (ab_purpose);
#endif
if (!gnc_description)
- gnc_description = g_strdup("");
+ gnc_description = g_strdup ("");
return gnc_description;
}
gchar *
-gnc_ab_description_to_gnc(const AB_TRANSACTION *ab_trans, gboolean is_ofx)
+gnc_ab_description_to_gnc (const AB_TRANSACTION *ab_trans, gboolean is_ofx)
{
/* Description */
- gchar *description = gnc_ab_get_purpose(ab_trans, is_ofx);
- gchar *other_name = gnc_ab_get_remote_name(ab_trans);
+ gchar *description = gnc_ab_get_purpose (ab_trans, is_ofx);
+ gchar *other_name = gnc_ab_get_remote_name (ab_trans);
gchar *retval;
if (other_name)
{
if (description && *description)
{
- retval = g_strdup_printf("%s; %s", description, other_name);
+ retval = g_strdup_printf ("%s; %s", description, other_name);
}
else
{
- retval = g_strdup(other_name);
+ retval = g_strdup (other_name);
}
}
else
{
if (description && *description)
{
- retval = g_strdup(description);
+ retval = g_strdup (description);
}
else
{
- retval = g_strdup(_("Unspecified"));
+ retval = g_strdup (_("Unspecified"));
}
}
- g_free(description);
- g_free(other_name);
+ g_free (description);
+ g_free (other_name);
return retval;
}
gchar *
-gnc_ab_memo_to_gnc(const AB_TRANSACTION *ab_trans)
+gnc_ab_memo_to_gnc (const AB_TRANSACTION *ab_trans)
{
const gchar *ab_remote_accountnumber =
- AB_Transaction_GetRemoteAccountNumber(ab_trans);
+ AB_Transaction_GetRemoteAccountNumber (ab_trans);
const gchar *ab_remote_bankcode =
- AB_Transaction_GetRemoteBankCode(ab_trans);
+ AB_Transaction_GetRemoteBankCode (ab_trans);
gchar *ab_other_accountid;
gchar *ab_other_bankcode;
@@ -534,20 +534,20 @@ gnc_ab_memo_to_gnc(const AB_TRANSACTION *ab_trans)
// For SEPA transactions, we need to ask for something different here
if (!ab_remote_accountnumber)
- ab_remote_accountnumber = AB_Transaction_GetRemoteIban(ab_trans);
+ ab_remote_accountnumber = AB_Transaction_GetRemoteIban (ab_trans);
if (!ab_remote_bankcode)
- ab_remote_bankcode = AB_Transaction_GetRemoteBic(ab_trans);
+ ab_remote_bankcode = AB_Transaction_GetRemoteBic (ab_trans);
- ab_other_accountid = g_strdup(ab_remote_accountnumber ? ab_remote_accountnumber : "");
- ab_other_bankcode = g_strdup(ab_remote_bankcode ? ab_remote_bankcode : "");
+ ab_other_accountid = g_strdup (ab_remote_accountnumber ? ab_remote_accountnumber : "");
+ ab_other_bankcode = g_strdup (ab_remote_bankcode ? ab_remote_bankcode : "");
/* Ensure string is in utf8 */
- gnc_utf8_strip_invalid(ab_other_accountid);
- gnc_utf8_strip_invalid(ab_other_bankcode);
+ gnc_utf8_strip_invalid (ab_other_accountid);
+ gnc_utf8_strip_invalid (ab_other_bankcode);
/* and -then- trim it */
- g_strstrip(ab_other_accountid);
- g_strstrip(ab_other_bankcode);
+ g_strstrip (ab_other_accountid);
+ g_strstrip (ab_other_bankcode);
have_accountid = ab_other_accountid && *ab_other_accountid;
@@ -555,27 +555,27 @@ gnc_ab_memo_to_gnc(const AB_TRANSACTION *ab_trans)
if ( have_accountid || have_bankcode )
{
- retval = g_strdup_printf("%s %s %s %s",
- have_accountid ? _("Account") : "",
- have_accountid ? ab_other_accountid : "",
- have_bankcode ? _("Bank") : "",
- have_bankcode ? ab_other_bankcode : ""
- );
- g_strstrip(retval);
+ retval = g_strdup_printf ("%s %s %s %s",
+ have_accountid ? _("Account") : "",
+ have_accountid ? ab_other_accountid : "",
+ have_bankcode ? _("Bank") : "",
+ have_bankcode ? ab_other_bankcode : ""
+ );
+ g_strstrip (retval);
}
else
{
- retval = g_strdup("");
+ retval = g_strdup ("");
}
- g_free(ab_other_accountid);
- g_free(ab_other_bankcode);
+ g_free (ab_other_accountid);
+ g_free (ab_other_bankcode);
return retval;
}
Transaction *
-gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_acc)
+gnc_ab_trans_to_gnc (const AB_TRANSACTION *ab_trans, Account *gnc_acc)
{
QofBook *book;
Transaction *gnc_trans;
@@ -587,12 +587,12 @@ gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_acc)
Split *split;
gchar *memo;
- g_return_val_if_fail(ab_trans && gnc_acc, NULL);
+ g_return_val_if_fail (ab_trans && gnc_acc, NULL);
/* Create new GnuCash transaction for the given AqBanking one */
- book = gnc_account_get_book(gnc_acc);
- gnc_trans = xaccMallocTransaction(book);
- xaccTransBeginEdit(gnc_trans);
+ book = gnc_account_get_book (gnc_acc);
+ gnc_trans = xaccMallocTransaction (book);
+ xaccTransBeginEdit (gnc_trans);
/* Date / Time */
/* SWIFT import formats (in particular MT940) provide for two
@@ -605,57 +605,56 @@ gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_acc)
* last balance instead of using the value date or NULL, making
* the field unreliable.
*/
- value_date = AB_Transaction_GetValutaDate(ab_trans);
+ value_date = AB_Transaction_GetValutaDate (ab_trans);
if (value_date)
- post_time = gnc_gwen_date_to_time64(value_date);
- else if ((post_date = AB_Transaction_GetDate(ab_trans))) // always true
- post_time = gnc_gwen_date_to_time64(post_date);
+ post_time = gnc_gwen_date_to_time64 (value_date);
+ else if ((post_date = AB_Transaction_GetDate (ab_trans))) // always true
+ post_time = gnc_gwen_date_to_time64 (post_date);
else
{
- g_warning("transaction_cb: Import had no transaction date");
+ g_warning ("transaction_cb: Import had no transaction date");
post_time = gnc_time (NULL);
}
- xaccTransSetDatePostedSecsNormalized(gnc_trans, post_time);
+ xaccTransSetDatePostedSecsNormalized (gnc_trans, post_time);
- xaccTransSetDateEnteredSecs(gnc_trans, gnc_time (NULL));
+ xaccTransSetDateEnteredSecs (gnc_trans, gnc_time (NULL));
/* Currency. We take simply the default currency of the gnucash account */
- xaccTransSetCurrency(gnc_trans, xaccAccountGetCommodity(gnc_acc));
+ xaccTransSetCurrency (gnc_trans, xaccAccountGetCommodity (gnc_acc));
/* Trans-Num or Split-Action set with gnc_set_num_action below per book
* option */
- fitid = AB_Transaction_GetFiId(ab_trans);
+ fitid = AB_Transaction_GetFiId (ab_trans);
/* Description */
- description = gnc_ab_description_to_gnc(ab_trans, (fitid && *fitid));
- xaccTransSetDescription(gnc_trans, description);
- g_free(description);
+ description = gnc_ab_description_to_gnc (ab_trans, (fitid && *fitid));
+ xaccTransSetDescription (gnc_trans, description);
+ g_free (description);
/* Notes. */
/* xaccTransSetNotes(gnc_trans, g_notes); */
/* But Nobody ever uses the Notes field? */
/* Add one split */
- split = xaccMallocSplit(book);
- xaccSplitSetParent(split, gnc_trans);
- xaccSplitSetAccount(split, gnc_acc);
+ split = xaccMallocSplit (book);
+ xaccSplitSetParent (split, gnc_trans);
+ xaccSplitSetAccount (split, gnc_acc);
/* Set the transaction number or split action field based on book option.
* We use the "customer reference", if there is one. */
- custref = AB_Transaction_GetCustomerReference(ab_trans);
- if (custref && *custref
- && g_ascii_strncasecmp(custref, "NONREF", 6) != 0)
+ custref = AB_Transaction_GetCustomerReference (ab_trans);
+ if (custref && *custref && g_ascii_strncasecmp (custref, "NONREF", 6) != 0)
gnc_set_num_action (gnc_trans, split, custref, NULL);
/* Set OFX unique transaction ID */
if (fitid && *fitid)
- gnc_import_set_split_online_id(split, fitid);
+ gnc_import_set_split_online_id (split, fitid);
/* FIXME: Extract function */
{
/* Amount into the split */
- const AB_VALUE *ab_value = AB_Transaction_GetValue(ab_trans);
+ const AB_VALUE *ab_value = AB_Transaction_GetValue (ab_trans);
double d_value = ab_value ? AB_Value_GetValueAsDouble (ab_value) : 0.0;
AB_TRANSACTION_TYPE ab_type = AB_Transaction_GetType (ab_trans);
gnc_numeric gnc_amount;
@@ -667,19 +666,19 @@ gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_acc)
if (d_value > 0.0 && ab_type == AB_Transaction_TypeTransfer)
d_value = -d_value;
- gnc_amount = double_to_gnc_numeric(
+ gnc_amount = double_to_gnc_numeric (
d_value,
- xaccAccountGetCommoditySCU(gnc_acc),
+ xaccAccountGetCommoditySCU (gnc_acc),
GNC_HOW_RND_ROUND_HALF_UP);
if (!ab_value)
- g_warning("transaction_cb: Oops, value was NULL. Using 0");
- xaccSplitSetBaseValue(split, gnc_amount, xaccAccountGetCommodity(gnc_acc));
+ g_warning ("transaction_cb: Oops, value was NULL. Using 0");
+ xaccSplitSetBaseValue (split, gnc_amount, xaccAccountGetCommodity (gnc_acc));
}
/* Memo in the Split. */
- memo = gnc_ab_memo_to_gnc(ab_trans);
- xaccSplitSetMemo(split, memo);
- g_free(memo);
+ memo = gnc_ab_memo_to_gnc (ab_trans);
+ xaccSplitSetMemo (split, memo);
+ g_free (memo);
return gnc_trans;
}
@@ -693,26 +692,26 @@ gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_acc)
* @return A GnuCash account, or NULL otherwise
*/
static Account *
-gnc_ab_accinfo_to_gnc_acc(GtkWidget *parent, AB_IMEXPORTER_ACCOUNTINFO *acc_info)
+gnc_ab_accinfo_to_gnc_acc (GtkWidget *parent, AB_IMEXPORTER_ACCOUNTINFO *acc_info)
{
const gchar *bankcode, *accountnumber;
gchar *online_id;
Account *gnc_acc;
- g_return_val_if_fail(acc_info, NULL);
+ g_return_val_if_fail (acc_info, NULL);
- bankcode = AB_ImExporterAccountInfo_GetBankCode(acc_info);
- accountnumber = AB_ImExporterAccountInfo_GetAccountNumber(acc_info);
- online_id = gnc_ab_create_online_id(bankcode, accountnumber);
- gnc_acc = gnc_import_select_account(
- parent, online_id, 1, AB_ImExporterAccountInfo_GetAccountName(acc_info),
+ bankcode = AB_ImExporterAccountInfo_GetBankCode (acc_info);
+ accountnumber = AB_ImExporterAccountInfo_GetAccountNumber (acc_info);
+ online_id = gnc_ab_create_online_id (bankcode, accountnumber);
+ gnc_acc = gnc_import_select_account (parent, online_id, 1,
+ AB_ImExporterAccountInfo_GetAccountName (acc_info),
NULL, ACCT_TYPE_NONE, NULL, NULL);
if (!gnc_acc)
{
- g_warning("gnc_ab_accinfo_to_gnc_acc: Could not determine source account"
- " for online_id %s", online_id);
+ g_warning ("gnc_ab_accinfo_to_gnc_acc: Could not determine source account"
+ " for online_id %s", online_id);
}
- g_free(online_id);
+ g_free (online_id);
return gnc_acc;
}
@@ -727,7 +726,7 @@ gnc_ab_accinfo_to_gnc_acc(GtkWidget *parent, AB_IMEXPORTER_ACCOUNTINFO *acc_info
* @return A GnuCash account, or NULL otherwise
*/
static Account *
-gnc_ab_txn_to_gnc_acc(GtkWidget *parent, const AB_TRANSACTION *transaction)
+gnc_ab_txn_to_gnc_acc (GtkWidget *parent, const AB_TRANSACTION *transaction)
{
const gchar *bankcode, *accountnumber;
gchar *online_id;
@@ -735,63 +734,63 @@ gnc_ab_txn_to_gnc_acc(GtkWidget *parent, const AB_TRANSACTION *transaction)
g_return_val_if_fail(transaction, NULL);
- bankcode = AB_Transaction_GetLocalBankCode(transaction);
- accountnumber = AB_Transaction_GetLocalAccountNumber(transaction);
+ bankcode = AB_Transaction_GetLocalBankCode (transaction);
+ accountnumber = AB_Transaction_GetLocalAccountNumber (transaction);
if (!bankcode && !accountnumber)
{
return NULL;
}
- online_id = gnc_ab_create_online_id(bankcode, accountnumber);
- gnc_acc = gnc_import_select_account(
- parent, online_id, 1, AB_Transaction_GetLocalName(transaction),
+ online_id = gnc_ab_create_online_id (bankcode, accountnumber);
+ gnc_acc = gnc_import_select_account (parent, online_id, 1,
+ AB_Transaction_GetLocalName (transaction),
NULL, ACCT_TYPE_NONE, NULL, NULL);
if (!gnc_acc)
{
- g_warning("gnc_ab_txn_to_gnc_acc: Could not determine source account"
- " for online_id %s", online_id);
+ g_warning ("gnc_ab_txn_to_gnc_acc: Could not determine source account"
+ " for online_id %s", online_id);
}
- g_free(online_id);
+ g_free (online_id);
return gnc_acc;
}
static const AB_TRANSACTION *
-txn_transaction_cb(const AB_TRANSACTION *element, gpointer user_data)
+txn_transaction_cb (const AB_TRANSACTION *element, gpointer user_data)
{
GncABImExContextImport *data = user_data;
Transaction *gnc_trans;
GncABTransType trans_type;
Account* txnacc;
- g_return_val_if_fail(element && data, NULL);
+ g_return_val_if_fail (element && data, NULL);
/* Create a GnuCash transaction from ab_trans */
- txnacc = gnc_ab_txn_to_gnc_acc(GTK_WIDGET(data->parent), element);
- gnc_trans = gnc_ab_trans_to_gnc(element, txnacc ? txnacc : data->gnc_acc);
+ txnacc = gnc_ab_txn_to_gnc_acc (GTK_WIDGET(data->parent), element);
+ gnc_trans = gnc_ab_trans_to_gnc (element, txnacc ? txnacc : data->gnc_acc);
if (data->execute_txns && data->ab_acc)
{
- AB_TRANSACTION *ab_trans = AB_Transaction_dup(element);
+ AB_TRANSACTION *ab_trans = AB_Transaction_dup (element);
GNC_AB_JOB *job;
/* NEW: The imported transaction has been imported into gnucash.
* Now also add it as a job to aqbanking */
#ifdef AQBANKING6
- AB_Transaction_SetLocalBankCode(
- ab_trans, AB_AccountSpec_GetBankCode(data->ab_acc));
- AB_Transaction_SetLocalAccountNumber(
- ab_trans, AB_AccountSpec_GetAccountNumber(data->ab_acc));
+ AB_Transaction_SetLocalBankCode (
+ ab_trans, AB_AccountSpec_GetBankCode (data->ab_acc));
+ AB_Transaction_SetLocalAccountNumber (
+ ab_trans, AB_AccountSpec_GetAccountNumber (data->ab_acc));
#else
- AB_Transaction_SetLocalBankCode(
- ab_trans, AB_Account_GetBankCode(data->ab_acc));
- AB_Transaction_SetLocalAccountNumber(
- ab_trans, AB_Account_GetAccountNumber(data->ab_acc));
+ AB_Transaction_SetLocalBankCode (
+ ab_trans, AB_Account_GetBankCode (data->ab_acc));
+ AB_Transaction_SetLocalAccountNumber (
+ ab_trans, AB_Account_GetAccountNumber (data->ab_acc));
#endif
- AB_Transaction_SetLocalCountry(ab_trans, "DE");
+ AB_Transaction_SetLocalCountry (ab_trans, "DE");
- switch (AB_Transaction_GetType(ab_trans))
+ switch (AB_Transaction_GetType (ab_trans))
{
case AB_Transaction_TypeDebitNote:
trans_type = SINGLE_DEBITNOTE;
@@ -808,18 +807,18 @@ txn_transaction_cb(const AB_TRANSACTION *element, gpointer user_data)
break;
} /* switch */
- job = gnc_ab_get_trans_job(data->ab_acc, ab_trans, trans_type);
+ job = gnc_ab_get_trans_job (data->ab_acc, ab_trans, trans_type);
/* Check whether we really got a job */
#ifdef AQBANKING6
- if (!job || AB_AccountSpec_GetTransactionLimitsForCommand(data->ab_acc, AB_Transaction_GetCommand(job))==NULL)
+ if (!job || AB_AccountSpec_GetTransactionLimitsForCommand (data->ab_acc, AB_Transaction_GetCommand (job)) == NULL)
#else
- if (!job || AB_Job_CheckAvailability(job))
+ if (!job || AB_Job_CheckAvailability (job))
#endif
{
/* Oops, no job, probably not supported by bank */
- if (gnc_verify_dialog(
- GTK_WINDOW (data->parent), FALSE, "%s",
+ if (gnc_verify_dialog (
+ GTK_WINDOW(data->parent), FALSE, "%s",
_("The backend found an error during the preparation "
"of the job. It is not possible to execute this job.\n"
"\n"
@@ -830,101 +829,101 @@ txn_transaction_cb(const AB_TRANSACTION *element, gpointer user_data)
"\n"
"Do you want to enter the job again?")))
{
- gnc_error_dialog (GTK_WINDOW (data->parent),
+ gnc_error_dialog (GTK_WINDOW(data->parent),
"Sorry, not implemented yet. Please check the console or trace file logs to see which job was rejected.");
}
}
else
{
- gnc_gen_trans_list_add_trans_with_ref_id(data->generic_importer,
- gnc_trans,
+ gnc_gen_trans_list_add_trans_with_ref_id (data->generic_importer,
+ gnc_trans,
#ifdef AQBANKING6
- AB_Transaction_GetUniqueId(job));
+ AB_Transaction_GetUniqueId (job));
#else
- AB_Job_GetJobId(job));
+ AB_Job_GetJobId (job));
#endif
/* AB_Job_List2_PushBack(data->job_list, job); -> delayed until trans is successfully imported */
- g_datalist_set_data(&data->tmp_job_list, gnc_AB_JOB_to_readable_string(job), job);
+ g_datalist_set_data (&data->tmp_job_list, gnc_AB_JOB_to_readable_string (job), job);
}
- AB_Transaction_free(ab_trans);
+ AB_Transaction_free (ab_trans);
}
else
{
/* Instead of xaccTransCommitEdit(gnc_trans) */
- gnc_gen_trans_list_add_trans(data->generic_importer, gnc_trans);
+ gnc_gen_trans_list_add_trans (data->generic_importer, gnc_trans);
}
return NULL;
}
-static void gnc_ab_trans_processed_cb(GNCImportTransInfo *trans_info,
- gboolean imported,
- gpointer user_data)
+static void gnc_ab_trans_processed_cb (GNCImportTransInfo *trans_info,
+ gboolean imported,
+ gpointer user_data)
{
GncABImExContextImport *data = user_data;
- gchar *jobname = gnc_AB_JOB_ID_to_string(gnc_import_TransInfo_get_ref_id(trans_info));
- GNC_AB_JOB *job = g_datalist_get_data(&data->tmp_job_list, jobname);
+ gchar *jobname = gnc_AB_JOB_ID_to_string (gnc_import_TransInfo_get_ref_id (trans_info));
+ GNC_AB_JOB *job = g_datalist_get_data (&data->tmp_job_list, jobname);
if (imported)
{
#ifdef AQBANKING6
- AB_Transaction_List2_PushBack(data->job_list, job);
+ AB_Transaction_List2_PushBack (data->job_list, job);
#else
- AB_Job_List2_PushBack(data->job_list, job);
+ AB_Job_List2_PushBack (data->job_list, job);
#endif
}
else
{
#ifdef AQBANKING6
- AB_Transaction_free(job);
+ AB_Transaction_free (job);
#else
- AB_Job_free(job);
+ AB_Job_free (job);
#endif
}
- g_datalist_remove_data(&data->tmp_job_list, jobname);
+ g_datalist_remove_data (&data->tmp_job_list, jobname);
}
gchar *
-gnc_AB_JOB_to_readable_string(const GNC_AB_JOB *job)
+gnc_AB_JOB_to_readable_string (const GNC_AB_JOB *job)
{
if (job)
{
#ifdef AQBANKING6
- return gnc_AB_JOB_ID_to_string(AB_Transaction_GetUniqueId(job));
+ return gnc_AB_JOB_ID_to_string (AB_Transaction_GetUniqueId (job));
#else
- return gnc_AB_JOB_ID_to_string(AB_Job_GetJobId(job));
+ return gnc_AB_JOB_ID_to_string (AB_Job_GetJobId (job));
#endif
}
else
{
- return gnc_AB_JOB_ID_to_string(0);
+ return gnc_AB_JOB_ID_to_string (0);
}
}
gchar *
-gnc_AB_JOB_ID_to_string(gulong job_id)
+gnc_AB_JOB_ID_to_string (gulong job_id)
{
- return g_strdup_printf("job_%lu", job_id);
+ return g_strdup_printf ("job_%lu", job_id);
}
static AB_IMEXPORTER_ACCOUNTINFO *
-txn_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
+txn_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
{
GncABImExContextImport *data = user_data;
Account *gnc_acc;
- g_return_val_if_fail(element && data, NULL);
+ g_return_val_if_fail (element && data, NULL);
if (data->awaiting & IGNORE_TRANSACTIONS)
/* Ignore them */
return NULL;
#ifdef AQBANKING6
- if (!AB_ImExporterAccountInfo_GetFirstTransaction(element, AB_Transaction_TypeStatement, 0))
+ if (!AB_ImExporterAccountInfo_GetFirstTransaction (element, AB_Transaction_TypeStatement, 0))
#else
- if (!AB_ImExporterAccountInfo_GetFirstTransaction(element))
+ if (!AB_ImExporterAccountInfo_GetFirstTransaction (element))
#endif
/* No transaction found */
return NULL;
@@ -933,7 +932,7 @@ txn_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
if (!(data->awaiting & AWAIT_TRANSACTIONS))
{
- if (gnc_verify_dialog (GTK_WINDOW (data->parent), TRUE, "%s",
+ if (gnc_verify_dialog (GTK_WINDOW(data->parent), TRUE, "%s",
_("The bank has sent transaction information "
"in its response."
"\n"
@@ -949,7 +948,7 @@ txn_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
}
/* Lookup the corresponding gnucash account */
- gnc_acc = gnc_ab_accinfo_to_gnc_acc(GTK_WIDGET(data->parent), element);
+ gnc_acc = gnc_ab_accinfo_to_gnc_acc (GTK_WIDGET(data->parent), element);
if (!gnc_acc) return NULL;
data->gnc_acc = gnc_acc;
@@ -957,13 +956,13 @@ txn_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
{
/* Retrieve the aqbanking account that belongs to this gnucash
* account */
- data->ab_acc = gnc_ab_get_ab_account(data->api, gnc_acc);
+ data->ab_acc = gnc_ab_get_ab_account (data->api, gnc_acc);
if (!data->ab_acc)
{
- gnc_error_dialog(GTK_WINDOW (data->parent), "%s",
- _("No Online Banking account found for this "
- "gnucash account. These transactions will "
- "not be executed by Online Banking."));
+ gnc_error_dialog (GTK_WINDOW(data->parent), "%s",
+ _("No Online Banking account found for this "
+ "gnucash account. These transactions will "
+ "not be executed by Online Banking."));
}
}
else
@@ -973,33 +972,33 @@ txn_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
if (!data->generic_importer)
{
- data->generic_importer = gnc_gen_trans_list_new(data->parent, NULL,
- TRUE, 14, TRUE);
+ data->generic_importer = gnc_gen_trans_list_new (data->parent, NULL,
+ TRUE, 14, TRUE);
if (data->execute_txns)
{
- gnc_gen_trans_list_add_tp_cb(data->generic_importer,
- gnc_ab_trans_processed_cb, data);
+ gnc_gen_trans_list_add_tp_cb (data->generic_importer,
+ gnc_ab_trans_processed_cb, data);
}
}
/* Iterate through all transactions */
#ifdef AQBANKING6
{
- AB_TRANSACTION_LIST *ab_trans_list = AB_ImExporterAccountInfo_GetTransactionList(element);
+ AB_TRANSACTION_LIST *ab_trans_list = AB_ImExporterAccountInfo_GetTransactionList (element);
if (ab_trans_list)
- AB_Transaction_List_ForEachByType(ab_trans_list,
- txn_transaction_cb, data,
- AB_Transaction_TypeStatement, 0);
+ AB_Transaction_List_ForEachByType (ab_trans_list,
+ txn_transaction_cb, data,
+ AB_Transaction_TypeStatement, 0);
}
#else
- AB_ImExporterAccountInfo_TransactionsForEach(element, txn_transaction_cb,
- data);
+ AB_ImExporterAccountInfo_TransactionsForEach (element, txn_transaction_cb,
+ data);
#endif
return NULL;
}
static AB_IMEXPORTER_ACCOUNTINFO *
-bal_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
+bal_accountinfo_cb (AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
{
GncABImExContextImport *data = user_data;
Account *gnc_acc;
@@ -1014,16 +1013,16 @@ bal_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
AB_ACCOUNT_STATUS *best = NULL;
#endif
- g_return_val_if_fail(element && data, NULL);
+ g_return_val_if_fail (element && data, NULL);
if (data->awaiting & IGNORE_BALANCES)
/* Ignore them */
return NULL;
#ifdef AQBANKING6
- if (!AB_ImExporterAccountInfo_GetFirstBalance(element))
+ if (!AB_ImExporterAccountInfo_GetFirstBalance (element))
#else
- if (!AB_ImExporterAccountInfo_GetFirstAccountStatus(element))
+ if (!AB_ImExporterAccountInfo_GetFirstAccountStatus (element))
#endif
/* No balance found */
return NULL;
@@ -1032,39 +1031,39 @@ bal_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
#ifdef AQBANKING6
/* Lookup the most recent BALANCE available */
- booked_bal=AB_Balance_List_GetLatestByType(AB_ImExporterAccountInfo_GetBalanceList(element),
- AB_Balance_TypeBooked);
+ booked_bal = AB_Balance_List_GetLatestByType (AB_ImExporterAccountInfo_GetBalanceList (element),
+ AB_Balance_TypeBooked);
#else
{
AB_ACCOUNT_STATUS *item = NULL;
const GWEN_TIME *best_time = NULL;
/* Lookup the most recent ACCOUNT_STATUS available */
- item = AB_ImExporterAccountInfo_GetFirstAccountStatus(element);
+ item = AB_ImExporterAccountInfo_GetFirstAccountStatus (element);
while (item)
{
- const GWEN_TIME *item_time = AB_AccountStatus_GetTime(item);
- if (!best || GWEN_Time_Diff(best_time, item_time) < 0.0)
+ const GWEN_TIME *item_time = AB_AccountStatus_GetTime (item);
+ if (!best || GWEN_Time_Diff (best_time, item_time) < 0.0)
{
best = item;
best_time = item_time;
}
- item = AB_ImExporterAccountInfo_GetNextAccountStatus(element);
+ item = AB_ImExporterAccountInfo_GetNextAccountStatus (element);
}
- booked_bal = AB_AccountStatus_GetBookedBalance(best);
+ booked_bal = AB_AccountStatus_GetBookedBalance (best);
}
#endif
if (!(data->awaiting & AWAIT_BALANCES))
{
GtkWindow *parent = data->generic_importer ?
- GTK_WINDOW(gnc_gen_trans_list_widget(data->generic_importer)) :
+ GTK_WINDOW(gnc_gen_trans_list_widget (data->generic_importer)) :
GTK_WINDOW(data->parent);
const char* balance_msg =
_("The bank has sent balance information in its response.\n"
"Do you want to import it?");
/* Ignore zero balances if we don't await a balance */
- if (!booked_bal || AB_Value_IsZero(AB_Balance_GetValue(booked_bal)))
+ if (!booked_bal || AB_Value_IsZero (AB_Balance_GetValue (booked_bal)))
return NULL;
/* Ask the user whether to import unawaited non-zero balance */
@@ -1080,7 +1079,7 @@ bal_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
}
/* Lookup the corresponding gnucash account */
- gnc_acc = gnc_ab_accinfo_to_gnc_acc(GTK_WIDGET (data->parent), element);
+ gnc_acc = gnc_ab_accinfo_to_gnc_acc (GTK_WIDGET(data->parent), element);
if (!gnc_acc) return NULL;
data->gnc_acc = gnc_acc;
@@ -1088,68 +1087,68 @@ bal_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
if (booked_bal)
{
#ifdef AQBANKING6
- const GWEN_DATE *ti = AB_Balance_GetDate(booked_bal);
+ const GWEN_DATE *ti = AB_Balance_GetDate (booked_bal);
#else
- const GNC_GWEN_DATE *ti = AB_Balance_GetTime(booked_bal);
+ const GNC_GWEN_DATE *ti = AB_Balance_GetTime (booked_bal);
#endif
if (ti)
{
- booked_tt = gnc_gwen_date_to_time64(ti);
+ booked_tt = gnc_gwen_date_to_time64 (ti);
}
else
{
/* No time found? Use today because the HBCI query asked for today's
* balance. */
- booked_tt = gnc_time64_get_day_neutral(gnc_time(NULL));
+ booked_tt = gnc_time64_get_day_neutral (gnc_time (NULL));
}
- booked_val = AB_Balance_GetValue(booked_bal);
+ booked_val = AB_Balance_GetValue (booked_bal);
if (booked_val)
{
- booked_value = AB_Value_GetValueAsDouble(booked_val);
+ booked_value = AB_Value_GetValueAsDouble (booked_val);
}
else
{
- g_warning("bal_accountinfo_cb: booked_val == NULL. Assuming 0");
+ g_warning ("bal_accountinfo_cb: booked_val == NULL. Assuming 0");
booked_value = 0.0;
}
}
else
{
- g_warning("bal_accountinfo_cb: booked_bal == NULL. Assuming 0");
+ g_warning ("bal_accountinfo_cb: booked_bal == NULL. Assuming 0");
booked_tt = 0;
booked_value = 0.0;
}
/* Lookup noted balance */
#ifdef AQBANKING6
- noted_bal = AB_Balance_List_GetLatestByType(AB_ImExporterAccountInfo_GetBalanceList(element),
- AB_Balance_TypeNoted);
+ noted_bal = AB_Balance_List_GetLatestByType (AB_ImExporterAccountInfo_GetBalanceList (element),
+ AB_Balance_TypeNoted);
#else
- noted_bal = AB_AccountStatus_GetNotedBalance(best);
+ noted_bal = AB_AccountStatus_GetNotedBalance (best);
#endif
if (noted_bal)
{
- noted_val = AB_Balance_GetValue(noted_bal);
+ noted_val = AB_Balance_GetValue (noted_bal);
if (noted_val)
- noted_value = AB_Value_GetValueAsDouble(noted_val);
+ noted_value = AB_Value_GetValueAsDouble (noted_val);
else
{
- g_warning("bal_accountinfo_cb: noted_val == NULL. Assuming 0");
+ g_warning ("bal_accountinfo_cb: noted_val == NULL. Assuming 0");
noted_value = 0.0;
}
}
else
{
- g_warning("bal_accountinfo_cb: noted_bal == NULL. Assuming 0");
+ g_warning ("bal_accountinfo_cb: noted_bal == NULL. Assuming 0");
noted_value = 0.0;
}
- value = double_to_gnc_numeric(booked_value,
- xaccAccountGetCommoditySCU(gnc_acc),
- GNC_HOW_RND_ROUND_HALF_UP);
+ value = double_to_gnc_numeric (booked_value,
+ xaccAccountGetCommoditySCU (gnc_acc),
+ GNC_HOW_RND_ROUND_HALF_UP);
if (noted_value == 0.0 && booked_value == 0.0)
{
- dialog = gtk_message_dialog_new(
+ dialog = gtk_message_dialog_new (
GTK_WINDOW(data->parent),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
@@ -1169,82 +1168,82 @@ bal_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
"Online Banking version number in the Online Banking "
"(AqBanking or HBCI) Setup. After that, try again to "
"download the Online Banking Balance."));
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ gtk_dialog_run (GTK_DIALOG(dialog));
+ gtk_widget_destroy (dialog);
}
else
{
- gnc_numeric reconc_balance = xaccAccountGetReconciledBalance(gnc_acc);
+ gnc_numeric reconc_balance = xaccAccountGetReconciledBalance (gnc_acc);
- gchar *booked_str = gnc_AB_VALUE_to_readable_string(booked_val);
- gchar *message1 = g_strdup_printf(
+ gchar *booked_str = gnc_AB_VALUE_to_readable_string (booked_val);
+ gchar *message1 = g_strdup_printf (
_("Result of Online Banking job:\n"
"Account booked balance is %s"),
booked_str);
gchar *message2 =
(noted_value == 0.0) ?
- g_strdup("") :
- g_strdup_printf(_("For your information: This account also "
- "has a noted balance of %s\n"),
- gnc_AB_VALUE_to_readable_string(noted_val));
+ g_strdup ("") :
+ g_strdup_printf (_("For your information: This account also "
+ "has a noted balance of %s\n"),
+ gnc_AB_VALUE_to_readable_string (noted_val));
- if (gnc_numeric_equal(value, reconc_balance))
+ if (gnc_numeric_equal (value, reconc_balance))
{
const gchar *message3 =
_("The booked balance is identical to the current "
"reconciled balance of the account.");
- dialog = gtk_message_dialog_new(
+ dialog = gtk_message_dialog_new (
GTK_WINDOW(data->parent),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
GTK_BUTTONS_OK,
"%s\n%s\n%s",
message1, message2, message3);
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(GTK_WIDGET(dialog));
+ gtk_dialog_run (GTK_DIALOG(dialog));
+ gtk_widget_destroy (GTK_WIDGET(dialog));
}
else
{
const char *message3 = _("Reconcile account now?");
- show_recn_window = gnc_verify_dialog (GTK_WINDOW (data->parent), TRUE, "%s\n%s\n%s",
- message1, message2, message3);
+ show_recn_window = gnc_verify_dialog (GTK_WINDOW(data->parent), TRUE, "%s\n%s\n%s",
+ message1, message2, message3);
}
- g_free(booked_str);
- g_free(message1);
- g_free(message2);
+ g_free (booked_str);
+ g_free (message1);
+ g_free (message2);
}
/* Show reconciliation window */
if (show_recn_window)
- recnWindowWithBalance(GTK_WIDGET (data->parent), gnc_acc, value, booked_tt);
+ recnWindowWithBalance (GTK_WIDGET(data->parent), gnc_acc, value, booked_tt);
return NULL;
}
GncABImExContextImport *
-gnc_ab_import_context(AB_IMEXPORTER_CONTEXT *context,
- guint awaiting, gboolean execute_txns,
- AB_BANKING *api, GtkWidget *parent)
+gnc_ab_import_context (AB_IMEXPORTER_CONTEXT *context,
+ guint awaiting, gboolean execute_txns,
+ AB_BANKING *api, GtkWidget *parent)
{
- GncABImExContextImport *data = g_new(GncABImExContextImport, 1);
+ GncABImExContextImport *data = g_new (GncABImExContextImport, 1);
#ifdef AQBANKING6
AB_IMEXPORTER_ACCOUNTINFO_LIST *ab_ail;
#endif
- g_return_val_if_fail(context, NULL);
+ g_return_val_if_fail (context, NULL);
/* Do not await and ignore at the same time */
- g_return_val_if_fail(!(awaiting & AWAIT_BALANCES)
- || !(awaiting & IGNORE_BALANCES),
- NULL);
- g_return_val_if_fail(!(awaiting & AWAIT_TRANSACTIONS)
- || !(awaiting & IGNORE_TRANSACTIONS),
- NULL);
+ g_return_val_if_fail (!(awaiting & AWAIT_BALANCES)
+ || !(awaiting & IGNORE_BALANCES),
+ NULL);
+ g_return_val_if_fail (!(awaiting & AWAIT_TRANSACTIONS)
+ || !(awaiting & IGNORE_TRANSACTIONS),
+ NULL);
/* execute_txns must be FALSE if txns are not awaited */
- g_return_val_if_fail(awaiting & AWAIT_TRANSACTIONS || !execute_txns, NULL);
+ g_return_val_if_fail (awaiting & AWAIT_TRANSACTIONS || !execute_txns, NULL);
/* An api is needed for the jobs */
- g_return_val_if_fail(!execute_txns || api, NULL);
+ g_return_val_if_fail (!execute_txns || api, NULL);
data->awaiting = awaiting;
data->txn_found = FALSE;
@@ -1252,65 +1251,69 @@ gnc_ab_import_context(AB_IMEXPORTER_CONTEXT *context,
data->api = api;
data->parent = parent;
#ifdef AQBANKING6
- data->job_list = AB_Transaction_List2_new();
+ data->job_list = AB_Transaction_List2_new ();
#else
- data->job_list = AB_Job_List2_new();
+ data->job_list = AB_Job_List2_new ();
#endif
data->tmp_job_list = NULL;
data->generic_importer = NULL;
- g_datalist_init(&data->tmp_job_list);
+ g_datalist_init (&data->tmp_job_list);
/* Import transactions */
#ifdef AQBANKING6
- ab_ail = AB_ImExporterContext_GetAccountInfoList(context);
- if (ab_ail && AB_ImExporterAccountInfo_List_GetCount(ab_ail))
+ ab_ail = AB_ImExporterContext_GetAccountInfoList (context);
+ if (ab_ail && AB_ImExporterAccountInfo_List_GetCount (ab_ail))
{
if (!(awaiting & IGNORE_TRANSACTIONS))
- AB_ImExporterAccountInfo_List_ForEach(ab_ail, txn_accountinfo_cb,
- data);
+ AB_ImExporterAccountInfo_List_ForEach (ab_ail,
+ txn_accountinfo_cb,
+ data);
/* populate and display the matching window */
if (data->generic_importer)
- gnc_gen_trans_list_show_all(data->generic_importer);
+ gnc_gen_trans_list_show_all (data->generic_importer);
/* Check balances */
if (!(awaiting & IGNORE_BALANCES))
- AB_ImExporterAccountInfo_List_ForEach(ab_ail, bal_accountinfo_cb,
- data);
+ AB_ImExporterAccountInfo_List_ForEach (ab_ail,
+ bal_accountinfo_cb,
+ data);
}
#else
if (!(awaiting & IGNORE_TRANSACTIONS))
- AB_ImExporterContext_AccountInfoForEach(context, txn_accountinfo_cb,
- data);
+ AB_ImExporterContext_AccountInfoForEach (context,
+ txn_accountinfo_cb,
+ data);
/* populate and display the matching window */
if (data->generic_importer)
- gnc_gen_trans_list_show_all(data->generic_importer);
+ gnc_gen_trans_list_show_all (data->generic_importer);
/* Check balances */
if (!(awaiting & IGNORE_BALANCES))
- AB_ImExporterContext_AccountInfoForEach(context, bal_accountinfo_cb,
- data);
+ AB_ImExporterContext_AccountInfoForEach (context,
+ bal_accountinfo_cb,
+ data);
#endif
/* Check bank-messages */
{
- AB_MESSAGE * bankmsg = AB_ImExporterContext_GetFirstMessage(context);
+ AB_MESSAGE * bankmsg = AB_ImExporterContext_GetFirstMessage (context);
while (bankmsg)
{
- const char* subject = AB_Message_GetSubject(bankmsg);
- const char* text = AB_Message_GetText(bankmsg);
- gnc_info_dialog(GTK_WINDOW (data->parent), "%s\n%s %s\n%s",
- _("The bank has sent a message in its response."),
- _("Subject:"),
- subject,
- text);
+ const char* subject = AB_Message_GetSubject (bankmsg);
+ const char* text = AB_Message_GetText (bankmsg);
+ gnc_info_dialog (GTK_WINDOW(data->parent), "%s\n%s %s\n%s",
+ _("The bank has sent a message in its response."),
+ _("Subject:"),
+ subject,
+ text);
#ifdef AQBANKING6
- bankmsg = AB_Message_List_Next(bankmsg);
+ bankmsg = AB_Message_List_Next (bankmsg);
#else
- bankmsg = AB_ImExporterContext_GetNextMessage(context); // The iterator is incremented within aqbanking
+ bankmsg = AB_ImExporterContext_GetNextMessage (context); // The iterator is incremented within aqbanking
#endif
}
}
@@ -1319,81 +1322,81 @@ gnc_ab_import_context(AB_IMEXPORTER_CONTEXT *context,
}
guint
-gnc_ab_ieci_get_found(GncABImExContextImport *ieci)
+gnc_ab_ieci_get_found (GncABImExContextImport *ieci)
{
- g_return_val_if_fail(ieci, 0);
+ g_return_val_if_fail (ieci, 0);
return ieci->awaiting;
}
GNC_AB_JOB_LIST2 *
-gnc_ab_ieci_get_job_list(GncABImExContextImport *ieci)
+gnc_ab_ieci_get_job_list (GncABImExContextImport *ieci)
{
- g_return_val_if_fail(ieci, NULL);
+ g_return_val_if_fail (ieci, NULL);
return ieci->job_list;
}
gboolean
-gnc_ab_ieci_run_matcher(GncABImExContextImport *ieci)
+gnc_ab_ieci_run_matcher (GncABImExContextImport *ieci)
{
- g_return_val_if_fail(ieci, FALSE);
+ g_return_val_if_fail (ieci, FALSE);
- return gnc_gen_trans_list_run(ieci->generic_importer);
+ return gnc_gen_trans_list_run (ieci->generic_importer);
}
GWEN_DB_NODE *
-gnc_ab_get_permanent_certs(void)
+gnc_ab_get_permanent_certs (void)
{
int rv;
GWEN_DB_NODE *perm_certs = NULL;
- AB_BANKING *banking = gnc_AB_BANKING_new();
+ AB_BANKING *banking = gnc_AB_BANKING_new ();
- g_return_val_if_fail(banking, NULL);
- rv = AB_Banking_LoadSharedConfig(banking, "certs", &perm_certs);
- gnc_AB_BANKING_fini(banking);
- g_return_val_if_fail(rv >= 0, NULL);
+ g_return_val_if_fail (banking, NULL);
+ rv = AB_Banking_LoadSharedConfig (banking, "certs", &perm_certs);
+ gnc_AB_BANKING_fini (banking);
+ g_return_val_if_fail (rv >= 0, NULL);
return perm_certs;
}
#if (AQBANKING_VERSION_INT >= 60400)
GList*
-gnc_ab_trans_templ_list_new_from_ref_accounts(GNC_AB_ACCOUNT_SPEC *ab_acc)
+gnc_ab_trans_templ_list_new_from_ref_accounts (GNC_AB_ACCOUNT_SPEC *ab_acc)
{
GList *retval = NULL;
AB_REFERENCE_ACCOUNT *ra;
AB_REFERENCE_ACCOUNT_LIST *ral;
- GWEN_BUFFER *accNameForTemplate = GWEN_Buffer_new(0,120,0,0);
- gnc_numeric zero = gnc_numeric_zero();
+ GWEN_BUFFER *accNameForTemplate = GWEN_Buffer_new (0,120,0,0);
+ gnc_numeric zero = gnc_numeric_zero ();
/* get the target account list */
- ral = AB_AccountSpec_GetRefAccountList(ab_acc);
- ra = AB_ReferenceAccount_List_First(ral);
-
+ ral = AB_AccountSpec_GetRefAccountList (ab_acc);
+ ra = AB_ReferenceAccount_List_First (ral);
+
/* fill the template list with the target accounts */
while (ra)
{
- GncABTransTempl *new_templ = gnc_ab_trans_templ_new();
- const char *iban = AB_ReferenceAccount_GetIban(ra);
- const char *accName = AB_ReferenceAccount_GetAccountName(ra);
- GWEN_Buffer_Reset(accNameForTemplate);
- if (accName)
- {
- GWEN_Buffer_AppendString(accNameForTemplate, accName);
- GWEN_Buffer_AppendString(accNameForTemplate, ": ");
- }
- GWEN_Buffer_AppendString(accNameForTemplate, iban);
- gnc_ab_trans_templ_set_name(new_templ, GWEN_Buffer_GetStart(accNameForTemplate));
- gnc_ab_trans_templ_set_recp_name(new_templ, AB_ReferenceAccount_GetOwnerName(ra));
- gnc_ab_trans_templ_set_recp_account(new_templ, AB_ReferenceAccount_GetIban(ra));
- gnc_ab_trans_templ_set_recp_bankcode(new_templ, AB_ReferenceAccount_GetBic(ra));
- gnc_ab_trans_templ_set_amount(new_templ, zero);
- retval = g_list_prepend (retval, new_templ);
- ra = AB_ReferenceAccount_List_Next(ra);
+ GncABTransTempl *new_templ = gnc_ab_trans_templ_new ();
+ const char *iban = AB_ReferenceAccount_GetIban (ra);
+ const char *accName = AB_ReferenceAccount_GetAccountName (ra);
+ GWEN_Buffer_Reset (accNameForTemplate);
+ if (accName)
+ {
+ GWEN_Buffer_AppendString (accNameForTemplate, accName);
+ GWEN_Buffer_AppendString (accNameForTemplate, ": ");
+ }
+ GWEN_Buffer_AppendString (accNameForTemplate, iban);
+ gnc_ab_trans_templ_set_name (new_templ, GWEN_Buffer_GetStart (accNameForTemplate));
+ gnc_ab_trans_templ_set_recp_name (new_templ, AB_ReferenceAccount_GetOwnerName (ra));
+ gnc_ab_trans_templ_set_recp_account (new_templ, AB_ReferenceAccount_GetIban (ra));
+ gnc_ab_trans_templ_set_recp_bankcode (new_templ, AB_ReferenceAccount_GetBic (ra));
+ gnc_ab_trans_templ_set_amount (new_templ, zero);
+ retval = g_list_prepend (retval, new_templ);
+ ra = AB_ReferenceAccount_List_Next (ra);
}
retval = g_list_reverse (retval);
- GWEN_Buffer_free(accNameForTemplate);
+ GWEN_Buffer_free (accNameForTemplate);
return retval;
}
diff --git a/gnucash/import-export/aqb/gnc-ab-utils.h b/gnucash/import-export/aqb/gnc-ab-utils.h
index bc9a3251c..f4f119f7b 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.h
+++ b/gnucash/import-export/aqb/gnc-ab-utils.h
@@ -94,12 +94,12 @@ typedef struct _GncABImExContextImport GncABImExContextImport;
* Initialize the gwenhywfar library by calling GWEN_Init() and setting up
* gwenhywfar logging.
*/
-void gnc_GWEN_Init(void);
+void gnc_GWEN_Init (void);
/**
* Finalize the gwenhywfar library.
*/
-void gnc_GWEN_Fini(void);
+void gnc_GWEN_Fini (void);
/**
* If there is a cached AB_BANKING object, return it initialized. Otherwise,
@@ -108,7 +108,7 @@ void gnc_GWEN_Fini(void);
*
* @return The AB_BANKING object
*/
-AB_BANKING *gnc_AB_BANKING_new(void);
+AB_BANKING *gnc_AB_BANKING_new (void);
/**
* Delete the AB_BANKING @a api. If this is also the one that was cached by
@@ -116,7 +116,7 @@ AB_BANKING *gnc_AB_BANKING_new(void);
*
* @param api AB_BANKING or NULL for the cached AB_BANKING object
*/
-void gnc_AB_BANKING_delete(AB_BANKING *api);
+void gnc_AB_BANKING_delete (AB_BANKING *api);
/**
* Finish the AB_BANKING @a api. If this is also the one that was cached by
@@ -127,7 +127,7 @@ void gnc_AB_BANKING_delete(AB_BANKING *api);
* @param api AB_BANKING object
* @return Zero on success
*/
-gint gnc_AB_BANKING_fini(AB_BANKING *api);
+gint gnc_AB_BANKING_fini (AB_BANKING *api);
/**
* Get the corresponding AqBanking account to the GnuCash account @a gnc_acc.
@@ -138,7 +138,7 @@ gint gnc_AB_BANKING_fini(AB_BANKING *api);
* @param gnc_acc The GnuCash account to query for GNC_AB_ACCOUNT_SPEC reference data
* @return The GNC_AB_ACCOUNT_SPEC found or NULL otherwise
*/
-GNC_AB_ACCOUNT_SPEC *gnc_ab_get_ab_account(const AB_BANKING *api, Account *gnc_acc);
+GNC_AB_ACCOUNT_SPEC *gnc_ab_get_ab_account (const AB_BANKING *api, Account *gnc_acc);
/**
* Print the value of @a value with two decimal places and @a value's
@@ -147,7 +147,7 @@ GNC_AB_ACCOUNT_SPEC *gnc_ab_get_ab_account(const AB_BANKING *api, Account *gnc_a
* @param value AB_VALUE or NULL
* @return A newly allocated string
*/
-gchar *gnc_AB_VALUE_to_readable_string(const AB_VALUE *value);
+gchar *gnc_AB_VALUE_to_readable_string (const AB_VALUE *value);
/**
* Return the job as string.
@@ -155,7 +155,7 @@ gchar *gnc_AB_VALUE_to_readable_string(const AB_VALUE *value);
* @param value GNC_AB_JOB or NULL
* @return A newly allocated string
*/
-gchar *gnc_AB_JOB_to_readable_string(const GNC_AB_JOB *job);
+gchar *gnc_AB_JOB_to_readable_string (const GNC_AB_JOB *job);
/**
* Return the job_id as string.
@@ -163,7 +163,7 @@ gchar *gnc_AB_JOB_to_readable_string(const GNC_AB_JOB *job);
* @param job_id
* @return A newly allocated string
*/
-gchar *gnc_AB_JOB_ID_to_string(gulong job_id);
+gchar *gnc_AB_JOB_ID_to_string (gulong job_id);
/**
* Retrieve the merged "remote name" fields from a transaction. The returned
@@ -173,7 +173,7 @@ gchar *gnc_AB_JOB_ID_to_string(gulong job_id);
* @param ab_trans AqBanking transaction
* @return A newly allocated string or NULL otherwise
*/
-gchar *gnc_ab_get_remote_name(const AB_TRANSACTION *ab_trans);
+gchar *gnc_ab_get_remote_name (const AB_TRANSACTION *ab_trans);
/**
* Retrieve the merged purpose fields from a transaction. The returned string
@@ -183,7 +183,7 @@ gchar *gnc_ab_get_remote_name(const AB_TRANSACTION *ab_trans);
* @param ab_trans AqBanking transaction
* @return A newly allocated string, may be ""
*/
-gchar *gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx);
+gchar *gnc_ab_get_purpose (const AB_TRANSACTION *ab_trans, gboolean is_ofx);
/**
* Create the appropriate description field for a GnuCash Transaction by the
@@ -193,7 +193,7 @@ gchar *gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx);
* @param ab_trans AqBanking transaction
* @return A newly allocated string, may be ""
*/
-gchar *gnc_ab_description_to_gnc(const AB_TRANSACTION *ab_trans, gboolean is_ofx);
+gchar *gnc_ab_description_to_gnc (const AB_TRANSACTION *ab_trans, gboolean is_ofx);
/**
* Create the appropriate memo field for a GnuCash Split by the information
@@ -203,7 +203,7 @@ gchar *gnc_ab_description_to_gnc(const AB_TRANSACTION *ab_trans, gboolean is_ofx
* @param ab_trans AqBanking transaction
* @return A newly allocated string, may be ""
*/
-gchar *gnc_ab_memo_to_gnc(const AB_TRANSACTION *ab_trans);
+gchar *gnc_ab_memo_to_gnc (const AB_TRANSACTION *ab_trans);
/**
* Create an unbalanced and dirty GnuCash transaction with a split to @a gnc_acc
@@ -213,7 +213,7 @@ gchar *gnc_ab_memo_to_gnc(const AB_TRANSACTION *ab_trans);
* @param gnc_acc Account of to use for the split
* @return A dirty GnuCash transaction or NULL otherwise
*/
-Transaction *gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_acc);
+Transaction *gnc_ab_trans_to_gnc (const AB_TRANSACTION *ab_trans, Account *gnc_acc);
/**
* Import balances and transactions found in a AB_IMEXPORTER_CONTEXT into
@@ -239,9 +239,11 @@ Transaction *gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_ac
* gnc_ab_ieci_get_job_list() must be called and the result freed with
* AB_Job_List2_FreeAll()
*/
-GncABImExContextImport *gnc_ab_import_context(
- AB_IMEXPORTER_CONTEXT *context, guint awaiting, gboolean execute_txns,
- AB_BANKING *api, GtkWidget *parent);
+GncABImExContextImport *gnc_ab_import_context (AB_IMEXPORTER_CONTEXT *context,
+ guint awaiting,
+ gboolean execute_txns,
+ AB_BANKING *api,
+ GtkWidget *parent);
/**
* Extract awaiting from @a data.
@@ -250,7 +252,7 @@ GncABImExContextImport *gnc_ab_import_context(
* @return The initial awaiting bitmask plus IGNORE_* for unexpected and then
* ignored items, and FOUND_* for non-empty items
*/
-guint gnc_ab_ieci_get_found(GncABImExContextImport *ieci);
+guint gnc_ab_ieci_get_found (GncABImExContextImport *ieci);
/**
* Extract the job list from @a data.
@@ -258,7 +260,7 @@ guint gnc_ab_ieci_get_found(GncABImExContextImport *ieci);
* @param ieci The return value of gnc_ab_import_context()
* @return The list of jobs, freeable with AB_Job_List2_FreeAll()
*/
-GNC_AB_JOB_LIST2 *gnc_ab_ieci_get_job_list(GncABImExContextImport *ieci);
+GNC_AB_JOB_LIST2 *gnc_ab_ieci_get_job_list (GncABImExContextImport *ieci);
/**
* Run the generic transaction matcher dialog.
@@ -266,7 +268,7 @@ GNC_AB_JOB_LIST2 *gnc_ab_ieci_get_job_list(GncABImExContextImport *ieci);
* @param ieci The return value of gnc_ab_import_context()
* @return The return value of gnc_gen_trans_list_run().
*/
-gboolean gnc_ab_ieci_run_matcher(GncABImExContextImport *ieci);
+gboolean gnc_ab_ieci_run_matcher (GncABImExContextImport *ieci);
/**
@@ -274,7 +276,7 @@ gboolean gnc_ab_ieci_run_matcher(GncABImExContextImport *ieci);
*
* @return a GWEN_DB containing all permanently accepted SSL certificates (hashed).
*/
-GWEN_DB_NODE *gnc_ab_get_permanent_certs(void);
+GWEN_DB_NODE *gnc_ab_get_permanent_certs (void);
/**
* Creates an online ID from bank code and account number.
@@ -285,7 +287,7 @@ GWEN_DB_NODE *gnc_ab_get_permanent_certs(void);
* @param accountnumber Account number
* @return an online ID
*/
-gchar* gnc_ab_create_online_id(const gchar *bankcode, const gchar *accountnumber);
+gchar* gnc_ab_create_online_id (const gchar *bankcode, const gchar *accountnumber);
#if (AQBANKING_VERSION_INT >= 60400)
@@ -296,7 +298,7 @@ gchar* gnc_ab_create_online_id(const gchar *bankcode, const gchar *accountnumber
* @return A GList of newly allocated GncABTransTempls
*/
GList*
-gnc_ab_trans_templ_list_new_from_ref_accounts(GNC_AB_ACCOUNT_SPEC *ab_acc);
+gnc_ab_trans_templ_list_new_from_ref_accounts (GNC_AB_ACCOUNT_SPEC *ab_acc);
#endif
G_END_DECLS
commit edf000f4cf3d584ebdc833a4c2b31e663ee574d6
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Fri Jul 29 09:38:32 2022 +0100
Fix uninstantiatable type error on the console
sys:1: Warning: invalid uninstantiatable type '(null)' in cast to
'GtkWindow'
diff --git a/gnucash/import-export/aqb/gnc-ab-utils.c b/gnucash/import-export/aqb/gnc-ab-utils.c
index f78585680..28e5b48e2 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.c
+++ b/gnucash/import-export/aqb/gnc-ab-utils.c
@@ -1058,7 +1058,7 @@ bal_accountinfo_cb(AB_IMEXPORTER_ACCOUNTINFO *element, gpointer user_data)
if (!(data->awaiting & AWAIT_BALANCES))
{
GtkWindow *parent = data->generic_importer ?
- GTK_WINDOW(data->generic_importer) :
+ GTK_WINDOW(gnc_gen_trans_list_widget(data->generic_importer)) :
GTK_WINDOW(data->parent);
const char* balance_msg =
_("The bank has sent balance information in its response.\n"
commit ebf34395586ba3ed76a067a73f0d5ab57f1bb877
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Jul 29 10:58:05 2022 +0800
[gnc-sx-instance-model] free some GHashTable keys & Values
diff --git a/libgnucash/app-utils/gnc-sx-instance-model.c b/libgnucash/app-utils/gnc-sx-instance-model.c
index f79396644..75c624785 100644
--- a/libgnucash/app-utils/gnc-sx-instance-model.c
+++ b/libgnucash/app-utils/gnc-sx-instance-model.c
@@ -101,7 +101,8 @@ scrub_sx_split_numeric (Split* split, gboolean is_credit, GList **changes)
const char *numeric = is_credit ? "sx-credit-numeric" : "sx-debit-numeric";
char *formval;
gnc_numeric *numval = NULL;
- GHashTable *parser_vars = g_hash_table_new (g_str_hash, g_str_equal);
+ GHashTable *parser_vars = g_hash_table_new_full
+ (g_str_hash, g_str_equal, g_free, (GDestroyNotify)gnc_sx_variable_free);
char *error_loc;
gnc_numeric amount = gnc_numeric_zero ();
gboolean parse_result = FALSE;
@@ -205,6 +206,9 @@ GHashTable*
gnc_sx_instance_get_variables_for_parser(GHashTable *instance_var_hash)
{
GHashTable *parser_vars;
+
+ /* fixme: the following GHashTable should g_free keys and
+ gnc_sx_variable_free the values, however this breaks SX formulas */
parser_vars = g_hash_table_new(g_str_hash, g_str_equal);
g_hash_table_foreach(instance_var_hash, (GHFunc)_sx_var_to_raw_numeric, parser_vars);
return parser_vars;
commit 7c2a24951106c19f562efc745ed5c8d605cd5d53
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Jul 27 21:38:31 2022 +0800
[gnc-sx-instance-model.c] refactor Scrub function
This scrubbing function calls xaccTransRollbackEdit which is
leaky. Instead of trying to fix xaccTransRollbackEdit which requires
superhuman skills, it's easiest to track the changes separately in a
GList, and use xaccTransBeginEdit/xaccTransCommitEdit only if
necessary.
diff --git a/libgnucash/app-utils/gnc-sx-instance-model.c b/libgnucash/app-utils/gnc-sx-instance-model.c
index f54b78e52..f79396644 100644
--- a/libgnucash/app-utils/gnc-sx-instance-model.c
+++ b/libgnucash/app-utils/gnc-sx-instance-model.c
@@ -88,41 +88,45 @@ static void _gnc_sx_instance_event_handler(QofInstance *ent, QofEventId event_ty
static gnc_commodity* get_transaction_currency(SxTxnCreationData *creation_data, SchedXaction *sx, Transaction *template_txn);
/* ------------------------------------------------------------ */
-static gboolean
-scrub_sx_split_numeric (Split* split, const char *debcred)
+typedef struct
+{
+ const char *name;
+ gnc_numeric amount;
+} ScrubItem;
+
+static void
+scrub_sx_split_numeric (Split* split, gboolean is_credit, GList **changes)
{
- const gboolean is_credit = g_strcmp0 (debcred, "credit") == 0;
- const char *formula = is_credit ?
- "sx-credit-formula" : "sx-debit-formula";
- const char *numeric = is_credit ?
- "sx-credit-numeric" : "sx-debit-numeric";
+ const char *formula = is_credit ? "sx-credit-formula" : "sx-debit-formula";
+ const char *numeric = is_credit ? "sx-credit-numeric" : "sx-debit-numeric";
char *formval;
gnc_numeric *numval = NULL;
GHashTable *parser_vars = g_hash_table_new (g_str_hash, g_str_equal);
char *error_loc;
gnc_numeric amount = gnc_numeric_zero ();
gboolean parse_result = FALSE;
- gboolean num_val_changed = FALSE;
- qof_instance_get (QOF_INSTANCE (split),
- formula, &formval,
- numeric, &numval,
- NULL);
- parse_result =
- gnc_exp_parser_parse_separate_vars (formval, &amount,
- &error_loc, parser_vars);
+
+ qof_instance_get (QOF_INSTANCE (split), formula, &formval,
+ numeric, &numval, NULL);
+
+ parse_result = gnc_exp_parser_parse_separate_vars (formval, &amount,
+ &error_loc, parser_vars);
+
if (!parse_result || g_hash_table_size (parser_vars) != 0)
amount = gnc_numeric_zero ();
+
g_hash_table_unref (parser_vars);
+
if (!numval || !gnc_numeric_eq (amount, *numval))
{
- qof_instance_set (QOF_INSTANCE (split),
- numeric, &amount,
- NULL);
- num_val_changed = TRUE;
+ ScrubItem *change = g_new (ScrubItem, 1);
+ change->name = numeric;
+ change->amount = amount;
+ *changes = g_list_prepend (*changes, change);
}
+
g_free (formval);
g_free (numval);
- return num_val_changed;
}
/* Fixes error in pre-2.6.16 where the numeric slot wouldn't get changed if the
@@ -133,14 +137,20 @@ gnc_sx_scrub_split_numerics (gpointer psplit, gpointer puser)
{
Split *split = GNC_SPLIT (psplit);
Transaction *trans = xaccSplitGetParent (split);
- gboolean changed;
+ GList *changes = NULL;
+ scrub_sx_split_numeric (split, TRUE, &changes);
+ scrub_sx_split_numeric (split, FALSE, &changes);
+ if (!changes)
+ return;
+
xaccTransBeginEdit (trans);
- changed = scrub_sx_split_numeric (split, "credit") +
- scrub_sx_split_numeric (split, "debit");
- if (!changed)
- xaccTransRollbackEdit (trans);
- else
- xaccTransCommitEdit (trans);
+ for (GList *n = changes; n; n = n->next)
+ {
+ ScrubItem *change = n->data;
+ qof_instance_set (QOF_INSTANCE (split), change->name, &change->amount, NULL);
+ }
+ xaccTransCommitEdit (trans);
+ g_list_free_full (changes, g_free);
}
static void
commit 7880f9b16f5322ae8a1e16dfca9b50ed0b5f6f91
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Jul 29 12:22:41 2022 +0800
[SchedXaction.c] free list of recurrences
diff --git a/libgnucash/engine/SchedXaction.c b/libgnucash/engine/SchedXaction.c
index ebbc1c48d..99177e9ef 100644
--- a/libgnucash/engine/SchedXaction.c
+++ b/libgnucash/engine/SchedXaction.c
@@ -520,6 +520,9 @@ xaccSchedXactionFree( SchedXaction *sx )
sx->deferredList = NULL;
}
+ /* a GList of Recurrences */
+ g_list_free_full (sx->schedule, g_free);
+
/* qof_instance_release (&sx->inst); */
g_object_unref( sx );
}
commit 38ec9f254c1b4f73668489e1218acd58bbe13463
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Jul 29 10:10:38 2022 +0800
[dialog-sx-since-last-run] free the dialog
it was created with g_new0 in gnc_ui_sx_since_last_run_dialog
diff --git a/gnucash/gnome/dialog-sx-since-last-run.c b/gnucash/gnome/dialog-sx-since-last-run.c
index fd73489c2..ee5103eb1 100644
--- a/gnucash/gnome/dialog-sx-since-last-run.c
+++ b/gnucash/gnome/dialog-sx-since-last-run.c
@@ -1122,6 +1122,7 @@ close_handler (gpointer user_data)
gnc_save_window_size (GNC_PREFS_GROUP_STARTUP, GTK_WINDOW(app_dialog->dialog));
gtk_widget_destroy (app_dialog->dialog);
+ g_free (app_dialog);
}
static void
commit 436110e523e5530e67d8d21410270fe7d495b0ea
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jul 28 14:55:12 2022 -0700
Bug 798578 - MT940 imports broken - all transactions have date of...
first transaction
It's really the date of the opening balance and it's because AQBanking
returns that instead of the value date if a transaction field has
no entry date.: https://www.aquamaniac.de/rdm/issues/262
diff --git a/gnucash/import-export/aqb/gnc-ab-utils.c b/gnucash/import-export/aqb/gnc-ab-utils.c
index e8809eed2..f78585680 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.c
+++ b/gnucash/import-export/aqb/gnc-ab-utils.c
@@ -111,7 +111,7 @@ gnc_gwen_date_to_time64 (const GNC_GWEN_DATE* date)
* that's the case then back up a day to get a real date for
* posting.
*/
- if (month == 2 && day <= 30 && day > (is_leap_year(year) ? 29 : 28))
+ while (month == 2 && day <= 30 && day > (is_leap_year(year) ? 29 : 28))
--day;
return gnc_dmy2time64_neutral(day, month, year);
#else
@@ -600,16 +600,16 @@ gnc_ab_trans_to_gnc(const AB_TRANSACTION *ab_trans, Account *gnc_acc)
* German). The value date is the effective date for financial
* calculation purposes and is mandatory, the entry date is the
* date that the financial institution posted the
- * transaction. Since the entry date is normally closer to the
- * date that the customer's book should recognize the transaction
- * we prefer that date if present.
+ * transaction. Unfortunately if the transaction field doesn't
+ * provide an entry date AQBanking substitutes the date from the
+ * last balance instead of using the value date or NULL, making
+ * the field unreliable.
*/
- post_date = AB_Transaction_GetDate(ab_trans);
value_date = AB_Transaction_GetValutaDate(ab_trans);
- if (post_date)
- post_time = gnc_gwen_date_to_time64(post_date);
- else if (value_date)
+ if (value_date)
post_time = gnc_gwen_date_to_time64(value_date);
+ else if ((post_date = AB_Transaction_GetDate(ab_trans))) // always true
+ post_time = gnc_gwen_date_to_time64(post_date);
else
{
g_warning("transaction_cb: Import had no transaction date");
commit 1d5e9d4d97dec5c16733d09b67e96fb11ed566f3
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jul 28 11:49:51 2022 -0700
Use macos-latest github runner for mac tests.
diff --git a/.github/workflows/mac-tests.yaml b/.github/workflows/mac-tests.yaml
index e77621e94..b61e25229 100644
--- a/.github/workflows/mac-tests.yaml
+++ b/.github/workflows/mac-tests.yaml
@@ -3,7 +3,7 @@ on: [push, pull_request]
permissions: {}
jobs:
ci_tests_mac:
- runs-on: macos-10.15
+ runs-on: macos-latest
name: macOS CI Tests
env:
TZ: America/Los_Angeles
commit b98cd0099379937552d1cf97483382bb85c30dc6
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Jul 28 03:20:27 2022 +0200
Translation update by Frank H. Ellenberger <frank.h.ellenberger at gmail.com> using Weblate
po/nl.po: 99.2% (5359 of 5400 strings; 33 fuzzy)
10 failing checks (0.1%)
Translation: GnuCash/Program (Dutch)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/nl/
Co-authored-by: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
diff --git a/po/nl.po b/po/nl.po
index c8e5e1c9e..a96d34a3f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,14 +11,15 @@
# Hendrik-Jan Heins <hjh at passys.nl>, 2003.
# Jan Willem Harmanny <jwharmanny at zeelandnet.nl>, 2002.
# Geert Janssens <info at kobaltwit.be>, 2021.
+# Frank H. Ellenberger <frank.h.ellenberger at 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: 2021-06-26 10:32+0000\n"
-"Last-Translator: Geert Janssens <geert at kobaltwit.be>\n"
+"PO-Revision-Date: 2022-07-28 01:19+0000\n"
+"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/gnucash/gnucash/nl/"
">\n"
"Language: nl\n"
@@ -26,9 +27,9 @@ 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.7.1-dev\n"
-"X-Bugs: Report translation errors to https://bugs.gnucash.org/enter_bug.cgi?"
-"product=GnuCash&component=Translations\n"
+"X-Generator: Weblate 4.14-dev\n"
+"X-Bugs: Report translation errors to https://bugs.gnucash.org/enter_bug."
+"cgi?product=GnuCash&component=Translations\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@@ -13539,6 +13540,7 @@ msgstr ""
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:193
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:183
+#, fuzzy
msgid "<b>Load and Save Settings</b>"
msgstr "<b>Instellingen voor Openen en Bewaren</b>"
commit 5fc99aa9b4c2a60dc0c71abfdf9a94fed7fad2c1
Author: Milo Ivir <mail at milotype.de>
Date: Thu Jul 28 03:20:26 2022 +0200
Translation update by Milo Ivir <mail at milotype.de> using Weblate
po/hr.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (Croatian)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/hr/
Translation update by Milo Ivir <mail at milotype.de> using Weblate
po/hr.po: 99.8% (5393 of 5400 strings; 7 fuzzy)
2 failing checks (0.1%)
Translation: GnuCash/Program (Croatian)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/hr/
Co-authored-by: Milo Ivir <mail at milotype.de>
diff --git a/po/hr.po b/po/hr.po
index f26e5ba30..33625c0d7 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,10 +5,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-06-22 19:20+0000\n"
+"PO-Revision-Date: 2022-07-27 17:15+0000\n"
"Last-Translator: Milo Ivir <mail at milotype.de>\n"
"Language-Team: Croatian <https://hosted.weblate.org/projects/gnucash/gnucash/"
"hr/>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@@ -8733,10 +8733,8 @@ msgid "Edit the global preferences of GnuCash"
msgstr "Uredi opće postavke za GnuCash"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>Položaj kartica</b>"
+msgstr "P_oložaj kartice"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -8984,7 +8982,7 @@ msgstr "Opcije za knjigu"
#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
-msgstr ""
+msgstr "(korisnik može promijeniti)"
#. Translators: %s will be replaced with the current year
#: gnucash/gnome-utils/gnc-main-window.c:4880
@@ -10334,10 +10332,8 @@ msgid "{1} [options] [datafile]"
msgstr "{1} [opcije] [datoteka podataka]"
#: gnucash/gnucash-core-app.cpp:255
-#, fuzzy
-#| msgid "GnuCash "
msgid "GnuCash Paths"
-msgstr "GnuCash "
+msgstr "GnuCash staze"
#: gnucash/gnucash-core-app.cpp:270
msgid "GnuCash {1}"
@@ -10385,10 +10381,8 @@ msgstr ""
"Ovo se može pozvati više puta."
#: gnucash/gnucash-core-app.cpp:309
-#, fuzzy
-#| msgid "Show plot"
msgid "Show paths"
-msgstr "Prikaži dijagram"
+msgstr "Prikaži staze"
#: gnucash/gnucash-core-app.cpp:311
msgid ""
@@ -15600,10 +15594,8 @@ msgstr "ISIN, CUSI_P ili neka druga Å¡ifra"
#: gnucash/gtkbuilder/dialog-commodity.glade:485
#: gnucash/gtkbuilder/dialog-commodity.glade:767
#: gnucash/gtkbuilder/dialog-price.glade:122
-#, fuzzy
-#| msgid "Namespace"
msgid "Nam_espace"
-msgstr "Imenski prostor"
+msgstr "Im_enski prostor"
#: gnucash/gtkbuilder/dialog-commodity.glade:500
msgid "_Symbol/abbreviation"
@@ -16313,10 +16305,8 @@ msgid "Green"
msgstr "Zelena"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "Ne ispisuj detalje transakcije"
+msgstr "Uredi uvezene detalje transakcije"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -21653,24 +21643,18 @@ msgstr "IskljuÄeno"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "Odabiru dodijeli konto prijenosa."
+msgstr "_Dodijeli konto prijenosa odabiru"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "Opis, napomene ili bilješka"
+msgstr "_Uredi opis, napomene ili bilješku"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "Vrati standardne vrijednosti"
+msgstr "_Resetiraj sva uređivanja"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
commit 2e81d4440262b01bbf304c9adddbac96550febed
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Jul 27 20:00:08 2022 +0800
[gnc-tree-view] some char* freed
diff --git a/gnucash/gnome-utils/gnc-tree-view.c b/gnucash/gnome-utils/gnc-tree-view.c
index 977323704..0de60f806 100644
--- a/gnucash/gnome-utils/gnc-tree-view.c
+++ b/gnucash/gnome-utils/gnc-tree-view.c
@@ -1037,13 +1037,17 @@ gnc_tree_view_set_state_section (GncTreeView *view,
gchar *key = keys[idx];
if (g_strcmp0 (key, STATE_KEY_SORT_COLUMN) == 0)
{
- gnc_tree_view_set_sort_column (view,
- g_key_file_get_string (state_file, priv->state_section, key, NULL));
+ gchar *name = g_key_file_get_string (state_file, priv->state_section,
+ key, NULL);
+ gnc_tree_view_set_sort_column (view, name);
+ g_free (name);
}
else if (g_strcmp0 (key, STATE_KEY_SORT_ORDER) == 0)
{
- gnc_tree_view_set_sort_order (view,
- g_key_file_get_string (state_file, priv->state_section, key, NULL));
+ gchar *name = g_key_file_get_string (state_file, priv->state_section,
+ key, NULL);
+ gnc_tree_view_set_sort_order (view, name);
+ g_free (name);
}
else if (g_strcmp0 (key, STATE_KEY_COLUMN_ORDER) == 0)
{
commit b598375ea7465a693b4e122b0f0ae28ea77c610d
Author: J0kWang <lianjiefly at gmail.com>
Date: Tue Jul 26 17:51:19 2022 +0200
Translation update by J0kWang <lianjiefly at gmail.com> using Weblate
po/zh_CN.po: 99.9% (5395 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (Chinese (Simplified))
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/zh_Hans/
Co-authored-by: J0kWang <lianjiefly at gmail.com>
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f22205ea8..0803d3df6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,7 +17,7 @@
# TianXing_Yi <ytx.cash at gmail.com>, 2021.
# cjh <cjh at cjh0613.com>, 2021.
# Eric <spice2wolf at gmail.com>, 2021.
-# J0kWang <lianjiefly at gmail.com>, 2021.
+# J0kWang <lianjiefly at gmail.com>, 2021, 2022.
# YTX <ytx.cash at gmail.com>, 2021, 2022.
# æŽå…ƒåŸº <lovedebushiu at qq.com>, 2022.
# Eric <alchemillatruth at purelymail.com>, 2022.
@@ -28,8 +28,8 @@ 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-07-22 07:21+0000\n"
-"Last-Translator: Eric <alchemillatruth at purelymail.com>\n"
+"PO-Revision-Date: 2022-07-26 15:51+0000\n"
+"Last-Translator: J0kWang <lianjiefly at gmail.com>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
"gnucash/gnucash/zh_Hans/>\n"
"Language: zh_CN\n"
@@ -18641,6 +18641,9 @@ msgid ""
"* It ignores GnuCash's preferences like \"Close log window when finished\".\n"
"* To report issues read"
msgstr ""
+"æ„æ€æ˜¯ï¼š\n"
+"*å®ƒæ— è§†GnuCashçš„ \"完æˆåŽå…³é—æ—¥å¿—çª—å£ \"ç‰å好。\n"
+"*报告问题的阅读(状æ€)"
#: gnucash/import-export/aqb/assistant-ab-initial.glade:141
msgid ""
commit 9417c6cb54121bd1583ca1a5461c05284fa9e5cc
Author: Avi Markovitz <avi.markovitz at gmail.com>
Date: Tue Jul 26 17:51:19 2022 +0200
Translation update by Avi Markovitz <avi.markovitz at gmail.com> using Weblate
po/he.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (Hebrew)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/he/
Co-authored-by: Avi Markovitz <avi.markovitz at gmail.com>
diff --git a/po/he.po b/po/he.po
index 2642d7497..f5024f6cc 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,8 +11,8 @@ 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-07-26 07:25+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
+"PO-Revision-Date: 2022-07-26 15:51+0000\n"
+"Last-Translator: Avi Markovitz <avi.markovitz at gmail.com>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/gnucash/gnucash/"
"he/>\n"
"Language: he\n"
@@ -15233,7 +15233,7 @@ msgstr "בחירת מידע משתמש ×›×ן..."
msgid ""
"The customer ID number. If left blank a reasonable number will be chosen for "
"you"
-msgstr "מזהה הלקוח. ×× ×”×©×“×” ייש×ר ריק, המערכת תקצה מזהה־ספק סביר."
+msgstr "מזהה הלקוח. ×× ×”×©×“×” ייש×ר ריק, המערכת תקצה מזהה־לקוח סביר"
#: gnucash/gtkbuilder/dialog-customer.glade:258
#: gnucash/gtkbuilder/dialog-customer.glade:790
@@ -23631,7 +23631,7 @@ msgstr "פיזור:"
#: gnucash/report/reports/example/welcome-to-gnucash.scm:41
#, scheme-format
msgid "Welcome to GnuCash ~a !"
-msgstr "×‘×¨×•×›×™× ×”×‘××™× ×œ×’× ×•×§×ש ~a !"
+msgstr "ברוך בו×ך ×œ×’× ×•×§×ש ~a !"
#: gnucash/report/reports/example/welcome-to-gnucash.scm:44
#, scheme-format
commit e9b4e2e99fd0144d62aeb8ebe2495692d78b0eac
Author: Yaron Shahrabani <sh.yaron at gmail.com>
Date: Tue Jul 26 17:51:18 2022 +0200
Translation update by Yaron Shahrabani <sh.yaron at gmail.com> using Weblate
po/he.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
1 failing checks (0.1%)
Translation: GnuCash/Program (Hebrew)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/he/
Co-authored-by: Yaron Shahrabani <sh.yaron at gmail.com>
diff --git a/po/he.po b/po/he.po
index 6ba7b2483..2642d7497 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12,7 +12,7 @@ msgstr ""
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2022-07-26 07:25+0000\n"
-"Last-Translator: Avi Markovitz <avi.markovitz at gmail.com>\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/gnucash/gnucash/"
"he/>\n"
"Language: he\n"
@@ -8843,7 +8843,7 @@ msgstr "×—×©×‘×•× ×ות ל×× ×©×™× ×¤×¨×˜×™×™× ×•×¢×¡×§×™× ×§×˜× ×™×."
msgid "translator-credits"
msgstr ""
"×בי מרקוביץ avi.markovitz at gmail.com 2022 ,2021, 2020, 2019\n"
-"ירון ×©×”×¨×‘× ×™ 2021\n"
+"ירון ×©×”×¨×‘× ×™ 2021, 2022\n"
"×ורי הוך 2006"
#: gnucash/gnome-utils/gnc-main-window.c:4913
@@ -15233,7 +15233,7 @@ msgstr "בחירת מידע משתמש ×›×ן..."
msgid ""
"The customer ID number. If left blank a reasonable number will be chosen for "
"you"
-msgstr "מזהה הלקוח. ×× ×”×©×“×” יש×ר ריק, המערכת תקצה מזהה־ ספק סביר"
+msgstr "מזהה הלקוח. ×× ×”×©×“×” ייש×ר ריק, המערכת תקצה מזהה־ספק סביר."
#: gnucash/gtkbuilder/dialog-customer.glade:258
#: gnucash/gtkbuilder/dialog-customer.glade:790
@@ -21109,7 +21109,7 @@ msgstr "_הקצ×ת חשבון 'העברת' לשורות ×©× ×‘×—×¨×•"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
msgid "_Edit description, notes, or memo"
-msgstr "עריכת תי×ור, הערות, ×ו מזכר"
+msgstr "_עריכת תי×ור, הערות, ×ו מזכר"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
@@ -29199,7 +29199,7 @@ msgstr "שגי××” %d בערך gnc_numeric סופי SX [%sâ€]â€, שימוש ב
#: libgnucash/app-utils/gnc-sx-instance-model.c:1802
#, c-format
msgid "No exchange rate available in SX [%s] for %s -> %s, value is zero."
-msgstr "שערי חליפין ×œ× ×–×ž×™× ×™× ×‘Ö¾SX [%s] עבור %s <- %s, ערך '×פס'."
+msgstr "שערי חליפין ×œ× ×–×ž×™× ×™× ×‘Ö¾SX [%s] עבור %s <- %s, ערך '×פס'."
#. Translators: This and the following strings appear on
#. the account tab if the Tax Info column is displayed,
commit 7e1ef4ce6ee65dbb95386b4c50f59c85b5e23e59
Author: Avi Markovitz <avi.markovitz at gmail.com>
Date: Tue Jul 26 17:51:18 2022 +0200
Translation update by Avi Markovitz <avi.markovitz at gmail.com> using Weblate
po/he.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
1 failing checks (0.1%)
Translation: GnuCash/Program (Hebrew)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/he/
Co-authored-by: Avi Markovitz <avi.markovitz at gmail.com>
diff --git a/po/he.po b/po/he.po
index 45b0bcb17..6ba7b2483 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,7 +11,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-07-23 14:22+0000\n"
+"PO-Revision-Date: 2022-07-26 07:25+0000\n"
"Last-Translator: Avi Markovitz <avi.markovitz at gmail.com>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/gnucash/gnucash/"
"he/>\n"
@@ -6439,7 +6439,7 @@ msgstr "× ×™×”×•×œ הכספי×, ×”×—×©×‘×•× ×•×ª וההשקעות"
#: gnucash/gnome/gnucash.appdata.xml.in.in:8
msgid ""
"GnuCash is a program for personal and small-business financial-accounting."
-msgstr "×’× ×•×§×ש ×”×™× ×ª×›× ×ª ×”× ×”×œ×ª ×—×©×‘×•× ×•×ª, לשימוש ×ישי ×•×œ×¢×¡×§×™× ×§×˜× ×™×."
+msgstr "×’× ×•×§×ש ×”×™× ×ª×•×›× ×ª ×”× ×”×œ×ª ×—×©×‘×•× ×•×ª, לשימוש ×ישי ×•×œ×¢×¡×§×™× ×§×˜× ×™×."
#: gnucash/gnome/gnucash.appdata.xml.in.in:11
msgid ""
@@ -8189,8 +8189,8 @@ msgid ""
"system, you may not have write permission for the directory or your anti-"
"virus software is preventing this action."
msgstr ""
-"×œ× ×”×™×™×ª×” ×פשרות ×œ×’× ×•×§×ש לכתוב ל־%s. מסד × ×ª×•× ×™× ×–×” עשוי ×œ×”×ž×¦× ×¢×œ ×ž×¢×¨×›×ªÖ¾×§×‘×¦×™× "
-"לקרי××” בלבד, ייתכן שחסרה הרש×ת כתיבה לספריה, ×ו, ×©×ª×›× ×ª ×”×× ×˜×™Ö¾×•×™×¨×•×¡ ×ž×•× ×¢×ª "
+"×œ×’× ×•×§×ש ×œ× ×”×™×™×ª×” ×פשרות לכתוב ל־%s. מסד × ×ª×•× ×™× ×–×” עשוי ×œ×”×ž×¦× ×¢×œ ×ž×¢×¨×›×ªÖ¾×§×‘×¦×™× "
+"לקרי××” בלבד, ייתכן שחסרה הרש×ת כתיבה לספריה, ×ו ×©×ª×•×›× ×ª ×”×× ×˜×™Ö¾×•×™×¨×•×¡ ×ž×•× ×¢×ª "
"פעולה זו."
#: gnucash/gnome-utils/gnc-file.c:385
@@ -10706,7 +10706,7 @@ msgid ""
"the check. Coordinates are from the lower left corner of the specified check "
"position."
msgstr ""
-"הערך מכיל קו××•×¨×“×™× ×˜×•×ª X, Y עבור התחלת שורת המזכר בהמח××”. קו××•×¨×“×™× ×˜×•×ª הן "
+"הערך מכיל × ×§×•×“×•×ªÖ¾×¦×™×•×Ÿ X, Y לר×ש שורת המזכר בהמח××”. ר×שית × ×§×•×“×•×ªÖ¾×¦×™×•×Ÿ הן "
"×ž×”×¤×™× ×” השמ×לית ×”×ª×—×ª×•× ×” של ×ž×™×§×•× ×”×”×ž×—××” שהוגדרה."
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.checkprinting.gschema.xml.in:70
@@ -13903,8 +13903,8 @@ msgstr ""
"× ×¨××” שקובץ ×”Ö¾QIF ×©× ×˜×¢×Ÿ מכיל ×ª× ×•×¢×•×ª בחשבון ×חד בלבד, ×ך הקובץ ××™× ×• מכיל ×ת ×©× "
"החשבון.\n"
"\n"
-"× × ×œ×”×–×™×Ÿ ×©× ×—×©×‘×•×Ÿ. ×× ×”×§×•×‘×¥ ×™×•×¦× ×ž×ª×›× ×ª ×”× ×”×œ×ªÖ¾×—×©×‘×•× ×•×ª ×חרת, × × ×œ×”×©×ª×ž×© ב×ותו "
-"×©× ×—×©×‘×•×Ÿ ששימש ב×ותה ×”×ª×›× ×”.\n"
+"× × ×œ×”×–×™×Ÿ ×©× ×—×©×‘×•×Ÿ. ×× ×”×§×•×‘×¥ ×™×•×¦× ×ž×ª×•×›× ×ª ×”× ×”×œ×ªÖ¾×—×©×‘×•× ×•×ª ×חרת, × × ×œ×”×©×ª×ž×© ב×ותו "
+"×©× ×—×©×‘×•×Ÿ ששימש ב×ותה ×”×ª×•×›× ×”.\n"
#: gnucash/gtkbuilder/assistant-qif-import.glade:368
msgid "Account name"
@@ -13962,7 +13962,7 @@ msgstr ""
"שימוש בחשבון ×–×”; ×חרת, ×’× ×•×§×ש יצור חשבון חדש ×‘×©× ×•×¡×•×’ ×–×”×”×™× ×œ×—×©×‘×•×Ÿ QIF. × ×™×ª×Ÿ "
"×œ×©× ×•×ª ×ת פרטי החשבון שהוצע על־ידי ×’× ×•×§×ש על־ידי הקשה כפולה עליו.\n"
"\n"
-"לתשומת לב, ×’× ×•×§×ש יצור ×—×©×‘×•× ×•×ª × ×•×¡×¤×™× ×¨×‘×™× ×©×œ× ×”×™×• ×§×™×™×ž×™× ×‘×ª×›× ×ª ×”×›×¡×¤×™× "
+"לתשומת לב, ×’× ×•×§×ש יצור ×—×©×‘×•× ×•×ª × ×•×¡×¤×™× ×¨×‘×™× ×©×œ× ×”×™×• ×§×™×™×ž×™× ×‘×ª×•×›× ×ª ×”×›×¡×¤×™× "
"×”×ישית ×”×חרת ×ž×ž× ×” מייב××™×, לרבות חשבון × ×¤×¨×“ לכל ×ž× ×™×”, ×—×©×‘×•× ×•×ª × ×¤×¨×“×™× ×¢×‘×•×¨ "
"עמלות × ×™×”×•×œ תיקי×, ×—×©×‘×•× ×•×ª 'הון' ×ž×™×•×—×“×™× (×—×©×‘×•× ×•×ª ×”×ž×©× ×” של ×”×›× ×¡×•×ª מיועדות, "
"כברירת מחדל) שהן המקור ליתרות הפתיחה וכו '. כל ×”×—×©×‘×•× ×•×ª ×”×לה יופיעו בעמוד "
commit 0e81d42e0834dff7c1364742b7e4fe30ca47868d
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Jul 27 00:21:01 2022 +0800
[csv-transactions-export] couple leaks plugged
diff --git a/gnucash/import-export/csv-exp/csv-transactions-export.c b/gnucash/import-export/csv-exp/csv-transactions-export.c
index 7050a6df9..f709dc443 100644
--- a/gnucash/import-export/csv-exp/csv-transactions-export.c
+++ b/gnucash/import-export/csv-exp/csv-transactions-export.c
@@ -393,6 +393,7 @@ add_price (gchar *so_far, Split *split, gboolean t_void, CsvExportInfo *info)
conv = csv_txn_test_field_string (info, string_amount);
result = g_strconcat (so_far, conv, info->end_sep, EOLSTR, NULL);
g_free (conv);
+ g_free (so_far);
return result;
}
@@ -649,6 +650,7 @@ void csv_transactions_export (CsvExportInfo *info)
DEBUG("Account being processed is : %s", xaccAccountGetName (acc));
account_splits (info, acc, fh);
}
+ g_list_free (info->csva.account_list);
}
else
account_splits (info, info->account, fh);
commit 6b64c70c643cf8c5c4401ea8fe095f5bcb3b9685
Merge: 4b73dbc61 3a6f1ab1a
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Jul 26 09:38:25 2022 +0100
Merge Christian Wehling's branch 'help-buttons' into maint PR #1385
commit 4b73dbc616740a1e6f7f2038d1d636c6e74c50bf
Author: Christian Wehling <christian.wehling at web.de>
Date: Mon Jul 25 22:24:13 2022 +0200
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/glossary/de.po: 99.5% (215 of 216 strings; 1 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Glossary (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/glossary/de/
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/de.po: 99.8% (5390 of 5400 strings; 9 fuzzy)
184 failing checks (3.4%)
Translation: GnuCash/Program (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/de.po: 99.8% (5390 of 5400 strings; 9 fuzzy)
185 failing checks (3.4%)
Translation: GnuCash/Program (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/de/
Co-authored-by: Christian Wehling <christian.wehling at web.de>
diff --git a/po/de.po b/po/de.po
index 1c89eb018..d8edddb3c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -36,10 +36,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-12 21:16+0000\n"
+"PO-Revision-Date: 2022-07-25 20:24+0000\n"
"Last-Translator: Christian Wehling <christian.wehling at web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/gnucash/"
"de/>\n"
@@ -741,15 +741,15 @@ msgid ""
"To schedule a transaction every year you can choose the monthly basic "
"frequency and then set 'Every 12 months'."
msgstr ""
-"Der Editor für die terminierten Buchungen verfügt über eine sehr flexible "
+"Der Editor für die geplanten Buchungen verfügt über eine sehr flexible "
"Konfiguration der Häufigkeit. Die Standardhäufigkeit, um eine Buchung zu "
-"terminieren, sind täglich, wöchentlich und monatlich. Es können auch "
-"erweiterte Schemata eingerichtet werden. Einige Beispiele:\n"
+"planen, sind täglich, wöchentlich und monatlich. Es können auch erweiterte "
+"Schemata eingerichtet werden. Einige Beispiele:\n"
"\n"
-"Um eine Buchung für jede dritte Woche zu terminieren, können Sie die "
-"wöchentliche Standardhäufigkeit wählen und dann 'Jede 3. Woche'.\n"
+"Um eine Buchung für jede dritte Woche zu planen, können Sie die wöchentliche "
+"Standardhäufigkeit wählen und dann 'Jede 3. Woche'.\n"
"\n"
-"Um eine Buchung für jedes Jahr zu terminieren, können Sie die monatliche "
+"Um eine Buchung für jedes Jahr zu planen, können Sie die monatliche "
"Standardhäufigkeit wählen und dann 'Alle 12 Monate'."
#: doc/tip_of_the_day.list.c:117
@@ -3171,8 +3171,8 @@ msgstr "A_ktionen"
msgid ""
"This Scheduled Transaction has changed; are you sure you want to cancel?"
msgstr ""
-"Diese terminierte Buchung wurde geändert. Sind Sie sicher, dass Sie "
-"abbrechen wollen?"
+"Diese geplante Buchung wurde geändert. Sind Sie sicher, dass Sie abbrechen "
+"wollen?"
#: gnucash/gnome/dialog-sx-editor2.c:636
#, c-format
@@ -3194,12 +3194,12 @@ msgid ""
"The Scheduled Transaction Editor cannot automatically balance this "
"transaction. Should it still be entered?"
msgstr ""
-"Der Terminierte-Buchungen-Editor kann diese Buchung nicht automatisch "
+"Der Editor für geplante Buchungen kann diese Buchung nicht automatisch "
"ausgeglichen erstellen. Soll sie trotzdem erstellt werden?"
#: gnucash/gnome/dialog-sx-editor2.c:712 gnucash/gnome/dialog-sx-editor.c:492
msgid "Please name the Scheduled Transaction."
-msgstr "Bitte geben Sie der terminierten Buchung einen Namen."
+msgstr "Bitte geben Sie der geplanten Buchung einen Namen."
#: gnucash/gnome/dialog-sx-editor2.c:739 gnucash/gnome/dialog-sx-editor.c:518
#, c-format
@@ -3207,20 +3207,20 @@ msgid ""
"A Scheduled Transaction with the name \"%s\" already exists. Are you sure "
"you want to name this one the same?"
msgstr ""
-"Eine terminierte Buchung mit dem Namen »%s« existiert bereits. Sind Sie "
-"sicher, dass die aktuelle den gleichen Namen erhalten soll?"
+"Eine geplante Buchung mit dem Namen »%s« existiert bereits. Sind Sie sicher, "
+"dass die aktuelle den gleichen Namen erhalten soll?"
#: gnucash/gnome/dialog-sx-editor2.c:767
msgid "Scheduled Transactions with variables cannot be automatically created."
msgstr ""
-"Terminierte Buchungen mit Variablen können nicht automatisch erstellt werden."
+"Geplante Buchungen mit Variablen können nicht automatisch erstellt werden."
#: gnucash/gnome/dialog-sx-editor2.c:777 gnucash/gnome/dialog-sx-editor.c:627
msgid ""
"Scheduled Transactions without a template transaction cannot be "
"automatically created."
msgstr ""
-"Terminierte Buchungen ohne Buchungsvorlage können nicht automatisch erstellt "
+"Geplante Buchungen ohne Buchungsvorlage können nicht automatisch erstellt "
"werden."
#: gnucash/gnome/dialog-sx-editor2.c:792 gnucash/gnome/dialog-sx-editor.c:542
@@ -3245,8 +3245,8 @@ msgid ""
"You have attempted to create a Scheduled Transaction which will never run. "
"Do you really want to do this?"
msgstr ""
-"Sie versuchen gerade, eine Terminierte Buchung zu erstellen, die nie "
-"auftritt. Wollen Sie wirklich fortsetzen?"
+"Sie versuchen gerade, eine geplante Buchung zu erstellen, die nie auftritt. "
+"Wollen Sie wirklich fortsetzen?"
#: gnucash/gnome/dialog-sx-editor2.c:1301
msgid ""
@@ -3278,8 +3278,8 @@ msgid ""
"Scheduled Transactions with variables or involving more than one commodity "
"cannot be automatically created."
msgstr ""
-"Terminierte Buchungen mit Variablen oder mit mehr als einem Wertpapier "
-"können nicht automatisch erstellt werden."
+"Geplante Buchungen mit Variablen oder mit mehr als einem Wertpapier können "
+"nicht automatisch erstellt werden."
#: gnucash/gnome/dialog-sx-editor.c:679
#, c-format
@@ -3318,17 +3318,17 @@ msgid ""
"The Scheduled Transaction is unbalanced. You are strongly encouraged to "
"correct this situation."
msgstr ""
-"Diese Terminierte Buchung ist nicht ausgeglichen. Bitte korrigieren Sie "
-"diese Buchung."
+"Diese geplante Buchung ist nicht ausgeglichen. Bitte korrigieren Sie diese "
+"Buchung."
#: gnucash/gnome/dialog-sx-from-trans.c:789
msgid ""
"Cannot create a Scheduled Transaction from a Transaction currently being "
"edited. Please Enter the Transaction before Scheduling."
msgstr ""
-"Es kann keine Terminierte Buchung von einer Buchung erstellt werden, die "
+"Es kann keine geplante Buchung von einer Buchung erstellt werden, die "
"ihrerseits gerade bearbeitet wird. Bitte speichern Sie die Buchung, bevor "
-"Sie eine Terminierte Buchung daraus erstellen wollen."
+"Sie eine geplante Buchung daraus erstellen wollen."
#: gnucash/gnome/dialog-sx-since-last-run.c:402
msgid "Ignored"
@@ -3375,10 +3375,10 @@ msgid_plural ""
"There are no Scheduled Transactions to be entered at this time. (%d "
"transactions automatically created)"
msgstr[0] ""
-"Es gibt derzeit keine terminierten Buchungen einzugeben. (Eine Buchung "
-"automatisch erstellt)"
+"Es gibt derzeit keine geplante Buchung einzugeben. (Eine Buchung automatisch "
+"erstellt)"
msgstr[1] ""
-"Es gibt derzeit keine terminierten Buchungen einzugeben. (%d Buchungen "
+"Es gibt derzeit keine geplanten Buchungen einzugeben. (%d Buchungen "
"automatisch erstellt)"
#: gnucash/gnome/dialog-sx-since-last-run.c:1000
@@ -3637,11 +3637,11 @@ msgstr "Term_inierte Buchungen"
# Fixme: Source should have HEllip?
#: gnucash/gnome/gnc-plugin-basic-commands.c:166
msgid "_Scheduled Transaction Editor"
-msgstr "_Editor für Terminierte Buchungen"
+msgstr "_Editor für geplante Buchungen"
#: gnucash/gnome/gnc-plugin-basic-commands.c:167
msgid "The list of Scheduled Transactions"
-msgstr "Die Liste der terminierten Buchungen"
+msgstr "Die Liste der geplanten Buchungen"
#: gnucash/gnome/gnc-plugin-basic-commands.c:171
msgid "Since _Last Run..."
@@ -3649,7 +3649,7 @@ msgstr "Seit _letztem Aufruf..."
#: gnucash/gnome/gnc-plugin-basic-commands.c:172
msgid "Create Scheduled Transactions since the last time run"
-msgstr "Alle terminierten Buchungen seit dem letzten Aufruf erstellen."
+msgstr "Alle geplanten Buchungen seit dem letzten Aufruf erstellen."
#: gnucash/gnome/gnc-plugin-basic-commands.c:176
msgid "_Mortgage & Loan Repayment..."
@@ -3657,7 +3657,7 @@ msgstr "_Hypothek & Darlehen Assistent..."
#: gnucash/gnome/gnc-plugin-basic-commands.c:177
msgid "Setup scheduled transactions for repayment of a loan"
-msgstr "Terminierte Buchungen einrichten, die ein Darlehen tilgen sollen"
+msgstr "Geplante Buchungen einrichten, die ein Darlehen tilgen sollen"
#: gnucash/gnome/gnc-plugin-basic-commands.c:180
#: gnucash/report/report-core.scm:153
@@ -3733,8 +3733,7 @@ msgstr "»Tipp des Tages« anzeigen"
#: gnucash/gnome/gnc-plugin-basic-commands.c:545
msgid "There are no Scheduled Transactions to be entered at this time."
-msgstr ""
-"Es gibt derzeit keine terminierten Buchungen, die gebucht werden sollten."
+msgstr "Es gibt derzeit keine geplanten Buchungen, die gebucht werden sollten."
#. Translators: %d is the number of transactions. This is a
#. ngettext(3) message.
@@ -3747,11 +3746,11 @@ msgid_plural ""
"There are no Scheduled Transactions to be entered at this time. (%d "
"transactions automatically created)"
msgstr[0] ""
-"Es gibt keine terminierten Buchungen, die erstellt werden sollen. (Eine "
-"Buchung automatisch erstellt)"
+"Es gibt keine geplante Buchung, die erstellt werden soll. (Eine Buchung "
+"automatisch erstellt)"
msgstr[1] ""
-"Es gibt keine terminierten Buchungen, die erstellt werden sollen. (%d "
-"Buchungen automatisch erstellt)"
+"Es gibt keine geplanten Buchungen, die erstellt werden sollen. (%d Buchungen "
+"automatisch erstellt)"
#: gnucash/gnome/gnc-plugin-budget.c:63
msgid "_New Budget"
@@ -5534,7 +5533,7 @@ msgstr "_Terminiert..."
#: gnucash/gnome/gnc-plugin-page-register.c:529
msgid ""
"Create a Scheduled Transaction with the current transaction as a template"
-msgstr "Terminierte Buchung erstellen mit aktuellem Buchungssatz als Vorlage"
+msgstr "Geplante Buchung mit aktuellem Buchungssatz als Vorlage erstellen"
#. Translators: The following 2 are Scrub actions in register view
#: gnucash/gnome/gnc-plugin-page-register2.c:397
@@ -6248,7 +6247,7 @@ msgstr "_Neu"
#: gnucash/gnome/gnc-plugin-page-sx-list.c:140
msgid "Create a new scheduled transaction"
-msgstr "Neue terminierte Buchung erstellen"
+msgstr "Neue geplante Buchung erstellen"
#: gnucash/gnome/gnc-plugin-page-sx-list.c:145
msgid "_New 2"
@@ -6256,11 +6255,11 @@ msgstr "_Neu"
#: gnucash/gnome/gnc-plugin-page-sx-list.c:146
msgid "Create a new scheduled transaction 2"
-msgstr "Neue terminierte Buchung erstellen"
+msgstr "Neue geplante Buchung erstellen"
#: gnucash/gnome/gnc-plugin-page-sx-list.c:152
msgid "Edit the selected scheduled transaction"
-msgstr "Ausgewählte terminierte Buchung bearbeiten"
+msgstr "Ausgewählte geplante Buchung bearbeiten"
#: gnucash/gnome/gnc-plugin-page-sx-list.c:157
msgid "_Edit 2"
@@ -6268,11 +6267,11 @@ msgstr "_Bearbeiten (neu)"
#: gnucash/gnome/gnc-plugin-page-sx-list.c:158
msgid "Edit the selected scheduled transaction 2"
-msgstr "Ausgewählte terminierte Buchung bearbeiten"
+msgstr "Ausgewählte geplante Buchung bearbeiten"
#: gnucash/gnome/gnc-plugin-page-sx-list.c:164
msgid "Delete the selected scheduled transaction"
-msgstr "Ausgewählte terminierte Buchung löschen"
+msgstr "Ausgewählte geplante Buchung löschen"
#: gnucash/gnome/gnc-plugin-page-sx-list.c:441
#: gnucash/gtkbuilder/dialog-account.glade:553
@@ -6289,8 +6288,8 @@ msgstr "Bevorstehende Buchungen"
msgid "Do you really want to delete this scheduled transaction?"
msgid_plural "Do you really want to delete %d scheduled transactions?"
msgstr[0] ""
-"Sind Sie sicher, dass Sie die ausgewählte Terminierte Buchung löschen wollen?"
-msgstr[1] "Sind Sie sicher, dass Sie %d Terminierte Buchungen löschen wollen?"
+"Sind Sie sicher, dass Sie die ausgewählte geplante Buchung löschen wollen?"
+msgstr[1] "Sind Sie sicher, dass Sie %d geplanten Buchungen löschen wollen?"
#: gnucash/gnome/gnc-plugin-register2.c:57
#: gnucash/gnome/gnc-plugin-register.c:58
@@ -6722,8 +6721,7 @@ msgstr "Präzise Berichte und Grafiken Ihrer Finanzdaten erzeugen"
#: gnucash/gnome/gnucash.appdata.xml.in.in:21
msgid "Set up scheduled transactions to avoid repeated data entry"
-msgstr ""
-"Terminierte Buchungen einrichten, um wiederholte Dateneingabe zu vermeiden"
+msgstr "Geplante Buchungen einrichten, um wiederholte Dateneingabe zu vermeiden"
#: gnucash/gnome/gnucash.appdata.xml.in.in:22
msgid ""
@@ -10157,7 +10155,7 @@ msgstr "Ausgleichskonto"
#. See "MAX_DATE_LENGTH" in https://code.gnucash.org/docs/MAINT/group__Date.html
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:1489
msgid " Scheduled "
-msgstr " Terminiert "
+msgstr " Geplant "
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2316
#: gnucash/register/ledger-core/split-register-control.c:1521
@@ -11611,9 +11609,9 @@ msgid ""
"the initial opening of the data file when GnuCash starts. If this setting is "
"active, run the \"since last run\" process, otherwise it is not run."
msgstr ""
-"Diese Einstellung bestimmt, ob die Aktion »Terminierte Buchungen->Seit "
-"letztem Aufruf...« beim Öffnen einer Datei automatisch ausgeführt wird. Nur "
-"wenn die Einstellung aktiviert ist, wird der Prozess gestartet."
+"Diese Einstellung bestimmt, ob die Aktion »Geplante Buchungen->Seit letztem "
+"Aufruf...« beim Öffnen einer Datei automatisch ausgeführt wird. Nur wenn die "
+"Einstellung aktiviert ist, wird der Prozess gestartet."
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:22
msgid "Show \"since last run\" notification dialog when a file is opened."
@@ -11629,9 +11627,9 @@ msgid ""
"show the dialog, otherwise it is not shown."
msgstr ""
"Diese Einstellung bestimmt, ob nur der Benachrichtigungsdialog »Seit letztem "
-"Aufruf...« der terminierten Buchungen beim Öffnen einer Datei angezeigt "
-"wird, wenn die »Seit letztem Aufruf«-Verarbeitung aktiviert ist. Nur wenn "
-"diese Einstellung aktiviert ist, wird der Dialog angezeigt."
+"Aufruf...« der geplanten Buchungen beim Öffnen einer Datei angezeigt wird, "
+"wenn die »Seit letztem Aufruf«-Verarbeitung aktiviert ist. Nur wenn diese "
+"Einstellung aktiviert ist, wird der Dialog angezeigt."
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:27
msgid ""
@@ -11652,7 +11650,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:35
msgid "Set the \"auto create\" flag by default"
msgstr ""
-"»Automatisch erstellen« für neue terminierte Buchungen als Voreinstellung "
+"»Automatisch erstellen« für neue geplante Buchungen als Voreinstellung "
"wählen."
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:36
@@ -11662,21 +11660,21 @@ msgid ""
"transaction creation, or at any later time by editing the scheduled "
"transaction."
msgstr ""
-"Wenn aktiviert, werden neu erstellte Terminierte Buchungen »Automatisch "
+"Wenn aktiviert, werden neu erstellte geplante Buchungen »Automatisch "
"erstellen« als Voreinstellung aktiviert haben. Diese Einstellung kann bei "
-"jeder Terminierten Buchung geändert werden."
+"jeder geplanten Buchung geändert werden."
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:40
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:41
msgid "How many days in advance to notify the user."
msgstr ""
-"Anzahl der Tage im Voraus, mit denen über die Terminierte Buchungen "
+"Anzahl der Tage im Voraus, mit denen über die geplanten Buchungen "
"benachrichtigt werden soll."
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:52
msgid "Set the \"notify\" flag by default"
msgstr ""
-"»Benachrichtigen« für neue terminierte Buchungen als Voreinstellung wählen."
+"»Benachrichtigen« für neue geplante Buchungen als Voreinstellung wählen."
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:53
msgid ""
@@ -11685,16 +11683,16 @@ msgid ""
"creation, or at any later time by editing the scheduled transaction. This "
"setting only has meaning if the create-auto setting is active."
msgstr ""
-"Wenn gewählt, werden neu erstellte Terminierte Buchungen »Benachrichtigen« "
-"als Voreinstellung aktiviert haben. Diese Einstellung kann bei jeder "
-"Terminierten Buchung auch nachträglich geändert werden. Diese Einstellung "
-"ist nur von Bedeutung, wenn »Automatisch erstellen« aktiviert ist."
+"Wenn gewählt, werden neu erstellte geplante Buchungen »Benachrichtigen« als "
+"Voreinstellung aktiviert haben. Diese Einstellung kann bei jeder geplanten "
+"Buchung auch nachträglich geändert werden. Diese Einstellung ist nur von "
+"Bedeutung, wenn »Automatisch erstellen« aktiviert ist."
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:57
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.sxs.gschema.xml.in:58
msgid "How many days in advance to remind the user."
msgstr ""
-"Anzahl der Tage im Voraus, die an Terminierte Buchungen erinnert werden soll."
+"Anzahl der Tage im Voraus, die an geplante Buchungen erinnert werden soll."
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.totd.gschema.xml.in:5
#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.totd.gschema.xml.in:6
@@ -14222,10 +14220,10 @@ msgstr ""
"Dieser Assistent ist eine Schritt-für-Schritt Anleitung, um die Rückzahlung "
"eines Darlehens in GnuCash einzurichten. Sie können die Parameter Ihres "
"Darlehens und der Tilgungsraten angeben. Mit diesen Informationen werden die "
-"entsprechenden terminierten Buchungen erstellt.\n"
+"entsprechenden geplanten Buchungen erstellt.\n"
"\n"
"Wenn Ihnen ein Fehler unterläuft oder Sie später Änderungen vornehmen "
-"möchten, können Sie die erstellte terminierte Buchung direkt ändern."
+"möchten, können Sie die erstellte geplante Buchung direkt ändern."
#: gnucash/gtkbuilder/assistant-loan.glade:111
msgid "Loan / Mortgage Repayment Setup"
@@ -14278,7 +14276,7 @@ msgid ""
msgstr ""
"Geben Sie die Anzahl der Monate an, die noch getilgt werden müssen. Daraus "
"resultiert sowohl der noch zu tilgende Betrag als auch die Dauer der "
-"terminierten Buchung."
+"geplanten Buchung."
#: gnucash/gtkbuilder/assistant-loan.glade:288
msgid "Months Remaining"
@@ -14400,7 +14398,7 @@ msgid ""
"Review the details below and if correct press Apply to create the schedule."
msgstr ""
"\n"
-"Prüfen Sie die Details unten und klicken Sie »Anwenden«, um die terminierten "
+"Prüfen Sie die Details unten und klicken Sie »Anwenden«, um die geplanten "
"Buchungen zu erstellen."
#: gnucash/gtkbuilder/assistant-loan.glade:1111
@@ -16378,7 +16376,7 @@ msgstr "Den einen leeren Eintrag in den Feldern ausrechnen."
#: gnucash/gtkbuilder/dialog-fincalc.glade:514
msgid "<b>Payment Options</b>"
-msgstr "<b>Zahlungsraten Optionen</b>"
+msgstr "<b>Darlehensoptionen</b>"
#: gnucash/gtkbuilder/dialog-fincalc.glade:535
msgid "Payment Total"
@@ -18469,8 +18467,8 @@ msgid ""
"The following Scheduled Transactions reference the deleted account and must "
"now be corrected. Press OK to edit them."
msgstr ""
-"Die folgenden terminierten Buchungen gehören zu dem gelöschten Konto und "
-"müssen nun geändert werden. Klicken Sie Ok, um sie zu ändern."
+"Die folgenden geplanten Buchungen gehören zu dem gelöschten Konto und müssen "
+"nun geändert werden. Klicken Sie Ok, um sie zu ändern."
#: gnucash/gtkbuilder/dialog-sx.glade:123
#: gnucash/gtkbuilder/gnc-frequency.glade:171
@@ -18492,7 +18490,7 @@ msgstr "Jährlich"
#: gnucash/gtkbuilder/dialog-sx.glade:144
msgid "Make Scheduled Transaction"
-msgstr "Terminierte Buchung erstellen"
+msgstr "Geplante Buchung erstellen"
#: gnucash/gtkbuilder/dialog-sx.glade:159
msgid "Advanced..."
@@ -18543,7 +18541,7 @@ msgstr "Neue Buchungen _automatisch erstellen"
#: gnucash/gtkbuilder/dialog-sx.glade:579
msgid "Set the 'auto-create' flag on newly created scheduled transactions."
msgstr ""
-"»Automatisch erstellen« für neue terminierte Buchungen als Voreinstellung "
+"»Automatisch erstellen« für neue geplante Buchungen als Voreinstellung "
"wählen."
#: gnucash/gtkbuilder/dialog-sx.glade:599
@@ -18565,7 +18563,7 @@ msgstr "Be_nachrichtigen, bevor neue Buchungen erstellt werden"
#: gnucash/gtkbuilder/dialog-sx.glade:675
msgid "Set the 'notify' flag on newly created scheduled transactions."
msgstr ""
-"»Benachrichtigen« für neue terminierte Buchungen als Voreinstellung wählen."
+"»Benachrichtigen« für neue geplante Buchungen als Voreinstellung wählen."
#: gnucash/gtkbuilder/dialog-sx.glade:694
msgid "Crea_te in advance"
@@ -18589,7 +18587,7 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-sx.glade:788
msgid "Edit Scheduled Transaction"
-msgstr "Terminierte Buchungen bearbeiten"
+msgstr "Geplante Buchungen bearbeiten"
#: gnucash/gtkbuilder/dialog-sx.glade:954
msgid "Create in advance"
@@ -25161,7 +25159,7 @@ msgstr "Kontenübersicht"
#: gnucash/report/reports/standard/account-summary.scm:70
msgid "Future Scheduled Transactions Summary"
-msgstr "Zukünftige Terminierte Buchungen"
+msgstr "Zukünftige geplante Buchungen"
#: gnucash/report/reports/standard/account-summary.scm:72
#: gnucash/report/reports/standard/balance-sheet.scm:75
diff --git a/po/glossary/de.po b/po/glossary/de.po
index 4272d0198..f0a9acc48 100644
--- a/po/glossary/de.po
+++ b/po/glossary/de.po
@@ -17,7 +17,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2021-12-05 20:11+0100\n"
-"PO-Revision-Date: 2022-02-17 17:55+0000\n"
+"PO-Revision-Date: 2022-07-25 20:24+0000\n"
"Last-Translator: Christian Wehling <christian.wehling at web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/glossary/"
"de/>\n"
@@ -26,7 +26,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.11-dev\n"
+"X-Generator: Weblate 4.14-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!)"
@@ -761,7 +761,8 @@ msgstr "speichern"
#. "A transaction or reminder of a transaction that can be automatically executed at a specific time. It can be executed either once, or several times at regular intervals."
msgid "Scheduled Transaction"
-msgstr "Terminierte Buchung (Dauerauftrag, Termin-Ãœberweisung)"
+msgstr ""
+"Geplante Buchung (Terminierte Buchung, Dauerauftrag, Termin-Ãœberweisung)"
# bis 1.6: ausbuchen
#. "DEPRECATED. 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'. Deprecated - use the term 'to check and repair' now."
commit 6c100532127e694a11c25265585a8996aa78d0f5
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Jul 25 09:24:18 2022 +0800
[trep-engine] fix use of gnc:make-complex-boolean-option
don't set invalid setter-function-called-cb
diff --git a/gnucash/report/trep-engine.scm b/gnucash/report/trep-engine.scm
index 20d854de2..57b4e8973 100644
--- a/gnucash/report/trep-engine.scm
+++ b/gnucash/report/trep-engine.scm
@@ -973,8 +973,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-complex-boolean-option
gnc:pagename-display (N_ "Memo")
- "d" (G_ "Display the memo?") disp-memo?
- disp-memo?
+ "d" (G_ "Display the memo?") disp-memo? #f
(lambda (x)
(set! disp-memo? x)
(apply-selectable-by-name-display-options))))
@@ -983,8 +982,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-complex-boolean-option
gnc:pagename-display (N_ "Account Name")
- "e" (G_ "Display the account name?") disp-accname?
- disp-accname?
+ "e" (G_ "Display the account name?") disp-accname? #f
(lambda (x)
(set! disp-accname? x)
(apply-selectable-by-name-display-options))))
@@ -993,8 +991,7 @@ be excluded from periodic reporting.")
(gnc:register-trep-option
(gnc:make-complex-boolean-option
gnc:pagename-display (N_ "Other Account Name")
- "h5" (G_ "Display the other account name? (if this is a split transaction, this parameter is guessed).") disp-other-accname?
- disp-other-accname?
+ "h5" (G_ "Display the other account name? (if this is a split transaction, this parameter is guessed).") disp-other-accname? #f
(lambda (x)
(set! disp-other-accname? x)
(apply-selectable-by-name-display-options))))
commit 3a6f1ab1a962d5730269233cfbda3f15c8e9ad2c
Author: Christian Wehling <christian.wehling at web.de>
Date: Mon Jul 25 17:20:16 2022 +0200
[dialog-price] Price Database: Insert help buttons
diff --git a/gnucash/gnome/dialog-price-edit-db.c b/gnucash/gnome/dialog-price-edit-db.c
index 14770a519..721446fc6 100644
--- a/gnucash/gnome/dialog-price-edit-db.c
+++ b/gnucash/gnome/dialog-price-edit-db.c
@@ -62,6 +62,7 @@ static QofLogModule log_module = GNC_MOD_GUI;
void gnc_prices_dialog_destroy_cb (GtkWidget *object, gpointer data);
void gnc_prices_dialog_close_cb (GtkDialog *dialog, gpointer data);
+void gnc_prices_dialog_help_cb (GtkDialog *dialog, gpointer data);
void gnc_prices_dialog_edit_clicked (GtkWidget *widget, gpointer data);
void gnc_prices_dialog_remove_clicked (GtkWidget *widget, gpointer data);
void gnc_prices_dialog_remove_old_clicked (GtkWidget *widget, gpointer data);
@@ -134,6 +135,15 @@ gnc_prices_dialog_close_cb (GtkDialog *dialog, gpointer data)
}
+void
+gnc_prices_dialog_help_cb (GtkDialog *dialog, gpointer data)
+{
+ PricesDialog *pdb_dialog = data;
+
+ gnc_gnome_help (GTK_WINDOW (pdb_dialog->window), HF_HELP, HL_PRICE_DB);
+}
+
+
void
gnc_prices_dialog_edit_clicked (GtkWidget *widget, gpointer data)
{
diff --git a/gnucash/gnome/dialog-price-editor.c b/gnucash/gnome/dialog-price-editor.c
index fba85ca64..6b36c6702 100644
--- a/gnucash/gnome/dialog-price-editor.c
+++ b/gnucash/gnome/dialog-price-editor.c
@@ -71,6 +71,7 @@ typedef struct
GtkWidget * type_combobox;
GtkWidget * price_edit;
+ GtkWidget * help_button;
GtkWidget * cancel_button;
GtkWidget * apply_button;
GtkWidget * ok_button;
@@ -371,6 +372,10 @@ pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
gnc_price_unref (pedit_dialog->price);
pedit_dialog->price = new_price;
}
+ else if (response == GTK_RESPONSE_HELP)
+ {
+ gnc_gnome_help (GTK_WINDOW (pedit_dialog->dialog), HF_HELP, HL_PRICE_EDIT);
+ }
else
{
gnc_save_window_size(GNC_PREFS_GROUP, GTK_WINDOW(pedit_dialog->dialog));
@@ -544,6 +549,9 @@ gnc_price_pedit_dialog_create (GtkWidget *parent,
g_signal_connect (G_OBJECT (w), "changed",
G_CALLBACK (pedit_data_changed_cb), pedit_dialog);
+ w = GTK_WIDGET(gtk_builder_get_object (builder, "pd_help_button"));
+ pedit_dialog->help_button = w;
+
w = GTK_WIDGET(gtk_builder_get_object (builder, "pd_cancel_button"));
pedit_dialog->cancel_button = w;
diff --git a/gnucash/gtkbuilder/dialog-price.glade b/gnucash/gtkbuilder/dialog-price.glade
index 887d9d450..e2178311f 100644
--- a/gnucash/gtkbuilder/dialog-price.glade
+++ b/gnucash/gtkbuilder/dialog-price.glade
@@ -55,6 +55,22 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="layout-style">end</property>
+ <child>
+ <object class="GtkButton" id="pd_help_button">
+ <property name="label" translatable="yes">_Help</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
<child>
<object class="GtkButton" id="pd_cancel_button">
<property name="label" translatable="yes">_Cancel</property>
@@ -67,7 +83,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -81,7 +97,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -97,7 +113,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -334,6 +350,7 @@
</object>
</child>
<action-widgets>
+ <action-widget response="-11">pd_help_button</action-widget>
<action-widget response="-6">pd_cancel_button</action-widget>
<action-widget response="-10">pd_apply_button</action-widget>
<action-widget response="-5">pd_ok_button</action-widget>
@@ -782,13 +799,15 @@ These prices were added so that there's always a "nearest in time" price for eve
<property name="default-width">800</property>
<property name="default-height">400</property>
<child>
- <object class="GtkBox" id="vbox11">
+ <!-- n-columns=2 n-rows=2 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
- <object class="GtkBox" id="hbox1">
+ <object class="GtkBox" id="vbox11">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="price_list_window">
<property name="visible">True</property>
@@ -799,163 +818,192 @@ These prices were added so that there's always a "nearest in time" price for eve
<property name="shadow-type">in</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-bottom">6</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox">
+ <object class="GtkButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="margin-bottom">12</property>
+ <property name="border-width">5</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <property name="layout-style">start</property>
<child>
- <object class="GtkButtonBox" id="vbuttonbox1">
+ <object class="GtkButton" id="add_button">
+ <property name="label" translatable="yes">_Add</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="border-width">5</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <property name="layout-style">start</property>
- <child>
- <object class="GtkButton" id="add_button">
- <property name="label" translatable="yes">_Add</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="can-default">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">Add a new price.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_add_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="remove_button">
- <property name="label" translatable="yes">_Remove</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can-focus">True</property>
- <property name="can-default">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">Remove the current price.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_remove_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="edit_button">
- <property name="label" translatable="yes">_Edit</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can-focus">True</property>
- <property name="can-default">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">Edit the current price.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_edit_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="remove_old_button">
- <property name="label" translatable="yes">Remove _Old</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="can-default">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">Remove prices older than a user-entered date.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_remove_old_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="get_quotes_button">
- <property name="label" translatable="yes">_Get Quotes</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="can-default">True</property>
- <property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes">Get new online quotes for stock accounts.</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_get_quotes_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">Add a new price.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_add_clicked" swapped="no"/>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButtonBox" id="vbuttonbox2">
+ <object class="GtkButton" id="remove_button">
+ <property name="label" translatable="yes">_Remove</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="valign">end</property>
- <property name="border-width">5</property>
- <property name="orientation">vertical</property>
- <property name="layout-style">start</property>
- <child>
- <object class="GtkButton" id="close_button">
- <property name="label" translatable="yes">_Close</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="can-default">True</property>
- <property name="receives-default">False</property>
- <property name="valign">start</property>
- <property name="use-underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_close_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="sensitive">False</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">Remove the current price.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_remove_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="edit_button">
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">Edit the current price.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_edit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="remove_old_button">
+ <property name="label" translatable="yes">Remove _Old</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">Remove prices older than a user-entered date.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_remove_old_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="get_quotes_button">
+ <property name="label" translatable="yes">_Get Quotes</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes">Get new online quotes for stock accounts.</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_get_quotes_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="vbuttonbox2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="valign">end</property>
+ <property name="border-width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout-style">start</property>
+ <child>
+ <object class="GtkButton" id="close_button">
+ <property name="label" translatable="yes">_Close</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="valign">start</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_close_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="valign">end</property>
+ <property name="layout-style">start</property>
+ <child>
+ <object class="GtkButton" id="help_button">
+ <property name="label" translatable="yes">_Help</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="margin-bottom">9</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_help_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
commit 5fa4b83169b70f7d273960dd2250fa2a7ddd2a61
Author: Christian Wehling <christian.wehling at web.de>
Date: Thu Jul 21 17:42:31 2022 +0200
[gnc-ui.h] Price Database: Insert new links to the help file
diff --git a/gnucash/gnome-utils/gnc-ui.h b/gnucash/gnome-utils/gnc-ui.h
index 40224c79b..1df87cd54 100644
--- a/gnucash/gnome-utils/gnc-ui.h
+++ b/gnucash/gnome-utils/gnc-ui.h
@@ -64,6 +64,8 @@
#define HL_COMMODITY "tool-commodity"
#define HL_FIND_TRANSACTIONS "tool-find"
#define HL_FIN_CALC "tool-calc"
+#define HL_PRICE_DB "tool-price"
+#define HL_PRICE_EDIT "tool-price-manual"
#define HL_GLOBPREFS "set-prefs"
#define HL_PRINTCHECK "print-check"
#define HL_RECNWIN "acct-reconcile"
commit d3a3e3e9f9a8db3294fb115522993f409fa3b44f
Author: Wellington Terumi Uemura <wellingtonuemura at gmail.com>
Date: Mon Jul 25 02:18:11 2022 +0200
Translation update by Wellington Terumi Uemura <wellingtonuemura at gmail.com> using Weblate
po/pt_BR.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (Portuguese (Brazil))
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/pt_BR/
Co-authored-by: Wellington Terumi Uemura <wellingtonuemura at gmail.com>
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 193dc3c42..39821cf7c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -15,10 +15,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-18 13:22+0000\n"
+"PO-Revision-Date: 2022-07-25 00:18+0000\n"
"Last-Translator: Wellington Terumi Uemura <wellingtonuemura at gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
"gnucash/gnucash/pt_BR/>\n"
@@ -8788,10 +8788,8 @@ msgid "Edit the global preferences of GnuCash"
msgstr "Editar as preferências globais do GnuCash"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>Posição da Aba</b>"
+msgstr "P_osição da Aba"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -16498,10 +16496,8 @@ msgid "Green"
msgstr "Verde"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "Não imprima os detalhes da transação"
+msgstr "Edite os detalhes das transações importadas"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -21890,24 +21886,18 @@ msgstr "Desativado"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "Atribua uma conta de transferência à seleção."
+msgstr "_Atribua uma conta de transferência à seleção"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "Descrição, notas ou memorando"
+msgstr "_Edite a descrição, as notas ou o memorando"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "Restaurar padrões"
+msgstr "_Redefina todas as edições"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
commit 738a99f3a42d32ec350e4d76519ff2af5ae1ae4a
Author: Szia Tomi <sziatomi01 at gmail.com>
Date: Mon Jul 25 02:18:11 2022 +0200
Translation update by Szia Tomi <sziatomi01 at gmail.com> using Weblate
po/glossary/hu.po: 100.0% (216 of 216 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Glossary (Hungarian)
Translate-URL: https://hosted.weblate.org/projects/gnucash/glossary/hu/
Co-authored-by: Szia Tomi <sziatomi01 at gmail.com>
diff --git a/po/glossary/hu.po b/po/glossary/hu.po
index edc43fb98..1843d6164 100644
--- a/po/glossary/hu.po
+++ b/po/glossary/hu.po
@@ -11,7 +11,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2021-12-05 20:11+0100\n"
-"PO-Revision-Date: 2022-07-10 23:35+0000\n"
+"PO-Revision-Date: 2022-07-24 21:14+0000\n"
"Last-Translator: Szia Tomi <sziatomi01 at gmail.com>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/gnucash/"
"glossary/hu/>\n"
@@ -20,7 +20,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.13.1-dev\n"
+"X-Generator: Weblate 4.14-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!)"
@@ -29,7 +29,7 @@ msgstr ""
#. "Opening and closing quote symbols and optionally their key combos like [altgr]+[Y]/[X]. Define the preferred style of quotation, see https://en.wikipedia.org/wiki/Quotation_mark#Summary_table"
msgid "\"\""
-msgstr "\"\""
+msgstr "„â€"
#. "A detailed record of money spent and received"
msgid "account"
commit 544f9100671a1d00f440def9671a823872fb8881
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Jul 24 12:49:20 2022 +0800
[import-main-matcher] don't need collated string anymore
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 24a86e356..69d77d8a8 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -978,7 +978,6 @@ static RowInfo * row_get_info (gpointer row, GNCImportMainMatcher *info)
enum
{
COMPLETION_LIST_ORIGINAL,
- COMPLETION_LIST_COLLATED,
COMPLETION_LIST_NORMALIZED_FOLDED,
NUM_COMPLETION_COLS
};
@@ -987,18 +986,15 @@ static void populate_list (gpointer key, gpointer value, GtkListStore *list)
{
GtkTreeIter iter;
const char *original = key;
- char *collated = g_utf8_collate_key (original, -1);
- char *normalized = collated ? g_utf8_normalize (original, -1, G_NORMALIZE_ALL) : NULL;
+ char *normalized = g_utf8_normalize (original, -1, G_NORMALIZE_ALL);
char *normalized_folded = normalized ? g_utf8_casefold (normalized, -1) : NULL;
gtk_list_store_append (list, &iter);
gtk_list_store_set (list, &iter,
COMPLETION_LIST_ORIGINAL, original,
- COMPLETION_LIST_COLLATED, collated,
COMPLETION_LIST_NORMALIZED_FOLDED, normalized_folded,
-1);
g_free (normalized_folded);
g_free (normalized);
- g_free (collated);
}
static gboolean
commit 0ea46fabeb06a804f40017fb2388774719bcd37b
Author: Avi Markovitz <avi.markovitz at gmail.com>
Date: Sat Jul 23 16:22:58 2022 +0200
Translation update by Avi Markovitz <avi.markovitz at gmail.com> using Weblate
po/he.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
1 failing checks (0.1%)
Translation: GnuCash/Program (Hebrew)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/he/
Translation update by Avi Markovitz <avi.markovitz at gmail.com> using Weblate
po/he.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
3 failing checks (0.1%)
Translation: GnuCash/Program (Hebrew)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/he/
Translation update by Avi Markovitz <avi.markovitz at gmail.com> using Weblate
po/he.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
3 failing checks (0.1%)
Translation: GnuCash/Program (Hebrew)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/he/
Co-authored-by: Avi Markovitz <avi.markovitz at gmail.com>
diff --git a/po/he.po b/po/he.po
index 718a6c231..45b0bcb17 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,8 +11,8 @@ 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-07-23 09:57+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
+"PO-Revision-Date: 2022-07-23 14:22+0000\n"
+"Last-Translator: Avi Markovitz <avi.markovitz at gmail.com>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/gnucash/gnucash/"
"he/>\n"
"Language: he\n"
@@ -3284,7 +3284,7 @@ msgstr "כעת"
#: gnucash/gnome/dialog-tax-info.c:1185
#: gnucash/gtkbuilder/dialog-tax-info.glade:89
msgid "Income Tax Identity"
-msgstr "מזהה מס ×”×›× ×¡×”"
+msgstr "מזהה מס ×”×›× ×¡×” (מספר תיק)"
#: gnucash/gnome/dialog-tax-info.c:1191
#: gnucash/gtkbuilder/dialog-options.glade:55
@@ -3484,7 +3484,7 @@ msgstr "מצי×ת ×ª× ×•×¢×•×ª ב×מצעות חיפוש"
#: gnucash/gnome/gnc-plugin-page-register2.c:263
#: gnucash/gnome/gnc-plugin-page-register.c:377
msgid "Ta_x Report Options"
-msgstr "×פ_שרויות מיסוי"
+msgstr "×פ_שרויות דוח מס"
#. Translators: currently implemented are
#. US: income tax and
@@ -5845,7 +5845,7 @@ msgstr "יצירת PDF"
msgid ""
"Update the current report's saved configuration. The report configuration "
"will be saved in the file %s."
-msgstr "עדכון תצורת הדוח השמור ×”× ×•×›×—×™. הגדרות הדוח יישמרו בקובץ %s."
+msgstr "עדכון תצורת הדוח השמור ×”× ×•×›×—×™. תצורת הדוח תישמר בקובץ %s."
#: gnucash/gnome/gnc-plugin-page-report.c:1199
#, c-format
@@ -5976,7 +5976,7 @@ msgid ""
"This report must be upgraded to return a document object with export-string "
"or export-error."
msgstr ""
-"חובה לשדרג דוח ×–×” על ×ž× ×ª להחזיר פריט מסמך ×¢×, export-string ×ו, export-error."
+"על ×ž× ×ª להחזיר פריט מסמך ×¢× export-string ×ו, export-error, יש לשדרג דוח ×–×”."
#: gnucash/gnome/gnc-plugin-page-report.c:1765
#, c-format
@@ -6121,7 +6121,7 @@ msgstr "×רעה שגי××” בעת הרצת הדוח."
#: gnucash/gnome/gnc-plugin-report-system.c:206
#, c-format
msgid "Badly formed options URL: %s"
-msgstr "תצורת ×פשרויות מען URL שגויה: %s"
+msgstr "תצורת ×פשרויות מען־URL שגויה: %s"
#: gnucash/gnome/gnc-plugin-report-system.c:194
#, c-format
@@ -7584,7 +7584,7 @@ msgid ""
"default gain/loss account."
msgstr ""
"×ין ×—×©×‘×•× ×•×ª '×”×›× ×¡×•×ª' ×ו 'הוצ×ות'\n"
-"למטבע ×”×¡×¤×¨×™× ×©×¦×•×™×™×Ÿ; כדי לבחור בחשבון ברירת מחדל לחשבון 'רווח/הפסד',\n"
+"למטבע ×”×¡×¤×¨×™× ×©×¦×•×™×Ÿ; כדי לבחור בחשבון ברירת מחדל לחשבון 'רווח/הפסד',\n"
"ל×חר הקמת חשבון, יש לחזור לתיבת דו־שיח זו\n"
"(מתפריט 'קובץ ← מ××¤×™×™× ×™×')."
@@ -7825,8 +7825,8 @@ msgid ""
"You can't transfer from a non-currency account. Try reversing the \"from\" "
"and \"to\" accounts and making the \"amount\" negative."
msgstr ""
-"×œ× × ×™×ª×Ÿ להעביר מחשבון ש××™× ×• מטבעי. × ×¡×• להפוך ×ת סדר ×”×¢×¨×›×™× 'מחשבון' "
-"ו־'לחשבון' ×•×”×–×™× ×• ×ת ×”Ö¾'סכו×' כמספר שלילי."
+"×œ× × ×™×ª×Ÿ להעביר מחשבון ש××™× ×• מטבעי. × ×™×ª×Ÿ ×œ× ×¡×•×ª להפוך ×ת סדר ×”×¢×¨×›×™× 'מחשבון' ו־"
+"'לחשבון' והלהזין ×ת ×”'סכו×' כמספר שלילי."
#: gnucash/gnome-utils/dialog-transfer.c:1486
msgid "You must enter a valid price."
@@ -8189,8 +8189,9 @@ msgid ""
"system, you may not have write permission for the directory or your anti-"
"virus software is preventing this action."
msgstr ""
-"×œ×’× ×•×§×ש ×œ× ×”×ª×פשר לכתוב ל־%s. מסד × ×ª×•× ×™× ×–×” עשוי להיות במערכת ×§×‘×¦×™× ×œ×§×¨×™××” "
-"בלבד, ייתכן שחסרה הרש×ת כתיבה לספריה, ×ו, ×ª×•×›× ×ª ×”×× ×˜×™Ö¾×•×™×¨×•×¡ ×ž×•× ×¢×ª פעולה זו."
+"×œ× ×”×™×™×ª×” ×פשרות ×œ×’× ×•×§×ש לכתוב ל־%s. מסד × ×ª×•× ×™× ×–×” עשוי ×œ×”×ž×¦× ×¢×œ ×ž×¢×¨×›×ªÖ¾×§×‘×¦×™× "
+"לקרי××” בלבד, ייתכן שחסרה הרש×ת כתיבה לספריה, ×ו, ×©×ª×›× ×ª ×”×× ×˜×™Ö¾×•×™×¨×•×¡ ×ž×•× ×¢×ª "
+"פעולה זו."
#: gnucash/gnome-utils/gnc-file.c:385
#, c-format
@@ -8337,9 +8338,9 @@ msgid ""
"your SQL database. Please see https://bugs.gnucash.org/show_bug.cgi?"
"id=645216 for more information."
msgstr ""
-"×’× ×•×§×ש ×œ× ×™×›×•×œ×” ×œ×”×©×œ×™× ×‘×“×™×§×” מהותית ל×יתור תקל בספרית 'libdbi'. יתכן שהדבר "
-"× ×’×¨× ×›×ª×•×¦××” מתצורת הרש×ות שגויה במסד × ×ª×•× ×™ SQL. למידע × ×•×¡×£, × ×™×ª×Ÿ לעיין ב־"
-"https://bugs.gnucash.org/show_bug.cgi?id=645216."
+"×’× ×•×§×ש ×œ× ×™×›×•×œ×” ×œ×”×©×œ×™× ×‘×“×™×§×” מהותית ל×יתור המצ×ות תקל בספרית 'libdbi'. יתכן "
+"שהדבר × ×’×¨× ×›×ª×•×¦××” מתצורת הרש×ות שגויה במסד × ×ª×•× ×™ SQL. למידע × ×•×¡×£, × ×™×ª×Ÿ לעיין "
+"ב־https://bugs.gnucash.org/show_bug.cgi?id=645216."
#: gnucash/gnome-utils/gnc-file.c:537
msgid ""
@@ -8563,13 +8564,11 @@ msgstr "הע_דפות"
#: gnucash/gnome-utils/gnc-main-window.c:339
msgid "Edit the global preferences of GnuCash"
-msgstr "עריכת המ××¤×™×™× ×™× ×”×›×œ×œ×™×™× ×©×œ ×’× ×•×§×ש"
+msgstr "עריכת ההעדפות הכלליות של ×’× ×•×§×ש"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>×ž×™×§×•× ×œ×©×•× ×™×ª</b>"
+msgstr "×ž×™×§×•× ×œ_×©×•× ×™×ª"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -8617,7 +8616,7 @@ msgstr "מדריך שימוש ומדריך _מושגי×"
#: gnucash/gnome-utils/gnc-main-window.c:391
msgid "Open the GnuCash Tutorial"
-msgstr "פתיחת מדריך למשתמש ×‘×’× ×•×§×ש"
+msgstr "פתיחת מדריך למשתמש – ×’× ×•×§×ש"
#: gnucash/gnome-utils/gnc-main-window.c:395
msgid "_Contents"
@@ -8843,7 +8842,7 @@ msgstr "×—×©×‘×•× ×ות ל×× ×©×™× ×¤×¨×˜×™×™× ×•×¢×¡×§×™× ×§×˜× ×™×."
#: gnucash/gnome-utils/gnc-main-window.c:4910
msgid "translator-credits"
msgstr ""
-"×בי מרקוביץ avi.markovitz at gmail.com ,2021, 2020, 2019\n"
+"×בי מרקוביץ avi.markovitz at gmail.com 2022 ,2021, 2020, 2019\n"
"ירון ×©×”×¨×‘× ×™ 2021\n"
"×ורי הוך 2006"
@@ -10077,10 +10076,10 @@ msgid ""
msgstr ""
"הפעלת פקודות ×œ×¢× ×™×Ÿ דוחות. הפקודות הב×ות × ×ª×ž×›×•×ª.\n"
"\n"
-"רשימה: \tרשימת דוחות ×–×ž×™× ×™×.\n"
-"הצגה: \tתי×ור ×”×©×™× ×•×™×™× ×©× ×¢×©×• בדוח ×”×מור. × ×™×ª×Ÿ להגדיר קובץ × ×ª×•× ×™× ×œ×ª×ור מספר "
+" list: \t רשימת דוחות ×–×ž×™× ×™×.\n"
+" show: תי×ור ×”×©×™× ×•×™×™× ×©× ×¢×©×• בדוח ×”×מור. × ×™×ª×Ÿ להגדיר קובץ × ×ª×•× ×™× ×œ×ª×ור מספר "
"×פשרויות ×©× ×©×ž×¨×•.\n"
-"הרצה: \tהרצת הדוח ×”×מור מקובץ × ×ª×•× ×™ ×’× ×•×§×ש ×”× ×ª×•×Ÿ.\n"
+" run: \tהרצת הדוח ×”×מור מקובץ × ×ª×•× ×™ ×’× ×•×§×ש ×”× ×ª×•×Ÿ.\n"
#: gnucash/gnucash-cli.cpp:113
msgid "Name of the report to run\n"
@@ -10183,7 +10182,7 @@ msgid ""
"Enable debugging mode: provide deep detail in the logs.\n"
"This is equivalent to: --log \"=info\" --log \"qof=info\" --log \"gnc=info\""
msgstr ""
-"×פשור מצב × ×™×¤×•×™Ö¾×ª×§×œ×™×: מספק מידע מפורט ביומן־הרישו×.\n"
+"×פשור מצב × ×™×¤×•×™Ö¾×ª×§×œ×™×: ×ספקת מידע מפורט ביומן־הרישו×.\n"
"זהה ל־: ‎--log \"=info\" --log \"qof=info\" --log \"gnc=info\"‎"
#: gnucash/gnucash-core-app.cpp:305
@@ -11288,7 +11287,7 @@ msgstr "× ×ª×™×‘ ר×שי לצרופות מקושרות ×œ×ª× ×•×¢×”"
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:26
msgid ""
"This is the path head for the Transaction Linked Files with relative paths"
-msgstr "זהו ×”× ×ª×™×‘ הר×שי לצרופות בעלות × ×ª×™×‘×™× ×™×—×¡×™×™×, המקושרות ×œ×ª× ×•×¢×”"
+msgstr "זהו ×”× ×ª×™×‘ הר×שי, לצרופות ×¢× × ×ª×™×‘×™× ×™×—×¡×™×™×, שמקושרות ×œ×ª× ×•×¢×”"
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:30
msgid "Compress the data file"
@@ -11307,7 +11306,7 @@ msgid ""
"If active, GnuCash shows an explanation of the auto-save feature the first "
"time that feature is started. Otherwise no extra explanation is shown."
msgstr ""
-"×× ×”×פשרות פעילה, ×’× ×•×§×ש יציג הסבר על ×ª×›×•× ×ª השמירה ×”×וטומטית בהפעלה ר××©×•× ×” "
+"×× ×”×פשרות פעילה, ×’× ×•×§×ש תציג הסבר על ×ª×›×•× ×ª השמירה ×”×וטומטית בהפעלה ר××©×•× ×” "
"של ×”×ª×›×•× ×”. ×חרת ×œ× ×™×•×¦×’ הסבר × ×•×¡×£."
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:40
@@ -11411,10 +11410,10 @@ msgid ""
"days'"
msgstr ""
"×פשרות זו מגדירה מה ייעשה בקובצי ×™×•×ž× ×™Ö¾×¨×™×©×•×/×’×™×‘×•×™×™× ×™×©× ×™×. 'לעד' פירושו "
-"לשמור ×ת כל ×”×§×‘×¦×™× ×”×™×©× ×™×. '×œ×¢×•×œ× ×œ×' פירושו ×©×œ× × ×©×ž×¨×™× ×§×•×‘×¦×™ יומן־"
-"רישו×/גיבוי ×™×©× ×™×. בכל ×¤×¢× ×©×ž×ª×‘×¦×¢×ª שמירה, גרס×ות ×™×©× ×•×ª יותר של הקובץ מוסרות. "
-"'ימי×' פירושו מספר ×”×™×ž×™× ×©×™×© לשמור ×§×‘×¦×™× ×™×©× ×™×. מספר ×”×™×ž×™× ×ž×•×’×“×¨ במפתח '×™×ž×™× "
-"לשמירה'"
+"לשמור ×ת כל ×”×§×‘×¦×™× ×”×™×©× ×™×. '×œ×¢×•×œ× ×œ×' פירושו ×©×œ× × ×©×ž×¨×™× ×§×•×‘×¦×™ יומן־רישו×/"
+"גיבוי ×™×©× ×™×. בכל ×¤×¢× ×©×ž×ª×‘×¦×¢×ª שמירה, גרס×ות ×™×©× ×•×ª יותר של הקובץ מוסרות. "
+"'ימי×' פירושו מספר ×”×™×ž×™× ×©×™×© לשמור ×§×‘×¦×™× ×™×©× ×™×. מספר ×”×™×ž×™× ×ž×•×’×“×¨ במפתח "
+"'retain-days'"
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:80
#: gnucash/gtkbuilder/dialog-preferences.glade:1902
@@ -11929,9 +11928,9 @@ msgid ""
"register is first opened. The setting can be changed at any time via the "
"\"View->Double Line\" menu item."
msgstr ""
-"הצגת שורה × ×•×¡×¤×ª ביומן, לכל ×ª× ×•×¢×” הכוללת 'פעולה', 'הערות', ו'צרופות'. זוהי "
-"הגדרת ברירת המחדל עבור יומן שיפתח לר××©×•× ×”. × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת ההגדרה בכל עת, "
-"מפריט 'מצג ← שורה כפולה'."
+"הצגת שורה × ×•×¡×¤×ª ביומן בכל ×ª× ×•×¢×” הכוללת: 'פעולה', 'הערות', ו'צרופות'. זוהי "
+"הגדרת ברירת המחדל שיופיעו בפתיחה הר××©×•× ×” של היומן. × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת ההגדרה בכל "
+"עת, מפריט 'מצג ← שורה כפולה'."
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:311
msgid "Only display leaf account names."
@@ -12403,12 +12402,12 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:99
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:222
msgid "Cut a transaction"
-msgstr "_גזירת ×ª× ×•×¢×”"
+msgstr "גזירת ×ª× ×•×¢×”"
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:100
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:223
msgid "This dialog is presented before allowing you to cut a transaction."
-msgstr "חלון דו־שיח ×–×” מוצג ×œ×¤× ×™ שתת×פשר גזירת ×ª× ×•×¢×”."
+msgstr "חלון דו־שיח ×–×” מוצג ×œ×¤× ×™ ×©× ×™×ª×Ÿ ×™×”×™×” לגזור ×ª× ×•×¢×”."
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:104
#: gnucash/gschemas/org.gnucash.GnuCash.warnings.gschema.xml.in:227
@@ -13436,8 +13435,8 @@ msgid ""
"If not satisfied with the available templates, please read the wiki page "
"linked below and share your new or improved template."
msgstr ""
-"×× ×”×ª×‘× ×™×•×ª ×”×–×ž×™× ×•×ª ××™× ×Ÿ מספקות, × × ×œ×¢×™×™×Ÿ בעמוד הוויקי שלהלן, ×©× × ×™×ª×Ÿ לשתף ×ת "
-"×”×ª×‘× ×™×•×ª החדשות שיצרת."
+"×× ×”×ª×‘× ×™×•×ª ×”×–×ž×™× ×•×ª ××™× ×Ÿ מספקות, × × ×œ×¢×™×™×Ÿ בעמוד הוויקי שלהלן, ×©× × ×™×ª×Ÿ לשתף "
+"×ª×‘× ×™×•×ª חדשות ×©× ×•×¦×¨×• על ידי משתמשי×."
#: gnucash/gtkbuilder/assistant-hierarchy.glade:484
msgid ""
@@ -13904,8 +13903,8 @@ msgstr ""
"× ×¨××” שקובץ ×”Ö¾QIF ×©× ×˜×¢×Ÿ מכיל ×ª× ×•×¢×•×ª בחשבון ×חד בלבד, ×ך הקובץ ××™× ×• מכיל ×ת ×©× "
"החשבון.\n"
"\n"
-"× × ×œ×”×–×™×Ÿ ×©× ×—×©×‘×•×Ÿ. ×× ×”×§×•×‘×¥ ×™×•×¦× ×ž×ª×•×›× ×ª ×—×©×‘×•× ×ות ×חרת, יש להשתמש ב×ותו ×©× "
-"חשבון ששימש ב×ותה ×”×ª×•×›× ×”.\n"
+"× × ×œ×”×–×™×Ÿ ×©× ×—×©×‘×•×Ÿ. ×× ×”×§×•×‘×¥ ×™×•×¦× ×ž×ª×›× ×ª ×”× ×”×œ×ªÖ¾×—×©×‘×•× ×•×ª ×חרת, × × ×œ×”×©×ª×ž×© ב×ותו "
+"×©× ×—×©×‘×•×Ÿ ששימש ב×ותה ×”×ª×›× ×”.\n"
#: gnucash/gtkbuilder/assistant-qif-import.glade:368
msgid "Account name"
@@ -14727,7 +14726,7 @@ msgid ""
"Use Edit->Tax Report Options to set the tax-related flag and assign a tax "
"code to this account."
msgstr ""
-"תיבת בר מיסוי תהיה פעילה ×× ×”×•×’×“×¨×• קוד מיסוי ×œ×—×©×‘×•× ×•×ª ×לו בתפריט 'עריכה "
+"תיבת 'בר מיסוי' תהיה פעילה ×× ×”×•×’×“×¨×• קוד מיסוי ×œ×—×©×‘×•× ×•×ª ×לו בתפריט 'עריכה "
"← ×פשרויות מיסוי'."
#: gnucash/gtkbuilder/dialog-account.glade:1517
@@ -15234,9 +15233,7 @@ msgstr "בחירת מידע משתמש ×›×ן..."
msgid ""
"The customer ID number. If left blank a reasonable number will be chosen for "
"you"
-msgstr ""
-"מזהה הלקוח. ×× ×”×©×“×” יותר ריק, מספר זיהוי ספק סביר ייקבע על ידי המערכת ב×ופן "
-"×וטומטי"
+msgstr "מזהה הלקוח. ×× ×”×©×“×” יש×ר ריק, המערכת תקצה מזהה־ ספק סביר"
#: gnucash/gtkbuilder/dialog-customer.glade:258
#: gnucash/gtkbuilder/dialog-customer.glade:790
@@ -15907,10 +15904,8 @@ msgid "Green"
msgstr "ירוק"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "×œ× ×œ×”×“×¤×™×¡ פרטי ×ª× ×•×¢×”"
+msgstr "עריכת פרטי ×ª× ×•×¢×” מיוב×ת"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -20027,7 +20022,7 @@ msgid ""
"which you can choose one here."
msgstr ""
"הגדרת ×ž×‘× ×” × ×ª×•× ×™× ×‘×• יעשה שימוש בעת ×™×‘×•× ×§×•×‘×¦×™ SWIFT MT942. ספריית ×ייקיו־"
-"×‘× ×§×™× ×’ מציעה מגוון ×ž×‘× ×™ ×™×‘×•× (× ×§×¨××™× 'פרופילי×') מהן, × ×™×ª×Ÿ ×›×ן, לבחור ×חת."
+"×‘× ×§×™× ×’ מציעה מגוון ×ž×‘× ×™ ×™×‘×•× (× ×§×¨××™× 'פרופילי×') מה×, × ×™×ª×Ÿ ×›×ן, לבחור ×חד."
#: gnucash/import-export/bi-import/dialog-bi-import.c:297
#, c-format
@@ -21108,24 +21103,18 @@ msgstr "×ž× ×•×˜×¨×œ"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "הקצ×ת חשבון להעברת השורות ×©× ×‘×—×¨×•."
+msgstr "_הקצ×ת חשבון 'העברת' לשורות ×©× ×‘×—×¨×•"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "תי×ור, הערות, ×ו מזכר"
+msgstr "עריכת תי×ור, הערות, ×ו מזכר"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "×יפוס לברירת מחדל"
+msgstr "_שיצוב לבררת מחדל"
# ת=הוספת ×ª× ×•×¢×”
#: gnucash/import-export/import-main-matcher.c:1547
@@ -21255,7 +21244,7 @@ msgstr "_הרצה מחודשת של קובץ log. ×’× ×•×§×ש..."
#: gnucash/import-export/log-replay/gnc-plugin-log-replay.c:49
msgid "Replay a GnuCash log file after a crash. This cannot be undone."
msgstr ""
-"הרצה מחודשת של קובץ ×™×•×ž×ŸÖ¾×”×¨×™×©×•× ×©×œ ×’× ×•×§×ש ×חרי קריסה. הפעולה בלתי הפיכה."
+"ביצוע חוזר של קובץ ×™×•×ž×ŸÖ¾×¨×™×©×•× ×’× ×•×§×ש, ×חרי קריסה. פעולה זו ×”×™× ×‘×œ×ª×™ הפיכה."
#: gnucash/import-export/ofx/gnc-ofx-import.c:671
#, c-format
@@ -22544,7 +22533,7 @@ msgstr "×œ× ×§×™×™×ž×•×ª גרס×ות תקציב. × ×“×¨×© לייצור לפח
#: gnucash/report/html-utilities.scm:391
msgid "This report requires you to specify certain report options."
-msgstr "× ×“×¨×©×•×ª לדוח ×–×”, הגדרות מסוימות ב×פשרויות דוח."
+msgstr "לדוח ×–×” × ×“×¨×©×•×ª הגדרות מסוימות ב×פשרויות דוח."
#: gnucash/report/html-utilities.scm:398
msgid "No accounts selected"
@@ -23517,7 +23506,7 @@ msgid ""
"For help on writing reports, or to contribute your brand new, totally cool "
"report, consult the mailing list ~a."
msgstr ""
-"לעזרה בכתיבת־דוחות, ×ו לשיתוף הדוח החדש והמדליק שיצרת, × ×™×ª×Ÿ להיוועץ ברשימת "
+"לקבלת עזרה בכתיבת־דוחות, ×ו לשיתוף דוח חדש ו'מדליק', × ×™×ª×Ÿ להיוועץ ברשימת "
"הדיוור ~a."
#: gnucash/report/reports/example/hello-world.scm:327
@@ -26454,7 +26443,7 @@ msgstr "שימוש בתמצית מס ברירת מחדל"
msgid ""
"Display all tax categories separately (one per line) instead of one single "
"tax line.?"
-msgstr "הצגת כול סוגי־×ב מס (×חת לכול שורה) ×‘×ž×§×•× ×©×•×¨×ª מס בודדת?"
+msgstr "הצגת כל סוגי־×ב מס ×‘× ×¤×¨×“ (×חת לכול שורה) ×‘×ž×§×•× ×©×•×¨×ª מס בודדת?"
#: gnucash/report/reports/standard/invoice.scm:292
msgid "References"
@@ -27559,7 +27548,7 @@ msgstr "מספר ×—×©×‘×•× ×™×ª:"
#: gnucash/report/reports/standard/taxinvoice.scm:194
msgid "To:"
-msgstr "ל:"
+msgstr "עבור:"
#: gnucash/report/reports/standard/taxinvoice.scm:196
msgid "Your ref:"
@@ -28697,13 +28686,13 @@ msgstr "מספר לקוח"
msgid ""
"The format string to use for generating customer numbers. This is a printf-"
"style format string."
-msgstr "מחרוזת ×ª×™×‘× ×•×ª לחילול מזהה לקוח. זוהי מחרוזת ×ª×‘× ×•×ª ×‘×¡×’× ×•×Ÿ printf."
+msgstr "מחרוזת ×ª×‘× ×™×ª שתשמש לחילול מזהה לקוח. זוהי מחרוזת ×ª×‘× ×™×ª ×‘×¡×’× ×•×Ÿ printf."
#: libgnucash/app-utils/business-prefs.scm:43
msgid ""
"The previous customer number generated. This number will be incremented to "
"generate the next customer number."
-msgstr "מזהה הלקוח ×”×§×•×“× ×©×—×•×œ×œ. מספר ×–×” יגדל ב־,1 לחילול מזהה הלקוח הב×."
+msgstr "מזהה הלקוח ×”×§×•×“× ×©×—×•×œ×œ. מספר הזיהוי ×™×§×•×“× ×‘Ö¾1 לחילול מזהה הלקוח הב×."
#: libgnucash/app-utils/business-prefs.scm:44
msgid "Employee number format"
@@ -29210,7 +29199,7 @@ msgstr "שגי××” %d בערך gnc_numeric סופי SX [%sâ€]â€, שימוש ב
#: libgnucash/app-utils/gnc-sx-instance-model.c:1802
#, c-format
msgid "No exchange rate available in SX [%s] for %s -> %s, value is zero."
-msgstr "שערי חליפין ×œ× ×–×ž×™× ×™× ×‘Ö¾SX [%s] שער חליפיןור %s ← %s, ערך '×פס'."
+msgstr "שערי חליפין ×œ× ×–×ž×™× ×™× ×‘Ö¾SX [%s] עבור %s <- %s, ערך '×פס'."
#. Translators: This and the following strings appear on
#. the account tab if the Tax Info column is displayed,
commit 7163ca46e69c9fedcc3dd79dd4288217c2661e55
Author: Yaron Shahrabani <sh.yaron at gmail.com>
Date: Sat Jul 23 16:22:58 2022 +0200
Translation update by Yaron Shahrabani <sh.yaron at gmail.com> using Weblate
po/he.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
3 failing checks (0.1%)
Translation: GnuCash/Program (Hebrew)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/he/
Co-authored-by: Yaron Shahrabani <sh.yaron at gmail.com>
diff --git a/po/he.po b/po/he.po
index f946c26c0..718a6c231 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,10 +8,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-17 07:37+0000\n"
+"PO-Revision-Date: 2022-07-23 09:57+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/gnucash/gnucash/"
"he/>\n"
@@ -75,7 +75,7 @@ msgstr "×™×•× ×™×§×•×“"
#: borrowed/goffice/go-charmap-sel.c:82
msgid "Vietnamese"
-msgstr "וי××˜× ×ž×™×ª"
+msgstr "×•×™×™×˜× ×ž×™×ª"
#: borrowed/goffice/go-charmap-sel.c:83
msgid "Western"
commit 861054d7d072d93c7f7053a3da33d238c4de4db2
Author: Maxime Leroy <lisacintosh at gmail.com>
Date: Sat Jul 23 16:22:57 2022 +0200
Translation update by Maxime Leroy <lisacintosh at gmail.com> using Weblate
po/fr.po: 99.9% (5398 of 5400 strings; 2 fuzzy)
3 failing checks (0.1%)
Translation: GnuCash/Program (French)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/fr/
Co-authored-by: Maxime Leroy <lisacintosh at gmail.com>
diff --git a/po/fr.po b/po/fr.po
index 628dcc48a..7571b60e9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -31,10 +31,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-19 06:16+0000\n"
+"PO-Revision-Date: 2022-07-23 09:57+0000\n"
"Last-Translator: Maxime Leroy <lisacintosh at gmail.com>\n"
"Language-Team: French <https://hosted.weblate.org/projects/gnucash/gnucash/"
"fr/>\n"
@@ -9744,10 +9744,8 @@ msgstr "Éditer les préférences globales de GnuCash"
# messages-i18n.c:240
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>Position de l'onglet</b>"
+msgstr "P_osition de l'onglet"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -18055,10 +18053,8 @@ msgid "Green"
msgstr "Vert"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "Ne pas imprimer le détail de la transaction"
+msgstr "Modifier le détail de la transaction importée"
# messages-i18n.c:306 po/guile_strings.txt:176
#: gnucash/gtkbuilder/dialog-import.glade:944
@@ -23915,25 +23911,19 @@ msgstr "Désactivé"
# messages-i18n.c:20
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "Assigner le compte de transfert à la sélection."
+msgstr "_Assigner le compte de transfert à la sélection"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "Description, Notes ou Mémo"
+msgstr "_Modifier la description, les notes ou le mémo"
# messages-i18n.c:324 po/guile_strings.txt:181
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "Réinitialiser aux valeurs par défaut"
+msgstr "_Réinitialiser toutes les modifications"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
commit 822ce9f11064c78243ca9e0a172e83f807b0511a
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Sat Jul 23 15:20:29 2022 +0100
Fix crash on Windows introduced by PR #1371
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 2945e3006..24a86e356 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -980,6 +980,7 @@ enum
COMPLETION_LIST_ORIGINAL,
COMPLETION_LIST_COLLATED,
COMPLETION_LIST_NORMALIZED_FOLDED,
+ NUM_COMPLETION_COLS
};
static void populate_list (gpointer key, gpointer value, GtkListStore *list)
@@ -1028,12 +1029,12 @@ setup_entry (GtkWidget *entry, gboolean sensitive, GHashTable *hash,
if (!sensitive)
return;
- list = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ list = gtk_list_store_new (NUM_COMPLETION_COLS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
g_hash_table_foreach (hash, (GHFunc)populate_list, list);
if (!g_hash_table_lookup (hash, (gpointer)initial))
populate_list ((gpointer)initial, NULL, list);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (list),
- COMPLETION_LIST_COLLATED,
+ COMPLETION_LIST_ORIGINAL,
GTK_SORT_ASCENDING);
completion = gtk_entry_completion_new ();
@@ -1124,7 +1125,7 @@ gnc_gen_trans_edit_fields (GtkMenuItem *menuitem, GNCImportMainMatcher *info)
RowInfo *row = n->data;
if (info->edit_desc)
{
- guint64 style = g_strcmp0 (new_desc, row->orig_desc) ?
+ gint style = g_strcmp0 (new_desc, row->orig_desc) ?
PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL;
gtk_tree_store_set (store, &row->iter,
DOWNLOADED_COL_DESCRIPTION, new_desc,
@@ -1152,7 +1153,7 @@ gnc_gen_trans_edit_fields (GtkMenuItem *menuitem, GNCImportMainMatcher *info)
if (info->edit_memo)
{
- guint64 style = g_strcmp0 (new_memo, row->orig_memo) ?
+ gint style = g_strcmp0 (new_memo, row->orig_memo) ?
PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL;
gtk_tree_store_set (store, &row->iter,
DOWNLOADED_COL_MEMO, new_memo,
@@ -1525,8 +1526,8 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
view = info->view;
store = gtk_tree_store_new (NUM_DOWNLOADED_COLS, G_TYPE_STRING, G_TYPE_INT64,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_DOUBLE,
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, //description stuff
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, //memo stuff
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, //description stuff
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, //memo stuff
G_TYPE_STRING, G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING,
GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_STRING,
commit 4af4f4070009625296c9ac6393f71e394d979c97
Author: Yuri Chornoivan <yurchor at ukr.net>
Date: Fri Jul 22 09:21:14 2022 +0200
Translation update by Yuri Chornoivan <yurchor at ukr.net> using Weblate
po/uk.po: 100.0% (5400 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (Ukrainian)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/uk/
Co-authored-by: Yuri Chornoivan <yurchor at ukr.net>
diff --git a/po/uk.po b/po/uk.po
index de8608a6d..cc60fd447 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,11 +10,11 @@
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-06-21 16:43+0000\n"
-"Last-Translator: Artem <artem at molotov.work>\n"
+"PO-Revision-Date: 2022-07-22 07:21+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
"Language-Team: Ukrainian <https://hosted.weblate.org/projects/gnucash/"
"gnucash/uk/>\n"
"Language: uk\n"
@@ -23,7 +23,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"X-Project-Style: default\n"
@@ -8831,10 +8831,8 @@ msgid "Edit the global preferences of GnuCash"
msgstr "Змінити глобальні параметри GnuCash"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>ÐŸÐ¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ Ð²ÐºÐ»Ð°Ð´Ð¾Ðº</b>"
+msgstr "_Ð Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÐºÐ»Ð°Ð´Ð¾Ðº"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -9084,7 +9082,7 @@ msgstr "Параметри книги"
#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
-msgstr ""
+msgstr "(може бути змінено кориÑтувачем)"
#. Translators: %s will be replaced with the current year
#: gnucash/gnome-utils/gnc-main-window.c:4880
@@ -10442,10 +10440,8 @@ msgid "{1} [options] [datafile]"
msgstr "{1} [параметри] [файл_даних]"
#: gnucash/gnucash-core-app.cpp:255
-#, fuzzy
-#| msgid "GnuCash "
msgid "GnuCash Paths"
-msgstr "GnuCash "
+msgstr "ШлÑхи GnuCash"
#: gnucash/gnucash-core-app.cpp:270
msgid "GnuCash {1}"
@@ -10493,10 +10489,8 @@ msgstr ""
"Можна викориÑтовувати декілька таких визначень Ñ€Ñ–Ð²Ð½Ñ Ñƒ одній команді."
#: gnucash/gnucash-core-app.cpp:309
-#, fuzzy
-#| msgid "Show plot"
msgid "Show paths"
-msgstr "Показати графік"
+msgstr "Показати шлÑхи"
#: gnucash/gnucash-core-app.cpp:311
msgid ""
@@ -15813,10 +15807,8 @@ msgstr "ISIN, CUSI_P або інший код"
#: gnucash/gtkbuilder/dialog-commodity.glade:485
#: gnucash/gtkbuilder/dialog-commodity.glade:767
#: gnucash/gtkbuilder/dialog-price.glade:122
-#, fuzzy
-#| msgid "Namespace"
msgid "Nam_espace"
-msgstr "ПроÑÑ‚Ñ–Ñ€ назв"
+msgstr "Пр_оÑÑ‚Ñ–Ñ€ назв"
#: gnucash/gtkbuilder/dialog-commodity.glade:500
msgid "_Symbol/abbreviation"
@@ -16530,10 +16522,8 @@ msgid "Green"
msgstr "Зелений"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "Ðе виводити деталі транзакцій"
+msgstr "Редагувати імпортовані параметри транзакцій"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -21956,24 +21946,18 @@ msgstr "Вимкнено"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "Призначити рахунок переказу до позначеного."
+msgstr "Пр_изначити рахунок переказу до позначеного"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "ОпиÑ, нотатки або примітки"
+msgstr "_Редагувати опиÑ, нотатки або примітку"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "Скинути"
+msgstr "_Скинути уÑÑ– редагуваннÑ"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
commit 08a7e940f7973858860b0f4066f68c7d6edf257b
Author: Eric <alchemillatruth at purelymail.com>
Date: Fri Jul 22 09:21:13 2022 +0200
Translation update by Eric <alchemillatruth at purelymail.com> using Weblate
po/zh_CN.po: 99.8% (5394 of 5400 strings; 0 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (Chinese (Simplified))
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/zh_Hans/
Translation update by Eric <alchemillatruth at purelymail.com> using Weblate
po/zh_CN.po: 99.8% (5392 of 5400 strings; 2 fuzzy)
0 failing checks (0.0%)
Translation: GnuCash/Program (Chinese (Simplified))
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/zh_Hans/
Co-authored-by: Eric <alchemillatruth at purelymail.com>
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c6c7f31c1..f22205ea8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -25,10 +25,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-17 05:15+0000\n"
+"PO-Revision-Date: 2022-07-22 07:21+0000\n"
"Last-Translator: Eric <alchemillatruth at purelymail.com>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
"gnucash/gnucash/zh_Hans/>\n"
@@ -8436,10 +8436,8 @@ msgid "Edit the global preferences of GnuCash"
msgstr "编辑 GnuCash 全局首选项"
#: gnucash/gnome-utils/gnc-main-window.c:345
-#, fuzzy
-#| msgid "<b>Tab Position</b>"
msgid "Tab P_osition"
-msgstr "<b>æ ‡ç¾é¡µä½ç½®</b>"
+msgstr "æ ‡ç¾é¡µä½ç½®(_O)"
#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
@@ -15595,10 +15593,8 @@ msgid "Green"
msgstr "绿"
#: gnucash/gtkbuilder/dialog-import.glade:871
-#, fuzzy
-#| msgid "Do not print transaction detail"
msgid "Edit imported transaction details"
-msgstr "ä¸æ‰“å°äº¤æ˜“事项明细"
+msgstr "编辑导入的交易明细"
#: gnucash/gtkbuilder/dialog-import.glade:944
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
@@ -20694,24 +20690,18 @@ msgstr "ç¦ç”¨"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1321
-#, fuzzy
-#| msgid "Assign a transfer account to the selection."
msgid "_Assign a transfer account to the selection"
-msgstr "您必须自科目表选择转账科目。"
+msgstr "给所选项分é…一个收款账户(_A)"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368
-#, fuzzy
-#| msgid "Description, Notes, or Memo"
msgid "_Edit description, notes, or memo"
-msgstr "æ述，说明，备注"
+msgstr "编辑æè¿°ã€è¯´æ˜Žæˆ–备注(_E)"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1377
-#, fuzzy
-#| msgid "Reset defaults"
msgid "_Reset all edits"
-msgstr "默认值"
+msgstr "é‡ç½®æ‰€æœ‰ç¼–辑(_R)"
#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
commit c645fdc53d1d86f4ebafd6947e0abc2c86d0a175
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Jul 22 06:39:25 2022 +0200
L10N: msgmerge 4.11-2
diff --git a/po/ar.po b/po/ar.po
index fa3396cd3..c7657e377 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -13,10 +13,10 @@
# Sherif ElGamal <selgamal0 at gmail.com>, 2022.
msgid ""
msgstr ""
-"Project-Id-Version: GnuCash 4.11-1\n"
+"Project-Id-Version: GnuCash 4.11-2\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
-"POT-Creation-Date: 2022-07-17 04:04+0200\n"
+"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2022-05-20 12:18+0000\n"
"Last-Translator: Sherif ElGamal <selgamal0 at gmail.com>\n"
"Language-Team: Arabic <https://hosted.weblate.org/projects/gnucash/gnucash/"
@@ -985,7 +985,7 @@ msgstr "خيار سداد القرض: \"%s\""
#: gnucash/import-export/csv-exp/csv-transactions-export.c:622
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:53
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:63
-#: gnucash/import-export/import-main-matcher.c:1280
+#: gnucash/import-export/import-main-matcher.c:1541
#: gnucash/import-export/import-match-picker.c:393
#: gnucash/import-export/import-match-picker.c:433
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3700
@@ -1086,7 +1086,7 @@ msgstr "خطأ ÙÙŠ إضاÙØ© الأسعار."
#: gnucash/import-export/aqb/gnc-ab-utils.c:559
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:147
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:70
-#: gnucash/import-export/import-main-matcher.c:1281
+#: gnucash/import-export/import-main-matcher.c:1542
#: gnucash/import-export/import-match-picker.c:392
#: gnucash/import-export/qif-imp/dialog-account-picker.c:433
#: gnucash/register/ledger-core/split-register-model.c:342
@@ -1336,8 +1336,8 @@ msgstr "Øذ٠السلعة؟"
#: gnucash/gnome-utils/gnc-file.c:118 gnucash/gnome-utils/gnc-file.c:366
#: gnucash/gnome-utils/gnc-file.c:664 gnucash/gnome-utils/gnc-gui-query.c:300
#: gnucash/gnome-utils/gnc-gui-query.c:332
-#: gnucash/gnome-utils/gnc-main-window.c:1313
-#: gnucash/gnome-utils/gnc-main-window.c:1470
+#: gnucash/gnome-utils/gnc-main-window.c:1341
+#: gnucash/gnome-utils/gnc-main-window.c:1498
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:886
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1023
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1063
@@ -1366,7 +1366,8 @@ msgstr "Øذ٠السلعة؟"
#: gnucash/gtkbuilder/dialog-fincalc.glade:137
#: gnucash/gtkbuilder/dialog-import.glade:46
#: gnucash/gtkbuilder/dialog-import.glade:328
-#: gnucash/gtkbuilder/dialog-import.glade:1040
+#: gnucash/gtkbuilder/dialog-import.glade:885
+#: gnucash/gtkbuilder/dialog-import.glade:1185
#: gnucash/gtkbuilder/dialog-invoice.glade:674
#: gnucash/gtkbuilder/dialog-invoice.glade:1198
#: gnucash/gtkbuilder/dialog-job.glade:41
@@ -1590,7 +1591,7 @@ msgstr "Øدد Øساب"
#: gnucash/gnome-utils/gnc-gui-query.c:297
#: gnucash/gnome-utils/gnc-gui-query.c:331
#: gnucash/gnome-utils/gnc-gui-query.c:417
-#: gnucash/gnome-utils/gnc-main-window.c:1471
+#: gnucash/gnome-utils/gnc-main-window.c:1499
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:196
#: gnucash/gtkbuilder/dialog-account.glade:35
#: gnucash/gtkbuilder/dialog-account.glade:832
@@ -1613,7 +1614,8 @@ msgstr "Øدد Øساب"
#: gnucash/gtkbuilder/dialog-import.glade:61
#: gnucash/gtkbuilder/dialog-import.glade:188
#: gnucash/gtkbuilder/dialog-import.glade:343
-#: gnucash/gtkbuilder/dialog-import.glade:1056
+#: gnucash/gtkbuilder/dialog-import.glade:899
+#: gnucash/gtkbuilder/dialog-import.glade:1201
#: gnucash/gtkbuilder/dialog-invoice.glade:690
#: gnucash/gtkbuilder/dialog-invoice.glade:1213
#: gnucash/gtkbuilder/dialog-job.glade:57
@@ -1744,7 +1746,7 @@ msgstr "تÙاصيل المعاملة"
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-exp/csv-tree-export.c:156
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:65
-#: gnucash/import-export/import-main-matcher.c:1284
+#: gnucash/import-export/import-main-matcher.c:1545
#: gnucash/import-export/import-match-picker.c:395
#: gnucash/import-export/import-match-picker.c:435
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3710
@@ -1826,7 +1828,7 @@ msgid "Username"
msgstr "اسم المستخدم"
#: gnucash/gnome/dialog-employee.c:732 gnucash/gnome/dialog-sx-editor2.c:1755
-#: gnucash/gnome/dialog-sx-editor.c:1817 gnucash/gnome/dialog-tax-info.c:1200
+#: gnucash/gnome/dialog-sx-editor.c:1823 gnucash/gnome/dialog-tax-info.c:1200
#: gnucash/gnome-utils/gnc-dense-cal.c:350
#: gnucash/gnome-utils/gnc-tree-model-budget.c:96
#: gnucash/gnome-utils/gnc-tree-view-commodity.c:368
@@ -1963,7 +1965,7 @@ msgstr "سعر السهم"
#: gnucash/gtkbuilder/dialog-payment.glade:418
#: gnucash/gtkbuilder/dialog-transfer.glade:102
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:54
-#: gnucash/import-export/import-main-matcher.c:1283
+#: gnucash/import-export/import-main-matcher.c:1544
#: gnucash/import-export/import-match-picker.c:394
#: gnucash/import-export/import-match-picker.c:434
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3721
@@ -2097,7 +2099,7 @@ msgstr "الوصÙ/ملاØظات/مذكرة"
#: gnucash/gtkbuilder/dialog-transfer.glade:205
#: gnucash/import-export/csv-exp/csv-transactions-export.c:626
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:74
-#: gnucash/import-export/import-main-matcher.c:1285
+#: gnucash/import-export/import-main-matcher.c:1546
#: gnucash/import-export/import-match-picker.c:396
#: gnucash/import-export/import-match-picker.c:436
#: gnucash/register/ledger-core/split-register-model.c:356
@@ -3088,7 +3090,7 @@ msgstr "اسم ورقة نمط"
#: gnucash/gnome/dialog-sx-editor2.c:165 gnucash/gnome/dialog-sx-editor.c:167
#: gnucash/gnome/gnc-plugin-page-sx-list.c:151
#: gnucash/gnome/window-reconcile2.c:2187 gnucash/gnome/window-reconcile.c:2449
-#: gnucash/gnome-utils/gnc-main-window.c:277
+#: gnucash/gnome-utils/gnc-main-window.c:278
#: gnucash/gtkbuilder/dialog-billterms.glade:679
#: gnucash/gtkbuilder/dialog-commodities.glade:156
#: gnucash/gtkbuilder/dialog-price.glade:858
@@ -3104,12 +3106,12 @@ msgid "_Transaction"
msgstr "_المعاملات"
#: gnucash/gnome/dialog-sx-editor2.c:167 gnucash/gnome/dialog-sx-editor.c:169
-#: gnucash/gnome-utils/gnc-main-window.c:278
+#: gnucash/gnome-utils/gnc-main-window.c:279
msgid "_View"
msgstr "_عرض"
#: gnucash/gnome/dialog-sx-editor2.c:168 gnucash/gnome/dialog-sx-editor.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:279
+#: gnucash/gnome-utils/gnc-main-window.c:280
msgid "_Actions"
msgstr "_الإجراءات"
@@ -3128,7 +3130,7 @@ msgstr "لا يمكن تØليل صيغة الائتمان للتقسيم %s."
msgid "Couldn't parse debit formula for split \"%s\"."
msgstr "لا يمكن تØليل صيغة الخصم للتقسيم %s."
-#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:874
+#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:880
#: gnucash/gnome/dialog-sx-from-trans.c:261
msgid ""
"The Scheduled Transaction Editor cannot automatically balance this "
@@ -3189,17 +3191,17 @@ msgid ""
msgstr ""
"ملاØظة: إذا كنت قد قبلت بالÙعل تغييرات على القالب، عمليةالالغاء لن تÙعلها."
-#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1406
+#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1412
msgid "(never)"
msgstr "(ابدأ)"
-#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1568
+#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1574
msgid ""
"The current template transaction has been changed. Would you like to record "
"the changes?"
msgstr "تم تغيير قالب العمليات الØالي. هل ترغب ÙÙŠ تسجيل التغييرات؟"
-#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1844
+#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1850
#: gnucash/gnome/gnc-plugin-page-sx-list.c:246
#: gnucash/gnome/gnc-plugin-page-sx-list.c:252
msgid "Scheduled Transactions"
@@ -3211,31 +3213,31 @@ msgid ""
"cannot be automatically created."
msgstr "المعاملات المجدولة مع متغيرات أو عدة عملات لا يمكن أن تنشأ تلقائيا."
-#: gnucash/gnome/dialog-sx-editor.c:675
+#: gnucash/gnome/dialog-sx-editor.c:679
#, c-format
msgid "Couldn't parse %s for split \"%s\"."
msgstr "لا يمكن تØليل %s للعملية \"%s\"."
-#: gnucash/gnome/dialog-sx-editor.c:739
+#: gnucash/gnome/dialog-sx-editor.c:745
#, c-format
msgid "Split with memo %s has an invalid account."
msgstr "العملية %s تتضمن على Øساب غير صالØ"
-#: gnucash/gnome/dialog-sx-editor.c:742
+#: gnucash/gnome/dialog-sx-editor.c:748
msgid "Invalid Account in Split"
msgstr "Øساب غير ØµØ§Ù„Ø ÙÙŠ العملية"
-#: gnucash/gnome/dialog-sx-editor.c:754
+#: gnucash/gnome/dialog-sx-editor.c:760
#, fuzzy, c-format
#| msgid "Split with memo %s has an unparseable Credit Formula."
msgid "Split with memo %s has an unparsable Credit Formula."
msgstr "%sالعملية تتضمن مبالغ دائنة غير متواÙقة مع نمط المدخلات Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§"
-#: gnucash/gnome/dialog-sx-editor.c:757 gnucash/gnome/dialog-sx-editor.c:773
+#: gnucash/gnome/dialog-sx-editor.c:763 gnucash/gnome/dialog-sx-editor.c:779
msgid "Unparsable Formula in Split"
msgstr "العملية تتضمن مدخلات غير متواÙقة"
-#: gnucash/gnome/dialog-sx-editor.c:770
+#: gnucash/gnome/dialog-sx-editor.c:776
#, fuzzy, c-format
#| msgid "Split with memo %s has an unparseable Debit Formula."
msgid "Split with memo %s has an unparsable Debit Formula."
@@ -3502,7 +3504,7 @@ msgstr "ÙØªØ Ù…Ù„Ù Ù…ÙˆØ¬ÙˆØ¯ على الجهاز من GnuCash"
#: gnucash/gnome/gnc-plugin-basic-commands.c:121
#: gnucash/gnome-utils/gnc-file.c:100 gnucash/gnome-utils/gnc-file.c:666
-#: gnucash/gnome-utils/gnc-main-window.c:1314
+#: gnucash/gnome-utils/gnc-main-window.c:1342
#: gnucash/html/gnc-html-webkit1.c:1198
msgid "_Save"
msgstr "_ØÙظ"
@@ -4104,7 +4106,7 @@ msgstr "تذكر كل الخسابات الÙرعية للØساب المØدد"
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:185
#: gnucash/gnome/gnc-plugin-page-register2.c:340
#: gnucash/gnome/gnc-plugin-page-register.c:463
-#: gnucash/gnome-utils/gnc-main-window.c:349
+#: gnucash/gnome-utils/gnc-main-window.c:351
msgid "_Filter By..."
msgstr "_تصÙية بواسطة..."
@@ -4116,7 +4118,7 @@ msgstr "_تصÙية بواسطة..."
#: gnucash/gnome/gnc-plugin-page-register.c:467
#: gnucash/gnome/gnc-plugin-page-report.c:1231
#: gnucash/gnome/gnc-plugin-page-sx-list.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:353
+#: gnucash/gnome-utils/gnc-main-window.c:355
msgid "_Refresh"
msgstr "ت_Øديث"
@@ -4127,7 +4129,7 @@ msgstr "ت_Øديث"
#: gnucash/gnome/gnc-plugin-page-register.c:468
#: gnucash/gnome/gnc-plugin-page-report.c:1232
#: gnucash/gnome/gnc-plugin-page-sx-list.c:171
-#: gnucash/gnome-utils/gnc-main-window.c:354
+#: gnucash/gnome-utils/gnc-main-window.c:356
msgid "Refresh this window"
msgstr "تØديث هذه الناÙذة"
@@ -4550,7 +4552,7 @@ msgstr "نسخ"
#: gnucash/gnome/gnc-plugin-page-register2.c:240
#: gnucash/gnome/gnc-plugin-page-register.c:354
#: gnucash/gnome/gnc-plugin-page-report.c:1226
-#: gnucash/gnome-utils/gnc-main-window.c:332
+#: gnucash/gnome-utils/gnc-main-window.c:333
msgid "_Paste"
msgstr "_لصق"
@@ -5335,35 +5337,35 @@ msgstr "_طباعة الشيكات..."
#: gnucash/gnome/gnc-plugin-page-register2.c:230
#: gnucash/gnome/gnc-plugin-page-register.c:344
#: gnucash/gnome/gnc-plugin-page-report.c:1216
-#: gnucash/gnome-utils/gnc-main-window.c:322
+#: gnucash/gnome-utils/gnc-main-window.c:323
msgid "Cu_t"
msgstr "_قص"
#: gnucash/gnome/gnc-plugin-page-register2.c:231
#: gnucash/gnome/gnc-plugin-page-register.c:345
#: gnucash/gnome/gnc-plugin-page-report.c:1217
-#: gnucash/gnome-utils/gnc-main-window.c:323
+#: gnucash/gnome-utils/gnc-main-window.c:324
msgid "Cut the current selection and copy it to clipboard"
msgstr "قص التØديد الØالي ونسخه إلى الØاÙظة"
#: gnucash/gnome/gnc-plugin-page-register2.c:235
#: gnucash/gnome/gnc-plugin-page-register.c:349
#: gnucash/gnome/gnc-plugin-page-report.c:1221
-#: gnucash/gnome-utils/gnc-main-window.c:327
+#: gnucash/gnome-utils/gnc-main-window.c:328
msgid "_Copy"
msgstr "_نسخ"
#: gnucash/gnome/gnc-plugin-page-register2.c:236
#: gnucash/gnome/gnc-plugin-page-register.c:350
#: gnucash/gnome/gnc-plugin-page-report.c:1222
-#: gnucash/gnome-utils/gnc-main-window.c:328
+#: gnucash/gnome-utils/gnc-main-window.c:329
msgid "Copy the current selection to clipboard"
msgstr "نسخ التØديد الØالي إلى الØاÙظة"
#: gnucash/gnome/gnc-plugin-page-register2.c:241
#: gnucash/gnome/gnc-plugin-page-register.c:355
#: gnucash/gnome/gnc-plugin-page-report.c:1227
-#: gnucash/gnome-utils/gnc-main-window.c:333
+#: gnucash/gnome-utils/gnc-main-window.c:334
msgid "Paste the clipboard content at the cursor position"
msgstr "لصق Ù…Øتوى الØاÙظة ÙÙŠ موضع المؤشر"
@@ -5820,7 +5822,7 @@ msgid "Remo_ve Other Splits"
msgstr "_أزل التقسيمات الأخرى"
#: gnucash/gnome/gnc-plugin-page-register.c:459
-#: gnucash/gnome-utils/gnc-main-window.c:345
+#: gnucash/gnome-utils/gnc-main-window.c:347
msgid "_Sort By..."
msgstr "Ø¥_Ùرز Øسب..."
@@ -6871,7 +6873,7 @@ msgstr "_Øساب"
#: gnucash/gnome/window-reconcile2.c:2129
#: gnucash/gnome/window-reconcile2.c:2210 gnucash/gnome/window-reconcile.c:2391
#: gnucash/gnome/window-reconcile.c:2472
-#: gnucash/gnome-utils/gnc-main-window.c:285
+#: gnucash/gnome-utils/gnc-main-window.c:286
#: gnucash/gtkbuilder/dialog-account.glade:1121
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:23
#: gnucash/gtkbuilder/dialog-book-close.glade:22
@@ -6881,7 +6883,7 @@ msgstr "_Øساب"
#: gnucash/gtkbuilder/dialog-custom-report.glade:29
#: gnucash/gtkbuilder/dialog-employee.glade:23
#: gnucash/gtkbuilder/dialog-fincalc.glade:107
-#: gnucash/gtkbuilder/dialog-import.glade:1023
+#: gnucash/gtkbuilder/dialog-import.glade:1168
#: gnucash/gtkbuilder/dialog-invoice.glade:657
#: gnucash/gtkbuilder/dialog-job.glade:24
#: gnucash/gtkbuilder/dialog-options.glade:21
@@ -6943,7 +6945,7 @@ msgid "Edit the main account for this register"
msgstr "تØرير الØساب الرئيسي لهذا السجل"
#: gnucash/gnome/window-reconcile2.c:2173 gnucash/gnome/window-reconcile.c:2435
-#: gnucash/gnome-utils/gnc-main-window.c:360
+#: gnucash/gnome-utils/gnc-main-window.c:362
msgid "_Check & Repair"
msgstr "_تØقق & إصلاØ"
@@ -7735,7 +7737,7 @@ msgid "_Save As"
msgstr "ØÙظ بإسم ..."
#: gnucash/gnome-utils/dialog-options.c:225
-#: gnucash/gnome-utils/gnc-main-window.c:309
+#: gnucash/gnome-utils/gnc-main-window.c:310
#: gnucash/gtkbuilder/dialog-billterms.glade:731
#: gnucash/gtkbuilder/dialog-commodities.glade:174
#: gnucash/gtkbuilder/dialog-custom-report.glade:46
@@ -8320,7 +8322,7 @@ msgstr "تردد"
msgid "(unnamed)"
msgstr "(لم يسم)"
-#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:289
+#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:290
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
#: gnucash/import-export/customer-import/gnc-plugin-customer-import.c:57
msgid "_Import"
@@ -8337,7 +8339,7 @@ msgstr "استيراد"
msgid "Save"
msgstr "ØÙظ"
-#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:290
+#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:291
msgid "_Export"
msgstr "_تصدير"
@@ -8610,7 +8612,7 @@ msgid "Save changes to the file?"
msgstr "ØÙظ التغييرات إلى الملÙØŸ"
#: gnucash/gnome-utils/gnc-file.c:656
-#: gnucash/gnome-utils/gnc-main-window.c:1307
+#: gnucash/gnome-utils/gnc-main-window.c:1335
#, c-format
msgid "If you don't save, changes from the past %d minute will be discarded."
msgid_plural ""
@@ -8672,7 +8674,7 @@ msgstr "اÙØªØ ÙÙŠ جميع الØالات"
msgid "Open _Folder"
msgstr "خاصية التصنيÙ"
-#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:314
+#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:315
msgid "_Quit"
msgstr "_قم بإنهاء"
@@ -8715,7 +8717,7 @@ msgstr ""
"الإستمرار؟"
#: gnucash/gnome-utils/gnc-file.c:1701
-#: gnucash/gnome-utils/gnc-main-window.c:1275
+#: gnucash/gnome-utils/gnc-main-window.c:1303
msgid "<unknown>"
msgstr "<معروÙ>"
@@ -8765,204 +8767,254 @@ msgstr "قم بإدخال اسم المستخدم وكلمة المرور للا
msgid "Changes will be saved automatically in %u seconds"
msgstr "سيتم ØÙظ التغييرات تلقائيا ÙÙŠ %u ثانية"
-#: gnucash/gnome-utils/gnc-main-window.c:276
+#: gnucash/gnome-utils/gnc-main-window.c:277
msgid "_File"
msgstr "_ملÙ"
-#: gnucash/gnome-utils/gnc-main-window.c:280
+#: gnucash/gnome-utils/gnc-main-window.c:281
msgid "Tra_nsaction"
msgstr "المعاملة"
-#: gnucash/gnome-utils/gnc-main-window.c:281
+#: gnucash/gnome-utils/gnc-main-window.c:282
msgid "_Reports"
msgstr "_التقارير"
-#: gnucash/gnome-utils/gnc-main-window.c:282
+#: gnucash/gnome-utils/gnc-main-window.c:283
msgid "_Tools"
msgstr "_أدوات"
-#: gnucash/gnome-utils/gnc-main-window.c:283
+#: gnucash/gnome-utils/gnc-main-window.c:284
msgid "E_xtensions"
msgstr "ملØقات"
-#: gnucash/gnome-utils/gnc-main-window.c:284
+#: gnucash/gnome-utils/gnc-main-window.c:285
msgid "_Windows"
msgstr "_نواÙØ°"
-#: gnucash/gnome-utils/gnc-main-window.c:292
+#: gnucash/gnome-utils/gnc-main-window.c:293
msgid "_Print..."
msgstr "_طباعة..."
-#: gnucash/gnome-utils/gnc-main-window.c:293
+#: gnucash/gnome-utils/gnc-main-window.c:294
msgid "Print the currently active page"
msgstr "طباعة الصÙØØ© النشطة Øاليا"
-#: gnucash/gnome-utils/gnc-main-window.c:299
+#: gnucash/gnome-utils/gnc-main-window.c:300
msgid "Pa_ge Setup..."
msgstr "إعداد الصÙØØ©..."
-#: gnucash/gnome-utils/gnc-main-window.c:300
+#: gnucash/gnome-utils/gnc-main-window.c:301
msgid "Specify the page size and orientation for printing"
msgstr "تØديد Øجم الصÙØØ© والتوجيه للطباعة"
-#: gnucash/gnome-utils/gnc-main-window.c:304
+#: gnucash/gnome-utils/gnc-main-window.c:305
msgid "Proper_ties"
msgstr "خصائص"
-#: gnucash/gnome-utils/gnc-main-window.c:305
+#: gnucash/gnome-utils/gnc-main-window.c:306
msgid "Edit the properties of the current file"
msgstr "تØرير خصائص المل٠الØالي"
-#: gnucash/gnome-utils/gnc-main-window.c:310
+#: gnucash/gnome-utils/gnc-main-window.c:311
msgid "Close the currently active page"
msgstr "إغلاق الصÙØØ© النشطة Øاليا"
-#: gnucash/gnome-utils/gnc-main-window.c:315
+#: gnucash/gnome-utils/gnc-main-window.c:316
msgid "Quit this application"
msgstr "قم بإنهاء هذا التطبيق"
-#: gnucash/gnome-utils/gnc-main-window.c:337
+#: gnucash/gnome-utils/gnc-main-window.c:338
msgid "Pr_eferences"
msgstr "تÙضيلات"
-#: gnucash/gnome-utils/gnc-main-window.c:338
+#: gnucash/gnome-utils/gnc-main-window.c:339
msgid "Edit the global preferences of GnuCash"
msgstr "تعديل التÙضيلات العالمية لجنوكاش"
-#: gnucash/gnome-utils/gnc-main-window.c:346
+#: gnucash/gnome-utils/gnc-main-window.c:345
+#, fuzzy
+#| msgid "<b>Tab Position</b>"
+msgid "Tab P_osition"
+msgstr "<b>موضع علامة التبويب</b>"
+
+#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
msgstr "Øدد معايير الÙرز لعرض هذه الصÙØØ©"
-#: gnucash/gnome-utils/gnc-main-window.c:350
+#: gnucash/gnome-utils/gnc-main-window.c:352
msgid "Select the account types that should be displayed."
msgstr "Øدد أنواع الØسابات التي يجب أن يتم عرضها."
-#: gnucash/gnome-utils/gnc-main-window.c:362
+#: gnucash/gnome-utils/gnc-main-window.c:364
msgid "Reset _Warnings..."
msgstr "إعادة تعيين التØذيرات..."
-#: gnucash/gnome-utils/gnc-main-window.c:363
+#: gnucash/gnome-utils/gnc-main-window.c:365
msgid "Reset the state of all warning messages so they will be shown again."
msgstr "إعادة تعيين Øالات كل رسائل التØذير لتظهر مرة أخرى."
-#: gnucash/gnome-utils/gnc-main-window.c:367
+#: gnucash/gnome-utils/gnc-main-window.c:369
msgid "Re_name Page"
msgstr "إعادة تسمية الصÙØØ©"
-#: gnucash/gnome-utils/gnc-main-window.c:368
+#: gnucash/gnome-utils/gnc-main-window.c:370
msgid "Rename this page."
msgstr "إعادة تسمية هذه الصÙØØ©."
-#: gnucash/gnome-utils/gnc-main-window.c:375
+#: gnucash/gnome-utils/gnc-main-window.c:377
msgid "_New Window"
msgstr "_ناÙذة جديدة"
-#: gnucash/gnome-utils/gnc-main-window.c:376
+#: gnucash/gnome-utils/gnc-main-window.c:378
msgid "Open a new top-level GnuCash window."
msgstr "ÙØªØ Ù†Ø§Ùذة جديدة لجنوكاش من المستوى الأعلى."
-#: gnucash/gnome-utils/gnc-main-window.c:380
+#: gnucash/gnome-utils/gnc-main-window.c:382
msgid "New Window with _Page"
msgstr "ناÙذة جديدة بصÙØØ© جديدة"
-#: gnucash/gnome-utils/gnc-main-window.c:381
+#: gnucash/gnome-utils/gnc-main-window.c:383
msgid "Move the current page to a new top-level GnuCash window."
msgstr "نقل الصÙØØ© الØالية إلى ناÙذة جنوكاش ÙÙŠ المستوى الأعلى ."
-#: gnucash/gnome-utils/gnc-main-window.c:388
+#: gnucash/gnome-utils/gnc-main-window.c:390
msgid "Tutorial and Concepts _Guide"
msgstr "دليل المÙاهيم Ùˆ الدروس"
-#: gnucash/gnome-utils/gnc-main-window.c:389
+#: gnucash/gnome-utils/gnc-main-window.c:391
msgid "Open the GnuCash Tutorial"
msgstr "ÙØªØ Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ التعليمي GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:393
+#: gnucash/gnome-utils/gnc-main-window.c:395
msgid "_Contents"
msgstr "Ù…Øتويات"
-#: gnucash/gnome-utils/gnc-main-window.c:394
+#: gnucash/gnome-utils/gnc-main-window.c:396
msgid "Open the GnuCash Help"
msgstr "ÙØªØ ØªØ¹Ù„ÙŠÙ…Ø§Øª GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:398
+#: gnucash/gnome-utils/gnc-main-window.c:400
msgid "_About"
msgstr "Øول"
-#: gnucash/gnome-utils/gnc-main-window.c:399
+#: gnucash/gnome-utils/gnc-main-window.c:401
msgid "About GnuCash"
msgstr "Øول GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:411
+#: gnucash/gnome-utils/gnc-main-window.c:413
msgid "_Toolbar"
msgstr "_شريط الأدوات"
-#: gnucash/gnome-utils/gnc-main-window.c:412
+#: gnucash/gnome-utils/gnc-main-window.c:414
msgid "Show/hide the toolbar on this window"
msgstr "إظهار/إخÙاء شريط الأدوات ÙÙŠ هذه الناÙذة"
-#: gnucash/gnome-utils/gnc-main-window.c:416
+#: gnucash/gnome-utils/gnc-main-window.c:418
msgid "Su_mmary Bar"
msgstr "شريط ملخص"
-#: gnucash/gnome-utils/gnc-main-window.c:417
+#: gnucash/gnome-utils/gnc-main-window.c:419
msgid "Show/hide the summary bar on this window"
msgstr "إظهار/إخÙاء شريط ملخص ÙÙŠ هذه الناÙذة"
-#: gnucash/gnome-utils/gnc-main-window.c:421
+#: gnucash/gnome-utils/gnc-main-window.c:423
msgid "Stat_us Bar"
msgstr "شريط المعلومات"
-#: gnucash/gnome-utils/gnc-main-window.c:422
+#: gnucash/gnome-utils/gnc-main-window.c:424
msgid "Show/hide the status bar on this window"
msgstr "إظهار/إخÙاء شريط المعلومات ÙÙŠ هذه الناÙذة"
-#: gnucash/gnome-utils/gnc-main-window.c:434
+#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gtkbuilder/dialog-preferences.glade:3895
+msgid "To_p"
+msgstr "أعلى"
+
+#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
+#: gnucash/gtkbuilder/dialog-preferences.glade:3901
+msgid "Display the notebook tabs at the top of the window."
+msgstr "عرض علامات التبويب دÙتر ÙÙŠ الجزء العلوي من الناÙذة."
+
+#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gtkbuilder/dialog-preferences.glade:3914
+msgid "B_ottom"
+msgstr "أسÙÙ„"
+
+#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
+#: gnucash/gtkbuilder/dialog-preferences.glade:3920
+msgid "Display the notebook tabs at the bottom of the window."
+msgstr "عرض علامات التبويب دÙتر ÙÙŠ الجزء السÙلي من الناÙذة."
+
+#: gnucash/gnome-utils/gnc-main-window.c:444
+#: gnucash/gtkbuilder/dialog-preferences.glade:3933
+msgid "_Left"
+msgstr "_يسار"
+
+#: gnucash/gnome-utils/gnc-main-window.c:445
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
+#: gnucash/gtkbuilder/dialog-preferences.glade:3939
+msgid "Display the notebook tabs at the left of the window."
+msgstr "عرض علامات التبويب دÙتر ÙÙŠ الجهة اليسرى من الناÙذة."
+
+#: gnucash/gnome-utils/gnc-main-window.c:448
+#: gnucash/gtkbuilder/dialog-preferences.glade:3952
+msgid "_Right"
+msgstr "_يمين"
+
+#: gnucash/gnome-utils/gnc-main-window.c:449
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
+#: gnucash/gtkbuilder/dialog-preferences.glade:3958
+msgid "Display the notebook tabs at the right of the window."
+msgstr "عرض علامات التبويب دÙتر على يمين الناÙذة."
+
+#: gnucash/gnome-utils/gnc-main-window.c:462
msgid "Window _1"
msgstr "ناÙذة _1"
-#: gnucash/gnome-utils/gnc-main-window.c:435
+#: gnucash/gnome-utils/gnc-main-window.c:463
msgid "Window _2"
msgstr "ناÙذة _2"
-#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gnome-utils/gnc-main-window.c:464
msgid "Window _3"
msgstr "ناÙذة _3"
-#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gnome-utils/gnc-main-window.c:465
msgid "Window _4"
msgstr "ناÙذة _4"
-#: gnucash/gnome-utils/gnc-main-window.c:438
+#: gnucash/gnome-utils/gnc-main-window.c:466
msgid "Window _5"
msgstr "ناÙذة _5"
-#: gnucash/gnome-utils/gnc-main-window.c:439
+#: gnucash/gnome-utils/gnc-main-window.c:467
msgid "Window _6"
msgstr "ناÙذة _6"
-#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gnome-utils/gnc-main-window.c:468
msgid "Window _7"
msgstr "ناÙذة _7"
-#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gnome-utils/gnc-main-window.c:469
msgid "Window _8"
msgstr "ناÙذة _8"
-#: gnucash/gnome-utils/gnc-main-window.c:442
+#: gnucash/gnome-utils/gnc-main-window.c:470
msgid "Window _9"
msgstr "ناÙذة _9"
-#: gnucash/gnome-utils/gnc-main-window.c:443
+#: gnucash/gnome-utils/gnc-main-window.c:471
msgid "Window _0"
msgstr "ناÙذة _0"
-#: gnucash/gnome-utils/gnc-main-window.c:1258
+#: gnucash/gnome-utils/gnc-main-window.c:1286
#, c-format
msgid "Save changes to file %s before closing?"
msgstr "ØÙظ التغييرات إلى ملÙ%s قبل الغلق؟"
-#: gnucash/gnome-utils/gnc-main-window.c:1261
+#: gnucash/gnome-utils/gnc-main-window.c:1289
#, c-format
msgid ""
"If you don't save, changes from the past %d hours and %d minutes will be "
@@ -8971,7 +9023,7 @@ msgstr ""
"إذا لم تقم بالØÙظ، سيتم تجاهل التغييرات من الساعات %d الماضية Ùˆ%d دقيقة "
"الماضية."
-#: gnucash/gnome-utils/gnc-main-window.c:1263
+#: gnucash/gnome-utils/gnc-main-window.c:1291
#, c-format
msgid ""
"If you don't save, changes from the past %d days and %d hours will be "
@@ -8980,15 +9032,15 @@ msgstr ""
"إذا لم تقم بالØÙظ، سيتم تجاهل التغييرات من الأيام %d الماضية Ùˆ%d الساعات "
"الماضية."
-#: gnucash/gnome-utils/gnc-main-window.c:1312
+#: gnucash/gnome-utils/gnc-main-window.c:1340
msgid "Close _Without Saving"
msgstr "إغلاق بدون ØÙظ"
-#: gnucash/gnome-utils/gnc-main-window.c:1459
+#: gnucash/gnome-utils/gnc-main-window.c:1487
msgid "This window is closing and will not be restored."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1465
+#: gnucash/gnome-utils/gnc-main-window.c:1493
#, fuzzy
#| msgid "Close this window"
msgid "Close Window?"
@@ -8996,64 +9048,64 @@ msgstr "قم بإغلاق هذه الناÙذة"
#. Translators: This string is shown in the window title if this
#. document is, well, read-only.
-#: gnucash/gnome-utils/gnc-main-window.c:1595
+#: gnucash/gnome-utils/gnc-main-window.c:1623
msgid "(read-only)"
msgstr "(للقراءة Ùقط )"
-#: gnucash/gnome-utils/gnc-main-window.c:1603
+#: gnucash/gnome-utils/gnc-main-window.c:1631
msgid "Unsaved Book"
msgstr "دÙتر لم ÙŠØÙظ"
-#: gnucash/gnome-utils/gnc-main-window.c:1766
+#: gnucash/gnome-utils/gnc-main-window.c:1794
#, fuzzy
msgid "Last modified on %a, %b %d, %Y at %I:%M %p"
msgstr "تم آخر تعديل ÙÙŠ: %a, %b %e, %Y at %I:%M%P"
#. Translators: This message appears in the status bar after opening the file.
-#: gnucash/gnome-utils/gnc-main-window.c:1769
+#: gnucash/gnome-utils/gnc-main-window.c:1797
#, c-format
msgid "File %s opened. %s"
msgstr "ÙتØ%s الملÙ%s"
-#: gnucash/gnome-utils/gnc-main-window.c:2896
+#: gnucash/gnome-utils/gnc-main-window.c:2924
msgctxt "lower case key for short cut to 'Accounts'"
msgid "a"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:2986
+#: gnucash/gnome-utils/gnc-main-window.c:3014
msgid "Unable to save to database."
msgstr "غير قادر على الØÙظ إلى قاعدة البيانات."
-#: gnucash/gnome-utils/gnc-main-window.c:2988
+#: gnucash/gnome-utils/gnc-main-window.c:3016
msgid "Unable to save to database: Book is marked read-only."
msgstr "غير قادر على الØÙظ إلى قاعدة البيانات: الدÙتر للقراءة Ùقط."
-#: gnucash/gnome-utils/gnc-main-window.c:4333
+#: gnucash/gnome-utils/gnc-main-window.c:4396
#: gnucash/gtkbuilder/assistant-qif-import.glade:959
msgid "Book Options"
msgstr "خيارات الدÙتر."
-#: gnucash/gnome-utils/gnc-main-window.c:4751 gnucash/gnucash-core-app.cpp:261
+#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
msgstr ""
#. Translators: %s will be replaced with the current year
-#: gnucash/gnome-utils/gnc-main-window.c:4778
+#: gnucash/gnome-utils/gnc-main-window.c:4880
#, fuzzy, c-format
msgid "Copyright © 1997-%s The GnuCash contributors."
msgstr "المشاركون© 1997-2014"
-#: gnucash/gnome-utils/gnc-main-window.c:4790
+#: gnucash/gnome-utils/gnc-main-window.c:4892
#: gnucash/gnome-utils/gnc-splash.c:98
msgid "Version"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4791
+#: gnucash/gnome-utils/gnc-main-window.c:4893
#: gnucash/gnome-utils/gnc-splash.c:99 gnucash/gnucash-core-app.cpp:278
msgid "Build ID"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4799
+#: gnucash/gnome-utils/gnc-main-window.c:4901
#, fuzzy
msgid "Accounting for personal and small business finance."
msgstr "- جنوكاش للإدارة المالية الشخصية والتجارية الصغيرة "
@@ -9062,14 +9114,14 @@ msgstr "- جنوكاش للإدارة المالية الشخصية والتجا
#. Enter your name or that of your team and an email contact for feedback.
#. The string can have multiple rows, so you can also add a list of
#. contributors.
-#: gnucash/gnome-utils/gnc-main-window.c:4808
+#: gnucash/gnome-utils/gnc-main-window.c:4910
msgid "translator-credits"
msgstr ""
"المشاركين ÙÙŠ تعريب برنامج Gnucash:معتز الشويكي (المدرسون العرب - دروس "
"تعليمية Ù…Øاسبية)http://www.arabstutors.comعبدالسلام بن عبدالعزيز "
"الشلاشhttps://twitter.com/alashalashكريم Ø³Ø§Ù…Ø (رقميات)www.ritsol.com"
-#: gnucash/gnome-utils/gnc-main-window.c:4811
+#: gnucash/gnome-utils/gnc-main-window.c:4913
msgid "Visit the GnuCash website."
msgstr ""
@@ -9607,7 +9659,7 @@ msgid "Dist"
msgstr "توزيع"
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:45
-#: gnucash/import-export/import-main-matcher.c:1594
+#: gnucash/import-export/import-main-matcher.c:1862
#: gnucash/report/reports/standard/register.scm:218
#: libgnucash/engine/Split.c:1614 libgnucash/engine/Split.c:1631
msgid "-- Split Transaction --"
@@ -10210,12 +10262,12 @@ msgid "Enter the effective share price"
msgstr "أدخل سعر السهم الÙعلي"
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3323
-#: gnucash/register/ledger-core/split-register-model.c:2380
+#: gnucash/register/ledger-core/split-register-model.c:2385
msgid "Enter credit formula for real transaction"
msgstr "قم بإدخال صيغة الائتمان للمعاملات الØقيقية"
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3333
-#: gnucash/register/ledger-core/split-register-model.c:2346
+#: gnucash/register/ledger-core/split-register-model.c:2349
msgid "Enter debit formula for real transaction"
msgstr "قم بإدخال صيغة الخصم للمعاملات الØقيقية"
@@ -11928,11 +11980,6 @@ msgstr ""
"إذا نشطة، سيتم عرض شاشة البداية عند بدء التشغيل. وإلا لن يتم عرض شاشة "
"البداية."
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
-#: gnucash/gtkbuilder/dialog-preferences.glade:3901
-msgid "Display the notebook tabs at the top of the window."
-msgstr "عرض علامات التبويب دÙتر ÙÙŠ الجزء العلوي من الناÙذة."
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:196
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:201
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:206
@@ -11945,21 +11992,6 @@ msgstr ""
"ÙŠØدد هذا الإعداد الØاÙØ© التي يتم رسم علامات التبويب لتبديل الصÙØات . القيم "
"الممكنة هي أعلى ;اليسار ;أسÙÙ„;اليمين;. الوضع الاÙتراضي إلى أعلى."
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
-#: gnucash/gtkbuilder/dialog-preferences.glade:3920
-msgid "Display the notebook tabs at the bottom of the window."
-msgstr "عرض علامات التبويب دÙتر ÙÙŠ الجزء السÙلي من الناÙذة."
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
-#: gnucash/gtkbuilder/dialog-preferences.glade:3939
-msgid "Display the notebook tabs at the left of the window."
-msgstr "عرض علامات التبويب دÙتر ÙÙŠ الجهة اليسرى من الناÙذة."
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
-#: gnucash/gtkbuilder/dialog-preferences.glade:3958
-msgid "Display the notebook tabs at the right of the window."
-msgstr "عرض علامات التبويب دÙتر على يمين الناÙذة."
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:215
#: gnucash/gtkbuilder/dialog-preferences.glade:3990
msgid "Display the summary bar at the top of the page."
@@ -13528,7 +13560,7 @@ msgid "Select a row to change the mappings"
msgstr ""
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:970
-#: gnucash/import-export/import-account-matcher.c:188
+#: gnucash/import-export/import-account-matcher.c:197
msgid "Account ID"
msgstr "معر٠الØساب"
@@ -14522,6 +14554,7 @@ msgid "_Amount"
msgstr "_المبلغ:"
#: gnucash/gtkbuilder/assistant-stock-split.glade:293
+#: gnucash/gtkbuilder/dialog-import.glade:958
#: gnucash/gtkbuilder/dialog-print-check.glade:1129
#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:957
msgid "_Memo"
@@ -14925,6 +14958,7 @@ msgid "_Account code"
msgstr "_رمز الØساب"
#: gnucash/gtkbuilder/dialog-account.glade:1251
+#: gnucash/gtkbuilder/dialog-import.glade:930
msgid "_Description"
msgstr "_الوصÙ"
@@ -16209,46 +16243,59 @@ msgstr "أصÙر"
msgid "Green"
msgstr "أخضر"
-#: gnucash/gtkbuilder/dialog-import.glade:877
+#: gnucash/gtkbuilder/dialog-import.glade:871
+#, fuzzy
+#| msgid "Do not print transaction detail"
+msgid "Edit imported transaction details"
+msgstr "لا تقم بطباعة تÙاصيل المعاملة"
+
+#: gnucash/gtkbuilder/dialog-import.glade:944
+#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
+#: gnucash/gtkbuilder/dialog-print-check.glade:745
+#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
+msgid "_Notes"
+msgstr "_مسودة"
+
+#: gnucash/gtkbuilder/dialog-import.glade:1022
#, fuzzy
msgid ""
"List of downloaded transactions (source split and matched information shown)"
msgstr "قائمة العمليات المØملة"
-#: gnucash/gtkbuilder/dialog-import.glade:919
+#: gnucash/gtkbuilder/dialog-import.glade:1064
#, fuzzy
msgid "Show _Account column"
msgstr "عرض اللون Øساب على علامات التبويب"
-#: gnucash/gtkbuilder/dialog-import.glade:935
+#: gnucash/gtkbuilder/dialog-import.glade:1080
#, fuzzy
msgid "Show _Memo column"
msgstr "عرض اللون Øساب على علامات التبويب"
-#: gnucash/gtkbuilder/dialog-import.glade:951
+#: gnucash/gtkbuilder/dialog-import.glade:1096
#, fuzzy
msgid "Show matched _information"
msgstr "معلومات القسيمة"
-#: gnucash/gtkbuilder/dialog-import.glade:966
+#: gnucash/gtkbuilder/dialog-import.glade:1111
#, fuzzy
#| msgid "Spend"
msgid "A_ppend"
msgstr "إنÙاق"
-#: gnucash/gtkbuilder/dialog-import.glade:970
+#: gnucash/gtkbuilder/dialog-import.glade:1115
msgid ""
"When Updating and Clearing a matched transaction, append the imported "
"Description and Notes to the matched Description and Notes instead of "
"replacing them."
msgstr ""
-#: gnucash/gtkbuilder/dialog-import.glade:982
+#: gnucash/gtkbuilder/dialog-import.glade:1127
#, fuzzy
msgid "_Reconcile after match"
msgstr "تسوية - مطابقة تلقائية"
-#: gnucash/gtkbuilder/dialog-import.glade:1005
+#: gnucash/gtkbuilder/dialog-import.glade:1150
msgid "Generic import transaction matcher"
msgstr "مطابقة استيراد العمليات العام"
@@ -16360,12 +16407,6 @@ msgstr "Ø£Øذ٠المجموعة المختارة."
msgid "Enter a name for the highlighted lot."
msgstr "أدخل اسما المجموعة المختارة."
-#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
-#: gnucash/gtkbuilder/dialog-print-check.glade:745
-#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
-msgid "_Notes"
-msgstr "_مسودة"
-
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:174
msgid "Enter any notes you want to make about this lot."
msgstr "أدخل أي ملاØظات كنت تريد أن تجعل Øول هذه المجموعة."
@@ -17411,22 +17452,6 @@ msgstr "Ø¥Øضار علامة التبويب الأØدث إلى الأمام"
msgid "<b>Tab Position</b>"
msgstr "<b>موضع علامة التبويب</b>"
-#: gnucash/gtkbuilder/dialog-preferences.glade:3895
-msgid "To_p"
-msgstr "أعلى"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3914
-msgid "B_ottom"
-msgstr "أسÙÙ„"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3933
-msgid "_Left"
-msgstr "_يسار"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3952
-msgid "_Right"
-msgstr "_يمين"
-
#: gnucash/gtkbuilder/dialog-preferences.glade:3974
msgid "<b>Summary Bar Position</b>"
msgstr "<b>موضع شريط الملخص</b>"
@@ -19294,15 +19319,15 @@ msgstr "التصدير إلى مل٠PDF"
msgid "Bank code %s (%s), Account %s (%s)"
msgstr "رمز البك %s (%s), الØساب %s (%s)"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:858
+#: gnucash/import-export/aqb/assistant-ab-initial.c:859
msgid "Online Banking Account Name"
msgstr "اسم جساب الخدمات المصرÙية عبر الإنترنت"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:863
+#: gnucash/import-export/aqb/assistant-ab-initial.c:864
msgid "GnuCash Account Name"
msgstr "إسم Øساب GnuCash"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:869
+#: gnucash/import-export/aqb/assistant-ab-initial.c:870
#: gnucash/import-export/qif-imp/assistant-qif-import.c:572
#: gnucash/import-export/qif-imp/dialog-account-picker.c:452
msgid "New?"
@@ -21505,7 +21530,7 @@ msgstr "إستورد العملاء و الموردين"
msgid "Import Customers and Vendors from a CSV text file."
msgstr "إستورد العملاء و الموردين من مل٠نصي"
-#: gnucash/import-export/import-account-matcher.c:263
+#: gnucash/import-export/import-account-matcher.c:272
#, fuzzy, c-format
msgid ""
"The account '%s' is a placeholder account and does not allow transactions. "
@@ -21514,7 +21539,7 @@ msgstr ""
"هذا الØساب %s هو Øساب مخصص للتصني٠ولا ÙŠØ³Ù…Ø Ø¨ØªØ³Ø¬ÙŠÙ„ العمليات به. الرجاء "
"اختيار Øساب آخر."
-#: gnucash/import-export/import-account-matcher.c:280
+#: gnucash/import-export/import-account-matcher.c:289
#, fuzzy, c-format
msgid ""
"The account '%s' has a different commodity to the one required, '%s'. Please "
@@ -21523,7 +21548,7 @@ msgstr ""
"هذا الØساب %s هو Øساب مخصص للتصني٠ولا ÙŠØ³Ù…Ø Ø¨ØªØ³Ø¬ÙŠÙ„ العمليات به. الرجاء "
"اختيار Øساب آخر."
-#: gnucash/import-export/import-account-matcher.c:472
+#: gnucash/import-export/import-account-matcher.c:481
msgid "(Full account ID: "
msgstr "(كامل معر٠الØساب: "
@@ -21552,139 +21577,128 @@ msgstr "y/m/d"
msgid "y/d/m"
msgstr "y/d/m"
-#: gnucash/import-export/import-main-matcher.c:462
+#: gnucash/import-export/import-main-matcher.c:518
#, fuzzy
msgid "No new transactions were found in this import."
msgstr "لا ترتبط هذه المعاملة مع URI."
-#: gnucash/import-export/import-main-matcher.c:630
-#: gnucash/import-export/import-main-matcher.c:783
+#: gnucash/import-export/import-main-matcher.c:687
+#: gnucash/import-export/import-main-matcher.c:840
msgid "Destination account for the auto-balance split."
msgstr "الØساب المستخدم لعمليات التوازن التلقائي."
-#: gnucash/import-export/import-main-matcher.c:943
-#, fuzzy
-#| msgid "Enter the Entry Description"
-msgid "Enter new Description"
-msgstr "أدخل الوص٠المدخل"
-
-#: gnucash/import-export/import-main-matcher.c:958
-#, fuzzy
-#| msgid "Enter Due Date"
-msgid "Enter new Memo"
-msgstr "أدخل تاريخ الاستØقاق"
-
-#: gnucash/import-export/import-main-matcher.c:971
+#: gnucash/import-export/import-main-matcher.c:1026
+#: gnucash/report/html-utilities.scm:338
+#: gnucash/report/reports/standard/balsheet-pnl.scm:154
+#: gnucash/report/reports/standard/new-owner-report.scm:942
#, fuzzy
-msgid "Enter new Notes"
-msgstr "ملاØظات إضاÙية"
+msgid "Disabled"
+msgstr "تمكين"
-#: gnucash/import-export/import-main-matcher.c:1097
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1321
#, fuzzy
-msgid "Assign a transfer account to the selection."
+msgid "_Assign a transfer account to the selection"
msgstr "يجب تØديد Øساب التØويل من شجرة الØسابات."
-#: gnucash/import-export/import-main-matcher.c:1108
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1368
#, fuzzy
-#| msgid "description"
-msgid "Edit description."
-msgstr "الوصÙ"
-
-#: gnucash/import-export/import-main-matcher.c:1116
-#, fuzzy
-#| msgid "Edit Job"
-msgid "Edit memo."
-msgstr "تØرير الوظيÙØ©"
+#| msgid "Description, Notes, or Memo"
+msgid "_Edit description, notes, or memo"
+msgstr "الوصÙ/ملاØظات/مذكرة"
-#: gnucash/import-export/import-main-matcher.c:1124
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1377
#, fuzzy
-msgid "Edit notes."
-msgstr "إشعار إضاÙØ©"
+#| msgid "Reset defaults"
+msgid "_Reset all edits"
+msgstr "إعادة تعيين الإعدادات الاÙتراضية"
-#: gnucash/import-export/import-main-matcher.c:1286
+#: gnucash/import-export/import-main-matcher.c:1547
#, fuzzy
#| msgid "A"
msgctxt "Column header for 'Adding transaction'"
msgid "A"
msgstr "A"
-#: gnucash/import-export/import-main-matcher.c:1289
+#: gnucash/import-export/import-main-matcher.c:1550
#, fuzzy
msgctxt "Column header for 'Updating plus Clearing transaction'"
msgid "U+C"
msgstr "U+R"
-#: gnucash/import-export/import-main-matcher.c:1293
+#: gnucash/import-export/import-main-matcher.c:1554
#, fuzzy
#| msgid "C"
msgctxt "Column header for 'Clearing transaction'"
msgid "C"
msgstr "C"
-#: gnucash/import-export/import-main-matcher.c:1300
+#: gnucash/import-export/import-main-matcher.c:1561
msgid "Info"
msgstr "معلومات"
-#: gnucash/import-export/import-main-matcher.c:1307
+#: gnucash/import-export/import-main-matcher.c:1568
#: gnucash/report/stylesheets/head-or-tail.scm:102
#, fuzzy
msgid "Additional Comments"
msgstr "تضا٠إلى بطاقة:"
-#: gnucash/import-export/import-main-matcher.c:1700
+#: gnucash/import-export/import-main-matcher.c:1987
msgid "New, already balanced"
msgstr "جديدة، متوازنة بالÙعل"
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1726
+#: gnucash/import-export/import-main-matcher.c:2013
#, c-format
msgid "New, transfer %s to (manual) \"%s\""
msgstr "نقل جديد %s to (دليل) \"%s\""
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1734
+#: gnucash/import-export/import-main-matcher.c:2021
#, c-format
msgid "New, transfer %s to (auto) \"%s\""
msgstr "نقل جديد %s إلى (أوتوماتيك) \"%s\""
#. Translators: %s is the amount to be transferred.
-#: gnucash/import-export/import-main-matcher.c:1745
+#: gnucash/import-export/import-main-matcher.c:2032
#, c-format
msgid "New, UNBALANCED (need acct to transfer %s)!"
msgstr "جديد، غير متوازن (ÙŠØتاج الØساب لتØويل %s)!"
-#: gnucash/import-export/import-main-matcher.c:1763
+#: gnucash/import-export/import-main-matcher.c:2050
#, fuzzy, c-format
#| msgid "Reconcile (manual) match"
msgid "Reconcile (manual) match to %s"
msgstr "تسوية - مطابقة يدوية"
-#: gnucash/import-export/import-main-matcher.c:1768
+#: gnucash/import-export/import-main-matcher.c:2055
#, fuzzy, c-format
#| msgid "Reconcile (auto) match"
msgid "Reconcile (auto) match to %s"
msgstr "تسوية - مطابقة تلقائية"
-#: gnucash/import-export/import-main-matcher.c:1777
-#: gnucash/import-export/import-main-matcher.c:1807
+#: gnucash/import-export/import-main-matcher.c:2064
+#: gnucash/import-export/import-main-matcher.c:2094
msgid "Match missing!"
msgstr "مماثل غير موجود!"
-#: gnucash/import-export/import-main-matcher.c:1793
+#: gnucash/import-export/import-main-matcher.c:2080
#, fuzzy, c-format
#| msgid "Update and reconcile (manual) match"
msgid "Update and reconcile (manual) match to %s"
msgstr "تØديث وتسوية - مطابقة يدوية"
-#: gnucash/import-export/import-main-matcher.c:1798
+#: gnucash/import-export/import-main-matcher.c:2085
#, fuzzy, c-format
#| msgid "Update and reconcile (auto) match"
msgid "Update and reconcile (auto) match to %s"
msgstr "تØديث وتسوية - مطابقة تلقائية"
-#: gnucash/import-export/import-main-matcher.c:1815
+#: gnucash/import-export/import-main-matcher.c:2102
msgid "Do not import (no action selected)"
msgstr "عدم الإستيراد (عدم اختيار أي إجراء)"
@@ -23058,13 +23072,6 @@ msgstr[5] "سعر الصرÙ"
msgid "No budgets exist. You must create at least one budget."
msgstr "لا توجد ميزانيات. يجب أن تقوم بإنشاء ميزانية واØدة على الأقل."
-#: gnucash/report/html-utilities.scm:338
-#: gnucash/report/reports/standard/balsheet-pnl.scm:154
-#: gnucash/report/reports/standard/new-owner-report.scm:942
-#, fuzzy
-msgid "Disabled"
-msgstr "تمكين"
-
#: gnucash/report/html-utilities.scm:391
msgid "This report requires you to specify certain report options."
msgstr "هذا التقرير يتطلب منك تØديد خيارات معينة ÙÙŠ التقرير."
@@ -30003,23 +30010,23 @@ msgstr "خطأ رقمي"
#. Translators: A list of error messages from the Scheduled Transactions (SX).
#. They might appear in their editor or in "Since last run".
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1018
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1019
#, c-format
msgid "Unknown account for guid [%s], cancelling SX [%s] creation."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1071
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1074
#, c-format
msgid "Error parsing SX [%s] key [%s]=formula [%s] at [%s]: %s."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1125
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1788
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1130
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1793
#, c-format
msgid "Error %d in SX [%s] final gnc_numeric value, using 0 instead."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1797
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1802
#, c-format
msgid "No exchange rate available in SX [%s] for %s -> %s, value is zero."
msgstr ""
@@ -30518,11 +30525,11 @@ msgctxt ""
msgid "Split"
msgstr "تقسيم"
-#: libgnucash/engine/Transaction.c:2784
+#: libgnucash/engine/Transaction.c:2807
msgid "Voided transaction"
msgstr "المعاملات الملغاة"
-#: libgnucash/engine/Transaction.c:2800
+#: libgnucash/engine/Transaction.c:2823
msgid "Transaction Voided"
msgstr "ابطلت المعاملة"
diff --git a/po/as.po b/po/as.po
index 173206f13..f203fecb1 100644
--- a/po/as.po
+++ b/po/as.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GnuCash 4.11-1\n"
+"Project-Id-Version: GnuCash 4.11-2\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
-"POT-Creation-Date: 2022-07-17 04:04+0200\n"
+"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2014-06-02 10:43+0530\n"
"Last-Translator: Parimal Khade <parimalk at cdac.in>\n"
"Language-Team: NONE\n"
@@ -975,7 +975,7 @@ msgstr "ঋণ পà§à¦¨à§° পৰিশোধ বিকলà§à¦ª: \"%s\""
#: gnucash/import-export/csv-exp/csv-transactions-export.c:622
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:53
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:63
-#: gnucash/import-export/import-main-matcher.c:1280
+#: gnucash/import-export/import-main-matcher.c:1541
#: gnucash/import-export/import-match-picker.c:393
#: gnucash/import-export/import-match-picker.c:433
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3700
@@ -1076,7 +1076,7 @@ msgstr "দাম যোগৰ à¦à§‚ল."
#: gnucash/import-export/aqb/gnc-ab-utils.c:559
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:147
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:70
-#: gnucash/import-export/import-main-matcher.c:1281
+#: gnucash/import-export/import-main-matcher.c:1542
#: gnucash/import-export/import-match-picker.c:392
#: gnucash/import-export/qif-imp/dialog-account-picker.c:433
#: gnucash/register/ledger-core/split-register-model.c:342
@@ -1333,8 +1333,8 @@ msgstr "সামগà§à§°à§€ ডিলিট কৰক?"
#: gnucash/gnome-utils/gnc-file.c:118 gnucash/gnome-utils/gnc-file.c:366
#: gnucash/gnome-utils/gnc-file.c:664 gnucash/gnome-utils/gnc-gui-query.c:300
#: gnucash/gnome-utils/gnc-gui-query.c:332
-#: gnucash/gnome-utils/gnc-main-window.c:1313
-#: gnucash/gnome-utils/gnc-main-window.c:1470
+#: gnucash/gnome-utils/gnc-main-window.c:1341
+#: gnucash/gnome-utils/gnc-main-window.c:1498
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:886
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1023
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1063
@@ -1363,7 +1363,8 @@ msgstr "সামগà§à§°à§€ ডিলিট কৰক?"
#: gnucash/gtkbuilder/dialog-fincalc.glade:137
#: gnucash/gtkbuilder/dialog-import.glade:46
#: gnucash/gtkbuilder/dialog-import.glade:328
-#: gnucash/gtkbuilder/dialog-import.glade:1040
+#: gnucash/gtkbuilder/dialog-import.glade:885
+#: gnucash/gtkbuilder/dialog-import.glade:1185
#: gnucash/gtkbuilder/dialog-invoice.glade:674
#: gnucash/gtkbuilder/dialog-invoice.glade:1198
#: gnucash/gtkbuilder/dialog-job.glade:41
@@ -1593,7 +1594,7 @@ msgstr "à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ নিৰà§à¦¬à¦¾à¦šà¦¨ কৰক"
#: gnucash/gnome-utils/gnc-gui-query.c:297
#: gnucash/gnome-utils/gnc-gui-query.c:331
#: gnucash/gnome-utils/gnc-gui-query.c:417
-#: gnucash/gnome-utils/gnc-main-window.c:1471
+#: gnucash/gnome-utils/gnc-main-window.c:1499
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:196
#: gnucash/gtkbuilder/dialog-account.glade:35
#: gnucash/gtkbuilder/dialog-account.glade:832
@@ -1616,7 +1617,8 @@ msgstr "à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ নিৰà§à¦¬à¦¾à¦šà¦¨ কৰক"
#: gnucash/gtkbuilder/dialog-import.glade:61
#: gnucash/gtkbuilder/dialog-import.glade:188
#: gnucash/gtkbuilder/dialog-import.glade:343
-#: gnucash/gtkbuilder/dialog-import.glade:1056
+#: gnucash/gtkbuilder/dialog-import.glade:899
+#: gnucash/gtkbuilder/dialog-import.glade:1201
#: gnucash/gtkbuilder/dialog-invoice.glade:690
#: gnucash/gtkbuilder/dialog-invoice.glade:1213
#: gnucash/gtkbuilder/dialog-job.glade:57
@@ -1747,7 +1749,7 @@ msgstr "লেনদেনৰ পূংখানà§à¦ªà§‚ংখ বিৱৰণ"
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-exp/csv-tree-export.c:156
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:65
-#: gnucash/import-export/import-main-matcher.c:1284
+#: gnucash/import-export/import-main-matcher.c:1545
#: gnucash/import-export/import-match-picker.c:395
#: gnucash/import-export/import-match-picker.c:435
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3710
@@ -1829,7 +1831,7 @@ msgid "Username"
msgstr "বà§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° নাম"
#: gnucash/gnome/dialog-employee.c:732 gnucash/gnome/dialog-sx-editor2.c:1755
-#: gnucash/gnome/dialog-sx-editor.c:1817 gnucash/gnome/dialog-tax-info.c:1200
+#: gnucash/gnome/dialog-sx-editor.c:1823 gnucash/gnome/dialog-tax-info.c:1200
#: gnucash/gnome-utils/gnc-dense-cal.c:350
#: gnucash/gnome-utils/gnc-tree-model-budget.c:96
#: gnucash/gnome-utils/gnc-tree-view-commodity.c:368
@@ -1968,7 +1970,7 @@ msgstr "শà§à¦¬à§‡à§Ÿà¦¾à§°à§° মূলà§à¦¯"
#: gnucash/gtkbuilder/dialog-payment.glade:418
#: gnucash/gtkbuilder/dialog-transfer.glade:102
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:54
-#: gnucash/import-export/import-main-matcher.c:1283
+#: gnucash/import-export/import-main-matcher.c:1544
#: gnucash/import-export/import-match-picker.c:394
#: gnucash/import-export/import-match-picker.c:434
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3721
@@ -2103,7 +2105,7 @@ msgstr "বিৱৰণ / টোকাবোৰ / মেমো"
#: gnucash/gtkbuilder/dialog-transfer.glade:205
#: gnucash/import-export/csv-exp/csv-transactions-export.c:626
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:74
-#: gnucash/import-export/import-main-matcher.c:1285
+#: gnucash/import-export/import-main-matcher.c:1546
#: gnucash/import-export/import-match-picker.c:396
#: gnucash/import-export/import-match-picker.c:436
#: gnucash/register/ledger-core/split-register-model.c:356
@@ -3082,7 +3084,7 @@ msgstr "শৈলী শà§à¦¬à§€à¦Ÿà§° নাম"
#: gnucash/gnome/dialog-sx-editor2.c:165 gnucash/gnome/dialog-sx-editor.c:167
#: gnucash/gnome/gnc-plugin-page-sx-list.c:151
#: gnucash/gnome/window-reconcile2.c:2187 gnucash/gnome/window-reconcile.c:2449
-#: gnucash/gnome-utils/gnc-main-window.c:277
+#: gnucash/gnome-utils/gnc-main-window.c:278
#: gnucash/gtkbuilder/dialog-billterms.glade:679
#: gnucash/gtkbuilder/dialog-commodities.glade:156
#: gnucash/gtkbuilder/dialog-price.glade:858
@@ -3098,12 +3100,12 @@ msgid "_Transaction"
msgstr "_লেনদেন কৰক"
#: gnucash/gnome/dialog-sx-editor2.c:167 gnucash/gnome/dialog-sx-editor.c:169
-#: gnucash/gnome-utils/gnc-main-window.c:278
+#: gnucash/gnome-utils/gnc-main-window.c:279
msgid "_View"
msgstr "_চাওক"
#: gnucash/gnome/dialog-sx-editor2.c:168 gnucash/gnome/dialog-sx-editor.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:279
+#: gnucash/gnome-utils/gnc-main-window.c:280
msgid "_Actions"
msgstr "_কাৰà§à¦¯à§à¦¯à¦¬à§‹à§°"
@@ -3122,7 +3124,7 @@ msgstr "\"%s\" সà§à¦ªà§à¦²à¦¿à¦Ÿà§° কাৰণে পাবলগীয়া
msgid "Couldn't parse debit formula for split \"%s\"."
msgstr "\"%s\" সà§à¦ªà§à¦²à¦¿à¦Ÿà§° কৰণে পà§à§°à¦¤à¦¿à¦Ÿà§‹ দিবলগীয়া সূতà§à§°à§° অৰà§à¦¥ নিৰà§à¦§à¦¾à§°à¦£ কৰিব পৰা নগল."
-#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:874
+#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:880
#: gnucash/gnome/dialog-sx-from-trans.c:261
msgid ""
"The Scheduled Transaction Editor cannot automatically balance this "
@@ -3186,18 +3188,18 @@ msgstr ""
"টোকা: যদি আপà§à¦¨à¦¿ ইতিমধà§à¦¯à§‡ নমà§à¦¨à¦¾à¦Ÿà§‹à¦²à§ˆ কৰা সলনিবোৰ গà§à§°à¦¹à¦£ কৰিছে, তেনà§à¦¤à§‡ বাতিল কৰাটোৱে "
"সেইবোৰ অবৈধ নকৰে."
-#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1406
+#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1412
msgid "(never)"
msgstr "(কেতিয়াও)"
-#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1568
+#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1574
msgid ""
"The current template transaction has been changed. Would you like to record "
"the changes?"
msgstr ""
"চলিত লেনদেনৰ নমà§à¦¨à¦¾à¦Ÿà§‹ সলনি কৰা হৈছে. আপà§à¦¨à¦¿ সলনিবোৰ ৰেকৰà§à¦¡ কৰিব বিচাৰিব নেকি?"
-#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1844
+#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1850
#: gnucash/gnome/gnc-plugin-page-sx-list.c:246
#: gnucash/gnome/gnc-plugin-page-sx-list.c:252
msgid "Scheduled Transactions"
@@ -3210,31 +3212,31 @@ msgid ""
"cannot be automatically created."
msgstr "চলকবোৰৰ সৈতে নিৰà§à¦§à¦¾à§°à¦¿à¦¤ লেনদেনবোৰ সà§à¦¬à§Ÿà¦‚কà§à§°à¦¿à§Ÿà¦à¦¾à¦¬à§‡ সৃষà§à¦Ÿà¦¿ কৰিব নোৱাৰিব."
-#: gnucash/gnome/dialog-sx-editor.c:675
+#: gnucash/gnome/dialog-sx-editor.c:679
#, fuzzy, c-format
msgid "Couldn't parse %s for split \"%s\"."
msgstr "\"%s\" সà§à¦ªà§à¦²à¦¿à¦Ÿà§° কৰণে পà§à§°à¦¤à¦¿à¦Ÿà§‹ দিবলগীয়া সূতà§à§°à§° অৰà§à¦¥ নিৰà§à¦§à¦¾à§°à¦£ কৰিব পৰা নগল."
-#: gnucash/gnome/dialog-sx-editor.c:739
+#: gnucash/gnome/dialog-sx-editor.c:745
#, c-format
msgid "Split with memo %s has an invalid account."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:742
+#: gnucash/gnome/dialog-sx-editor.c:748
#, fuzzy
msgid "Invalid Account in Split"
msgstr "বেচাকিনা কৰা à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦¬à§‹à§°à§° মà§à¦ টো অনà§à¦¤à§°à§à¦à§à¦•à§à¦¤ কৰক"
-#: gnucash/gnome/dialog-sx-editor.c:754
+#: gnucash/gnome/dialog-sx-editor.c:760
#, c-format
msgid "Split with memo %s has an unparsable Credit Formula."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:757 gnucash/gnome/dialog-sx-editor.c:773
+#: gnucash/gnome/dialog-sx-editor.c:763 gnucash/gnome/dialog-sx-editor.c:779
msgid "Unparsable Formula in Split"
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:770
+#: gnucash/gnome/dialog-sx-editor.c:776
#, c-format
msgid "Split with memo %s has an unparsable Debit Formula."
msgstr ""
@@ -3491,7 +3493,7 @@ msgstr "à¦à¦Ÿà¦¾ বৰà§à¦¤à¦¿ থকা GnuCash ফাইল খোলক"
#: gnucash/gnome/gnc-plugin-basic-commands.c:121
#: gnucash/gnome-utils/gnc-file.c:100 gnucash/gnome-utils/gnc-file.c:666
-#: gnucash/gnome-utils/gnc-main-window.c:1314
+#: gnucash/gnome-utils/gnc-main-window.c:1342
#: gnucash/html/gnc-html-webkit1.c:1198
msgid "_Save"
msgstr "_ছেঠকৰক"
@@ -4091,7 +4093,7 @@ msgstr "নিৰà§à¦¬à¦¾à¦šà¦¿à¦¤ à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦Ÿà§‹à§° শিশà§
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:185
#: gnucash/gnome/gnc-plugin-page-register2.c:340
#: gnucash/gnome/gnc-plugin-page-register.c:463
-#: gnucash/gnome-utils/gnc-main-window.c:349
+#: gnucash/gnome-utils/gnc-main-window.c:351
msgid "_Filter By..."
msgstr "_দà§à¦¬à¦¾à§°à¦¾ ফিলà§à¦Ÿà¦¾à§°..."
@@ -4103,7 +4105,7 @@ msgstr "_দà§à¦¬à¦¾à§°à¦¾ ফিলà§à¦Ÿà¦¾à§°..."
#: gnucash/gnome/gnc-plugin-page-register.c:467
#: gnucash/gnome/gnc-plugin-page-report.c:1231
#: gnucash/gnome/gnc-plugin-page-sx-list.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:353
+#: gnucash/gnome-utils/gnc-main-window.c:355
msgid "_Refresh"
msgstr "পà§à¦¨à§° সজীৱ কৰক"
@@ -4114,7 +4116,7 @@ msgstr "পà§à¦¨à§° সজীৱ কৰক"
#: gnucash/gnome/gnc-plugin-page-register.c:468
#: gnucash/gnome/gnc-plugin-page-report.c:1232
#: gnucash/gnome/gnc-plugin-page-sx-list.c:171
-#: gnucash/gnome-utils/gnc-main-window.c:354
+#: gnucash/gnome-utils/gnc-main-window.c:356
msgid "Refresh this window"
msgstr "à¦à¦‡ উইণà§à¦¡à§‹à¦–ন পà§à¦¨à§° সজীৱ কৰক"
@@ -4535,7 +4537,7 @@ msgstr "পà§à¦°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿"
#: gnucash/gnome/gnc-plugin-page-register2.c:240
#: gnucash/gnome/gnc-plugin-page-register.c:354
#: gnucash/gnome/gnc-plugin-page-report.c:1226
-#: gnucash/gnome-utils/gnc-main-window.c:332
+#: gnucash/gnome-utils/gnc-main-window.c:333
msgid "_Paste"
msgstr "_আঠা লগাওক"
@@ -5337,35 +5339,35 @@ msgstr "_পà§à§°à¦¿à¦£à§à¦Ÿà§° পৰীকà§à¦·à¦¾à¦¬à§‹à§° কৰক..."
#: gnucash/gnome/gnc-plugin-page-register2.c:230
#: gnucash/gnome/gnc-plugin-page-register.c:344
#: gnucash/gnome/gnc-plugin-page-report.c:1216
-#: gnucash/gnome-utils/gnc-main-window.c:322
+#: gnucash/gnome-utils/gnc-main-window.c:323
msgid "Cu_t"
msgstr "কাট কৰক"
#: gnucash/gnome/gnc-plugin-page-register2.c:231
#: gnucash/gnome/gnc-plugin-page-register.c:345
#: gnucash/gnome/gnc-plugin-page-report.c:1217
-#: gnucash/gnome-utils/gnc-main-window.c:323
+#: gnucash/gnome-utils/gnc-main-window.c:324
msgid "Cut the current selection and copy it to clipboard"
msgstr "বৰà§à¦¤à¦®à¦¾à¦¨à§° নিৰà§à¦¬à¦¾à¦šà¦¨à¦Ÿà§‹ কাট কৰক আৰৠইয়াক কà§à¦²à¦¿à¦ªà¦¬à§°à§à¦¡à¦²à§ˆ পà§à§°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿ কৰক"
#: gnucash/gnome/gnc-plugin-page-register2.c:235
#: gnucash/gnome/gnc-plugin-page-register.c:349
#: gnucash/gnome/gnc-plugin-page-report.c:1221
-#: gnucash/gnome-utils/gnc-main-window.c:327
+#: gnucash/gnome-utils/gnc-main-window.c:328
msgid "_Copy"
msgstr "_পà§à§°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿ কৰক"
#: gnucash/gnome/gnc-plugin-page-register2.c:236
#: gnucash/gnome/gnc-plugin-page-register.c:350
#: gnucash/gnome/gnc-plugin-page-report.c:1222
-#: gnucash/gnome-utils/gnc-main-window.c:328
+#: gnucash/gnome-utils/gnc-main-window.c:329
msgid "Copy the current selection to clipboard"
msgstr "বৰà§à¦¤à¦®à¦¾à¦¨à§° নিৰà§à¦¬à¦¾à¦šà¦¨à¦Ÿà§‹ কà§à¦²à¦¿à¦ªà¦¬à§°à§à¦¡à¦²à§ˆ পà§à§°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿ কৰক"
#: gnucash/gnome/gnc-plugin-page-register2.c:241
#: gnucash/gnome/gnc-plugin-page-register.c:355
#: gnucash/gnome/gnc-plugin-page-report.c:1227
-#: gnucash/gnome-utils/gnc-main-window.c:333
+#: gnucash/gnome-utils/gnc-main-window.c:334
msgid "Paste the clipboard content at the cursor position"
msgstr "কà§à¦²à¦¿à¦ªà¦¬à§°à§à¦¡à§° বিষয়টো কাৰà§à¦›à§‹à§°à§° সà§à¦¥à¦¾à¦¨à¦¤ আঠা লগাওক"
@@ -5830,7 +5832,7 @@ msgid "Remo_ve Other Splits"
msgstr "আন সà§à¦ªà§à¦²à¦¿à¦Ÿà¦¬à§‹à§° আতà¦à§° কৰক"
#: gnucash/gnome/gnc-plugin-page-register.c:459
-#: gnucash/gnome-utils/gnc-main-window.c:345
+#: gnucash/gnome-utils/gnc-main-window.c:347
msgid "_Sort By..."
msgstr "_দà§à¦¬à¦¾à§°à¦¾ বৰà§à¦—ীকৰণ..."
@@ -6894,7 +6896,7 @@ msgstr "হিচাপ কৰক"
#: gnucash/gnome/window-reconcile2.c:2129
#: gnucash/gnome/window-reconcile2.c:2210 gnucash/gnome/window-reconcile.c:2391
#: gnucash/gnome/window-reconcile.c:2472
-#: gnucash/gnome-utils/gnc-main-window.c:285
+#: gnucash/gnome-utils/gnc-main-window.c:286
#: gnucash/gtkbuilder/dialog-account.glade:1121
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:23
#: gnucash/gtkbuilder/dialog-book-close.glade:22
@@ -6904,7 +6906,7 @@ msgstr "হিচাপ কৰক"
#: gnucash/gtkbuilder/dialog-custom-report.glade:29
#: gnucash/gtkbuilder/dialog-employee.glade:23
#: gnucash/gtkbuilder/dialog-fincalc.glade:107
-#: gnucash/gtkbuilder/dialog-import.glade:1023
+#: gnucash/gtkbuilder/dialog-import.glade:1168
#: gnucash/gtkbuilder/dialog-invoice.glade:657
#: gnucash/gtkbuilder/dialog-job.glade:24
#: gnucash/gtkbuilder/dialog-options.glade:21
@@ -6966,7 +6968,7 @@ msgid "Edit the main account for this register"
msgstr "à¦à¦‡ পঞà§à¦œà§€à§Ÿà¦¨à¦Ÿà§‹à§° কৰণে মূখà§à¦¯ à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦Ÿà§‹ সমà§à¦ªà¦¾à¦¦à¦¨ কৰক"
#: gnucash/gnome/window-reconcile2.c:2173 gnucash/gnome/window-reconcile.c:2435
-#: gnucash/gnome-utils/gnc-main-window.c:360
+#: gnucash/gnome-utils/gnc-main-window.c:362
msgid "_Check & Repair"
msgstr "পৰীকà§à¦·à¦¾ & মেৰামতি কৰক"
@@ -7766,7 +7768,7 @@ msgid "_Save As"
msgstr "... দৰে ছেঠকৰক"
#: gnucash/gnome-utils/dialog-options.c:225
-#: gnucash/gnome-utils/gnc-main-window.c:309
+#: gnucash/gnome-utils/gnc-main-window.c:310
#: gnucash/gtkbuilder/dialog-billterms.glade:731
#: gnucash/gtkbuilder/dialog-commodities.glade:174
#: gnucash/gtkbuilder/dialog-custom-report.glade:46
@@ -8315,7 +8317,7 @@ msgstr "কমà§à¦ªà¦¨à¦¾à¦‚ক"
msgid "(unnamed)"
msgstr "(কোনো নাম নাই)"
-#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:289
+#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:290
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
#: gnucash/import-export/customer-import/gnc-plugin-customer-import.c:57
msgid "_Import"
@@ -8332,7 +8334,7 @@ msgstr "আমদানি"
msgid "Save"
msgstr "ছেঠকৰক"
-#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:290
+#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:291
msgid "_Export"
msgstr "ৰপà§à¦¤à¦¾à¦¨à¦¿"
@@ -8612,7 +8614,7 @@ msgid "Save changes to the file?"
msgstr "ফাইলটোৰ সলনিবোৰ ছেঠকৰে নে?"
#: gnucash/gnome-utils/gnc-file.c:656
-#: gnucash/gnome-utils/gnc-main-window.c:1307
+#: gnucash/gnome-utils/gnc-main-window.c:1335
#, c-format
msgid "If you don't save, changes from the past %d minute will be discarded."
msgid_plural ""
@@ -8670,7 +8672,7 @@ msgstr "যিকোনো উপায়ে খোলক"
msgid "Open _Folder"
msgstr "সà§à¦¥à¦¾à¦¨à¦§à¦¾à§°à¦•"
-#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:314
+#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:315
msgid "_Quit"
msgstr "à¦à§°à¦¿ দিয়ক"
@@ -8714,7 +8716,7 @@ msgstr ""
"%s ফাইলটো ইতিমধà§à¦¯à§‡ বৰà§à¦¤à¦¿ আছে. আপà§à¦¨à¦¿ à¦à¦‡à¦Ÿà§‹ অà¦à¦¾à§°à§°à¦¾à¦‡à¦Ÿ কৰিব বিচাৰে বà§à¦²à¦¿ নিশà§à¦šà¦¿à¦¤à¦¨à§‡?"
#: gnucash/gnome-utils/gnc-file.c:1701
-#: gnucash/gnome-utils/gnc-main-window.c:1275
+#: gnucash/gnome-utils/gnc-main-window.c:1303
msgid "<unknown>"
msgstr "<অ়জà§à¦žà¦¾à¦¤>"
@@ -8766,226 +8768,276 @@ msgstr "à¦à¦Ÿà¦¾ বà§à¦¯à§±à¦¹à¦¾à§°à¦•à§°à§à¦¤à¦¾à§° নাম আৰà§
msgid "Changes will be saved automatically in %u seconds"
msgstr "%u ছেকেণà§à¦¡à¦¤ সলনিবোৰ সà§à¦¬à§Ÿà¦‚কà§à§°à¦¿à§Ÿà¦à¦¾à§±à§‡ ছেঠহব"
-#: gnucash/gnome-utils/gnc-main-window.c:276
+#: gnucash/gnome-utils/gnc-main-window.c:277
msgid "_File"
msgstr "ফাইল"
-#: gnucash/gnome-utils/gnc-main-window.c:280
+#: gnucash/gnome-utils/gnc-main-window.c:281
msgid "Tra_nsaction"
msgstr "লেনদেন"
-#: gnucash/gnome-utils/gnc-main-window.c:281
+#: gnucash/gnome-utils/gnc-main-window.c:282
msgid "_Reports"
msgstr "ৰিপোৰà§à¦Ÿà¦¬à§‹à§°"
-#: gnucash/gnome-utils/gnc-main-window.c:282
+#: gnucash/gnome-utils/gnc-main-window.c:283
msgid "_Tools"
msgstr "টà§à¦²à¦¬à§‹à§°"
-#: gnucash/gnome-utils/gnc-main-window.c:283
+#: gnucash/gnome-utils/gnc-main-window.c:284
msgid "E_xtensions"
msgstr "পà§à§°à¦¸à¦¾à§°à¦¬à§‹à§°"
-#: gnucash/gnome-utils/gnc-main-window.c:284
+#: gnucash/gnome-utils/gnc-main-window.c:285
msgid "_Windows"
msgstr "উইণà§à¦¡à§‹à¦œ"
-#: gnucash/gnome-utils/gnc-main-window.c:292
+#: gnucash/gnome-utils/gnc-main-window.c:293
msgid "_Print..."
msgstr "পà§à§°à¦¿à¦¨à§à¦Ÿ..."
-#: gnucash/gnome-utils/gnc-main-window.c:293
+#: gnucash/gnome-utils/gnc-main-window.c:294
msgid "Print the currently active page"
msgstr "বৰà§à¦¤à¦®à¦¾à¦¨à§° সকà§à§°à¦¿à§Ÿ পৃষà§à¦ াটো পà§à§°à¦¿à¦¨à§à¦Ÿ কৰক"
-#: gnucash/gnome-utils/gnc-main-window.c:299
+#: gnucash/gnome-utils/gnc-main-window.c:300
msgid "Pa_ge Setup..."
msgstr "পৃষà§à¦ াৰ ছেটআপ..."
-#: gnucash/gnome-utils/gnc-main-window.c:300
+#: gnucash/gnome-utils/gnc-main-window.c:301
msgid "Specify the page size and orientation for printing"
msgstr "পà§à§°à¦¿à¦¨à§à¦Ÿ কৰাৰ বাবে পৃষà§à¦ াৰ আকাৰ আৰৠঅৰিয়েনà§à¦Ÿà§‡à¦¶à§à¦¬à¦¨ নিৰà§à¦§à¦¾à§°à¦£ কৰক"
-#: gnucash/gnome-utils/gnc-main-window.c:304
+#: gnucash/gnome-utils/gnc-main-window.c:305
msgid "Proper_ties"
msgstr "বৈশিষà§à¦Ÿà¦¬à§‹à§°"
-#: gnucash/gnome-utils/gnc-main-window.c:305
+#: gnucash/gnome-utils/gnc-main-window.c:306
msgid "Edit the properties of the current file"
msgstr "বৰà§à¦¤à¦®à¦¾à¦¨à§° ফাইলটোৰ বৈশিষà§à¦Ÿà¦¬à§‹à§° সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ কৰক"
-#: gnucash/gnome-utils/gnc-main-window.c:310
+#: gnucash/gnome-utils/gnc-main-window.c:311
msgid "Close the currently active page"
msgstr "বৰà§à¦¤à¦®à¦¾à¦¨à§° সকà§à§°à¦¿à§Ÿ পৃষà§à¦ াটো বনà§à¦§ কৰক"
-#: gnucash/gnome-utils/gnc-main-window.c:315
+#: gnucash/gnome-utils/gnc-main-window.c:316
msgid "Quit this application"
msgstr "à¦à¦‡ পà§à§°à§Ÿà§‹à¦—টো à¦à§°à¦¿ দিয়ক"
-#: gnucash/gnome-utils/gnc-main-window.c:337
+#: gnucash/gnome-utils/gnc-main-window.c:338
msgid "Pr_eferences"
msgstr "পছনà§à¦¦à¦¬à§‹à§°"
-#: gnucash/gnome-utils/gnc-main-window.c:338
+#: gnucash/gnome-utils/gnc-main-window.c:339
msgid "Edit the global preferences of GnuCash"
msgstr "GnuCash ৰ গà§à¦²à§‹à¦¬à§‡à¦² পছনà§à¦¦à¦¬à§‹à§° সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ কৰক"
-#: gnucash/gnome-utils/gnc-main-window.c:346
+#: gnucash/gnome-utils/gnc-main-window.c:345
+#, fuzzy
+#| msgid "<b>Tab Position</b>"
+msgid "Tab P_osition"
+msgstr "<b>টেবৰ সà§à¦¥à¦¾à¦¨</b>"
+
+#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
msgstr "à¦à¦‡ পৃà§à¦·à§à¦ াটোৰ দৃশà§à¦¯à§° কৰণে বৰà§à¦—ীকৰণৰ চৰà§à¦¤ নিৰà§à¦¬à¦¾à¦šà¦¨ কৰক"
-#: gnucash/gnome-utils/gnc-main-window.c:350
+#: gnucash/gnome-utils/gnc-main-window.c:352
msgid "Select the account types that should be displayed."
msgstr "দেখà§à§±à¦¾à¦¬à¦²à¦—ীয়া à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿà§° পà§à§°à¦•à¦¾à§°à¦¬à§‹à§° নিৰà§à¦¬à¦¾à¦šà¦¨ কৰক."
-#: gnucash/gnome-utils/gnc-main-window.c:362
+#: gnucash/gnome-utils/gnc-main-window.c:364
msgid "Reset _Warnings..."
msgstr "সতৰà§à¦•à¦¬à¦¾à¦£à§€à¦¬à§‹à§° পà§à¦¨à§° ছেট কৰক..."
-#: gnucash/gnome-utils/gnc-main-window.c:363
+#: gnucash/gnome-utils/gnc-main-window.c:365
msgid "Reset the state of all warning messages so they will be shown again."
msgstr "সকলো সতৰà§à¦• বাৰà§à¦¤à¦¾à¦¬à§‹à§° পà§à¦¨à§° ছেট কৰক যাতে সেইবোৰ আকৌ দেখà§à§±à¦¾à¦¬ পৰা যায়."
-#: gnucash/gnome-utils/gnc-main-window.c:367
+#: gnucash/gnome-utils/gnc-main-window.c:369
msgid "Re_name Page"
msgstr "পৃষà§à¦ াৰ পà§à¦¨à§° নামাকৰণ কৰক"
-#: gnucash/gnome-utils/gnc-main-window.c:368
+#: gnucash/gnome-utils/gnc-main-window.c:370
msgid "Rename this page."
msgstr "à¦à¦‡ পৃষà§à¦ াটোৰ পà§à¦¨à§° নামাকৰণ কৰক."
-#: gnucash/gnome-utils/gnc-main-window.c:375
+#: gnucash/gnome-utils/gnc-main-window.c:377
msgid "_New Window"
msgstr "নতà§à¦¨ উইণà§à¦¡à§‹"
-#: gnucash/gnome-utils/gnc-main-window.c:376
+#: gnucash/gnome-utils/gnc-main-window.c:378
msgid "Open a new top-level GnuCash window."
msgstr "à¦à¦–ন নতà§à¦¨ ওপৰ সà§à¦¤à§°à§° GnuCash উইণà§à¦¡à§‹ খোলক."
-#: gnucash/gnome-utils/gnc-main-window.c:380
+#: gnucash/gnome-utils/gnc-main-window.c:382
msgid "New Window with _Page"
msgstr "পৃষà§à¦ াৰ সৈতে নতà§à¦¨ উইণà§à¦¡à§‹"
-#: gnucash/gnome-utils/gnc-main-window.c:381
+#: gnucash/gnome-utils/gnc-main-window.c:383
msgid "Move the current page to a new top-level GnuCash window."
msgstr "বৰà§à¦¤à¦®à¦¾à¦¨à§° পৃষà§à¦ াটো à¦à¦–ন নতà§à¦¨ ওপৰ সà§à¦¤à§°à§° GnuCash উইণà§à¦¡à§‹à¦²à§ˆ নিয়ক."
-#: gnucash/gnome-utils/gnc-main-window.c:388
+#: gnucash/gnome-utils/gnc-main-window.c:390
msgid "Tutorial and Concepts _Guide"
msgstr "নিৰà§à¦¦à§‡à¦¶à¦¨à¦¾ আৰৠধাৰণাবোৰৰ পথ-পà§à§°à¦¦à§°à§à¦¶à¦•"
-#: gnucash/gnome-utils/gnc-main-window.c:389
+#: gnucash/gnome-utils/gnc-main-window.c:391
msgid "Open the GnuCash Tutorial"
msgstr "GnuCash টোৰ নিৰà§à¦¦à§‡à¦¶à¦¨à¦¾ খোলক"
-#: gnucash/gnome-utils/gnc-main-window.c:393
+#: gnucash/gnome-utils/gnc-main-window.c:395
msgid "_Contents"
msgstr "বিষয়বোৰ"
-#: gnucash/gnome-utils/gnc-main-window.c:394
+#: gnucash/gnome-utils/gnc-main-window.c:396
msgid "Open the GnuCash Help"
msgstr "GnuCash সহায়টো খোলক"
-#: gnucash/gnome-utils/gnc-main-window.c:398
+#: gnucash/gnome-utils/gnc-main-window.c:400
msgid "_About"
msgstr "বিষয়ে"
-#: gnucash/gnome-utils/gnc-main-window.c:399
+#: gnucash/gnome-utils/gnc-main-window.c:401
msgid "About GnuCash"
msgstr "GnuCash ৰ বিষয়ে"
-#: gnucash/gnome-utils/gnc-main-window.c:411
+#: gnucash/gnome-utils/gnc-main-window.c:413
msgid "_Toolbar"
msgstr "টà§à¦²à¦¬à¦¾à§°"
-#: gnucash/gnome-utils/gnc-main-window.c:412
+#: gnucash/gnome-utils/gnc-main-window.c:414
msgid "Show/hide the toolbar on this window"
msgstr "à¦à¦‡ উইণà§à¦¡à§‹à¦–নত টà§à¦²à¦¬à¦¾à§°à¦Ÿà§‹ দেখà§à§±à¦¾à¦“ক/লà§à¦•à§à§±à¦¾à¦“ক"
-#: gnucash/gnome-utils/gnc-main-window.c:416
+#: gnucash/gnome-utils/gnc-main-window.c:418
msgid "Su_mmary Bar"
msgstr "সাৰাংশ বাৰ"
-#: gnucash/gnome-utils/gnc-main-window.c:417
+#: gnucash/gnome-utils/gnc-main-window.c:419
msgid "Show/hide the summary bar on this window"
msgstr "à¦à¦‡ উইণà§à¦¡à§‹à¦–নত সাৰাংশ বাৰটো দেখà§à§±à¦¾à¦“ক/লà§à¦•à§à§±à¦¾à¦“ক"
-#: gnucash/gnome-utils/gnc-main-window.c:421
+#: gnucash/gnome-utils/gnc-main-window.c:423
msgid "Stat_us Bar"
msgstr "ষà§à¦Ÿà§‡à¦Ÿà¦¾à¦› বাৰ"
-#: gnucash/gnome-utils/gnc-main-window.c:422
+#: gnucash/gnome-utils/gnc-main-window.c:424
msgid "Show/hide the status bar on this window"
msgstr "à¦à¦‡ উইণà§à¦¡à§‹à¦–নত ষà§à¦Ÿà§‡à¦Ÿà¦¾à¦› বাৰটো দেখà§à§±à¦¾à¦“ক/লà§à¦•à§à§±à¦¾à¦“ক"
-#: gnucash/gnome-utils/gnc-main-window.c:434
+#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gtkbuilder/dialog-preferences.glade:3895
+msgid "To_p"
+msgstr "ওপৰ"
+
+#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
+#: gnucash/gtkbuilder/dialog-preferences.glade:3901
+msgid "Display the notebook tabs at the top of the window."
+msgstr "টোকাবহীটোৰ টেববোৰ উইণà§à¦¡à§‹à¦–নৰ ওপৰত দেখà§à§±à¦¾à¦“ক."
+
+#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gtkbuilder/dialog-preferences.glade:3914
+msgid "B_ottom"
+msgstr "তলত"
+
+#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
+#: gnucash/gtkbuilder/dialog-preferences.glade:3920
+msgid "Display the notebook tabs at the bottom of the window."
+msgstr "টোকাবহীটোৰ টেববোৰ উইণà§à¦¡à§‹à¦–নৰ তলত দেখà§à§±à¦¾à¦“ক."
+
+#: gnucash/gnome-utils/gnc-main-window.c:444
+#: gnucash/gtkbuilder/dialog-preferences.glade:3933
+msgid "_Left"
+msgstr "ৰৈ য়োৱা"
+
+#: gnucash/gnome-utils/gnc-main-window.c:445
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
+#: gnucash/gtkbuilder/dialog-preferences.glade:3939
+msgid "Display the notebook tabs at the left of the window."
+msgstr "টোকাবহীটোৰ টেববোৰ উইণà§à¦¡à§‹à¦–নৰ বাওফালে দেখà§à§±à¦¾à¦“ক."
+
+#: gnucash/gnome-utils/gnc-main-window.c:448
+#: gnucash/gtkbuilder/dialog-preferences.glade:3952
+msgid "_Right"
+msgstr "সোফাল"
+
+#: gnucash/gnome-utils/gnc-main-window.c:449
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
+#: gnucash/gtkbuilder/dialog-preferences.glade:3958
+msgid "Display the notebook tabs at the right of the window."
+msgstr "টোকাবহীটোৰ টেববোৰ উইণà§à¦¡à§‹à¦–নৰ সোà¦à¦«à¦¾à¦²à§‡ দেখà§à§±à¦¾à¦“ক."
+
+#: gnucash/gnome-utils/gnc-main-window.c:462
msgid "Window _1"
msgstr "উইণà§à¦¡à§‹ _1"
-#: gnucash/gnome-utils/gnc-main-window.c:435
+#: gnucash/gnome-utils/gnc-main-window.c:463
msgid "Window _2"
msgstr "উইণà§à¦¡à§‹ _2"
-#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gnome-utils/gnc-main-window.c:464
msgid "Window _3"
msgstr "উইণà§à¦¡à§‹ _3"
-#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gnome-utils/gnc-main-window.c:465
msgid "Window _4"
msgstr "উইণà§à¦¡à§‹ _4"
-#: gnucash/gnome-utils/gnc-main-window.c:438
+#: gnucash/gnome-utils/gnc-main-window.c:466
msgid "Window _5"
msgstr "উইণà§à¦¡à§‹ _5"
-#: gnucash/gnome-utils/gnc-main-window.c:439
+#: gnucash/gnome-utils/gnc-main-window.c:467
msgid "Window _6"
msgstr "উইণà§à¦¡à§‹ _6"
-#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gnome-utils/gnc-main-window.c:468
msgid "Window _7"
msgstr "উইণà§à¦¡à§‹ _7"
-#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gnome-utils/gnc-main-window.c:469
msgid "Window _8"
msgstr "উইণà§à¦¡à§‹ _8"
-#: gnucash/gnome-utils/gnc-main-window.c:442
+#: gnucash/gnome-utils/gnc-main-window.c:470
msgid "Window _9"
msgstr "উইণà§à¦¡à§‹ _9"
-#: gnucash/gnome-utils/gnc-main-window.c:443
+#: gnucash/gnome-utils/gnc-main-window.c:471
msgid "Window _0"
msgstr "উইণà§à¦¡à§‹ _0"
-#: gnucash/gnome-utils/gnc-main-window.c:1258
+#: gnucash/gnome-utils/gnc-main-window.c:1286
#, c-format
msgid "Save changes to file %s before closing?"
msgstr "বনà§à¦§ কৰাৰ আগতে %s ফাইলটোত সলনিবোৰ ছেঠকৰে নে?"
-#: gnucash/gnome-utils/gnc-main-window.c:1261
+#: gnucash/gnome-utils/gnc-main-window.c:1289
#, c-format
msgid ""
"If you don't save, changes from the past %d hours and %d minutes will be "
"discarded."
msgstr "যদি আপà§à¦¨à¦¿ ছেঠনকৰে, শেষৰ %d ঘণà§à¦Ÿà¦¾à¦¬à§‹à§° আৰৠ%d মিনিটবোৰৰ সলনিবোৰ উপকà§à¦·à¦¿à¦¤ হব."
-#: gnucash/gnome-utils/gnc-main-window.c:1263
+#: gnucash/gnome-utils/gnc-main-window.c:1291
#, c-format
msgid ""
"If you don't save, changes from the past %d days and %d hours will be "
"discarded."
msgstr "যদি আপà§à¦¨à¦¿ ছেঠনকৰে, শেষৰ %d দিনবোৰ আৰৠ%d ঘণà§à¦Ÿà¦¾à¦¬à§‹à§°à§° সলনিবোৰ উপকà§à¦·à¦¿à¦¤ হব."
-#: gnucash/gnome-utils/gnc-main-window.c:1312
+#: gnucash/gnome-utils/gnc-main-window.c:1340
msgid "Close _Without Saving"
msgstr "ছেঠনকৰাকৈ বনà§à¦§ কৰক"
-#: gnucash/gnome-utils/gnc-main-window.c:1459
+#: gnucash/gnome-utils/gnc-main-window.c:1487
msgid "This window is closing and will not be restored."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1465
+#: gnucash/gnome-utils/gnc-main-window.c:1493
#, fuzzy
#| msgid "Close this window"
msgid "Close Window?"
@@ -8993,64 +9045,64 @@ msgstr "à¦à¦‡ উইণà§à¦¡à¦Ÿà§‹ বনà§à¦§ কৰক"
#. Translators: This string is shown in the window title if this
#. document is, well, read-only.
-#: gnucash/gnome-utils/gnc-main-window.c:1595
+#: gnucash/gnome-utils/gnc-main-window.c:1623
msgid "(read-only)"
msgstr "(কেৱল পঢ়া)"
-#: gnucash/gnome-utils/gnc-main-window.c:1603
+#: gnucash/gnome-utils/gnc-main-window.c:1631
msgid "Unsaved Book"
msgstr "কিতাপখন ছেঠকৰা নহল"
-#: gnucash/gnome-utils/gnc-main-window.c:1766
+#: gnucash/gnome-utils/gnc-main-window.c:1794
#, fuzzy
msgid "Last modified on %a, %b %d, %Y at %I:%M %p"
msgstr "%a ত শেহতীয়া পৰিৱৰà§à¦¤à¦¨ কৰা হৈছিল, %b %e, %I:%M%P ত %Y"
#. Translators: This message appears in the status bar after opening the file.
-#: gnucash/gnome-utils/gnc-main-window.c:1769
+#: gnucash/gnome-utils/gnc-main-window.c:1797
#, c-format
msgid "File %s opened. %s"
msgstr "%s ফাইলটো খোলা হল. %s"
-#: gnucash/gnome-utils/gnc-main-window.c:2896
+#: gnucash/gnome-utils/gnc-main-window.c:2924
msgctxt "lower case key for short cut to 'Accounts'"
msgid "a"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:2986
+#: gnucash/gnome-utils/gnc-main-window.c:3014
msgid "Unable to save to database."
msgstr "ডাটাবেছলৈ ছেঠকৰিবলৈ সকà§à¦·à¦® নহয়."
-#: gnucash/gnome-utils/gnc-main-window.c:2988
+#: gnucash/gnome-utils/gnc-main-window.c:3016
msgid "Unable to save to database: Book is marked read-only."
msgstr "ডাটাবেছ ছেঠকৰিবলৈ অসমৰà§à¦¥: কিতাপখন কেৱল পঢ়িবৰ বাবে চিহà§à¦¨à¦¿à¦¤ কৰা হৈছে."
-#: gnucash/gnome-utils/gnc-main-window.c:4333
+#: gnucash/gnome-utils/gnc-main-window.c:4396
#: gnucash/gtkbuilder/assistant-qif-import.glade:959
msgid "Book Options"
msgstr "কিতাপৰ বিকলà§à¦ªà¦¬à¦¿à¦²à¦¾à¦•"
-#: gnucash/gnome-utils/gnc-main-window.c:4751 gnucash/gnucash-core-app.cpp:261
+#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
msgstr ""
#. Translators: %s will be replaced with the current year
-#: gnucash/gnome-utils/gnc-main-window.c:4778
+#: gnucash/gnome-utils/gnc-main-window.c:4880
#, c-format
msgid "Copyright © 1997-%s The GnuCash contributors."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4790
+#: gnucash/gnome-utils/gnc-main-window.c:4892
#: gnucash/gnome-utils/gnc-splash.c:98
msgid "Version"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4791
+#: gnucash/gnome-utils/gnc-main-window.c:4893
#: gnucash/gnome-utils/gnc-splash.c:99 gnucash/gnucash-core-app.cpp:278
msgid "Build ID"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4799
+#: gnucash/gnome-utils/gnc-main-window.c:4901
#, fuzzy
msgid "Accounting for personal and small business finance."
msgstr "- GnuCash বà§à¦¯à¦•à§à¦¤à¦¿ আৰৠকà§à¦·à§à¦¦à§à§° বà§à¦¯à§±à¦¸à¦¾à§Ÿà§€ বিতà§à¦¤à§€à§Ÿ পৰিচালনা"
@@ -9059,11 +9111,11 @@ msgstr "- GnuCash বà§à¦¯à¦•à§à¦¤à¦¿ আৰৠকà§à¦·à§à¦¦à§à§° বà§
#. Enter your name or that of your team and an email contact for feedback.
#. The string can have multiple rows, so you can also add a list of
#. contributors.
-#: gnucash/gnome-utils/gnc-main-window.c:4808
+#: gnucash/gnome-utils/gnc-main-window.c:4910
msgid "translator-credits"
msgstr "Parimal Khade <parimalk at cdac.in>, 2014"
-#: gnucash/gnome-utils/gnc-main-window.c:4811
+#: gnucash/gnome-utils/gnc-main-window.c:4913
msgid "Visit the GnuCash website."
msgstr ""
@@ -9606,7 +9658,7 @@ msgid "Dist"
msgstr "ডিষà§à¦Ÿ"
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:45
-#: gnucash/import-export/import-main-matcher.c:1594
+#: gnucash/import-export/import-main-matcher.c:1862
#: gnucash/report/reports/standard/register.scm:218
#: libgnucash/engine/Split.c:1614 libgnucash/engine/Split.c:1631
msgid "-- Split Transaction --"
@@ -10212,12 +10264,12 @@ msgid "Enter the effective share price"
msgstr "পà§à§°à¦à¦¾à§±à¦¿à¦¤ শà§à¦¬à§‡à§Ÿà¦¾à§°à§° দামটো à¦à§°à¦¾à¦“ক"
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3323
-#: gnucash/register/ledger-core/split-register-model.c:2380
+#: gnucash/register/ledger-core/split-register-model.c:2385
msgid "Enter credit formula for real transaction"
msgstr "পà§à§°à¦•à§ƒà¦¤ লেনদেনৰ কৰণে দিবলগীয়াৰ সূতà§à§°à¦Ÿà§‹ à¦à§°à¦¾à¦“ক"
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3333
-#: gnucash/register/ledger-core/split-register-model.c:2346
+#: gnucash/register/ledger-core/split-register-model.c:2349
msgid "Enter debit formula for real transaction"
msgstr "পà§à§°à¦•à§ƒà¦¤ লেনদেনৰ কৰণে ঋণৰ সূতà§à§°à¦Ÿà§‹ à¦à§°à¦¾à¦“ক"
@@ -11968,11 +12020,6 @@ msgstr ""
"যদি সকà§à§°à¦¿à§Ÿ হয়, আৰমà§à¦à¦¨à¦¿à¦¤à§‡ à¦à¦–ন সà§à¦ªà§à¦²à¦¾à¦› সà§à¦•à§à§°à§€à¦£ দেখà§à¦“ৱা হব. অথবা কোনো সà§à¦ªà§à¦²à¦¾à¦› সà§à¦•à§à§°à§€à¦£ "
"দেখà§à¦“ৱা নহব. "
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
-#: gnucash/gtkbuilder/dialog-preferences.glade:3901
-msgid "Display the notebook tabs at the top of the window."
-msgstr "টোকাবহীটোৰ টেববোৰ উইণà§à¦¡à§‹à¦–নৰ ওপৰত দেখà§à§±à¦¾à¦“ক."
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:196
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:201
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:206
@@ -11985,21 +12032,6 @@ msgstr ""
"à¦à¦‡ ছেটিংটোৱে টোকাবহীবোৰত ছà§à¦‡à¦š কৰা পৃষà§à¦ াবোৰৰ কৰণে টেববোৰ টনা দাà¦à¦¤à¦¿à¦Ÿà§‹ নিৰà§à¦§à¦¾à§°à¦£ "
"কৰে. সমà§à¦à¦¾à§±à§à¦¯ মূলà§à¦¯à¦¬à§‹à§° হল \"ওপৰ\" আৰৠ\"তল\". ই \"তল\" লৈ ডিফলà§à¦Ÿ হয়. "
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
-#: gnucash/gtkbuilder/dialog-preferences.glade:3920
-msgid "Display the notebook tabs at the bottom of the window."
-msgstr "টোকাবহীটোৰ টেববোৰ উইণà§à¦¡à§‹à¦–নৰ তলত দেখà§à§±à¦¾à¦“ক."
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
-#: gnucash/gtkbuilder/dialog-preferences.glade:3939
-msgid "Display the notebook tabs at the left of the window."
-msgstr "টোকাবহীটোৰ টেববোৰ উইণà§à¦¡à§‹à¦–নৰ বাওফালে দেখà§à§±à¦¾à¦“ক."
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
-#: gnucash/gtkbuilder/dialog-preferences.glade:3958
-msgid "Display the notebook tabs at the right of the window."
-msgstr "টোকাবহীটোৰ টেববোৰ উইণà§à¦¡à§‹à¦–নৰ সোà¦à¦«à¦¾à¦²à§‡ দেখà§à§±à¦¾à¦“ক."
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:215
#: gnucash/gtkbuilder/dialog-preferences.glade:3990
msgid "Display the summary bar at the top of the page."
@@ -13599,7 +13631,7 @@ msgid "Select a row to change the mappings"
msgstr ""
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:970
-#: gnucash/import-export/import-account-matcher.c:188
+#: gnucash/import-export/import-account-matcher.c:197
msgid "Account ID"
msgstr "à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ ID"
@@ -14632,6 +14664,7 @@ msgid "_Amount"
msgstr "পৰিমাণ:"
#: gnucash/gtkbuilder/assistant-stock-split.glade:293
+#: gnucash/gtkbuilder/dialog-import.glade:958
#: gnucash/gtkbuilder/dialog-print-check.glade:1129
#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:957
msgid "_Memo"
@@ -15040,6 +15073,7 @@ msgid "_Account code"
msgstr "_à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ কোড"
#: gnucash/gtkbuilder/dialog-account.glade:1251
+#: gnucash/gtkbuilder/dialog-import.glade:930
msgid "_Description"
msgstr "_বিৱৰণ"
@@ -16337,46 +16371,59 @@ msgstr "হালধীয়া"
msgid "Green"
msgstr "সেউজীয়া"
-#: gnucash/gtkbuilder/dialog-import.glade:877
+#: gnucash/gtkbuilder/dialog-import.glade:871
+#, fuzzy
+#| msgid "Do not print transaction detail"
+msgid "Edit imported transaction details"
+msgstr "লেনদেনৰ সমà§à¦ªà§‚ৰà§à¦£ বিৱৰণ পà§à§°à¦¿à¦£à§à¦Ÿ নকৰিব"
+
+#: gnucash/gtkbuilder/dialog-import.glade:944
+#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
+#: gnucash/gtkbuilder/dialog-print-check.glade:745
+#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
+msgid "_Notes"
+msgstr "_টোকাবোৰ"
+
+#: gnucash/gtkbuilder/dialog-import.glade:1022
#, fuzzy
msgid ""
"List of downloaded transactions (source split and matched information shown)"
msgstr "ডউনলোড কৰা লেনদেনবোৰৰ তালিকা (উতà§à¦¸à§° সà§à¦ªà§à¦²à¦¿à¦Ÿ দেখà§à§±à¦¾à§Ÿ)"
-#: gnucash/gtkbuilder/dialog-import.glade:919
+#: gnucash/gtkbuilder/dialog-import.glade:1064
#, fuzzy
msgid "Show _Account column"
msgstr "টেববোৰত à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ ৰংটো দেখà§à§±à¦¾à¦“ক"
-#: gnucash/gtkbuilder/dialog-import.glade:935
+#: gnucash/gtkbuilder/dialog-import.glade:1080
#, fuzzy
msgid "Show _Memo column"
msgstr "টেববোৰত à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ ৰংটো দেখà§à§±à¦¾à¦“ক"
-#: gnucash/gtkbuilder/dialog-import.glade:951
+#: gnucash/gtkbuilder/dialog-import.glade:1096
#, fuzzy
msgid "Show matched _information"
msgstr "ৰছিদৰ তথà§à¦¯"
-#: gnucash/gtkbuilder/dialog-import.glade:966
+#: gnucash/gtkbuilder/dialog-import.glade:1111
#, fuzzy
#| msgid "Spend"
msgid "A_ppend"
msgstr "বà§à¦¯à§Ÿ কৰক"
-#: gnucash/gtkbuilder/dialog-import.glade:970
+#: gnucash/gtkbuilder/dialog-import.glade:1115
msgid ""
"When Updating and Clearing a matched transaction, append the imported "
"Description and Notes to the matched Description and Notes instead of "
"replacing them."
msgstr ""
-#: gnucash/gtkbuilder/dialog-import.glade:982
+#: gnucash/gtkbuilder/dialog-import.glade:1127
#, fuzzy
msgid "_Reconcile after match"
msgstr "মিল পà§à¦¨à§°à¦¸à¦‚যোজন (সà§à¦¬à§Ÿà¦‚কà§à§°à¦¿à§Ÿ)"
-#: gnucash/gtkbuilder/dialog-import.glade:1005
+#: gnucash/gtkbuilder/dialog-import.glade:1150
msgid "Generic import transaction matcher"
msgstr "বৰà§à¦—ীয় আমাদানিৰ লেনদেনৰ মিলকৰà§à¦¤à¦¾"
@@ -16492,12 +16539,6 @@ msgstr "আলোকিত কৰা হোৱা গোটটো ডিলি
msgid "Enter a name for the highlighted lot."
msgstr "আলোকিত কৰা হোৱা গোটটোৰ কাৰণে à¦à¦Ÿà¦¾ নাম à¦à§°à¦¾à¦“ক."
-#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
-#: gnucash/gtkbuilder/dialog-print-check.glade:745
-#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
-msgid "_Notes"
-msgstr "_টোকাবোৰ"
-
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:174
msgid "Enter any notes you want to make about this lot."
msgstr "আপà§à¦¨à¦¿ à¦à¦‡ গোটটোত কৰিব খোজা কামৰ যিকোনো টোকা à¦à¦Ÿà¦¾ à¦à§°à¦¾à¦“ক. "
@@ -17557,22 +17598,6 @@ msgstr "শেহতীয়া টেবটো সনà§à¦®à§‚খলৈ আনক
msgid "<b>Tab Position</b>"
msgstr "<b>টেবৰ সà§à¦¥à¦¾à¦¨</b>"
-#: gnucash/gtkbuilder/dialog-preferences.glade:3895
-msgid "To_p"
-msgstr "ওপৰ"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3914
-msgid "B_ottom"
-msgstr "তলত"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3933
-msgid "_Left"
-msgstr "ৰৈ য়োৱা"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3952
-msgid "_Right"
-msgstr "সোফাল"
-
#: gnucash/gtkbuilder/dialog-preferences.glade:3974
msgid "<b>Summary Bar Position</b>"
msgstr "<b>সাৰাংশ বাৰৰ সà§à¦¥à¦¾à¦¨</b>"
@@ -19462,15 +19487,15 @@ msgstr "PDF ফাইললৈ ৰপà§à¦¤à¦¾à¦¨à¦¿ কৰক"
msgid "Bank code %s (%s), Account %s (%s)"
msgstr ""
-#: gnucash/import-export/aqb/assistant-ab-initial.c:858
+#: gnucash/import-export/aqb/assistant-ab-initial.c:859
msgid "Online Banking Account Name"
msgstr "অনলাইন বেংক à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿà§° নাম"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:863
+#: gnucash/import-export/aqb/assistant-ab-initial.c:864
msgid "GnuCash Account Name"
msgstr "GnuCash à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿà§° নাম"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:869
+#: gnucash/import-export/aqb/assistant-ab-initial.c:870
#: gnucash/import-export/qif-imp/assistant-qif-import.c:572
#: gnucash/import-export/qif-imp/dialog-account-picker.c:452
msgid "New?"
@@ -21664,7 +21689,7 @@ msgstr "গà§à§°à¦¾à¦¹à¦•à¦¬à§‹à§° আৰৠবà§à¦¯à§±à¦¸à¦¾à§Ÿà§€à¦¬à§‹à§°
msgid "Import Customers and Vendors from a CSV text file."
msgstr "টেকà§à¦¸à¦Ÿ ফাইলৰ পৰা গà§à§°à¦¾à¦¹à¦• বা বà§à¦¯à§±à¦¸à¦¾à§Ÿà§€à¦¬à§‹à§° আমদানি কৰক"
-#: gnucash/import-export/import-account-matcher.c:263
+#: gnucash/import-export/import-account-matcher.c:272
#, fuzzy, c-format
msgid ""
"The account '%s' is a placeholder account and does not allow transactions. "
@@ -21673,7 +21698,7 @@ msgstr ""
"%s à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦Ÿà§‹ à¦à¦Ÿà¦¾ সà§à¦¥à¦¾à¦¨-অধিকাৰকৰà§à¦¤à¦¾à§° à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ আৰৠই লেনদেনবোৰৰ অনà§à¦®à¦¤à¦¿ নিদিয়ে. অনà§à¦—à§à§°à¦¹ "
"কৰি à¦à¦Ÿà¦¾ বেলেগ à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ পছনà§à¦¦ কৰক."
-#: gnucash/import-export/import-account-matcher.c:280
+#: gnucash/import-export/import-account-matcher.c:289
#, fuzzy, c-format
msgid ""
"The account '%s' has a different commodity to the one required, '%s'. Please "
@@ -21682,7 +21707,7 @@ msgstr ""
"%s à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦Ÿà§‹ à¦à¦Ÿà¦¾ সà§à¦¥à¦¾à¦¨-অধিকাৰকৰà§à¦¤à¦¾à§° à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ আৰৠই লেনদেনবোৰৰ অনà§à¦®à¦¤à¦¿ নিদিয়ে. অনà§à¦—à§à§°à¦¹ "
"কৰি à¦à¦Ÿà¦¾ বেলেগ à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ পছনà§à¦¦ কৰক."
-#: gnucash/import-export/import-account-matcher.c:472
+#: gnucash/import-export/import-account-matcher.c:481
msgid "(Full account ID: "
msgstr "(সমà§à¦ªà§‚ৰà§à¦£ à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ ID: "
@@ -21712,139 +21737,127 @@ msgstr "y/m/d"
msgid "y/d/m"
msgstr "y/d/m"
-#: gnucash/import-export/import-main-matcher.c:462
+#: gnucash/import-export/import-main-matcher.c:518
#, fuzzy
msgid "No new transactions were found in this import."
msgstr "লেনদেনটো URI à¦à¦Ÿà¦¾à§° সৈতে জড়িত নহয়."
-#: gnucash/import-export/import-main-matcher.c:630
-#: gnucash/import-export/import-main-matcher.c:783
+#: gnucash/import-export/import-main-matcher.c:687
+#: gnucash/import-export/import-main-matcher.c:840
msgid "Destination account for the auto-balance split."
msgstr "সà§à¦¬à§Ÿà¦‚কà§à§°à¦¿à§Ÿ-পৰিমাণ সà§à¦ªà§à¦²à¦¿à¦Ÿà§° কাৰণে লকà§à¦·à§à¦¯à¦¸à§à¦¥à¦¾à¦¨ à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ "
-#: gnucash/import-export/import-main-matcher.c:943
-#, fuzzy
-#| msgid "Enter the Entry Description"
-msgid "Enter new Description"
-msgstr "পà§à§°à§±à¦¿à¦·à§à¦Ÿà¦¿à§° বিৱৰণ à¦à§°à¦¾à¦“ক"
-
-#: gnucash/import-export/import-main-matcher.c:958
-#, fuzzy
-#| msgid "Enter Due Date"
-msgid "Enter new Memo"
-msgstr "দিবলগীয়া তাৰিখটো à¦à§°à¦¾à¦“ক"
-
-#: gnucash/import-export/import-main-matcher.c:971
+#: gnucash/import-export/import-main-matcher.c:1026
+#: gnucash/report/html-utilities.scm:338
+#: gnucash/report/reports/standard/balsheet-pnl.scm:154
+#: gnucash/report/reports/standard/new-owner-report.scm:942
#, fuzzy
-msgid "Enter new Notes"
-msgstr "বাহিৰা টোকাবোৰ"
+msgid "Disabled"
+msgstr "সকà§à¦·à¦® কৰা হল"
-#: gnucash/import-export/import-main-matcher.c:1097
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1321
#, fuzzy
-msgid "Assign a transfer account to the selection."
+msgid "_Assign a transfer account to the selection"
msgstr "আপà§à¦¨à¦¿ à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ শৃংখলৰ পৰা বদলি à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ à¦à¦Ÿà¦¾ নিৰà§à¦¬à¦¾à¦šà¦¨ কৰাটো অপৰিহাৰà§à¦¯à§à¦¯."
-#: gnucash/import-export/import-main-matcher.c:1108
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1368
#, fuzzy
-#| msgid "description"
-msgid "Edit description."
-msgstr "বিৱৰণ"
-
-#: gnucash/import-export/import-main-matcher.c:1116
-#, fuzzy
-#| msgid "Edit Job"
-msgid "Edit memo."
-msgstr "কাম সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ কৰক"
+msgid "_Edit description, notes, or memo"
+msgstr "বিৱৰণ / টোকাবোৰ / মেমো"
-#: gnucash/import-export/import-main-matcher.c:1124
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1377
#, fuzzy
-msgid "Edit notes."
-msgstr "পাবলগীয়াৰ টোকা"
+#| msgid "Reset defaults"
+msgid "_Reset all edits"
+msgstr "ডিফলà§à¦Ÿà¦¬à§‹à§° ৰিছেট কৰক "
-#: gnucash/import-export/import-main-matcher.c:1286
+#: gnucash/import-export/import-main-matcher.c:1547
#, fuzzy
#| msgid "A"
msgctxt "Column header for 'Adding transaction'"
msgid "A"
msgstr "A"
-#: gnucash/import-export/import-main-matcher.c:1289
+#: gnucash/import-export/import-main-matcher.c:1550
#, fuzzy
msgctxt "Column header for 'Updating plus Clearing transaction'"
msgid "U+C"
msgstr "U+R"
-#: gnucash/import-export/import-main-matcher.c:1293
+#: gnucash/import-export/import-main-matcher.c:1554
#, fuzzy
#| msgid "C"
msgctxt "Column header for 'Clearing transaction'"
msgid "C"
msgstr "C"
-#: gnucash/import-export/import-main-matcher.c:1300
+#: gnucash/import-export/import-main-matcher.c:1561
msgid "Info"
msgstr "তথà§à¦¯"
-#: gnucash/import-export/import-main-matcher.c:1307
+#: gnucash/import-export/import-main-matcher.c:1568
#: gnucash/report/stylesheets/head-or-tail.scm:102
#, fuzzy
msgid "Additional Comments"
msgstr "কাৰà§à¦¡à§° অতিৰিকà§à¦¤:"
-#: gnucash/import-export/import-main-matcher.c:1700
+#: gnucash/import-export/import-main-matcher.c:1987
msgid "New, already balanced"
msgstr "নতà§à¦¨, ইতিমধà§à¦¯à§‡ সমতা কৰা হল"
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1726
+#: gnucash/import-export/import-main-matcher.c:2013
#, c-format
msgid "New, transfer %s to (manual) \"%s\""
msgstr "নতà§à¦¨, %s ক (মেনà§à§±à§‡à¦²) \"%s\" লৈ বদলি কৰক"
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1734
+#: gnucash/import-export/import-main-matcher.c:2021
#, c-format
msgid "New, transfer %s to (auto) \"%s\""
msgstr "নতà§à¦¨, %s ক (সà§à¦¬à§Ÿà¦‚কà§à§°à¦¿à§Ÿ) \"%s\" লৈ বদলি কৰক"
#. Translators: %s is the amount to be transferred.
-#: gnucash/import-export/import-main-matcher.c:1745
+#: gnucash/import-export/import-main-matcher.c:2032
#, c-format
msgid "New, UNBALANCED (need acct to transfer %s)!"
msgstr "নতà§à¦¨, UNBALANCED (à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿà¦Ÿà§‹ %s লৈ বদলি কৰাৰ পà§à§°à§Ÿà§‹à¦œà¦¨)!"
-#: gnucash/import-export/import-main-matcher.c:1763
+#: gnucash/import-export/import-main-matcher.c:2050
#, fuzzy, c-format
#| msgid "Reconcile (manual) match"
msgid "Reconcile (manual) match to %s"
msgstr "মিল পà§à¦¨à§°à¦¸à¦‚যোজন (মেনà§à§±à§‡à¦²) কৰক"
-#: gnucash/import-export/import-main-matcher.c:1768
+#: gnucash/import-export/import-main-matcher.c:2055
#, fuzzy, c-format
#| msgid "Reconcile (auto) match"
msgid "Reconcile (auto) match to %s"
msgstr "মিল পà§à¦¨à§°à¦¸à¦‚যোজন (সà§à¦¬à§Ÿà¦‚কà§à§°à¦¿à§Ÿ)"
-#: gnucash/import-export/import-main-matcher.c:1777
-#: gnucash/import-export/import-main-matcher.c:1807
+#: gnucash/import-export/import-main-matcher.c:2064
+#: gnucash/import-export/import-main-matcher.c:2094
msgid "Match missing!"
msgstr "মিল কৰাত বà§à¦¯à§°à§à¦¥!"
-#: gnucash/import-export/import-main-matcher.c:1793
+#: gnucash/import-export/import-main-matcher.c:2080
#, fuzzy, c-format
#| msgid "Update and reconcile (manual) match"
msgid "Update and reconcile (manual) match to %s"
msgstr "মিল আপডেট আৰৠপà§à¦¨à§°à¦¸à¦‚যোজন (মেনà§à§±à§‡à¦²) কৰক"
-#: gnucash/import-export/import-main-matcher.c:1798
+#: gnucash/import-export/import-main-matcher.c:2085
#, fuzzy, c-format
#| msgid "Update and reconcile (auto) match"
msgid "Update and reconcile (auto) match to %s"
msgstr "মিল আপডেট আৰৠপà§à¦¨à§°à¦¸à¦‚যোজন (সà§à¦¬à§Ÿà¦‚কà§à§°à¦¿à§Ÿ)"
-#: gnucash/import-export/import-main-matcher.c:1815
+#: gnucash/import-export/import-main-matcher.c:2102
msgid "Do not import (no action selected)"
msgstr "আমদানি কৰা নহয় (কোনো কাৰà§à¦¯à§à¦¯ নিৰà§à¦¬à¦¾à¦šà¦¿à¦¤ কৰা নহল)"
@@ -23237,13 +23250,6 @@ msgstr[1] "সালসলনিৰ হাৰ"
msgid "No budgets exist. You must create at least one budget."
msgstr "কোনো বাজেট বৰà§à¦¤à¦¿ থকা নাই. আপà§à¦¨à¦¿ অতিকমেও à¦à¦–ন বাজেট তৈয়াৰ কৰাটো অপৰিহাৰà§à¦¯."
-#: gnucash/report/html-utilities.scm:338
-#: gnucash/report/reports/standard/balsheet-pnl.scm:154
-#: gnucash/report/reports/standard/new-owner-report.scm:942
-#, fuzzy
-msgid "Disabled"
-msgstr "সকà§à¦·à¦® কৰা হল"
-
#: gnucash/report/html-utilities.scm:391
msgid "This report requires you to specify certain report options."
msgstr "à¦à¦‡ ৰিপোৰà§à¦Ÿà¦Ÿà§‹à§±à§‡ কিছà§à¦®à¦¾à¦¨ ৰিপোৰà§à¦Ÿà§° বিকলà§à¦ª আপোনাক নিৰà§à¦§à¦¾à§°à¦£ কৰিবলৈ কয়. "
@@ -30243,23 +30249,23 @@ msgstr "সাংখিক à¦à§‚ল"
#. Translators: A list of error messages from the Scheduled Transactions (SX).
#. They might appear in their editor or in "Since last run".
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1018
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1019
#, c-format
msgid "Unknown account for guid [%s], cancelling SX [%s] creation."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1071
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1074
#, c-format
msgid "Error parsing SX [%s] key [%s]=formula [%s] at [%s]: %s."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1125
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1788
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1130
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1793
#, c-format
msgid "Error %d in SX [%s] final gnc_numeric value, using 0 instead."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1797
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1802
#, c-format
msgid "No exchange rate available in SX [%s] for %s -> %s, value is zero."
msgstr ""
@@ -30746,11 +30752,11 @@ msgctxt ""
msgid "Split"
msgstr "সà§à¦ªà§à¦²à¦¿à¦Ÿ"
-#: libgnucash/engine/Transaction.c:2784
+#: libgnucash/engine/Transaction.c:2807
msgid "Voided transaction"
msgstr "শূনà§à¦¯ লেনদেন কৰা হল"
-#: libgnucash/engine/Transaction.c:2800
+#: libgnucash/engine/Transaction.c:2823
msgid "Transaction Voided"
msgstr "লেনদেন শূনà§à¦¯ কৰা হল"
diff --git a/po/az.po b/po/az.po
index a7bea2666..cfdd88c50 100644
--- a/po/az.po
+++ b/po/az.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GnuCash 4.11-1\n"
+"Project-Id-Version: GnuCash 4.11-2\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
-"POT-Creation-Date: 2022-07-17 04:04+0200\n"
+"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2001-11-27 17:55+0200\n"
"Last-Translator: Vasif İsmayıloğlu MD <azerb_linux at hotmail.com>\n"
"Language-Team: Azerbaijani <linuxaz at azerimail.net>\n"
@@ -873,7 +873,7 @@ msgstr ""
#: gnucash/import-export/csv-exp/csv-transactions-export.c:622
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:53
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:63
-#: gnucash/import-export/import-main-matcher.c:1280
+#: gnucash/import-export/import-main-matcher.c:1541
#: gnucash/import-export/import-match-picker.c:393
#: gnucash/import-export/import-match-picker.c:433
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3700
@@ -975,7 +975,7 @@ msgstr ""
#: gnucash/import-export/aqb/gnc-ab-utils.c:559
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:147
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:70
-#: gnucash/import-export/import-main-matcher.c:1281
+#: gnucash/import-export/import-main-matcher.c:1542
#: gnucash/import-export/import-match-picker.c:392
#: gnucash/import-export/qif-imp/dialog-account-picker.c:433
#: gnucash/register/ledger-core/split-register-model.c:342
@@ -1228,8 +1228,8 @@ msgstr ""
#: gnucash/gnome-utils/gnc-file.c:118 gnucash/gnome-utils/gnc-file.c:366
#: gnucash/gnome-utils/gnc-file.c:664 gnucash/gnome-utils/gnc-gui-query.c:300
#: gnucash/gnome-utils/gnc-gui-query.c:332
-#: gnucash/gnome-utils/gnc-main-window.c:1313
-#: gnucash/gnome-utils/gnc-main-window.c:1470
+#: gnucash/gnome-utils/gnc-main-window.c:1341
+#: gnucash/gnome-utils/gnc-main-window.c:1498
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:886
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1023
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1063
@@ -1258,7 +1258,8 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-fincalc.glade:137
#: gnucash/gtkbuilder/dialog-import.glade:46
#: gnucash/gtkbuilder/dialog-import.glade:328
-#: gnucash/gtkbuilder/dialog-import.glade:1040
+#: gnucash/gtkbuilder/dialog-import.glade:885
+#: gnucash/gtkbuilder/dialog-import.glade:1185
#: gnucash/gtkbuilder/dialog-invoice.glade:674
#: gnucash/gtkbuilder/dialog-invoice.glade:1198
#: gnucash/gtkbuilder/dialog-job.glade:41
@@ -1488,7 +1489,7 @@ msgstr "Yeni Hesab"
#: gnucash/gnome-utils/gnc-gui-query.c:297
#: gnucash/gnome-utils/gnc-gui-query.c:331
#: gnucash/gnome-utils/gnc-gui-query.c:417
-#: gnucash/gnome-utils/gnc-main-window.c:1471
+#: gnucash/gnome-utils/gnc-main-window.c:1499
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:196
#: gnucash/gtkbuilder/dialog-account.glade:35
#: gnucash/gtkbuilder/dialog-account.glade:832
@@ -1511,7 +1512,8 @@ msgstr "Yeni Hesab"
#: gnucash/gtkbuilder/dialog-import.glade:61
#: gnucash/gtkbuilder/dialog-import.glade:188
#: gnucash/gtkbuilder/dialog-import.glade:343
-#: gnucash/gtkbuilder/dialog-import.glade:1056
+#: gnucash/gtkbuilder/dialog-import.glade:899
+#: gnucash/gtkbuilder/dialog-import.glade:1201
#: gnucash/gtkbuilder/dialog-invoice.glade:690
#: gnucash/gtkbuilder/dialog-invoice.glade:1213
#: gnucash/gtkbuilder/dialog-job.glade:57
@@ -1637,7 +1639,7 @@ msgstr "Transaksiya Raportu"
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-exp/csv-tree-export.c:156
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:65
-#: gnucash/import-export/import-main-matcher.c:1284
+#: gnucash/import-export/import-main-matcher.c:1545
#: gnucash/import-export/import-match-picker.c:395
#: gnucash/import-export/import-match-picker.c:435
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3710
@@ -1719,7 +1721,7 @@ msgid "Username"
msgstr "İstifadəçi Adı:"
#: gnucash/gnome/dialog-employee.c:732 gnucash/gnome/dialog-sx-editor2.c:1755
-#: gnucash/gnome/dialog-sx-editor.c:1817 gnucash/gnome/dialog-tax-info.c:1200
+#: gnucash/gnome/dialog-sx-editor.c:1823 gnucash/gnome/dialog-tax-info.c:1200
#: gnucash/gnome-utils/gnc-dense-cal.c:350
#: gnucash/gnome-utils/gnc-tree-model-budget.c:96
#: gnucash/gnome-utils/gnc-tree-view-commodity.c:368
@@ -1853,7 +1855,7 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-payment.glade:418
#: gnucash/gtkbuilder/dialog-transfer.glade:102
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:54
-#: gnucash/import-export/import-main-matcher.c:1283
+#: gnucash/import-export/import-main-matcher.c:1544
#: gnucash/import-export/import-match-picker.c:394
#: gnucash/import-export/import-match-picker.c:434
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3721
@@ -1990,7 +1992,7 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-transfer.glade:205
#: gnucash/import-export/csv-exp/csv-transactions-export.c:626
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:74
-#: gnucash/import-export/import-main-matcher.c:1285
+#: gnucash/import-export/import-main-matcher.c:1546
#: gnucash/import-export/import-match-picker.c:396
#: gnucash/import-export/import-match-picker.c:436
#: gnucash/register/ledger-core/split-register-model.c:356
@@ -2999,7 +3001,7 @@ msgstr ""
#: gnucash/gnome/dialog-sx-editor2.c:165 gnucash/gnome/dialog-sx-editor.c:167
#: gnucash/gnome/gnc-plugin-page-sx-list.c:151
#: gnucash/gnome/window-reconcile2.c:2187 gnucash/gnome/window-reconcile.c:2449
-#: gnucash/gnome-utils/gnc-main-window.c:277
+#: gnucash/gnome-utils/gnc-main-window.c:278
#: gnucash/gtkbuilder/dialog-billterms.glade:679
#: gnucash/gtkbuilder/dialog-commodities.glade:156
#: gnucash/gtkbuilder/dialog-price.glade:858
@@ -3016,13 +3018,13 @@ msgid "_Transaction"
msgstr ""
#: gnucash/gnome/dialog-sx-editor2.c:167 gnucash/gnome/dialog-sx-editor.c:169
-#: gnucash/gnome-utils/gnc-main-window.c:278
+#: gnucash/gnome-utils/gnc-main-window.c:279
#, fuzzy
msgid "_View"
msgstr "_Yeni"
#: gnucash/gnome/dialog-sx-editor2.c:168 gnucash/gnome/dialog-sx-editor.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:279
+#: gnucash/gnome-utils/gnc-main-window.c:280
#, fuzzy
msgid "_Actions"
msgstr "GediÅŸ"
@@ -3042,7 +3044,7 @@ msgstr ""
msgid "Couldn't parse debit formula for split \"%s\"."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:874
+#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:880
#: gnucash/gnome/dialog-sx-from-trans.c:261
msgid ""
"The Scheduled Transaction Editor cannot automatically balance this "
@@ -3097,18 +3099,18 @@ msgid ""
"revoke them."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1406
+#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1412
#, fuzzy
msgid "(never)"
msgstr "(heç biri)"
-#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1568
+#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1574
msgid ""
"The current template transaction has been changed. Would you like to record "
"the changes?"
msgstr ""
-#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1844
+#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1850
#: gnucash/gnome/gnc-plugin-page-sx-list.c:246
#: gnucash/gnome/gnc-plugin-page-sx-list.c:252
msgid "Scheduled Transactions"
@@ -3120,30 +3122,30 @@ msgid ""
"cannot be automatically created."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:675
+#: gnucash/gnome/dialog-sx-editor.c:679
#, c-format
msgid "Couldn't parse %s for split \"%s\"."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:739
+#: gnucash/gnome/dialog-sx-editor.c:745
#, c-format
msgid "Split with memo %s has an invalid account."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:742
+#: gnucash/gnome/dialog-sx-editor.c:748
msgid "Invalid Account in Split"
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:754
+#: gnucash/gnome/dialog-sx-editor.c:760
#, c-format
msgid "Split with memo %s has an unparsable Credit Formula."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:757 gnucash/gnome/dialog-sx-editor.c:773
+#: gnucash/gnome/dialog-sx-editor.c:763 gnucash/gnome/dialog-sx-editor.c:779
msgid "Unparsable Formula in Split"
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:770
+#: gnucash/gnome/dialog-sx-editor.c:776
#, c-format
msgid "Split with memo %s has an unparsable Debit Formula."
msgstr ""
@@ -3399,7 +3401,7 @@ msgstr ""
#: gnucash/gnome/gnc-plugin-basic-commands.c:121
#: gnucash/gnome-utils/gnc-file.c:100 gnucash/gnome-utils/gnc-file.c:666
-#: gnucash/gnome-utils/gnc-main-window.c:1314
+#: gnucash/gnome-utils/gnc-main-window.c:1342
#: gnucash/html/gnc-html-webkit1.c:1198
#, fuzzy
msgid "_Save"
@@ -4017,7 +4019,7 @@ msgstr ""
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:185
#: gnucash/gnome/gnc-plugin-page-register2.c:340
#: gnucash/gnome/gnc-plugin-page-register.c:463
-#: gnucash/gnome-utils/gnc-main-window.c:349
+#: gnucash/gnome-utils/gnc-main-window.c:351
msgid "_Filter By..."
msgstr ""
@@ -4029,7 +4031,7 @@ msgstr ""
#: gnucash/gnome/gnc-plugin-page-register.c:467
#: gnucash/gnome/gnc-plugin-page-report.c:1231
#: gnucash/gnome/gnc-plugin-page-sx-list.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:353
+#: gnucash/gnome-utils/gnc-main-window.c:355
#, fuzzy
msgid "_Refresh"
msgstr "_Raportlar"
@@ -4041,7 +4043,7 @@ msgstr "_Raportlar"
#: gnucash/gnome/gnc-plugin-page-register.c:468
#: gnucash/gnome/gnc-plugin-page-report.c:1232
#: gnucash/gnome/gnc-plugin-page-sx-list.c:171
-#: gnucash/gnome-utils/gnc-main-window.c:354
+#: gnucash/gnome-utils/gnc-main-window.c:356
msgid "Refresh this window"
msgstr ""
@@ -4461,7 +4463,7 @@ msgstr ""
#: gnucash/gnome/gnc-plugin-page-register2.c:240
#: gnucash/gnome/gnc-plugin-page-register.c:354
#: gnucash/gnome/gnc-plugin-page-report.c:1226
-#: gnucash/gnome-utils/gnc-main-window.c:332
+#: gnucash/gnome-utils/gnc-main-window.c:333
#, fuzzy
msgid "_Paste"
msgstr "_Sonraya burax"
@@ -5282,7 +5284,7 @@ msgstr "Çap Et"
#: gnucash/gnome/gnc-plugin-page-register2.c:230
#: gnucash/gnome/gnc-plugin-page-register.c:344
#: gnucash/gnome/gnc-plugin-page-report.c:1216
-#: gnucash/gnome-utils/gnc-main-window.c:322
+#: gnucash/gnome-utils/gnc-main-window.c:323
#, fuzzy
msgid "Cu_t"
msgstr "Xüsusi"
@@ -5290,28 +5292,28 @@ msgstr "Xüsusi"
#: gnucash/gnome/gnc-plugin-page-register2.c:231
#: gnucash/gnome/gnc-plugin-page-register.c:345
#: gnucash/gnome/gnc-plugin-page-report.c:1217
-#: gnucash/gnome-utils/gnc-main-window.c:323
+#: gnucash/gnome-utils/gnc-main-window.c:324
msgid "Cut the current selection and copy it to clipboard"
msgstr ""
#: gnucash/gnome/gnc-plugin-page-register2.c:235
#: gnucash/gnome/gnc-plugin-page-register.c:349
#: gnucash/gnome/gnc-plugin-page-report.c:1221
-#: gnucash/gnome-utils/gnc-main-window.c:327
+#: gnucash/gnome-utils/gnc-main-window.c:328
msgid "_Copy"
msgstr ""
#: gnucash/gnome/gnc-plugin-page-register2.c:236
#: gnucash/gnome/gnc-plugin-page-register.c:350
#: gnucash/gnome/gnc-plugin-page-report.c:1222
-#: gnucash/gnome-utils/gnc-main-window.c:328
+#: gnucash/gnome-utils/gnc-main-window.c:329
msgid "Copy the current selection to clipboard"
msgstr ""
#: gnucash/gnome/gnc-plugin-page-register2.c:241
#: gnucash/gnome/gnc-plugin-page-register.c:355
#: gnucash/gnome/gnc-plugin-page-report.c:1227
-#: gnucash/gnome-utils/gnc-main-window.c:333
+#: gnucash/gnome-utils/gnc-main-window.c:334
msgid "Paste the clipboard content at the cursor position"
msgstr ""
@@ -5776,7 +5778,7 @@ msgid "Remo_ve Other Splits"
msgstr "Sil"
#: gnucash/gnome/gnc-plugin-page-register.c:459
-#: gnucash/gnome-utils/gnc-main-window.c:345
+#: gnucash/gnome-utils/gnc-main-window.c:347
msgid "_Sort By..."
msgstr ""
@@ -6796,7 +6798,7 @@ msgstr ""
#: gnucash/gnome/window-reconcile2.c:2129
#: gnucash/gnome/window-reconcile2.c:2210 gnucash/gnome/window-reconcile.c:2391
#: gnucash/gnome/window-reconcile.c:2472
-#: gnucash/gnome-utils/gnc-main-window.c:285
+#: gnucash/gnome-utils/gnc-main-window.c:286
#: gnucash/gtkbuilder/dialog-account.glade:1121
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:23
#: gnucash/gtkbuilder/dialog-book-close.glade:22
@@ -6806,7 +6808,7 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-custom-report.glade:29
#: gnucash/gtkbuilder/dialog-employee.glade:23
#: gnucash/gtkbuilder/dialog-fincalc.glade:107
-#: gnucash/gtkbuilder/dialog-import.glade:1023
+#: gnucash/gtkbuilder/dialog-import.glade:1168
#: gnucash/gtkbuilder/dialog-invoice.glade:657
#: gnucash/gtkbuilder/dialog-job.glade:24
#: gnucash/gtkbuilder/dialog-options.glade:21
@@ -6870,7 +6872,7 @@ msgid "Edit the main account for this register"
msgstr ""
#: gnucash/gnome/window-reconcile2.c:2173 gnucash/gnome/window-reconcile.c:2435
-#: gnucash/gnome-utils/gnc-main-window.c:360
+#: gnucash/gnome-utils/gnc-main-window.c:362
msgid "_Check & Repair"
msgstr ""
@@ -7640,7 +7642,7 @@ msgid "_Save As"
msgstr "Qeyd Et"
#: gnucash/gnome-utils/dialog-options.c:225
-#: gnucash/gnome-utils/gnc-main-window.c:309
+#: gnucash/gnome-utils/gnc-main-window.c:310
#: gnucash/gtkbuilder/dialog-billterms.glade:731
#: gnucash/gtkbuilder/dialog-commodities.glade:174
#: gnucash/gtkbuilder/dialog-custom-report.glade:46
@@ -8185,7 +8187,7 @@ msgstr ""
msgid "(unnamed)"
msgstr "(heç biri)"
-#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:289
+#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:290
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
#: gnucash/import-export/customer-import/gnc-plugin-customer-import.c:57
#, fuzzy
@@ -8204,7 +8206,7 @@ msgstr "Ä°xrac Et"
msgid "Save"
msgstr "Qeyd Et"
-#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:290
+#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:291
#, fuzzy
msgid "_Export"
msgstr "Ä°xrac Et"
@@ -8435,7 +8437,7 @@ msgid "Save changes to the file?"
msgstr ""
#: gnucash/gnome-utils/gnc-file.c:656
-#: gnucash/gnome-utils/gnc-main-window.c:1307
+#: gnucash/gnome-utils/gnc-main-window.c:1335
#, c-format
msgid "If you don't save, changes from the past %d minute will be discarded."
msgid_plural ""
@@ -8485,7 +8487,7 @@ msgstr "Yeni Hesab"
msgid "Open _Folder"
msgstr ""
-#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:314
+#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:315
#, fuzzy
msgid "_Quit"
msgstr "_Düzəlt"
@@ -8524,7 +8526,7 @@ msgid ""
msgstr ""
#: gnucash/gnome-utils/gnc-file.c:1701
-#: gnucash/gnome-utils/gnc-main-window.c:1275
+#: gnucash/gnome-utils/gnc-main-window.c:1303
#, fuzzy
msgid "<unknown>"
msgstr "NamÉ™'lum"
@@ -8571,313 +8573,364 @@ msgstr ""
msgid "Changes will be saved automatically in %u seconds"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:276
+#: gnucash/gnome-utils/gnc-main-window.c:277
#, fuzzy
msgid "_File"
msgstr "GiriÅŸ"
-#: gnucash/gnome-utils/gnc-main-window.c:280
+#: gnucash/gnome-utils/gnc-main-window.c:281
#, fuzzy
msgid "Tra_nsaction"
msgstr "Transaksiya Raportu"
-#: gnucash/gnome-utils/gnc-main-window.c:281
+#: gnucash/gnome-utils/gnc-main-window.c:282
#, fuzzy
msgid "_Reports"
msgstr "_Raportlar"
-#: gnucash/gnome-utils/gnc-main-window.c:282
+#: gnucash/gnome-utils/gnc-main-window.c:283
#, fuzzy
msgid "_Tools"
msgstr "_Vasitələr"
-#: gnucash/gnome-utils/gnc-main-window.c:283
+#: gnucash/gnome-utils/gnc-main-window.c:284
msgid "E_xtensions"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:284
+#: gnucash/gnome-utils/gnc-main-window.c:285
#, fuzzy
msgid "_Windows"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:292
+#: gnucash/gnome-utils/gnc-main-window.c:293
#, fuzzy
msgid "_Print..."
msgstr "Çap Et"
-#: gnucash/gnome-utils/gnc-main-window.c:293
+#: gnucash/gnome-utils/gnc-main-window.c:294
msgid "Print the currently active page"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:299
+#: gnucash/gnome-utils/gnc-main-window.c:300
#, fuzzy
msgid "Pa_ge Setup..."
msgstr "Dayan"
-#: gnucash/gnome-utils/gnc-main-window.c:300
+#: gnucash/gnome-utils/gnc-main-window.c:301
msgid "Specify the page size and orientation for printing"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:304
+#: gnucash/gnome-utils/gnc-main-window.c:305
msgid "Proper_ties"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:305
+#: gnucash/gnome-utils/gnc-main-window.c:306
msgid "Edit the properties of the current file"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:310
+#: gnucash/gnome-utils/gnc-main-window.c:311
msgid "Close the currently active page"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:315
+#: gnucash/gnome-utils/gnc-main-window.c:316
msgid "Quit this application"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:337
+#: gnucash/gnome-utils/gnc-main-window.c:338
#, fuzzy
msgid "Pr_eferences"
msgstr "Seçənəklər"
-#: gnucash/gnome-utils/gnc-main-window.c:338
+#: gnucash/gnome-utils/gnc-main-window.c:339
msgid "Edit the global preferences of GnuCash"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:346
+#: gnucash/gnome-utils/gnc-main-window.c:345
+#, fuzzy
+msgid "Tab P_osition"
+msgstr "Transaksiya Raportu"
+
+#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:350
+#: gnucash/gnome-utils/gnc-main-window.c:352
msgid "Select the account types that should be displayed."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:362
+#: gnucash/gnome-utils/gnc-main-window.c:364
msgid "Reset _Warnings..."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:363
+#: gnucash/gnome-utils/gnc-main-window.c:365
msgid "Reset the state of all warning messages so they will be shown again."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:367
+#: gnucash/gnome-utils/gnc-main-window.c:369
msgid "Re_name Page"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:368
+#: gnucash/gnome-utils/gnc-main-window.c:370
msgid "Rename this page."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:375
+#: gnucash/gnome-utils/gnc-main-window.c:377
#, fuzzy
msgid "_New Window"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:376
+#: gnucash/gnome-utils/gnc-main-window.c:378
msgid "Open a new top-level GnuCash window."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:380
+#: gnucash/gnome-utils/gnc-main-window.c:382
msgid "New Window with _Page"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:381
+#: gnucash/gnome-utils/gnc-main-window.c:383
msgid "Move the current page to a new top-level GnuCash window."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:388
+#: gnucash/gnome-utils/gnc-main-window.c:390
msgid "Tutorial and Concepts _Guide"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:389
+#: gnucash/gnome-utils/gnc-main-window.c:391
msgid "Open the GnuCash Tutorial"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:393
+#: gnucash/gnome-utils/gnc-main-window.c:395
#, fuzzy
msgid "_Contents"
msgstr "Santimetr"
-#: gnucash/gnome-utils/gnc-main-window.c:394
+#: gnucash/gnome-utils/gnc-main-window.c:396
msgid "Open the GnuCash Help"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:398
+#: gnucash/gnome-utils/gnc-main-window.c:400
#, fuzzy
msgid "_About"
msgstr "Hesab"
-#: gnucash/gnome-utils/gnc-main-window.c:399
+#: gnucash/gnome-utils/gnc-main-window.c:401
msgid "About GnuCash"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:411
+#: gnucash/gnome-utils/gnc-main-window.c:413
#, fuzzy
msgid "_Toolbar"
msgstr "_Vasitələr"
-#: gnucash/gnome-utils/gnc-main-window.c:412
+#: gnucash/gnome-utils/gnc-main-window.c:414
msgid "Show/hide the toolbar on this window"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:416
+#: gnucash/gnome-utils/gnc-main-window.c:418
msgid "Su_mmary Bar"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:417
+#: gnucash/gnome-utils/gnc-main-window.c:419
msgid "Show/hide the summary bar on this window"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:421
+#: gnucash/gnome-utils/gnc-main-window.c:423
msgid "Stat_us Bar"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:422
+#: gnucash/gnome-utils/gnc-main-window.c:424
msgid "Show/hide the status bar on this window"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:434
+#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gtkbuilder/dialog-preferences.glade:3895
+#, fuzzy
+msgid "To_p"
+msgstr "Ãœst"
+
+#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
+#: gnucash/gtkbuilder/dialog-preferences.glade:3901
+msgid "Display the notebook tabs at the top of the window."
+msgstr ""
+
+#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gtkbuilder/dialog-preferences.glade:3914
+#, fuzzy
+msgid "B_ottom"
+msgstr "Alt"
+
+#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
+#: gnucash/gtkbuilder/dialog-preferences.glade:3920
+msgid "Display the notebook tabs at the bottom of the window."
+msgstr ""
+
+#: gnucash/gnome-utils/gnc-main-window.c:444
+#: gnucash/gtkbuilder/dialog-preferences.glade:3933
+msgid "_Left"
+msgstr ""
+
+#: gnucash/gnome-utils/gnc-main-window.c:445
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
+#: gnucash/gtkbuilder/dialog-preferences.glade:3939
+msgid "Display the notebook tabs at the left of the window."
+msgstr ""
+
+#: gnucash/gnome-utils/gnc-main-window.c:448
+#: gnucash/gtkbuilder/dialog-preferences.glade:3952
+msgid "_Right"
+msgstr ""
+
+#: gnucash/gnome-utils/gnc-main-window.c:449
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
+#: gnucash/gtkbuilder/dialog-preferences.glade:3958
+msgid "Display the notebook tabs at the right of the window."
+msgstr ""
+
+#: gnucash/gnome-utils/gnc-main-window.c:462
#, fuzzy
msgid "Window _1"
msgstr "pəncərə1"
-#: gnucash/gnome-utils/gnc-main-window.c:435
+#: gnucash/gnome-utils/gnc-main-window.c:463
#, fuzzy
msgid "Window _2"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gnome-utils/gnc-main-window.c:464
#, fuzzy
msgid "Window _3"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gnome-utils/gnc-main-window.c:465
#, fuzzy
msgid "Window _4"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:438
+#: gnucash/gnome-utils/gnc-main-window.c:466
#, fuzzy
msgid "Window _5"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:439
+#: gnucash/gnome-utils/gnc-main-window.c:467
#, fuzzy
msgid "Window _6"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gnome-utils/gnc-main-window.c:468
#, fuzzy
msgid "Window _7"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gnome-utils/gnc-main-window.c:469
#, fuzzy
msgid "Window _8"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:442
+#: gnucash/gnome-utils/gnc-main-window.c:470
#, fuzzy
msgid "Window _9"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:443
+#: gnucash/gnome-utils/gnc-main-window.c:471
#, fuzzy
msgid "Window _0"
msgstr "_Pəncərə"
-#: gnucash/gnome-utils/gnc-main-window.c:1258
+#: gnucash/gnome-utils/gnc-main-window.c:1286
#, c-format
msgid "Save changes to file %s before closing?"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1261
+#: gnucash/gnome-utils/gnc-main-window.c:1289
#, c-format
msgid ""
"If you don't save, changes from the past %d hours and %d minutes will be "
"discarded."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1263
+#: gnucash/gnome-utils/gnc-main-window.c:1291
#, c-format
msgid ""
"If you don't save, changes from the past %d days and %d hours will be "
"discarded."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1312
+#: gnucash/gnome-utils/gnc-main-window.c:1340
msgid "Close _Without Saving"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1459
+#: gnucash/gnome-utils/gnc-main-window.c:1487
msgid "This window is closing and will not be restored."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1465
+#: gnucash/gnome-utils/gnc-main-window.c:1493
#, fuzzy
msgid "Close Window?"
msgstr "_Pəncərə"
#. Translators: This string is shown in the window title if this
#. document is, well, read-only.
-#: gnucash/gnome-utils/gnc-main-window.c:1595
+#: gnucash/gnome-utils/gnc-main-window.c:1623
msgid "(read-only)"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1603
+#: gnucash/gnome-utils/gnc-main-window.c:1631
#, fuzzy
msgid "Unsaved Book"
msgstr "Qapat"
-#: gnucash/gnome-utils/gnc-main-window.c:1766
+#: gnucash/gnome-utils/gnc-main-window.c:1794
msgid "Last modified on %a, %b %d, %Y at %I:%M %p"
msgstr ""
#. Translators: This message appears in the status bar after opening the file.
-#: gnucash/gnome-utils/gnc-main-window.c:1769
+#: gnucash/gnome-utils/gnc-main-window.c:1797
#, c-format
msgid "File %s opened. %s"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:2896
+#: gnucash/gnome-utils/gnc-main-window.c:2924
msgctxt "lower case key for short cut to 'Accounts'"
msgid "a"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:2986
+#: gnucash/gnome-utils/gnc-main-window.c:3014
msgid "Unable to save to database."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:2988
+#: gnucash/gnome-utils/gnc-main-window.c:3016
msgid "Unable to save to database: Book is marked read-only."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4333
+#: gnucash/gnome-utils/gnc-main-window.c:4396
#: gnucash/gtkbuilder/assistant-qif-import.glade:959
#, fuzzy
msgid "Book Options"
msgstr "Seçənəklər"
-#: gnucash/gnome-utils/gnc-main-window.c:4751 gnucash/gnucash-core-app.cpp:261
+#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
msgstr ""
#. Translators: %s will be replaced with the current year
-#: gnucash/gnome-utils/gnc-main-window.c:4778
+#: gnucash/gnome-utils/gnc-main-window.c:4880
#, c-format
msgid "Copyright © 1997-%s The GnuCash contributors."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4790
+#: gnucash/gnome-utils/gnc-main-window.c:4892
#: gnucash/gnome-utils/gnc-splash.c:98
msgid "Version"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4791
+#: gnucash/gnome-utils/gnc-main-window.c:4893
#: gnucash/gnome-utils/gnc-splash.c:99 gnucash/gnucash-core-app.cpp:278
msgid "Build ID"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4799
+#: gnucash/gnome-utils/gnc-main-window.c:4901
msgid "Accounting for personal and small business finance."
msgstr ""
@@ -8885,13 +8938,13 @@ msgstr ""
#. Enter your name or that of your team and an email contact for feedback.
#. The string can have multiple rows, so you can also add a list of
#. contributors.
-#: gnucash/gnome-utils/gnc-main-window.c:4808
+#: gnucash/gnome-utils/gnc-main-window.c:4910
msgid "translator-credits"
msgstr ""
"Vasif İsmayıloğlu MD, 2001\n"
"Language-Team: Azerbaijani <linuxaz at azerimail.net>"
-#: gnucash/gnome-utils/gnc-main-window.c:4811
+#: gnucash/gnome-utils/gnc-main-window.c:4913
msgid "Visit the GnuCash website."
msgstr ""
@@ -9430,7 +9483,7 @@ msgid "Dist"
msgstr ""
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:45
-#: gnucash/import-export/import-main-matcher.c:1594
+#: gnucash/import-export/import-main-matcher.c:1862
#: gnucash/report/reports/standard/register.scm:218
#: libgnucash/engine/Split.c:1614 libgnucash/engine/Split.c:1631
msgid "-- Split Transaction --"
@@ -10057,12 +10110,12 @@ msgid "Enter the effective share price"
msgstr ""
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3323
-#: gnucash/register/ledger-core/split-register-model.c:2380
+#: gnucash/register/ledger-core/split-register-model.c:2385
msgid "Enter credit formula for real transaction"
msgstr ""
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3333
-#: gnucash/register/ledger-core/split-register-model.c:2346
+#: gnucash/register/ledger-core/split-register-model.c:2349
msgid "Enter debit formula for real transaction"
msgstr ""
@@ -11561,11 +11614,6 @@ msgid ""
"screen will be shown."
msgstr ""
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
-#: gnucash/gtkbuilder/dialog-preferences.glade:3901
-msgid "Display the notebook tabs at the top of the window."
-msgstr ""
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:196
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:201
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:206
@@ -11576,21 +11624,6 @@ msgid ""
"\"right\". It defaults to \"top\"."
msgstr ""
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
-#: gnucash/gtkbuilder/dialog-preferences.glade:3920
-msgid "Display the notebook tabs at the bottom of the window."
-msgstr ""
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
-#: gnucash/gtkbuilder/dialog-preferences.glade:3939
-msgid "Display the notebook tabs at the left of the window."
-msgstr ""
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
-#: gnucash/gtkbuilder/dialog-preferences.glade:3958
-msgid "Display the notebook tabs at the right of the window."
-msgstr ""
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:215
#: gnucash/gtkbuilder/dialog-preferences.glade:3990
msgid "Display the summary bar at the top of the page."
@@ -13005,7 +13038,7 @@ msgid "Select a row to change the mappings"
msgstr ""
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:970
-#: gnucash/import-export/import-account-matcher.c:188
+#: gnucash/import-export/import-account-matcher.c:197
#, fuzzy
msgid "Account ID"
msgstr "Hesab"
@@ -13856,6 +13889,7 @@ msgid "_Amount"
msgstr "Miqdar:"
#: gnucash/gtkbuilder/assistant-stock-split.glade:293
+#: gnucash/gtkbuilder/dialog-import.glade:958
#: gnucash/gtkbuilder/dialog-print-check.glade:1129
#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:957
#, fuzzy
@@ -14245,6 +14279,7 @@ msgid "_Account code"
msgstr "Hesab Adı"
#: gnucash/gtkbuilder/dialog-account.glade:1251
+#: gnucash/gtkbuilder/dialog-import.glade:930
msgid "_Description"
msgstr "Ä°zahat"
@@ -15512,43 +15547,56 @@ msgstr ""
msgid "Green"
msgstr "Yaşıl"
-#: gnucash/gtkbuilder/dialog-import.glade:877
+#: gnucash/gtkbuilder/dialog-import.glade:871
+#, fuzzy
+msgid "Edit imported transaction details"
+msgstr "Transaksiya Raportu"
+
+#: gnucash/gtkbuilder/dialog-import.glade:944
+#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
+#: gnucash/gtkbuilder/dialog-print-check.glade:745
+#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
+#, fuzzy
+msgid "_Notes"
+msgstr "Qeydlər"
+
+#: gnucash/gtkbuilder/dialog-import.glade:1022
msgid ""
"List of downloaded transactions (source split and matched information shown)"
msgstr ""
-#: gnucash/gtkbuilder/dialog-import.glade:919
+#: gnucash/gtkbuilder/dialog-import.glade:1064
#, fuzzy
msgid "Show _Account column"
msgstr "Yeni Hesab"
-#: gnucash/gtkbuilder/dialog-import.glade:935
+#: gnucash/gtkbuilder/dialog-import.glade:1080
#, fuzzy
msgid "Show _Memo column"
msgstr "Yeni Hesab"
-#: gnucash/gtkbuilder/dialog-import.glade:951
+#: gnucash/gtkbuilder/dialog-import.glade:1096
#, fuzzy
msgid "Show matched _information"
msgstr "Ãœmumi MÉ™'lumat"
-#: gnucash/gtkbuilder/dialog-import.glade:966
+#: gnucash/gtkbuilder/dialog-import.glade:1111
msgid "A_ppend"
msgstr ""
-#: gnucash/gtkbuilder/dialog-import.glade:970
+#: gnucash/gtkbuilder/dialog-import.glade:1115
msgid ""
"When Updating and Clearing a matched transaction, append the imported "
"Description and Notes to the matched Description and Notes instead of "
"replacing them."
msgstr ""
-#: gnucash/gtkbuilder/dialog-import.glade:982
+#: gnucash/gtkbuilder/dialog-import.glade:1127
#, fuzzy
msgid "_Reconcile after match"
msgstr "Yeni Hesab"
-#: gnucash/gtkbuilder/dialog-import.glade:1005
+#: gnucash/gtkbuilder/dialog-import.glade:1150
msgid "Generic import transaction matcher"
msgstr ""
@@ -15663,13 +15711,6 @@ msgstr ""
msgid "Enter a name for the highlighted lot."
msgstr ""
-#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
-#: gnucash/gtkbuilder/dialog-print-check.glade:745
-#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
-#, fuzzy
-msgid "_Notes"
-msgstr "Qeydlər"
-
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:174
msgid "Enter any notes you want to make about this lot."
msgstr ""
@@ -16670,24 +16711,6 @@ msgstr ""
msgid "<b>Tab Position</b>"
msgstr ""
-#: gnucash/gtkbuilder/dialog-preferences.glade:3895
-#, fuzzy
-msgid "To_p"
-msgstr "Ãœst"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3914
-#, fuzzy
-msgid "B_ottom"
-msgstr "Alt"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3933
-msgid "_Left"
-msgstr ""
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3952
-msgid "_Right"
-msgstr ""
-
#: gnucash/gtkbuilder/dialog-preferences.glade:3974
msgid "<b>Summary Bar Position</b>"
msgstr ""
@@ -18606,17 +18629,17 @@ msgstr ""
msgid "Bank code %s (%s), Account %s (%s)"
msgstr ""
-#: gnucash/import-export/aqb/assistant-ab-initial.c:858
+#: gnucash/import-export/aqb/assistant-ab-initial.c:859
#, fuzzy
msgid "Online Banking Account Name"
msgstr "Hesab adı"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:863
+#: gnucash/import-export/aqb/assistant-ab-initial.c:864
#, fuzzy
msgid "GnuCash Account Name"
msgstr "Hesab adı"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:869
+#: gnucash/import-export/aqb/assistant-ab-initial.c:870
#: gnucash/import-export/qif-imp/assistant-qif-import.c:572
#: gnucash/import-export/qif-imp/dialog-account-picker.c:452
msgid "New?"
@@ -20575,21 +20598,21 @@ msgstr ""
msgid "Import Customers and Vendors from a CSV text file."
msgstr ""
-#: gnucash/import-export/import-account-matcher.c:263
+#: gnucash/import-export/import-account-matcher.c:272
#, c-format
msgid ""
"The account '%s' is a placeholder account and does not allow transactions. "
"Please choose a different account."
msgstr ""
-#: gnucash/import-export/import-account-matcher.c:280
+#: gnucash/import-export/import-account-matcher.c:289
#, c-format
msgid ""
"The account '%s' has a different commodity to the one required, '%s'. Please "
"choose a different account."
msgstr ""
-#: gnucash/import-export/import-account-matcher.c:472
+#: gnucash/import-export/import-account-matcher.c:481
msgid "(Full account ID: "
msgstr ""
@@ -20616,124 +20639,115 @@ msgstr ""
msgid "y/d/m"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:462
+#: gnucash/import-export/import-main-matcher.c:518
#, fuzzy
msgid "No new transactions were found in this import."
msgstr "Transaksiya Raportu"
-#: gnucash/import-export/import-main-matcher.c:630
-#: gnucash/import-export/import-main-matcher.c:783
+#: gnucash/import-export/import-main-matcher.c:687
+#: gnucash/import-export/import-main-matcher.c:840
msgid "Destination account for the auto-balance split."
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:943
-#, fuzzy
-msgid "Enter new Description"
-msgstr "Ä°zahat"
-
-#: gnucash/import-export/import-main-matcher.c:958
-#, fuzzy
-msgid "Enter new Memo"
-msgstr "Tarix"
-
-#: gnucash/import-export/import-main-matcher.c:971
+#: gnucash/import-export/import-main-matcher.c:1026
+#: gnucash/report/html-utilities.scm:338
+#: gnucash/report/reports/standard/balsheet-pnl.scm:154
+#: gnucash/report/reports/standard/new-owner-report.scm:942
#, fuzzy
-msgid "Enter new Notes"
-msgstr "Qeydlər"
+msgid "Disabled"
+msgstr "Cədvəl"
-#: gnucash/import-export/import-main-matcher.c:1097
-msgid "Assign a transfer account to the selection."
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1321
+msgid "_Assign a transfer account to the selection"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1108
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1368
#, fuzzy
-msgid "Edit description."
+msgid "_Edit description, notes, or memo"
msgstr "Ä°zahat"
-#: gnucash/import-export/import-main-matcher.c:1116
-#, fuzzy
-msgid "Edit memo."
-msgstr "Düzəlt"
-
-#: gnucash/import-export/import-main-matcher.c:1124
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1377
#, fuzzy
-msgid "Edit notes."
-msgstr "Yeni Hesab"
+msgid "_Reset all edits"
+msgstr "Qeydiyyatçılar"
-#: gnucash/import-export/import-main-matcher.c:1286
+#: gnucash/import-export/import-main-matcher.c:1547
msgctxt "Column header for 'Adding transaction'"
msgid "A"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1289
+#: gnucash/import-export/import-main-matcher.c:1550
msgctxt "Column header for 'Updating plus Clearing transaction'"
msgid "U+C"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1293
+#: gnucash/import-export/import-main-matcher.c:1554
msgctxt "Column header for 'Clearing transaction'"
msgid "C"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1300
+#: gnucash/import-export/import-main-matcher.c:1561
msgid "Info"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1307
+#: gnucash/import-export/import-main-matcher.c:1568
#: gnucash/report/stylesheets/head-or-tail.scm:102
msgid "Additional Comments"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1700
+#: gnucash/import-export/import-main-matcher.c:1987
msgid "New, already balanced"
msgstr ""
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1726
+#: gnucash/import-export/import-main-matcher.c:2013
#, c-format
msgid "New, transfer %s to (manual) \"%s\""
msgstr ""
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1734
+#: gnucash/import-export/import-main-matcher.c:2021
#, c-format
msgid "New, transfer %s to (auto) \"%s\""
msgstr ""
#. Translators: %s is the amount to be transferred.
-#: gnucash/import-export/import-main-matcher.c:1745
+#: gnucash/import-export/import-main-matcher.c:2032
#, c-format
msgid "New, UNBALANCED (need acct to transfer %s)!"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1763
+#: gnucash/import-export/import-main-matcher.c:2050
#, fuzzy, c-format
msgid "Reconcile (manual) match to %s"
msgstr "Yeni Hesab"
-#: gnucash/import-export/import-main-matcher.c:1768
+#: gnucash/import-export/import-main-matcher.c:2055
#, fuzzy, c-format
msgid "Reconcile (auto) match to %s"
msgstr "Yeni Hesab"
-#: gnucash/import-export/import-main-matcher.c:1777
-#: gnucash/import-export/import-main-matcher.c:1807
+#: gnucash/import-export/import-main-matcher.c:2064
+#: gnucash/import-export/import-main-matcher.c:2094
msgid "Match missing!"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1793
+#: gnucash/import-export/import-main-matcher.c:2080
#, c-format
msgid "Update and reconcile (manual) match to %s"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1798
+#: gnucash/import-export/import-main-matcher.c:2085
#, c-format
msgid "Update and reconcile (auto) match to %s"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1815
+#: gnucash/import-export/import-main-matcher.c:2102
msgid "Do not import (no action selected)"
msgstr ""
@@ -22075,13 +22089,6 @@ msgstr[1] ""
msgid "No budgets exist. You must create at least one budget."
msgstr ""
-#: gnucash/report/html-utilities.scm:338
-#: gnucash/report/reports/standard/balsheet-pnl.scm:154
-#: gnucash/report/reports/standard/new-owner-report.scm:942
-#, fuzzy
-msgid "Disabled"
-msgstr "Cədvəl"
-
#: gnucash/report/html-utilities.scm:391
msgid "This report requires you to specify certain report options."
msgstr ""
@@ -28911,23 +28918,23 @@ msgstr ""
#. Translators: A list of error messages from the Scheduled Transactions (SX).
#. They might appear in their editor or in "Since last run".
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1018
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1019
#, c-format
msgid "Unknown account for guid [%s], cancelling SX [%s] creation."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1071
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1074
#, c-format
msgid "Error parsing SX [%s] key [%s]=formula [%s] at [%s]: %s."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1125
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1788
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1130
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1793
#, c-format
msgid "Error %d in SX [%s] final gnc_numeric value, using 0 instead."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1797
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1802
#, c-format
msgid "No exchange rate available in SX [%s] for %s -> %s, value is zero."
msgstr ""
@@ -29394,11 +29401,11 @@ msgctxt ""
msgid "Split"
msgstr "_Sil"
-#: libgnucash/engine/Transaction.c:2784
+#: libgnucash/engine/Transaction.c:2807
msgid "Voided transaction"
msgstr ""
-#: libgnucash/engine/Transaction.c:2800
+#: libgnucash/engine/Transaction.c:2823
#, fuzzy
msgid "Transaction Voided"
msgstr "Transaksiya Raportu"
diff --git a/po/bg.po b/po/bg.po
index 20b42bd7f..d36cdb092 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,10 +8,10 @@
# Kamen Naydenov
msgid ""
msgstr ""
-"Project-Id-Version: GnuCash 4.11-1\n"
+"Project-Id-Version: GnuCash 4.11-2\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
-"POT-Creation-Date: 2022-07-17 04:04+0200\n"
+"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2011-10-25 13:27+0200\n"
"Last-Translator: Rosi Dimova <pocu at bk.ru>\n"
"Language-Team: Bulgarian <dict at fsa-bg.org>\n"
@@ -972,7 +972,7 @@ msgstr "Калкулатор за изплащане на заем"
#: gnucash/import-export/csv-exp/csv-transactions-export.c:622
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:53
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:63
-#: gnucash/import-export/import-main-matcher.c:1280
+#: gnucash/import-export/import-main-matcher.c:1541
#: gnucash/import-export/import-match-picker.c:393
#: gnucash/import-export/import-match-picker.c:433
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3700
@@ -1075,7 +1075,7 @@ msgstr "Грешка при добавÑне на цена."
#: gnucash/import-export/aqb/gnc-ab-utils.c:559
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:147
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:70
-#: gnucash/import-export/import-main-matcher.c:1281
+#: gnucash/import-export/import-main-matcher.c:1542
#: gnucash/import-export/import-match-picker.c:392
#: gnucash/import-export/qif-imp/dialog-account-picker.c:433
#: gnucash/register/ledger-core/split-register-model.c:342
@@ -1332,8 +1332,8 @@ msgstr "Изтриване на инвеÑтиционна Ñтока?"
#: gnucash/gnome-utils/gnc-file.c:118 gnucash/gnome-utils/gnc-file.c:366
#: gnucash/gnome-utils/gnc-file.c:664 gnucash/gnome-utils/gnc-gui-query.c:300
#: gnucash/gnome-utils/gnc-gui-query.c:332
-#: gnucash/gnome-utils/gnc-main-window.c:1313
-#: gnucash/gnome-utils/gnc-main-window.c:1470
+#: gnucash/gnome-utils/gnc-main-window.c:1341
+#: gnucash/gnome-utils/gnc-main-window.c:1498
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:886
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1023
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1063
@@ -1362,7 +1362,8 @@ msgstr "Изтриване на инвеÑтиционна Ñтока?"
#: gnucash/gtkbuilder/dialog-fincalc.glade:137
#: gnucash/gtkbuilder/dialog-import.glade:46
#: gnucash/gtkbuilder/dialog-import.glade:328
-#: gnucash/gtkbuilder/dialog-import.glade:1040
+#: gnucash/gtkbuilder/dialog-import.glade:885
+#: gnucash/gtkbuilder/dialog-import.glade:1185
#: gnucash/gtkbuilder/dialog-invoice.glade:674
#: gnucash/gtkbuilder/dialog-invoice.glade:1198
#: gnucash/gtkbuilder/dialog-job.glade:41
@@ -1594,7 +1595,7 @@ msgstr "Избор на Ñметка"
#: gnucash/gnome-utils/gnc-gui-query.c:297
#: gnucash/gnome-utils/gnc-gui-query.c:331
#: gnucash/gnome-utils/gnc-gui-query.c:417
-#: gnucash/gnome-utils/gnc-main-window.c:1471
+#: gnucash/gnome-utils/gnc-main-window.c:1499
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:196
#: gnucash/gtkbuilder/dialog-account.glade:35
#: gnucash/gtkbuilder/dialog-account.glade:832
@@ -1617,7 +1618,8 @@ msgstr "Избор на Ñметка"
#: gnucash/gtkbuilder/dialog-import.glade:61
#: gnucash/gtkbuilder/dialog-import.glade:188
#: gnucash/gtkbuilder/dialog-import.glade:343
-#: gnucash/gtkbuilder/dialog-import.glade:1056
+#: gnucash/gtkbuilder/dialog-import.glade:899
+#: gnucash/gtkbuilder/dialog-import.glade:1201
#: gnucash/gtkbuilder/dialog-invoice.glade:690
#: gnucash/gtkbuilder/dialog-invoice.glade:1213
#: gnucash/gtkbuilder/dialog-job.glade:57
@@ -1747,7 +1749,7 @@ msgstr "Отчет на транзакции"
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-exp/csv-tree-export.c:156
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:65
-#: gnucash/import-export/import-main-matcher.c:1284
+#: gnucash/import-export/import-main-matcher.c:1545
#: gnucash/import-export/import-match-picker.c:395
#: gnucash/import-export/import-match-picker.c:435
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3710
@@ -1829,7 +1831,7 @@ msgid "Username"
msgstr "ПотребителÑко име"
#: gnucash/gnome/dialog-employee.c:732 gnucash/gnome/dialog-sx-editor2.c:1755
-#: gnucash/gnome/dialog-sx-editor.c:1817 gnucash/gnome/dialog-tax-info.c:1200
+#: gnucash/gnome/dialog-sx-editor.c:1823 gnucash/gnome/dialog-tax-info.c:1200
#: gnucash/gnome-utils/gnc-dense-cal.c:350
#: gnucash/gnome-utils/gnc-tree-model-budget.c:96
#: gnucash/gnome-utils/gnc-tree-view-commodity.c:368
@@ -1969,7 +1971,7 @@ msgstr "СтойноÑÑ‚ на акциите"
#: gnucash/gtkbuilder/dialog-payment.glade:418
#: gnucash/gtkbuilder/dialog-transfer.glade:102
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:54
-#: gnucash/import-export/import-main-matcher.c:1283
+#: gnucash/import-export/import-main-matcher.c:1544
#: gnucash/import-export/import-match-picker.c:394
#: gnucash/import-export/import-match-picker.c:434
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3721
@@ -2105,7 +2107,7 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-transfer.glade:205
#: gnucash/import-export/csv-exp/csv-transactions-export.c:626
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:74
-#: gnucash/import-export/import-main-matcher.c:1285
+#: gnucash/import-export/import-main-matcher.c:1546
#: gnucash/import-export/import-match-picker.c:396
#: gnucash/import-export/import-match-picker.c:436
#: gnucash/register/ledger-core/split-register-model.c:356
@@ -3101,7 +3103,7 @@ msgstr "Име на таблица ÑÑŠÑ Ñтилове"
#: gnucash/gnome/dialog-sx-editor2.c:165 gnucash/gnome/dialog-sx-editor.c:167
#: gnucash/gnome/gnc-plugin-page-sx-list.c:151
#: gnucash/gnome/window-reconcile2.c:2187 gnucash/gnome/window-reconcile.c:2449
-#: gnucash/gnome-utils/gnc-main-window.c:277
+#: gnucash/gnome-utils/gnc-main-window.c:278
#: gnucash/gtkbuilder/dialog-billterms.glade:679
#: gnucash/gtkbuilder/dialog-commodities.glade:156
#: gnucash/gtkbuilder/dialog-price.glade:858
@@ -3117,12 +3119,12 @@ msgid "_Transaction"
msgstr "_ТранзакциÑ"
#: gnucash/gnome/dialog-sx-editor2.c:167 gnucash/gnome/dialog-sx-editor.c:169
-#: gnucash/gnome-utils/gnc-main-window.c:278
+#: gnucash/gnome-utils/gnc-main-window.c:279
msgid "_View"
msgstr "_Преглед"
#: gnucash/gnome/dialog-sx-editor2.c:168 gnucash/gnome/dialog-sx-editor.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:279
+#: gnucash/gnome-utils/gnc-main-window.c:280
msgid "_Actions"
msgstr "_ДейÑтвиÑ"
@@ -3142,7 +3144,7 @@ msgstr "Ðе може да Ñе интерпретира кредитна фор
msgid "Couldn't parse debit formula for split \"%s\"."
msgstr "Ðе може да Ñе интерпретира дебитна формула за разбивка \"%s\"."
-#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:874
+#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:880
#: gnucash/gnome/dialog-sx-from-trans.c:261
msgid ""
"The Scheduled Transaction Editor cannot automatically balance this "
@@ -3203,18 +3205,18 @@ msgid ""
"revoke them."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1406
+#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1412
msgid "(never)"
msgstr "(никога)"
-#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1568
+#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1574
msgid ""
"The current template transaction has been changed. Would you like to record "
"the changes?"
msgstr ""
"ТекущиÑÑ‚ шаблон на Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ðµ променен. ИÑкате ли да запишете промените?"
-#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1844
+#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1850
#: gnucash/gnome/gnc-plugin-page-sx-list.c:246
#: gnucash/gnome/gnc-plugin-page-sx-list.c:252
msgid "Scheduled Transactions"
@@ -3227,31 +3229,31 @@ msgid ""
"cannot be automatically created."
msgstr "Ðе могат да Ñе Ñъздадат автоматично планирани транзакции Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð»Ð¸Ð²Ð¸."
-#: gnucash/gnome/dialog-sx-editor.c:675
+#: gnucash/gnome/dialog-sx-editor.c:679
#, fuzzy, c-format
msgid "Couldn't parse %s for split \"%s\"."
msgstr "Ðе може да Ñе интерпретира дебитна формула за разбивка \"%s\"."
-#: gnucash/gnome/dialog-sx-editor.c:739
+#: gnucash/gnome/dialog-sx-editor.c:745
#, c-format
msgid "Split with memo %s has an invalid account."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:742
+#: gnucash/gnome/dialog-sx-editor.c:748
#, fuzzy
msgid "Invalid Account in Split"
msgstr "Включване на обща Ñума от брокерÑки Ñметки"
-#: gnucash/gnome/dialog-sx-editor.c:754
+#: gnucash/gnome/dialog-sx-editor.c:760
#, c-format
msgid "Split with memo %s has an unparsable Credit Formula."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:757 gnucash/gnome/dialog-sx-editor.c:773
+#: gnucash/gnome/dialog-sx-editor.c:763 gnucash/gnome/dialog-sx-editor.c:779
msgid "Unparsable Formula in Split"
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:770
+#: gnucash/gnome/dialog-sx-editor.c:776
#, c-format
msgid "Split with memo %s has an unparsable Debit Formula."
msgstr ""
@@ -3507,7 +3509,7 @@ msgstr "ОтварÑне на ÑъщеÑтвуващ файл на GnuCash"
#: gnucash/gnome/gnc-plugin-basic-commands.c:121
#: gnucash/gnome-utils/gnc-file.c:100 gnucash/gnome-utils/gnc-file.c:666
-#: gnucash/gnome-utils/gnc-main-window.c:1314
+#: gnucash/gnome-utils/gnc-main-window.c:1342
#: gnucash/html/gnc-html-webkit1.c:1198
msgid "_Save"
msgstr "_Запазване"
@@ -4121,7 +4123,7 @@ msgstr "Преномериране на подÑметките в избрана
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:185
#: gnucash/gnome/gnc-plugin-page-register2.c:340
#: gnucash/gnome/gnc-plugin-page-register.c:463
-#: gnucash/gnome-utils/gnc-main-window.c:349
+#: gnucash/gnome-utils/gnc-main-window.c:351
msgid "_Filter By..."
msgstr "_Филтриране по..."
@@ -4133,7 +4135,7 @@ msgstr "_Филтриране по..."
#: gnucash/gnome/gnc-plugin-page-register.c:467
#: gnucash/gnome/gnc-plugin-page-report.c:1231
#: gnucash/gnome/gnc-plugin-page-sx-list.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:353
+#: gnucash/gnome-utils/gnc-main-window.c:355
msgid "_Refresh"
msgstr "_ОпреÑнÑване"
@@ -4144,7 +4146,7 @@ msgstr "_ОпреÑнÑване"
#: gnucash/gnome/gnc-plugin-page-register.c:468
#: gnucash/gnome/gnc-plugin-page-report.c:1232
#: gnucash/gnome/gnc-plugin-page-sx-list.c:171
-#: gnucash/gnome-utils/gnc-main-window.c:354
+#: gnucash/gnome-utils/gnc-main-window.c:356
msgid "Refresh this window"
msgstr "ОпреÑнÑване на прозореца"
@@ -4573,7 +4575,7 @@ msgstr "Копиране"
#: gnucash/gnome/gnc-plugin-page-register2.c:240
#: gnucash/gnome/gnc-plugin-page-register.c:354
#: gnucash/gnome/gnc-plugin-page-report.c:1226
-#: gnucash/gnome-utils/gnc-main-window.c:332
+#: gnucash/gnome-utils/gnc-main-window.c:333
msgid "_Paste"
msgstr "_ПоÑтавÑне"
@@ -5406,35 +5408,35 @@ msgstr "_Печат на чекове..."
#: gnucash/gnome/gnc-plugin-page-register2.c:230
#: gnucash/gnome/gnc-plugin-page-register.c:344
#: gnucash/gnome/gnc-plugin-page-report.c:1216
-#: gnucash/gnome-utils/gnc-main-window.c:322
+#: gnucash/gnome-utils/gnc-main-window.c:323
msgid "Cu_t"
msgstr "И_зрÑзване"
#: gnucash/gnome/gnc-plugin-page-register2.c:231
#: gnucash/gnome/gnc-plugin-page-register.c:345
#: gnucash/gnome/gnc-plugin-page-report.c:1217
-#: gnucash/gnome-utils/gnc-main-window.c:323
+#: gnucash/gnome-utils/gnc-main-window.c:324
msgid "Cut the current selection and copy it to clipboard"
msgstr "ИзрÑзва Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ð¸Ð·Ð±Ð¾Ñ€ и го копира в буфера"
#: gnucash/gnome/gnc-plugin-page-register2.c:235
#: gnucash/gnome/gnc-plugin-page-register.c:349
#: gnucash/gnome/gnc-plugin-page-report.c:1221
-#: gnucash/gnome-utils/gnc-main-window.c:327
+#: gnucash/gnome-utils/gnc-main-window.c:328
msgid "_Copy"
msgstr "_Копиране"
#: gnucash/gnome/gnc-plugin-page-register2.c:236
#: gnucash/gnome/gnc-plugin-page-register.c:350
#: gnucash/gnome/gnc-plugin-page-report.c:1222
-#: gnucash/gnome-utils/gnc-main-window.c:328
+#: gnucash/gnome-utils/gnc-main-window.c:329
msgid "Copy the current selection to clipboard"
msgstr "Копиране на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ð¸Ð·Ð±Ð¾Ñ€ в буфера"
#: gnucash/gnome/gnc-plugin-page-register2.c:241
#: gnucash/gnome/gnc-plugin-page-register.c:355
#: gnucash/gnome/gnc-plugin-page-report.c:1227
-#: gnucash/gnome-utils/gnc-main-window.c:333
+#: gnucash/gnome-utils/gnc-main-window.c:334
msgid "Paste the clipboard content at the cursor position"
msgstr "ПоÑÑ‚Ð°Ð²Ñ Ñъдържанието на буфера на мÑÑтото на курÑора"
@@ -5899,7 +5901,7 @@ msgstr "_Премахване на разбивки"
# FIXME подредба по?
#: gnucash/gnome/gnc-plugin-page-register.c:459
-#: gnucash/gnome-utils/gnc-main-window.c:345
+#: gnucash/gnome-utils/gnc-main-window.c:347
msgid "_Sort By..."
msgstr "_Подредба по..."
@@ -6970,7 +6972,7 @@ msgstr "_Сметка"
#: gnucash/gnome/window-reconcile2.c:2129
#: gnucash/gnome/window-reconcile2.c:2210 gnucash/gnome/window-reconcile.c:2391
#: gnucash/gnome/window-reconcile.c:2472
-#: gnucash/gnome-utils/gnc-main-window.c:285
+#: gnucash/gnome-utils/gnc-main-window.c:286
#: gnucash/gtkbuilder/dialog-account.glade:1121
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:23
#: gnucash/gtkbuilder/dialog-book-close.glade:22
@@ -6980,7 +6982,7 @@ msgstr "_Сметка"
#: gnucash/gtkbuilder/dialog-custom-report.glade:29
#: gnucash/gtkbuilder/dialog-employee.glade:23
#: gnucash/gtkbuilder/dialog-fincalc.glade:107
-#: gnucash/gtkbuilder/dialog-import.glade:1023
+#: gnucash/gtkbuilder/dialog-import.glade:1168
#: gnucash/gtkbuilder/dialog-invoice.glade:657
#: gnucash/gtkbuilder/dialog-job.glade:24
#: gnucash/gtkbuilder/dialog-options.glade:21
@@ -7043,7 +7045,7 @@ msgid "Edit the main account for this register"
msgstr "Редактиране на оÑновната Ñметка в отчета"
#: gnucash/gnome/window-reconcile2.c:2173 gnucash/gnome/window-reconcile.c:2435
-#: gnucash/gnome-utils/gnc-main-window.c:360
+#: gnucash/gnome-utils/gnc-main-window.c:362
msgid "_Check & Repair"
msgstr "_Проверка и поправка"
@@ -7849,7 +7851,7 @@ msgid "_Save As"
msgstr "Запазване _като..."
#: gnucash/gnome-utils/dialog-options.c:225
-#: gnucash/gnome-utils/gnc-main-window.c:309
+#: gnucash/gnome-utils/gnc-main-window.c:310
#: gnucash/gtkbuilder/dialog-billterms.glade:731
#: gnucash/gtkbuilder/dialog-commodities.glade:174
#: gnucash/gtkbuilder/dialog-custom-report.glade:46
@@ -8400,7 +8402,7 @@ msgstr "ЧеÑтота"
msgid "(unnamed)"
msgstr "(без име)"
-#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:289
+#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:290
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
#: gnucash/import-export/customer-import/gnc-plugin-customer-import.c:57
msgid "_Import"
@@ -8418,7 +8420,7 @@ msgstr "ВнаÑÑне"
msgid "Save"
msgstr "Запазване"
-#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:290
+#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:291
msgid "_Export"
msgstr "_ИзнаÑÑне"
@@ -8696,7 +8698,7 @@ msgid "Save changes to the file?"
msgstr "Да Ñе запазÑÑ‚ ли промените във файла?"
#: gnucash/gnome-utils/gnc-file.c:656
-#: gnucash/gnome-utils/gnc-main-window.c:1307
+#: gnucash/gnome-utils/gnc-main-window.c:1335
#, fuzzy, c-format
msgid "If you don't save, changes from the past %d minute will be discarded."
msgid_plural ""
@@ -8756,7 +8758,7 @@ msgstr "_ОтварÑне винаги"
msgid "Open _Folder"
msgstr "Синтетична Ñметка "
-#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:314
+#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:315
msgid "_Quit"
msgstr "_Изход"
@@ -8799,7 +8801,7 @@ msgstr ""
"Файлът %s вече ÑъщеÑтвува. Сигурни ли Ñте, че иÑкате да го презапишете?"
#: gnucash/gnome-utils/gnc-file.c:1701
-#: gnucash/gnome-utils/gnc-main-window.c:1275
+#: gnucash/gnome-utils/gnc-main-window.c:1303
msgid "<unknown>"
msgstr "<непознат>"
@@ -8850,206 +8852,256 @@ msgstr "Въведете потребителÑко име и парола, за
msgid "Changes will be saved automatically in %u seconds"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:276
+#: gnucash/gnome-utils/gnc-main-window.c:277
msgid "_File"
msgstr "_Файл"
-#: gnucash/gnome-utils/gnc-main-window.c:280
+#: gnucash/gnome-utils/gnc-main-window.c:281
msgid "Tra_nsaction"
msgstr "Тра_нзакциÑ"
-#: gnucash/gnome-utils/gnc-main-window.c:281
+#: gnucash/gnome-utils/gnc-main-window.c:282
msgid "_Reports"
msgstr "_Отчети"
-#: gnucash/gnome-utils/gnc-main-window.c:282
+#: gnucash/gnome-utils/gnc-main-window.c:283
msgid "_Tools"
msgstr "_ИнÑтрументи"
-#: gnucash/gnome-utils/gnc-main-window.c:283
+#: gnucash/gnome-utils/gnc-main-window.c:284
msgid "E_xtensions"
msgstr "Ра_зширениÑ"
-#: gnucash/gnome-utils/gnc-main-window.c:284
+#: gnucash/gnome-utils/gnc-main-window.c:285
msgid "_Windows"
msgstr "_Прозорци"
-#: gnucash/gnome-utils/gnc-main-window.c:292
+#: gnucash/gnome-utils/gnc-main-window.c:293
msgid "_Print..."
msgstr "_Отпечатване..."
-#: gnucash/gnome-utils/gnc-main-window.c:293
+#: gnucash/gnome-utils/gnc-main-window.c:294
msgid "Print the currently active page"
msgstr "Отпечатване на текущата Ñтраница"
-#: gnucash/gnome-utils/gnc-main-window.c:299
+#: gnucash/gnome-utils/gnc-main-window.c:300
msgid "Pa_ge Setup..."
msgstr "ÐаÑ_тройка на Ñтраница..."
-#: gnucash/gnome-utils/gnc-main-window.c:300
+#: gnucash/gnome-utils/gnc-main-window.c:301
msgid "Specify the page size and orientation for printing"
msgstr "ОпределÑне размера и разположението за печат"
-#: gnucash/gnome-utils/gnc-main-window.c:304
+#: gnucash/gnome-utils/gnc-main-window.c:305
msgid "Proper_ties"
msgstr "С_войÑтва"
-#: gnucash/gnome-utils/gnc-main-window.c:305
+#: gnucash/gnome-utils/gnc-main-window.c:306
msgid "Edit the properties of the current file"
msgstr "Редактиране на ÑвойÑтвата на Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ñ„Ð°Ð¹Ð»"
-#: gnucash/gnome-utils/gnc-main-window.c:310
+#: gnucash/gnome-utils/gnc-main-window.c:311
msgid "Close the currently active page"
msgstr "ЗатварÑне на текущата Ñтраница"
-#: gnucash/gnome-utils/gnc-main-window.c:315
+#: gnucash/gnome-utils/gnc-main-window.c:316
msgid "Quit this application"
msgstr "ÐапуÑкане на приложението"
-#: gnucash/gnome-utils/gnc-main-window.c:337
+#: gnucash/gnome-utils/gnc-main-window.c:338
msgid "Pr_eferences"
msgstr "Пре_дпочитаниÑ"
-#: gnucash/gnome-utils/gnc-main-window.c:338
+#: gnucash/gnome-utils/gnc-main-window.c:339
msgid "Edit the global preferences of GnuCash"
msgstr "Редактиране общите Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ð¸Ñ‚Ð°Ð½Ð¸Ñ Ð² GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:346
+#: gnucash/gnome-utils/gnc-main-window.c:345
+#, fuzzy
+#| msgid "<b>Tab Position</b>"
+msgid "Tab P_osition"
+msgstr "<b>ÐœÑÑто на подпрозорец</b>"
+
+#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
msgstr "Избор на критерий за подреждане при преглед на Ñтраницата"
-#: gnucash/gnome-utils/gnc-main-window.c:350
+#: gnucash/gnome-utils/gnc-main-window.c:352
msgid "Select the account types that should be displayed."
msgstr "Избор на видовете Ñметки, които да Ñе покажат."
-#: gnucash/gnome-utils/gnc-main-window.c:362
+#: gnucash/gnome-utils/gnc-main-window.c:364
msgid "Reset _Warnings..."
msgstr "Ðулиране на _предупреждениÑ..."
-#: gnucash/gnome-utils/gnc-main-window.c:363
+#: gnucash/gnome-utils/gnc-main-window.c:365
msgid "Reset the state of all warning messages so they will be shown again."
msgstr ""
"Ðулиране на ÑÑŠÑтоÑнието на вÑички предупредителни ÑъобщениÑ, за да Ñе "
"покажат отново."
-#: gnucash/gnome-utils/gnc-main-window.c:367
+#: gnucash/gnome-utils/gnc-main-window.c:369
msgid "Re_name Page"
msgstr "П_реименуване на Ñтраница"
-#: gnucash/gnome-utils/gnc-main-window.c:368
+#: gnucash/gnome-utils/gnc-main-window.c:370
msgid "Rename this page."
msgstr "Преименуване на Ñтраницата."
-#: gnucash/gnome-utils/gnc-main-window.c:375
+#: gnucash/gnome-utils/gnc-main-window.c:377
msgid "_New Window"
msgstr "_Ðов прозорец"
-#: gnucash/gnome-utils/gnc-main-window.c:376
+#: gnucash/gnome-utils/gnc-main-window.c:378
msgid "Open a new top-level GnuCash window."
msgstr "ОтварÑне на нов прозорец от виÑоко ниво на GnuCash."
-#: gnucash/gnome-utils/gnc-main-window.c:380
+#: gnucash/gnome-utils/gnc-main-window.c:382
msgid "New Window with _Page"
msgstr "Ðов прозорец ÑÑŠÑ ÑÑ‚_раница"
-#: gnucash/gnome-utils/gnc-main-window.c:381
+#: gnucash/gnome-utils/gnc-main-window.c:383
msgid "Move the current page to a new top-level GnuCash window."
msgstr "ПремеÑтване на Ñтраницата в нов прозорец от виÑоко ниво на GnuCash."
-#: gnucash/gnome-utils/gnc-main-window.c:388
+#: gnucash/gnome-utils/gnc-main-window.c:390
msgid "Tutorial and Concepts _Guide"
msgstr "Са_моучител и принципи "
-#: gnucash/gnome-utils/gnc-main-window.c:389
+#: gnucash/gnome-utils/gnc-main-window.c:391
msgid "Open the GnuCash Tutorial"
msgstr "ОтварÑне на ръководÑтвото на GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:393
+#: gnucash/gnome-utils/gnc-main-window.c:395
msgid "_Contents"
msgstr "_РъководÑтво"
-#: gnucash/gnome-utils/gnc-main-window.c:394
+#: gnucash/gnome-utils/gnc-main-window.c:396
msgid "Open the GnuCash Help"
msgstr "ОтварÑне на помощта на GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:398
+#: gnucash/gnome-utils/gnc-main-window.c:400
msgid "_About"
msgstr "_ОтноÑно"
-#: gnucash/gnome-utils/gnc-main-window.c:399
+#: gnucash/gnome-utils/gnc-main-window.c:401
msgid "About GnuCash"
msgstr "ОтноÑно GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:411
+#: gnucash/gnome-utils/gnc-main-window.c:413
msgid "_Toolbar"
msgstr "_Лента Ñ Ð¸Ð½Ñтрументи"
-#: gnucash/gnome-utils/gnc-main-window.c:412
+#: gnucash/gnome-utils/gnc-main-window.c:414
msgid "Show/hide the toolbar on this window"
msgstr "Показва/Ñкрива лентата Ñ Ð¸Ð½Ñтрументи на прозореца"
-#: gnucash/gnome-utils/gnc-main-window.c:416
+#: gnucash/gnome-utils/gnc-main-window.c:418
msgid "Su_mmary Bar"
msgstr "Лен_та за Ñправки"
-#: gnucash/gnome-utils/gnc-main-window.c:417
+#: gnucash/gnome-utils/gnc-main-window.c:419
msgid "Show/hide the summary bar on this window"
msgstr "Показва/Ñкрива лентата за Ñправки на прозореца"
-#: gnucash/gnome-utils/gnc-main-window.c:421
+#: gnucash/gnome-utils/gnc-main-window.c:423
msgid "Stat_us Bar"
msgstr "Ле_нта за ÑÑŠÑтоÑнието"
-#: gnucash/gnome-utils/gnc-main-window.c:422
+#: gnucash/gnome-utils/gnc-main-window.c:424
msgid "Show/hide the status bar on this window"
msgstr "Показва/Ñкрива лентата за ÑÑŠÑтоÑнието на прозореца"
-#: gnucash/gnome-utils/gnc-main-window.c:434
+#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gtkbuilder/dialog-preferences.glade:3895
+msgid "To_p"
+msgstr "Го_ре"
+
+#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
+#: gnucash/gtkbuilder/dialog-preferences.glade:3901
+msgid "Display the notebook tabs at the top of the window."
+msgstr "Показване на подпрозорците на бележника отгоре на прозореца."
+
+#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gtkbuilder/dialog-preferences.glade:3914
+msgid "B_ottom"
+msgstr "Д_олу"
+
+#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
+#: gnucash/gtkbuilder/dialog-preferences.glade:3920
+msgid "Display the notebook tabs at the bottom of the window."
+msgstr "Показване на подпрозорците на бележника в ÐºÑ€Ð°Ñ Ð½Ð° прозореца."
+
+#: gnucash/gnome-utils/gnc-main-window.c:444
+#: gnucash/gtkbuilder/dialog-preferences.glade:3933
+msgid "_Left"
+msgstr "_ЛÑво"
+
+#: gnucash/gnome-utils/gnc-main-window.c:445
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
+#: gnucash/gtkbuilder/dialog-preferences.glade:3939
+msgid "Display the notebook tabs at the left of the window."
+msgstr "Показване на подпрозорците на бележника отлÑво на прозореца."
+
+#: gnucash/gnome-utils/gnc-main-window.c:448
+#: gnucash/gtkbuilder/dialog-preferences.glade:3952
+msgid "_Right"
+msgstr "_ДÑÑно"
+
+#: gnucash/gnome-utils/gnc-main-window.c:449
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
+#: gnucash/gtkbuilder/dialog-preferences.glade:3958
+msgid "Display the notebook tabs at the right of the window."
+msgstr "Показване на подпрозорците на бележника отдÑÑно на прозореца."
+
+#: gnucash/gnome-utils/gnc-main-window.c:462
msgid "Window _1"
msgstr "Прозорец _1"
-#: gnucash/gnome-utils/gnc-main-window.c:435
+#: gnucash/gnome-utils/gnc-main-window.c:463
msgid "Window _2"
msgstr "Прозорец _2"
-#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gnome-utils/gnc-main-window.c:464
msgid "Window _3"
msgstr "Прозорец _3"
-#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gnome-utils/gnc-main-window.c:465
msgid "Window _4"
msgstr "Прозорец _4"
-#: gnucash/gnome-utils/gnc-main-window.c:438
+#: gnucash/gnome-utils/gnc-main-window.c:466
msgid "Window _5"
msgstr "Прозорец _5"
-#: gnucash/gnome-utils/gnc-main-window.c:439
+#: gnucash/gnome-utils/gnc-main-window.c:467
msgid "Window _6"
msgstr "Прозорец _6"
-#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gnome-utils/gnc-main-window.c:468
msgid "Window _7"
msgstr "Прозорец _7"
-#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gnome-utils/gnc-main-window.c:469
msgid "Window _8"
msgstr "Прозорец _8"
-#: gnucash/gnome-utils/gnc-main-window.c:442
+#: gnucash/gnome-utils/gnc-main-window.c:470
msgid "Window _9"
msgstr "Прозорец _9"
-#: gnucash/gnome-utils/gnc-main-window.c:443
+#: gnucash/gnome-utils/gnc-main-window.c:471
msgid "Window _0"
msgstr "Прозорец _0"
-#: gnucash/gnome-utils/gnc-main-window.c:1258
+#: gnucash/gnome-utils/gnc-main-window.c:1286
#, c-format
msgid "Save changes to file %s before closing?"
msgstr "Да Ñе запазÑÑ‚ ли промените по файла %s преди затварÑне?"
-#: gnucash/gnome-utils/gnc-main-window.c:1261
+#: gnucash/gnome-utils/gnc-main-window.c:1289
#, c-format
msgid ""
"If you don't save, changes from the past %d hours and %d minutes will be "
@@ -9058,7 +9110,7 @@ msgstr ""
"Ðко не запазите, промените от поÑледните %d чаÑа и %d минути ще бъдат "
"отменени."
-#: gnucash/gnome-utils/gnc-main-window.c:1263
+#: gnucash/gnome-utils/gnc-main-window.c:1291
#, c-format
msgid ""
"If you don't save, changes from the past %d days and %d hours will be "
@@ -9066,15 +9118,15 @@ msgid ""
msgstr ""
"Ðко не запазите, промените от поÑледните %d дни и %d чаÑа ще бъдат отменени."
-#: gnucash/gnome-utils/gnc-main-window.c:1312
+#: gnucash/gnome-utils/gnc-main-window.c:1340
msgid "Close _Without Saving"
msgstr "ЗатварÑне _без запазване"
-#: gnucash/gnome-utils/gnc-main-window.c:1459
+#: gnucash/gnome-utils/gnc-main-window.c:1487
msgid "This window is closing and will not be restored."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1465
+#: gnucash/gnome-utils/gnc-main-window.c:1493
#, fuzzy
#| msgid "Close this window"
msgid "Close Window?"
@@ -9082,63 +9134,63 @@ msgstr "ЗатварÑне на прозореца"
#. Translators: This string is shown in the window title if this
#. document is, well, read-only.
-#: gnucash/gnome-utils/gnc-main-window.c:1595
+#: gnucash/gnome-utils/gnc-main-window.c:1623
msgid "(read-only)"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1603
+#: gnucash/gnome-utils/gnc-main-window.c:1631
msgid "Unsaved Book"
msgstr "Ðезапазена книга"
-#: gnucash/gnome-utils/gnc-main-window.c:1766
+#: gnucash/gnome-utils/gnc-main-window.c:1794
msgid "Last modified on %a, %b %d, %Y at %I:%M %p"
msgstr ""
#. Translators: This message appears in the status bar after opening the file.
-#: gnucash/gnome-utils/gnc-main-window.c:1769
+#: gnucash/gnome-utils/gnc-main-window.c:1797
#, fuzzy, c-format
msgid "File %s opened. %s"
msgstr "ÐеуÑпешно отварÑне на файл."
-#: gnucash/gnome-utils/gnc-main-window.c:2896
+#: gnucash/gnome-utils/gnc-main-window.c:2924
msgctxt "lower case key for short cut to 'Accounts'"
msgid "a"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:2986
+#: gnucash/gnome-utils/gnc-main-window.c:3014
msgid "Unable to save to database."
msgstr "Ðе може да запазва в базата от данни."
-#: gnucash/gnome-utils/gnc-main-window.c:2988
+#: gnucash/gnome-utils/gnc-main-window.c:3016
msgid "Unable to save to database: Book is marked read-only."
msgstr "Ðе може да запазва в базата: книгата е Ñамо за четене."
-#: gnucash/gnome-utils/gnc-main-window.c:4333
+#: gnucash/gnome-utils/gnc-main-window.c:4396
#: gnucash/gtkbuilder/assistant-qif-import.glade:959
msgid "Book Options"
msgstr "Опции на книга"
-#: gnucash/gnome-utils/gnc-main-window.c:4751 gnucash/gnucash-core-app.cpp:261
+#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
msgstr ""
#. Translators: %s will be replaced with the current year
-#: gnucash/gnome-utils/gnc-main-window.c:4778
+#: gnucash/gnome-utils/gnc-main-window.c:4880
#, c-format
msgid "Copyright © 1997-%s The GnuCash contributors."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4790
+#: gnucash/gnome-utils/gnc-main-window.c:4892
#: gnucash/gnome-utils/gnc-splash.c:98
msgid "Version"
msgstr "ВерÑиÑ"
-#: gnucash/gnome-utils/gnc-main-window.c:4791
+#: gnucash/gnome-utils/gnc-main-window.c:4893
#: gnucash/gnome-utils/gnc-splash.c:99 gnucash/gnucash-core-app.cpp:278
msgid "Build ID"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4799
+#: gnucash/gnome-utils/gnc-main-window.c:4901
msgid "Accounting for personal and small business finance."
msgstr ""
@@ -9146,11 +9198,11 @@ msgstr ""
#. Enter your name or that of your team and an email contact for feedback.
#. The string can have multiple rows, so you can also add a list of
#. contributors.
-#: gnucash/gnome-utils/gnc-main-window.c:4808
+#: gnucash/gnome-utils/gnc-main-window.c:4910
msgid "translator-credits"
msgstr "РоÑица Димова <pocu_at_bk.ru>"
-#: gnucash/gnome-utils/gnc-main-window.c:4811
+#: gnucash/gnome-utils/gnc-main-window.c:4913
msgid "Visit the GnuCash website."
msgstr ""
@@ -9701,7 +9753,7 @@ msgid "Dist"
msgstr "Разпр."
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:45
-#: gnucash/import-export/import-main-matcher.c:1594
+#: gnucash/import-export/import-main-matcher.c:1862
#: gnucash/report/reports/standard/register.scm:218
#: libgnucash/engine/Split.c:1614 libgnucash/engine/Split.c:1631
msgid "-- Split Transaction --"
@@ -10334,12 +10386,12 @@ msgid "Enter the effective share price"
msgstr "Въвеждане на дейÑтвителната цена на акциÑ"
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3323
-#: gnucash/register/ledger-core/split-register-model.c:2380
+#: gnucash/register/ledger-core/split-register-model.c:2385
msgid "Enter credit formula for real transaction"
msgstr "Въвеждане на кредитна формула за дейÑтвителна транзакциÑ"
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3333
-#: gnucash/register/ledger-core/split-register-model.c:2346
+#: gnucash/register/ledger-core/split-register-model.c:2349
msgid "Enter debit formula for real transaction"
msgstr "Въвеждане на дебитна формула за дейÑтвителна транзакциÑ"
@@ -12124,11 +12176,6 @@ msgstr ""
"Ðко е активно, ще Ñе покаже начален екран при Ñтартиране. Ðко не е, нÑма да "
"Ñе покаже."
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
-#: gnucash/gtkbuilder/dialog-preferences.glade:3901
-msgid "Display the notebook tabs at the top of the window."
-msgstr "Показване на подпрозорците на бележника отгоре на прозореца."
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:196
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:201
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:206
@@ -12142,21 +12189,6 @@ msgstr ""
"на Ñтраниците в книгата. Възможните ÑтойноÑти Ñа \"горе\", \"влÑво\", \"долу"
"\" и \"вдÑÑно\". Ð¡Ñ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð°Ñ‚Ñ Ðµ \"горе\"."
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
-#: gnucash/gtkbuilder/dialog-preferences.glade:3920
-msgid "Display the notebook tabs at the bottom of the window."
-msgstr "Показване на подпрозорците на бележника в ÐºÑ€Ð°Ñ Ð½Ð° прозореца."
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
-#: gnucash/gtkbuilder/dialog-preferences.glade:3939
-msgid "Display the notebook tabs at the left of the window."
-msgstr "Показване на подпрозорците на бележника отлÑво на прозореца."
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
-#: gnucash/gtkbuilder/dialog-preferences.glade:3958
-msgid "Display the notebook tabs at the right of the window."
-msgstr "Показване на подпрозорците на бележника отдÑÑно на прозореца."
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:215
#: gnucash/gtkbuilder/dialog-preferences.glade:3990
msgid "Display the summary bar at the top of the page."
@@ -13766,7 +13798,7 @@ msgid "Select a row to change the mappings"
msgstr ""
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:970
-#: gnucash/import-export/import-account-matcher.c:188
+#: gnucash/import-export/import-account-matcher.c:197
msgid "Account ID"
msgstr "ID на Ñметка"
@@ -14796,6 +14828,7 @@ msgid "_Amount"
msgstr "_Сума:"
#: gnucash/gtkbuilder/assistant-stock-split.glade:293
+#: gnucash/gtkbuilder/dialog-import.glade:958
#: gnucash/gtkbuilder/dialog-print-check.glade:1129
#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:957
msgid "_Memo"
@@ -15213,6 +15246,7 @@ msgid "_Account code"
msgstr "_Код на Ñметка"
#: gnucash/gtkbuilder/dialog-account.glade:1251
+#: gnucash/gtkbuilder/dialog-import.glade:930
msgid "_Description"
msgstr "_ОпиÑание"
@@ -16515,46 +16549,59 @@ msgstr "Жълт"
msgid "Green"
msgstr "Зелено"
-#: gnucash/gtkbuilder/dialog-import.glade:877
+#: gnucash/gtkbuilder/dialog-import.glade:871
+#, fuzzy
+#| msgid "Do not print transaction detail"
+msgid "Edit imported transaction details"
+msgstr "Да не Ñе отпечатват данни за транзакциÑ"
+
+#: gnucash/gtkbuilder/dialog-import.glade:944
+#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
+#: gnucash/gtkbuilder/dialog-print-check.glade:745
+#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
+msgid "_Notes"
+msgstr "_Бележки"
+
+#: gnucash/gtkbuilder/dialog-import.glade:1022
#, fuzzy
msgid ""
"List of downloaded transactions (source split and matched information shown)"
msgstr "СпиÑък от Ñвалени транзакции (показана е изходната разбивка)"
-#: gnucash/gtkbuilder/dialog-import.glade:919
+#: gnucash/gtkbuilder/dialog-import.glade:1064
#, fuzzy
msgid "Show _Account column"
msgstr "Да Ñе показва код на Ñметка"
-#: gnucash/gtkbuilder/dialog-import.glade:935
+#: gnucash/gtkbuilder/dialog-import.glade:1080
#, fuzzy
msgid "Show _Memo column"
msgstr "Да Ñе показва код на Ñметка"
-#: gnucash/gtkbuilder/dialog-import.glade:951
+#: gnucash/gtkbuilder/dialog-import.glade:1096
#, fuzzy
msgid "Show matched _information"
msgstr "Данни за фактура"
-#: gnucash/gtkbuilder/dialog-import.glade:966
+#: gnucash/gtkbuilder/dialog-import.glade:1111
#, fuzzy
#| msgid "Spend"
msgid "A_ppend"
msgstr "Харчене"
-#: gnucash/gtkbuilder/dialog-import.glade:970
+#: gnucash/gtkbuilder/dialog-import.glade:1115
msgid ""
"When Updating and Clearing a matched transaction, append the imported "
"Description and Notes to the matched Description and Notes instead of "
"replacing them."
msgstr ""
-#: gnucash/gtkbuilder/dialog-import.glade:982
+#: gnucash/gtkbuilder/dialog-import.glade:1127
#, fuzzy
msgid "_Reconcile after match"
msgstr "СверÑване (автоматично) на Ñъвпадение"
-#: gnucash/gtkbuilder/dialog-import.glade:1005
+#: gnucash/gtkbuilder/dialog-import.glade:1150
msgid "Generic import transaction matcher"
msgstr "Модул за общо внаÑÑне на транзакции"
@@ -16667,12 +16714,6 @@ msgstr "Изтриване на подчертаната ÑтатиÑ"
msgid "Enter a name for the highlighted lot."
msgstr "Въвеждане на име на подчертаната ÑтатиÑ."
-#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
-#: gnucash/gtkbuilder/dialog-print-check.glade:745
-#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
-msgid "_Notes"
-msgstr "_Бележки"
-
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:174
msgid "Enter any notes you want to make about this lot."
msgstr "Въведете бележки отноÑно ÑтатиÑта."
@@ -17770,22 +17811,6 @@ msgstr "Показване отпред на поÑÐ»ÐµÐ´Ð½Ð¸Ñ _използв
msgid "<b>Tab Position</b>"
msgstr "<b>ÐœÑÑто на подпрозорец</b>"
-#: gnucash/gtkbuilder/dialog-preferences.glade:3895
-msgid "To_p"
-msgstr "Го_ре"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3914
-msgid "B_ottom"
-msgstr "Д_олу"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3933
-msgid "_Left"
-msgstr "_ЛÑво"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3952
-msgid "_Right"
-msgstr "_ДÑÑно"
-
#: gnucash/gtkbuilder/dialog-preferences.glade:3974
msgid "<b>Summary Bar Position</b>"
msgstr "<b>ÐœÑÑто на Ñправочната лента</b>"
@@ -19721,15 +19746,15 @@ msgstr "Заглавие на отчет"
msgid "Bank code %s (%s), Account %s (%s)"
msgstr ""
-#: gnucash/import-export/aqb/assistant-ab-initial.c:858
+#: gnucash/import-export/aqb/assistant-ab-initial.c:859
msgid "Online Banking Account Name"
msgstr "Име на Ñметка в онлайн-банкиране"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:863
+#: gnucash/import-export/aqb/assistant-ab-initial.c:864
msgid "GnuCash Account Name"
msgstr "Име на Ñметка в GnuCash"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:869
+#: gnucash/import-export/aqb/assistant-ab-initial.c:870
#: gnucash/import-export/qif-imp/assistant-qif-import.c:572
#: gnucash/import-export/qif-imp/dialog-account-picker.c:452
msgid "New?"
@@ -21912,7 +21937,7 @@ msgstr "ВнаÑÑне на CSV и и_зпращане..."
msgid "Import Customers and Vendors from a CSV text file."
msgstr "ВнаÑÑне на Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð¾Ñ‚ текÑтов файл"
-#: gnucash/import-export/import-account-matcher.c:263
+#: gnucash/import-export/import-account-matcher.c:272
#, fuzzy, c-format
msgid ""
"The account '%s' is a placeholder account and does not allow transactions. "
@@ -21920,7 +21945,7 @@ msgid ""
msgstr ""
"Сметката %s е Ñинтетична и не позволÑва транзакции. Изберете друга Ñметка."
-#: gnucash/import-export/import-account-matcher.c:280
+#: gnucash/import-export/import-account-matcher.c:289
#, fuzzy, c-format
msgid ""
"The account '%s' has a different commodity to the one required, '%s'. Please "
@@ -21928,7 +21953,7 @@ msgid ""
msgstr ""
"Сметката %s е Ñинтетична и не позволÑва транзакции. Изберете друга Ñметка."
-#: gnucash/import-export/import-account-matcher.c:472
+#: gnucash/import-export/import-account-matcher.c:481
msgid "(Full account ID: "
msgstr "(Пълно ID на Ñметка: "
@@ -21958,136 +21983,125 @@ msgstr "г/м/д"
msgid "y/d/m"
msgstr "г/д/м"
-#: gnucash/import-export/import-main-matcher.c:462
+#: gnucash/import-export/import-main-matcher.c:518
#, fuzzy
msgid "No new transactions were found in this import."
msgstr "Текущата Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð½Ðµ е изравнена."
-#: gnucash/import-export/import-main-matcher.c:630
-#: gnucash/import-export/import-main-matcher.c:783
+#: gnucash/import-export/import-main-matcher.c:687
+#: gnucash/import-export/import-main-matcher.c:840
msgid "Destination account for the auto-balance split."
msgstr "Целева Ñметка за автоматично изравнÑващата Ñе разбивка."
-#: gnucash/import-export/import-main-matcher.c:943
-#, fuzzy
-#| msgid "Enter the Entry Description"
-msgid "Enter new Description"
-msgstr "Въвеждане на опиÑание на запиÑа"
-
-# FIXME Падеж?
-#: gnucash/import-export/import-main-matcher.c:958
-#, fuzzy
-msgid "Enter new Memo"
-msgstr "Падеж"
-
-#: gnucash/import-export/import-main-matcher.c:971
+#: gnucash/import-export/import-main-matcher.c:1026
+#: gnucash/report/html-utilities.scm:338
+#: gnucash/report/reports/standard/balsheet-pnl.scm:154
+#: gnucash/report/reports/standard/new-owner-report.scm:942
#, fuzzy
-msgid "Enter new Notes"
-msgstr "Допълнителни бележки"
+msgid "Disabled"
+msgstr "Включен"
-#: gnucash/import-export/import-main-matcher.c:1097
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1321
#, fuzzy
-msgid "Assign a transfer account to the selection."
+msgid "_Assign a transfer account to the selection"
msgstr "ТрÑбва да изберете Ñметка за превод от йерархиÑта на Ñметките."
-#: gnucash/import-export/import-main-matcher.c:1108
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1368
#, fuzzy
-msgid "Edit description."
+msgid "_Edit description, notes, or memo"
msgstr "ОпиÑание"
-#: gnucash/import-export/import-main-matcher.c:1116
-#, fuzzy
-#| msgid "Edit Job"
-msgid "Edit memo."
-msgstr "Редактиране на задание"
-
-#: gnucash/import-export/import-main-matcher.c:1124
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1377
#, fuzzy
-msgid "Edit notes."
-msgstr "Кредитна Ñметка"
+#| msgid "Reset defaults"
+msgid "_Reset all edits"
+msgstr "Ðулиране до Ñтандартни наÑтройки"
-#: gnucash/import-export/import-main-matcher.c:1286
+#: gnucash/import-export/import-main-matcher.c:1547
#, fuzzy
#| msgid "A"
msgctxt "Column header for 'Adding transaction'"
msgid "A"
msgstr "Ð"
-#: gnucash/import-export/import-main-matcher.c:1289
+#: gnucash/import-export/import-main-matcher.c:1550
#, fuzzy
msgctxt "Column header for 'Updating plus Clearing transaction'"
msgid "U+C"
msgstr "Ð+С"
-#: gnucash/import-export/import-main-matcher.c:1293
+#: gnucash/import-export/import-main-matcher.c:1554
msgctxt "Column header for 'Clearing transaction'"
msgid "C"
msgstr ""
-#: gnucash/import-export/import-main-matcher.c:1300
+#: gnucash/import-export/import-main-matcher.c:1561
msgid "Info"
msgstr "Данни"
-#: gnucash/import-export/import-main-matcher.c:1307
+#: gnucash/import-export/import-main-matcher.c:1568
#: gnucash/report/stylesheets/head-or-tail.scm:102
#, fuzzy
msgid "Additional Comments"
msgstr "Допълнително към карта:"
-#: gnucash/import-export/import-main-matcher.c:1700
+#: gnucash/import-export/import-main-matcher.c:1987
msgid "New, already balanced"
msgstr "Ðова, вече в баланÑа"
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1726
+#: gnucash/import-export/import-main-matcher.c:2013
#, c-format
msgid "New, transfer %s to (manual) \"%s\""
msgstr "Ðова, транÑфер на %s към (ръчно) \"%s\""
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1734
+#: gnucash/import-export/import-main-matcher.c:2021
#, c-format
msgid "New, transfer %s to (auto) \"%s\""
msgstr "Ðова, транÑфер на %s към (автоматично) \"%s\""
#. Translators: %s is the amount to be transferred.
-#: gnucash/import-export/import-main-matcher.c:1745
+#: gnucash/import-export/import-main-matcher.c:2032
#, c-format
msgid "New, UNBALANCED (need acct to transfer %s)!"
msgstr "Ðова, ÐЕИЗРÐÐ’ÐЕÐÐ (нужна Ñ-ка за превод на %s)!"
-#: gnucash/import-export/import-main-matcher.c:1763
+#: gnucash/import-export/import-main-matcher.c:2050
#, fuzzy, c-format
#| msgid "Reconcile (manual) match"
msgid "Reconcile (manual) match to %s"
msgstr "СверÑване (ръчно) на Ñъвпадение"
-#: gnucash/import-export/import-main-matcher.c:1768
+#: gnucash/import-export/import-main-matcher.c:2055
#, fuzzy, c-format
#| msgid "Reconcile (auto) match"
msgid "Reconcile (auto) match to %s"
msgstr "СверÑване (автоматично) на Ñъвпадение"
-#: gnucash/import-export/import-main-matcher.c:1777
-#: gnucash/import-export/import-main-matcher.c:1807
+#: gnucash/import-export/import-main-matcher.c:2064
+#: gnucash/import-export/import-main-matcher.c:2094
msgid "Match missing!"
msgstr "ÐÑма Ñъвпадение!"
-#: gnucash/import-export/import-main-matcher.c:1793
+#: gnucash/import-export/import-main-matcher.c:2080
#, fuzzy, c-format
#| msgid "Update and reconcile (manual) match"
msgid "Update and reconcile (manual) match to %s"
msgstr "Ðктуализиране и ÑверÑване на ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ (ръчно)"
-#: gnucash/import-export/import-main-matcher.c:1798
+#: gnucash/import-export/import-main-matcher.c:2085
#, fuzzy, c-format
#| msgid "Update and reconcile (auto) match"
msgid "Update and reconcile (auto) match to %s"
msgstr "Ðктуализиране и ÑверÑване на ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ (автоматично)"
-#: gnucash/import-export/import-main-matcher.c:1815
+#: gnucash/import-export/import-main-matcher.c:2102
msgid "Do not import (no action selected)"
msgstr "Да не Ñе внаÑÑ (не е избрана операциÑ)"
@@ -23492,13 +23506,6 @@ msgstr[1] "Обменен курÑ"
msgid "No budgets exist. You must create at least one budget."
msgstr "Ðе ÑъщеÑтвуват бюджети. ТрÑбва да Ñъздадете поне един."
-#: gnucash/report/html-utilities.scm:338
-#: gnucash/report/reports/standard/balsheet-pnl.scm:154
-#: gnucash/report/reports/standard/new-owner-report.scm:942
-#, fuzzy
-msgid "Disabled"
-msgstr "Включен"
-
#: gnucash/report/html-utilities.scm:391
msgid "This report requires you to specify certain report options."
msgstr "Отчетът изиÑква да поÑочите определени опции."
@@ -30729,23 +30736,23 @@ msgstr "ЧиÑлена грешка"
#. Translators: A list of error messages from the Scheduled Transactions (SX).
#. They might appear in their editor or in "Since last run".
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1018
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1019
#, c-format
msgid "Unknown account for guid [%s], cancelling SX [%s] creation."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1071
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1074
#, c-format
msgid "Error parsing SX [%s] key [%s]=formula [%s] at [%s]: %s."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1125
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1788
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1130
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1793
#, c-format
msgid "Error %d in SX [%s] final gnc_numeric value, using 0 instead."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1797
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1802
#, c-format
msgid "No exchange rate available in SX [%s] for %s -> %s, value is zero."
msgstr ""
@@ -31232,11 +31239,11 @@ msgctxt ""
msgid "Split"
msgstr "Разбивка"
-#: libgnucash/engine/Transaction.c:2784
+#: libgnucash/engine/Transaction.c:2807
msgid "Voided transaction"
msgstr "Ðнулирана транзакциÑ"
-#: libgnucash/engine/Transaction.c:2800
+#: libgnucash/engine/Transaction.c:2823
msgid "Transaction Voided"
msgstr "ТранзакциÑта анулирана"
diff --git a/po/brx.po b/po/brx.po
index 201fb5099..f304740ea 100644
--- a/po/brx.po
+++ b/po/brx.po
@@ -4,10 +4,10 @@
# Adithya K <adithyak04 at gmail.com>, 2021.
msgid ""
msgstr ""
-"Project-Id-Version: GnuCash 4.11-1\n"
+"Project-Id-Version: GnuCash 4.11-2\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
-"POT-Creation-Date: 2022-07-17 04:04+0200\n"
+"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2021-02-20 14:50+0000\n"
"Last-Translator: Adithya K <adithyak04 at gmail.com>\n"
"Language-Team: Bodo <https://hosted.weblate.org/projects/gnucash/gnucash/brx/"
@@ -973,7 +973,7 @@ msgstr "लन रांहोफिननाय उफà¥à¤°à¤¾Â¥: \"%s\""
#: gnucash/import-export/csv-exp/csv-transactions-export.c:622
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:53
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:63
-#: gnucash/import-export/import-main-matcher.c:1280
+#: gnucash/import-export/import-main-matcher.c:1541
#: gnucash/import-export/import-match-picker.c:393
#: gnucash/import-export/import-match-picker.c:433
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3700
@@ -1074,7 +1074,7 @@ msgstr "बेसेन दाजाबदेरनाय समाव जान
#: gnucash/import-export/aqb/gnc-ab-utils.c:559
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:147
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:70
-#: gnucash/import-export/import-main-matcher.c:1281
+#: gnucash/import-export/import-main-matcher.c:1542
#: gnucash/import-export/import-match-picker.c:392
#: gnucash/import-export/qif-imp/dialog-account-picker.c:433
#: gnucash/register/ledger-core/split-register-model.c:342
@@ -1327,8 +1327,8 @@ msgstr "बेसादखौ खोमोर?"
#: gnucash/gnome-utils/gnc-file.c:118 gnucash/gnome-utils/gnc-file.c:366
#: gnucash/gnome-utils/gnc-file.c:664 gnucash/gnome-utils/gnc-gui-query.c:300
#: gnucash/gnome-utils/gnc-gui-query.c:332
-#: gnucash/gnome-utils/gnc-main-window.c:1313
-#: gnucash/gnome-utils/gnc-main-window.c:1470
+#: gnucash/gnome-utils/gnc-main-window.c:1341
+#: gnucash/gnome-utils/gnc-main-window.c:1498
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:886
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1023
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1063
@@ -1357,7 +1357,8 @@ msgstr "बेसादखौ खोमोर?"
#: gnucash/gtkbuilder/dialog-fincalc.glade:137
#: gnucash/gtkbuilder/dialog-import.glade:46
#: gnucash/gtkbuilder/dialog-import.glade:328
-#: gnucash/gtkbuilder/dialog-import.glade:1040
+#: gnucash/gtkbuilder/dialog-import.glade:885
+#: gnucash/gtkbuilder/dialog-import.glade:1185
#: gnucash/gtkbuilder/dialog-invoice.glade:674
#: gnucash/gtkbuilder/dialog-invoice.glade:1198
#: gnucash/gtkbuilder/dialog-job.glade:41
@@ -1582,7 +1583,7 @@ msgstr "à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ सायख"
#: gnucash/gnome-utils/gnc-gui-query.c:297
#: gnucash/gnome-utils/gnc-gui-query.c:331
#: gnucash/gnome-utils/gnc-gui-query.c:417
-#: gnucash/gnome-utils/gnc-main-window.c:1471
+#: gnucash/gnome-utils/gnc-main-window.c:1499
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:196
#: gnucash/gtkbuilder/dialog-account.glade:35
#: gnucash/gtkbuilder/dialog-account.glade:832
@@ -1605,7 +1606,8 @@ msgstr "à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ सायख"
#: gnucash/gtkbuilder/dialog-import.glade:61
#: gnucash/gtkbuilder/dialog-import.glade:188
#: gnucash/gtkbuilder/dialog-import.glade:343
-#: gnucash/gtkbuilder/dialog-import.glade:1056
+#: gnucash/gtkbuilder/dialog-import.glade:899
+#: gnucash/gtkbuilder/dialog-import.glade:1201
#: gnucash/gtkbuilder/dialog-invoice.glade:690
#: gnucash/gtkbuilder/dialog-invoice.glade:1213
#: gnucash/gtkbuilder/dialog-job.glade:57
@@ -1736,7 +1738,7 @@ msgstr "लेनदेननि गà¥à¤µà¤¾à¤°à¥ˆ"
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-exp/csv-tree-export.c:156
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:65
-#: gnucash/import-export/import-main-matcher.c:1284
+#: gnucash/import-export/import-main-matcher.c:1545
#: gnucash/import-export/import-match-picker.c:395
#: gnucash/import-export/import-match-picker.c:435
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3710
@@ -1818,7 +1820,7 @@ msgid "Username"
msgstr "बाहायगà¥à¤°à¤¾à¤®à¥à¤‚"
#: gnucash/gnome/dialog-employee.c:732 gnucash/gnome/dialog-sx-editor2.c:1755
-#: gnucash/gnome/dialog-sx-editor.c:1817 gnucash/gnome/dialog-tax-info.c:1200
+#: gnucash/gnome/dialog-sx-editor.c:1823 gnucash/gnome/dialog-tax-info.c:1200
#: gnucash/gnome-utils/gnc-dense-cal.c:350
#: gnucash/gnome-utils/gnc-tree-model-budget.c:96
#: gnucash/gnome-utils/gnc-tree-view-commodity.c:368
@@ -1957,7 +1959,7 @@ msgstr "शेयार बेसेन"
#: gnucash/gtkbuilder/dialog-payment.glade:418
#: gnucash/gtkbuilder/dialog-transfer.glade:102
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:54
-#: gnucash/import-export/import-main-matcher.c:1283
+#: gnucash/import-export/import-main-matcher.c:1544
#: gnucash/import-export/import-match-picker.c:394
#: gnucash/import-export/import-match-picker.c:434
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3721
@@ -2092,7 +2094,7 @@ msgstr "बेखेवथि / लिरसà¥à¤‚थाइ / मेम'"
#: gnucash/gtkbuilder/dialog-transfer.glade:205
#: gnucash/import-export/csv-exp/csv-transactions-export.c:626
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:74
-#: gnucash/import-export/import-main-matcher.c:1285
+#: gnucash/import-export/import-main-matcher.c:1546
#: gnucash/import-export/import-match-picker.c:396
#: gnucash/import-export/import-match-picker.c:436
#: gnucash/register/ledger-core/split-register-model.c:356
@@ -3068,7 +3070,7 @@ msgstr "सà¥à¤Ÿà¤¾à¤‡à¤² सिट मà¥à¤‚"
#: gnucash/gnome/dialog-sx-editor2.c:165 gnucash/gnome/dialog-sx-editor.c:167
#: gnucash/gnome/gnc-plugin-page-sx-list.c:151
#: gnucash/gnome/window-reconcile2.c:2187 gnucash/gnome/window-reconcile.c:2449
-#: gnucash/gnome-utils/gnc-main-window.c:277
+#: gnucash/gnome-utils/gnc-main-window.c:278
#: gnucash/gtkbuilder/dialog-billterms.glade:679
#: gnucash/gtkbuilder/dialog-commodities.glade:156
#: gnucash/gtkbuilder/dialog-price.glade:858
@@ -3084,12 +3086,12 @@ msgid "_Transaction"
msgstr "लेनदेन"
#: gnucash/gnome/dialog-sx-editor2.c:167 gnucash/gnome/dialog-sx-editor.c:169
-#: gnucash/gnome-utils/gnc-main-window.c:278
+#: gnucash/gnome-utils/gnc-main-window.c:279
msgid "_View"
msgstr "नà¥à¤¥à¤¾à¤¯"
#: gnucash/gnome/dialog-sx-editor2.c:168 gnucash/gnome/dialog-sx-editor.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:279
+#: gnucash/gnome-utils/gnc-main-window.c:280
msgid "_Actions"
msgstr "हाबाफोर"
@@ -3108,7 +3110,7 @@ msgstr "\"%s\" बोखावनायनि थाखाय कà¥à¤°à¥‡à¤¡à¤¿
msgid "Couldn't parse debit formula for split \"%s\"."
msgstr "\"%s\" बोखावनायनि थाखाय डेबिट फरमà¥à¤²à¤¾à¤–ौ पारà¥à¤¸ खालामनो हायाखै।"
-#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:874
+#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:880
#: gnucash/gnome/dialog-sx-from-trans.c:261
msgid ""
"The Scheduled Transaction Editor cannot automatically balance this "
@@ -3172,18 +3174,18 @@ msgstr ""
"नायनो गोनां: नोंथाङा टेमपà¥à¤²à¥‡à¤Ÿà¤†à¤µ सोलायनायखौ सिगाङावनो आजावबायबà¥à¤²à¤¾, बातिल खालामनायखौ "
"लाबोफिननाय नङा।"
-#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1406
+#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1412
msgid "(never)"
msgstr "(माबà¥à¤²à¤¾à¤¬à¤¾à¤¬à¥‹ नङा)"
-#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1568
+#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1574
msgid ""
"The current template transaction has been changed. Would you like to record "
"the changes?"
msgstr ""
"दानि टेमपà¥à¤²à¥‡à¤Ÿ लेनदेनखौ सोलायबाय। नोंथाङा सोलायनायफोरखौ रेकरà¥à¤¡ खालामनो लà¥à¤¬à¥ˆà¤¯à¥‹ नामा?"
-#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1844
+#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1850
#: gnucash/gnome/gnc-plugin-page-sx-list.c:246
#: gnucash/gnome/gnc-plugin-page-sx-list.c:252
msgid "Scheduled Transactions"
@@ -3196,31 +3198,31 @@ msgid ""
"cannot be automatically created."
msgstr "सोलायसà¥à¤²à¥à¤œà¥‹à¤‚ थि लेनदेनफोरखौ गावनो गाव महरै सोरजिनो हाया।"
-#: gnucash/gnome/dialog-sx-editor.c:675
+#: gnucash/gnome/dialog-sx-editor.c:679
#, fuzzy, c-format
msgid "Couldn't parse %s for split \"%s\"."
msgstr "\"%s\" बोखावनायनि थाखाय डेबिट फरमà¥à¤²à¤¾à¤–ौ पारà¥à¤¸ खालामनो हायाखै।"
-#: gnucash/gnome/dialog-sx-editor.c:739
+#: gnucash/gnome/dialog-sx-editor.c:745
#, c-format
msgid "Split with memo %s has an invalid account."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:742
+#: gnucash/gnome/dialog-sx-editor.c:748
#, fuzzy
msgid "Invalid Account in Split"
msgstr "टà¥à¤°à¥‡à¤¡à¤¿à¤‚ à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ गासैखौ सोफादेर"
-#: gnucash/gnome/dialog-sx-editor.c:754
+#: gnucash/gnome/dialog-sx-editor.c:760
#, c-format
msgid "Split with memo %s has an unparsable Credit Formula."
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:757 gnucash/gnome/dialog-sx-editor.c:773
+#: gnucash/gnome/dialog-sx-editor.c:763 gnucash/gnome/dialog-sx-editor.c:779
msgid "Unparsable Formula in Split"
msgstr ""
-#: gnucash/gnome/dialog-sx-editor.c:770
+#: gnucash/gnome/dialog-sx-editor.c:776
#, c-format
msgid "Split with memo %s has an unparsable Debit Formula."
msgstr ""
@@ -3475,7 +3477,7 @@ msgstr "मोनसे थाखानाय GnuCash फाइलखौ खे
#: gnucash/gnome/gnc-plugin-basic-commands.c:121
#: gnucash/gnome-utils/gnc-file.c:100 gnucash/gnome-utils/gnc-file.c:666
-#: gnucash/gnome-utils/gnc-main-window.c:1314
+#: gnucash/gnome-utils/gnc-main-window.c:1342
#: gnucash/html/gnc-html-webkit1.c:1198
msgid "_Save"
msgstr "थिना दोन"
@@ -4080,7 +4082,7 @@ msgstr "सायखखानाय à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¤¨à¤¿ चिलà¥à¤¡
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:185
#: gnucash/gnome/gnc-plugin-page-register2.c:340
#: gnucash/gnome/gnc-plugin-page-register.c:463
-#: gnucash/gnome-utils/gnc-main-window.c:349
+#: gnucash/gnome-utils/gnc-main-window.c:351
msgid "_Filter By..."
msgstr "..मथे फिलà¥à¤Ÿà¤¾à¤° खालाम..."
@@ -4092,7 +4094,7 @@ msgstr "..मथे फिलà¥à¤Ÿà¤¾à¤° खालाम..."
#: gnucash/gnome/gnc-plugin-page-register.c:467
#: gnucash/gnome/gnc-plugin-page-report.c:1231
#: gnucash/gnome/gnc-plugin-page-sx-list.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:353
+#: gnucash/gnome-utils/gnc-main-window.c:355
msgid "_Refresh"
msgstr "गोदान खालाम"
@@ -4103,7 +4105,7 @@ msgstr "गोदान खालाम"
#: gnucash/gnome/gnc-plugin-page-register.c:468
#: gnucash/gnome/gnc-plugin-page-report.c:1232
#: gnucash/gnome/gnc-plugin-page-sx-list.c:171
-#: gnucash/gnome-utils/gnc-main-window.c:354
+#: gnucash/gnome-utils/gnc-main-window.c:356
msgid "Refresh this window"
msgstr "बे उइनà¥à¤¡'खौ गोदान खालाम"
@@ -4526,7 +4528,7 @@ msgstr "कपि खालाम"
#: gnucash/gnome/gnc-plugin-page-register2.c:240
#: gnucash/gnome/gnc-plugin-page-register.c:354
#: gnucash/gnome/gnc-plugin-page-report.c:1226
-#: gnucash/gnome-utils/gnc-main-window.c:332
+#: gnucash/gnome-utils/gnc-main-window.c:333
msgid "_Paste"
msgstr "फोनांजाब हो"
@@ -5328,35 +5330,35 @@ msgstr "पà¥à¤°à¤¿à¤¨à¥à¤Ÿ चेकà¥â€Œà¤¸..."
#: gnucash/gnome/gnc-plugin-page-register2.c:230
#: gnucash/gnome/gnc-plugin-page-register.c:344
#: gnucash/gnome/gnc-plugin-page-report.c:1216
-#: gnucash/gnome-utils/gnc-main-window.c:322
+#: gnucash/gnome-utils/gnc-main-window.c:323
msgid "Cu_t"
msgstr "दानस'"
#: gnucash/gnome/gnc-plugin-page-register2.c:231
#: gnucash/gnome/gnc-plugin-page-register.c:345
#: gnucash/gnome/gnc-plugin-page-report.c:1217
-#: gnucash/gnome-utils/gnc-main-window.c:323
+#: gnucash/gnome-utils/gnc-main-window.c:324
msgid "Cut the current selection and copy it to clipboard"
msgstr "दानि सायखनायखौ दानस' आरो बेखौ कà¥à¤²à¤¿à¤ªà¤¬à¤°à¥à¤¡à¤¾à¤µ कपि खालाम।"
#: gnucash/gnome/gnc-plugin-page-register2.c:235
#: gnucash/gnome/gnc-plugin-page-register.c:349
#: gnucash/gnome/gnc-plugin-page-report.c:1221
-#: gnucash/gnome-utils/gnc-main-window.c:327
+#: gnucash/gnome-utils/gnc-main-window.c:328
msgid "_Copy"
msgstr "कपि खालाम"
#: gnucash/gnome/gnc-plugin-page-register2.c:236
#: gnucash/gnome/gnc-plugin-page-register.c:350
#: gnucash/gnome/gnc-plugin-page-report.c:1222
-#: gnucash/gnome-utils/gnc-main-window.c:328
+#: gnucash/gnome-utils/gnc-main-window.c:329
msgid "Copy the current selection to clipboard"
msgstr "दानि सायखनायखौ कà¥à¤²à¤¿à¤ªà¤¬à¤°à¥à¤¡à¤¾à¤µ कपि खालाम"
#: gnucash/gnome/gnc-plugin-page-register2.c:241
#: gnucash/gnome/gnc-plugin-page-register.c:355
#: gnucash/gnome/gnc-plugin-page-report.c:1227
-#: gnucash/gnome-utils/gnc-main-window.c:333
+#: gnucash/gnome-utils/gnc-main-window.c:334
msgid "Paste the clipboard content at the cursor position"
msgstr "कà¥à¤²à¤¿à¤ªà¤¬à¤°à¥à¤¡à¤¨à¤¿ आयदाखौ कारà¥à¤¸à¤°à¤¨à¤¿ जायगायाव फोनांजाब हो"
@@ -5822,7 +5824,7 @@ msgid "Remo_ve Other Splits"
msgstr "गà¥à¤¬à¥à¤¨ बोखावनायखौ बोखार"
#: gnucash/gnome/gnc-plugin-page-register.c:459
-#: gnucash/gnome-utils/gnc-main-window.c:345
+#: gnucash/gnome-utils/gnc-main-window.c:347
msgid "_Sort By..."
msgstr "..मथे थख' साजाय..."
@@ -6880,7 +6882,7 @@ msgstr "बिबां"
#: gnucash/gnome/window-reconcile2.c:2129
#: gnucash/gnome/window-reconcile2.c:2210 gnucash/gnome/window-reconcile.c:2391
#: gnucash/gnome/window-reconcile.c:2472
-#: gnucash/gnome-utils/gnc-main-window.c:285
+#: gnucash/gnome-utils/gnc-main-window.c:286
#: gnucash/gtkbuilder/dialog-account.glade:1121
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:23
#: gnucash/gtkbuilder/dialog-book-close.glade:22
@@ -6890,7 +6892,7 @@ msgstr "बिबां"
#: gnucash/gtkbuilder/dialog-custom-report.glade:29
#: gnucash/gtkbuilder/dialog-employee.glade:23
#: gnucash/gtkbuilder/dialog-fincalc.glade:107
-#: gnucash/gtkbuilder/dialog-import.glade:1023
+#: gnucash/gtkbuilder/dialog-import.glade:1168
#: gnucash/gtkbuilder/dialog-invoice.glade:657
#: gnucash/gtkbuilder/dialog-job.glade:24
#: gnucash/gtkbuilder/dialog-options.glade:21
@@ -6952,7 +6954,7 @@ msgid "Edit the main account for this register"
msgstr "बे रेजिसà¥à¤Ÿà¤¾à¤°à¤¨à¤¿ थाखाय गाहाइ à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ सà¥à¤œà¥"
#: gnucash/gnome/window-reconcile2.c:2173 gnucash/gnome/window-reconcile.c:2435
-#: gnucash/gnome-utils/gnc-main-window.c:360
+#: gnucash/gnome-utils/gnc-main-window.c:362
msgid "_Check & Repair"
msgstr "आनजाद खालाम & फाहाम"
@@ -7748,7 +7750,7 @@ msgid "_Save As"
msgstr "..बादि थिना दोन..."
#: gnucash/gnome-utils/dialog-options.c:225
-#: gnucash/gnome-utils/gnc-main-window.c:309
+#: gnucash/gnome-utils/gnc-main-window.c:310
#: gnucash/gtkbuilder/dialog-billterms.glade:731
#: gnucash/gtkbuilder/dialog-commodities.glade:174
#: gnucash/gtkbuilder/dialog-custom-report.glade:46
@@ -8296,7 +8298,7 @@ msgstr "गलेगलेथाय"
msgid "(unnamed)"
msgstr "(मà¥à¤‚होयै)"
-#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:289
+#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:290
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
#: gnucash/import-export/customer-import/gnc-plugin-customer-import.c:57
msgid "_Import"
@@ -8313,7 +8315,7 @@ msgstr "लाबोनाय"
msgid "Save"
msgstr "थिना दोन"
-#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:290
+#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:291
msgid "_Export"
msgstr "दैथायनाय"
@@ -8594,7 +8596,7 @@ msgid "Save changes to the file?"
msgstr "सोलायनायफोरखौ फाइलाव थिना दोन?"
#: gnucash/gnome-utils/gnc-file.c:656
-#: gnucash/gnome-utils/gnc-main-window.c:1307
+#: gnucash/gnome-utils/gnc-main-window.c:1335
#, c-format
msgid "If you don't save, changes from the past %d minute will be discarded."
msgid_plural ""
@@ -8654,7 +8656,7 @@ msgstr "फरायनो-थाखायल'खौ खेव"
msgid "Open _Folder"
msgstr "पà¥à¤²à¥‡à¤¸à¤¹'लà¥à¤¡à¤¾à¤°"
-#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:314
+#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:315
msgid "_Quit"
msgstr "नागार लां"
@@ -8697,7 +8699,7 @@ msgid ""
msgstr "%s फाइलआ सिगाङावनो दं। थारैनो नोंथाङा बेखौ अà¤à¤¾à¤°à¤°à¤¾à¤‡à¤Ÿ खालामनो लà¥à¤¬à¥ˆà¤¯à¥‹ नामा?"
#: gnucash/gnome-utils/gnc-file.c:1701
-#: gnucash/gnome-utils/gnc-main-window.c:1275
+#: gnucash/gnome-utils/gnc-main-window.c:1303
msgid "<unknown>"
msgstr "<मोनथिमोनै>"
@@ -8749,205 +8751,255 @@ msgstr "..जों फोनांजाब खालामनो थाखा
msgid "Changes will be saved automatically in %u seconds"
msgstr "सोलायनायखौ गावनो गाव महरै %u सेकेनà¥à¤¦à¤†à¤µ थिना दोनगोन"
-#: gnucash/gnome-utils/gnc-main-window.c:276
+#: gnucash/gnome-utils/gnc-main-window.c:277
msgid "_File"
msgstr "फाइल"
-#: gnucash/gnome-utils/gnc-main-window.c:280
+#: gnucash/gnome-utils/gnc-main-window.c:281
msgid "Tra_nsaction"
msgstr "लेनदेन"
-#: gnucash/gnome-utils/gnc-main-window.c:281
+#: gnucash/gnome-utils/gnc-main-window.c:282
msgid "_Reports"
msgstr "रिपरà¥à¤Ÿà¤«à¥‹à¤°"
-#: gnucash/gnome-utils/gnc-main-window.c:282
+#: gnucash/gnome-utils/gnc-main-window.c:283
msgid "_Tools"
msgstr "टà¥à¤²à¤¸"
-#: gnucash/gnome-utils/gnc-main-window.c:283
+#: gnucash/gnome-utils/gnc-main-window.c:284
msgid "E_xtensions"
msgstr "फेहेरनायफोर"
-#: gnucash/gnome-utils/gnc-main-window.c:284
+#: gnucash/gnome-utils/gnc-main-window.c:285
msgid "_Windows"
msgstr "उइनà¥à¤¡'स"
-#: gnucash/gnome-utils/gnc-main-window.c:292
+#: gnucash/gnome-utils/gnc-main-window.c:293
msgid "_Print..."
msgstr "साफाय..."
-#: gnucash/gnome-utils/gnc-main-window.c:293
+#: gnucash/gnome-utils/gnc-main-window.c:294
msgid "Print the currently active page"
msgstr "दासानà¥à¤¦à¤¿ मावथि बिलाइखौ साफाय"
-#: gnucash/gnome-utils/gnc-main-window.c:299
+#: gnucash/gnome-utils/gnc-main-window.c:300
msgid "Pa_ge Setup..."
msgstr "बिलाइनि सेटआप..."
-#: gnucash/gnome-utils/gnc-main-window.c:300
+#: gnucash/gnome-utils/gnc-main-window.c:301
msgid "Specify the page size and orientation for printing"
msgstr "साफायनायनि थाखाय बिलाइनि महर आरो अरियेनà¥à¤Ÿà¥‡à¤¸à¤¨à¤–ौ थिक खालाम"
-#: gnucash/gnome-utils/gnc-main-window.c:304
+#: gnucash/gnome-utils/gnc-main-window.c:305
msgid "Proper_ties"
msgstr "आथà¥à¤–ायफोर"
-#: gnucash/gnome-utils/gnc-main-window.c:305
+#: gnucash/gnome-utils/gnc-main-window.c:306
msgid "Edit the properties of the current file"
msgstr "दानि फाइलनि आखà¥à¤¥à¤¾à¤¯à¤«à¥‹à¤°à¤–ौ सà¥à¤œà¥"
-#: gnucash/gnome-utils/gnc-main-window.c:310
+#: gnucash/gnome-utils/gnc-main-window.c:311
msgid "Close the currently active page"
msgstr "दासानà¥à¤¦à¤¿ मावथि बिलाइखौ बनà¥à¤¦ खालाम"
-#: gnucash/gnome-utils/gnc-main-window.c:315
+#: gnucash/gnome-utils/gnc-main-window.c:316
msgid "Quit this application"
msgstr "बे à¤à¤ªà¥à¤²à¤¿à¤•à¥‡à¤¸à¤¨à¤–ौ नागार लां"
-#: gnucash/gnome-utils/gnc-main-window.c:337
+#: gnucash/gnome-utils/gnc-main-window.c:338
msgid "Pr_eferences"
msgstr "पसनà¥à¤¦"
-#: gnucash/gnome-utils/gnc-main-window.c:338
+#: gnucash/gnome-utils/gnc-main-window.c:339
msgid "Edit the global preferences of GnuCash"
msgstr "GnuCash नि मà¥à¤²à¥à¤—नां पसनà¥à¤¦à¤–ौ सà¥à¤œà¥"
-#: gnucash/gnome-utils/gnc-main-window.c:346
+#: gnucash/gnome-utils/gnc-main-window.c:345
+#, fuzzy
+#| msgid "<b>Tab Position</b>"
+msgid "Tab P_osition"
+msgstr "<b>टेबनि जायगा</b>"
+
+#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
msgstr "बे बिलाइनि नà¥à¤¥à¤¾à¤‡à¤¨à¤¿ थाखाय थख' साजायनाय खानà¥à¤¥à¤¿à¤–ौ सायख"
-#: gnucash/gnome-utils/gnc-main-window.c:350
+#: gnucash/gnome-utils/gnc-main-window.c:352
msgid "Select the account types that should be displayed."
msgstr "दिनà¥à¤¥à¤¿à¤«à¥à¤‚नो गोनां à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ रोखोमफोरखौ सायख।"
-#: gnucash/gnome-utils/gnc-main-window.c:362
+#: gnucash/gnome-utils/gnc-main-window.c:364
msgid "Reset _Warnings..."
msgstr "सांगà¥à¤°à¤¾à¤‚थिखौ फिन फज..."
-#: gnucash/gnome-utils/gnc-main-window.c:363
+#: gnucash/gnome-utils/gnc-main-window.c:365
msgid "Reset the state of all warning messages so they will be shown again."
msgstr ""
"सांगà¥à¤°à¤¾à¤‚थि होनाय गासै खौरांनि जायगाखौ फिन फज जाहाते बेफोरखौ आरोबाव दिनà¥à¤¥à¤¿à¤¨à¤¾à¤¯ जागोन।"
-#: gnucash/gnome-utils/gnc-main-window.c:367
+#: gnucash/gnome-utils/gnc-main-window.c:369
msgid "Re_name Page"
msgstr "बिलाइखौ फिन मà¥à¤‚ हो"
-#: gnucash/gnome-utils/gnc-main-window.c:368
+#: gnucash/gnome-utils/gnc-main-window.c:370
msgid "Rename this page."
msgstr "बे बिलाइखौ फिन मà¥à¤‚ हो।"
-#: gnucash/gnome-utils/gnc-main-window.c:375
+#: gnucash/gnome-utils/gnc-main-window.c:377
msgid "_New Window"
msgstr "गोदान उइनà¥à¤¡'"
-#: gnucash/gnome-utils/gnc-main-window.c:376
+#: gnucash/gnome-utils/gnc-main-window.c:378
msgid "Open a new top-level GnuCash window."
msgstr "मोनसे गोदान गोजौ-थाखोनि GnuCash उइनà¥à¤¡'खौ खेव।"
-#: gnucash/gnome-utils/gnc-main-window.c:380
+#: gnucash/gnome-utils/gnc-main-window.c:382
msgid "New Window with _Page"
msgstr "बिलाइजों गोदान उइनà¥à¤¡'"
-#: gnucash/gnome-utils/gnc-main-window.c:381
+#: gnucash/gnome-utils/gnc-main-window.c:383
msgid "Move the current page to a new top-level GnuCash window."
msgstr "दानि बिलाइखौ मोनसे गोदान-थाखोनि GnuCash उइनà¥à¤¡'याव लां"
-#: gnucash/gnome-utils/gnc-main-window.c:388
+#: gnucash/gnome-utils/gnc-main-window.c:390
msgid "Tutorial and Concepts _Guide"
msgstr "टिउट'रियाल आरो सानखांथि गाइडफोर"
-#: gnucash/gnome-utils/gnc-main-window.c:389
+#: gnucash/gnome-utils/gnc-main-window.c:391
msgid "Open the GnuCash Tutorial"
msgstr "GnuCash टिउट'रियालखौ खेव"
-#: gnucash/gnome-utils/gnc-main-window.c:393
+#: gnucash/gnome-utils/gnc-main-window.c:395
msgid "_Contents"
msgstr "थानाय आयदाफोर"
-#: gnucash/gnome-utils/gnc-main-window.c:394
+#: gnucash/gnome-utils/gnc-main-window.c:396
msgid "Open the GnuCash Help"
msgstr "GnuCash मददखौ खेव"
-#: gnucash/gnome-utils/gnc-main-window.c:398
+#: gnucash/gnome-utils/gnc-main-window.c:400
msgid "_About"
msgstr "सोमोनà¥à¤¦à¥ˆ"
-#: gnucash/gnome-utils/gnc-main-window.c:399
+#: gnucash/gnome-utils/gnc-main-window.c:401
msgid "About GnuCash"
msgstr "GnuCash नि सोमोनà¥à¤¦à¥ˆ"
-#: gnucash/gnome-utils/gnc-main-window.c:411
+#: gnucash/gnome-utils/gnc-main-window.c:413
msgid "_Toolbar"
msgstr "टà¥à¤²à¤¬à¤¾à¤°"
-#: gnucash/gnome-utils/gnc-main-window.c:412
+#: gnucash/gnome-utils/gnc-main-window.c:414
msgid "Show/hide the toolbar on this window"
msgstr "टà¥à¤²à¤¬à¤¾à¤°à¤–ौ बे उइनà¥à¤¡'याव दिनà¥à¤¥à¤¿/दोनखोमा"
-#: gnucash/gnome-utils/gnc-main-window.c:416
+#: gnucash/gnome-utils/gnc-main-window.c:418
msgid "Su_mmary Bar"
msgstr "गà¥à¤¬à¥ˆà¤°à¤¾à¤µ बार"
-#: gnucash/gnome-utils/gnc-main-window.c:417
+#: gnucash/gnome-utils/gnc-main-window.c:419
msgid "Show/hide the summary bar on this window"
msgstr "गà¥à¤¬à¥ˆà¤°à¤¾à¤µ बारखौ बे उइनà¥à¤¡'याव दिनà¥à¤¥à¤¿/दोनखोमा"
-#: gnucash/gnome-utils/gnc-main-window.c:421
+#: gnucash/gnome-utils/gnc-main-window.c:423
msgid "Stat_us Bar"
msgstr "सà¥à¤Ÿà¥‡à¤Ÿà¤¾à¤¸ बार"
-#: gnucash/gnome-utils/gnc-main-window.c:422
+#: gnucash/gnome-utils/gnc-main-window.c:424
msgid "Show/hide the status bar on this window"
msgstr "सà¥à¤Ÿà¥‡à¤Ÿà¤¾à¤¸ बारखौ बे उइनà¥à¤¡'याव दिनà¥à¤¥à¤¿/दोनखोमा"
-#: gnucash/gnome-utils/gnc-main-window.c:434
+#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gtkbuilder/dialog-preferences.glade:3895
+msgid "To_p"
+msgstr "गोजौ"
+
+#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
+#: gnucash/gtkbuilder/dialog-preferences.glade:3901
+msgid "Display the notebook tabs at the top of the window."
+msgstr "नटबà¥à¤• टेबफोरखौ उइनà¥à¤¡'नि गोजौयाव दिनà¥à¤¥à¤¿à¤«à¥à¤‚"
+
+#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gtkbuilder/dialog-preferences.glade:3914
+msgid "B_ottom"
+msgstr "गाहायनि"
+
+#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
+#: gnucash/gtkbuilder/dialog-preferences.glade:3920
+msgid "Display the notebook tabs at the bottom of the window."
+msgstr "नटबà¥à¤• टेबफोरखौ उइनà¥à¤¡'नि गाहायाव दिनà¥à¤¥à¤¿à¤«à¥à¤‚"
+
+#: gnucash/gnome-utils/gnc-main-window.c:444
+#: gnucash/gtkbuilder/dialog-preferences.glade:3933
+msgid "_Left"
+msgstr "आगसि"
+
+#: gnucash/gnome-utils/gnc-main-window.c:445
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
+#: gnucash/gtkbuilder/dialog-preferences.glade:3939
+msgid "Display the notebook tabs at the left of the window."
+msgstr "नटबà¥à¤• टेबफोरखौ उइनà¥à¤¡'नि आगसियाव दिनà¥à¤¥à¤¿à¤«à¥à¤‚"
+
+#: gnucash/gnome-utils/gnc-main-window.c:448
+#: gnucash/gtkbuilder/dialog-preferences.glade:3952
+msgid "_Right"
+msgstr "आगदा"
+
+#: gnucash/gnome-utils/gnc-main-window.c:449
+#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
+#: gnucash/gtkbuilder/dialog-preferences.glade:3958
+msgid "Display the notebook tabs at the right of the window."
+msgstr "नटबà¥à¤• टेबफोरखौ उइनà¥à¤¡'नि आगदायाव दिनà¥à¤¥à¤¿à¤«à¥à¤‚"
+
+#: gnucash/gnome-utils/gnc-main-window.c:462
msgid "Window _1"
msgstr "उइनà¥à¤¡'_1"
-#: gnucash/gnome-utils/gnc-main-window.c:435
+#: gnucash/gnome-utils/gnc-main-window.c:463
msgid "Window _2"
msgstr "उइनà¥à¤¡'_2"
-#: gnucash/gnome-utils/gnc-main-window.c:436
+#: gnucash/gnome-utils/gnc-main-window.c:464
msgid "Window _3"
msgstr "उइनà¥à¤¡'_3"
-#: gnucash/gnome-utils/gnc-main-window.c:437
+#: gnucash/gnome-utils/gnc-main-window.c:465
msgid "Window _4"
msgstr "उइनà¥à¤¡'_4"
-#: gnucash/gnome-utils/gnc-main-window.c:438
+#: gnucash/gnome-utils/gnc-main-window.c:466
msgid "Window _5"
msgstr "उइनà¥à¤¡'_5"
-#: gnucash/gnome-utils/gnc-main-window.c:439
+#: gnucash/gnome-utils/gnc-main-window.c:467
msgid "Window _6"
msgstr "उइनà¥à¤¡'_6"
-#: gnucash/gnome-utils/gnc-main-window.c:440
+#: gnucash/gnome-utils/gnc-main-window.c:468
msgid "Window _7"
msgstr "उइनà¥à¤¡'_7"
-#: gnucash/gnome-utils/gnc-main-window.c:441
+#: gnucash/gnome-utils/gnc-main-window.c:469
msgid "Window _8"
msgstr "उइनà¥à¤¡'_8"
-#: gnucash/gnome-utils/gnc-main-window.c:442
+#: gnucash/gnome-utils/gnc-main-window.c:470
msgid "Window _9"
msgstr "उइनà¥à¤¡'_9"
-#: gnucash/gnome-utils/gnc-main-window.c:443
+#: gnucash/gnome-utils/gnc-main-window.c:471
msgid "Window _0"
msgstr "उइनà¥à¤¡'_0"
-#: gnucash/gnome-utils/gnc-main-window.c:1258
+#: gnucash/gnome-utils/gnc-main-window.c:1286
#, c-format
msgid "Save changes to file %s before closing?"
msgstr "बनà¥à¤¦ खालामनायनि सिगां सोलायनायफोरखौ %s फाइलआन थिना दोन?"
-#: gnucash/gnome-utils/gnc-main-window.c:1261
+#: gnucash/gnome-utils/gnc-main-window.c:1289
#, c-format
msgid ""
"If you don't save, changes from the past %d hours and %d minutes will be "
@@ -8956,7 +9008,7 @@ msgstr ""
"नोंथाङा थिना दोनाबà¥à¤²à¤¾, सिगां %d घनà¥à¤Ÿà¤¾ आरो %d मिनिटनि सोलायनायफोरखौ नागारनाय "
"जागोन।"
-#: gnucash/gnome-utils/gnc-main-window.c:1263
+#: gnucash/gnome-utils/gnc-main-window.c:1291
#, c-format
msgid ""
"If you don't save, changes from the past %d days and %d hours will be "
@@ -8964,15 +9016,15 @@ msgid ""
msgstr ""
"नोंथाङा थिना दोनाबà¥à¤²à¤¾, सिगां %d सान आरो %d घनà¥à¤Ÿà¤¾à¤¨à¤¿ सोलायनायफोरखौ नागारनाय जागोन।"
-#: gnucash/gnome-utils/gnc-main-window.c:1312
+#: gnucash/gnome-utils/gnc-main-window.c:1340
msgid "Close _Without Saving"
msgstr "थिना दोनागारानो बनà¥à¤¦ खालाम"
-#: gnucash/gnome-utils/gnc-main-window.c:1459
+#: gnucash/gnome-utils/gnc-main-window.c:1487
msgid "This window is closing and will not be restored."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:1465
+#: gnucash/gnome-utils/gnc-main-window.c:1493
#, fuzzy
#| msgid "Close this window"
msgid "Close Window?"
@@ -8980,64 +9032,64 @@ msgstr "बे उइनà¥à¤¡'खौ बनà¥à¤¦ खालाम"
#. Translators: This string is shown in the window title if this
#. document is, well, read-only.
-#: gnucash/gnome-utils/gnc-main-window.c:1595
+#: gnucash/gnome-utils/gnc-main-window.c:1623
msgid "(read-only)"
msgstr "(फरायनो-थाखायल')"
-#: gnucash/gnome-utils/gnc-main-window.c:1603
+#: gnucash/gnome-utils/gnc-main-window.c:1631
msgid "Unsaved Book"
msgstr "थिना दोनै बिजाब"
-#: gnucash/gnome-utils/gnc-main-window.c:1766
+#: gnucash/gnome-utils/gnc-main-window.c:1794
#, fuzzy
msgid "Last modified on %a, %b %d, %Y at %I:%M %p"
msgstr "%a, %b %e, %Y at %I:%M%P आव जोबथा सà¥à¤¦à¥à¤°à¤¾à¤¯à¤¨à¤¾à¤¯"
#. Translators: This message appears in the status bar after opening the file.
-#: gnucash/gnome-utils/gnc-main-window.c:1769
+#: gnucash/gnome-utils/gnc-main-window.c:1797
#, c-format
msgid "File %s opened. %s"
msgstr "फाइल %s खौ खेवबायमोन। %s"
-#: gnucash/gnome-utils/gnc-main-window.c:2896
+#: gnucash/gnome-utils/gnc-main-window.c:2924
msgctxt "lower case key for short cut to 'Accounts'"
msgid "a"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:2986
+#: gnucash/gnome-utils/gnc-main-window.c:3014
msgid "Unable to save to database."
msgstr "डाटाबेसाव थिना दोननो हायाखै।"
-#: gnucash/gnome-utils/gnc-main-window.c:2988
+#: gnucash/gnome-utils/gnc-main-window.c:3016
msgid "Unable to save to database: Book is marked read-only."
msgstr "डाटाबेसाव थिना दोननो हायाखै: बिजाबखौ खालि-फरायनाय बादिल' दाग होनाय जायो।"
-#: gnucash/gnome-utils/gnc-main-window.c:4333
+#: gnucash/gnome-utils/gnc-main-window.c:4396
#: gnucash/gtkbuilder/assistant-qif-import.glade:959
msgid "Book Options"
msgstr "बिजाबनि उफà¥à¤°à¤¾à¤«à¥‹à¤°"
-#: gnucash/gnome-utils/gnc-main-window.c:4751 gnucash/gnucash-core-app.cpp:261
+#: gnucash/gnome-utils/gnc-main-window.c:4853 gnucash/gnucash-core-app.cpp:261
msgid "(user modifiable)"
msgstr ""
#. Translators: %s will be replaced with the current year
-#: gnucash/gnome-utils/gnc-main-window.c:4778
+#: gnucash/gnome-utils/gnc-main-window.c:4880
#, c-format
msgid "Copyright © 1997-%s The GnuCash contributors."
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4790
+#: gnucash/gnome-utils/gnc-main-window.c:4892
#: gnucash/gnome-utils/gnc-splash.c:98
msgid "Version"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4791
+#: gnucash/gnome-utils/gnc-main-window.c:4893
#: gnucash/gnome-utils/gnc-splash.c:99 gnucash/gnucash-core-app.cpp:278
msgid "Build ID"
msgstr ""
-#: gnucash/gnome-utils/gnc-main-window.c:4799
+#: gnucash/gnome-utils/gnc-main-window.c:4901
#, fuzzy
msgid "Accounting for personal and small business finance."
msgstr "- GnuCash निजि आरो फिसा फालांगि रांखानà¥à¤¥à¤¿ मेनेजमेनà¥à¤Ÿ"
@@ -9046,11 +9098,11 @@ msgstr "- GnuCash निजि आरो फिसा फालांगि र
#. Enter your name or that of your team and an email contact for feedback.
#. The string can have multiple rows, so you can also add a list of
#. contributors.
-#: gnucash/gnome-utils/gnc-main-window.c:4808
+#: gnucash/gnome-utils/gnc-main-window.c:4910
msgid "translator-credits"
msgstr "Ritu Panwar <ritup at cdac.in>, 2014"
-#: gnucash/gnome-utils/gnc-main-window.c:4811
+#: gnucash/gnome-utils/gnc-main-window.c:4913
msgid "Visit the GnuCash website."
msgstr ""
@@ -9592,7 +9644,7 @@ msgid "Dist"
msgstr "डिसà¥à¤Ÿ"
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:45
-#: gnucash/import-export/import-main-matcher.c:1594
+#: gnucash/import-export/import-main-matcher.c:1862
#: gnucash/report/reports/standard/register.scm:218
#: libgnucash/engine/Split.c:1614 libgnucash/engine/Split.c:1631
msgid "-- Split Transaction --"
@@ -10198,12 +10250,12 @@ msgid "Enter the effective share price"
msgstr "गोहोमगोनां शेयार बेसेन हाबहो"
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3323
-#: gnucash/register/ledger-core/split-register-model.c:2380
+#: gnucash/register/ledger-core/split-register-model.c:2385
msgid "Enter credit formula for real transaction"
msgstr "थार लेनदेननि थाखाय कà¥à¤°à¥‡à¤¡à¤¿à¤Ÿ फरमà¥à¤²à¤¾à¤–ौ हाबहो"
#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3333
-#: gnucash/register/ledger-core/split-register-model.c:2346
+#: gnucash/register/ledger-core/split-register-model.c:2349
msgid "Enter debit formula for real transaction"
msgstr "थार लेनदेननि थाखाय डेबिट फरमà¥à¤²à¤¾à¤–ौ हाबहो"
@@ -11955,11 +12007,6 @@ msgstr ""
"मावथिबà¥à¤²à¤¾, आरामà¥à¤ खालामनाय समाव मोनसे सà¥à¤ªà¥à¤²à¥‡à¤¸ सà¥à¤•à¥à¤°à¤¿à¤¨à¤–ौ दिनà¥à¤¥à¤¿à¤¨à¤¾à¤¯ जागोन। नङाबà¥à¤²à¤¾ जेबो "
"सà¥à¤ªà¥à¤²à¥‡à¤¸ सà¥à¤•à¥à¤°à¤¿à¤¨ दिनà¥à¤¥à¤¿à¤¨à¤¾à¤¯ जानाय नङा।"
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:195
-#: gnucash/gtkbuilder/dialog-preferences.glade:3901
-msgid "Display the notebook tabs at the top of the window."
-msgstr "नटबà¥à¤• टेबफोरखौ उइनà¥à¤¡'नि गोजौयाव दिनà¥à¤¥à¤¿à¤«à¥à¤‚"
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:196
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:201
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:206
@@ -11972,21 +12019,6 @@ msgstr ""
"बे सेटिंआ नटबà¥à¤•à¤¾à¤µ बिलाइ सोलायनायनि थाखाय टेबफोरखौ बोबोनाय रà¥à¤—à¥à¤‚खौ थि खालामो। जाथाव "
"बेसेनफोरा \"आगसि\", \"गाहाय\" आरो \"आगदा\"। बेयो \"गोजौ\" आव डिफलà¥à¤Ÿ जायो।"
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:200
-#: gnucash/gtkbuilder/dialog-preferences.glade:3920
-msgid "Display the notebook tabs at the bottom of the window."
-msgstr "नटबà¥à¤• टेबफोरखौ उइनà¥à¤¡'नि गाहायाव दिनà¥à¤¥à¤¿à¤«à¥à¤‚"
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:205
-#: gnucash/gtkbuilder/dialog-preferences.glade:3939
-msgid "Display the notebook tabs at the left of the window."
-msgstr "नटबà¥à¤• टेबफोरखौ उइनà¥à¤¡'नि आगसियाव दिनà¥à¤¥à¤¿à¤«à¥à¤‚"
-
-#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:210
-#: gnucash/gtkbuilder/dialog-preferences.glade:3958
-msgid "Display the notebook tabs at the right of the window."
-msgstr "नटबà¥à¤• टेबफोरखौ उइनà¥à¤¡'नि आगदायाव दिनà¥à¤¥à¤¿à¤«à¥à¤‚"
-
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:215
#: gnucash/gtkbuilder/dialog-preferences.glade:3990
msgid "Display the summary bar at the top of the page."
@@ -13579,7 +13611,7 @@ msgid "Select a row to change the mappings"
msgstr ""
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:970
-#: gnucash/import-export/import-account-matcher.c:188
+#: gnucash/import-export/import-account-matcher.c:197
msgid "Account ID"
msgstr "à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ ID"
@@ -14610,6 +14642,7 @@ msgid "_Amount"
msgstr "बिबां:"
#: gnucash/gtkbuilder/assistant-stock-split.glade:293
+#: gnucash/gtkbuilder/dialog-import.glade:958
#: gnucash/gtkbuilder/dialog-print-check.glade:1129
#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:957
msgid "_Memo"
@@ -15010,6 +15043,7 @@ msgid "_Account code"
msgstr "à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ क'ड"
#: gnucash/gtkbuilder/dialog-account.glade:1251
+#: gnucash/gtkbuilder/dialog-import.glade:930
msgid "_Description"
msgstr "बेखेवथि"
@@ -16305,46 +16339,59 @@ msgstr "गोमो"
msgid "Green"
msgstr "सोमखोर"
-#: gnucash/gtkbuilder/dialog-import.glade:877
+#: gnucash/gtkbuilder/dialog-import.glade:871
+#, fuzzy
+#| msgid "Do not print transaction detail"
+msgid "Edit imported transaction details"
+msgstr "लेनदेनखौ गà¥à¤µà¤¾à¤°à¥ˆ साफायनो नाङा"
+
+#: gnucash/gtkbuilder/dialog-import.glade:944
+#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
+#: gnucash/gtkbuilder/dialog-print-check.glade:745
+#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
+msgid "_Notes"
+msgstr "लिरसà¥à¤‚थाइ"
+
+#: gnucash/gtkbuilder/dialog-import.glade:1022
#, fuzzy
msgid ""
"List of downloaded transactions (source split and matched information shown)"
msgstr "डाउनल'ड खालामनाय लेनदेनफोरनि लिसà¥à¤Ÿ (फà¥à¤‚खा बोखावनाय दिनà¥à¤¥à¤¿à¤¨à¤¾à¤¯)"
-#: gnucash/gtkbuilder/dialog-import.glade:919
+#: gnucash/gtkbuilder/dialog-import.glade:1064
#, fuzzy
msgid "Show _Account column"
msgstr "à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¤¨à¤¿ गाबखौ टेबआव दिनà¥à¤¥à¤¿"
-#: gnucash/gtkbuilder/dialog-import.glade:935
+#: gnucash/gtkbuilder/dialog-import.glade:1080
#, fuzzy
msgid "Show _Memo column"
msgstr "à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¤¨à¤¿ गाबखौ टेबआव दिनà¥à¤¥à¤¿"
-#: gnucash/gtkbuilder/dialog-import.glade:951
+#: gnucash/gtkbuilder/dialog-import.glade:1096
#, fuzzy
msgid "Show matched _information"
msgstr "रसिद फोरमायथिहोगà¥à¤°à¤¾"
-#: gnucash/gtkbuilder/dialog-import.glade:966
+#: gnucash/gtkbuilder/dialog-import.glade:1111
#, fuzzy
#| msgid "Spend"
msgid "A_ppend"
msgstr "रां खरसा खालाम"
-#: gnucash/gtkbuilder/dialog-import.glade:970
+#: gnucash/gtkbuilder/dialog-import.glade:1115
msgid ""
"When Updating and Clearing a matched transaction, append the imported "
"Description and Notes to the matched Description and Notes instead of "
"replacing them."
msgstr ""
-#: gnucash/gtkbuilder/dialog-import.glade:982
+#: gnucash/gtkbuilder/dialog-import.glade:1127
#, fuzzy
msgid "_Reconcile after match"
msgstr "(अट') गोरोबनायखौ गोरोबहोफिन"
-#: gnucash/gtkbuilder/dialog-import.glade:1005
+#: gnucash/gtkbuilder/dialog-import.glade:1150
msgid "Generic import transaction matcher"
msgstr "जेनेरिक लाबोनाय लेनदेन गोरोबहोगà¥à¤°à¤¾"
@@ -16460,12 +16507,6 @@ msgstr "हाइलाइट खालामनाय लटà¥â€Œà¤–ौ खो
msgid "Enter a name for the highlighted lot."
msgstr "हाइलाइट खालामनाय लटà¥â€Œà¤¨à¤¿ थाखाय मà¥à¤‚खौ हाबहो।"
-#: gnucash/gtkbuilder/dialog-lot-viewer.glade:151
-#: gnucash/gtkbuilder/dialog-print-check.glade:745
-#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1014
-msgid "_Notes"
-msgstr "लिरसà¥à¤‚थाइ"
-
#: gnucash/gtkbuilder/dialog-lot-viewer.glade:174
msgid "Enter any notes you want to make about this lot."
msgstr "नोंथाङा बे लटà¥â€Œà¤¨à¤¿ सोमोनà¥à¤¦à¥ˆ होनो लà¥à¤¬à¥ˆà¤¨à¤¾à¤¯ जायखिजाया लिरसà¥à¤‚थाइखौ हाबहो"
@@ -17525,22 +17566,6 @@ msgstr "बावैसोथारनि टेबखौ सिगाङाव
msgid "<b>Tab Position</b>"
msgstr "<b>टेबनि जायगा</b>"
-#: gnucash/gtkbuilder/dialog-preferences.glade:3895
-msgid "To_p"
-msgstr "गोजौ"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3914
-msgid "B_ottom"
-msgstr "गाहायनि"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3933
-msgid "_Left"
-msgstr "आगसि"
-
-#: gnucash/gtkbuilder/dialog-preferences.glade:3952
-msgid "_Right"
-msgstr "आगदा"
-
#: gnucash/gtkbuilder/dialog-preferences.glade:3974
msgid "<b>Summary Bar Position</b>"
msgstr "<b>सारबाहागो बारनि जायगा</b>"
@@ -19426,15 +19451,15 @@ msgstr "PDF फाइलआव दैथाय हर"
msgid "Bank code %s (%s), Account %s (%s)"
msgstr ""
-#: gnucash/import-export/aqb/assistant-ab-initial.c:858
+#: gnucash/import-export/aqb/assistant-ab-initial.c:859
msgid "Online Banking Account Name"
msgstr "अनलाइन बेंकिं à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¤¨à¤¿ मà¥à¤‚"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:863
+#: gnucash/import-export/aqb/assistant-ab-initial.c:864
msgid "GnuCash Account Name"
msgstr "GnuCash à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¤¨à¤¿ मà¥à¤‚"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:869
+#: gnucash/import-export/aqb/assistant-ab-initial.c:870
#: gnucash/import-export/qif-imp/assistant-qif-import.c:572
#: gnucash/import-export/qif-imp/dialog-account-picker.c:452
msgid "New?"
@@ -21615,7 +21640,7 @@ msgstr "बायगà¥à¤°à¤¾ आरो फानगà¥à¤°à¤¾ लाबो"
msgid "Import Customers and Vendors from a CSV text file."
msgstr "फरा फाइल निफà¥à¤°à¤¾à¤¯ बायगà¥à¤°à¤¾ à¤à¤¬à¤¾ फानगà¥à¤°à¤¾à¤–ौ लाबो"
-#: gnucash/import-export/import-account-matcher.c:263
+#: gnucash/import-export/import-account-matcher.c:272
#, fuzzy, c-format
msgid ""
"The account '%s' is a placeholder account and does not allow transactions. "
@@ -21624,7 +21649,7 @@ msgstr ""
"%s à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¤† मोनसे पà¥à¤²à¥‡à¤¸à¤¹'लà¥à¤¡à¤° à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ आरो बेयो लेनदेनखौ गनायथि होआ। अननानै मोनसे गà¥à¤¬à¥à¤¨ "
"à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ बासिख।"
-#: gnucash/import-export/import-account-matcher.c:280
+#: gnucash/import-export/import-account-matcher.c:289
#, fuzzy, c-format
msgid ""
"The account '%s' has a different commodity to the one required, '%s'. Please "
@@ -21633,7 +21658,7 @@ msgstr ""
"%s à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¤† मोनसे पà¥à¤²à¥‡à¤¸à¤¹'लà¥à¤¡à¤° à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ आरो बेयो लेनदेनखौ गनायथि होआ। अननानै मोनसे गà¥à¤¬à¥à¤¨ "
"à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ बासिख।"
-#: gnucash/import-export/import-account-matcher.c:472
+#: gnucash/import-export/import-account-matcher.c:481
msgid "(Full account ID: "
msgstr "(आबà¥à¤‚ à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ ID: "
@@ -21662,139 +21687,127 @@ msgstr "y/m/d"
msgid "y/d/m"
msgstr "y/d/m"
-#: gnucash/import-export/import-main-matcher.c:462
+#: gnucash/import-export/import-main-matcher.c:518
#, fuzzy
msgid "No new transactions were found in this import."
msgstr "बे लेनदेनआ URI जों थाफाया।"
-#: gnucash/import-export/import-main-matcher.c:630
-#: gnucash/import-export/import-main-matcher.c:783
+#: gnucash/import-export/import-main-matcher.c:687
+#: gnucash/import-export/import-main-matcher.c:840
msgid "Destination account for the auto-balance split."
msgstr "अट'-बेलेनà¥à¤¸ बोखावनायनि थाखाय थांखि à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¥¤"
-#: gnucash/import-export/import-main-matcher.c:943
-#, fuzzy
-#| msgid "Enter the Entry Description"
-msgid "Enter new Description"
-msgstr "हाबहोनाय बेखेवथि हाबहो"
-
-#: gnucash/import-export/import-main-matcher.c:958
-#, fuzzy
-#| msgid "Enter Due Date"
-msgid "Enter new Memo"
-msgstr "होनो गोनां अकà¥à¤Ÿ'खौ हाबहो"
-
-#: gnucash/import-export/import-main-matcher.c:971
+#: gnucash/import-export/import-main-matcher.c:1026
+#: gnucash/report/html-utilities.scm:338
+#: gnucash/report/reports/standard/balsheet-pnl.scm:154
+#: gnucash/report/reports/standard/new-owner-report.scm:942
#, fuzzy
-msgid "Enter new Notes"
-msgstr "बांदà¥à¤°à¤¾à¤¯ लिरसà¥à¤‚थाइ"
+msgid "Disabled"
+msgstr "हाहोबाय"
-#: gnucash/import-export/import-main-matcher.c:1097
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1321
#, fuzzy
-msgid "Assign a transfer account to the selection."
+msgid "_Assign a transfer account to the selection"
msgstr "à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿ टà¥à¤°à¤¿ निफà¥à¤°à¤¾à¤¯ टà¥à¤°à¥‡à¤¨à¥à¤¸à¤«à¤¾à¤° à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¤–ौ सायखथारनांगोन"
-#: gnucash/import-export/import-main-matcher.c:1108
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1368
#, fuzzy
-#| msgid "description"
-msgid "Edit description."
-msgstr "बेखेवथि"
-
-#: gnucash/import-export/import-main-matcher.c:1116
-#, fuzzy
-#| msgid "Edit Job"
-msgid "Edit memo."
-msgstr "खामानि सà¥à¤œà¥"
+msgid "_Edit description, notes, or memo"
+msgstr "बेखेवथि / लिरसà¥à¤‚थाइ / मेम'"
-#: gnucash/import-export/import-main-matcher.c:1124
+#. Translators: Menu entry, no full stop
+#: gnucash/import-export/import-main-matcher.c:1377
#, fuzzy
-msgid "Edit notes."
-msgstr "कà¥à¤°à¥‡à¤¡à¤¿à¤Ÿ लिरसà¥à¤‚थाइ"
+#| msgid "Reset defaults"
+msgid "_Reset all edits"
+msgstr "डिफलà¥à¤Ÿà¤«à¥‹à¤°à¤–ौ फिन फज"
-#: gnucash/import-export/import-main-matcher.c:1286
+#: gnucash/import-export/import-main-matcher.c:1547
#, fuzzy
#| msgid "A"
msgctxt "Column header for 'Adding transaction'"
msgid "A"
msgstr "A"
-#: gnucash/import-export/import-main-matcher.c:1289
+#: gnucash/import-export/import-main-matcher.c:1550
#, fuzzy
msgctxt "Column header for 'Updating plus Clearing transaction'"
msgid "U+C"
msgstr "U+R"
-#: gnucash/import-export/import-main-matcher.c:1293
+#: gnucash/import-export/import-main-matcher.c:1554
#, fuzzy
#| msgid "C"
msgctxt "Column header for 'Clearing transaction'"
msgid "C"
msgstr "C"
-#: gnucash/import-export/import-main-matcher.c:1300
+#: gnucash/import-export/import-main-matcher.c:1561
msgid "Info"
msgstr "फोरमायथिहोगà¥à¤°à¤¾"
-#: gnucash/import-export/import-main-matcher.c:1307
+#: gnucash/import-export/import-main-matcher.c:1568
#: gnucash/report/stylesheets/head-or-tail.scm:102
#, fuzzy
msgid "Additional Comments"
msgstr "कारà¥à¤¡à¤¾à¤µ बांदà¥à¤°à¤¾à¤¯:"
-#: gnucash/import-export/import-main-matcher.c:1700
+#: gnucash/import-export/import-main-matcher.c:1987
msgid "New, already balanced"
msgstr "गोदान, सिगाङावनो समायथाय खालामबाय"
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1726
+#: gnucash/import-export/import-main-matcher.c:2013
#, c-format
msgid "New, transfer %s to (manual) \"%s\""
msgstr "गोदान, %s खौ (मेनà¥à¤¯à¥‡à¤²) \"%s\"आव जायगा सोलायहो"
#. Translators: %1$s is the amount to be transferred,
#. %2$s the destination account.
-#: gnucash/import-export/import-main-matcher.c:1734
+#: gnucash/import-export/import-main-matcher.c:2021
#, c-format
msgid "New, transfer %s to (auto) \"%s\""
msgstr "गोदान, %s खौ (अट') \"%s\" आव जायगा सोलायहो"
#. Translators: %s is the amount to be transferred.
-#: gnucash/import-export/import-main-matcher.c:1745
+#: gnucash/import-export/import-main-matcher.c:2032
#, c-format
msgid "New, UNBALANCED (need acct to transfer %s)!"
msgstr "गोदान, UNBALANCED (à¤à¤•à¤¾à¤‰à¤¨à¥à¤Ÿà¤–ौ %s आव जायगा सोलायहोनांगौ)!"
-#: gnucash/import-export/import-main-matcher.c:1763
+#: gnucash/import-export/import-main-matcher.c:2050
#, fuzzy, c-format
#| msgid "Reconcile (manual) match"
msgid "Reconcile (manual) match to %s"
msgstr "(मेनà¥à¤¯à¥‡à¤²) गोरोबनायखौ गोरोबहोफिन"
-#: gnucash/import-export/import-main-matcher.c:1768
+#: gnucash/import-export/import-main-matcher.c:2055
#, fuzzy, c-format
#| msgid "Reconcile (auto) match"
msgid "Reconcile (auto) match to %s"
msgstr "(अट') गोरोबनायखौ गोरोबहोफिन"
-#: gnucash/import-export/import-main-matcher.c:1777
-#: gnucash/import-export/import-main-matcher.c:1807
+#: gnucash/import-export/import-main-matcher.c:2064
+#: gnucash/import-export/import-main-matcher.c:2094
msgid "Match missing!"
msgstr "गोरोबनाय गैया!"
-#: gnucash/import-export/import-main-matcher.c:1793
+#: gnucash/import-export/import-main-matcher.c:2080
#, fuzzy, c-format
#| msgid "Update and reconcile (manual) match"
msgid "Update and reconcile (manual) match to %s"
msgstr "(मेनà¥à¤¯à¥‡à¤²) गोरोबनायखौ आपडेट खालाम आरो गोरोबहोफिन"
-#: gnucash/import-export/import-main-matcher.c:1798
+#: gnucash/import-export/import-main-matcher.c:2085
#, fuzzy, c-format
#| msgid "Update and reconcile (auto) match"
msgid "Update and reconcile (auto) match to %s"
msgstr "(अट') गोरोबनायखौ आपडेट खालाम आरो गोरोबहोफिन"
-#: gnucash/import-export/import-main-matcher.c:1815
+#: gnucash/import-export/import-main-matcher.c:2102
msgid "Do not import (no action selected)"
msgstr "लाबोनो नाङा (जेबो हाबा सायख'वाखै)"
@@ -23185,13 +23198,6 @@ msgstr[1] "सोलाय सोल' हार"
msgid "No budgets exist. You must create at least one budget."
msgstr "जेबो बाजेत गैया। नोंथाङा खमैबो मोनसे बाजेत सोरजिथारनांगोन।"
-#: gnucash/report/html-utilities.scm:338
-#: gnucash/report/reports/standard/balsheet-pnl.scm:154
-#: gnucash/report/reports/standard/new-owner-report.scm:942
-#, fuzzy
-msgid "Disabled"
-msgstr "हाहोबाय"
-
#: gnucash/report/html-utilities.scm:391
msgid "This report requires you to specify certain report options."
msgstr "बे रिपरà¥à¤Ÿà¤† नोंथांखौ थि रिपरà¥à¤Ÿ उफà¥à¤°à¤¾à¤–ौ थिक खालामनो थिनो।"
@@ -30180,23 +30186,23 @@ msgstr "अनजिमायारि गोरोनà¥à¤¥à¤¿"
#. Translators: A list of error messages from the Scheduled Transactions (SX).
#. They might appear in their editor or in "Since last run".
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1018
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1019
#, c-format
msgid "Unknown account for guid [%s], cancelling SX [%s] creation."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1071
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1074
#, c-format
msgid "Error parsing SX [%s] key [%s]=formula [%s] at [%s]: %s."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1125
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1788
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1130
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1793
#, c-format
msgid "Error %d in SX [%s] final gnc_numeric value, using 0 instead."
msgstr ""
-#: libgnucash/app-utils/gnc-sx-instance-model.c:1797
+#: libgnucash/app-utils/gnc-sx-instance-model.c:1802
#, c-format
msgid "No exchange rate available in SX [%s] for %s -> %s, value is zero."
msgstr ""
@@ -30683,11 +30689,11 @@ msgctxt ""
msgid "Split"
msgstr "बोखावनाय"
-#: libgnucash/engine/Transaction.c:2784
+#: libgnucash/engine/Transaction.c:2807
msgid "Voided transaction"
msgstr "बातिल खालामनाय लेनदेन"
-#: libgnucash/engine/Transaction.c:2800
+#: libgnucash/engine/Transaction.c:2823
msgid "Transaction Voided"
msgstr "लेनदेन बातिल खालामबाय"
diff --git a/po/ca.po b/po/ca.po
index 8cab155c8..1e7da687d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -43,10 +43,10 @@
# Voucher - comprovant
msgid ""
msgstr ""
-"Project-Id-Version: GnuCash 4.11-1\n"
+"Project-Id-Version: GnuCash 4.11-2\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
-"POT-Creation-Date: 2022-07-17 04:04+0200\n"
+"POT-Creation-Date: 2022-07-22 06:33+0200\n"
"PO-Revision-Date: 2021-04-18 17:21+0200\n"
"Last-Translator: Walter Garcia-Fontes <walter.garcia at upf.edu>\n"
"Language-Team: Catalan <ca at dodds.net>\n"
@@ -1025,7 +1025,7 @@ msgstr "Opció de devolució del préstec: «%s»"
#: gnucash/import-export/csv-exp/csv-transactions-export.c:622
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:53
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:63
-#: gnucash/import-export/import-main-matcher.c:1280
+#: gnucash/import-export/import-main-matcher.c:1541
#: gnucash/import-export/import-match-picker.c:393
#: gnucash/import-export/import-match-picker.c:433
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3700
@@ -1125,7 +1125,7 @@ msgstr "S'ha produït un error en afegir la cotització."
#: gnucash/import-export/aqb/gnc-ab-utils.c:559
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:147
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:70
-#: gnucash/import-export/import-main-matcher.c:1281
+#: gnucash/import-export/import-main-matcher.c:1542
#: gnucash/import-export/import-match-picker.c:392
#: gnucash/import-export/qif-imp/dialog-account-picker.c:433
#: gnucash/register/ledger-core/split-register-model.c:342
@@ -1382,8 +1382,8 @@ msgstr "Voleu suprimir l'acció o divisa?"
#: gnucash/gnome-utils/gnc-file.c:118 gnucash/gnome-utils/gnc-file.c:366
#: gnucash/gnome-utils/gnc-file.c:664 gnucash/gnome-utils/gnc-gui-query.c:300
#: gnucash/gnome-utils/gnc-gui-query.c:332
-#: gnucash/gnome-utils/gnc-main-window.c:1313
-#: gnucash/gnome-utils/gnc-main-window.c:1470
+#: gnucash/gnome-utils/gnc-main-window.c:1341
+#: gnucash/gnome-utils/gnc-main-window.c:1498
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:886
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1023
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1063
@@ -1412,7 +1412,8 @@ msgstr "Voleu suprimir l'acció o divisa?"
#: gnucash/gtkbuilder/dialog-fincalc.glade:137
#: gnucash/gtkbuilder/dialog-import.glade:46
#: gnucash/gtkbuilder/dialog-import.glade:328
-#: gnucash/gtkbuilder/dialog-import.glade:1040
+#: gnucash/gtkbuilder/dialog-import.glade:885
+#: gnucash/gtkbuilder/dialog-import.glade:1185
#: gnucash/gtkbuilder/dialog-invoice.glade:674
#: gnucash/gtkbuilder/dialog-invoice.glade:1198
#: gnucash/gtkbuilder/dialog-job.glade:41
@@ -1636,7 +1637,7 @@ msgstr "Selecciona el document"
#: gnucash/gnome-utils/gnc-gui-query.c:297
#: gnucash/gnome-utils/gnc-gui-query.c:331
#: gnucash/gnome-utils/gnc-gui-query.c:417
-#: gnucash/gnome-utils/gnc-main-window.c:1471
+#: gnucash/gnome-utils/gnc-main-window.c:1499
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:196
#: gnucash/gtkbuilder/dialog-account.glade:35
#: gnucash/gtkbuilder/dialog-account.glade:832
@@ -1659,7 +1660,8 @@ msgstr "Selecciona el document"
#: gnucash/gtkbuilder/dialog-import.glade:61
#: gnucash/gtkbuilder/dialog-import.glade:188
#: gnucash/gtkbuilder/dialog-import.glade:343
-#: gnucash/gtkbuilder/dialog-import.glade:1056
+#: gnucash/gtkbuilder/dialog-import.glade:899
+#: gnucash/gtkbuilder/dialog-import.glade:1201
#: gnucash/gtkbuilder/dialog-invoice.glade:690
#: gnucash/gtkbuilder/dialog-invoice.glade:1213
#: gnucash/gtkbuilder/dialog-job.glade:57
@@ -1779,7 +1781,7 @@ msgstr "Enllaços de document d'assentament"
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-exp/csv-tree-export.c:156
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:65
-#: gnucash/import-export/import-main-matcher.c:1284
+#: gnucash/import-export/import-main-matcher.c:1545
#: gnucash/import-export/import-match-picker.c:395
#: gnucash/import-export/import-match-picker.c:435
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3710
@@ -1866,7 +1868,7 @@ msgid "Username"
msgstr "Nom d'usuari"
#: gnucash/gnome/dialog-employee.c:732 gnucash/gnome/dialog-sx-editor2.c:1755
-#: gnucash/gnome/dialog-sx-editor.c:1817 gnucash/gnome/dialog-tax-info.c:1200
+#: gnucash/gnome/dialog-sx-editor.c:1823 gnucash/gnome/dialog-tax-info.c:1200
#: gnucash/gnome-utils/gnc-dense-cal.c:350
#: gnucash/gnome-utils/gnc-tree-model-budget.c:96
#: gnucash/gnome-utils/gnc-tree-view-commodity.c:368
@@ -1998,7 +2000,7 @@ msgstr "Cotització de l'acció"
#: gnucash/gtkbuilder/dialog-payment.glade:418
#: gnucash/gtkbuilder/dialog-transfer.glade:102
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:54
-#: gnucash/import-export/import-main-matcher.c:1283
+#: gnucash/import-export/import-main-matcher.c:1544
#: gnucash/import-export/import-match-picker.c:394
#: gnucash/import-export/import-match-picker.c:434
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3721
@@ -2132,7 +2134,7 @@ msgstr "Descripció, notes o informe"
#: gnucash/gtkbuilder/dialog-transfer.glade:205
#: gnucash/import-export/csv-exp/csv-transactions-export.c:626
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:74
-#: gnucash/import-export/import-main-matcher.c:1285
+#: gnucash/import-export/import-main-matcher.c:1546
#: gnucash/import-export/import-match-picker.c:396
#: gnucash/import-export/import-match-picker.c:436
#: gnucash/register/ledger-core/split-register-model.c:356
@@ -3122,7 +3124,7 @@ msgstr "Nom del full d'estil"
#: gnucash/gnome/dialog-sx-editor2.c:165 gnucash/gnome/dialog-sx-editor.c:167
#: gnucash/gnome/gnc-plugin-page-sx-list.c:151
#: gnucash/gnome/window-reconcile2.c:2187 gnucash/gnome/window-reconcile.c:2449
-#: gnucash/gnome-utils/gnc-main-window.c:277
+#: gnucash/gnome-utils/gnc-main-window.c:278
#: gnucash/gtkbuilder/dialog-billterms.glade:679
#: gnucash/gtkbuilder/dialog-commodities.glade:156
#: gnucash/gtkbuilder/dialog-price.glade:858
@@ -3138,12 +3140,12 @@ msgid "_Transaction"
msgstr "_Assentament"
#: gnucash/gnome/dialog-sx-editor2.c:167 gnucash/gnome/dialog-sx-editor.c:169
-#: gnucash/gnome-utils/gnc-main-window.c:278
+#: gnucash/gnome-utils/gnc-main-window.c:279
msgid "_View"
msgstr "_Visualitza"
#: gnucash/gnome/dialog-sx-editor2.c:168 gnucash/gnome/dialog-sx-editor.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:279
+#: gnucash/gnome-utils/gnc-main-window.c:280
msgid "_Actions"
msgstr "A_ccions"
@@ -3164,7 +3166,7 @@ msgid "Couldn't parse debit formula for split \"%s\"."
msgstr ""
"No s'ha pogut analitzar la fórmula del deure per al desglossament «%s»."
-#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:874
+#: gnucash/gnome/dialog-sx-editor2.c:691 gnucash/gnome/dialog-sx-editor.c:880
#: gnucash/gnome/dialog-sx-from-trans.c:261
msgid ""
"The Scheduled Transaction Editor cannot automatically balance this "
@@ -3231,18 +3233,18 @@ msgstr ""
"Nota: Si ja heu acceptat els canvis a la plantilla, Cancel·la no els "
"revocarà ."
-#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1406
+#: gnucash/gnome/dialog-sx-editor2.c:1347 gnucash/gnome/dialog-sx-editor.c:1412
msgid "(never)"
msgstr "(mai)"
-#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1568
+#: gnucash/gnome/dialog-sx-editor2.c:1515 gnucash/gnome/dialog-sx-editor.c:1574
msgid ""
"The current template transaction has been changed. Would you like to record "
"the changes?"
msgstr ""
"L'assentament plantilla actual ha canviat. Voleu enregistrar-ne els canvis?"
-#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1844
+#: gnucash/gnome/dialog-sx-editor2.c:1782 gnucash/gnome/dialog-sx-editor.c:1850
#: gnucash/gnome/gnc-plugin-page-sx-list.c:246
#: gnucash/gnome/gnc-plugin-page-sx-list.c:252
msgid "Scheduled Transactions"
@@ -3256,32 +3258,32 @@ msgstr ""
"Els assentaments programats amb variables o que involucrin més d'un producte "
"no es poden crear automà ticament."
-#: gnucash/gnome/dialog-sx-editor.c:675
+#: gnucash/gnome/dialog-sx-editor.c:679
#, c-format
msgid "Couldn't parse %s for split \"%s\"."
msgstr "No s'ha pogut analitzar %s per al desglossament «%s»."
-#: gnucash/gnome/dialog-sx-editor.c:739
+#: gnucash/gnome/dialog-sx-editor.c:745
#, c-format
msgid "Split with memo %s has an invalid account."
msgstr "El desglossament amb anotació %s té un compte no và lid."
-#: gnucash/gnome/dialog-sx-editor.c:742
+#: gnucash/gnome/dialog-sx-editor.c:748
msgid "Invalid Account in Split"
msgstr "Compte no và lid al desglossament"
-#: gnucash/gnome/dialog-sx-editor.c:754
+#: gnucash/gnome/dialog-sx-editor.c:760
#, fuzzy, c-format
#| msgid "Split with memo %s has an unparseable Credit Formula."
msgid "Split with memo %s has an unparsable Credit Formula."
msgstr ""
"El desglossament amb anotació %s té una fórmula no analitzable de crèdit."
-#: gnucash/gnome/dialog-sx-editor.c:757 gnucash/gnome/dialog-sx-editor.c:773
+#: gnucash/gnome/dialog-sx-editor.c:763 gnucash/gnome/dialog-sx-editor.c:779
msgid "Unparsable Formula in Split"
msgstr "Fórmula no analitzable al desglossament"
-#: gnucash/gnome/dialog-sx-editor.c:770
+#: gnucash/gnome/dialog-sx-editor.c:776
#, fuzzy, c-format
#| msgid "Split with memo %s has an unparseable Debit Formula."
msgid "Split with memo %s has an unparsable Debit Formula."
@@ -3537,7 +3539,7 @@ msgstr "Obre un fitxer del GnuCash"
#: gnucash/gnome/gnc-plugin-basic-commands.c:121
#: gnucash/gnome-utils/gnc-file.c:100 gnucash/gnome-utils/gnc-file.c:666
-#: gnucash/gnome-utils/gnc-main-window.c:1314
+#: gnucash/gnome-utils/gnc-main-window.c:1342
#: gnucash/html/gnc-html-webkit1.c:1198
msgid "_Save"
msgstr "_Desa"
@@ -4130,7 +4132,7 @@ msgstr "Torna a numerar els subcomptes del compte seleccionat"
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:185
#: gnucash/gnome/gnc-plugin-page-register2.c:340
#: gnucash/gnome/gnc-plugin-page-register.c:463
-#: gnucash/gnome-utils/gnc-main-window.c:349
+#: gnucash/gnome-utils/gnc-main-window.c:351
msgid "_Filter By..."
msgstr "_Filtra per..."
@@ -4142,7 +4144,7 @@ msgstr "_Filtra per..."
#: gnucash/gnome/gnc-plugin-page-register.c:467
#: gnucash/gnome/gnc-plugin-page-report.c:1231
#: gnucash/gnome/gnc-plugin-page-sx-list.c:170
-#: gnucash/gnome-utils/gnc-main-window.c:353
+#: gnucash/gnome-utils/gnc-main-window.c:355
msgid "_Refresh"
msgstr "_Refresca"
@@ -4153,7 +4155,7 @@ msgstr "_Refresca"
#: gnucash/gnome/gnc-plugin-page-register.c:468
#: gnucash/gnome/gnc-plugin-page-report.c:1232
#: gnucash/gnome/gnc-plugin-page-sx-list.c:171
-#: gnucash/gnome-utils/gnc-main-window.c:354
+#: gnucash/gnome-utils/gnc-main-window.c:356
msgid "Refresh this window"
msgstr "Refresca aquesta finestra"
@@ -4569,7 +4571,7 @@ msgstr "Copia"
#: gnucash/gnome/gnc-plugin-page-register2.c:240
#: gnucash/gnome/gnc-plugin-page-register.c:354
#: gnucash/gnome/gnc-plugin-page-report.c:1226
-#: gnucash/gnome-utils/gnc-main-window.c:332
+#: gnucash/gnome-utils/gnc-main-window.c:333
msgid "_Paste"
msgstr "Engan_xa"
@@ -5342,35 +5344,35 @@ msgstr "Im_primeix els xecs..."
#: gnucash/gnome/gnc-plugin-page-register2.c:230
#: gnucash/gnome/gnc-plugin-page-register.c:344
#: gnucash/gnome/gnc-plugin-page-report.c:1216
-#: gnucash/gnome-utils/gnc-main-window.c:322
+#: gnucash/gnome-utils/gnc-main-window.c:323
msgid "Cu_t"
msgstr "Re_talla"
#: gnucash/gnome/gnc-plugin-page-register2.c:231
#: gnucash/gnome/gnc-plugin-page-register.c:345
#: gnucash/gnome/gnc-plugin-page-report.c:1217
-#: gnucash/gnome-utils/gnc-main-window.c:323
+#: gnucash/gnome-utils/gnc-main-window.c:324
msgid "Cut the current selection and copy it to clipboard"
msgstr "Retalla la selecció actual i copia-la al porta-retalls"
#: gnucash/gnome/gnc-plugin-page-register2.c:235
#: gnucash/gnome/gnc-plugin-page-register.c:349
#: gnucash/gnome/gnc-plugin-page-report.c:1221
-#: gnucash/gnome-utils/gnc-main-window.c:327
+#: gnucash/gnome-utils/gnc-main-window.c:328
msgid "_Copy"
msgstr "_Copia"
#: gnucash/gnome/gnc-plugin-page-register2.c:236
#: gnucash/gnome/gnc-plugin-page-register.c:350
#: gnucash/gnome/gnc-plugin-page-report.c:1222
-#: gnucash/gnome-utils/gnc-main-window.c:328
+#: gnucash/gnome-utils/gnc-main-window.c:329
msgid "Copy the current selection to clipboard"
msgstr "Copia la selecció actual al porta-retalls"
#: gnucash/gnome/gnc-plugin-page-register2.c:241
#: gnucash/gnome/gnc-plugin-page-register.c:355
#: gnucash/gnome/gnc-plugin-page-report.c:1227
-#: gnucash/gnome-utils/gnc-main-window.c:333
+#: gnucash/gnome-utils/gnc-main-window.c:334
msgid "Paste the clipboard content at the cursor position"
msgstr "Enganxa el contingut del porta-retalls a la posició del cursor"
@@ -5831,7 +5833,7 @@ msgid "Remo_ve Other Splits"
msgstr "_Suprimeix els altres desglossaments"
#: gnucash/gnome/gnc-plugin-page-register.c:459
-#: gnucash/gnome-utils/gnc-main-window.c:345
+#: gnucash/gnome-utils/gnc-main-window.c:347
msgid "_Sort By..."
msgstr "_Ordena per..."
@@ -6880,7 +6882,7 @@ msgstr "_Compte"
#: gnucash/gnome/window-reconcile2.c:2129
#: gnucash/gnome/window-reconcile2.c:2210 gnucash/gnome/window-reconcile.c:2391
#: gnucash/gnome/window-reconcile.c:2472
-#: gnucash/gnome-utils/gnc-main-window.c:285
+#: gnucash/gnome-utils/gnc-main-window.c:286
#: gnucash/gtkbuilder/dialog-account.glade:1121
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:23
#: gnucash/gtkbuilder/dialog-book-close.glade:22
@@ -6890,7 +6892,7 @@ msgstr "_Compte"
#: gnucash/gtkbuilder/dialog-custom-report.glade:29
#: gnucash/gtkbuilder/dialog-employee.glade:23
#: gnucash/gtkbuilder/dialog-fincalc.glade:107
-#: gnucash/gtkbuilder/dialog-import.glade:1023
+#: gnucash/gtkbuilder/dialog-import.glade:1168
#: gnucash/gtkbuilder/dialog-invoice.glade:657
#: gnucash/gtkbuilder/dialog-job.glade:24
#: gnucash/gtkbuilder/dialog-options.glade:21
@@ -6954,7 +6956,7 @@ msgid "Edit the main account for this register"
msgstr "Edita el compte principal d'aquest registre"
#: gnucash/gnome/window-reconcile2.c:2173 gnucash/gnome/window-reconcile.c:2435
-#: gnucash/gnome-utils/gnc-main-window.c:360
+#: gnucash/gnome-utils/gnc-main-window.c:362
msgid "_Check & Repair"
msgstr "_Comprova i repara"
@@ -7771,7 +7773,7 @@ msgid "_Save As"
msgstr "Anomena i de_sa"
#: gnucash/gnome-utils/dialog-options.c:225
-#: gnucash/gnome-utils/gnc-main-window.c:309
+#: gnucash/gnome-utils/gnc-main-window.c:310
#: gnucash/gtkbuilder/dialog-billterms.glade:731
#: gnucash/gtkbuilder/dialog-commodities.glade:174
#: gnucash/gtkbuilder/dialog-custom-report.glade:46
@@ -8329,7 +8331,7 @@ msgstr "Periodicitat"
msgid "(unnamed)"
msgstr "(sense nom)"
-#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:289
+#: gnucash/gnome-utils/gnc-file.c:94 gnucash/gnome-utils/gnc-main-window.c:290
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
#: gnucash/import-export/customer-import/gnc-plugin-customer-import.c:57
msgid "_Import"
@@ -8346,7 +8348,7 @@ msgstr "_Importa"
msgid "Save"
msgstr "Desa"
-#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:290
+#: gnucash/gnome-utils/gnc-file.c:106 gnucash/gnome-utils/gnc-main-window.c:291
msgid "_Export"
msgstr "_Exporta"
@@ -8639,7 +8641,7 @@ msgid "Save changes to the file?"
msgstr "Voleu desar els canvis del fitxer?"
#: gnucash/gnome-utils/gnc-file.c:656
-#: gnucash/gnome-utils/gnc-main-window.c:1307
+#: gnucash/gnome-utils/gnc-main-window.c:1335
#, c-format
msgid "If you don't save, changes from the past %d minute will be discarded."
msgid_plural ""
@@ -8693,7 +8695,7 @@ msgstr "Obre de totes maneres"
msgid "Open _Folder"
msgstr "Obre la _carpeta"
-#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:314
+#: gnucash/gnome-utils/gnc-file.c:865 gnucash/gnome-utils/gnc-main-window.c:315
msgid "_Quit"
msgstr "_Surt"
@@ -8738,7 +8740,7 @@ msgstr ""
"continuar?"
#: gnucash/gnome-utils/gnc-file.c:1701
-#: gnucash/gnome-utils/gnc-main-window.c:1275
+#: gnucash/gnome-utils/gnc-main-window.c:1303
msgid "<unknown>"
msgstr "<desconegut>"
@@ -8784,207 +8786,257 @@ msgstr "Entreu un nom d'usuari i clau per connectar a: %s"
msgid "Changes will be saved automatically in %u seconds"
msgstr "Els canvis es desaran automà ticament en %u segons"
-#: gnucash/gnome-utils/gnc-main-window.c:276
+#: gnucash/gnome-utils/gnc-main-window.c:277
msgid "_File"
msgstr "_Fitxer"
-#: gnucash/gnome-utils/gnc-main-window.c:280
+#: gnucash/gnome-utils/gnc-main-window.c:281
msgid "Tra_nsaction"
msgstr "Asse_ntament"
-#: gnucash/gnome-utils/gnc-main-window.c:281
+#: gnucash/gnome-utils/gnc-main-window.c:282
msgid "_Reports"
msgstr "Inf_ormes"
-#: gnucash/gnome-utils/gnc-main-window.c:282
+#: gnucash/gnome-utils/gnc-main-window.c:283
msgid "_Tools"
msgstr "E_ines"
-#: gnucash/gnome-utils/gnc-main-window.c:283
+#: gnucash/gnome-utils/gnc-main-window.c:284
msgid "E_xtensions"
msgstr "E_xtensions"
-#: gnucash/gnome-utils/gnc-main-window.c:284
+#: gnucash/gnome-utils/gnc-main-window.c:285
msgid "_Windows"
msgstr "Fine_stres"
-#: gnucash/gnome-utils/gnc-main-window.c:292
+#: gnucash/gnome-utils/gnc-main-window.c:293
msgid "_Print..."
msgstr "Im_primeix..."
-#: gnucash/gnome-utils/gnc-main-window.c:293
+#: gnucash/gnome-utils/gnc-main-window.c:294
msgid "Print the currently active page"
msgstr "Imprimeix la pà gina activa"
-#: gnucash/gnome-utils/gnc-main-window.c:299
+#: gnucash/gnome-utils/gnc-main-window.c:300
msgid "Pa_ge Setup..."
msgstr "Configuració de pà _gina..."
-#: gnucash/gnome-utils/gnc-main-window.c:300
+#: gnucash/gnome-utils/gnc-main-window.c:301
msgid "Specify the page size and orientation for printing"
msgstr "Especifiqueu la mida de la pà gina i l'orientació per imprimir"
-#: gnucash/gnome-utils/gnc-main-window.c:304
+#: gnucash/gnome-utils/gnc-main-window.c:305
msgid "Proper_ties"
msgstr "Propie_tats"
-#: gnucash/gnome-utils/gnc-main-window.c:305
+#: gnucash/gnome-utils/gnc-main-window.c:306
msgid "Edit the properties of the current file"
msgstr "Edita les propietats del fitxer actual"
-#: gnucash/gnome-utils/gnc-main-window.c:310
+#: gnucash/gnome-utils/gnc-main-window.c:311
msgid "Close the currently active page"
msgstr "Tanca la pà gina activa"
-#: gnucash/gnome-utils/gnc-main-window.c:315
+#: gnucash/gnome-utils/gnc-main-window.c:316
msgid "Quit this application"
msgstr "Surt de l'aplicació"
-#: gnucash/gnome-utils/gnc-main-window.c:337
+#: gnucash/gnome-utils/gnc-main-window.c:338
msgid "Pr_eferences"
msgstr "Pr_eferències"
-#: gnucash/gnome-utils/gnc-main-window.c:338
+#: gnucash/gnome-utils/gnc-main-window.c:339
msgid "Edit the global preferences of GnuCash"
msgstr "Edita les preferències globals del GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:346
+#: gnucash/gnome-utils/gnc-main-window.c:345
+#, fuzzy
+#| msgid "<b>Tab Position</b>"
+msgid "Tab P_osition"
+msgstr "<b>Posició de les pestanyes</b>"
+
+#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
msgstr "Selecciona el criteri d'ordenació per a aquesta vista de pà gina"
-#: gnucash/gnome-utils/gnc-main-window.c:350
+#: gnucash/gnome-utils/gnc-main-window.c:352
msgid "Select the account types that should be displayed."
msgstr "Escull els tipus de comptes a mostrar."
-#: gnucash/gnome-utils/gnc-main-window.c:362
+#: gnucash/gnome-utils/gnc-main-window.c:364
msgid "Reset _Warnings..."
msgstr "Reinicialitza els a_visos..."
-#: gnucash/gnome-utils/gnc-main-window.c:363
+#: gnucash/gnome-utils/gnc-main-window.c:365
msgid "Reset the state of all warning messages so they will be shown again."
msgstr ""
"Reinicialitza l'estat de tots els avisos d'advertiment de manera que es "
"puguin tornar a mostrar."
-#: gnucash/gnome-utils/gnc-main-window.c:367
+#: gnucash/gnome-utils/gnc-main-window.c:369
msgid "Re_name Page"
msgstr "Ca_nvia el nom de la pà gina"
-#: gnucash/gnome-utils/gnc-main-window.c:368
+#: gnucash/gnome-utils/gnc-main-window.c:370
msgid "Rename this page."
msgstr "Canvia el nom d'aquesta pà gina"
-#: gnucash/gnome-utils/gnc-main-window.c:375
+#: gnucash/gnome-utils/gnc-main-window.c:377
msgid "_New Window"
msgstr "Finestra _nova"
-#: gnucash/gnome-utils/gnc-main-window.c:376
+#: gnucash/gnome-utils/gnc-main-window.c:378
msgid "Open a new top-level GnuCash window."
msgstr "Obre una finestra del GnuCash de nivell superior nova."
-#: gnucash/gnome-utils/gnc-main-window.c:380
+#: gnucash/gnome-utils/gnc-main-window.c:382
msgid "New Window with _Page"
msgstr "Finestra nova amb _pà gina"
-#: gnucash/gnome-utils/gnc-main-window.c:381
+#: gnucash/gnome-utils/gnc-main-window.c:383
msgid "Move the current page to a new top-level GnuCash window."
msgstr ""
"Mou la pà gina actual a una finestra del GnuCash de nivell superior nova."
-#: gnucash/gnome-utils/gnc-main-window.c:388
+#: gnucash/gnome-utils/gnc-main-window.c:390
msgid "Tutorial and Concepts _Guide"
msgstr "Programa d'aprenentatge i _guia de conceptes"
-#: gnucash/gnome-utils/gnc-main-window.c:389
+#: gnucash/gnome-utils/gnc-main-window.c:391
msgid "Open the GnuCash Tutorial"
msgstr "Obre el programa d'aprenentatge del GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:393
+#: gnucash/gnome-utils/gnc-main-window.c:395
msgid "_Contents"
msgstr "_Contingut"
-#: gnucash/gnome-utils/gnc-main-window.c:394
+#: gnucash/gnome-utils/gnc-main-window.c:396
msgid "Open the GnuCash Help"
msgstr "Obre l'ajuda del GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:398
+#: gnucash/gnome-utils/gnc-main-window.c:400
msgid "_About"
msgstr "_Quant a"
-#: gnucash/gnome-utils/gnc-main-window.c:399
+#: gnucash/gnome-utils/gnc-main-window.c:401
msgid "About GnuCash"
msgstr "Quant al GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:411
+#: gnucash/gnome-utils/gnc-main-window.c:413
msgid "_Toolbar"
msgstr "_Barra d'eines"
-#: gnucash/gnome-utils/gnc-main-window.c:412
+#: gnucash/gnome-utils/gnc-main-window.c:414
msgid "Show/hide the toolbar on this window"
msgstr "Mostra/oculta la barra d'eines en aquesta finestra"
-#: gnucash/gnome-utils/gnc-main-window.c:416
+#: gnucash/gnome-utils/gnc-main-window.c:418
msgid "Su_mmary Bar"
msgstr "Barra de _resum"
-#: gnucash/gnome-utils/gnc-main-window.c:417
+#: gnucash/gnome-utils/gnc-main-window.c:419
msgid "Show/hide the summary bar on this window"
msgstr "Mostra/oculta la barra de resum en aquesta finestra"
-#: gnucash/gnome-utils/gnc-main-window.c:421
+#: gnucash/gnome-utils/gnc-main-window.c:423
msgid "Stat_us Bar"
msgstr "Barra d'es_tat"
-#: gnucash/gnome-utils/gnc-main-wi