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

Merge branch 'maint'

Browse Source
This commit is contained in:
John Ralls 2022-08-29 14:59:18 -07:00
commit 9291548667
4 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnucash/gnome-utils/cursors.c
View File

@ -83,9 +83,16 @@ gnc_set_busy_cursor (GtkWidget *w, gboolean update_now)
gnc_ui_set_cursor (gtk_widget_get_window(w), GNC_CURSOR_BUSY, update_now);
else
{
GList *containerstop, *node;
/* gnc_ui_set_cursor runs the event loop and if there's an
* idle waiting that destroys a toplevel further down the list
* then we'll get a use after free crash unless we have our
* own reference, so take a reference to all of the toplevels
* and release them all after the loop finishes.
*/
GList *containerstop = gtk_window_list_toplevels (), *node;
g_list_foreach (containerstop, (GFunc)g_object_ref, NULL);
for (containerstop = node = gtk_window_list_toplevels (); node; node = node->next)
for (node = containerstop; node; node = node->next)
{
w = node->data;
@ -94,7 +101,7 @@ gnc_set_busy_cursor (GtkWidget *w, gboolean update_now)
gnc_ui_set_cursor (gtk_widget_get_window(w), GNC_CURSOR_BUSY, update_now);
}
g_list_free (containerstop);
g_list_free_full (containerstop, (GDestroyNotify)g_object_unref);
}
}

16
gnucash/gnome/assistant-stock-transaction.cpp
View File

