Skip to content

Commit

Permalink
Merge branch 'Gnucash:maint' into 798712
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianRater committed Mar 19, 2023
2 parents 70693d1 + 21dd8aa commit 3608583
Show file tree
Hide file tree
Showing 12 changed files with 254 additions and 261 deletions.
15 changes: 12 additions & 3 deletions gnucash/gnome/gnc-budget-view.c
Expand Up @@ -1562,6 +1562,14 @@ The function will step through to only display the columns that are set
void
gnc_budget_view_refresh (GncBudgetView *budget_view)
{
// Column identifiers
enum {
code_column = 1,
description_column = 2,
startPeriods_column = 3
// The Totals column will be after the periods columns.
};

GncBudgetViewPrivate *priv;
gint num_periods;
gint num_periods_visible;
Expand Down Expand Up @@ -1604,13 +1612,13 @@ gnc_budget_view_refresh (GncBudgetView *budget_view)
// set visibility of the account code columns
code_col = gnc_tree_view_find_column_by_name (GNC_TREE_VIEW(priv->tree_view), "account-code");
gtk_tree_view_column_set_visible (code_col, priv->show_account_code);
code_col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), 1);
code_col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), code_column);
gtk_tree_view_column_set_visible (code_col, priv->show_account_code);

// set visibility of the account description columns
desc_col = gnc_tree_view_find_column_by_name (GNC_TREE_VIEW(priv->tree_view), "description");
gtk_tree_view_column_set_visible (desc_col, priv->show_account_desc);
desc_col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), 2);
desc_col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), description_column);
gtk_tree_view_column_set_visible (desc_col, priv->show_account_desc);

