Merge branch 'maint'

Gnucash · Jan 31, 2021 · f556ad3 · f556ad3
2 parents d16f390 + 103511e
commit f556ad3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 53 deletions.
diff --git a/gnucash/gnome-search/gnc-general-search.c b/gnucash/gnome-search/gnc-general-search.c
@@ -510,8 +510,9 @@ gnc_general_search_set_selected (GNCGeneralSearch *gsl, gpointer selection)
     if (selection && priv->get_guid)
     {
         const QofParam *get_guid = priv->get_guid;
-        priv->guid = * ((GncGUID *)(get_guid->param_getfcn
-                                    (gsl->selected_item, get_guid)));
+        GncGUID *guid = (GncGUID *)(get_guid->param_getfcn (gsl->selected_item,
+                                                            get_guid));
+        priv->guid = guid ? *guid : *guid_null ();
         gnc_gui_component_watch_entity
         (priv->component_id, &(priv->guid),
          QOF_EVENT_MODIFY | QOF_EVENT_DESTROY);

diff --git a/libgnucash/backend/dbi/gnc-backend-dbi.cpp b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
@@ -30,20 +30,9 @@ extern "C"
 #include "config.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)
 #include <winsock2.h>
 #include <windows.h>
-#define __STDC_FORMAT_MACROS 1
 #endif
 
 #include <inttypes.h>
@@ -85,13 +74,6 @@ extern "C"
 #include "gnc-dbisqlresult.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
 #define HAVE_LIBDBI_R 1
 static dbi_inst dbi_instance = nullptr;

diff --git a/po/glossary/pt_BR.po b/po/glossary/pt_BR.po
@@ -7,30 +7,32 @@
 # Caio Alonso <caioalons@gmail.com>, 2007.
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.8\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: 2021-01-10 08:00+0100\n"
-"PO-Revision-Date: 2020-12-18 07:06+0000\n"
-"Last-Translator: LL Magical <lolayami2004@gmail.com>\n"
+"PO-Revision-Date: 2021-01-31 07: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"
 "Language: pt_BR\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.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.)"
 msgid "Term (Dear translator: This file will never be visible to the user!)"
 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"
 msgid "\"\""
-msgstr ""
+msgstr "\"\""
 
 #. "A detailed record of money spent and received"
 msgid "account"
@@ -338,7 +340,7 @@ msgstr "Personalizado"
 
 #. "Compact, well-structured presentation of informations. See https://en.wikipedia.org/wiki/Dashboard_(business)"
 msgid "dashboard"
-msgstr ""
+msgstr "Painel"
 
 #. "The backend where the data is stored."
 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"
 msgid "email"
-msgstr ""
+msgstr "E-mail"
 
 #. "a person who works for somebody or a company in return for wages"
 msgid "employee"
@@ -433,14 +435,12 @@ msgid "financial calculator: payments"
 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."
-#, fuzzy
-#| msgid "income 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"
 msgid "free software"
-msgstr ""
+msgstr "software livre"
 
 #. "An increase in wealth; profit; advantage (See also: capital gains)"
 msgid "gain"
@@ -763,22 +763,20 @@ msgid "tax info"
 msgstr "info de impostos"
 
 #. "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"
-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."
 msgid "tax type: sales tax"
-msgstr ""
+msgstr "tipo do imposto: imposto sobre as vendas"
 
 #. "'Goods and Service Tax' is one form of sales tax."
 msgid "tax type: GST"
-msgstr ""
+msgstr "tipo do imposto: produtos e serviços"
 
 #. "'Value Added Tax' is the other form of sales tax."
 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."
 msgid "template"

diff --git a/po/ja.po b/po/ja.po
@@ -19,10 +19,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash 4.0\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: 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"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/gnucash/gnucash/"
 "ja/>\n"
@@ -27482,14 +27482,10 @@ msgid "Double-Weeks"
 msgstr "2 週"
 
 #: gnucash/report/reports/standard/price-scatter.scm:143
-#, fuzzy
-#| msgid "Quarter"
 msgid "Quarters"
 msgstr "四半期"
 
 #: gnucash/report/reports/standard/price-scatter.scm:144
-#, fuzzy
-#| msgid "Half Year"
 msgid "Half Years"
 msgstr "半年"
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
@@ -11,14 +11,15 @@
 # LL Magical <lolayami2004@gmail.com>, 2020.
 # Fábio Rodrigues Ribeiro <farribeiro@gmail.com>, 2021.
 # José Lemos Neto <lemosjosex@protonmail.com>, 2021.
+# Wellington Terumi Uemura <wellingtonuemura@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: GnuCash 2.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: 2021-01-22 11:07+0100\n"
-"PO-Revision-Date: 2021-01-21 13:32+0000\n"
-"Last-Translator: José Lemos Neto <lemosjosex@protonmail.com>\n"
+"PO-Revision-Date: 2021-01-31 07:41+0000\n"
+"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "gnucash/gnucash/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -21364,9 +21365,8 @@ msgid "From Namespace"
 msgstr "Espaço de nomes"
 
 #: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:53
-#, fuzzy
 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-tx.cpp:117
@@ -31546,7 +31546,7 @@ msgstr ""
 
 #: libgnucash/engine/gncOwner.c:1127
 msgid "Lot Link"
-msgstr "Ligação de Lote "
+msgstr "Ligação de Lote"
 
 #: libgnucash/engine/policy.c:52
 msgid "First In, First Out"

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