@ -180,9 +180,9 @@ static const TxnTypeVec long_types
FieldMask::DISABLED, // dividend_amt
FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO | FieldMask::ALLOW_NEGATIVE, // capgains_amt
// Translators: this is a stock transaction describing sale of
// stock, and recording capital gains/loss
// stock, and recording capital gain/loss
N_("Sell"),
N_("Selling stock, and record capital gains/loss")
N_("Selling stock, and record capital gain/loss")
},
{
FieldMask::DISABLED, // stock_amt
@ -314,9 +314,9 @@ static const TxnTypeVec short_types
FieldMask::DISABLED, // dividend_amt
FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO | FieldMask::ALLOW_NEGATIVE, // capg_amt
// Translators: this is a stock transaction describing cover
// buying stock, and recording capital gains/loss
N_("Cover buy"),
N_("Cover buying stock, and record capital gains/loss")
// buying stock, and recording capital gain/loss
N_("Buy to cover short"),
N_("Buy back stock to cover short and record capital gain/loss")
},
{
FieldMask::DISABLED, // stock_amt
@ -1005,7 +1005,7 @@ stock_assistant_finish (GtkAssistant *assistant, gpointer user_data)
auto date = gnc_date_edit_get_date (GNC_DATE_EDIT (info->date_edit));
xaccTransSetDatePostedSecsNormalized (trans, date);
create_split (trans, info->txn_type->stock_value,
create_split (trans, info->txn_type->stock_amount | info->txn_type->stock_value,
NC_ ("Stock Assistant: Action field", "Stock"),
info->acct, account_commits, info->stock_memo_edit,
info->txn_type->stock_amount != FieldMask::DISABLED ? info->stock_amount_edit : nullptr,
@ -1041,14 +1041,14 @@ stock_assistant_finish (GtkAssistant *assistant, gpointer user_data)
if (info->txn_type->capgains_value != FieldMask::DISABLED)
{
create_split (trans, info->txn_type->capgains_value,
NC_ ("Stock Assistant: Action field", "Capital Gains"),
NC_ ("Stock Assistant: Action field", "Capital Gain"),
gas_account (info->capgains_account),
account_commits, info->capgains_memo_edit,
info->capgains_value, info->capgains_value, false);
create_split (trans,
info->txn_type->capgains_value ^ (FieldMask::ENABLED_CREDIT | FieldMask::ENABLED_DEBIT),
NC_ ("Stock Assistant: Action field", "Capital Gains"),
NC_ ("Stock Assistant: Action field", "Capital Gain"),
info->acct, account_commits, info->capgains_memo_edit,
nullptr, info->capgains_value, false);
}

13
gnucash/register/ledger-core/gncEntryLedger.c
View File

@ -720,11 +720,16 @@ gnc_entry_ledger_compute_value (GncEntryLedger *ledger,
disc_type = gnc_entry_ledger_get_type (ledger, ENTRY_DISTYPE_CELL);
disc_how = gnc_entry_ledger_get_type (ledger, ENTRY_DISHOW_CELL);
/* Bills and exp-vouchers don't have discounts */
/* Some ledger types (see full list in gnc_entry_ledger_set_cells)
don't have discounts */
if (ledger->type == GNCENTRY_BILL_ENTRY ||
ledger->type == GNCENTRY_BILL_VIEWER ||
ledger->type == GNCENTRY_EXPVOUCHER_ENTRY ||
ledger->type == GNCENTRY_EXPVOUCHER_VIEWER)
ledger->type == GNCENTRY_BILL_VIEWER ||
ledger->type == GNCENTRY_VEND_CREDIT_NOTE_ENTRY ||
ledger->type == GNCENTRY_VEND_CREDIT_NOTE_VIEWER ||
ledger->type == GNCENTRY_EXPVOUCHER_ENTRY ||
ledger->type == GNCENTRY_EXPVOUCHER_VIEWER ||
ledger->type == GNCENTRY_EMPL_CREDIT_NOTE_ENTRY ||
ledger->type == GNCENTRY_EMPL_CREDIT_NOTE_VIEWER)
{
g_assert (gnc_numeric_zero_p (discount));
disc_type = GNC_AMT_TYPE_VALUE;

32
po/ru.po
View File

@ -14,14 +14,15 @@
# Artem <KovalevArtem.ru@gmail.com>, 2021.
# МАН69К <weblate@mah69k.net>, 2022.
# Nikita Samoilov <n.p.samoilov@gmail.com>, 2022.
# Vik <xasertop@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: 2022-06-27 17:20+0000\n"
"Last-Translator: Nikita Samoilov <n.p.samoilov@gmail.com>\n"
"PO-Revision-Date: 2022-08-27 13:17+0000\n"
"Last-Translator: Vik <xasertop@gmail.com>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/gnucash/gnucash/"
"ru/>\n"
"Language: ru\n"
@ -30,7 +31,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 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.1-dev\n"
"X-Source-Language: C\n"
# For the translation in '../borrowed/goffice/go-charmap-sel.c' see
@ -431,7 +432,7 @@ msgstr "Западная (Windows-1252)"
#: borrowed/goffice/go-charmap-sel.c:441
msgid "Locale: "
msgstr "Локаль:"
msgstr "Локаль: "
#: borrowed/goffice/go-charmap-sel.c:476
msgid "Conversion Direction"
@ -465,8 +466,8 @@ msgid ""
"at https://wiki.gnucash.org/wiki/Mailing_Lists"
msgstr ""
"Списки рассылки являются предпочтительной формой коммуникации в сообществе "
"GnuCash. Объявления о новых выпусках, группах пользователей и т.д. см. в "
"таблице https://wiki.gnucash.org/wiki/Mailing_Lists"
"GnuCash. Объявления о новых выпусках, группы пользователей и т. д. смотрите "
"в таблице на https://wiki.gnucash.org/wiki/Mailing_Lists"
#: doc/tip_of_the_day.list.c:11
msgid ""
@ -558,12 +559,12 @@ msgid ""
"select \"View\" in the menu bar and check \"Double Line\" or\n"
"check \"Double Line Mode\" in Preferences:Register Defaults."
msgstr ""
"Каждая проводка имеет поле \"Примечания\", куда можно поместить полезную "
"информацию.\n"
"У каждой проводки есть поле \"Примечания\", куда вы можете поместить "
"полезную информацию. \n"
"\n"
"Чтобы сделать его видимым\n"
"выберите \"Вид\" в строке меню и установите флажок \"Две строки\" или\n"
"установите флажок \"Двустрочный режим\" в Настройки:Настройки журнала."
"флажок \"Двустрочный режим\" в Настройки: Настройки журнала."
#: doc/tip_of_the_day.list.c:50
msgid ""
@ -796,7 +797,7 @@ msgstr[2] ""
#. Translators: Run the assistant in your language to see GTK's translation of the button labels.
#: gnucash/gnome/assistant-acct-period.c:371
#, fuzzy, c-format
#, c-format
msgid ""
"You have asked for a book to be created. This book will contain all "
"transactions up to midnight %s (for a total of %d transactions spread over "
@ -808,7 +809,7 @@ msgstr ""
"Вы запросили создание новой книги. Эта книга будет содержать все проводки "
"вплоть до полуночи %s (всего %d проводок, распределенных по %d счетам).\n"
"\n"
"Внесите правки в название и заметки или Нажмите \"Вперёд\" для продолжения.\n"
"Внесите правки в название и заметки или нажмите \"Вперёд\" для продолжения.\n"
"Нажмите \"Назад\" для корректировки дат или \"Отмена\"."
#: gnucash/gnome/assistant-acct-period.c:388
@ -817,12 +818,12 @@ msgid "Period %s - %s"
msgstr "Период с %s по %s"
#: gnucash/gnome/assistant-acct-period.c:406
#, fuzzy, c-format
#, c-format
msgid ""
"The book will be created with the title %s when you click on \"Apply\". "
"Click on \"Back\" to adjust, or \"Cancel\" to not create any book."
msgstr ""
"Книга будет создана с названием %s когда вы нажмете \"Применить\". Нажмите "
"Книга будет создана с названием %s, когда вы нажмете \"Применить\". Нажмите "
"\"Назад\" для внесения изменений или \"Отмена\" для отмены создания книги."
#: gnucash/gnome/assistant-acct-period.c:525
@ -1086,7 +1087,6 @@ msgstr "Депонентный платёж"
#: gnucash/gnome/assistant-stock-split.c:391
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2946
#: gnucash/register/ledger-core/split-register.c:2639
#, fuzzy
msgctxt "Action Column"
msgid "Split"
msgstr "Разделить"