Merge branch 'maint'

.travis.yml

@@ -1,15 +0,0 @@
-# Test
-language: c++
-compiler: gcc
-env:
-    - BUILDENV=arch BUILDTYPE=cmake-ninja
-    - BUILDENV=ubuntu-18.04 BUILDTYPE=cmake-make
-services:
-    - docker
-install:
-    - docker --version
-    - echo BUILDENV="$BUILDENV"
-    - docker build -f util/ci/${BUILDENV}-docker -t ${BUILDENV}-gnucashbuild util/ci
-script:
-    - echo BUILDTYPE="$BUILDTYPE"
-    - docker run -v "$(pwd)":/gnucash:rw --env="BUILDTYPE=$BUILDTYPE" --rm ${BUILDENV}-gnucashbuild

NEWS

@@ -1,5 +1,110 @@
 Version history:
 ------- -------
+4.3  - 27 December 2020
+The fourth release of the 4.x stable series.
+
+Between 4.2 and 4.3, the following bugfixes were accomplished:
+
+    Bug 106746 - In Mort. Repay. druid, creating New acct should also select it.
+    Bug 128772 - Account Help Button does not work
+    Bug 309943 - When unable to obtain a lock, no option to open another database.
+    Bug 330930 - Financial Calculator resets payment period to zero if automatic decimal places used
+    Bug 343647 - [rfe] save tab/report location
+    Bug 345924 - RFE: don't disable "OK" button after using "Apply" to modify chart options
+    Bug 355496 - Mark placeholder accounts in account tree window visibly.
+    Bug 355498 - When there is only one result from a 'Find', select it.
+    Bug 571697 - Transaction Status in Since Last Run needs to look clickable.
+    Bug 644242 - Window Panning Oddity.
+    Bug 645379 - When duplicating a transaction, any non-numeric value entered in the "Number" field is discarded.
+    Bug 667490 - Support image-based TAN methods QR, photoTAN, and chipTAN optical "Flicker code"
+
+    Partial: Implements the display of flashing optical TAN challenges (aka flicker) in the "Enter TAN" dialog box.
+    Bug 688917 - Help button not working when editing style sheets.
+    Bug 720564 - Search in General Ledger cannot be cleared.
+    Bug 794807 - Calendar widget current month shown as (null).
+    Bug 797901 - List of Recently Used Files not updated until GnuCash is closed and reopened.
+    Bug 797944 - Crash on use of File-Open
+    Bug 797953 - RFE: provide access to filter-by on right-mouse-click in Accounts register.
+    Bug 797956 - dialog-report-style-sheet.c stylesheet editor does not set transient_for correctly.
+    Bug 797959 - "Exception" when value greater than one million with commas and periods is pasted to register.
+    Bug 797967 - minor ui niggles - some dialogs don't respond to GDK_KEY_Escape
+    Bug 797971 - odd cursor behaviour in register Description.
+    Bug 797972 - Crash on export report CSV
+    Bug 797982 - exchange rates' decimal places (bis)
+    Bug 797983 - v4.2 report numbers change over gnucash restarts; Price Database dropping user:price-editor entries.
+    Bug 797984 - Infinite loop while Check&Repair AR and AP accounts
+    Bug 797989 - Sorting columns by alphabet with non-ASCII characters
+    Bug 797993 - Reverse balance option does not apply to an Account Report
+    Bug 797994 - Account type-ahead search doesn't match accented characters.
+    Bug 798005 - Import of QIF file sets expenses to zero, deposits are fine
+    Bug 798008 - Option '--log' cannot be specified more than once.
+    Bug 798015 - cash flow numerical-overflow
+    Bug 798031 - Date goes to prior year with mm/dd entry to transaction duplicate.
+    Bug 798036 - Transaction Report should offer price source
+    Bug 798038 - Incorrect spelling in german account templates 'common' and 'full'
+    Bug 798039 - Using 'Consolidate Transactions' option on Consolidate Transaction Report returns Error
+    Bug 798041 - Open invoices in new window.
+    Bug 798047 - Crash on delete account.
+    Bug 798050 - error using Reports->Experimental->Income Statement (Multicolumn)
+
+The following fixes and improvements were not associated with bug reports:
+
+    Add custom unbound-variable exception reporter in guile that identifies what module provides the missing symbol.
+    Balsheet-pnl report: show most recent period first by default
+    Change register page icon to a padlock if read only
+    When a resister is read only make whole sheet insensitive.
+    Add account name to the read-only-register dialog box because under some circumstances it may be unclear to which register the message applies.
+    Strictly use use-modules to import Scheme symbols: Guile 3.0 doesn't like the alternatives. This can cause problems resolving symbols if the source of those symbols isn't yet compiled and hasn't been symlinked into the builddir.
+    Don't try to reload report if the first attempt raised an html error.
+    Barcharts: Limit account drill-down depth to 6.
+    I18N:glossary: add mortgage terms ARM, APR, FRM
+    Change the icons used for the file locked dialog box.
+    Add support for the opening balance accounts flag
+
+    Up to now, opening balance accounts have been identified by means of fixed names and their translations. Support Replacing this with a consistent non-translated tag. The actual replacement will be added to Gnucash 4.4; this change is to ensure a migration path.
+    Replace TravisCI with Github actions for CI testing. TravisCI sharply restricted their free support of Free Software projects.
+    Use LTDL_LIBRARY_PATH instead of (DY)LD_LIBRARY_PATH in environment file.
+    Add a few more CSS classes for labels
+    Add GoogleMocks of some engine objects and refine Import-export unit tests using them.
+    Add auto-clear to register page
+    Change source files dialog-dup-trans.* for space and tabs
+    Fix exception when converting to decimal values that reduce to N/1.
+    Add confirmation of Main Window close when more than one window is displayed
+    Add keyboard shortcuts <Ctrl><Alt><Menu> for the notebook page selection menu and <Ctrl><Alt>A to jump to the Accounts page.
+    Allow using the Ctrl+Alt+PgUp/Down to scroll the report view.
+    Fix report page keyboard focus in the scroll window.
+    Fix some incorrect links to the help file
+    Fix section help on windows not working.
+    Set the visibility of the account column in import-main-matcher depending upon the nubmer of accounts being displayed.
+    Add option to hide memo column on import-main-matcher
+    Fix pressing help button in OFX importer causing main-import-matcher to disappear
+    Preferences dialog: Display the invalid account separator message box only when the user closes the Preferences Dialog instead of after every change to any control.
+    Expose ngettext as gnc:ngettext
+    Add tooltip in import matcher window for description and memo column.
+    Put Macs back on WebKit2.
+    CMake: Mute guile-2.2 again
+    Fix several report stylesheet font-handling issues especially on macOS.
+    Fix price-renderer not converting to decimal.
+    Add some additional places where Check&Repair can be aborted
+    Make the price database list obey the force-prices-to-decimal preference.
+    Several improvements to the auto-clear dialog.
+    Fix some errors found by i18nspector in po files
+    Tax Report Options appeared twice on menu for Chart of Accounts
+    General Journal Report: Allow Report Options>General Title to render
+        document title.
+    [options.scm] rename new-owner-report "Links" to "Transaction Links"
+    [new-owner-report] enable doclink links
+    [html-utilities][API] add function gnc:html-invoice-doclink-anchor
+    Disable chart animation that prevented visual comparison of state before
+        and after reload
+    Select the register account if Tax Options dialog opened from a register tab.
+
+Deprecations
+
+    xaccAccountCountSplits.
+    gnc:html-make-exchangerates
+
+
 4.2  - 27 September 2020
 The third release of the 4.x stable series.
 

bindings/guile/core-utils.scm

@@ -29,6 +29,8 @@
 (eval-when (compile load eval expand)
   (load-extension "libgnucash-guile" "gnc_guile_bindings_init"))
 
+(use-modules (srfi srfi-26))
+(use-modules (ice-9 match))
 (use-modules (ice-9 i18n))
 
 (export N_)
@@ -73,3 +75,35 @@
 
 (define gnc:string-locale<? string-locale<?)
 (define gnc:string-locale>? string-locale>?)
