aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source
pull/1455/head
Christopher Lam 4 years ago
parent ed4d2f32a0 8f1794cb28
commit ba44f720c1
9 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
gnucash/gnome/assistant-stock-transaction.cpp
Unescape View File

@ -292,7 +292,7 @@ static const TxnTypeVec short_types
FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO, // fees_amt
false, // fees_capitalize
FieldMask::DISABLED, // dividend_amt
FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO | FieldMask::ALLOW_NEGATIVE, // capg_amt
FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO | FieldMask::ALLOW_NEGATIVE, // capg_amt
// Translators: this is a stock transaction describing cover
// buying stock, and recording capital gain/loss
N_("Buy to cover short"),

1
gnucash/gnome/gnc-plugin-page-budget.c
Unescape View File

@ -1292,6 +1292,7 @@ gnc_plugin_page_budget_cmd_budget_note(GtkAction *action,
if (!strlen(txt))
txt = NULL;
gnc_budget_set_account_period_note(priv->budget, acc, period_num, txt);
g_free (txt);
break;
default:
break;

13
libgnucash/backend/sql/gnc-sql-column-table-entry.hpp
Unescape View File

@ -187,6 +187,7 @@ public:
void* pObject, T get_ref)
const noexcept
{
static QofLogModule log_module = G_LOG_DOMAIN;
g_return_if_fail (pObject != NULL);
try
@ -199,9 +200,19 @@ public:
if (target != nullptr)
set_parameter (pObject, target, get_setter(obj_name),
m_gobj_param_name);
else
DEBUG("GUID %s returned null %s reference.",
val.c_str(), m_gobj_param_name);
}
else
{
if (val.empty()) DEBUG("Can't load empty guid string for column %s", m_col_name);
else DEBUG("Invalid GUID %s for column %s", val.c_str(), m_col_name);
}
}
catch (std::invalid_argument& err) {
DEBUG("set_parameter threw %s for column %s", err.what(), m_col_name);
}
catch (std::invalid_argument&) {}
}

6
libgnucash/backend/sql/gnc-transaction-sql.cpp
Unescape View File

@ -239,6 +239,12 @@ load_single_split (GncSqlBackend* sql_be, GncSqlRow& row)
qof_backend_set_error ((QofBackend*)sql_be, ERR_BACKEND_DATA_CORRUPT);
pSplit = NULL;
}
if (!xaccSplitGetAccount(pSplit))
{
gchar guidstr[GUID_ENCODING_LENGTH + 1];
guid_to_string_buff (qof_instance_get_guid (pSplit), guidstr);
PERR("Split %s created with no account!", guidstr);
}
return pSplit;
}
static void

8
po/es.po
Unescape View File

@ -83,7 +83,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-09-11 23:24+0200\n"
"PO-Revision-Date: 2022-09-28 23:23+0000\n"
"PO-Revision-Date: 2022-10-10 18:09+0000\n"
"Last-Translator: Guille Lopez <willelopz@gmail.com>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/gnucash/gnucash/"
"es/>\n"
@ -16014,10 +16014,8 @@ msgstr "ISIN, CUSI_P u otro código"
#: gnucash/gtkbuilder/dialog-commodity.glade:485
#: gnucash/gtkbuilder/dialog-commodity.glade:767
#: gnucash/gtkbuilder/dialog-price.glade:138
#, fuzzy
#| msgid "Namespace"
msgid "Nam_espace"
msgstr "Espacio de nombres"
msgstr "_Espacio de nombres"
#: gnucash/gtkbuilder/dialog-commodity.glade:500
msgid "_Symbol/abbreviation"
@ -22157,7 +22155,7 @@ msgstr "Deshabilitado"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1314
msgid "_Assign a transfer account to the selection"
msgstr "_Asignar una cuenta a la selección para transferir."
msgstr "_Asignar una cuenta a la selección para transferir"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1365

6
po/fr.po
Unescape View File

