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

Merge branch 'maint'

Browse Source
This commit is contained in:
Frank H. Ellenberger 2021-01-31 23:17:19 +01:00
commit f556ad35ef
6 changed files with 30 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnucash/gnome-search/gnc-general-search.c
View File

@ -510,8 +510,9 @@ gnc_general_search_set_selected (GNCGeneralSearch *gsl, gpointer selection)
if (selection && priv->get_guid) if (selection && priv->get_guid)
{ {
const QofParam *get_guid = priv->get_guid; const QofParam *get_guid = priv->get_guid;
priv->guid = * ((GncGUID *)(get_guid->param_getfcn GncGUID *guid = (GncGUID *)(get_guid->param_getfcn (gsl->selected_item,
(gsl->selected_item, get_guid))); get_guid));
priv->guid = guid ? *guid : *guid_null ();
gnc_gui_component_watch_entity gnc_gui_component_watch_entity
(priv->component_id, &(priv->guid), (priv->component_id, &(priv->guid),
QOF_EVENT_MODIFY | QOF_EVENT_DESTROY); QOF_EVENT_MODIFY | QOF_EVENT_DESTROY);

18
libgnucash/backend/dbi/gnc-backend-dbi.cpp
View File

@ -30,20 +30,9 @@ extern "C"
#include "config.h" #include "config.h"
#include <platform.h> #include <platform.h>
#ifdef __STRICT_ANSI__
#undef __STRICT_ANSI__
#define __STRICT_ANSI_UNSET__ 1
#endif
#ifdef _NO_OLDNAMES
#undef _NO_OLDNAMES
#endif
#ifdef _UWIN
#undef _UWIN
#endif
#if PLATFORM(WINDOWS) #if PLATFORM(WINDOWS)
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#define __STDC_FORMAT_MACROS 1
#endif #endif
#include <inttypes.h> #include <inttypes.h>
@ -85,13 +74,6 @@ extern "C"
#include "gnc-dbisqlresult.hpp" #include "gnc-dbisqlresult.hpp"
#include "gnc-dbisqlconnection.hpp" #include "gnc-dbisqlconnection.hpp"
#if PLATFORM(WINDOWS)
#ifdef __STRICT_ANSI_UNSET__
#undef __STRICT_ANSI_UNSET__
#define __STRICT_ANSI__ 1
#endif
#endif
#if LIBDBI_VERSION >= 900 #if LIBDBI_VERSION >= 900
#define HAVE_LIBDBI_R 1 #define HAVE_LIBDBI_R 1
static dbi_inst dbi_instance = nullptr; static dbi_inst dbi_instance = nullptr;

34
po/glossary/pt_BR.po
View File

@ -7,14 +7,16 @@
# Caio Alonso <caioalons@gmail.com>, 2007. # Caio Alonso <caioalons@gmail.com>, 2007.
# Vladimir Melo <vladimirmelo.psi@gmail.com>, 2007. # Vladimir Melo <vladimirmelo.psi@gmail.com>, 2007.
# LL Magical <lolayami2004@gmail.com>, 2020. # LL Magical <lolayami2004@gmail.com>, 2020.
# Fábio Rodrigues Ribeiro <farribeiro@gmail.com>, 2021.
# Wellington Terumi Uemura <wellingtonuemura@gmail.com>, 2021.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 1.8\n" "Project-Id-Version: 1.8\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?" "Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"product=GnuCash&component=Translations\n" "cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2021-01-10 08:00+0100\n" "POT-Creation-Date: 2021-01-10 08:00+0100\n"
"PO-Revision-Date: 2020-12-18 07:06+0000\n" "PO-Revision-Date: 2021-01-31 07:41+0000\n"
"Last-Translator: LL Magical <lolayami2004@gmail.com>\n" "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
"gnucash/glossary/pt_BR/>\n" "gnucash/glossary/pt_BR/>\n"
"Language: pt_BR\n" "Language: pt_BR\n"
@ -22,7 +24,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n" "Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 4.4-dev\n" "X-Generator: Weblate 4.5-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.)" #. "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!)" msgid "Term (Dear translator: This file will never be visible to the user!)"
@ -30,7 +32,7 @@ msgstr "Termo (Só para completar a estatística)"
#. "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" #. "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 "\"\"" msgid "\"\""
msgstr "" msgstr "\"\""
#. "A detailed record of money spent and received" #. "A detailed record of money spent and received"
msgid "account" msgid "account"
@ -338,7 +340,7 @@ msgstr "Personalizado"
#. "Compact, well-structured presentation of informations. See https://en.wikipedia.org/wiki/Dashboard_(business)" #. "Compact, well-structured presentation of informations. See https://en.wikipedia.org/wiki/Dashboard_(business)"
msgid "dashboard" msgid "dashboard"
msgstr "" msgstr "Painel"
#. "The backend where the data is stored." #. "The backend where the data is stored."
msgid "database" msgid "database"
@ -390,7 +392,7 @@ msgstr "link de documento"
#. "Electronic mail. Some languages allow different writings, but each team should use only one. https://en.wikipedia.org/wiki/Email" #. "Electronic mail. Some languages allow different writings, but each team should use only one. https://en.wikipedia.org/wiki/Email"
msgid "email" msgid "email"
msgstr "" msgstr "E-mail"
#. "a person who works for somebody or a company in return for wages" #. "a person who works for somebody or a company in return for wages"
msgid "employee" msgid "employee"
@ -433,14 +435,12 @@ msgid "financial calculator: payments"
msgstr "pagamentos" msgstr "pagamentos"
#. "formal records of the financial activities and position of a business, person, or other entity. See https://en.wikipedia.org/wiki/Financial_statement for a list." #. "formal records of the financial activities and position of a business, person, or other entity. See https://en.wikipedia.org/wiki/Financial_statement for a list."
#, fuzzy
#| msgid "income statement"
msgid "financial statement" msgid "financial statement"
msgstr "declaração de renda" msgstr "demonstrativo financeiro"
#. "Free software is a matter of liberty, not price … see https://en.wikipedia.org/wiki/Free_software" #. "Free software is a matter of liberty, not price … see https://en.wikipedia.org/wiki/Free_software"
msgid "free software" msgid "free software"
msgstr "" msgstr "software livre"
#. "An increase in wealth; profit; advantage (See also: capital gains)" #. "An increase in wealth; profit; advantage (See also: capital gains)"
msgid "gain" msgid "gain"
@ -763,22 +763,20 @@ msgid "tax info"
msgstr "info de impostos" msgstr "info de impostos"
#. "Amost everybody has to declare and probably pay it. See https://en.wikipedia.org/wiki/Income_tax" #. "Amost everybody has to declare and probably pay it. See https://en.wikipedia.org/wiki/Income_tax"
#, fuzzy
#| msgid "account type: Income"
msgid "tax type: income tax" msgid "tax type: income tax"
msgstr "Receita" msgstr "tipo do imposto: imposto de renda"
#. "Usually only business users have to handle it, see https://en.wikipedia.org/wiki/Sales_tax." #. "Usually only business users have to handle it, see https://en.wikipedia.org/wiki/Sales_tax."
msgid "tax type: sales tax" msgid "tax type: sales tax"
msgstr "" msgstr "tipo do imposto: imposto sobre as vendas"
#. "'Goods and Service Tax' is one form of sales tax." #. "'Goods and Service Tax' is one form of sales tax."
msgid "tax type: GST" msgid "tax type: GST"
msgstr "" msgstr "tipo do imposto: produtos e serviços"
#. "'Value Added Tax' is the other form of sales tax." #. "'Value Added Tax' is the other form of sales tax."
msgid "tax type: VAT" msgid "tax type: VAT"
msgstr "" msgstr "tipo do imposto: IVA"
#. "If you create a new e.g. style sheet, you can start from a template." #. "If you create a new e.g. style sheet, you can start from a template."
msgid "template" msgid "template"