+
+;; Custom unbound-variable exception printer: instead of generic "In
+;; procedure module-lookup: Unbound variable: varname", it will first
+;; search all available modules to identify missing (use-modules) in
+;; header, and offer hint to add it. This is adapted from Guix source.
+(define (known-variable-definition variable)
+  (define seen (make-hash-table))
+  (let lp ((modules (list (resolve-module '() #f #f #:ensure #f))) (retval '()))
+    (match modules
+      (() retval)
+      (((? (cut hash-ref seen <>)) . tail) (lp tail retval))
+      ((head tail ...)
+       (hash-set! seen head #t)
+       (let ((next (append tail (hash-map->list (lambda (name module) module)
+                                                (module-submodules head)))))
+         (match (and=> (module-public-interface head)
+                       (cut module-local-variable <> variable))
+           (#f (lp next retval))
+           (_ (lp next (cons (module-name head) retval)))))))))
+
+(define (print-unbound-variable-error port key args default-printer)
+  (match args
+    ((proc message (variable) _ ...)
+     (format port "Unbound variable: ~a. " variable)
+     (match (known-variable-definition variable)
+       (() (format port "It is a typo, or inaccessible in current module."))
+       ((mod) (format port "Did you forget (use-module ~s)?" mod))
+       (modules (format port "It is defined in one of the following modules\n")
+                (for-each (cut format port "(use-module ~s)\n" <>) modules))))
+    (_ (default-printer))))
+
+(set-exception-printer! 'unbound-variable print-unbound-variable-error)

bindings/guile/gnc-module.scm

@@ -64,7 +64,7 @@ this module in your code or not.")
 been deprecated. Use '(use-modules (" mod-name-str "))' instead.")
        (module-use! (current-module) (resolve-interface scm-mod-name)))
 
-      ((or "gnucash/gnome-utils" "gnucash/html" "gnucash/report/report-system")
+      ((or "gnucash/gnome-utils" "gnucash/report/report-system")
        (when (string=? gnc-mod-name "gnucash/report/report-system")
          (set! mod-name-str "gnucash report"))
        (set! scm-mod-name '(gnucash report))
@@ -76,6 +76,12 @@ or not you use functions from this module in your code or not.")
        (use-modules (gnucash engine) (gnucash app-utils))
        (module-use! (current-module) (resolve-interface scm-mod-name)))
 
+      ("gnucash/html"
+       (deprecate "* WARNING * '(gnc:module-load \"gnucash/html\" 0)' has \
+been deprecated. Use '(use-modules (gnucash html))' instead.")
+       (use-modules (gnucash html))
+       (module-use! (current-module) (resolve-interface scm-mod-name)))
+
       (_ (deprecate "* WARNING * '(gnc:module-load \"" gnc-mod-name "\" 0)' \
 has been deprecated. Use '(use-modules (" mod-name-str "))' instead. \
 Additional guile modules may have to be loaded depending on your specific code.")

common/cmake_modules/GncAddSchemeTargets.cmake

@@ -174,6 +174,7 @@ function(gnc_add_scheme_targets _TARGET)
   endif()
 
   # If links are requested, we simply link (or copy, for Windows) each source file to the dest directory
+  set(TARGET_LINKS "")
   if(SCHEME_TGT_MAKE_LINKS)
     set(_LINK_DIR ${CMAKE_BINARY_DIR}/${GUILE_REL_UNIX_SITEDIR}/${SCHEME_TGT_OUTPUT_DIR})
     file(MAKE_DIRECTORY ${_LINK_DIR})
@@ -193,7 +194,8 @@ function(gnc_add_scheme_targets _TARGET)
         )
       endif()
     endforeach(scheme_file)
-    add_custom_target(${_TARGET}-links ALL DEPENDS ${_SCHEME_LINKS})
+    set(TARGET_LINKS ${_TARGET}-links)
+    add_custom_target(${TARGET_LINKS} ALL DEPENDS ${_SCHEME_LINKS})
   endif()
 
   # Construct the guile source and compiled load paths
@@ -279,7 +281,7 @@ function(gnc_add_scheme_targets _TARGET)
   if (__DEBUG)
     message("TARGET_FILES are ${_TARGET_FILES}")
   endif()
-  add_custom_target(${_TARGET} ALL DEPENDS ${_TARGET_FILES})
+  add_custom_target(${_TARGET} ALL DEPENDS ${_TARGET_FILES} ${TARGET_LINKS})
 
   set(_TARGET_FILES "${_TARGET_FILES}" PARENT_SCOPE)
 

data/accounts/de_DE/acctchrt_common.gnucash-xea

@@ -529,14 +529,14 @@
   <act:parent type="new">bc39f4d37eb75353f4f971e80b9d2818</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Einkommenssteuer</act:name>
+  <act:name>Einkommensteuer</act:name>
   <act:id type="new">f7d5002945d2d695e63bdb27a572e478</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
   </act:commodity>
-  <act:description>Einkommenssteuer</act:description>
+  <act:description>Einkommensteuer</act:description>
   <act:parent type="new">71ddd513f73ad0920520766c57c1258e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -562,14 +562,14 @@
   <act:parent type="new">71ddd513f73ad0920520766c57c1258e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Solidarzuschlag</act:name>
+  <act:name>Solidaritätszuschlag</act:name>
   <act:id type="new">a7535bdcf6c38d12d09c384449d00089</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
   </act:commodity>
-  <act:description>Solidarzuschlag</act:description>
+  <act:description>Solidaritätszuschlag</act:description>
   <act:parent type="new">71ddd513f73ad0920520766c57c1258e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">

data/accounts/de_DE/acctchrt_full.gnucash-xea

@@ -831,14 +831,14 @@
   <act:parent type="new">bc39f4d37eb75353f4f971e80b9d2818</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Einkommenssteuer</act:name>
+  <act:name>Einkommensteuer</act:name>
   <act:id type="new">f7d5002945d2d695e63bdb27a572e478</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
   </act:commodity>
-  <act:description>Einkommenssteuer</act:description>
+  <act:description>Einkommensteuer</act:description>
   <act:parent type="new">71ddd513f73ad0920520766c57c1258e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -864,14 +864,14 @@
   <act:parent type="new">71ddd513f73ad0920520766c57c1258e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Solidarzuschlag</act:name>
+  <act:name>Solidaritätszuschlag</act:name>
   <act:id type="new">a7535bdcf6c38d12d09c384449d00089</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
   </act:commodity>
-  <act:description>Solidarzuschlag</act:description>
+  <act:description>Solidaritätszuschlag</act:description>
   <act:parent type="new">71ddd513f73ad0920520766c57c1258e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">

gnucash/gnome-utils/dialog-commodity.c

@@ -169,7 +169,8 @@ gnc_ui_select_commodity_modal_full(gnc_commodity * orig_sel,
                         /* Translators: Replace here and later CUSIP by the name of your local
                            National Securities Identifying Number
                            like gb:SEDOL, de:WKN, ch:Valorennummer, fr:SICOVAM ...
-                           See http://en.wikipedia.org/wiki/ISIN for hints. */
+                           See http://en.wikipedia.org/wiki/ISIN and
+                           https://en.wikipedia.org/wiki/National_numbering_agency for hints. */
                         cusip    ? _("\nExchange code (ISIN, CUSIP or similar): ") : "",
                         cusip    ? cusip : "",
                         mnemonic ? _("\nMnemonic (Ticker symbol or similar): ") : "",

gnucash/gnome/dialog-invoice.c

@@ -2275,9 +2275,8 @@ gnc_invoice_new_page (QofBook *bookp, InvoiceDialogType type,
 
     /* Now create the plugin page for this invoice and display it. */
     new_page = gnc_plugin_page_invoice_new (iw);
-    if (window)
+
-        gnc_plugin_page_set_use_new_window (new_page, FALSE);
+    if (!window)
-    else
         window = gnc_plugin_business_get_window ();
 
     gnc_main_window_open_page (window, new_page);

gnucash/gnome/gnc-plugin-page-account-tree.c

@@ -1668,12 +1668,11 @@ gnc_plugin_page_account_tree_cmd_delete_account (GtkAction *action, GncPluginPag
     if (!(xaccAccountGetSplitList (account) != NULL ||
           gnc_account_n_children (account)))
     {
-        do_delete_account (account, NULL, NULL, NULL);
-
         /* update opening balance account */
         gnc_find_or_create_equity_account (gnc_account_get_root(account),
                                            EQUITY_OPENING_BALANCE,
                                            xaccAccountGetCommodity (account));
+        do_delete_account (account, NULL, NULL, NULL);
         return;
     }
 
@@ -1709,13 +1708,12 @@ gnc_plugin_page_account_tree_cmd_delete_account (GtkAction *action, GncPluginPag
                                 adopt.subacct.new_account,
                                 adopt.delete_res) == GTK_RESPONSE_ACCEPT)
     {
-        do_delete_account (account, adopt.subacct.new_account,
-                           adopt.subtrans.new_account, adopt.trans.new_account);
-
         /* update opening balance account */
         gnc_find_or_create_equity_account (gnc_account_get_root(account),
                                            EQUITY_OPENING_BALANCE,
                                            xaccAccountGetCommodity (account));
+        do_delete_account (account, adopt.subacct.new_account,
+                           adopt.subtrans.new_account, adopt.trans.new_account);
     }
 }
 

gnucash/gtkbuilder/dialog-commodity.glade

@@ -472,7 +472,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">ISIN, CUSI_P or other code</property>
+                <property name="label" translatable="yes" comments="Again replace CUSIP by your National Securities Identifying Number.">ISIN, CUSI_P or other code</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
                 <property name="mnemonic_widget">code_entry</property>

gnucash/import-export/aqb/CMakeLists.txt

@@ -13,6 +13,7 @@ set (aqbanking_SOURCES
   gnc-ab-transfer.c
   gnc-ab-utils.c
   gnc-file-aqb-import.c
+  gnc-flicker-gui.c
   gnc-gwen-gui.c
   gnc-plugin-aqbanking.c
   gncmod-aqbanking.c
@@ -31,6 +32,7 @@ set (aqbanking_noinst_HEADERS
   gnc-ab-transfer.h
   gnc-ab-utils.h
   gnc-file-aqb-import.h
+  gnc-flicker-gui.h
   gnc-gwen-gui.h
   gnc-plugin-aqbanking.h
 )

gnucash/import-export/aqb/dialog-ab.glade

@@ -634,14 +634,90 @@
               </packing>
             </child>
             <child>
-              <object class="GtkImage" id="optical_challenge">
+              <object class="GtkBox" id="flicker_hbox">
-                <property name="name">optical_challenge</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="spacing">7</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">end</property>
+                    <property name="label" translatable="yes">Bar_width</property>
+                    <property name="xalign">0.7</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">spin_barwidth</property>
+                    <attributes>
+                      <attribute name="gravity" value="west"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="spin_barwidth">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip-text" translatable="yes" comments="TAN generator with flicker interface common in DE only">Setting the bar width, adapting to the size of the TAN generator.</property>
+                    <property name="numeric">True</property>
+                    <property name="update_policy">if-valid</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">end</property>
+                    <property name="label" translatable="yes">_Delay</property>
+                    <property name="xalign">0.7</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">spin_delay</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="spin_delay">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip-text" translatable="yes" comments="TAN generator with flicker interface common in DE only">Setting the delay time, with small values the flicker graphic is repeated faster.</property>
+                    <property name="numeric">True</property>
+                    <property name="update_policy">if-valid</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkDrawingArea" id="flicker_marker">
+                <property name="visible">True</property>
+                <property name="app_paintable">True</property>
+                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="icon_name">image-missing</property>
-                <property name="icon_size">6</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -649,6 +725,48 @@
                 <property name="position">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkImage" id="optical_challenge">
+                    <property name="name">optical_challenge</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="icon_name">image-missing</property>
+                    <property name="icon_size">6</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkDrawingArea" id="flicker_challenge">
+                    <property name="visible">True</property>
+                    <property name="app_paintable">True</property>
+                    <property name="tooltip_text" translatable="yes" comments="TAN generator with flicker interface common in DE only">Hold the TAN generator in front of the animated graphic. The markings (triangles) on the graphic must match those on the TAN generator.</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
@@ -736,7 +854,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>

gnucash/import-export/aqb/gnc-flicker-gui.c

@@ -0,0 +1,442 @@
+/*
+ * gnc-flicker-gui.c --
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact:
+ *
+ * Free Software Foundation           Voice:  +1-617-542-5942
+ * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
+ * Boston, MA  02110-1301,  USA       gnu@gnu.org
+ */
+
+/**
+ * @internal
+ * @file gnc-flicker-gui.c
+ * @brief GUI callbacks for Flicker and ChipTAN(optisch)
+ * @author Copyright (C) 2020 Christian Wehling <christian.wehling@web.de>
+ */
+
+#include <config.h>
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include "dialog-utils.h"
+#include "gnc-flicker-gui.h"
+#include "gnc-state.h"
+#include "gnc-ui.h"
+
+#define GNC_PREFS_GROUP     "dialogs.flicker"
+#define GNC_STATE_SECTION   "Flicker"
+#define STATE_KEY_BAR_WIDTH "barwidth"
+#define STATE_KEY_DELAY     "delay"
+
+#define BAR_WIDTH  44    /* Width of the flicker bars */
+#define BAR_HEIGHT 200   /* Height of the flicker bars */
+#define MARGIN     12    /* Distance between the flicker bars */
+#define DELAY      50    /* Pause between the flickering painting */
+
+static guint flicker_data (char const *challenge);
+static gboolean time_handler (GtkWidget *widget);
+static void do_marker_drawing (cairo_t *cr);
+static void draw_bit (cairo_t *cr, _Bool bit, int i);
+static void do_flicker_drawing (GtkWidget *widget, cairo_t *cr);
+static void do_flicker_load_state (GtkWidget *dialog);
+static void do_flicker_store_state (GtkWidget *dialog);
+static gboolean on_flicker_challenge_draw (GtkWidget *widget, cairo_t *cr,
+                                           gpointer user_data);
+static void on_flicker_challenge_map (GtkWidget *widget);
+static void on_flicker_challenge_destroy (GtkWidget *widget, gpointer user_data);
+static gboolean on_flicker_marker_draw (GtkWidget *widget, cairo_t *cr,
+                                        gpointer user_data);
+static void on_flicker_marker_map (GtkWidget *widget);
+static void on_spin_barwidth_value_changed (GtkSpinButton *spin, GtkWidget *widget);
+static void on_spin_delay_value_changed (GtkSpinButton *spin, GtkWidget *widget);
+static void on_dialog_destroy (GtkWidget *dialog, gpointer user_data);
+
+/* structured data for the flicker variables */
+struct Flickerdraw {
+    const char *challenge;
+    guint challenge_length;
+    guint margin;           /* Distance between bars */
+    guint barwidth;         /* Bar width */
+    guint barheight;        /* Bar height */
+    guint x_barpos;         /* x-value for the position of the bar */
+    guint y_barpos;         /* y-value for the position of the bar */
+    guint x_drawpos;        /* x-value of the first painting position */
+    guint y_drawpos;        /* y-value of the first painting position */
+    guint height;           /* Height of the drawing area */
+    guint width;            /* Width of the drawing area */
+    guint delay;            /* Waiting time between frames in milliseconds */
+    guint halfbyteid;
+    guint clock;
+    guint interval;
+    gboolean change_interval;
+};
+static struct Flickerdraw flickerdraw;
+
+static GncFlickerGui *flickergui = NULL;
+static _Bool bitarray[255][5];
+
+/* this function will return number corresponding 0,1,2..,9,A,B,C,D,E,F */
+static guint
+get_num (const char ch)
+{
+    int num =0;
+    if (ch >= '0' && ch <= '9')
+        num = ch - 0x30;
+    else
+    {
+        switch (ch)
+        {
+            case 'A': case 'a': num = 10; break;
+            case 'B': case 'b': num = 11; break;
+            case 'C': case 'c': num = 12; break;
+            case 'D': case 'd': num = 13; break;
+            case 'E': case 'e': num = 14; break;
+            case 'F': case 'f': num = 15; break;
+            default: num = 0;
+        }
+    }
+    /* The bank challenge has been verified by Aqbanking,
+     * so I assume that no error can occur. */
+    return num;
+}
+
+/* convert the bank challenge into the 5 bits for the flicker data */
+static guint
+flicker_data (const char *challenge)
+{
+    /* bitfield is a clock bit and a 4-bit code with the bits reversed
+       (bit 1 is the least significant and bit 4 the most
+       so 0x1 is 1000 and 0x8 is 0001) */
+    static const _Bool bits[16][5] =
+    {
+        {0, 0, 0, 0, 0}, {0, 1, 0, 0, 0}, {0, 0, 1, 0, 0}, {0, 1, 1, 0, 0},
+        {0, 0, 0, 1, 0}, {0, 1, 0, 1, 0}, {0, 0, 1, 1, 0}, {0, 1, 1, 1, 0},
+        {0, 0, 0, 0, 1}, {0, 1, 0, 0, 1}, {0, 0, 1, 0, 1}, {0, 1, 1, 0, 1},
+        {0, 0, 0, 1, 1}, {0, 1, 0, 1, 1}, {0, 0, 1, 1, 1}, {0, 1, 1, 1, 1}
+    };
+
+    /* prepend synchronization identifier */
+    char* code = g_strdup_printf ("0FFF%s", challenge);
+    guint challenge_length = strlen (code);
+
+    /* Swap the position of the bits in pairs throughout the bank challenge
+       (low-order nibble first). */
+    for (guint i = 0; i < challenge_length; i += 2)
+    {
+        guint val1 = get_num (code[i]);
+        guint val2 = get_num (code[i+1]);
+
+        memcpy (&bitarray[i], bits[val2], sizeof(bits[val2]));
+        memcpy (&bitarray[i+1], bits[val1], sizeof(bits[val1]));
+    }
+    g_free (code);
+
+    return challenge_length;
+}
+
+/* A timer for redrawing the flickering painting, is started here and
+ * called up again when the "Delay" value is changed */
+static gboolean
+time_handler (GtkWidget *widget)
+{
+    /* Change of waiting time */
+    if (flickerdraw.change_interval)
+    {
+        g_source_remove (flickerdraw.interval);
+        flickerdraw.interval = g_timeout_add (flickerdraw.delay,
+                                              (GSourceFunc) time_handler,
+                                              (gpointer) widget);
+        flickerdraw.change_interval = FALSE;
+        return FALSE;
+    }
+    gtk_widget_queue_draw (widget);
+
+    return TRUE;
+}
+
+/* Show the colored triangle as a pointer for the position of the TAN generator */
+static void
+do_marker_drawing (cairo_t *cr)
+{
+    guint pos1;
+    guint pos2;
+
+    /* Initialize the drawing area to black */
+    cairo_set_source_rgb (cr, 0, 0, 0);
+    cairo_paint (cr);
+
+    cairo_set_source_rgb (cr, 0.9, 0.1, 0.1);
+    /* draw the left triangle */
+    pos1 = flickerdraw.x_drawpos + flickerdraw.barwidth / 2;
+    cairo_move_to (cr, pos1, 20);
+    cairo_line_to (cr, pos1 + 10, 2);
+    cairo_line_to (cr, pos1 - 10, 2);
+    cairo_close_path (cr);
+    cairo_stroke_preserve (cr);
+    cairo_fill (cr);
+
+    /* draw the right triangle */
+    pos2 = flickerdraw.x_drawpos + 4 * flickerdraw.margin + 4 * flickerdraw.barwidth +
+           flickerdraw.barwidth / 2;
+    cairo_move_to (cr, pos2, 20);
+    cairo_line_to (cr, pos2 + 10, 2);
+    cairo_line_to (cr, pos2 - 10, 2);
+    cairo_close_path (cr);
+    cairo_stroke_preserve (cr);
+    cairo_fill (cr);
+}
+
+/* draws the 5 flickering bars of the bank data into the drawing area */
+static void
+draw_bit (cairo_t *cr, _Bool bit, int i)
+{
+    if (bit & 1)
+        cairo_set_source_rgb (cr, 1, 1, 1);
+    else
+        cairo_set_source_rgb (cr, 0, 0, 0);
+
+    flickerdraw.x_barpos = flickerdraw.x_drawpos + i * flickerdraw.margin +
+                           i * flickerdraw.barwidth;
+    cairo_rectangle (cr, flickerdraw.x_barpos, flickerdraw.y_barpos,
+                     flickerdraw.barwidth, flickerdraw.barheight);
+    cairo_fill (cr);
+}
+
+/* Prepares the drawing area for the flicker graphic. */
+static void
+do_flicker_drawing (GtkWidget *widget, cairo_t *cr)
+{
+    /* Always align the flicker display in the middle of the drawing area */
+    flickerdraw.width = gtk_widget_get_allocated_width (widget);
+
+    /* Start position of the first bar */
+    flickerdraw.x_drawpos = (flickerdraw.width - 4 * flickerdraw.margin -
+                             5 * flickerdraw.barwidth) / 2;
+
+    /* Initialize the drawing area to black */
+    cairo_set_source_rgb (cr, 0, 0, 0);
+    cairo_paint (cr);
+
+    /* paint the flicker graphic */
+    bitarray[flickerdraw.halfbyteid][0] = flickerdraw.clock;
+    draw_bit (cr, flickerdraw.clock, 0);
+    for (int i = 1; i <= 4; i++)
+        draw_bit (cr, bitarray[flickerdraw.halfbyteid][i], i);
+
+    /* Each flicker point is drawn twice. Once with clock = 1 and once with clock = 0 */
+    if (!flickerdraw.clock)
+    {
+        flickerdraw.clock = 1;
+        flickerdraw.halfbyteid++;
+        if (flickerdraw.halfbyteid >= flickerdraw.challenge_length)
+            flickerdraw.halfbyteid = 0;
+    }
+    else if (flickerdraw.clock)
+        flickerdraw.clock = 0;
+}
+
+/* Load the state of the GUI (Size of the Dialog, Value of the Spinbutton)  */
+static void
+do_flicker_load_state (GtkWidget *dialog)
+{
+    /* Load the values in the spin button */
+    GKeyFile *state_file = gnc_state_get_current ();
+
+    if (g_key_file_has_key (state_file, GNC_STATE_SECTION, STATE_KEY_BAR_WIDTH, NULL))
+        flickerdraw.barwidth = g_key_file_get_integer (state_file,
+                                                       GNC_STATE_SECTION,
+                                                       STATE_KEY_BAR_WIDTH, NULL);
+    else
+        flickerdraw.barwidth = BAR_WIDTH;
+
+    if (g_key_file_has_key (state_file, GNC_STATE_SECTION, STATE_KEY_DELAY, NULL))
+        flickerdraw.delay = g_key_file_get_integer (state_file,
+                                                    GNC_STATE_SECTION,
+                                                    STATE_KEY_DELAY, NULL);
+    else
+        flickerdraw.delay = DELAY;
+
+    /* Load window size and position */
+    gnc_restore_window_size (GNC_PREFS_GROUP, GTK_WINDOW (dialog),
+                             gnc_ui_get_main_window (NULL));
+}
+
+/* Stores the state of the GUI (Size of the Dialog, Value of the Spinbutton) */
+static void
+do_flicker_store_state (GtkWidget *dialog)
+{
+    /* Save the values in the spin button */
+    GKeyFile *state_file = gnc_state_get_current ();
+
+    if (flickerdraw.barwidth != BAR_WIDTH)
+        g_key_file_set_integer (state_file, GNC_STATE_SECTION,
+                                STATE_KEY_BAR_WIDTH, flickerdraw.barwidth);
+    else if (g_key_file_has_key (state_file, GNC_STATE_SECTION,
+                                 STATE_KEY_BAR_WIDTH, NULL))
+        g_key_file_remove_key (state_file, GNC_STATE_SECTION,
+                               STATE_KEY_BAR_WIDTH, NULL);
+
+    if (flickerdraw.delay != DELAY)
+        g_key_file_set_integer (state_file, GNC_STATE_SECTION,
+                                STATE_KEY_DELAY, flickerdraw.delay);
+    else if (g_key_file_has_key (state_file, GNC_STATE_SECTION,
+                                 STATE_KEY_DELAY, NULL))
+        g_key_file_remove_key (state_file, GNC_STATE_SECTION,
+                               STATE_KEY_DELAY, NULL);
+
+    /* Save window size and position */
+    gnc_save_window_size (GNC_PREFS_GROUP, GTK_WINDOW (dialog));
+}
+
+/* This signal is emitted when the drawing area "flicker challenge" is visible */
+static void
+on_flicker_challenge_map (GtkWidget *widget)
+{
+    flickerdraw.challenge_length = flicker_data (flickerdraw.challenge);
+
+    /* Set the height of the drawing area */
+    flickerdraw.height = flickerdraw.barheight + 2 * flickerdraw.y_barpos;
+    gtk_widget_set_size_request (widget, -1, flickerdraw.height);
+
+    /* Call up the time function and start the flicker display */
+    flickerdraw.interval = g_timeout_add (flickerdraw.delay,
+                                          (GSourceFunc) time_handler,
+                                          (gpointer) widget);
+}
+
+/* Initialize the drawingarea to black and paint the flickerchallenge */
+static gboolean
+on_flicker_challenge_draw (GtkWidget *widget, cairo_t *cr,
+                           __attribute__((unused)) gpointer user_data)
+{
+    do_flicker_drawing (widget, cr);
+
+    return FALSE;
+}
+
+/* called when the drawing area is destroyed */
+static void
+on_flicker_challenge_destroy (GtkWidget *widget,
+                              __attribute__((unused)) gpointer user_data)
+{
+    /* remove the timeout function */
+    g_source_remove (flickerdraw.interval);
+}
+
+/* Initialize the drawing area "flicker marker" in black and draw the marker for
+ * the position of the TAN-Generator */
+static gboolean
+on_flicker_marker_draw (__attribute__((unused)) GtkWidget *widget, cairo_t *cr,
+                        __attribute__((unused)) gpointer data)
+{
+    do_marker_drawing (cr);
+
+    return FALSE;
+}
+
+/* This signal is emitted when the drawing area "flicker marker" is visible */
+static void
+on_flicker_marker_map (GtkWidget *widget)
+{
+    /* Set the height of the drawing area */
+    gtk_widget_set_size_request (widget, -1, flickerdraw.y_barpos);
+}
+
+/* The value for "Field width" has been changed on the spin button and the
+ * flicker display is updated */
+static void
+on_spin_barwidth_value_changed (GtkSpinButton *spin, GtkWidget *widget)
+{
+    flickerdraw.barwidth = gtk_spin_button_get_value_as_int (spin);
+    flickerdraw.x_drawpos = (flickerdraw.width - 4 * flickerdraw.margin -
+                             5 * flickerdraw.barwidth) / 2;
+
+    /* Moving the position triangles */
+    gtk_widget_queue_draw (widget);
+}
+
+/* The value for "waiting time" was changed on the spin button and
+ * the speed of the flickering display is updated */
+static void
+on_spin_delay_value_changed (GtkSpinButton *spin, GtkWidget *widget)
+{
+    flickerdraw.delay = gtk_spin_button_get_value_as_int (spin);
+
+    flickerdraw.change_interval = TRUE;
+    time_handler (widget);
+}
+
+static void
+on_dialog_destroy (GtkWidget *dialog, __attribute__((unused)) gpointer user_data)
+{
+    /* Store window size and initial setting values */
+    do_flicker_store_state (dialog);
+}
+
+/* The widgets for the GUI are prepared and the first parameters are set  */
+void
+ini_flicker_gui (const char *pChallenge, GncFlickerGui *gui)
+{
+    /* Establish reference to the dialog widgets created in gnc_gwen_gui */
+    flickergui = gui;
+
+    /* Load window size and initial setting values */
+    do_flicker_load_state (GTK_WIDGET (flickergui->dialog));
+
+    /* Initialize application */
+    flickerdraw.barheight = BAR_HEIGHT;
+    flickerdraw.margin = MARGIN;
+    flickerdraw.y_barpos = 20;        /* First painting position */
+    flickerdraw.halfbyteid = 0;
+    flickerdraw.clock = 1;
+
+    flickerdraw.challenge = pChallenge;
+
+    g_signal_connect (GTK_WINDOW (flickergui->dialog), "destroy",
+                      G_CALLBACK (on_dialog_destroy), NULL);
+
+    g_signal_connect (GTK_WIDGET (flickergui->flicker_challenge), "map",
+                      G_CALLBACK (on_flicker_challenge_map), NULL);
+    g_signal_connect (GTK_WIDGET (flickergui->flicker_challenge), "draw",
+                      G_CALLBACK (on_flicker_challenge_draw), NULL);
+    g_signal_connect (GTK_WIDGET (flickergui->flicker_challenge), "destroy",
+                      G_CALLBACK (on_flicker_challenge_destroy), NULL);
+
+    g_signal_connect (GTK_WIDGET (flickergui->flicker_marker), "map",
+                      G_CALLBACK (on_flicker_marker_map), NULL);
+    g_signal_connect (GTK_WIDGET (flickergui->flicker_marker), "draw",
+                      G_CALLBACK (on_flicker_marker_draw), NULL);
+
+    flickergui->adj_barwidth = gtk_adjustment_new (0.0, 10.0, 80.0, 1.0, 10.0, 0.0);
+    gtk_spin_button_set_adjustment (flickergui->spin_barwidth, flickergui->adj_barwidth);
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (flickergui->spin_barwidth),
+                               flickerdraw.barwidth);
+    g_signal_connect (GTK_WIDGET (flickergui->spin_barwidth), "value-changed",
+                      G_CALLBACK (on_spin_barwidth_value_changed),
+                                 flickergui->flicker_marker);
+    gtk_widget_set_focus_on_click (GTK_WIDGET (flickergui->spin_barwidth), FALSE);
+
+    flickergui->adj_delay = gtk_adjustment_new (0.0, 10.0, 100.0, 10.0, 10.0, 0.0);
+    gtk_spin_button_set_adjustment (flickergui->spin_delay, flickergui->adj_delay);
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (flickergui->spin_delay),
+                               flickerdraw.delay);
+    g_signal_connect (GTK_WIDGET (flickergui->spin_delay), "value-changed",
+                      G_CALLBACK (on_spin_delay_value_changed),
+                      flickergui->flicker_challenge);
+    gtk_widget_set_focus_on_click (GTK_WIDGET (flickergui->spin_delay), FALSE);
+
+    gtk_widget_grab_focus (GTK_WIDGET (flickergui->input_entry));
+}

gnucash/import-export/aqb/gnc-flicker-gui.h

@@ -0,0 +1,63 @@
+/*
+ * gnc-flicker-gui.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact:
+ *
+ * Free Software Foundation           Voice:  +1-617-542-5942
+ * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
+ * Boston, MA  02110-1301,  USA       gnu@gnu.org
+ */
+
+/**
+ * @addtogroup Import_Export
+ * @{
+ * @addtogroup AqBanking
+ * @{
+ * @file gnc-flicker-gui.h
+ * @brief GUI callbacks for Flicker and ChipTAN(optisch)
+ * @author Copyright (C) 2020 Christian Wehling <christian.wehling@web.de>
+ */
+
+#ifndef GNC_FLICKER_GUI_H
+#define GNC_FLICKER_GUI_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+// structured data for the GUI
+typedef struct
+{
+    GtkWidget     *dialog;
+    GtkWidget     *input_entry;
+    GtkWidget     *flicker_challenge;
+    GtkWidget     *flicker_marker;
+    GtkWidget     *flicker_hbox;
+    GtkAdjustment *adj_barwidth;
+    GtkAdjustment *adj_delay;
+    GtkSpinButton *spin_barwidth;
+    GtkSpinButton *spin_delay;
+} GncFlickerGui;
+
+/**
+ * Initialize the dialog and drawing area
+ *
+ * @param pChallenge: The answer from the bank which is shown as a flickering picture
+ * @param gui: The structure of the Dialog-Widgets
+ */
+void ini_flicker_gui (const char *pChallenge, GncFlickerGui *gui);
+
+G_END_DECLS
+
+#endif /* GNC_FLICKER_GUI_H */

gnucash/import-export/aqb/gnc-gwen-gui.c

@@ -46,6 +46,8 @@
 #include "gnc-plugin-aqbanking.h"
 #include "qof.h"
 
+#include "gnc-flicker-gui.h"
+
 # define GNC_GWENHYWFAR_CB GWENHYWFAR_CB
 
 #define GWEN_GUI_CM_CLASS "dialog-hbcilog"
@@ -928,6 +930,9 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
     GtkWidget *confirm_label;
     GtkWidget *remember_pin_checkbutton;
     GtkImage *optical_challenge;
+
+    static GncFlickerGui *flickergui = NULL;
+
     const gchar *internal_input, *internal_confirmed;
     gboolean confirm = (flags & GWEN_GUI_INPUT_FLAGS_CONFIRM) != 0;
     gboolean is_tan = (flags & GWEN_GUI_INPUT_FLAGS_TAN) != 0;
@@ -949,9 +954,33 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
     remember_pin_checkbutton = GTK_WIDGET(gtk_builder_get_object (builder, "remember_pin"));
     optical_challenge = GTK_IMAGE(gtk_builder_get_object (builder, "optical_challenge"));
     gtk_widget_set_visible(GTK_WIDGET(optical_challenge), FALSE);
+
+    flickergui = g_slice_new(GncFlickerGui);
+    flickergui->flicker_challenge = GTK_WIDGET(gtk_builder_get_object(builder, "flicker_challenge"));
+    flickergui->flicker_marker = GTK_WIDGET(gtk_builder_get_object(builder, "flicker_marker"));
+    flickergui->flicker_hbox = GTK_WIDGET(gtk_builder_get_object(builder, "flicker_hbox"));
+    flickergui->spin_barwidth = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "spin_barwidth"));
+    flickergui->spin_delay = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "spin_delay"));
+
+    gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_challenge), FALSE);
+    gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_marker), FALSE);
+    gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_hbox), FALSE);
+    gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_barwidth), FALSE);
+    gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_delay), FALSE);
+
     #ifdef AQBANKING6