@ -37,7 +37,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-09-11 23:24+0200\n"
"PO-Revision-Date: 2022-10-02 15:52+0000\n"
"PO-Revision-Date: 2022-10-12 11:25+0000\n"
"Last-Translator: Philippe Lamare <ph.lamare@free.fr>\n"
"Language-Team: French <https://hosted.weblate.org/projects/gnucash/gnucash/"
"fr/>\n"
@ -46,7 +46,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.14.1\n"
"X-Generator: Weblate 4.15-dev\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@ -16808,7 +16808,7 @@ msgid ""
"generated code"
msgstr ""
"Cela va remplacer le champ de code de tous les comptes fils avec un nouveau "
"code auto-généré."
"code auto-généré"
#: gnucash/gtkbuilder/dialog-account-picker.glade:34
msgid "_Show documentation"

9
po/glossary/es.po
Unescape View File

@ -11,14 +11,15 @@
# Guille Lopez <willelopz@gmail.com>, 2021.
# Francisco Serrador <fserrador@gmail.com>, 2021, 2022.
# Cow <javier.fserrador@gmail.com>, 2022.
# Pablo Fernandez <pfernandez@theansweris27.com>, 2022.
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-05-21 11:16+0000\n"
"Last-Translator: Francisco Serrador <fserrador@gmail.com>\n"
"PO-Revision-Date: 2022-10-10 18:09+0000\n"
"Last-Translator: Pablo Fernandez <pfernandez@theansweris27.com>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/gnucash/glossary/"
"es/>\n"
"Language: es\n"
@ -26,7 +27,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-dev\n"
"X-Generator: Weblate 4.14.1\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!)"
@ -110,7 +111,7 @@ msgstr "ahorro"
#. "-"
msgid "account type: Stock"
msgstr "Existencias"
msgstr "Acciones"
#. "This account type (new in gnucash-2.4.0) is used when exchanging or trading amounts from one currency into another"
msgid "account type: trading"

4
po/glossary/hr.po
Unescape View File

@ -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: 2022-03-11 11:54+0000\n"
"PO-Revision-Date: 2022-10-17 18:53+0000\n"
"Last-Translator: Milo Ivir <mail@milotype.de>\n"
"Language-Team: Croatian <https://hosted.weblate.org/projects/gnucash/"
"glossary/hr/>\n"
@ -17,7 +17,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.12-dev\n"
"X-Generator: Weblate 4.15-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!)"

71
po/ur.po
Unescape View File