10
po/ja.po
View File

@ -19,10 +19,10 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnucash 4.0\n" "Project-Id-Version: gnucash 4.0\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?" "Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"product=GnuCash&component=Translations\n" "cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2021-01-22 11:07+0100\n" "POT-Creation-Date: 2021-01-22 11:07+0100\n"
"PO-Revision-Date: 2021-01-16 09:32+0000\n" "PO-Revision-Date: 2021-01-29 13:32+0000\n"
"Last-Translator: YOSHINO Yoshihito <yy.y.ja.jp@gmail.com>\n" "Last-Translator: YOSHINO Yoshihito <yy.y.ja.jp@gmail.com>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/gnucash/gnucash/" "Language-Team: Japanese <https://hosted.weblate.org/projects/gnucash/gnucash/"
"ja/>\n" "ja/>\n"
@ -27482,14 +27482,10 @@ msgid "Double-Weeks"
msgstr "2 週" msgstr "2 週"
#: gnucash/report/reports/standard/price-scatter.scm:143 #: gnucash/report/reports/standard/price-scatter.scm:143
#, fuzzy
#| msgid "Quarter"
msgid "Quarters" msgid "Quarters"
msgstr "四半期" msgstr "四半期"
#: gnucash/report/reports/standard/price-scatter.scm:144 #: gnucash/report/reports/standard/price-scatter.scm:144
#, fuzzy
#| msgid "Half Year"
msgid "Half Years" msgid "Half Years"
msgstr "半年" msgstr "半年"