-    if(mimeType != NULL && pChallenge != NULL && lChallenge > 0)
+    if (g_strcmp0(mimeType,"text/x-flickercode") == 0 && pChallenge != NULL)
     {
+        /* Chiptan Optic (aka Flicker) */
+        gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_challenge), TRUE);
+        gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_marker), TRUE);
+        gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_hbox), TRUE);
+        gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_barwidth), TRUE);
+        gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_delay), TRUE);
+    }
+    else if(mimeType != NULL && pChallenge != NULL && lChallenge > 0)
+    {
+        /* Phototan or Chiptan QR */
         gtk_widget_set_visible(GTK_WIDGET(optical_challenge), TRUE);
     }
     #endif
@@ -969,6 +998,7 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
     if ((flags & (GWEN_GUI_INPUT_FLAGS_TAN | GWEN_GUI_INPUT_FLAGS_SHOW)) != 0)
     {
         gtk_widget_set_visible(input_entry, TRUE);
+        gtk_entry_set_visibility(GTK_ENTRY(input_entry), TRUE);
     }
 
     if (gui->dialog)
@@ -993,9 +1023,22 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
     }
 
     #ifdef AQBANKING6
-    //if (optical_challenge)
+    /* Optical challenge. Flickercode sets the mimetype to
-    if(mimeType != NULL && pChallenge != NULL && lChallenge > 0)
+     * x-flickercode and doesn't set the challenge length */
+    if (g_strcmp0(mimeType,"text/x-flickercode") == 0 && pChallenge != NULL)
     {
+         /* Chiptan Optic (aka Flicker) */
+         flickergui->dialog = dialog;
+         flickergui->input_entry = input_entry;
+
+         ini_flicker_gui(pChallenge, flickergui);
+         g_slice_free(GncFlickerGui, flickergui);
+    }
+    /* While phototan has multiple mimetypes and does set the
+     * challenge length. */
+    else if(mimeType != NULL && pChallenge != NULL && lChallenge > 0)
+    {
+        /* Phototan or Chiptan QR */
         // convert PNG and load into widget
         // TBD: check mimeType?
         guchar *gudata = (guchar*)pChallenge;
@@ -1019,7 +1062,7 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
 
         gtk_image_set_from_pixbuf(optical_challenge, pixbuf);
     }
-    #endif
+#endif
 
     if (*input)
     {
@@ -1425,28 +1468,43 @@ getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *token,
     if(is_tan && methodId == GWEN_Gui_PasswordMethod_OpticalHHD)
     {
         /**
-        * TODO: How to handle Flicker code (use WebView and JS???)
-        *
         * use GWEN_Gui_PasswordMethod_Mask to get the basic method id
         *  cf. gui/gui.h of gwenhywfar
         */
         opticalMethodId=GWEN_DB_GetIntValue(methodParams, "tanMethodId", 0, AB_BANKING_TANMETHOD_TEXT);
         switch(opticalMethodId)
         {
+            case AB_BANKING_TANMETHOD_CHIPTAN:
+                break;
+            case AB_BANKING_TANMETHOD_CHIPTAN_OPTIC:
+                mimeType = "text/x-flickercode";
+                pChallenge = GWEN_DB_GetCharValue(methodParams, "challenge", 0, NULL);
+                if ((pChallenge == NULL) || (pChallenge[0] == '\0'))
+                {
+                    /* empty flicker-data */
+                    return GWEN_ERROR_NO_DATA;
+                }
+                break;
+            case AB_BANKING_TANMETHOD_CHIPTAN_USB:
+                /**
+                 * ToDo: is this the same as CHIPTAN_OPTIC ?
+                 */
+                 break;
             case AB_BANKING_TANMETHOD_PHOTOTAN:
             case AB_BANKING_TANMETHOD_CHIPTAN_QR:
-            /**
+                /**
-            * image data is in methodParams
+                 * image data is in methodParams
-            */
+                 */
-            mimeType=GWEN_DB_GetCharValue(methodParams, "mimeType", 0, NULL);
+                mimeType=GWEN_DB_GetCharValue(methodParams, "mimeType", 0, NULL);
-            pChallenge=(const char*) GWEN_DB_GetBinValue(methodParams, "imageData", 0, NULL, 0, &lChallenge);
+                pChallenge=(const char*) GWEN_DB_GetBinValue(methodParams, "imageData", 0, NULL, 0, &lChallenge);
-            if (!(pChallenge && lChallenge)) {
+                if (!(pChallenge && lChallenge))
-                /* empty optical data */
+                {
-                return GWEN_ERROR_NO_DATA;
+                    /* empty optical data */
-            }
+                    return GWEN_ERROR_NO_DATA;
-            break;
+                }
-        default:
+                break;
-            break;
+            default:
+                break;
         }
     }
     #endif

gnucash/import-export/aqb/gschemas/CMakeLists.txt

@@ -1,8 +1,8 @@
 
 if (WITH_AQBANKING)
-  set(aqb_GSCHEMA org.gnucash.dialogs.import.hbci.gschema.xml)
+  set(aqb_GSCHEMA org.gnucash.dialogs.import.hbci.gschema.xml org.gnucash.dialogs.flicker.gschema.xml)
 
   add_gschema_targets("${aqb_GSCHEMA}")
 endif()
 
-set_dist_list(aqbanking_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.hbci.gschema.xml.in)
+set_dist_list(aqbanking_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.hbci.gschema.xml.in org.gnucash.dialogs.flicker.gschema.xml.in)

gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.flicker.gschema.xml.in

@@ -0,0 +1,13 @@
+<schemalist gettext-domain="@PROJECT_NAME@">
+
+  <schema id="org.gnucash.dialogs.flicker" path="/org/gnucash/dialogs/flicker/">
+    <key name="last-geometry" type="(iiii)">
+      <default>(-1,-1,-1,-1)</default>
+      <summary>Last window position and size</summary>
+      <description>This setting describes the size and position of the window when it was last closed.
+        The numbers are the X and Y coordinates of the top left corner of the window
+        followed by the width and height of the window.</description>
+    </key>
+  </schema>
+
+</schemalist>

gnucash/import-export/qif-imp/CMakeLists.txt

@@ -76,12 +76,14 @@ set(GUILE_DEPENDS
 gnc_add_scheme_targets(scm-qif-import-0
     SOURCES "${qif_import_SCHEME_0}"
     OUTPUT_DIR "gnucash"
-    DEPENDS "${GUILE_DEPENDS}")
+    DEPENDS "${GUILE_DEPENDS}"
+    MAKE_LINKS)
 
 gnc_add_scheme_targets(scm-qif-import-2
     SOURCES "${qif_import_SCHEME_2}"
     OUTPUT_DIR "gnucash"
-    DEPENDS "${GUILE_DEPENDS};scm-qif-import")
+    DEPENDS "${GUILE_DEPENDS};scm-qif-import"
+    MAKE_LINKS)
 
 gnc_add_scheme_targets(scm-qif-import
     SOURCES "${qif_import_SCHEME}"
@@ -93,11 +95,13 @@ gnc_add_scheme_targets(scm-qif-import
 gnc_add_scheme_deprecated_module (
     OLD_MODULE "gnucash import-export qif-import"
     NEW_MODULE "gnucash qif-import"
-    DEPENDS "scm-qif-import-2")
+    DEPENDS "scm-qif-import-2"
+    MAKE_LINKS)
 gnc_add_scheme_deprecated_module (
     OLD_MODULE "gnucash import-export string"
     NEW_MODULE "gnucash string"
-    DEPENDS "scm-qif-import-0")
+    DEPENDS "scm-qif-import-0"
+    MAKE_LINKS)
 
 set_local_dist(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}
         ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2})

gnucash/report/reports/locale-specific/us/taxtxf.scm

@@ -107,6 +107,7 @@
 (use-modules (gnucash gnome-utils))
 (use-modules (gnucash report))
 (use-modules (srfi srfi-1))
+(use-modules (ice-9 format))
 (use-modules (gnucash html))
 
 (define reportname (N_ "Tax Schedule Report/TXF Export"))

gnucash/report/reports/standard/account-piecharts.scm

@@ -31,6 +31,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report))
 (use-modules (srfi srfi-1))
+(use-modules (ice-9 format))
 
 (define menuname-income (N_ "Income Piechart"))
 (define menuname-expense (N_ "Expense Piechart"))
@@ -560,7 +561,7 @@ balance at a given time"))
                (gnc:html-chart-set-width! chart width)
                (gnc:html-chart-set-height! chart height)
                (gnc:html-chart-add-data-series! chart
-                                                "Accounts"
+                                                (G_ "Accounts")
                                                 (map round-scu (unzip1 combined))
                                                 (gnc:assign-colors (length combined))
                                                 'urls urls)

gnucash/report/reports/standard/advanced-portfolio.scm

@@ -33,6 +33,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report))
 (use-modules (srfi srfi-1))
+(use-modules (ice-9 format))
 
 (define reportname (N_ "Advanced Portfolio"))
 
@@ -687,7 +688,7 @@ by preventing negative stock balances.<br/>")
                                    (begin
                                      ;; Wrong account (or no account), assume there isn't a DRP holding account
                                      (set! drp-holding-account 'none)
-                                     (set trans-drp-residual (gnc-numeric-zero))
+                                     (set! trans-drp-residual (gnc-numeric-zero))
                                      (set! drp-holding-amount (gnc-numeric-zero))))))
 
                        ;; Set trans-bought to the amount of money moved in to the account which was used to