@ -2,39 +2,39 @@
# Copyright (C) 2014, C-DAC, GIST, Pune, India.
# Atiur Rahman Khan <ciil_khan@yahoo.co.in>, 2014.
# Frank H. Ellenberger <frank.h.ellenberger@gmail.com>, 2021.
# Abdul Quddos (AQN) <yousufi81@gmail.com>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.12-pre1\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-09-11 23:24+0200\n"
"PO-Revision-Date: 2021-03-11 20:02+0000\n"
"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger@gmail.com>\n"
"Language-Team: Urdu <https://hosted.weblate.org/projects/gnucash/gnucash/ur/"
">\n"
"PO-Revision-Date: 2022-10-17 18:53+0000\n"
"Last-Translator: Abdul Quddos (AQN) <yousufi81@gmail.com>\n"
"Language-Team: Urdu <https://hosted.weblate.org/projects/gnucash/gnucash/ur/>"
"\n"
"Language: ur\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.5.2-dev\n"
"X-Generator: Weblate 4.15-dev\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
msgstr ""
msgstr "عربی"
#: borrowed/goffice/go-charmap-sel.c:71
msgid "Baltic"
msgstr ""
msgstr "بالٹک"
#: borrowed/goffice/go-charmap-sel.c:72
#, fuzzy
msgid "Central European"
msgstr "یوروپی"
msgstr "مرکزی یوروپین"
#: borrowed/goffice/go-charmap-sel.c:73
msgid "Chinese"
msgstr ""
msgstr "چائینیز"
#: borrowed/goffice/go-charmap-sel.c:74
#: gnucash/gnome-utils/assistant-xml-encoding.c:242
@ -42,29 +42,28 @@ msgid "Cyrillic"
msgstr "سریلیك"
#: borrowed/goffice/go-charmap-sel.c:75
#, fuzzy
msgid "Greek"
msgstr "ہرا"
msgstr "یونانی"
#: borrowed/goffice/go-charmap-sel.c:76
msgid "Hebrew"
msgstr ""
msgstr "عبرانی"
#: borrowed/goffice/go-charmap-sel.c:77
msgid "Indian"
msgstr ""
msgstr "ہندی"
#: borrowed/goffice/go-charmap-sel.c:78
msgid "Japanese"
msgstr ""
msgstr "جاپانی"
#: borrowed/goffice/go-charmap-sel.c:79
msgid "Korean"
msgstr ""
msgstr "کورین"
#: borrowed/goffice/go-charmap-sel.c:80
msgid "Turkish"
msgstr ""
msgstr "ترکیا"
#: borrowed/goffice/go-charmap-sel.c:81
#: gnucash/gnome-utils/assistant-xml-encoding.c:224
@ -73,12 +72,11 @@ msgstr "یونی كوڈ"
#: borrowed/goffice/go-charmap-sel.c:82
msgid "Vietnamese"
msgstr ""
msgstr "ویتنامی"
#: borrowed/goffice/go-charmap-sel.c:83
#, fuzzy
msgid "Western"
msgstr "رجسٹر"
msgstr "مغربی"
#: borrowed/goffice/go-charmap-sel.c:84
#: gnucash/gtkbuilder/assistant-loan.glade:966
@ -114,57 +112,56 @@ msgstr ""
#: borrowed/goffice/go-charmap-sel.c:122
msgid "Arabic (Windows-1256)"
msgstr ""
msgstr "عربی (ونڈوز-1256)"
#: borrowed/goffice/go-charmap-sel.c:123
msgid "Armenian (ARMSCII-8)"
msgstr ""
msgstr "آرمینیائی (اے آر ایم ایس سی آئی آئی -8)"
#: borrowed/goffice/go-charmap-sel.c:124
#, fuzzy
msgid "Baltic (ISO-8859-13)"
msgstr "ISO-8859-13 (بالٹیك) "
msgstr "ISO-8859-13 (بالٹیك)"
#: borrowed/goffice/go-charmap-sel.c:125
msgid "Baltic (ISO-8859-4)"
msgstr ""
msgstr "بالٹک (آئی ایس او-8859-4)"
#: borrowed/goffice/go-charmap-sel.c:126
msgid "Baltic (Windows-1257)"
msgstr ""
msgstr "بالٹک (ونڈوز-1257)"
#: borrowed/goffice/go-charmap-sel.c:127
#, fuzzy
msgid "Celtic (ISO-8859-14)"
msgstr "ISO-8859-14 (سیلٹیك) "
msgstr "ISO-8859-14 (سیلٹیك)"
#: borrowed/goffice/go-charmap-sel.c:128
msgid "Central European (IBM-852)"
msgstr ""
msgstr "وسطی یورپی (آئی بی ایم -852)"
#: borrowed/goffice/go-charmap-sel.c:130
msgid "Central European (ISO-8859-2)"
msgstr ""
msgstr "وسطی یورپی (آئی ایس او-8859-2)"
#: borrowed/goffice/go-charmap-sel.c:132
msgid "Central European (MacCE)"
msgstr ""
msgstr "وسطی یورپی (میک سی ای)"
#: borrowed/goffice/go-charmap-sel.c:134
msgid "Central European (Windows-1250)"
msgstr ""
msgstr "وسطی یورپی (ونڈوز -1250)"
#: borrowed/goffice/go-charmap-sel.c:136
msgid "Chinese Simplified (GB18030)"
msgstr ""
msgstr "چینی آسان (جی بی 18030)"
#: borrowed/goffice/go-charmap-sel.c:137
#, fuzzy
msgid "Chinese Simplified (GB2312)"
msgstr ""
msgstr "چینی آسان (جی بی 2312)"
#: borrowed/goffice/go-charmap-sel.c:138
msgid "Chinese Simplified (GBK)"
msgstr ""
msgstr "آسان چینی (جی بی کے)"
#: borrowed/goffice/go-charmap-sel.c:139
msgid "Chinese Simplified (HZ)"

Write Preview
Loading…
Cancel
Save