14
po/pt_BR.po
View File

@ -11,14 +11,15 @@
# LL Magical <lolayami2004@gmail.com>, 2020. # LL Magical <lolayami2004@gmail.com>, 2020.
# Fábio Rodrigues Ribeiro <farribeiro@gmail.com>, 2021. # Fábio Rodrigues Ribeiro <farribeiro@gmail.com>, 2021.
# José Lemos Neto <lemosjosex@protonmail.com>, 2021. # José Lemos Neto <lemosjosex@protonmail.com>, 2021.
# Wellington Terumi Uemura <wellingtonuemura@gmail.com>, 2021.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GnuCash 2.2\n" "Project-Id-Version: GnuCash 2.2\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?" "Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"product=GnuCash&component=Translations\n" "cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2021-01-22 11:07+0100\n" "POT-Creation-Date: 2021-01-22 11:07+0100\n"
"PO-Revision-Date: 2021-01-21 13:32+0000\n" "PO-Revision-Date: 2021-01-31 07:41+0000\n"
"Last-Translator: José Lemos Neto <lemosjosex@protonmail.com>\n" "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
"gnucash/gnucash/pt_BR/>\n" "gnucash/gnucash/pt_BR/>\n"
"Language: pt_BR\n" "Language: pt_BR\n"
@ -21364,9 +21365,8 @@ msgid "From Namespace"
msgstr "Espaço de nomes" msgstr "Espaço de nomes"
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:53 #: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:53
#, fuzzy
msgid "Currency To" msgid "Currency To"
msgstr "Moeda: " msgstr "Moeda para"
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:66 #: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:66
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:117 #: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:117
@ -31546,7 +31546,7 @@ msgstr ""
#: libgnucash/engine/gncOwner.c:1127 #: libgnucash/engine/gncOwner.c:1127
msgid "Lot Link" msgid "Lot Link"
msgstr "Ligação de Lote " msgstr "Ligação de Lote"
#: libgnucash/engine/policy.c:52 #: libgnucash/engine/policy.c:52
msgid "First In, First Out" msgid "First In, First Out"

2
util/ci/macos-ci-deps/README.md
View File

@ -1,6 +1,6 @@
For creating the macOS dependency tarball required by the Github CI tests. For creating the macOS dependency tarball required by the Github CI tests.
Reruirements: Requirements:
* Administrator privs on your Mac. * Administrator privs on your Mac.
* Project admin privs for https://sourceforge.net/projects/gnucash. * Project admin privs for https://sourceforge.net/projects/gnucash.
* You must be running the same or newer version of macOS as the Github runner. * You must be running the same or newer version of macOS as the Github runner.