gnucash/report/reports/standard/balsheet-pnl.scm

@@ -62,6 +62,9 @@ https://bugs.gnucash.org/")))
 (define optname-period (N_ "Period duration"))
 (define opthelp-period (N_ "Duration between time periods"))
 
+(define optname-reverse-chrono (N_ "Period order is most recent first"))
+(define opthelp-reverse-chrono (N_ "Period order is most recent first"))
+
 (define optname-dual-columns (N_ "Enable dual columns"))
 (define opthelp-dual-columns (N_ "Selecting this option will enable double-column \
 reporting."))
@@ -202,6 +205,8 @@ also show overall period profit & loss."))
            options
            gnc:pagename-general optname-dual-columns
            (not x))
+          (gnc-option-db-set-option-selectable-by-name
+           options gnc:pagename-general optname-reverse-chrono x)
           (case report-type
             ((balsheet)
              (gnc-option-db-set-option-selectable-by-name
@@ -229,6 +234,11 @@ also show overall period profit & loss."))
       gnc:pagename-general optname-dual-columns
       "c4" opthelp-dual-columns #t))
 
+    (add-option
+     (gnc:make-simple-boolean-option
+      gnc:pagename-general optname-reverse-chrono
+      "c5" opthelp-reverse-chrono #t))
+
     (add-option
      (gnc:make-multichoice-option
       gnc:pagename-general optname-options-summary
@@ -350,6 +360,7 @@ also show overall period profit & loss."))
 
 (define* (add-multicolumn-acct-table
           table title accountlist maxindent get-cell-monetary-fn cols-data #:key
+          (reverse-cols? #f)
           (omit-zb-bals? #f)
           (show-zb-accts? #t)
           (disable-account-indent? #f)
@@ -427,7 +438,7 @@ also show overall period profit & loss."))
                    (list account-cell)
                    (gnc:html-make-empty-cells
                     (if amount-indenting? (1- amount-indent) 0))
-                   rest
+                   (if reverse-cols? (reverse rest) rest)
                    (gnc:html-make-empty-cells
                     (if amount-indenting? (- maxindent amount-indent) 0)))))
         (if row-markup
@@ -749,6 +760,8 @@ also show overall period profit & loss."))
            ((eq? report-type 'pnl) (list startdate enddate))
            (else (list enddate))))
 
+         (reverse-chrono? (get-option gnc:pagename-general optname-reverse-chrono))
+
          (report-dates-vec (list->vector report-dates))
          (num-report-dates (vector-length report-dates-vec))
 
@@ -1057,6 +1070,7 @@ also show overall period profit & loss."))
                               table title accounts
                               maxindent get-cell-monetary-fn
                               (iota num-report-dates)
+                              #:reverse-cols? reverse-chrono?
                               #:omit-zb-bals? omit-zb-bals?
                               #:show-zb-accts? show-zb-accts?
                               #:disable-account-indent? disable-account-indent?
@@ -1181,16 +1195,16 @@ also show overall period profit & loss."))
                    (list
                     (list "General" "Start Date" (cons 'absolute (car datepair)))
                     (list "General" "End Date" (cons 'absolute (cdr datepair)))
-                    (list "General" "Show original currency amount" show-orig?)
+                    (list "Currency" "Show original currency amount" show-orig?)
-                    (list "General" "Common Currency" common-currency)
+                    (list "Currency" "Common Currency" common-currency)
-                    (list "General" "Report's currency" curr)
+                    (list "Currency" "Report's currency" curr)
                     (list "Display" "Amount" 'double)
                     (list "Accounts" "Accounts" accts))))))
 
              (chart
               (and-let* (include-chart?
                          (curr (or common-currency book-main-currency))
-                         (delta (or (not (eq? incr 'disabled)) 'MonthDelta))
+                         (delta (if (eq? incr 'disabled) 'MonthDelta incr))
                          (price (or price-source 'pricedb-nearest)))
                 (gnc:make-report-anchor
                  pnl-barchart-uuid report-obj
@@ -1231,6 +1245,7 @@ also show overall period profit & loss."))
                                         (> num-report-dates 2))
                                    '(overall-period)
                                    '()))
+                              #:reverse-cols? reverse-chrono?
                               #:omit-zb-bals? omit-zb-bals?
                               #:show-zb-accts? show-zb-accts?
                               #:disable-account-indent? disable-account-indent?

gnucash/report/reports/standard/budget-income-statement.scm

@@ -46,6 +46,7 @@
 (use-modules (gnucash core-utils))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report))
+(use-modules (ice-9 format))
 
 ;; define all option's names and help text so that they are properly
 ;; defined in *one* place.

gnucash/report/reports/standard/income-gst-statement.scm

@@ -195,7 +195,7 @@ with *EUGOODS* in the account description."))) #f
   ;; Disable account filtering
   (gnc:option-make-internal! options gnc:pagename-accounts "Filter Type")
   (gnc:option-make-internal! options gnc:pagename-accounts "Filter By...")
-  (gnc:option-make-internal! options gnc:pagename-general "Show original currency amount")
+  (gnc:option-make-internal! options "Currency" "Show original currency amount")
 
   ;; Enforce compulsory common-currency. It's senseless to allow
   ;; multiple currencies in a government report. Plus, single currency

gnucash/report/reports/standard/new-owner-report.scm

@@ -223,10 +223,14 @@
         (addto! heading-list (G_ tax-header)))
     (if (debit-col column-vector)
         (addto! heading-list
-                (if formal? debit-header (gnc-account-get-debit-string acct-type))))
+                (if formal?
+                    (G_ debit-header)
+                    (gnc-account-get-debit-string acct-type))))
     (if (credit-col column-vector)
         (addto! heading-list
-                (if formal? credit-header (gnc-account-get-credit-string acct-type))))
+                (if formal?
+                    (G_ credit-header)
+                    (gnc-account-get-credit-string acct-type))))
     (if (bal-col column-vector)
         (addto! heading-list (G_ balance-header)))
     (case link-option

gnucash/report/reports/standard/price-scatter.scm

@@ -30,6 +30,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report))
 (use-modules (srfi srfi-1))
+(use-modules (ice-9 format))
 (use-modules (ice-9 match))
 
 (define optname-from-date (N_ "Start Date"))

gnucash/report/reports/standard/test/test-balsheet-pnl.scm

@@ -475,6 +475,7 @@
 (define (multicol-balsheet-tests)
   (define (default-testing-options)
     (let ((options (gnc:make-report-options multicol-balsheet-uuid)))
+      (set-option! options "General" "Period order is most recent first" #f)
       (set-option! options "General" "Start Date"
                    (cons 'absolute (gnc-dmy2time64 1 1 1970)))
       (set-option! options "General" "End Date"
@@ -540,6 +541,15 @@
           "1 FUNDS $350.0000")
         (sxml->table-row-col sxml 1 #f 4)))
 
+    (set-option! multi-bs-options "General" "Period order is most recent first" #t)
+    (let ((sxml (options->sxml multicol-balsheet-uuid multi-bs-options
+                               "multicol-balsheet-halfyear")))
+      (test-equal "bal-1/1/70-reverse-chrono"
+        '("Date" "01/01/72" "01/01/71" "01/01/70")
+        (sxml->table-row-col sxml 1 1 #f)))
+
+    (set-option! multi-bs-options "General" "Period order is most recent first" #f)
+
     ;; the following includes non-zero retained earnings of $1,270
     (set-option! multi-bs-options "General" "End Date"
                  (cons 'absolute (gnc-dmy2time64 1 3 1980)))
@@ -557,6 +567,7 @@
 (define (multicol-pnl-tests)
   (define (default-testing-options)
     (let ((options (gnc:make-report-options multicol-pnl-uuid)))
+      (set-option! options "General" "Period order is most recent first" #f)
       (set-option! options "General" "Start Date"
                    (cons 'absolute (gnc-dmy2time64 1 1 1980)))
       (set-option! options "General" "End Date"
@@ -597,4 +608,11 @@
       (test-equal "pnl-3/80"
         '("03/01/80" " to 03/31/80" "$0.00" "$0.00" "$0.00" "#0.00 "
           "$0.00" "#1.00 $1.7000")
-        (sxml->table-row-col sxml 1 #f 4)))))
+        (sxml->table-row-col sxml 1 #f 4)))
+
+    (set-option! multi-bs-options "General" "Period order is most recent first" #t)
+    (let ((sxml (options->sxml multicol-balsheet-uuid multi-bs-options
+                               "testing period reverse chrono order pnl")))
+      (test-equal "pnl-reverse chrono"
+        '("Date" "03/31/80" "03/01/80" "02/01/80" "01/01/80")
+        (sxml->table-row-col sxml 1 1 #f)))))

gnucash/report/reports/standard/test/test-cash-flow.scm

@@ -4,6 +4,7 @@
 (use-modules (gnucash reports standard cash-flow))
 (use-modules (gnucash reports cash-flow-calc))
 (use-modules (gnucash report))
+(use-modules (ice-9 format))
 
 (define (run-test)
   (and (test test-one-tx-in-cash-flow)
@@ -54,17 +55,17 @@
 	     (or (equal? 10000/100
 		     (gnc:gnc-monetary-amount (gnc:sum-collector-commodity expense-acc-in-collector
 									   report-currency exchange-fn)))
-                 (begin (format #t "Failed expense-acc-in-collector ~g expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity expense-acc-in-collector
+                 (begin (format #t "Failed expense-acc-in-collector ~a expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity expense-acc-in-collector
 									   report-currency exchange-fn))) #f))
 	     (or (equal? 10000/100
 		     (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-in-collector
 									   report-currency exchange-fn)))
-                 (begin (format #t "Failed money-in-collector ~g expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-in-collector
+                 (begin (format #t "Failed money-in-collector ~a expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-in-collector
 									   report-currency exchange-fn))) #f))
 	     (or (equal? 0/1
 		     (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-out-collector
 									   report-currency exchange-fn)))
-                 (begin (format #t "Failed sum-collector-commodity ~g expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-out-collector
+                 (begin (format #t "Failed sum-collector-commodity ~a expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-out-collector
                                                                                                                                                report-currency exchange-fn))) #f))
              (begin (format #t "test-one-tx-in-cash-flow success~%") #t)
 	     )))))

gnucash/report/reports/standard/test/test-transaction.scm

@@ -280,8 +280,8 @@
     (let ((options (default-testing-options)))
       (set-option! options "Sorting" "Add indenting columns" #t)
       (set-option! options "General" "Table for Exporting" #f)
-      (set-option! options "General" "Common Currency" #t)
+      (set-option! options "Currency" "Common Currency" #t)
-      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "Currency" "Show original currency amount" #t)
       (set-option! options "General" "Add options summary" 'never)
       (set-option! options "Sorting" "Primary Key" 'account-name)
       (set-option! options "Sorting" "Primary Subtotal" #t)
@@ -576,8 +576,8 @@
       (set-option! options "Accounts" "Accounts" (list usd-bank gbp-bank))
       (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 2000)))
       (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 2000)))
-      (set-option! options "General" "Common Currency" #t)
+      (set-option! options "Currency" "Common Currency" #t)
-      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "Currency" "Show original currency amount" #t)
       (let* ((sxml (options->sxml options "single column, with original currency headers")))
         (test-equal "single amount column, with original currency headers"
           (list "Date" "Num" "Description" "Memo/Notes" "Account"
@@ -650,8 +650,8 @@
       ;; test debit/credit dual columns
       (set! options (default-testing-options))
       (set-option! options "Display" "Amount" 'double)
-      (set-option! options "General" "Common Currency" #t)
+      (set-option! options "Currency" "Common Currency" #t)
-      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "Currency" "Show original currency amount" #t)
       (set-option! options "Sorting" "Primary Key" 'date)
       (set-option! options "Sorting" "Primary Subtotal for Date Key" 'none)
       (let* ((sxml (options->sxml options "dual columns")))
@@ -733,7 +733,7 @@
 
       (set! options (default-testing-options))
       (set-option! options "Sorting" "Add indenting columns" #t)
-      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "Currency" "Show original currency amount" #t)
       (set-option! options "Sorting" "Primary Key" 'account-name)
       (set-option! options "Sorting" "Primary Subtotal" #t)
       (set-option! options "Sorting" "Secondary Key" 'date)
@@ -750,7 +750,7 @@
       (set-option! options "Accounts" "Accounts" (gnc-account-get-descendants (gnc-account-get-root bank)))
       (set-option! options "Display" "Totals" #t)
       (set-option! options "Display" "Amount" 'double)
-      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "Currency" "Show original currency amount" #t)
       (set-option! options "General" "Table for Exporting" #f)
       (set-option! options "Sorting" "Add indenting columns" #t)
       (set-option! options "Sorting" "Primary Key" 'account-name)
@@ -893,9 +893,9 @@
       (set-option! options "General" "End Date"
                    (cons 'absolute (gnc-dmy2time64 31 12 1970)))
       (set-option! options "Display" "Subtotal Table" #t)
-      (set-option! options "General" "Common Currency" #t)
+      (set-option! options "Currency" "Common Currency" #t)
-      (set-option! options "General" "Report Currency" foreign2)
+      (set-option! options "Currency" "Report Currency" foreign2)
-      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "Currency" "Show original currency amount" #t)
       (set-option! options "Sorting" "Primary Key" 'account-name)
       (set-option! options "Sorting" "Primary Subtotal" #t)
       (set-option! options "Sorting" "Secondary Key" 'date)

gnucash/report/reports/standard/view-column.scm

@@ -116,21 +116,17 @@
 	 (gnc:report-set-stylesheet! 
 	  subreport (gnc:report-stylesheet report))
 	 
-	 ;; render the report body ... hopefully this will DTRT
+	 ;; render the report body ... capture error if report crashes.
-	 ;; if there is an error, then dump a backtrace and print
+         (gnc:html-table-cell-append-objects!
-	 ;; an error message
+          contents-cell
-	 ;; and cache when it's ok to cache.
+          (match (gnc:apply-with-error-handling
-	 (if (not (gnc:backtrace-if-exception
+                  (lambda () (gnc:report-render-html subreport #f)) '())
-		   (lambda ()
+            ((html #f) html)
-		     (gnc:html-table-cell-append-objects! 
+            ((_ captured-error)
-		      contents-cell (gnc:report-render-html subreport #f))
+             (gnc:make-html-text
-		     #t)))
+              (gnc:html-markup-h3 (G_ "Report error"))
-	     (gnc:html-table-cell-append-objects!
+              (G_ "An error occurred while running the report.")
-	      contents-cell
+              (gnc:html-markup "pre" captured-error)))))
-	      (gnc:make-html-text
-	       (gnc:html-markup-h3 (G_ "Report error"))
-               (G_ "An error occurred while running the report.")
-               (gnc:html-markup "pre" gnc:last-captured-error))))
 
 	 ;; increment the alloc number for each occupied row
 	 (let loop ((row current-row-num))

libgnucash/app-utils/CMakeLists.txt

@@ -169,13 +169,23 @@ install(FILES ${app_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnuca
 # And now handle scheme files
 
 set (app_utils_SCHEME_1
-    business-options.scm
     c-interface.scm
     date-utilities.scm
-    options.scm
     fin.scm
 )
 
+set (app_utils_SCHEME_1a
+    options.scm
+)
+
+set (app_utils_SCHEME_1b
+    business-options.scm
+)
+
+set (app_utils_SCHEME_1c
+    business-prefs.scm
+)
+
 set (app_utils_SCHEME_2
     app-utils.scm
 )
@@ -190,15 +200,30 @@ gnc_add_scheme_targets(scm-app-utils-1
     OUTPUT_DIR "gnucash/app-utils"
     DEPENDS "${GUILE_DEPENDS}"
     MAKE_LINKS)
-  gnc_add_scheme_targets(scm-bus-prefs
+
-    SOURCES "business-prefs.scm"
+gnc_add_scheme_targets(scm-app-utils-1a
+    SOURCES "${app_utils_SCHEME_1a}"
     OUTPUT_DIR "gnucash/app-utils"
-    DEPENDS "scm-app-utils-1")
+    DEPENDS "scm-app-utils-1"
+    MAKE_LINKS)
+
+gnc_add_scheme_targets(scm-app-utils-1b
+    SOURCES "${app_utils_SCHEME_1b}"
+    OUTPUT_DIR "gnucash/app-utils"
+    DEPENDS "scm-app-utils-1a"
+    MAKE_LINKS)
+
+gnc_add_scheme_targets(scm-bus-prefs
+    SOURCES "${app_utils_SCHEME_1c}"
+    OUTPUT_DIR "gnucash/app-utils"
+    DEPENDS "scm-app-utils-1b"
+    MAKE_LINKS)
 
 gnc_add_scheme_targets(scm-app-utils-2
     SOURCES "${app_utils_SCHEME_2}"
     OUTPUT_DIR "gnucash"
-    DEPENDS "scm-bus-prefs")
+    DEPENDS "scm-bus-prefs"
+    MAKE_LINKS)
 
 # Module interfaces deprecated in 4.x, will be removed for 5.x
 gnc_add_scheme_deprecated_module (OLD_MODULE "migrate-prefs")
@@ -211,8 +236,15 @@ gnc_add_scheme_deprecated_module (
 add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-2 scm-app-utils-1)
 
 set_local_dist(app_utils_DIST_local
-        ${app_utils_ALL_SOURCES} ${app_utils_SCHEME_1} ${app_utils_SCHEME_2} ${app_utils_SCHEME_3}
+    ${app_utils_ALL_SOURCES}
-        app-utils.i CMakeLists.txt gnc-help-utils.c)
+    ${app_utils_SCHEME_1}
+    ${app_utils_SCHEME_1a}
+    ${app_utils_SCHEME_1b}
+    ${app_utils_SCHEME_1c}
+    ${app_utils_SCHEME_2}
+    ${app_utils_SCHEME_3}
+    app-utils.i CMakeLists.txt gnc-help-utils.c)
+
 set(app_utils_DIST
     ${app_utils_DIST_local}
     ${test_app_utils_DIST}

libgnucash/app-utils/c-interface.scm

@@ -89,6 +89,8 @@
 ;; translated with gettext.
 (define (gnc:make-string-database)
   (define string-hash (make-hash-table))
+  (issue-deprecation-warning "gnc:make-string-database is deprecated. It \
+will be removed in GnuCash 5.x")
   (lambda args
     (match args
       (('lookup key) (G_ (hash-ref string-hash key)))

libgnucash/app-utils/date-utilities.scm

@@ -30,7 +30,6 @@
 (use-modules (gnucash core-utils))
 (use-modules (gnucash utilities))
 (use-modules (sw_app_utils))
-(use-modules (gnucash app-utils c-interface))
 (use-modules (ice-9 match))
 
 (export gnc:reldate-list)
@@ -891,7 +890,15 @@ Defaulting to today."))
 ;;one-month-ago three-months-ago six-months-ago one-year-ago
 ;;start-cur-fin-year start-prev-fin-year end-prev-fin-year
 
-(define gnc:reldate-string-db (gnc:make-string-database))
+
+(define (make-string-database)
+  (define string-hash (make-hash-table))
+  (match-lambda*
+    (('lookup key) (G_ (hash-ref string-hash key)))
+    (('store key string) (hash-set! string-hash key string))
+    (_ (gnc:warn "string-database: bad action"))))
+
+(define gnc:reldate-string-db (make-string-database))
 (define gnc:relative-date-values #f)
 (unless gnc:relative-date-hash
   (gnc:reldate-string-db 

libgnucash/app-utils/test/CMakeLists.txt

@@ -71,22 +71,6 @@ endif()
 # Doesn't work yet:
 gnc_add_test_with_guile(test-app-utils "${test_app_utils_SOURCES}" APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
 
-set_dist_list(test_app_utils_DIST
-  CMakeLists.txt
-  
-  test-exp-parser.c
-  test-print-parse-amount.cpp
-  test-print-queries.cpp
-  test-scm-query-string.cpp
-  test-sx.cpp
-  test-c-interface.scm
-  test-date-utilities.scm
-  test-options.scm
-  ${test_app_utils_scheme_SOURCES}
-  ${test_app_utils_SOURCES}
-)
-
-
 set(test_autoclear_SOURCES
     test-autoclear.cpp
 )
@@ -103,3 +87,18 @@ gnc_add_test(test-autoclear "${test_autoclear_SOURCES}"
     test_autoclear_INCLUDE_DIRS
     test_autoclear_LIBS
 )
+
+set_dist_list(test_app_utils_DIST
+  CMakeLists.txt
+  test-exp-parser.c
+  test-print-parse-amount.cpp
+  test-print-queries.cpp
+  test-scm-query-string.cpp
+  test-sx.cpp
+  test-c-interface.scm
+  test-date-utilities.scm
+  test-options.scm
+  ${test_app_utils_scheme_SOURCES}
+  ${test_app_utils_SOURCES}
+  ${test_autoclear_SOURCES}
+)

libgnucash/engine/mocks/CMakeLists.txt

@@ -5,8 +5,8 @@ set(engine_mocks_SOURCES
     gmock-qofbook.cpp
     gmock-qofbook.h
     gmock-qofinstance.cpp
-    gmock-qofquery.cpp
+    fake-qofquery.cpp
-    gmock-qofquery.h
+    fake-qofquery.h
     gmock-Split.cpp
     gmock-Split.h
     gmock-Transaction.cpp

libgnucash/engine/test/gtest-gnc-timezone.cpp

@@ -134,6 +134,13 @@ TEST(gnc_timezone_constructors, test_IANA_Belize_tz)
             EXPECT_EQ(tz->dst_zone_abbrev(), "CDT");
             EXPECT_EQ(tz->dst_offset().total_seconds(), 3600);
         }
+        /* An IANA update on 22 Dec 2020 added missing DST transitions
+         * for Belize between 1943 and 1967. Ignore those years until
+         * the oldest supported OS version release is later than that
+         * because distros updating of zoneinfo is spotty.
+         */
+        else if (year >= 1943 && year <= 1967)
+            continue;
         else
         {
             EXPECT_EQ(tz->std_zone_abbrev(), "CST");

po/CMakeLists.txt

@@ -2,9 +2,9 @@ add_subdirectory(glossary)
 
 # Set of available languages:
 # * managed at the Translation Project (TP):
-set (TP_LINGUAS ca cs da eu fa ja pt ro rw sk sr sv tr uk zh_CN)
+set (TP_LINGUAS ca cs da eu fa pt ro rw sk sr sv tr uk zh_CN)
 # * already marked as external at TP or they have no language team:
-set (GC_LINGUAS ar as az bg brx de doi el en_GB es es_NI et fi fr gu he hi hr hu id it kn ko kok kok@latin ks lt lv mai mni mni@bengali mr nb ne nl pl pt_BR ru ta te ur vi zh_TW)
+set (GC_LINGUAS ar as az bg brx de doi el en_GB es es_NI et fi fr gu he hi hr hu id it ja kn ko kok kok@latin ks lt lv mai mni mni@bengali mr nb ne nl pl pt_BR ru ta te ur vi zh_TW)
 # * New or unmarked: The release manager should announce them to TP 
 # and when listed there move in the respective group above.
 set (NEW_LINGUAS)

po/POTFILES.in

@@ -315,9 +315,11 @@ gnucash/import-export/aqb/gnc-ab-kvp.c
 gnucash/import-export/aqb/gnc-ab-transfer.c
 gnucash/import-export/aqb/gnc-ab-utils.c
 gnucash/import-export/aqb/gnc-file-aqb-import.c
+gnucash/import-export/aqb/gnc-flicker-gui.c
 gnucash/import-export/aqb/gnc-gwen-gui.c
 gnucash/import-export/aqb/gncmod-aqbanking.c
 gnucash/import-export/aqb/gnc-plugin-aqbanking.c
+gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.flicker.gschema.xml.in
 gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
 gnucash/import-export/bi-import/dialog-bi-import.c
 gnucash/import-export/bi-import/dialog-bi-import-gui.c

po/glossary/de.po

@@ -2,22 +2,26 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 #
 # Christian Stimming <stimming@tuhh.de>, 2001 - 2013.
-# Frank H. Ellenberger <frank.h.ellenberger@gmail.com>, 2013 - 2017.
+# Frank H. Ellenberger <frank.h.ellenberger@gmail.com>, 2013 - 2017, 2020.
+# Manuel Bichler <felseninsel@hotmail.com>, 2020.
+# K. Herbert <herbert.ka@mailo.com>, 2020.
+# Milo Ivir <mail@milotype.de>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash 2.6.18\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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2020-09-19 17:31+0200\n"
+"PO-Revision-Date: 2020-12-27 01:10+0000\n"
 "Last-Translator: Frank H. Ellenberger <frank.h.ellenberger@gmail.com>\n"
-"Language-Team: German <gnucash-de@gnucash.org>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/gnucash/glossary/"
-"Language: German\n"
+"de/>\n"
+"Language: de\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Weblate 4.4.1-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!)"
@@ -223,7 +227,7 @@ msgstr "Bilanz"
 
 #. "To arrange for income and spending to be equal"
 msgid "balance, to"
-msgstr "Ausgleichen "
+msgstr "ausgleichen"
 
 #. "-"
 msgid "bank"
@@ -252,7 +256,7 @@ msgstr ""
 
 #. "An estimate or plan of the money available to somebody and how it will be spent over a period of time."
 msgid "Budget"
-msgstr "Budget (Haushaltsplan)"
+msgstr "Budget"
 
 #. "-"
 msgid "business (adjective)"
@@ -462,10 +466,8 @@ msgid "loan"
 msgstr "Darlehen"
 
 #. "Annual Percentage Rate, includes in contrast to the Nominal Rate some of the various costs to obtain a loan."
-#, fuzzy
-#| msgid "loan"
 msgid "loan: APR"
-msgstr "Darlehen"
+msgstr "Darlehen: effektiver Jahreszins"
 
 #. "The money lost in business activity"
 msgid "loss"
@@ -473,11 +475,11 @@ msgstr "Verlust"
 
 #. "name of an automatically created account"
 msgid "Lost Accounts"
-msgstr "Verlorene Konten??"
+msgstr "verlorene Konten"
 
 #. "A particular collection of items that were bought in one transaction. A lot is typically formed when the item is bought, and is closed when the item is sold out. Needed e.g. for U.S. tax purposes."
 msgid "Lot"
-msgstr "Posten (Los, Partie)"
+msgstr "Charge"
 
 #. "Combine two books into one (see book)."
 msgid "merge, to"
@@ -497,23 +499,19 @@ msgstr "Fenstermodus"
 
 #. "One textfield per split that should help you remember what this split was about."
 msgid "Memo"
-msgstr "Buchungstext, (Verwendungszweck, Text, Erklärung?)"
+msgstr "Buchungstext"
 
 #. "(a) An agreement by which money is lent by a bank for buying a house or other property, the property being the security. (b) A sum of money lent in this way."
 msgid "Mortgage"
 msgstr "Hypothek"
 
 #. "Adjustable Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: ARM"
-msgstr "Hypothek"
+msgstr "Hypothek: Hypothek mit variablem Zinssatz"
 
 #. "Fixed Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: FRM"
-msgstr "Hypothek"
+msgstr "Hypothek: Hypothek mit festem Zinssatz"
 
 #. "e.g. USD, DEM, see Currency."
 msgid "national currency"
@@ -561,7 +559,7 @@ msgstr "Bestellung"
 
 #. "Name of an automatically created account that holds splits that have no account."
 msgid "orphan"
-msgstr "Ausbuchungskonto??"
+msgstr "verwaist"
 
 #. "The customer to (or employee or vendor from) which this invoice is sent - or short your business partner."
 msgid "owner (of bill, invoice or expense voucher)"
@@ -631,7 +629,7 @@ msgstr "Ergebnis, Gewinn"
 
 #. "OBSOLETE. This report was renamed to 'income statement' on 2004-07-13. Old definition: A list that shows the amount of money spent compared with the amount earned by a business in a particular period"
 msgid "Profit & Loss"
-msgstr "Gewinn- und Verlustrechnung (GuV)"
+msgstr "Gewinn- und Verlustrechnung"
 
 #. "-"
 msgid "quick-fill"
@@ -639,7 +637,7 @@ msgstr "Quick-Fill"
 
 #. "-"
 msgid "rebalance, to (a transaction)"
-msgstr "neu kalkulieren "
+msgstr "neu kalkulieren (eine Transaktion)"
 
 #. "reconcile an account, a reconciled split. To find a way to make the bank's account statement agree with the user's recorded transactions in an account."
 msgid "reconcile, to"
@@ -693,7 +691,7 @@ msgstr "Staffel-Form"
 #. "name of an equity account (?); to be distinguished from the opening balance."
 msgid "Retained Earnings"
 msgstr ""
-"Einbehaltener Gewinn, Gewinnvortrag (<=2.6: -rücklagen); TODO: ist das "
+"Einbehaltener Gewinn, Gewinnvortrag (<=2.6: -rücklagen) # TODO: ist das "
 "wirklich, was das balance sheet ausgibt?"
 
 #. "Create a new transaction that is the inverse of the old one.  When you add the two together they completely cancel out.  Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'."
@@ -806,7 +804,7 @@ msgstr "Rohbilanz (Probebilanz, Saldenbilanz)"
 
 #. "A class or things that have characteristics in common; type of an account, of a commodity etc."
 msgid "type"
-msgstr "Art"
+msgstr "Typ"
 
 #. "A fixed amount or number used as a standard of measurement; e.g. millimeters, inch; for absolute positioning in the custom check format."
 msgid "units"
@@ -818,7 +816,7 @@ msgstr "URL"
 
 #. "The worth of sth in terms of money or other commodities for which it can be exchanged"
 msgid "value (in a split)"
-msgstr "Wert "
+msgstr "Wert"
 
 #. "In small business accounting: A person or company that sells items and is supplying goods"
 msgid "vendor"

po/glossary/de_CH.po

@@ -1,20 +1,23 @@
 # Glossary of terms in GnuCash
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Christian Stimming <stimming@tuhh.de>, 2001
-#
+# Frank H. Ellenberger <frank.h.ellenberger@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash 1.7\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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2008-03-03 00:47+0100\n"
+"PO-Revision-Date: 2020-12-27 01:10+0000\n"
-"Last-Translator: Raffael Luthiger <r.luthiger@huanga.com>\n"
+"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger@gmail.com>\n"
-"Language-Team: DE\n"
+"Language-Team: German (Switzerland) <https://hosted.weblate.org/projects/"
-"Language: Swiss German \n"
+"gnucash/glossary/de_CH/>\n"
+"Language: de_CH\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.1-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!)"
@@ -225,7 +228,7 @@ msgstr "Bilanz"
 
 #. "To arrange for income and spending to be equal"
 msgid "balance, to"
-msgstr "Ausgleichen "
+msgstr "Ausgleichen"
 
 #. "-"
 msgid "bank"

po/glossary/el.po

@@ -1,43 +1,44 @@
 # Greek translation of gnucash-glossary.
 # Copyright (C) 2001 Free Software Foundation.
 # Simos Xenitellis <simos@hellug.gr>, 2001.
-#
+# THANOS SIOURDAKIS <siourdakisthanos@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash-glossary 1.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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2001-12-28 00:17+0000\n"
+"PO-Revision-Date: 2020-12-20 20:47+0000\n"
-"Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
+"Last-Translator: THANOS SIOURDAKIS <siourdakisthanos@gmail.com>\n"
-"Language-Team: Greek <nls@tux.hellug.gr>\n"
+"Language-Team: Greek <https://hosted.weblate.org/projects/gnucash/glossary/"
+"el/>\n"
 "Language: el\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"
 
 #. "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 ""
+"Όρος (Αγαπητέ μεταφραστή: Αυτό το αρχείο δεν θα είναι ποτέ ορατό στο χρήστη!)"
 
 #. "A detailed record of money spent and received"
 msgid "account"
 msgstr "λογαριασμός"
 
 #. "An alphanumerical key of an account in GnuCash, not at the bank, can be used to sort. Some templates provide them or the user can enter them."
-#, fuzzy
 msgid "account code"
-msgstr "Λογαριασμός %d"
+msgstr "κωδικός λογαριασμού"
 
 #. "the tree view of all accounts"
-#, fuzzy
 msgid "account hierarchy"
-msgstr "ιεραρχία"
+msgstr "ιεραρχία λογαριασμών"
 
 #. "-"
-#, fuzzy
 msgid "account name"
-msgstr "Όνομα _λογαριασμού:"
+msgstr "όνομα λογαριασμού"
 
 #. "The left side of the balance sheet in T account form shows the application of funds in form of assets. Because it contains only assets use assets directly. Complement: Passive. See also: Report Form"
 #, fuzzy

po/glossary/fi.po

@@ -1,24 +1,26 @@
 # Finnish messages for gnucash-glossary.
 # Copyright (C) 2020 Free Software Foundation, Inc.
 # Marko Kohtala <marko.kohtala@gmail.com>, 2020.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: GnuCash 3.10\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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2020-04-18 20:54+0300\n"
+"PO-Revision-Date: 2020-12-22 08:12+0000\n"
 "Last-Translator: Marko Kohtala <marko.kohtala@gmail.com>\n"
-"Language-Team: \n"
+"Language-Team: Finnish <https://hosted.weblate.org/projects/gnucash/glossary/"
+"fi/>\n"
 "Language: fi\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"
 
 #. "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 ""
+msgstr "Termi (Hyvä kääntäjä: Tämä tiedosto ei näy koskaan käyttäjälle!)"
 
 #. "A detailed record of money spent and received"
 msgid "account"
@@ -174,7 +176,7 @@ msgstr "tapahtuma: myynti"
 
 #. "-"
 msgid "action: Teller"
-msgstr "tapahtuma: Pankkiiri"
+msgstr "tapahtuma: Pankkivirkailija"
 
 #. "see: transfer 2. (=credit transfer)"
 msgid "action: transfer"
@@ -205,12 +207,10 @@ msgid "balance (noun)"
 msgstr "saldo"
 
 #. "Balance brought forward - usually the first entry of an account statement containing the 'balance c/f' of the previous billing period or page"
-#, fuzzy
 msgid "balance b/f"
 msgstr "alkusaldo"
 
 #. "Balance carried forward - usually the last entry of an account statement to be used as 'balance b/f' on the next billing period or page"
-#, fuzzy
 msgid "balance c/f"
 msgstr "loppusaldo"
 
@@ -276,11 +276,11 @@ msgstr "šekki"
 
 #. "To repair unbalanced transactions and orphan splits in an account tree. Any transactions that have debits != credits will get a balancing split added (pointing to a special new account called 'Imbalance'). Any splits that do not have accounts are put into another special account called 'Orphan'. Formerly known as 'to scrub'."
 msgid "check and repair, to"
-msgstr "tarkista ja korjaa"
+msgstr "tarkistaa ja korjata"
 
 #. "To end an application's relationship with an open file so that the application will no longer be able to access the file without opening it again. "
 msgid "close, to"
-msgstr "sulje"
+msgstr "sulkea"
 
 #. "An article that is bought and sold. The most general term of what an account keeps track of, e.g. a currency or a stock."
 msgid "commodity"
@@ -372,7 +372,7 @@ msgstr "kahdenkertainen"
 
 #. "Transactions or bills/invoices can contain a document link which links either to some file on the local disk or to some arbitrary URL."
 msgid "document link"
-msgstr ""
+msgstr "liittyvä asiakirja"
 
 #. "a person who works for somebody or a company in return for wages"
 msgid "employee"
@@ -455,10 +455,8 @@ msgid "loan"
 msgstr "laina"
 
 #. "Annual Percentage Rate, includes in contrast to the Nominal Rate some of the various costs to obtain a loan."
-#, fuzzy
-#| msgid "loan"
 msgid "loan: APR"
-msgstr "laina"
+msgstr "laina: todellinen vuosikorko"
 
 #. "The money lost in business activity"
 msgid "loss"
@@ -474,19 +472,19 @@ msgstr "Erä"
 
 #. "Combine two books into one (see book)."
 msgid "merge, to"
-msgstr ""
+msgstr "yhdistää"
 
 #. "The thing that the scatter plot uses to mark each data point"
 msgid "marker"
-msgstr ""
+msgstr "piste"
 
 #. "1. Some text annotation, but this meaning isn't used inside gnucash. 2. In the Customer summary report: The ratio of profit vs. sales, i.e. the profit amount divided by the sales amount, shown in percent."
 msgid "markup"
-msgstr ""
+msgstr "marginaali"
 
 #. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface."
 msgid "MDI modus"
-msgstr ""
+msgstr "MDI:n (monidokumenttikäyttöliittymän) tila"
 
 #. "One textfield per split that should help you remember what this split was about."
 msgid "Memo"
@@ -494,19 +492,19 @@ msgstr "Erittely"
 
 #. "(a) An agreement by which money is lent by a bank for buying a house or other property, the property being the security. (b) A sum of money lent in this way."
 msgid "Mortgage"
-msgstr ""
+msgstr "Asuntolaina"
 
 #. "Adjustable Rate Mortgage"
 msgid "mortgage: ARM"
-msgstr ""
+msgstr "säädettäväkorkoinen asuntolaina"
 
 #. "Fixed Rate Mortgage"
 msgid "mortgage: FRM"
-msgstr ""
+msgstr "kiinteäkorkoinen asuntolaina"
 
 #. "e.g. USD, DEM, see Currency."
 msgid "national currency"
-msgstr ""
+msgstr "valtiollinen valuutta"
 
 #. "(of money) remaining when nothing more is to be taken away"
 msgid "net"
@@ -514,15 +512,15 @@ msgstr "netto"
 
 #. "net total of all assets"
 msgid "net assets"
-msgstr ""
+msgstr "netto-omaisuus"
 
 #. "The total income minus the total expenses of a given time period."
 msgid "net profit"
-msgstr ""
+msgstr "nettovoitto"
 
 #. "Your net worth is your assets minus your liabilities. If your accounts are balanced, your net worth should equal your equity plus your net profit."
 msgid "net worth"
-msgstr ""
+msgstr "nettoarvo"
 
 #. "One textfield per transaction that can hold explanatory text about the transaction."
 msgid "notes (register)"
@@ -547,7 +545,7 @@ msgstr "valinnat"
 
 #. "Watch out: Although this word exists in gnucash program code, all that program code in gnucash is currently not activated. In the future, it will be used in business accounting as follows: A particular request to make or supply goods, but belonging to a (larger) job. Such a request can come from a customer or be sent to a vendor. An order will probably generate one invoice or bill."
 msgid "order"
-msgstr ""
+msgstr "tilaus"
 
 #. "Name of an automatically created account that holds splits that have no account."
 msgid "orphan"
@@ -555,11 +553,11 @@ msgstr "orporivit"
 
 #. "The customer to (or employee or vendor from) which this invoice is sent - or short your business partner."
 msgid "owner (of bill, invoice or expense voucher)"
-msgstr ""
+msgstr "omistaja"
 
 #. "A secret phrase that one needs to know in order to get access to a user account "
 msgid "passphrase"
-msgstr ""
+msgstr "salasana"
 
 #. "An amount that must be paid / An amount for which money has not yet been received"
 msgid "Payables/Receivables"
@@ -567,7 +565,7 @@ msgstr "Velat/Saatavat"
 
 #. "A person to whom sth is paid"
 msgid "payee"
-msgstr "mansunsaaja"
+msgstr "maksunsaaja"
 
 #. "A person who pays or who has to pay for sth"
 msgid "payer"
@@ -583,7 +581,7 @@ msgstr "koontitili"
 
 #. "A set of investments owned by a person"
 msgid "portfolio"
-msgstr ""
+msgstr "salkku"
 
 #. "Register invoice, voucher in account register"
 msgid "post, to"
@@ -591,7 +589,7 @@ msgstr ""
 
 #. "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. "
 msgid "preferences"
-msgstr ""
+msgstr "asetukset"
 
 #. "Loan repayment calculator: your payments are split in interests payment and principal payment"
 msgid "principal payment"
@@ -603,15 +601,15 @@ msgstr "hinta (rivillä)"
 
 #. "An ask is an offer to sell, and the price you want to sell at."
 msgid "price type: ask"
-msgstr ""
+msgstr "hintatyyppi: pyynti"
 
 #. "A bid is an offer to buy, and the price you want to buy at."
 msgid "price type: bid"
-msgstr ""
+msgstr "hintatyyppi: tarjous"
 
 #. "online quotes (rather: quotation!?) A statement of the current price of stocks or commodities"
 msgid "price: quotes"
-msgstr ""
+msgstr "hinta: tarjous"
 
 #. "Money gained in business, esp. the difference between the amount earned (sales) and the amount spent (expenses/cost): Profit is sales minus expenses/cost."
 msgid "profit"
@@ -623,11 +621,11 @@ msgstr "Tuloslaskelma"
 
 #. "-"
 msgid "quick-fill"
-msgstr ""
+msgstr "pikatäyttö"
 
 #. "-"
 msgid "rebalance, to (a transaction)"
-msgstr "tasaa"
+msgstr "tasata"
 
 #. "reconcile an account, a reconciled split. To find a way to make the bank's account statement agree with the user's recorded transactions in an account."
 msgid "reconcile, to"
@@ -635,7 +633,7 @@ msgstr "täsmäyttää"
 
 #. "-"
 msgid "record keeping"
-msgstr ""
+msgstr "kirjanpito"
 
 #. "A list of items; a book containing such a list"
 msgid "register"
@@ -643,39 +641,39 @@ msgstr "tilikirja"
 
 #. "A transaction that is divided into two or more parts"
 msgid "register entry: split transaction"
-msgstr ""
+msgstr "tilikirjamerkintä: jaettu tosite"
 
 #. "-"
 msgid "register entry: stock split"
-msgstr ""
+msgstr "tilikirjamerkintä: osakkeen jako"
 
 #. "one form of register"
 msgid "register: auto-split ledger"
-msgstr ""
+msgstr "tilikirja: automaattisesti jaettu tilikirja"
 
 #. "another form of register"
 msgid "register: basic ledger"
-msgstr ""
+msgstr "tilikirja: perustilikirja"
 
 #. "another form of register"
 msgid "register: general ledger"
-msgstr ""
+msgstr "tilikirja: yleinen tilikirja"
 
 #. "another form of register"
 msgid "register: transaction journal"
-msgstr "rekisteri: pääkirja"
+msgstr "tilikirja: pääkirja"
 
 #. "reload the current document"
 msgid "reload, to"
-msgstr ""
+msgstr "uudelleenladata"
 
 #. "aka 'two-sided form' is in Europe often used for the balance sheet. Complement: report form: Vertical Form"
 msgid "report form: T Account Form"
-msgstr ""
+msgstr "raporttimuoto: vierekkäiset tilit"
 
 #. "aka 'running form' is in english speaking countries usually used for the balance sheet in one column. Complement: report form: T Account Form"
 msgid "report form: Vertical Form"
-msgstr ""
+msgstr "raporttimuoto: peräkkäiset tilit"
 
 #. "name of an equity account (?); to be distinguished from the opening balance."
 msgid "Retained Earnings"
@@ -683,15 +681,15 @@ msgstr "Kertyneet voittovarat"
 
 #. "Create a new transaction that is the inverse of the old one.  When you add the two together they completely cancel out.  Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'."
 msgid "reverse transaction, to (Action in the register)"
-msgstr ""
+msgstr "käänteinen tosite"
 
 #. "(In the customer summary report) The total amount of money received because something was sold."
 msgid "sales"
-msgstr ""
+msgstr "myynti"
 
 #. "To write data (typically a file) to a storage medium, such as a disk or tape."
 msgid "save, to (to a file)"
-msgstr ""
+msgstr "tallentaa jonnekin"
 
 #. "A transaction or reminder of a transaction that can be automatically executed at a specific time. It can be executed either once, or several times at regular intervals."
 msgid "Scheduled Transaction"
@@ -707,7 +705,7 @@ msgstr "arvopaperi"
 
 #. "-"
 msgid "Share Balance (register)"
-msgstr ""
+msgstr "Osakemäärä?"
 
 #. "Any of the equal parts into which the money of a business company is divided, giving the holder a right to a portion of the profits"
 msgid "shares"
@@ -715,7 +713,7 @@ msgstr "osakkeet"
 
 #. "(often: of a quote) A place from which something comes or is obtained."
 msgid "source"
-msgstr ""
+msgstr "lähde"
 
 #. "One of the two or several parts a transaction is divided into"
 msgid "split"
@@ -723,7 +721,7 @@ msgstr "rivi"
 
 #. "This sets the particular design or shape of a report."
 msgid "style sheet"
-msgstr ""
+msgstr "tyylitiedosto"
 
 #. "The total of a set of figures that are part of a larger group of figures"
 msgid "subtotal"
@@ -731,23 +729,23 @@ msgstr "välisumma"
 
 #. "On the government's tax forms, the tax code identifies the given line or place on the form where certain amounts must be specified according to the current country's legislation"
 msgid "tax code"
-msgstr ""
+msgstr "verokoodi"
 
 #. "field of an account"
 msgid "tax info"
-msgstr ""
+msgstr "verotieto"
 
 #. "if you create a new e.g. style sheet, you can start from a template"
 msgid "template"
-msgstr ""
+msgstr "malline"
 
 #. "see: date range"
 msgid "time period"
-msgstr ""
+msgstr "aikaväli"
 
 #. "as abbreviation for Total"
 msgid "Tot"
-msgstr ""
+msgstr "Yht"
 
 #. "The full number or amount: total of some balances, of any account's running balance etc."
 msgid "total"
@@ -780,15 +778,15 @@ msgstr "siirto"
 
 #. "The account where an amount is transferred to"
 msgid "transfer account"
-msgstr ""
+msgstr "siirtotili"
 
 #. "To move money from one account to another. Will create a transaction."
 msgid "transfer, to (register toolbar)"
-msgstr ""
+msgstr "siirto tilille"
 
 #. "The trial balance is a worksheet on which you list all your general ledger accounts and their debit or credit balance. It is a tool that is used to alert you to errors in your books. The total debits must equal the total credits. If they don't equal, you know you have an error that must be tracked down."
 msgid "trial balance (report)"
-msgstr ""
+msgstr "koetase"
 
 #. "A class or things that have characteristics in common; type of an account, of a commodity etc."
 msgid "type"
@@ -796,15 +794,15 @@ msgstr "tyyppi"
 
 #. "A fixed amount or number used as a standard of measurement; e.g. millimeters, inch; for absolute positioning in the custom check format."
 msgid "units"
-msgstr ""
+msgstr "yksiköt"
 
 #. "-"
 msgid "URL"
-msgstr ""
+msgstr "URL-osoite"
 
 #. "The worth of sth in terms of money or other commodities for which it can be exchanged"
 msgid "value (in a split)"
-msgstr ""
+msgstr "arvo (rivissä)"
 
 #. "In small business accounting: A person or company that sells items and is supplying goods"
 msgid "vendor"
@@ -816,4 +814,4 @@ msgstr "matkalasku"
 
 #. "see debit"
 msgid "withdraw (in the reconcile dialog)"
-msgstr ""
+msgstr "nosto"

po/glossary/fr.po

@@ -7,18 +7,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash 2.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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2018-10-25 12:30+0200\n"
+"PO-Revision-Date: 2020-12-17 13:31+0000\n"
-"Last-Translator: La Boussole <yoann@laboussole.coop>\n"
+"Last-Translator: K. Herbert <herbert.ka@mailo.com>\n"
-"Language-Team: français <yoann@laboussole.coop>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/gnucash/glossary/"
+"fr/>\n"
 "Language: fr\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"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 4.4-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!)"
@@ -43,9 +44,8 @@ msgid "account name"
 msgstr "nom du compte"
 
 #. "The left side of the balance sheet in T account form shows the application of funds in form of assets. Because it contains only assets use assets directly. Complement: Passive. See also: Report Form"
-#, fuzzy
 msgid "account type: Active"
-msgstr "type de compte : actif"
+msgstr "type de compte : actif"
 
 #. "A thing, esp. owned by a person or company, that has value and can be used or sold to pay debts. Dependent on the context you might use 'account type: Active' instead."
 msgid "account type: Asset"

po/glossary/he.po

@@ -2,21 +2,24 @@
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # Ori Hoch <ori@uumpa.com>, 2008
 # http://www.uumpa.com/gnucash-he/
-#
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash 3.6\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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2019-08-12 17:55+0300\n"
+"PO-Revision-Date: 2020-12-22 15:29+0000\n"
-"Last-Translator: Avi Markovitz <avi.markovitz@gmail.com>\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: HE\n"
+"Language-Team: Hebrew <https://hosted.weblate.org/projects/gnucash/glossary/"
+"he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && "
+"n % 10 == 0) ? 2 : 3));\n"
+"X-Generator: Weblate 4.4-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!)"
@@ -72,7 +75,7 @@ msgstr "סוג חשבון: הכנסות"
 
 #. "A debt, a financial obligation, but see also 'account type: Passive'"
 msgid "account type: Liability"
-msgstr "סוג חשבון: הצחיבויות"
+msgstr "סוג חשבון: התחיבויות"
 
 #. "-"
 msgid "account type: money-market"
@@ -192,7 +195,7 @@ msgstr "פעולה: משיכה"
 
 #. "As in: payable aging, or: receivable aging. The aging report categorizes payables or receivables based on time buckets. This gives an overview of which bills or invoices are overdue at which time in the future. "
 msgid "aging"
-msgstr ""
+msgstr "גיול"
 
 #. "A sum of money"
 msgid "amount"
@@ -207,14 +210,12 @@ msgid "balance (noun)"
 msgstr "מאזן (שם עצם)"
 
 #. "Balance brought forward - usually the first entry of an account statement containing the 'balance c/f' of the previous billing period or page"
-#, fuzzy
 msgid "balance b/f"
-msgstr "לאזן, ל"
+msgstr "יתרה שהועברה קדימה"
 
 #. "Balance carried forward - usually the last entry of an account statement to be used as 'balance b/f' on the next billing period or page"
-#, fuzzy
 msgid "balance c/f"
-msgstr "לאזן, ל"
+msgstr "יתרה שהועברה אל"
 
 #. "A written record of money received and paid out, showing the difference between the two total amounts"
 msgid "balance sheet"
@@ -374,7 +375,7 @@ msgstr "הכנסה כפולה"
 
 #. "Transactions or bills/invoices can contain a document link which links either to some file on the local disk or to some arbitrary URL."
 msgid "document link"
-msgstr ""
+msgstr "קישור למסמך"
 
 #. "a person who works for somebody or a company in return for wages"
 msgid "employee"
@@ -457,10 +458,8 @@ msgid "loan"
 msgstr "הלוואה"
 
 #. "Annual Percentage Rate, includes in contrast to the Nominal Rate some of the various costs to obtain a loan."
-#, fuzzy
-#| msgid "loan"
 msgid "loan: APR"
-msgstr "הלוואה"
+msgstr "הלוואה: ריבית אפקטיבית שנתית"
 
 #. "The money lost in business activity"
 msgid "loss"
@@ -492,23 +491,19 @@ msgstr "מנגנון הצגת חלונות מרובים"
 
 #. "One textfield per split that should help you remember what this split was about."
 msgid "Memo"
-msgstr "תזכיר"
+msgstr "מזכר"
 
 #. "(a) An agreement by which money is lent by a bank for buying a house or other property, the property being the security. (b) A sum of money lent in this way."
 msgid "Mortgage"
 msgstr "משכנתה"
 
 #. "Adjustable Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: ARM"
-msgstr "משכנתה"
+msgstr "משכנתה: משכנתה בריבית משתנה"
 
 #. "Fixed Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: FRM"
-msgstr "משכנתה"
+msgstr "משכנתה: משכנתה בריבית קבועה"
 
 #. "e.g. USD, DEM, see Currency."
 msgid "national currency"
@@ -668,7 +663,7 @@ msgstr "יומן: כרטסת חשבונות"
 
 #. "another form of register"
 msgid "register: transaction journal"
-msgstr "יומן: יומן תנועות"
+msgstr "רישום יומן: יומן תנועות"
 
 #. "reload the current document"
 msgid "reload, to"
@@ -684,7 +679,7 @@ msgstr "טופס דוח: חשבון אנכי"
 
 #. "name of an equity account (?); to be distinguished from the opening balance."
 msgid "Retained Earnings"
-msgstr "Retained Earnings"
+msgstr "רווחים מיועדים"
 
 #. "Create a new transaction that is the inverse of the old one.  When you add the two together they completely cancel out.  Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'."
 msgid "reverse transaction, to (Action in the register)"
@@ -720,7 +715,7 @@ msgstr "מניות"
 
 #. "(often: of a quote) A place from which something comes or is obtained."
 msgid "source"
-msgstr "מקור:"
+msgstr "מקור"
 
 #. "One of the two or several parts a transaction is divided into"
 msgid "split"

po/glossary/hr.po

@@ -1,28 +1,28 @@
 # Croatian translation of GNUCash glossary.
 # Copyright (C) 2019 Free Software Foundation, Inc.
 # Milo Ivir <mail@milotype.de>, 2019., 2020.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: GnuCash Glossary\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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2020-11-30 13:59+0100\n"
+"PO-Revision-Date: 2020-12-19 19:43+0000\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
-"Language-Team: \n"
+"Language-Team: Croatian <https://hosted.weblate.org/projects/gnucash/"
+"glossary/hr/>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Weblate 4.4-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 ""
-"Izraz (Napomena za prevodioce: ova datoteka služi isključivo kao pomoć pri "
+"Pojam (Napomena za prevodioce: ova datoteka služi isključivo kao pomoć pri "
 "prevođenju i nikada se neće prikazati korisniku programa!)"
 
 #. "A detailed record of money spent and received"
@@ -458,10 +458,8 @@ msgid "loan"
 msgstr "kredit/zajam"
 
 #. "Annual Percentage Rate, includes in contrast to the Nominal Rate some of the various costs to obtain a loan."
-#, fuzzy
-#| msgid "loan"
 msgid "loan: APR"
-msgstr "kredit/zajam"
+msgstr "kredit: EKS"
 
 #. "The money lost in business activity"
 msgid "loss"
@@ -493,23 +491,19 @@ msgstr "Prikaz višestrukih prozora"
 
 #. "One textfield per split that should help you remember what this split was about."
 msgid "Memo"
-msgstr "Zabilješka"
+msgstr "Bilješka"
 
 #. "(a) An agreement by which money is lent by a bank for buying a house or other property, the property being the security. (b) A sum of money lent in this way."
 msgid "Mortgage"
 msgstr "Hipoteka"
 
 #. "Adjustable Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: ARM"
-msgstr "Hipoteka"
+msgstr "hipoteka: promijenjiva stopa"
 
 #. "Fixed Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: FRM"
-msgstr "Hipoteka"
+msgstr "hipoteka: fiksna stopa"
 
 #. "e.g. USD, DEM, see Currency."
 msgid "national currency"

po/glossary/hu.po

@@ -2,21 +2,23 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 #
 # Kornel Tako <takokornel@gmail.com>, 2007.
+# Frank H. Ellenberger <frank.h.ellenberger@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: @gnucash@\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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2007-07-31 22:59+0200\n"
+"PO-Revision-Date: 2020-12-27 01:10+0000\n"
-"Last-Translator: Kornel Tako <takokornel@gmail.com>\n"
+"Last-Translator: Frank H. Ellenberger <frank.h.ellenberger@gmail.com>\n"
-"Language-Team: Hungarian <gnucash-devel-request@gnucash.org>\n"
+"Language-Team: Hungarian <https://hosted.weblate.org/projects/gnucash/"
+"glossary/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-"Plural-Forms:  nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.4.1-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!)"
@@ -746,7 +748,7 @@ msgstr "Oldal stílus"
 
 #. "The total of a set of figures that are part of a larger group of figures"
 msgid "subtotal"
-msgstr "részösszeg "
+msgstr "részösszeg"
 
 #. "On the government's tax forms, the tax code identifies the given line or place on the form where certain amounts must be specified according to the current country's legislation"
 #, fuzzy

po/glossary/it.po

@@ -2,35 +2,38 @@
 # Copyright (C) 2020 Giuseppe Foti <foti.giuseppe@gmail.com>.
 # This file is distributed under the same license as the GnuCash package.
 # Giuseppe Foti <foti.giuseppe@gmail.com>, 2020.
-#
-# Contributors:
 # Cristian Marchi <cri79@libero.it>, 2008;
 # Lorenzo Cappelletti <lorenzo.cappelletti@email.it>, 2003;
 # Lorenzo Cappelletti <L.Cappelletti@mail.com>, 2002 2003;
 # Alessandro Seveso <aleseveso@tiscalinet.it>, 2002.
 #
+# Contributors:
+#
 # - I messaggi ancora dubbi sono marcati come fuzzy.
 # - Quando qui sono indicate più traduzioni, la prima è quella usata
-#   nel .po vero del programma.
+# nel .po vero del programma.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnucash-glossary 1.7.4\n"
+"Project-Id-Version: gnucash-glossary 4.3\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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2020-07-09 03:18+0200\n"
+"PO-Revision-Date: 2020-12-26 19:29+0000\n"
 "Last-Translator: Giuseppe Foti <foti.giuseppe@gmail.com>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/gnucash/glossary/"
+"it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.4.1-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 ""
+"Termine (Gentile traduttore: questo file non sarà mai visibile all'utente!)"
 
 #. "A detailed record of money spent and received"
 msgid "account"
@@ -70,7 +73,7 @@ msgstr "tipo conto: valuta, conto finanziario"
 
 #. "see: Equity, but see also 'account type: Passive'"
 msgid "account type: Equity"
-msgstr "tipo conto: capitale, valore netto"
+msgstr "tipo conto: capitale, patrimonio netto"
 
 #. "-"
 msgid "account type: Expense"
@@ -90,7 +93,7 @@ msgstr "tipo conto: mercato monetario"
 
 #. "-"
 msgid "account type: Mutual fund"
-msgstr "tipo conto: fondi comuni"
+msgstr "tipo conto: fondo comune"
 
 #. "The right side of the balance sheet in T account form shows the source of funds and contains equity & liability. While not common in english, most languages would translate 'equity & liability' with 'passive'. Complement: Active. See also: Report Form Implementation: https://bugs.gnucash.org/show_bug.cgi?id=421766"
 msgid "account type: Passive"
@@ -98,7 +101,7 @@ msgstr "tipo conto: passivo, passività"
 
 #. "Group of accounts tracking your success, complement of 'Assets & Liabilities'"
 msgid "account type: Profit & Loss"
-msgstr "tipo conto: Conto economico"
+msgstr "tipo conto: conto economico"
 
 #. "1. (US) any type of account that earns interest 2. (Brit) any type of bank account that earns a higher level of interest than a current account or deposit account"
 msgid "account type: saving"
@@ -114,7 +117,7 @@ msgstr "tipo conto: trading"
 
 #. "-"
 msgid "account: parent account"
-msgstr "conto: conto padre"
+msgstr "conto: conto genitore"
 
 #. "-"
 msgid "account: subaccount"
@@ -122,7 +125,7 @@ msgstr "conto: sottoconto"
 
 #. "-"
 msgid "account: top level account"
-msgstr "conto: conto livello principale"
+msgstr "conto: conto di livello principale"
 
 #. "The process of doing something that caused a transaction to happen"
 msgid "Action (register)"
@@ -135,7 +138,7 @@ msgstr "operazione: ATM, Bancomat, sportello automatico"
 
 #. "Transaction was an auto deposit"
 msgid "action: autoDep"
-msgstr "operazione: autodep"
+msgstr "operazione: deposito automatico"
 
 #. "-"
 msgid "action: buy"
@@ -147,7 +150,9 @@ msgstr "operazione: deposito, versamento"
 
 #. "When people can automatically deduct money straight from your account. The reverse of Direct Deposit."
 msgid "action: direct debit"
-msgstr "operazione: RID (Rimessa Interbancaria Diretta)"
+msgstr ""
+"operazione: RID (Rimessa Interbancaria Diretta), rimessa diretta, addebito "
+"diretto"
 
 #. "transaction is a distribution (???)"
 msgid "action: dist"
@@ -159,7 +164,7 @@ msgstr "operazione: div, dividendo"
 
 #. "-"
 msgid "action: fee"
-msgstr "operazione: onorario, emolumento, parcella, commissione, tassa"
+msgstr "operazione: commissione, onorario, emolumento, parcella"
 
 #. "transaction comes from interest"
 msgid "action: int"
@@ -167,7 +172,7 @@ msgstr "operazione: int, interessi"
 
 #. "-"
 msgid "action: loan"
-msgstr "operazione: mutuo, prestito"
+msgstr "operazione: prestito"
 
 #. "see: payment 1."
 msgid "action: payment"
@@ -179,7 +184,7 @@ msgstr "operazione: POS"
 
 #. "-"
 msgid "action: rebate"
-msgstr "operazione: rimborso, riduzione, deduzione, detrazione, sconto"
+msgstr "operazione: riduzione"
 
 #. "-"
 msgid "action: sell"
@@ -187,16 +192,15 @@ msgstr "operazione: vendita"
 
 #. "-"
 msgid "action: Teller"
-msgstr "operazione: banchiere"
+msgstr "operazione: cassiere"
 
 #. "see: transfer 2. (=credit transfer)"
 msgid "action: transfer"
 msgstr "operazione: trasferimento"
 
 #. "-"
-#, fuzzy
 msgid "action: wire"
-msgstr "operazione:"
+msgstr "operazione: bonifico"
 
 #. "-"
 msgid "action: withdraw"
@@ -228,7 +232,7 @@ msgstr "saldo di chiusura"
 
 #. "A written record of money received and paid out, showing the difference between the two total amounts"
 msgid "balance sheet"
-msgstr "bilancio"
+msgstr "stato patrimoniale"
 
 #. "To arrange for income and spending to be equal"
 msgid "balance, to"
@@ -260,7 +264,7 @@ msgstr "chiusura"
 
 #. "An estimate or plan of the money available to somebody and how it will be spent over a period of time."
 msgid "Budget"
-msgstr "Bilancio preventivo, bilancio di prvisione"
+msgstr "Bilancio di previsione"
 
 #. "-"
 msgid "business (adjective)"
@@ -268,11 +272,11 @@ msgstr "commerciale"
 
 #. "as Menu Item: Headline for features that are related to small business accounting"
 msgid "business (noun)"
-msgstr "affare"
+msgstr "impresa"
 
 #. "Profits made from the sale of investments or property"
 msgid "capital gains"
-msgstr "utile del capitale"
+msgstr "guadagni in conto capitale, plusvalenze"
 
 #. "Distinguishing the uppercase and lowercase letters"
 msgid "case sensitive"
@@ -324,7 +328,7 @@ msgstr "Carta di credito"
 
 #. "A transfer of money direct from one bank account to another, without using a cheque"
 msgid "credit transfer"
-msgstr "bonifico"
+msgstr "bonifico bancario"
 
 #. "A document that you give to a client that says you owe money to the client, i.e. the opposite of an invoice"
 msgid "credit note"
@@ -352,11 +356,11 @@ msgstr "formato data"
 
 #. "A range in time that is delimited by two distinct dates."
 msgid "date range"
-msgstr "intervallo temporale, di tempo"
+msgstr "intervallo temporale, di tempo, di date"
 
 #. "(a) A written note in an account of a sum owed or paid out. (b) A sum withdrawn from an account."
 msgid "Debit (column in register)"
-msgstr "Avere, uscita (colonna nel registro)"
+msgstr "Dare, uscita (colonna nel registro)"
 
 #. "Each option has a default setting that it is shipped with, until the user changes the setting."
 msgid "default"
@@ -368,7 +372,7 @@ msgstr "versamento (nella finestra di riconciliazione)"
 
 #. "The process of something becoming less valuable"
 msgid "depreciation"
-msgstr "deprezzamento"
+msgstr "ammortamento"
 
 #. "1. One textfield per transaction. The text in it should describe what the transaction was about. A short descriptive phrase (up to 40 chars) 2. One textfield per account. It is intended to be a longer, 1-5 sentence description of what this account is all about."
 msgid "Description (column in register)"
@@ -384,15 +388,15 @@ msgstr "partita doppia"
 
 #. "Transactions or bills/invoices can contain a document link which links either to some file on the local disk or to some arbitrary URL."
 msgid "document link"
-msgstr ""
+msgstr "collegamento al documento"
 
 #. "a person who works for somebody or a company in return for wages"
 msgid "employee"
-msgstr "lavoratore"
+msgstr "dipendente"
 
 #. "1. The money value of a property after all charges on it have been paid. Equity isn't debt, it's a representation of long-term capital (So combining it with liability isn't really very meaningful, except in the balance sheet. 2. (a) The value of the shares issued by  a company. (b) Ordinary stocks and shares that carry no fixed interest."
 msgid "equity"
-msgstr "capitale"
+msgstr "patrimonio netto, capitale"
 
 #. "Report that ... FIXME: Add description."
 msgid "equity statement"
@@ -452,7 +456,7 @@ msgstr "documento di vendita, documento, fattura"
 
 #. "In business accounting: Jobs are a mechanism by which you can group multiple invoices or bills that belong to the same customer or vendor. The job describes a (larger) piece of work or a task undertaken on order, for which one or many invoices or bills will be issued."
 msgid "job"
-msgstr "lavoro, compito"
+msgstr "lavoro, compito, operazione"
 
 #. "A book in which a bank, business firm, etc. records its financial accounts"
 msgid "ledger"
@@ -460,17 +464,15 @@ msgstr "libro mastro, mastro"
 
 #. "The heading for the right side of the balance sheet. See also: Equity."
 msgid "liabilities/equity"
-msgstr "passività/nette"
+msgstr "passività/patrimonio netto"
 
 #. "A sum of money that is lent (by a bank), see also: financial calculator, Mortgage"
 msgid "loan"
 msgstr "prestito"
 
 #. "Annual Percentage Rate, includes in contrast to the Nominal Rate some of the various costs to obtain a loan."
-#, fuzzy
-#| msgid "loan"
 msgid "loan: APR"
-msgstr "prestito"
+msgstr "prestito: tasso annuale"
 
 #. "The money lost in business activity"
 msgid "loss"
@@ -502,23 +504,19 @@ msgstr "modalità MDI"
 
 #. "One textfield per split that should help you remember what this split was about."
 msgid "Memo"
-msgstr "promemoria"
+msgstr "Promemoria"
 
 #. "(a) An agreement by which money is lent by a bank for buying a house or other property, the property being the security. (b) A sum of money lent in this way."
 msgid "Mortgage"
-msgstr "mutuo"
+msgstr "Mutuo"
 
 #. "Adjustable Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: ARM"
-msgstr "mutuo"
+msgstr "mutuo: a tasso variabile"
 
 #. "Fixed Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: FRM"
-msgstr "mutuo"
+msgstr "mutuo: a tasso fisso"
 
 #. "e.g. USD, DEM, see Currency."
 msgid "national currency"
@@ -530,7 +528,7 @@ msgstr "netto"
 
 #. "net total of all assets"
 msgid "net assets"
-msgstr "attivo netto"
+msgstr "attività nette, attivo netto"
 
 #. "The total income minus the total expenses of a given time period."
 msgid "net profit"
@@ -538,7 +536,7 @@ msgstr "utile netto"
 
 #. "Your net worth is your assets minus your liabilities. If your accounts are balanced, your net worth should equal your equity plus your net profit."
 msgid "net worth"
-msgstr "guadagno netto"
+msgstr "patrimonio netto"
 
 #. "One textfield per transaction that can hold explanatory text about the transaction."
 msgid "notes (register)"
@@ -546,7 +544,7 @@ msgstr "note (registro)"
 
 #. "Abbreviation for: number; Field in a transaction. If this transaction was done by check, then the check number should be noted in this field."
 msgid "Num (column in register)"
-msgstr "Nr. (colonna nel registro)"
+msgstr "Num (colonna nel registro)"
 
 #. "to make accessible"
 msgid "open, to"
@@ -580,7 +578,7 @@ msgstr "frase segreta"
 
 #. "An amount that must be paid / An amount for which money has not yet been received"
 msgid "Payables/Receivables"
-msgstr "Pagabile/esigibile"
+msgstr "Conti Fornitori / Conti Clienti"
 
 #. "A person to whom sth is paid"
 msgid "payee"
@@ -604,7 +602,7 @@ msgstr "portafoglio, paniere"
 
 #. "Register invoice, voucher in account register"
 msgid "post, to"
-msgstr "emettere, inviare"
+msgstr "emettere, inviare, registrare"
 
 #. "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. "
 msgid "preferences"
@@ -636,7 +634,7 @@ msgstr "utile, profitto"
 
 #. "OBSOLETE. This report was renamed to 'income statement' on 2004-07-13. Old definition: A list that shows the amount of money spent compared with the amount earned by a business in a particular period"
 msgid "Profit & Loss"
-msgstr "Conto economico, profitti e perdite"
+msgstr "Conto economico"
 
 #. "-"
 msgid "quick-fill"
@@ -652,7 +650,7 @@ msgstr "riconciliare"
 
 #. "-"
 msgid "record keeping"
-msgstr "tenere traccia"
+msgstr "tenere traccia, registrare"
 
 #. "A list of items; a book containing such a list"
 msgid "register"
@@ -668,7 +666,7 @@ msgstr "elemento di registro: scissione azionaria"
 
 #. "one form of register"
 msgid "register: auto-split ledger"
-msgstr "registro: (libro) mastro auto-suddiviso"
+msgstr "registro: (libro) registro a espansione automatica"
 
 #. "another form of register"
 msgid "register: basic ledger"
@@ -696,7 +694,7 @@ msgstr "formato report: Scalare"
 
 #. "name of an equity account (?); to be distinguished from the opening balance."
 msgid "Retained Earnings"
-msgstr "utili a nuovo"
+msgstr "utili portati a nuovo"
 
 #. "Create a new transaction that is the inverse of the old one.  When you add the two together they completely cancel out.  Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'."
 msgid "reverse transaction, to (Action in the register)"
@@ -704,7 +702,7 @@ msgstr "inserire una transazione inversa"
 
 #. "(In the customer summary report) The total amount of money received because something was sold."
 msgid "sales"
-msgstr "ricavi"
+msgstr "ricavi, vendite"
 
 #. "To write data (typically a file) to a storage medium, such as a disk or tape."
 msgid "save, to (to a file)"
@@ -724,15 +722,15 @@ msgstr "titolo, certificato, ipoteca, obbligazioni"
 
 #. "-"
 msgid "Share Balance (register)"
-msgstr "Bilancio quote (registro)"
+msgstr "Bilancio azioni (registro)"
 
 #. "Any of the equal parts into which the money of a business company is divided, giving the holder a right to a portion of the profits"
 msgid "shares"
-msgstr "quota"
+msgstr "azioni"
 
 #. "(often: of a quote) A place from which something comes or is obtained."
 msgid "source"
-msgstr "sorgente,fonte"
+msgstr "sorgente, fonte"
 
 #. "One of the two or several parts a transaction is divided into"
 msgid "split"
@@ -776,7 +774,7 @@ msgstr "transazione"
 
 #. "A transaction whose amount has actually been moved. The word comes from checks: a check is issued, but several steps have to be done until the amount is actually retrieved from the bank account, which is the point in time where that transaction (check) gets cleared."
 msgid "transaction state: cleared"
-msgstr "stato transazione: liquidata"
+msgstr "stato transazione: compensata, liquidata, verificata"
 
 #. "-"
 msgid "transaction state: frozen"
@@ -788,7 +786,7 @@ msgstr "stato transazione: riconciliata"
 
 #. "A transaction that is void i.e. not valid (anymore)."
 msgid "transaction state: voided"
-msgstr "stato transazione: invalidata"
+msgstr "stato transazione: annullata"
 
 #. "1. The action of transferring sth. 2. see: credit transfer"
 msgid "transfer (noun)"
@@ -828,15 +826,8 @@ msgstr "fornitore"
 
 #. "The terms 'Voucher' and 'Expense Voucher' are used interchangeably in gnucash. The 'Expense Voucher' is also a bit of a misnomer -- it's more like an 'Expense Report' in gnucash.  The phrase is meant to be a list of expenses incurred by an employee for which the company will reminburse them."
 msgid "voucher"
-msgstr "nota spese, buono, nota, garante"
+msgstr "nota spese, buono"
 
 #. "see debit"
 msgid "withdraw (in the reconcile dialog)"
 msgstr "prelievo (in una finestra di riconciliazione)"
-
-# "owner is the entity named in the document different from the company that is keeping book (so it could be the customer of an invoice, or the vendor indicated in your bill)."
-#~ msgid "invoice owner"
-#~ msgstr "intestatario"
-
-#~ msgid "Term"
-#~ msgstr "Termine"

po/glossary/pt.po

@@ -6,18 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash-2.4\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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2020-11-30 04:20+0000\n"
+"PO-Revision-Date: 2020-12-17 13:31+0000\n"
-"Last-Translator: Pedro Albuquerque <pmra@protonmail.com>\n"
+"Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
-"Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/gnucash/"
+"glossary/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Weblate 4.4-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!)"
@@ -456,10 +457,8 @@ msgid "loan"
 msgstr "empréstimo"
 
 #. "Annual Percentage Rate, includes in contrast to the Nominal Rate some of the various costs to obtain a loan."
-#, fuzzy
-#| msgid "loan"
 msgid "loan: APR"
-msgstr "empréstimo"
+msgstr "empréstimo:TPA"
 
 #. "The money lost in business activity"
 msgid "loss"
@@ -498,16 +497,12 @@ msgid "Mortgage"
 msgstr "Hipoteca"
 
 #. "Adjustable Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: ARM"
-msgstr "Hipoteca"
+msgstr "hipoteca:HTA"
 
 #. "Fixed Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: FRM"
-msgstr "Hipoteca"
+msgstr "hipoteca:HTF"
 
 #. "e.g. USD, DEM, see Currency."
 msgid "national currency"
@@ -731,7 +726,7 @@ msgstr "folha de estilo"
 
 #. "The total of a set of figures that are part of a larger group of figures"
 msgid "subtotal"
-msgstr "subtotal"
+msgstr "sub-total"
 
 #. "On the government's tax forms, the tax code identifies the given line or place on the form where certain amounts must be specified according to the current country's legislation"
 msgid "tax code"

po/glossary/pt_BR.po

@@ -6,20 +6,23 @@
 # Cleber Cassol <ccassol@gmail.com>, 2007.
 # Caio Alonso <caioalons@gmail.com>, 2007.
 # Vladimir Melo <vladimirmelo.psi@gmail.com>, 2007.
-#
+# LL Magical <lolayami2004@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "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: 2020-12-06 18:14+0100\n"
-"PO-Revision-Date: 2007-07-08 00:44-0300\n"
+"PO-Revision-Date: 2020-12-18 07:06+0000\n"
-"Last-Translator: Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>\n"
+"Last-Translator: LL Magical <lolayami2004@gmail.com>\n"
-"Language-Team: none\n"
+"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
-"Language: Brazilian Portuguese\n"
+"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"
 
 #. "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!)"
@@ -42,18 +45,16 @@ msgid "account name"
 msgstr "nome da conta"
 
 #. "The left side of the balance sheet in T account form shows the application of funds in form of assets. Because it contains only assets use assets directly. Complement: Passive. See also: Report Form"
-#, fuzzy
 msgid "account type: Active"
-msgstr "Ativo"
+msgstr "tipo de conta: Ativa"
 
 #. "A thing, esp. owned by a person or company, that has value and can be used or sold to pay debts. Dependent on the context you might use 'account type: Active' instead."
 msgid "account type: Asset"
 msgstr "Ativo"
 
 #. "in fact: 'Active & Passive', group aka 'Balance Sheet accounts'; complement of 'Profit & Loss'"
-#, fuzzy
 msgid "account type: Assets & Liabilities"
-msgstr "Passivo"
+msgstr "tipo de conta: Ativos & Passivos"
 
 #. "(esp. US) (Brit = current account) a bank account from which money can be withdrawn without previous notice"
 msgid "account type: checking"
@@ -88,14 +89,12 @@ msgid "account type: Mutual fund"
 msgstr "Fundo mútuo"
 
 #. "The right side of the balance sheet in T account form shows the source of funds and contains equity & liability. While not common in english, most languages would translate 'equity & liability' with 'passive'. Complement: Active. See also: Report Form Implementation: https://bugs.gnucash.org/show_bug.cgi?id=421766"
-#, fuzzy
 msgid "account type: Passive"
-msgstr "Ativo"
+msgstr "tipo de conta: Passivo"
 
 #. "Group of accounts tracking your success, complement of 'Assets & Liabilities'"
-#, fuzzy
 msgid "account type: Profit & Loss"
-msgstr "Ativo"
+msgstr "tipo de conta: Lucro & Perda"
 
 #. "1. (US) any type of account that earns interest 2. (Brit) any type of bank account that earns a higher level of interest than a current account or deposit account"
 msgid "account type: saving"
@@ -106,9 +105,8 @@ msgid "account type: Stock"
 msgstr "Ação"
 
 #. "This account type (new in gnucash-2.4.0) is used when exchanging or trading amounts from one currency into another"
-#, fuzzy
 msgid "account type: trading"
-msgstr "poupança"
+msgstr "tipo de conta: negociação"
 
 #. "-"
 msgid "account: parent account"
@@ -200,7 +198,7 @@ msgstr "saque"
 
 #. "As in: payable aging, or: receivable aging. The aging report categorizes payables or receivables based on time buckets. This gives an overview of which bills or invoices are overdue at which time in the future. "
 msgid "aging"
-msgstr ""
+msgstr "envelhecimento"
 
 #. "A sum of money"
 msgid "amount"
@@ -215,14 +213,12 @@ msgid "balance (noun)"
 msgstr "saldo"
 
 #. "Balance brought forward - usually the first entry of an account statement containing the 'balance c/f' of the previous billing period or page"
-#, fuzzy
 msgid "balance b/f"
-msgstr "equilibrar"
+msgstr "equilíbrio b/f"
 
 #. "Balance carried forward - usually the last entry of an account statement to be used as 'balance b/f' on the next billing period or page"
-#, fuzzy
 msgid "balance c/f"
-msgstr "equilibrar"
+msgstr "equilíbrio c/f"
 
 #. "A written record of money received and paid out, showing the difference between the two total amounts"
 msgid "balance sheet"
@@ -241,9 +237,8 @@ msgid "bill"
 msgstr "conta"
 
 #. "see invoice owner"
-#, fuzzy
 msgid "bill owner"
-msgstr "forma de faturamento"
+msgstr "proprietário da conta"
 
 #. "Conditions on paying a bill. Both an invoice and a bill have billing terms. For example, you can have 'terms' of 'Net-30', where the bill is due in full in 30 days."
 msgid "billing terms"
@@ -295,7 +290,7 @@ msgstr "fechar"
 
 #. "An article that is bought and sold. The most general term of what an account keeps track of, e.g. a currency or a stock."
 msgid "commodity"
-msgstr "commodity"
+msgstr "mercadoria"
 
 #. "e.g. NASDAQ"
 msgid "commodity listing"
@@ -310,9 +305,8 @@ msgid "commodity option: Symbol"
 msgstr "Símbolo"
 
 #. "interest which is earned on both the initial deposit and on any interest that has already been earned but left on deposit."
-#, fuzzy
 msgid "compound interests"
-msgstr "juros"
+msgstr "interesses compostos"
 
 #. "(a) A sum of money paid into an account. (b) A record of such a payment. (c) The state of having money in one's bank account."
 msgid "Credit (column in register)"
@@ -327,9 +321,8 @@ msgid "credit transfer"
 msgstr "transferência de crédito"
 
 #. "A document that you give to a client that says you owe money to the client, i.e. the opposite of an invoice"
-#, fuzzy
 msgid "credit note"
-msgstr "transferência de crédito"
+msgstr "nota de crédito"
 
 #. "The system of money used in a country"
 msgid "currency"
@@ -376,9 +369,8 @@ msgid "Description (column in register)"
 msgstr "Descrição"
 
 #. "Reductions to a basic price of goods or services. Your language might distinguish between discounts dealing with payments (billing terms) and others (invoice)."
-#, fuzzy
 msgid "discount"
-msgstr "conta"
+msgstr "desconto"
 
 #. "Important Buzzword :)"
 msgid "double entry"
@@ -386,7 +378,7 @@ msgstr "dupla entrada"
 
 #. "Transactions or bills/invoices can contain a document link which links either to some file on the local disk or to some arbitrary URL."
 msgid "document link"
-msgstr ""
+msgstr "link de documento"
 
 #. "a person who works for somebody or a company in return for wages"
 msgid "employee"
@@ -469,10 +461,8 @@ msgid "loan"
 msgstr "empréstimo"
 
 #. "Annual Percentage Rate, includes in contrast to the Nominal Rate some of the various costs to obtain a loan."
-#, fuzzy
-#| msgid "loan"
 msgid "loan: APR"
-msgstr "empréstimo"
+msgstr "empréstimo: APR"
 
 #. "The money lost in business activity"
 msgid "loss"
@@ -495,9 +485,8 @@ msgid "marker"
 msgstr "marcador"
 
 #. "1. Some text annotation, but this meaning isn't used inside gnucash. 2. In the Customer summary report: The ratio of profit vs. sales, i.e. the profit amount divided by the sales amount, shown in percent."
-#, fuzzy
 msgid "markup"
-msgstr "marcador"
+msgstr "Marcação"
 
 #. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface."
 msgid "MDI modus"
@@ -512,16 +501,12 @@ msgid "Mortgage"
 msgstr "Hipoteca"
 
 #. "Adjustable Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: ARM"
-msgstr "Hipoteca"
+msgstr "hipoteca: ARM"
 
 #. "Fixed Rate Mortgage"
-#, fuzzy
-#| msgid "Mortgage"
 msgid "mortgage: FRM"
-msgstr "Hipoteca"
+msgstr "hipoteca: FRM"
 
 #. "e.g. USD, DEM, see Currency."
 msgid "national currency"
@@ -573,7 +558,7 @@ msgstr "órfã"
 
 #. "The customer to (or employee or vendor from) which this invoice is sent - or short your business partner."
 msgid "owner (of bill, invoice or expense voucher)"
-msgstr ""
+msgstr "proprietário (de conta, fatura ou comprovante de despesa)"
 
 #. "A secret phrase that one needs to know in order to get access to a user account "
 msgid "passphrase"
@@ -597,25 +582,23 @@ msgstr "pagamento"
 
 #. "An account where no transactions may be posted to; transactions can only be posted to subaccounts of this account, so this account serves as a placeholder in the hierarchy"
 msgid "placeholder"
-msgstr "temporária"
+msgstr "alocador"
 
 #. "A set of investments owned by a person"
 msgid "portfolio"
 msgstr "portfólio"
 
 #. "Register invoice, voucher in account register"
-#, fuzzy
 msgid "post, to"
-msgstr "fechar"
+msgstr "postar para"
 
 #. "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. "
 msgid "preferences"
 msgstr "preferências"
 
 #. "Loan repayment calculator: your payments are split in interests payment and principal payment"
-#, fuzzy
 msgid "principal payment"
-msgstr "pagamento"
+msgstr "pagamento principal"
 
 #. "An amount of money for which sth may be bought or sold"
 msgid "price (in a split)"
@@ -691,11 +674,11 @@ msgstr "recarregar"
 
 #. "aka 'two-sided form' is in Europe often used for the balance sheet. Complement: report form: Vertical Form"
 msgid "report form: T Account Form"
-msgstr ""
+msgstr "formulário de relatório: Formulário de Conta T"
 
 #. "aka 'running form' is in english speaking countries usually used for the balance sheet in one column. Complement: report form: T Account Form"
 msgid "report form: Vertical Form"
-msgstr ""
+msgstr "formulário de relatório: Formulário Vertical"
 
 #. "name of an equity account (?); to be distinguished from the opening balance."
 msgid "Retained Earnings"
@@ -707,7 +690,7 @@ msgstr "reverter a transação"
 
 #. "(In the customer summary report) The total amount of money received because something was sold."
 msgid "sales"
-msgstr ""
+msgstr "vendas"
 
 #. "To write data (typically a file) to a storage medium, such as a disk or tape."
 msgid "save, to (to a file)"
@@ -750,9 +733,8 @@ msgid "subtotal"
 msgstr "subtotal"
 
 #. "On the government's tax forms, the tax code identifies the given line or place on the form where certain amounts must be specified according to the current country's legislation"
-#, fuzzy
 msgid "tax code"
-msgstr "info de impostos"
+msgstr "código tributário"
 
 #. "field of an account"
 msgid "tax info"
@@ -804,7 +786,7 @@ msgstr "conta de destino"
 
 #. "To move money from one account to another. Will create a transaction."
 msgid "transfer, to (register toolbar)"
-msgstr ""
+msgstr "transferência para (registrar barra de ferramentas)"
 
 #. "The trial balance is a worksheet on which you list all your general ledger accounts and their debit or credit balance. It is a tool that is used to alert you to errors in your books. The total debits must equal the total credits. If they don't equal, you know you have an error that must be tracked down."
 msgid "trial balance (report)"