/* If we're creating new columns to be appended to already existing
Expand All @@ -1622,7 +1630,8 @@ gnc_budget_view_refresh (GncBudgetView *budget_view)
col = priv->total_col;
gtk_tree_view_remove_column (GTK_TREE_VIEW(priv->tree_view), col);
priv->total_col = NULL;
col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view), num_periods_visible + 1);
col = gtk_tree_view_get_column (GTK_TREE_VIEW(priv->totals_tree_view),
startPeriods_column + num_periods_visible);
gtk_tree_view_remove_column (GTK_TREE_VIEW(priv->totals_tree_view), col);
}

Expand Down
2 changes: 1 addition & 1 deletion gnucash/gtkbuilder/dialog-preferences.glade
Expand Up @@ -1893,7 +1893,7 @@ many months before the current month</property>
</child>
<child>
<object class="GtkRadioButton" id="pref/general/retain-type-days">
<property name="label" translatable="yes">For</property>
<property name="label" translatable="yes" context="keep">For</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gtkbuilder/dialog-sx.glade
Expand Up @@ -1256,7 +1256,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rb_num_occur">
<property name="label" translatable="yes">For</property>
<property name="label" translatable="yes" context="repeat">For</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
Expand Down
22 changes: 11 additions & 11 deletions po/es.po
Expand Up @@ -14,6 +14,7 @@
# Eduardo Malaspina <vaio0@swismail.com>, 2022.
# Luis D. Lafaurie <luis.lafaurie@tecnativa.com>, 2022.
# Guille Lopez <willelopz@gmail.com>, 2022, 2023.
# gallegonovato <fran-carro@hotmail.es>, 2023.
#
#
# ###############################################################################
Expand Down Expand Up @@ -83,8 +84,8 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-12-04 19:47-0800\n"
"PO-Revision-Date: 2023-03-12 13:40+0000\n"
"Last-Translator: Guille Lopez <willelopz@gmail.com>\n"
"PO-Revision-Date: 2023-03-19 15:40+0000\n"
"Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/gnucash/gnucash/"
"es/>\n"
"Language: es\n"
Expand Down Expand Up @@ -8953,7 +8954,7 @@ msgstr "Edita las preferencias globales de GnuCash"

#: gnucash/gnome-utils/gnc-main-window.c:345
msgid "Tab P_osition"
msgstr "<b>Posición de pestaña</b>"
msgstr "_Posición de la pestaña"

#: gnucash/gnome-utils/gnc-main-window.c:348
msgid "Select sorting criteria for this page view"
Expand Down Expand Up @@ -11065,8 +11066,8 @@ msgid ""
"This value specifies the predefined check format to use. The number is the "
"guid of a known check format."
msgstr ""
"Este valor especifica el formato de comprobación predefinido para emplear. "
"El número es el GUID de un formato de comprobación conocido."
"Este valor especifica el formato predeterminado de cheque a utilizar. El "
"número es la guía de un formato de cheque conocido."

#: gnucash/gschemas/org.gnucash.GnuCash.dialogs.checkprinting.gschema.xml.in:10
msgid "Which check position to print"
Expand Down Expand Up @@ -15692,7 +15693,7 @@ msgstr "Abre documentos importados en casillas"

#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:392
msgid "Open not yet posted documents in tabs "
msgstr "Abre documentos aún no importados en casillas "
msgstr "Abrir documentos no contabilizados en pestañas "

#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:410
msgid "Don't open imported documents in tabs"
Expand Down Expand Up @@ -15869,7 +15870,7 @@ msgstr "Escoja Diálogo del Titular"
#: gnucash/gtkbuilder/dialog-commodities.glade:27
#: gnucash/report/reports/standard/account-piecharts.scm:62
msgid "Securities"
msgstr "Garantías"
msgstr "Títulos"

#: gnucash/gtkbuilder/dialog-commodities.glade:77
msgid "Show National Currencies"
Expand Down Expand Up @@ -23951,9 +23952,8 @@ msgid ""
"report system, especially your saved reports, for a report with this report-"
"guid: "
msgstr ""
"Uno de tus boletines tiene un boletín-guid que es un duplicado. Por favor "
"comprueba el sistema boletinado, especialmente tus boletines guardadas, para "
"una boletín con este boletín-guid: "
"Uno de sus informes tiene un GUID duplicado. Verifique el sistema de "
"informes y, en particular, los informes guardados con la siguiente guía: "

#: gnucash/report/report-core.scm:212
msgid "Wrong report definition: "
Expand Down Expand Up @@ -30522,7 +30522,7 @@ msgstr "Error numérico"
#: libgnucash/app-utils/gnc-sx-instance-model.c:1037
#, c-format
msgid "Unknown account for guid [%s], cancelling SX [%s] creation."
msgstr "Cuenta desconocida para guid [%s], cancelando creación SX [%s]."
msgstr "Cuenta desconocida para GUID [%s], cancelando la creación de SX [%s]."

#: libgnucash/app-utils/gnc-sx-instance-model.c:1092
#, c-format
Expand Down
4 changes: 2 additions & 2 deletions po/glossary/hr.po
Expand Up @@ -7,7 +7,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: 2023-03-10 23:42+0000\n"
"PO-Revision-Date: 2023-03-14 13:41+0000\n"
"Last-Translator: Milo Ivir <mail@milotype.de>\n"
"Language-Team: Croatian <https://hosted.weblate.org/projects/gnucash/"
"glossary/hr/>\n"
Expand Down Expand Up @@ -515,7 +515,7 @@ msgstr "marža"

#. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface."
msgid "MDI modus"
msgstr "Prikaz višestrukih prozora"
msgstr "Modus zasebnih prozora"

#. "One textfield per split that should help you remember what this split was about."
msgid "Memo"
Expand Down
6 changes: 3 additions & 3 deletions po/glossary/hu.po
Expand Up @@ -12,8 +12,8 @@ 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: 2023-03-12 13:41+0000\n"
"Last-Translator: Szia Tomi <sziatomi01@gmail.com>\n"
"PO-Revision-Date: 2023-03-16 17:41+0000\n"
"Last-Translator: mocsa <csaba@feltoltve.hu>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/gnucash/"
"glossary/hu/>\n"
"Language: hu\n"
Expand Down Expand Up @@ -876,7 +876,7 @@ msgid "withdraw (in the reconcile dialog)"
msgstr "visszavonás(az egyeztető párbeszédpanelen)"

msgid "stock"
msgstr "készlet"
msgstr "részvény"

msgid "due"
msgstr "esedékes"
Expand Down
8 changes: 4 additions & 4 deletions po/glossary/pt_BR.po
Expand Up @@ -8,14 +8,14 @@
# Vladimir Melo <vladimirmelo.psi@gmail.com>, 2007.
# LL Magical <lolayami2004@gmail.com>, 2020.
# Fábio Rodrigues Ribeiro <farribeiro@gmail.com>, 2021.
# Wellington Terumi Uemura <wellingtonuemura@gmail.com>, 2021, 2022.
# Wellington Terumi Uemura <wellingtonuemura@gmail.com>, 2021, 2022, 2023.
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.8\n"
"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-01-20 11:54+0000\n"
"PO-Revision-Date: 2023-03-18 11:41+0000\n"
"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
"gnucash/glossary/pt_BR/>\n"
Expand All @@ -24,7 +24,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.16.2-dev\n"

#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
msgid "Term (Dear translator: This file will never be visible to the user!)"
Expand Down Expand Up @@ -752,7 +752,7 @@ msgstr "origem"

#. "One of the two or several parts a transaction is divided into"
msgid "split"
msgstr "divisão"
msgstr "desdobramento"

#. "Alias of 'shares'"
msgid "stocks"
Expand Down
7 changes: 4 additions & 3 deletions po/glossary/zh_CN.po
Expand Up @@ -10,14 +10,15 @@
# Eric <alchemillatruth@purelymail.com>, 2022.
# YTX <ytx.cash@gmail.com>, 2022.
# J0kWang <lianjiefly@gmail.com>, 2023.
# Zhaoquan Huang <zhaoquan2008@hotmail.com>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.8\n"
"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: 2023-03-04 06:39+0000\n"
"Last-Translator: J0kWang <lianjiefly@gmail.com>\n"
"PO-Revision-Date: 2023-03-16 17:41+0000\n"
"Last-Translator: Zhaoquan Huang <zhaoquan2008@hotmail.com>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
"gnucash/glossary/zh_Hans/>\n"
"Language: zh_CN\n"
Expand Down Expand Up @@ -98,7 +99,7 @@ msgstr "科目类型:负债"

#. "-"
msgid "account type: money-market"
msgstr "科目类型:金融市场"
msgstr "科目类型:货币市场"

#. "-"
msgid "account type: Mutual fund"
Expand Down

0 comments on commit 3608583

Please sign in to comment.