gnucash maint: Multiple changes pushed

Sat Jan 9 17:11:32 EST 2016

Updated	 via  https://github.com/Gnucash/gnucash/commit/9c554ec3 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fdfea816 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b02e2807 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f8a0108a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7a25e2a7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a1126679 (commit)
	from  https://github.com/Gnucash/gnucash/commit/60eff5c7 (commit)



commit 9c554ec328ce83718da86f4a3d769268b9374be3
Author: Pedro Albuquerque <palbuquerque73 at gmail.com>
Date:   Thu Jan 7 06:42:20 2016 +0000

    Update to 2.6.10.pot

diff --git a/po/pt_PT.po b/po/pt_PT.po
index f71170c..ac316f6 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,21 +1,21 @@
 # GnuCash 2.6.9 pt_PT
 # Copyright (C) 2015
 # This file is distributed under the same license as the Gnucash package.
-# Pedro Albuquerque <palbuquerque73 at gmail.com>, 2015.
+# Pedro Albuquerque <palbuquerque73 at gmail.com>, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GnuCash 2.6.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-05 12:57-0700\n"
-"PO-Revision-Date: 2015-12-16 08:41+0000\n"
+"POT-Creation-Date: 2016-01-05 05:25+0100\n"
+"PO-Revision-Date: 2016-01-07 06:37+0000\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73 at gmail.com>\n"
 "Language-Team: PortuguÃªs <palbuquerque73 at gmail.com>\n"
 "Language: pt\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\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
 #. Business options
@@ -57,7 +57,7 @@ msgstr "Email da empresa"
 
 #: ../src/app-utils/app-utils.scm:310
 msgid "Company Contact Person"
-msgstr "Pessoa de contato da empresa"
+msgstr "Pessoa de contacto da empresa"
 
 #: ../src/app-utils/business-prefs.scm:24
 msgid "Counters"
@@ -266,7 +266,7 @@ msgstr "A morada do seu negÃ³cio."
 
 #: ../src/app-utils/business-prefs.scm:82
 msgid "The contact person to print on invoices."
-msgstr "A pessoa de contato a imprimir em faturas.."
+msgstr "A pessoa de contacto a imprimir em faturas.."
 
 #: ../src/app-utils/business-prefs.scm:87
 msgid "The phone number of your business."
@@ -349,7 +349,7 @@ msgstr "OrÃ§amento a usar quando nenhum outro foi especificado."
 
 #: ../src/app-utils/date-utilities.scm:122
 #: ../src/report/standard-reports/account-piecharts.scm:470
-#: ../src/report/standard-reports/cash-flow.scm:206
+#: ../src/report/standard-reports/cash-flow.scm:167
 #: ../src/report/standard-reports/category-barchart.scm:460
 #: ../src/report/standard-reports/daily-reports.scm:484
 #: ../src/report/standard-reports/equity-statement.scm:346
@@ -796,7 +796,7 @@ msgstr "Saldo inicial"
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:3204
 #: ../src/register/ledger-core/split-register.c:2367
 #: ../src/report/standard-reports/general-journal.scm:88
-#: ../src/report/standard-reports/register.scm:392
+#: ../src/report/standard-reports/register.scm:398
 #: ../src/report/standard-reports/transaction.scm:461
 #: ../src/report/standard-reports/trial-balance.scm:658
 msgid "Debit"
@@ -816,7 +816,7 @@ msgstr "CrÃ©dito"
 #: ../src/register/ledger-core/split-register.c:2506
 #: ../src/register/ledger-core/split-register.c:2524
 #: ../src/report/standard-reports/general-journal.scm:89
-#: ../src/report/standard-reports/register.scm:394
+#: ../src/report/standard-reports/register.scm:400
 #: ../src/report/standard-reports/transaction.scm:463
 #: ../src/report/standard-reports/trial-balance.scm:661
 msgid "Credit"
@@ -939,7 +939,7 @@ msgstr "Compra"
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:3070
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:3156
 #: ../src/register/ledger-core/split-register.c:2475
-#: ../src/report/standard-reports/register.scm:845
+#: ../src/report/standard-reports/register.scm:851
 msgid "Charge"
 msgstr "Pagamento"
 
@@ -958,7 +958,7 @@ msgstr "Despesa"
 #. page / name / orderkey / tooltip / default
 #: ../src/app-utils/prefs.scm:75
 #: ../src/business/business-gnome/business-gnome-utils.c:225
-#: ../src/business/business-gnome/dialog-invoice.c:3177
+#: ../src/business/business-gnome/dialog-invoice.c:3213
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:383
 #: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:1
 #: ../src/engine/gncInvoice.c:969 ../src/gnome-search/dialog-search.c:1069
@@ -975,7 +975,7 @@ msgstr "Despesa"
 #: ../src/report/business-reports/taxinvoice.eguile.scm:114
 #: ../src/report/business-reports/taxinvoice.scm:203
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:1698
-#: ../src/report/standard-reports/register.scm:832
+#: ../src/report/standard-reports/register.scm:838
 msgid "Invoice"
 msgstr "Fatura"
 
@@ -1048,10 +1048,10 @@ msgstr "Reembolso"
 
 #: ../src/app-utils/prefs.scm:91
 #: ../src/business/business-gnome/business-gnome-utils.c:219
-#: ../src/business/business-gnome/dialog-invoice.c:2347
-#: ../src/business/business-gnome/dialog-invoice.c:2523
-#: ../src/business/business-gnome/dialog-invoice.c:2524
-#: ../src/business/business-gnome/dialog-invoice.c:3165
+#: ../src/business/business-gnome/dialog-invoice.c:2368
+#: ../src/business/business-gnome/dialog-invoice.c:2543
+#: ../src/business/business-gnome/dialog-invoice.c:2544
+#: ../src/business/business-gnome/dialog-invoice.c:3201
 #: ../src/engine/gncInvoice.c:971 ../src/gnome-search/dialog-search.c:1053
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:3098
 #: ../src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade.h:3
@@ -1070,7 +1070,7 @@ msgstr "Mostrar versÃ£o do GnuCash"
 #: ../src/bin/gnucash-bin.c:101
 msgid "Enable debugging mode: increasing logging to provide deep detail."
 msgstr ""
-"Ativar modo de depuraÃ§Ã£o: aumeta os detalhes do diÃ¡rio para mais informaÃ§Ã£o."
+"Ativar modo de depuraÃ§Ã£o: aumenta os detalhes do diÃ¡rio para mais informaÃ§Ã£o."
 
 #: ../src/bin/gnucash-bin.c:106
 msgid "Enable extra/development/debugging features."
@@ -1158,7 +1158,7 @@ msgstr ""
 msgid "- GnuCash personal and small business finance management"
 msgstr "- gestor de finanÃ§as pessoais e de pequenos negÃ³cios Gnucash"
 
-#: ../src/bin/gnucash-bin.c:385 ../src/bin/gnucash-bin.c:764
+#: ../src/bin/gnucash-bin.c:385 ../src/bin/gnucash-bin.c:766
 #, c-format
 msgid ""
 "%s\n"
@@ -1182,7 +1182,7 @@ msgstr "VersÃ£o de desenvolvimento %s do GnuCash"
 #. 2nd %s is the scm type (svn/svk/git/bzr);
 #. 3rd %s is the scm revision number;
 #. 4th %s is the build date
-#: ../src/bin/gnucash-bin.c:404 ../src/gnome-utils/gnc-main-window.c:4393
+#: ../src/bin/gnucash-bin.c:404 ../src/gnome-utils/gnc-main-window.c:4382
 #, c-format
 msgid ""
 "%s\n"
@@ -1199,7 +1199,7 @@ msgstr "GnuCash %s"
 #. Translators: 1st %s is a fixed message, which is translated independently;
 #. 2nd %s is the scm (svn/svk/git/bzr) revision number;
 #. 3rd %s is the build date
-#: ../src/bin/gnucash-bin.c:415 ../src/gnome-utils/gnc-main-window.c:4400
+#: ../src/bin/gnucash-bin.c:415 ../src/gnome-utils/gnc-main-window.c:4389
 #, c-format
 msgid ""
 "%s\n"
@@ -1221,7 +1221,7 @@ msgstr "A verificar o Finance::Quote..."
 msgid "Loading data..."
 msgstr "A carregar os dados..."
 
-#: ../src/bin/gnucash-bin.c:765
+#: ../src/bin/gnucash-bin.c:767
 msgid ""
 "Error: could not initialize graphical user interface and option add-price-"
 "quotes was not set.\n"
@@ -1233,8 +1233,8 @@ msgstr ""
 
 #: ../src/business/business-gnome/business-gnome-utils.c:73
 #: ../src/business/business-gnome/business-gnome-utils.c:260
-#: ../src/business/business-gnome/dialog-invoice.c:1311
-#: ../src/business/business-gnome/dialog-invoice.c:1389
+#: ../src/business/business-gnome/dialog-invoice.c:1312
+#: ../src/business/business-gnome/dialog-invoice.c:1390
 #: ../src/gnome-utils/gnc-general-select.c:214
 msgid "Select..."
 msgstr "Selecionar..."
@@ -1245,9 +1245,9 @@ msgid "Edit..."
 msgstr "Editar..."
 
 #: ../src/business/business-gnome/business-gnome-utils.c:222
-#: ../src/business/business-gnome/dialog-invoice.c:2352
-#: ../src/business/business-gnome/dialog-invoice.c:2530
-#: ../src/business/business-gnome/dialog-invoice.c:2531
+#: ../src/business/business-gnome/dialog-invoice.c:2373
+#: ../src/business/business-gnome/dialog-invoice.c:2550
+#: ../src/business/business-gnome/dialog-invoice.c:2551
 msgid "Voucher"
 msgstr "Vale"
 
@@ -1352,7 +1352,7 @@ msgid "Proximo"
 msgstr "MÃªs seguinte"
 
 #: ../src/business/business-gnome/dialog-billterms.c:533
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:26
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:27
 #: ../src/report/business-reports/customer-summary.scm:224
 #: ../src/report/business-reports/job-report.scm:255
 #: ../src/report/business-reports/owner-report.scm:341
@@ -1369,7 +1369,7 @@ msgstr "As condiÃ§Ãµes \"%s\" estÃ£o em uso. NÃ£o podem ser eliminadas."
 #: ../src/gnome-utils/dialog-tax-table.c:571
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
-msgstr "Tem a certeza que quere eliminar \"%s\"?"
+msgstr "Tem a certeza que quer eliminar \"%s\"?"
 
 #: ../src/business/business-gnome/dialog-choose-owner.c:75
 msgid ""
@@ -1406,7 +1406,7 @@ msgstr "Tem de indicar uma morada de faturaÃ§Ã£o."
 #: ../src/business/business-gnome/dialog-customer.c:351
 msgid "Discount percentage must be between 0-100 or you must leave it blank."
 msgstr ""
-"A percentagm de desconto tem de ser entre 0 e 100, ou entÃ£o ficar em branco."
+"A percentagem de desconto tem de ser entre 0 e 100, ou entÃ£o ficar em branco."
 
 #: ../src/business/business-gnome/dialog-customer.c:356
 msgid "Credit must be a positive amount or you must leave it blank."
@@ -1445,10 +1445,10 @@ msgstr "Faturas do cliente"
 
 #: ../src/business/business-gnome/dialog-customer.c:907
 #: ../src/business/business-gnome/dialog-employee.c:712
-#: ../src/business/business-gnome/dialog-invoice.c:2931
-#: ../src/business/business-gnome/dialog-invoice.c:2940
-#: ../src/business/business-gnome/dialog-invoice.c:2951
-#: ../src/business/business-gnome/dialog-invoice.c:3204
+#: ../src/business/business-gnome/dialog-invoice.c:2967
+#: ../src/business/business-gnome/dialog-invoice.c:2976
+#: ../src/business/business-gnome/dialog-invoice.c:2987
+#: ../src/business/business-gnome/dialog-invoice.c:3240
 #: ../src/business/business-gnome/dialog-job.c:549
 #: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:1
 msgid "Process Payment"
@@ -1456,12 +1456,12 @@ msgstr "Processar pagamento"
 
 #: ../src/business/business-gnome/dialog-customer.c:917
 msgid "Shipping Contact"
-msgstr "Contato de entrega"
+msgstr "Contacto de entrega"
 
 #: ../src/business/business-gnome/dialog-customer.c:919
 #: ../src/business/business-gnome/dialog-vendor.c:722
 msgid "Billing Contact"
-msgstr "Contato de faturaÃ§Ã£o"
+msgstr "Contacto de faturaÃ§Ã£o"
 
 #: ../src/business/business-gnome/dialog-customer.c:921
 msgid "Customer ID"
@@ -1470,12 +1470,12 @@ msgstr "NÃºmero de cliente"
 #: ../src/business/business-gnome/dialog-customer.c:930
 #: ../src/business/business-gnome/dialog-vendor.c:733
 msgid "Contact"
-msgstr "Contato"
+msgstr "Contacto"
 
 #. FALL THROUGH
 #: ../src/business/business-gnome/dialog-customer.c:932
-#: ../src/business/business-gnome/dialog-invoice.c:3076
-#: ../src/business/business-gnome/dialog-invoice.c:3217
+#: ../src/business/business-gnome/dialog-invoice.c:3112
+#: ../src/business/business-gnome/dialog-invoice.c:3253
 #: ../src/business/business-gnome/dialog-job.c:575
 #: ../src/business/business-gnome/dialog-order.c:885
 #: ../src/business/business-gnome/dialog-vendor.c:735
@@ -1542,7 +1542,7 @@ msgid "Employee Username"
 msgstr "Nome de utilizador do empregado"
 
 #: ../src/business/business-gnome/dialog-employee.c:725
-#: ../src/business/business-gnome/dialog-invoice.c:3056
+#: ../src/business/business-gnome/dialog-invoice.c:3092
 msgid "Employee Name"
 msgstr "Nome do empregado"
 
@@ -1552,7 +1552,7 @@ msgid "Username"
 msgstr "Utilizador"
 
 #: ../src/business/business-gnome/dialog-employee.c:736
-#: ../src/gnome/dialog-sx-editor2.c:1757 ../src/gnome/dialog-sx-editor.c:1787
+#: ../src/gnome/dialog-sx-editor2.c:1757 ../src/gnome/dialog-sx-editor.c:1792
 #: ../src/gnome/dialog-tax-info.c:1150 ../src/gnome-utils/gnc-dense-cal.c:337
 #: ../src/gnome-utils/gnc-tree-model-budget.c:96
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:396
@@ -1571,25 +1571,25 @@ msgstr "Procurar empregado"
 #. * label in the frame and means
 #. * e.g. customer i.e. the company being
 #. * invoiced.
-#: ../src/business/business-gnome/dialog-invoice.c:386
+#: ../src/business/business-gnome/dialog-invoice.c:387
 #: ../src/business/business-gnome/dialog-order.c:181
 msgid "You need to supply Billing Information."
 msgstr "Tem de indicar a informaÃ§Ã£o de faturaÃ§Ã£o."
 
-#: ../src/business/business-gnome/dialog-invoice.c:579
+#: ../src/business/business-gnome/dialog-invoice.c:580
 msgid "Are you sure you want to delete the selected entry?"
 msgstr "Tem a certeza que quer eliminar a transaÃ§Ã£o selecionada?"
 
-#: ../src/business/business-gnome/dialog-invoice.c:581
+#: ../src/business/business-gnome/dialog-invoice.c:582
 msgid ""
 "This entry is attached to an order and will be deleted from that as well!"
 msgstr ""
 "Esta transaÃ§Ã£o estÃ¡ inserida numa encomenda e serÃ¡ eliminada daÃ tambÃ©m!"
 
-#: ../src/business/business-gnome/dialog-invoice.c:691
-#: ../src/business/business-gnome/dialog-invoice.c:2985
-#: ../src/business/business-gnome/dialog-invoice.c:3019
-#: ../src/business/business-gnome/dialog-invoice.c:3053
+#: ../src/business/business-gnome/dialog-invoice.c:692
+#: ../src/business/business-gnome/dialog-invoice.c:3021
+#: ../src/business/business-gnome/dialog-invoice.c:3055
+#: ../src/business/business-gnome/dialog-invoice.c:3089
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:2836
 #: ../src/register/ledger-core/split-register-model.c:231
 #: ../src/report/business-reports/aging.scm:393
@@ -1604,30 +1604,30 @@ msgid "Due Date"
 msgstr "Data de vencimento"
 
 #. Should be using standard label for due date?
-#: ../src/business/business-gnome/dialog-invoice.c:692
+#: ../src/business/business-gnome/dialog-invoice.c:693
 #: ../src/report/business-reports/aging.scm:394
 #: ../src/report/business-reports/owner-report.scm:571
 msgid "Post Date"
 msgstr "Data de emissÃ£o"
 
-#: ../src/business/business-gnome/dialog-invoice.c:693
+#: ../src/business/business-gnome/dialog-invoice.c:694
 msgid "Post to Account"
 msgstr "Emitir para conta"
 
-#: ../src/business/business-gnome/dialog-invoice.c:694
+#: ../src/business/business-gnome/dialog-invoice.c:695
 msgid "Accumulate Splits?"
 msgstr "Acumular parcelas?"
 
-#: ../src/business/business-gnome/dialog-invoice.c:787
+#: ../src/business/business-gnome/dialog-invoice.c:788
 msgid "The Invoice must have at least one Entry."
 msgstr "A fatura tem de ter pelo menos uma entrada."
 
-#: ../src/business/business-gnome/dialog-invoice.c:807
+#: ../src/business/business-gnome/dialog-invoice.c:808
 msgid "Do you really want to post the invoice?"
 msgstr "Tem a certeza que quer emitir a fatura?"
 
 #. Fill in the conversion prices with feedback from the user
-#: ../src/business/business-gnome/dialog-invoice.c:822
+#: ../src/business/business-gnome/dialog-invoice.c:823
 msgid ""
 "One or more of the entries are for accounts different from the invoice/bill "
 "currency. You will be asked a conversion rate for each."
@@ -1635,34 +1635,34 @@ msgstr ""
 "Uma ou mais das entradas sÃ£o para contas com moeda diferente da da fatura/"
 "nota. Ser-lhe-Ã¡ pedida uma taxa de cÃ¢mbio para cada uma."
 
-#: ../src/business/business-gnome/dialog-invoice.c:952
+#: ../src/business/business-gnome/dialog-invoice.c:953
 msgid "The post action was canceled because not all exchange rates were given."
 msgstr ""
 "A emissÃ£o foi cancelada porque nem todas as taxas de cÃ¢mbio foram indicadas."
 
-#: ../src/business/business-gnome/dialog-invoice.c:1221
-#: ../src/gnome/window-reconcile2.c:1142 ../src/gnome/window-reconcile.c:1142
+#: ../src/business/business-gnome/dialog-invoice.c:1222
+#: ../src/gnome/window-reconcile2.c:1142 ../src/gnome/window-reconcile.c:1179
 msgid "Total:"
 msgstr "Total:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1227
+#: ../src/business/business-gnome/dialog-invoice.c:1228
 msgid "Subtotal:"
 msgstr "Subtotal:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1228
+#: ../src/business/business-gnome/dialog-invoice.c:1229
 msgid "Tax:"
 msgstr "Imposto:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1232
+#: ../src/business/business-gnome/dialog-invoice.c:1233
 msgid "Total Cash:"
 msgstr "Total em dinheiro:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1233
+#: ../src/business/business-gnome/dialog-invoice.c:1234
 msgid "Total Charge:"
 msgstr "Total de gastos:"
 
 #. Set the type label
-#: ../src/business/business-gnome/dialog-invoice.c:1702
+#: ../src/business/business-gnome/dialog-invoice.c:1703
 #: ../src/business/business-gnome/dialog-payment.c:1010
 #: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:22
 #: ../src/engine/gncInvoice.c:977
@@ -1678,148 +1678,148 @@ msgstr "Total de gastos:"
 msgid "Credit Note"
 msgstr "Nota de crÃ©dito"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1901
-#: ../src/business/business-gnome/dialog-invoice.c:1920
-#: ../src/business/business-gnome/dialog-invoice.c:1939
+#: ../src/business/business-gnome/dialog-invoice.c:1922
+#: ../src/business/business-gnome/dialog-invoice.c:1941
+#: ../src/business/business-gnome/dialog-invoice.c:1960
 msgid "New Credit Note"
 msgstr "Nova nota de crÃ©dito"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1902
+#: ../src/business/business-gnome/dialog-invoice.c:1923
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:275
 #: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:21
 #: ../src/gnome-search/dialog-search.c:1071
 msgid "New Invoice"
 msgstr "Nova fatura"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1907
-#: ../src/business/business-gnome/dialog-invoice.c:1926
-#: ../src/business/business-gnome/dialog-invoice.c:1945
+#: ../src/business/business-gnome/dialog-invoice.c:1928
+#: ../src/business/business-gnome/dialog-invoice.c:1947
+#: ../src/business/business-gnome/dialog-invoice.c:1966
 msgid "Edit Credit Note"
 msgstr "Editar nota de crÃ©dito"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1908
+#: ../src/business/business-gnome/dialog-invoice.c:1929
 msgid "Edit Invoice"
 msgstr "Editar fatura"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1911
-#: ../src/business/business-gnome/dialog-invoice.c:1930
-#: ../src/business/business-gnome/dialog-invoice.c:1949
+#: ../src/business/business-gnome/dialog-invoice.c:1932
+#: ../src/business/business-gnome/dialog-invoice.c:1951
+#: ../src/business/business-gnome/dialog-invoice.c:1970
 msgid "View Credit Note"
 msgstr "Ver nota de crÃ©dito"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1912
+#: ../src/business/business-gnome/dialog-invoice.c:1933
 msgid "View Invoice"
 msgstr "Ver fatura"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1921
+#: ../src/business/business-gnome/dialog-invoice.c:1942
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:274
 #: ../src/gnome-search/dialog-search.c:1055
 msgid "New Bill"
 msgstr "Novo pagamento"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1927
+#: ../src/business/business-gnome/dialog-invoice.c:1948
 msgid "Edit Bill"
 msgstr "Editar pagamento"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1931
+#: ../src/business/business-gnome/dialog-invoice.c:1952
 msgid "View Bill"
 msgstr "Ver pagamento"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1940
+#: ../src/business/business-gnome/dialog-invoice.c:1961
 #: ../src/gnome-search/dialog-search.c:1067
 msgid "New Expense Voucher"
 msgstr "Novo vale de despesas"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1946
+#: ../src/business/business-gnome/dialog-invoice.c:1967
 msgid "Edit Expense Voucher"
 msgstr "Editar vale de despesas"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1950
+#: ../src/business/business-gnome/dialog-invoice.c:1971
 msgid "View Expense Voucher"
 msgstr "Ver vale de despesas"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2346
-#: ../src/business/business-gnome/dialog-invoice.c:2522
+#: ../src/business/business-gnome/dialog-invoice.c:2367
+#: ../src/business/business-gnome/dialog-invoice.c:2542
 msgid "Bill Information"
 msgstr "InformaÃ§Ã£o de faturaÃ§Ã£o"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2348
-#: ../src/business/business-gnome/dialog-invoice.c:2525
-#: ../src/business/business-gnome/dialog-invoice.c:3026
+#: ../src/business/business-gnome/dialog-invoice.c:2369
+#: ../src/business/business-gnome/dialog-invoice.c:2545
+#: ../src/business/business-gnome/dialog-invoice.c:3062
 msgid "Bill ID"
 msgstr "NÃºmero de pagamento"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2351
-#: ../src/business/business-gnome/dialog-invoice.c:2529
+#: ../src/business/business-gnome/dialog-invoice.c:2372
+#: ../src/business/business-gnome/dialog-invoice.c:2549
 msgid "Voucher Information"
 msgstr "InformaÃ§Ã£o do vale"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2353
-#: ../src/business/business-gnome/dialog-invoice.c:2532
-#: ../src/business/business-gnome/dialog-invoice.c:3060
+#: ../src/business/business-gnome/dialog-invoice.c:2374
+#: ../src/business/business-gnome/dialog-invoice.c:2552
+#: ../src/business/business-gnome/dialog-invoice.c:3096
 msgid "Voucher ID"
 msgstr "NÃºmero de vale"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2829
+#: ../src/business/business-gnome/dialog-invoice.c:2865
 msgid "Date of duplicated entries"
 msgstr "Data das entradas duplicadas"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2864
+#: ../src/business/business-gnome/dialog-invoice.c:2900
 msgid "Do you really want to post these invoices?"
 msgstr "Tem a certeza que quer emitir estas faturas?"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2930
+#: ../src/business/business-gnome/dialog-invoice.c:2966
 msgid "View/Edit Invoice"
 msgstr "Ver/Editar fatura"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2932
-#: ../src/business/business-gnome/dialog-invoice.c:2941
-#: ../src/business/business-gnome/dialog-invoice.c:2952
+#: ../src/business/business-gnome/dialog-invoice.c:2968
+#: ../src/business/business-gnome/dialog-invoice.c:2977
+#: ../src/business/business-gnome/dialog-invoice.c:2988
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:261
 #: ../src/gnome/gnc-plugin-page-register2.c:480
 #: ../src/gnome/gnc-plugin-page-register.c:483
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2933
-#: ../src/business/business-gnome/dialog-invoice.c:2942
-#: ../src/business/business-gnome/dialog-invoice.c:2953
+#: ../src/business/business-gnome/dialog-invoice.c:2969
+#: ../src/business/business-gnome/dialog-invoice.c:2978
+#: ../src/business/business-gnome/dialog-invoice.c:2989
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:265
 msgid "Post"
 msgstr "Emitir"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2934
-#: ../src/business/business-gnome/dialog-invoice.c:2943
-#: ../src/business/business-gnome/dialog-invoice.c:2954
+#: ../src/business/business-gnome/dialog-invoice.c:2970
+#: ../src/business/business-gnome/dialog-invoice.c:2979
+#: ../src/business/business-gnome/dialog-invoice.c:2990
 msgid "Printable Report"
 msgstr "RelatÃ³rio imprimÃvel"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2939
-#: ../src/business/business-gnome/dialog-invoice.c:3203
+#: ../src/business/business-gnome/dialog-invoice.c:2975
+#: ../src/business/business-gnome/dialog-invoice.c:3239
 msgid "View/Edit Bill"
 msgstr "Ver/Editar pagamento"
 
 #. Translators: The terms 'Voucher' and 'Expense Voucher' are used
 #. interchangeably in gnucash and mean the same thing.
-#: ../src/business/business-gnome/dialog-invoice.c:2950
+#: ../src/business/business-gnome/dialog-invoice.c:2986
 msgid "View/Edit Voucher"
 msgstr "Ver/Editar vale"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2964
+#: ../src/business/business-gnome/dialog-invoice.c:3000
 msgid "Invoice Owner"
 msgstr "TÃtular da fatura"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2967
+#: ../src/business/business-gnome/dialog-invoice.c:3003
 #: ../src/report/business-reports/easy-invoice.scm:339
 #: ../src/report/business-reports/fancy-invoice.scm:329
 #: ../src/report/business-reports/invoice.scm:314
 msgid "Invoice Notes"
 msgstr "Notas da fatura"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2970
-#: ../src/business/business-gnome/dialog-invoice.c:3004
-#: ../src/business/business-gnome/dialog-invoice.c:3038
-#: ../src/business/business-gnome/dialog-invoice.c:3067
+#: ../src/business/business-gnome/dialog-invoice.c:3006
+#: ../src/business/business-gnome/dialog-invoice.c:3040
+#: ../src/business/business-gnome/dialog-invoice.c:3074
+#: ../src/business/business-gnome/dialog-invoice.c:3103
 #: ../src/business/business-gnome/dialog-job.c:562
 #: ../src/business/business-gnome/dialog-job.c:573
 #: ../src/business/business-gnome/dialog-order.c:883
@@ -1832,15 +1832,15 @@ msgstr "Notas da fatura"
 msgid "Billing ID"
 msgstr "NÃºmero de pagamento"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2973
-#: ../src/business/business-gnome/dialog-invoice.c:3007
-#: ../src/business/business-gnome/dialog-invoice.c:3041
+#: ../src/business/business-gnome/dialog-invoice.c:3009
+#: ../src/business/business-gnome/dialog-invoice.c:3043
+#: ../src/business/business-gnome/dialog-invoice.c:3077
 msgid "Is Paid?"
 msgstr "EstÃ¡ paga?"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2976
-#: ../src/business/business-gnome/dialog-invoice.c:3010
-#: ../src/business/business-gnome/dialog-invoice.c:3044
+#: ../src/business/business-gnome/dialog-invoice.c:3012
+#: ../src/business/business-gnome/dialog-invoice.c:3046
+#: ../src/business/business-gnome/dialog-invoice.c:3080
 #: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:5
 #: ../src/gnome/dialog-find-transactions2.c:125
 #: ../src/gnome/dialog-find-transactions.c:124
@@ -1848,48 +1848,48 @@ msgstr "EstÃ¡ paga?"
 msgid "Date Posted"
 msgstr "Data de emissÃ£o"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2979
-#: ../src/business/business-gnome/dialog-invoice.c:3013
-#: ../src/business/business-gnome/dialog-invoice.c:3047
+#: ../src/business/business-gnome/dialog-invoice.c:3015
+#: ../src/business/business-gnome/dialog-invoice.c:3049
+#: ../src/business/business-gnome/dialog-invoice.c:3083
 msgid "Is Posted?"
 msgstr "EstÃ¡ emitida?"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2982
-#: ../src/business/business-gnome/dialog-invoice.c:3016
-#: ../src/business/business-gnome/dialog-invoice.c:3050
+#: ../src/business/business-gnome/dialog-invoice.c:3018
+#: ../src/business/business-gnome/dialog-invoice.c:3052
+#: ../src/business/business-gnome/dialog-invoice.c:3086
 #: ../src/business/business-gnome/dialog-order.c:872
 #: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:4
 #: ../src/business/business-gnome/gtkbuilder/dialog-order.glade.h:3
 msgid "Date Opened"
 msgstr "Data de abertura"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2988
-#: ../src/business/business-gnome/dialog-invoice.c:3022
+#: ../src/business/business-gnome/dialog-invoice.c:3024
+#: ../src/business/business-gnome/dialog-invoice.c:3058
 msgid "Company Name "
 msgstr "Nome da empresa"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2992
+#: ../src/business/business-gnome/dialog-invoice.c:3028
 #: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:3
 msgid "Invoice ID"
 msgstr "NÃºmero de fatura"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2998
+#: ../src/business/business-gnome/dialog-invoice.c:3034
 msgid "Bill Owner"
 msgstr "TÃtular do pagamento"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3001
+#: ../src/business/business-gnome/dialog-invoice.c:3037
 msgid "Bill Notes"
 msgstr "Notas do pagamento"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3032
+#: ../src/business/business-gnome/dialog-invoice.c:3068
 msgid "Voucher Owner"
 msgstr "TÃtular do vale"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3035
+#: ../src/business/business-gnome/dialog-invoice.c:3071
 msgid "Voucher Notes"
 msgstr "Notas do vale"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3069
+#: ../src/business/business-gnome/dialog-invoice.c:3105
 #: ../src/business/business-gnome/gtkbuilder/dialog-invoice.glade.h:2
 #: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:7
 #: ../src/gnome/dialog-lot-viewer.c:831 ../src/gnome/dialog-tax-info.c:1189
@@ -1907,28 +1907,28 @@ msgstr "Notas do vale"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3071
+#: ../src/business/business-gnome/dialog-invoice.c:3107
 #: ../src/register/ledger-core/split-register-model.c:300
 msgid "Paid"
 msgstr "Paga"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3074
+#: ../src/business/business-gnome/dialog-invoice.c:3110
 msgid "Posted"
 msgstr "Emitida"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3079
-#: ../src/business/business-gnome/dialog-invoice.c:3219
+#: ../src/business/business-gnome/dialog-invoice.c:3115
+#: ../src/business/business-gnome/dialog-invoice.c:3255
 #: ../src/report/business-reports/easy-invoice.scm:805
 msgid "Due"
 msgstr "Devida"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3081
+#: ../src/business/business-gnome/dialog-invoice.c:3117
 #: ../src/business/business-gnome/dialog-order.c:890
 #: ../src/gnome/dialog-lot-viewer.c:837
 msgid "Opened"
 msgstr "Aberta"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3083
+#: ../src/business/business-gnome/dialog-invoice.c:3119
 #: ../src/business/business-gnome/dialog-order.c:892
 #: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:19
 #: ../src/gnome/dialog-lot-viewer.c:914 ../src/gnome/reconcile-view.c:381
@@ -1939,7 +1939,7 @@ msgstr "Aberta"
 #: ../src/report/standard-reports/general-journal.scm:110
 #: ../src/report/standard-reports/general-ledger.scm:99
 #: ../src/report/standard-reports/register.scm:146
-#: ../src/report/standard-reports/register.scm:414
+#: ../src/report/standard-reports/register.scm:420
 #: ../src/report/standard-reports/transaction.scm:384
 #: ../src/report/standard-reports/transaction.scm:385
 #: ../src/report/standard-reports/transaction.scm:442
@@ -1947,15 +1947,15 @@ msgstr "Aberta"
 msgid "Num"
 msgstr "NÂº"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3164
+#: ../src/business/business-gnome/dialog-invoice.c:3200
 msgid "Find Bill"
 msgstr "Localizar pagamentos"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3170
+#: ../src/business/business-gnome/dialog-invoice.c:3206
 msgid "Find Expense Voucher"
 msgstr "Localizar vale de despesa"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3171
+#: ../src/business/business-gnome/dialog-invoice.c:3207
 #: ../src/gnome-search/dialog-search.c:1065
 #: ../src/report/business-reports/easy-invoice.scm:712
 #: ../src/report/business-reports/fancy-invoice.scm:811
@@ -1963,27 +1963,27 @@ msgstr "Localizar vale de despesa"
 msgid "Expense Voucher"
 msgstr "Vale de despesa"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3176
+#: ../src/business/business-gnome/dialog-invoice.c:3212
 msgid "Find Invoice"
 msgstr "Localizar fatura"
 
 #. Translators: This abbreviation is the column heading for
 #. the condition "Is this invoice a Credit Note?"
-#: ../src/business/business-gnome/dialog-invoice.c:3213
+#: ../src/business/business-gnome/dialog-invoice.c:3249
 msgid "CN?"
 msgstr "NC?"
 
 #. note the "Amount" multichoice option here
-#: ../src/business/business-gnome/dialog-invoice.c:3215
+#: ../src/business/business-gnome/dialog-invoice.c:3251
 #: ../src/gnome/dialog-lot-viewer.c:926 ../src/gnome/reconcile-view.c:373
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:2992
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:3004
 #: ../src/import-export/aqb/dialog-ab.glade.h:34
-#: ../src/import-export/import-main-matcher.c:484
+#: ../src/import-export/import-main-matcher.c:476
 #: ../src/import-export/import-match-picker.c:345
 #: ../src/import-export/import-match-picker.c:385
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3498
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3535
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3504
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3541
 #: ../src/report/business-reports/customer-summary.scm:71
 #: ../src/report/business-reports/job-report.scm:48
 #: ../src/report/business-reports/owner-report.scm:57
@@ -1991,8 +1991,8 @@ msgstr "NC?"
 #: ../src/report/standard-reports/general-journal.scm:116
 #: ../src/report/standard-reports/general-ledger.scm:91
 #: ../src/report/standard-reports/general-ledger.scm:111
-#: ../src/report/standard-reports/register.scm:449
-#: ../src/report/standard-reports/register.scm:845
+#: ../src/report/standard-reports/register.scm:455
+#: ../src/report/standard-reports/register.scm:851
 #: ../src/report/standard-reports/transaction.scm:398
 #: ../src/report/standard-reports/transaction.scm:458
 #: ../src/report/standard-reports/transaction.scm:758
@@ -2003,14 +2003,14 @@ msgstr "Montante"
 
 #. Translators: %d is the number of bills due. This is a
 #. ngettext(3) message.
-#: ../src/business/business-gnome/dialog-invoice.c:3269
+#: ../src/business/business-gnome/dialog-invoice.c:3305
 #, c-format
 msgid "The following bill is due:"
 msgid_plural "The following %d bills are due:"
 msgstr[0] "O seguinte pagamento Ã© devido:"
 msgstr[1] "Os seguintes %d pagamentos sÃ£o devidos:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:3274
+#: ../src/business/business-gnome/dialog-invoice.c:3310
 msgid "Due Bills Reminder"
 msgstr "Aviso de pagamentos devidos"
 
@@ -2253,7 +2253,7 @@ msgstr "Abrir o diÃ¡logo Localizar cliente"
 #: ../src/business/business-gnome/gnc-plugin-business.c:304
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:192
 msgid "New _Invoice..."
-msgstr "Nova _Fatura"
+msgstr "Nova _fatura"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:171
 #: ../src/business/business-gnome/gnc-plugin-business.c:305
@@ -2262,7 +2262,7 @@ msgstr "Abrir o diÃ¡logo Nova fatura"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:175
 msgid "Find In_voice..."
-msgstr "Locali_Zar fatura..."
+msgstr "Locali_zar fatura..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:176
 msgid "Open the Find Invoice dialog"
@@ -2271,7 +2271,7 @@ msgstr "Abrir o diÃ¡logo Localizar fatura"
 #: ../src/business/business-gnome/gnc-plugin-business.c:180
 #: ../src/business/business-gnome/gnc-plugin-business.c:223
 msgid "New _Job..."
-msgstr "Nova _Tarefa..."
+msgstr "Nova _tarefa..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:181
 #: ../src/business/business-gnome/gnc-plugin-business.c:224
@@ -2281,7 +2281,7 @@ msgstr "Abrir o diÃ¡logo Nova tarefa"
 #: ../src/business/business-gnome/gnc-plugin-business.c:185
 #: ../src/business/business-gnome/gnc-plugin-business.c:228
 msgid "Find Jo_b..."
-msgstr "L_Ocalizar tarefa..."
+msgstr "L_ocalizar tarefa..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:186
 #: ../src/business/business-gnome/gnc-plugin-business.c:229
@@ -2332,7 +2332,7 @@ msgstr "Abrir o diÃ¡logo Localizar fornecedor"
 #: ../src/business/business-gnome/gnc-plugin-business.c:213
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:187
 msgid "New _Bill..."
-msgstr "Novo _Pagamento..."
+msgstr "Novo _pagamento..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:214
 msgid "Open the New Bill dialog"
@@ -2340,7 +2340,7 @@ msgstr "Abrir o diÃ¡logo Novo pagamento"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:218
 msgid "Find Bi_ll..."
-msgstr "Localizar pa_Gamento..."
+msgstr "Localizar pa_gamento..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:219
 msgid "Open the Find Bill dialog"
@@ -2377,7 +2377,7 @@ msgstr "Abrir o diÃ¡logo Localizar empregado"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:256
 msgid "New _Expense Voucher..."
-msgstr "Novo _Vale de despesa..."
+msgstr "Novo _vale de despesa..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:257
 msgid "Open the New Expense Voucher dialog"
@@ -2385,7 +2385,7 @@ msgstr "Abrir o diÃ¡logo Novo vale de despesa"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:261
 msgid "Find Expense _Voucher..."
-msgstr "Localizar vale de _Despesa..."
+msgstr "Localizar vale de _despesa..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:262
 msgid "Open the Find Expense Voucher dialog"
@@ -2393,7 +2393,7 @@ msgstr "Abrir o diÃ¡logo Localizar vale de despesa"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:273
 msgid "Sales _Tax Table"
-msgstr "Tabela de _Imposto de vendas"
+msgstr "Tabela de _imposto de vendas"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:274
 msgid "View and edit the list of Sales Tax Tables (GST/VAT)"
@@ -2409,7 +2409,7 @@ msgstr "Ver e alterar a lista de condiÃ§Ãµes de pagamento"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:283
 msgid "Bills _Due Reminder"
-msgstr "Aviso de pagamentos devidos"
+msgstr "Aviso de pagamentos _devidos"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:284
 msgid "Open the Bills Due Reminder dialog"
@@ -2417,7 +2417,7 @@ msgstr "Abrir o diÃ¡logo Aviso de pagamentos devidos"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:287
 msgid "E_xport"
-msgstr "E_Xportar"
+msgstr "E_xportar"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:292
 #: ../src/business/business-gnome/gnc-plugin-business.c:293
@@ -2472,7 +2472,7 @@ msgstr "Copiar"
 #: ../src/gnome-utils/gnc-main-window.c:315
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:1028
 msgid "_Paste"
-msgstr "Co_Lar"
+msgstr "Co_lar"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:129
 msgid "_Edit Invoice"
@@ -2516,7 +2516,7 @@ msgstr "Registar a transaÃ§Ã£o atual"
 
 #. Add the Cancel button for the matcher
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:156
-#: ../src/gnome/window-reconcile2.c:2166 ../src/gnome/window-reconcile.c:2166
+#: ../src/gnome/window-reconcile2.c:2166 ../src/gnome/window-reconcile.c:2206
 #: ../src/import-export/csv-imp/assistant-csv-trans-import.c:1473
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -2527,7 +2527,7 @@ msgstr "Cancelar a transaÃ§Ã£o atual"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:161
 #: ../src/gnome/gnc-plugin-page-sx-list.c:158
-#: ../src/gnome/window-reconcile2.c:2208 ../src/gnome/window-reconcile.c:2208
+#: ../src/gnome/window-reconcile2.c:2208 ../src/gnome/window-reconcile.c:2248
 msgid "_Delete"
 msgstr "_Eliminar"
 
@@ -2545,7 +2545,7 @@ msgstr "Ir para a transaÃ§Ã£o em branco no final da fatura"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:171
 msgid "Dup_licate Entry"
-msgstr "TransaÃ§Ã£o dup_Licada"
+msgstr "TransaÃ§Ã£o dup_licada"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:172
 msgid "Make a copy of the current entry"
@@ -2561,7 +2561,7 @@ msgstr "Mover a transaÃ§Ã£o atual uma linha acima"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:181
 msgid "Move Entry Do_wn"
-msgstr "Mover _Abaixo"
+msgstr "Mover _abaixo"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:182
 msgid "Move the current entry one row downwards"
@@ -2569,7 +2569,7 @@ msgstr "Mover a transaÃ§Ã£o atual uma linha abaixo"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:188
 msgid "New _Invoice"
-msgstr "Nova _Fatura"
+msgstr "Nova _fatura"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:189
 msgid "Create a new invoice for the same owner as the current one"
@@ -2585,7 +2585,7 @@ msgstr "Registar um pagamento para o titular desta fatura"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:200
 msgid "_Company Report"
-msgstr "RelatÃ³rio de _Empresa"
+msgstr "RelatÃ³rio de _empresa"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:201
 msgid "Open a company report window for the owner of this Invoice"
@@ -2611,7 +2611,7 @@ msgstr "Ordenar por data"
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:211
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:31
 msgid "Date of _Entry"
-msgstr "Data de _Registo"
+msgstr "Data de _registo"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:211
 msgid "Sort by the date of entry"
@@ -2640,7 +2640,7 @@ msgstr "Ordenar por preÃ§o"
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:214
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:41
 msgid "Descri_ption"
-msgstr "D_EscriÃ§Ã£o"
+msgstr "D_escriÃ§Ã£o"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:214
 msgid "Sort by description"
@@ -2689,7 +2689,7 @@ msgstr "Suspender"
 
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:141
 msgid "E_dit Vendor"
-msgstr "E_Ditar fornecedor"
+msgstr "E_ditar fornecedor"
 
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:142
 msgid "Edit the selected vendor"
@@ -2697,7 +2697,7 @@ msgstr "Editar o fornecedor selecionado"
 
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:146
 msgid "E_dit Customer"
-msgstr "E_Ditar Cliente"
+msgstr "E_ditar cliente"
 
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:147
 msgid "Edit the selected customer"
@@ -2705,7 +2705,7 @@ msgstr "Editar o cliente selecionado"
 
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:151
 msgid "E_dit Employee"
-msgstr "E_Ditar empregado"
+msgstr "E_ditar empregado"
 
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:152
 msgid "Edit the selected employee"
@@ -2750,7 +2750,7 @@ msgstr "Criar uma nova fatura"
 
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:197
 msgid "New _Voucher..."
-msgstr "Novo _Vale..."
+msgstr "Novo _vale..."
 
 #: ../src/business/business-gnome/gnc-plugin-page-owner-tree.c:198
 msgid "Create a new voucher"
@@ -3093,7 +3093,7 @@ msgstr "_Dias antes"
 
 #: ../src/business/business-gnome/gtkbuilder/business-prefs.glade.h:11
 msgid "_Notify when due"
-msgstr "Notificar quando devido"
+msgstr "_Notificar quando devido"
 
 #: ../src/business/business-gnome/gtkbuilder/business-prefs.glade.h:12
 msgid "Whether to display the list of Bills Due at startup."
@@ -3148,7 +3148,7 @@ msgstr "<b>Geral</b>"
 
 #: ../src/business/business-gnome/gtkbuilder/business-prefs.glade.h:21
 msgid "Enable extra _buttons"
-msgstr "Ativar _BotÃµes extra"
+msgstr "Ativar _botÃµes extra"
 
 #: ../src/business/business-gnome/gtkbuilder/business-prefs.glade.h:24
 msgid "Report for printing:"
@@ -3162,7 +3162,7 @@ msgstr "_Processar pagamento na emissÃ£o"
 #. See the tooltip "At post time..." for details.
 #: ../src/business/business-gnome/gtkbuilder/business-prefs.glade.h:29
 msgid "Pro_cess payments on posting"
-msgstr "Processar pagamento na _EmissÃ£o"
+msgstr "Pro_cessar pagamento na emissÃ£o"
 
 #: ../src/business/business-gnome/gtkbuilder/dialog-billterms.glade.h:1
 msgid "Cancel your changes"
@@ -3178,7 +3178,7 @@ msgstr "<b>DefiniÃ§Ã£o de condiÃ§Ãµes</b>"
 
 #: ../src/business/business-gnome/gtkbuilder/dialog-billterms.glade.h:4
 msgid "De_scription:"
-msgstr "De_ScriÃ§Ã£o:"
+msgstr "De_scriÃ§Ã£o:"
 
 #: ../src/business/business-gnome/gtkbuilder/dialog-billterms.glade.h:5
 msgid "The description of the Billing Term, printed on invoices"
@@ -3302,7 +3302,6 @@ msgid "Choose Owner Dialog"
 msgstr "DiÃ¡logo Escolher titular"
 
 #: ../src/business/business-gnome/gtkbuilder/dialog-choose-owner.glade.h:2
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:5
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:66
 #: ../src/gnome/dialog-find-transactions2.c:154
 #: ../src/gnome/dialog-find-transactions.c:153
@@ -3313,11 +3312,11 @@ msgstr "DiÃ¡logo Escolher titular"
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:2912
 #: ../src/import-export/csv-exp/csv-transactions-export.c:419
 #: ../src/import-export/csv-imp/gnc-csv-model.c:67
-#: ../src/import-export/import-main-matcher.c:485
+#: ../src/import-export/import-main-matcher.c:477
 #: ../src/import-export/import-match-picker.c:346
 #: ../src/import-export/import-match-picker.c:386
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3489
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3526
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3495
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3532
 #: ../src/register/ledger-core/split-register-model.c:286
 #: ../src/report/business-reports/customer-summary.scm:70
 #: ../src/report/business-reports/easy-invoice.scm:112
@@ -3334,7 +3333,7 @@ msgstr "DiÃ¡logo Escolher titular"
 #: ../src/report/standard-reports/general-ledger.scm:80
 #: ../src/report/standard-reports/general-ledger.scm:100
 #: ../src/report/standard-reports/register.scm:148
-#: ../src/report/standard-reports/register.scm:419
+#: ../src/report/standard-reports/register.scm:425
 #: ../src/report/standard-reports/sx-summary.scm:447
 #: ../src/report/standard-reports/transaction.scm:388
 #: ../src/report/standard-reports/transaction.scm:444
@@ -3500,32 +3499,6 @@ msgstr "Morada de entrega"
 msgid "Question"
 msgstr "QuestÃ£o"
 
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:2
-msgid "Dummy message"
-msgstr "Mensagem de erro"
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:3
-msgid "postd"
-msgstr "emitido"
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:4
-msgid "duedate"
-msgstr "data de vencimento"
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:6
-msgid "acct"
-msgstr "conta"
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:7
-msgid "question"
-msgstr "questÃ£o"
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-date-close.glade.h:8
-#: ../src/import-export/csv-imp/assistant-csv-account-import.glade.h:25
-#: ../src/import-export/csv-imp/assistant-csv-trans-import.glade.h:46
-msgid "label"
-msgstr "etiqueta"
-
 #: ../src/business/business-gnome/gtkbuilder/dialog-employee.glade.h:2
 msgid "Employee Number: "
 msgstr "NÃºmero de empregado: "
@@ -3564,7 +3537,7 @@ msgid "Default Rate: "
 msgstr "Taxa predefinida: "
 
 #: ../src/business/business-gnome/gtkbuilder/dialog-employee.glade.h:18
-#: ../src/gnome-utils/dialog-transfer.c:1956
+#: ../src/gnome-utils/dialog-transfer.c:1976
 msgid "Credit Account"
 msgstr "Contas de crÃ©dito"
 
@@ -3747,11 +3720,11 @@ msgstr "Emitir para"
 #: ../src/gnome-utils/gnc-tree-view-price.c:436
 #: ../src/import-export/csv-exp/csv-transactions-export.c:417
 #: ../src/import-export/csv-imp/gnc-csv-model.c:65
-#: ../src/import-export/import-main-matcher.c:481
+#: ../src/import-export/import-main-matcher.c:473
 #: ../src/import-export/import-match-picker.c:344
 #: ../src/import-export/import-match-picker.c:384
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3481
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3518
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3487
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3524
 #: ../src/register/ledger-core/split-register-model.c:224
 #: ../src/report/business-reports/customer-summary.scm:67
 #: ../src/report/business-reports/easy-invoice.scm:110
@@ -3775,8 +3748,8 @@ msgstr "Emitir para"
 #: ../src/report/standard-reports/net-linechart.scm:459
 #: ../src/report/standard-reports/portfolio.scm:53
 #: ../src/report/standard-reports/register.scm:140
-#: ../src/report/standard-reports/register.scm:404
-#: ../src/report/standard-reports/register.scm:806
+#: ../src/report/standard-reports/register.scm:410
+#: ../src/report/standard-reports/register.scm:812
 #: ../src/report/standard-reports/transaction.scm:380
 #: ../src/report/standard-reports/transaction.scm:427
 #: ../src/report/standard-reports/transaction.scm:734
@@ -3845,14 +3818,14 @@ msgstr "Reembolso"
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:2898
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:2916
 #: ../src/import-export/csv-exp/csv-transactions-export.c:420
-#: ../src/import-export/import-main-matcher.c:486
+#: ../src/import-export/import-main-matcher.c:478
 #: ../src/import-export/import-match-picker.c:347
 #: ../src/import-export/import-match-picker.c:387
 #: ../src/register/ledger-core/split-register-model.c:339
 #: ../src/report/standard-reports/general-ledger.scm:81
 #: ../src/report/standard-reports/general-ledger.scm:101
 #: ../src/report/standard-reports/register.scm:150
-#: ../src/report/standard-reports/register.scm:424
+#: ../src/report/standard-reports/register.scm:430
 #: ../src/report/standard-reports/transaction.scm:408
 #: ../src/report/standard-reports/transaction.scm:447
 #: ../src/report/standard-reports/transaction.scm:448
@@ -3863,14 +3836,10 @@ msgid "Memo"
 msgstr "Nota"
 
 #: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:21
-msgid "(USD)"
-msgstr "(EUR)"
-
-#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:22
 msgid "Transaction Details"
 msgstr "Detalhes da transaÃ§Ã£o"
 
-#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:23
+#: ../src/business/business-gnome/gtkbuilder/dialog-payment.glade.h:22
 msgid "Transfer Account"
 msgstr "Conta de transferÃªncia"
 
@@ -3908,7 +3877,7 @@ msgid "Tax Table:"
 msgstr "Tabela de imposto:"
 
 #: ../src/business/business-gnome/gtkbuilder/dialog-vendor.glade.h:20
-#: ../src/gnome/window-reconcile2.c:466 ../src/gnome/window-reconcile.c:466
+#: ../src/gnome/window-reconcile2.c:466 ../src/gnome/window-reconcile.c:501
 msgid "Payment Information"
 msgstr "InformaÃ§Ã£o de pagamento"
 
@@ -3966,7 +3935,7 @@ msgid ""
 "The current transaction has been changed. Would you like to record the "
 "changes before duplicating this entry, or cancel the duplication?"
 msgstr ""
-"A transaÃ§Ã£o atual foi modificada. Quere gravar as alteraÃ§Ãµes antes de "
+"A transaÃ§Ã£o atual foi modificada. Quer gravar as alteraÃ§Ãµes antes de "
 "duplicar a entrada ou cancelar a duplicaÃ§Ã£o?"
 
 #: ../src/business/business-ledger/gncEntryLedger.c:919
@@ -4472,11 +4441,11 @@ msgstr "Moeda"
 
 #: ../src/engine/Account.c:3952
 msgid "A/Receivable"
-msgstr "A/CobrÃ¡vel"
+msgstr "C/CobrÃ¡vel"
 
 #: ../src/engine/Account.c:3953
 msgid "A/Payable"
-msgstr "A/PagÃ¡vel"
+msgstr "C/PagÃ¡vel"
 
 #: ../src/engine/Account.c:3954
 msgid "Root"
@@ -4523,7 +4492,7 @@ msgid " (posted)"
 msgstr " (emitido)"
 
 #: ../src/engine/gnc-lot.c:689 ../src/report/standard-reports/register.scm:158
-#: ../src/report/standard-reports/register.scm:439
+#: ../src/report/standard-reports/register.scm:445
 msgid "Lot"
 msgstr "Lote"
 
@@ -4849,7 +4818,7 @@ msgstr "EmprÃ©stimo"
 #: ../src/gnome/assistant-loan.c:1441
 #, c-format
 msgid "Loan Repayment Option: \"%s\""
-msgstr "OpÃ§Ã£o de repagamento de emprÃ©stimo: \"%s\""
+msgstr "OpÃ§Ã£o de pagamento de emprÃ©stimo: \"%s\""
 
 #: ../src/gnome/assistant-loan.c:1837 ../src/gnome/assistant-loan.c:2834
 msgid "Principal"
@@ -4897,7 +4866,7 @@ msgstr "Erro ao adicionar preÃ§o."
 #: ../src/gnome-utils/gnc-icons.c:38
 #: ../src/import-export/aqb/gnc-ab-utils.c:458
 #: ../src/import-export/csv-imp/gnc-csv-model.c:69
-#: ../src/import-export/import-main-matcher.c:482
+#: ../src/import-export/import-main-matcher.c:474
 #: ../src/import-export/import-match-picker.c:343
 #: ../src/import-export/qif-imp/dialog-account-picker.c:369
 #: ../src/register/ledger-core/split-register-model.c:325
@@ -4905,12 +4874,12 @@ msgstr "Erro ao adicionar preÃ§o."
 #: ../src/report/business-reports/owner-report.scm:48
 #: ../src/report/standard-reports/advanced-portfolio.scm:1042
 #: ../src/report/standard-reports/budget-flow.scm:43
-#: ../src/report/standard-reports/budget.scm:47
-#: ../src/report/standard-reports/cash-flow.scm:49
+#: ../src/report/standard-reports/budget.scm:48
+#: ../src/report/standard-reports/cash-flow.scm:51
 #: ../src/report/standard-reports/general-journal.scm:112
 #: ../src/report/standard-reports/portfolio.scm:243
 #: ../src/report/standard-reports/register.scm:153
-#: ../src/report/standard-reports/register.scm:429
+#: ../src/report/standard-reports/register.scm:435
 #: ../src/report/standard-reports/transaction.scm:450
 msgid "Account"
 msgstr "Conta"
@@ -4931,7 +4900,7 @@ msgstr "SÃmbolo"
 #: ../src/report/standard-reports/general-ledger.scm:88
 #: ../src/report/standard-reports/general-ledger.scm:108
 #: ../src/report/standard-reports/register.scm:156
-#: ../src/report/standard-reports/register.scm:434
+#: ../src/report/standard-reports/register.scm:440
 #: ../src/report/standard-reports/transaction.scm:394
 #: ../src/report/standard-reports/transaction.scm:454
 #: ../src/report/standard-reports/transaction.scm:956
@@ -5018,7 +4987,7 @@ msgstr "TransaÃ§Ãµes de fecho"
 #: ../src/gnome/dialog-find-transactions.c:116
 #: ../src/gnome/gnc-plugin-page-register2.c:484
 #: ../src/gnome/gnc-plugin-page-register.c:487
-#: ../src/gnome/window-reconcile2.c:1315 ../src/gnome/window-reconcile.c:1315
+#: ../src/gnome/window-reconcile2.c:1315 ../src/gnome/window-reconcile.c:1352
 #: ../src/import-export/csv-exp/csv-transactions-export.c:423
 msgid "Reconcile"
 msgstr "Reconciliar"
@@ -5037,7 +5006,7 @@ msgstr "PreÃ§o de aÃ§Ã£o"
 #: ../src/report/standard-reports/advanced-portfolio.scm:1071
 #: ../src/report/standard-reports/portfolio.scm:248
 #: ../src/report/standard-reports/register.scm:168
-#: ../src/report/standard-reports/register.scm:458
+#: ../src/report/standard-reports/register.scm:464
 msgid "Value"
 msgstr "Valor"
 
@@ -5077,8 +5046,8 @@ msgid "Description, Notes, or Memo"
 msgstr "DescriÃ§Ã£o, notas ou memorando"
 
 #. FIXME: All this does is leak.
-#: ../src/gnome/dialog-find-transactions2.c:221
-#: ../src/gnome/dialog-find-transactions.c:220
+#: ../src/gnome/dialog-find-transactions2.c:224
+#: ../src/gnome/dialog-find-transactions.c:223
 #: ../src/gnome-search/dialog-search.c:1449
 msgid "Find Transaction"
 msgstr "Localizar transaÃ§Ã£o"
@@ -5087,14 +5056,14 @@ msgstr "Localizar transaÃ§Ã£o"
 #: ../src/gnome/gnc-plugin-page-account-tree.c:339
 #: ../src/gnome/gnc-plugin-page-budget.c:176 ../src/gnome-utils/gnc-file.c:100
 #: ../src/gnome-utils/gnc-file.c:1034 ../src/gnome/window-reconcile2.c:1700
-#: ../src/gnome/window-reconcile.c:1700
+#: ../src/gnome/window-reconcile.c:1740
 msgid "Open"
 msgstr "Abrir"
 
 #: ../src/gnome/dialog-lot-viewer.c:857
 #: ../src/report/report-system/html-fonts.scm:89
 #: ../src/report/standard-reports/general-journal.scm:96
-#: ../src/report/standard-reports/register.scm:398
+#: ../src/report/standard-reports/register.scm:404
 msgid "Title"
 msgstr "TÃtulo"
 
@@ -5153,7 +5122,7 @@ msgid "You must select a Currency."
 msgstr "Tem de escolher uma moeda."
 
 #: ../src/gnome/dialog-price-editor.c:229
-#: ../src/gnome-utils/dialog-transfer.c:1711
+#: ../src/gnome-utils/dialog-transfer.c:1731
 msgid "You must enter a valid amount."
 msgstr "Tem de inserir uma quantia vÃ¡lida."
 
@@ -5227,15 +5196,15 @@ msgstr "Completo"
 
 #: ../src/gnome/dialog-sx-editor2.c:166 ../src/gnome/dialog-sx-editor.c:167
 #: ../src/gnome/gnc-plugin-page-sx-list.c:146
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:17
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:18
 #: ../src/gnome-utils/gnc-main-window.c:260
-#: ../src/gnome/window-reconcile2.c:2203 ../src/gnome/window-reconcile.c:2203
+#: ../src/gnome/window-reconcile2.c:2203 ../src/gnome/window-reconcile.c:2243
 #: ../src/report/report-gnome/dialog-report.glade.h:20
 msgid "_Edit"
 msgstr "_Editar"
 
 #: ../src/gnome/dialog-sx-editor2.c:167 ../src/gnome/dialog-sx-editor.c:168
-#: ../src/gnome/window-reconcile2.c:2144 ../src/gnome/window-reconcile.c:2144
+#: ../src/gnome/window-reconcile2.c:2144 ../src/gnome/window-reconcile.c:2184
 msgid "_Transaction"
 msgstr "_TransaÃ§Ã£o"
 
@@ -5254,17 +5223,17 @@ msgid ""
 "This Scheduled Transaction has changed; are you sure you want to cancel?"
 msgstr "Esta transaÃ§Ã£o agendada foi alterada. Tem a certeza que quer cancelar?"
 
-#: ../src/gnome/dialog-sx-editor2.c:648 ../src/gnome/dialog-sx-editor.c:655
+#: ../src/gnome/dialog-sx-editor2.c:648 ../src/gnome/dialog-sx-editor.c:659
 #, c-format
 msgid "Couldn't parse credit formula for split \"%s\"."
 msgstr "ImpossÃvel processar fÃ³rmula de crÃ©dito para a parcela \"%s\"."
 
-#: ../src/gnome/dialog-sx-editor2.c:676 ../src/gnome/dialog-sx-editor.c:683
+#: ../src/gnome/dialog-sx-editor2.c:676 ../src/gnome/dialog-sx-editor.c:687
 #, c-format
 msgid "Couldn't parse debit formula for split \"%s\"."
 msgstr "ImpossÃvel processar fÃ³rmula de dÃ©bito para a parcela \"%s\"."
 
-#: ../src/gnome/dialog-sx-editor2.c:710 ../src/gnome/dialog-sx-editor.c:717
+#: ../src/gnome/dialog-sx-editor2.c:710 ../src/gnome/dialog-sx-editor.c:721
 #: ../src/gnome/dialog-sx-from-trans.c:260
 msgid ""
 "The Scheduled Transaction Editor cannot automatically balance this "
@@ -5273,11 +5242,11 @@ msgstr ""
 "O editor de transaÃ§Ãµes agendadas nÃ£o consegue saldar automaticamente esta "
 "transaÃ§Ã£o. Ainda assim registÃ¡-la?"
 
-#: ../src/gnome/dialog-sx-editor2.c:731 ../src/gnome/dialog-sx-editor.c:738
+#: ../src/gnome/dialog-sx-editor2.c:731 ../src/gnome/dialog-sx-editor.c:742
 msgid "Please name the Scheduled Transaction."
 msgstr "Por favor dÃª um nome Ã  transaÃ§Ã£o agendada."
 
-#: ../src/gnome/dialog-sx-editor2.c:758 ../src/gnome/dialog-sx-editor.c:766
+#: ../src/gnome/dialog-sx-editor2.c:758 ../src/gnome/dialog-sx-editor.c:770
 #, c-format
 msgid ""
 "A Scheduled Transaction with the name \"%s\" already exists. Are you sure "
@@ -5286,13 +5255,13 @@ msgstr ""
 "JÃ¡ existe uma transaÃ§Ã£o agendada com o nome \"%s\".\n"
 "Tem a certeza que quer usar o mesmo nome para esta?"
 
-#: ../src/gnome/dialog-sx-editor2.c:786 ../src/gnome/dialog-sx-editor.c:794
+#: ../src/gnome/dialog-sx-editor2.c:786
 msgid "Scheduled Transactions with variables cannot be automatically created."
 msgstr ""
 "TransaÃ§Ãµes agendadas com variÃ¡veis\n"
 "nÃ£o podem ser criadas automaticamente."
 
-#: ../src/gnome/dialog-sx-editor2.c:796 ../src/gnome/dialog-sx-editor.c:804
+#: ../src/gnome/dialog-sx-editor2.c:796 ../src/gnome/dialog-sx-editor.c:809
 msgid ""
 "Scheduled Transactions without a template transaction cannot be "
 "automatically created."
@@ -5300,15 +5269,15 @@ msgstr ""
 "TransaÃ§Ãµes agendadas sem uma transaÃ§Ã£o modelo nÃ£o podem ser criadas "
 "automaticamente."
 
-#: ../src/gnome/dialog-sx-editor2.c:811 ../src/gnome/dialog-sx-editor.c:819
+#: ../src/gnome/dialog-sx-editor2.c:811 ../src/gnome/dialog-sx-editor.c:824
 msgid "Please provide a valid end selection."
 msgstr "Por favor indique uma seleÃ§Ã£o vÃ¡lida para o fim."
 
-#: ../src/gnome/dialog-sx-editor2.c:829 ../src/gnome/dialog-sx-editor.c:837
+#: ../src/gnome/dialog-sx-editor2.c:829 ../src/gnome/dialog-sx-editor.c:842
 msgid "There must be some number of occurrences."
 msgstr "Tem de haver um qualquer nÃºmero de ocorrÃªncias."
 
-#: ../src/gnome/dialog-sx-editor2.c:838 ../src/gnome/dialog-sx-editor.c:846
+#: ../src/gnome/dialog-sx-editor2.c:838 ../src/gnome/dialog-sx-editor.c:851
 #, c-format
 msgid ""
 "The number of remaining occurrences (%d) is greater than the number of total "
@@ -5317,7 +5286,7 @@ msgstr ""
 "O nÃºmero de ocorrÃªncias que faltam (%d) Ã© maior que o nÃºmero total de "
 "ocorrÃªncias (%d)."
 
-#: ../src/gnome/dialog-sx-editor2.c:870 ../src/gnome/dialog-sx-editor.c:878
+#: ../src/gnome/dialog-sx-editor2.c:870 ../src/gnome/dialog-sx-editor.c:883
 msgid ""
 "You have attempted to create a Scheduled Transaction which will never run. "
 "Do you really want to do this?"
@@ -5332,11 +5301,11 @@ msgid ""
 msgstr ""
 "Nota: se jÃ¡ aceitou alteraÃ§Ãµes ao modelo, Cancelar nÃ£o as vai reverter."
 
-#: ../src/gnome/dialog-sx-editor2.c:1363 ../src/gnome/dialog-sx-editor.c:1381
+#: ../src/gnome/dialog-sx-editor2.c:1363 ../src/gnome/dialog-sx-editor.c:1386
 msgid "(never)"
 msgstr "(nunca)"
 
-#: ../src/gnome/dialog-sx-editor2.c:1531 ../src/gnome/dialog-sx-editor.c:1549
+#: ../src/gnome/dialog-sx-editor2.c:1531 ../src/gnome/dialog-sx-editor.c:1554
 msgid ""
 "The current template transaction has been changed. Would you like to record "
 "the changes?"
@@ -5344,12 +5313,20 @@ msgstr ""
 "O modelo de transaÃ§Ã£o atual foi modificado.\n"
 "Quer gravar as alteraÃ§Ãµes?"
 
-#: ../src/gnome/dialog-sx-editor2.c:1784 ../src/gnome/dialog-sx-editor.c:1814
+#: ../src/gnome/dialog-sx-editor2.c:1784 ../src/gnome/dialog-sx-editor.c:1819
 #: ../src/gnome/gnc-plugin-page-sx-list.c:243
 #: ../src/gnome/gnc-plugin-page-sx-list.c:249
 msgid "Scheduled Transactions"
 msgstr "TransaÃ§Ãµes agendadas"
 
+#: ../src/gnome/dialog-sx-editor.c:798
+msgid ""
+"Scheduled Transactions with variables or involving more than one commodity "
+"cannot be automatically created."
+msgstr ""
+"TransaÃ§Ãµes agendadas com variÃ¡veis ou envolvendo mais de uma mercadoria nÃ£o "
+"podem ser criadas automaticamente."
+
 #: ../src/gnome/dialog-sx-from-trans.c:557
 msgid ""
 "The Scheduled Transaction is unbalanced. You are strongly encouraged to "
@@ -5501,7 +5478,7 @@ msgstr "Total"
 
 #: ../src/gnome/gnc-plugin-account-tree.c:59
 msgid "New Accounts _Page"
-msgstr "_PÃ¡gina de novas contas"
+msgstr "Nova _pÃ¡gina de contas"
 
 #: ../src/gnome/gnc-plugin-account-tree.c:60
 msgid "Open a new Account Tree page"
@@ -5509,7 +5486,7 @@ msgstr "Abrir uma nova pÃ¡gina de plano de contas"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:107
 msgid "New _File"
-msgstr "Novo _Ficheiro"
+msgstr "Novo _ficheiro"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:108
 msgid "Create a new file"
@@ -5533,7 +5510,7 @@ msgstr "Gravar o ficheiro atual"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:122
 msgid "Save _As..."
-msgstr "Gravar _Como..."
+msgstr "Gravar _como..."
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:123
 msgid "Save this file with a different name"
@@ -5541,7 +5518,7 @@ msgstr "Gravar este ficheiro com um nome diferente"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:127
 msgid "Re_vert"
-msgstr "Re_Verter"
+msgstr "Re_verter"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:128
 msgid "Reload the current database, reverting all unsaved changes"
@@ -5550,7 +5527,7 @@ msgstr ""
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:133
 msgid "Export _Accounts"
-msgstr "Exportar cont_As..."
+msgstr "Exportar cont_as..."
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:134
 msgid "Export the account hierarchy to a new GnuCash datafile"
@@ -5570,7 +5547,7 @@ msgstr "Localizar transaÃ§Ãµes com uma procura"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:147
 msgid "Ta_x Report Options"
-msgstr "OpÃ§Ãµes do relatÃ³rio Impostos"
+msgstr "OpÃ§Ãµes do relatÃ³rio _Impostos"
 
 #. Translators: currently implemented are *
 #. * US: income tax and                     *
@@ -5588,7 +5565,7 @@ msgstr "_TransaÃ§Ãµes agendadas"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:160
 msgid "_Scheduled Transaction Editor"
-msgstr "Editor de transaÃ§Ãµes _Agendadas"
+msgstr "Editor de tran_saÃ§Ãµes agendadas"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:161
 msgid "The list of Scheduled Transactions"
@@ -5596,7 +5573,7 @@ msgstr "A lista de transaÃ§Ãµes agendadas"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:165
 msgid "Since _Last Run..."
-msgstr "Desde a Ãºltima _ExecuÃ§Ã£o..."
+msgstr "Desde a Ãº_ltima execuÃ§Ã£o..."
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:166
 msgid "Create Scheduled Transactions since the last time run"
@@ -5604,7 +5581,7 @@ msgstr "Criar TransaÃ§Ãµes agendadas desde a Ãºltima execuÃ§Ã£o."
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:170
 msgid "_Mortgage & Loan Repayment..."
-msgstr "AmortizaÃ§Ã£o de _Hipotecas e emprÃ©stimos..."
+msgstr "A_mortizaÃ§Ã£o de hipotecas e emprÃ©stimos..."
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:171
 msgid "Setup scheduled transactions for repayment of a loan"
@@ -5623,53 +5600,65 @@ msgstr "_Fechar livros"
 msgid "Archive old data using accounting periods"
 msgstr "Arquivar dados antigos usando perÃodos contabilÃsticos"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:186
+#. Translators: This entry opens the Price Database window
+#. * and will be renamed to "_Price Database" in v.2.8
+#: ../src/gnome/gnc-plugin-basic-commands.c:188
 msgid "_Price Editor"
-msgstr "Editor de _PreÃ§os"
+msgstr "Base de dados de _cotaÃ§Ãµes"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:187
+#: ../src/gnome/gnc-plugin-basic-commands.c:189
 msgid "View and edit the prices for stocks and mutual funds"
 msgstr "Veja e edite as cotaÃ§Ãµes de aÃ§Ãµes e outros tÃtulos"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:191
+#: ../src/gnome/gnc-plugin-basic-commands.c:193
 msgid "_Security Editor"
-msgstr "Editor de _Garantias"
+msgstr "Editor de _garantias"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:192
+#: ../src/gnome/gnc-plugin-basic-commands.c:194
 msgid "View and edit the commodities for stocks and mutual funds"
 msgstr "Veja e edite os ativos de aÃ§Ãµes e outros tÃtulos"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:196
+#: ../src/gnome/gnc-plugin-basic-commands.c:198
 msgid "_Loan Repayment Calculator"
 msgstr "_Calculadora de amortizaÃ§Ã£o de emprÃ©stimos"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:197
+#: ../src/gnome/gnc-plugin-basic-commands.c:199
 msgid "Use the loan/mortgage repayment calculator"
 msgstr "Usar a calculadora de amortizaÃ§Ã£o de hipotecas/emprÃ©stimos"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:201
+#: ../src/gnome/gnc-plugin-basic-commands.c:203
 msgid "_Close Book"
 msgstr "_Fechar livro"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:202
+#: ../src/gnome/gnc-plugin-basic-commands.c:204
 msgid "Close the Book at the end of the Period"
 msgstr "Fechar o livro no final do perÃodo"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:209
+#: ../src/gnome/gnc-plugin-basic-commands.c:211
 msgid "_Tips Of The Day"
-msgstr "_SugestÃµes do dia"
+msgstr "_Dicas do dia"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:210
+#: ../src/gnome/gnc-plugin-basic-commands.c:212
 msgid "View the Tips of the Day"
-msgstr "Ver as sugestÃµes do dia"
+msgstr "Ver as dicas do dia"
+
+#: ../src/gnome/gnc-plugin-basic-commands.c:503
+#: ../src/gnome-utils/gnc-file.c:1571
+#, c-format
+msgid ""
+"Reverting will discard all unsaved changes to %s. Are you sure you want to "
+"proceed ?"
+msgstr ""
+"Reverter vai descartar todas as alteraÃ§Ãµes a %s. Tem a certeza que quer "
+"continuar?"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:546
+#: ../src/gnome/gnc-plugin-basic-commands.c:552
 msgid "There are no Scheduled Transactions to be entered at this time."
 msgstr "NÃ£o hÃ¡, de momento, transaÃ§Ãµes agendadas para registar."
 
 #. Translators: %d is the number of transactions. This is a
 #. ngettext(3) message.
-#: ../src/gnome/gnc-plugin-basic-commands.c:577
+#: ../src/gnome/gnc-plugin-basic-commands.c:583
 #, c-format
 msgid ""
 "There are no Scheduled Transactions to be entered at this time. (%d "
@@ -5718,7 +5707,7 @@ msgstr "Criar uma nova conta"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:170
 msgid "New Account _Hierarchy..."
-msgstr "Nova _Hierarquia de contas..."
+msgstr "Nova _hierarquia de contas..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:171
 msgid "Extend the current book by merging with new account type categories"
@@ -5750,7 +5739,7 @@ msgstr "Abrir a conta de registo de estilo antigo selecionada"
 #: ../src/gnome/gnc-plugin-page-account-tree.c:206
 #: ../src/gnome/gnc-plugin-page-account-tree.c:285
 msgid "Open _SubAccounts"
-msgstr "Abrir _Subcontas"
+msgstr "Abrir _subcontas"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:196
 #: ../src/gnome/gnc-plugin-page-account-tree.c:207
@@ -5761,7 +5750,7 @@ msgstr "Abrir a conta selecionada e todas as suas subcontas"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:200
 msgid "Open Old St_yle Subaccounts"
-msgstr "Abrir subcontas de _Estilo antigo"
+msgstr "Abrir subcontas de _estilo antigo"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:201
 msgid "Open the old style register selected account and all its subaccounts"
@@ -5773,7 +5762,7 @@ msgstr ""
 #: ../src/gnome/gnc-plugin-page-register2.c:241
 #: ../src/gnome/gnc-plugin-page-register.c:246
 msgid "Edit _Account"
-msgstr "Editar _Conta"
+msgstr "Editar _conta"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:215
 #: ../src/gnome/gnc-plugin-page-register2.c:242
@@ -5813,7 +5802,7 @@ msgstr "Reconciliar a conta selecionada"
 #: ../src/gnome/gnc-plugin-page-register2.c:341
 #: ../src/gnome/gnc-plugin-page-register.c:350
 msgid "_Auto-clear..."
-msgstr "Confirmar _Automaticamente..."
+msgstr "Confirmar _automaticamente..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:243
 msgid "Automatically clear individual transactions, given a cleared amount"
@@ -5824,14 +5813,14 @@ msgstr ""
 #: ../src/gnome/gnc-plugin-page-register2.c:331
 #: ../src/gnome/gnc-plugin-page-register.c:340
 #: ../src/gnome-utils/gnc-icons.c:43 ../src/gnome/window-reconcile2.c:2184
-#: ../src/gnome/window-reconcile.c:2184
+#: ../src/gnome/window-reconcile.c:2224
 msgid "_Transfer..."
-msgstr "_TransferÃªncia..."
+msgstr "_Transferir..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:248
 #: ../src/gnome/gnc-plugin-page-register2.c:332
 #: ../src/gnome/gnc-plugin-page-register.c:341
-#: ../src/gnome/window-reconcile2.c:2185 ../src/gnome/window-reconcile.c:2185
+#: ../src/gnome/window-reconcile2.c:2185 ../src/gnome/window-reconcile.c:2225
 msgid "Transfer funds from one account to another"
 msgstr "Transferir fundos de uma conta para outra"
 
@@ -5839,7 +5828,7 @@ msgstr "Transferir fundos de uma conta para outra"
 #: ../src/gnome/gnc-plugin-page-register2.c:346
 #: ../src/gnome/gnc-plugin-page-register.c:355
 msgid "Stoc_k Split..."
-msgstr "_DivisÃ£o de aÃ§Ãµes..."
+msgstr "_Desdobramento de aÃ§Ãµes..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:253
 #: ../src/gnome/gnc-plugin-page-register2.c:347
@@ -5851,7 +5840,7 @@ msgstr "Registar uma divisÃ£o ou uniÃ£o de aÃ§Ãµes"
 #: ../src/gnome/gnc-plugin-page-register2.c:351
 #: ../src/gnome/gnc-plugin-page-register.c:360
 msgid "View _Lots..."
-msgstr "Ver _Lotes..."
+msgstr "Ver _lotes..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:258
 #: ../src/gnome/gnc-plugin-page-register2.c:352
@@ -5861,10 +5850,10 @@ msgstr "Abrir uma janela para ver/editar lotes"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:262
 msgid "Check & Repair A_ccount"
-msgstr "Verificar & reparar _Conta"
+msgstr "Verificar & Corrigir _conta"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:263
-#: ../src/gnome/window-reconcile2.c:2190 ../src/gnome/window-reconcile.c:2190
+#: ../src/gnome/window-reconcile2.c:2190 ../src/gnome/window-reconcile.c:2230
 msgid ""
 "Check for and repair unbalanced transactions and orphan splits in this "
 "account"
@@ -5873,7 +5862,7 @@ msgstr ""
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:267
 msgid "Check & Repair Su_baccounts"
-msgstr "Verificar & reparar su_Bcontas"
+msgstr "Verificar & Corrigir su_bcontas"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:268
 msgid ""
@@ -5885,7 +5874,7 @@ msgstr ""
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:273
 msgid "Check & Repair A_ll"
-msgstr "Verificar & reparar _Todas"
+msgstr "Verificar & Corrigir _todas"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:274
 msgid ""
@@ -5969,20 +5958,20 @@ msgstr "Todas as transaÃ§Ãµes nesta conta serÃ£o eliminadas."
 #: ../src/gnome/gnc-plugin-page-account-tree.c:1352
 #, c-format
 msgid "All of its sub-accounts will be moved to the account %s."
-msgstr "Todas as suas subcontas serÃ¡o movidas para a conta %s."
+msgstr "Todas as suas subcontas serÃ£o movidas para a conta %s."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:1358
 msgid "All of its subaccounts will be deleted."
-msgstr "Todas as suas subcontas serÃ¡o eliminadas."
+msgstr "Todas as suas subcontas serÃ£o eliminadas."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:1363
 #, c-format
 msgid "All sub-account transactions will be moved to the account %s."
-msgstr "Todas as transaÃ§Ãµes da subconta serÃ¡o movidas para a conta %s."
+msgstr "Todas as transaÃ§Ãµes da subconta serÃ£o movidas para a conta %s."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:1369
 msgid "All sub-account transactions will be deleted."
-msgstr "Todas as transaÃ§Ãµes da subconta serÃ¡o eliminadas."
+msgstr "Todas as transaÃ§Ãµes da subconta serÃ£o eliminadas."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:1374
 msgid "Are you sure you want to do this?"
@@ -5990,7 +5979,7 @@ msgstr "Tem a certeza que deseja eliminar esta linha?"
 
 #: ../src/gnome/gnc-plugin-page-budget.c:132
 msgid "Open _Subaccounts"
-msgstr "Abrir _Subcontas"
+msgstr "Abrir _subcontas"
 
 #: ../src/gnome/gnc-plugin-page-budget.c:139
 msgid "_Delete Budget"
@@ -6038,7 +6027,7 @@ msgstr "Estimar"
 #: ../src/report/standard-reports/budget-barchart.scm:106
 #: ../src/report/standard-reports/budget-flow.scm:45
 #: ../src/report/standard-reports/budget-income-statement.scm:59
-#: ../src/report/standard-reports/budget.scm:71
+#: ../src/report/standard-reports/budget.scm:72
 msgid "Budget"
 msgstr "OrÃ§amento"
 
@@ -6057,7 +6046,7 @@ msgstr "Tem de selecionar pelo menos uma conta para estimar."
 #: ../src/gnome/gnc-plugin-page-register2.c:190
 #: ../src/gnome/gnc-plugin-page-register.c:192
 msgid "Cu_t Transaction"
-msgstr "Cortar _TransaÃ§Ã£o"
+msgstr "Cortar _transaÃ§Ã£o"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:191
 #: ../src/gnome/gnc-plugin-page-register.c:193
@@ -6067,7 +6056,7 @@ msgstr "_Copiar transaÃ§Ã£o"
 #: ../src/gnome/gnc-plugin-page-register2.c:192
 #: ../src/gnome/gnc-plugin-page-register.c:194
 msgid "_Paste Transaction"
-msgstr "Co_Lar transaÃ§Ã£o"
+msgstr "Co_lar transaÃ§Ã£o"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:193
 #: ../src/gnome/gnc-plugin-page-register.c:195
@@ -6076,7 +6065,7 @@ msgstr "_Duplicar transaÃ§Ã£o"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:194
 #: ../src/gnome/gnc-plugin-page-register.c:196
-#: ../src/gnome/gnc-split-reg.c:1337
+#: ../src/gnome/gnc-split-reg.c:1335
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:1065
 msgid "_Delete Transaction"
 msgstr "_Eliminar transaÃ§Ã£o"
@@ -6084,7 +6073,7 @@ msgstr "_Eliminar transaÃ§Ã£o"
 #: ../src/gnome/gnc-plugin-page-register2.c:195
 #: ../src/gnome/gnc-plugin-page-register.c:200
 msgid "Cu_t Split"
-msgstr "Cor_Tar parcela"
+msgstr "Cor_tar parcela"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:196
 #: ../src/gnome/gnc-plugin-page-register.c:201
@@ -6094,7 +6083,7 @@ msgstr "_Copiar parcela"
 #: ../src/gnome/gnc-plugin-page-register2.c:197
 #: ../src/gnome/gnc-plugin-page-register.c:202
 msgid "_Paste Split"
-msgstr "Co_Lar parcela"
+msgstr "Co_lar parcela"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:198
 #: ../src/gnome/gnc-plugin-page-register.c:203
@@ -6103,7 +6092,7 @@ msgstr "_Duplicar parcela"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:199
 #: ../src/gnome/gnc-plugin-page-register.c:204
-#: ../src/gnome/gnc-split-reg.c:1297
+#: ../src/gnome/gnc-split-reg.c:1295
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:1025
 msgid "_Delete Split"
 msgstr "_Eliminar parcela"
@@ -6168,7 +6157,7 @@ msgstr "_Imprimir cheques..."
 #: ../src/gnome-utils/gnc-main-window.c:305
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:1018
 msgid "Cu_t"
-msgstr "Cor_Tar"
+msgstr "Cor_tar"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:227
 #: ../src/gnome/gnc-plugin-page-register.c:232
@@ -6200,7 +6189,7 @@ msgstr "Colar a Ã¡rea de transferÃªncia na posiÃ§Ã£o do cursor"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:279
 msgid "Remo_ve All Splits"
-msgstr "Remover todas as parcelas"
+msgstr "Remo_ver todas as parcelas"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:280
 #: ../src/gnome/gnc-plugin-page-register.c:285
@@ -6220,7 +6209,7 @@ msgstr "Registar a transaÃ§Ã£o atual"
 #: ../src/gnome/gnc-plugin-page-register2.c:289
 #: ../src/gnome/gnc-plugin-page-register.c:294
 msgid "Ca_ncel Transaction"
-msgstr "Ca_Ncelar transaÃ§Ã£o"
+msgstr "Ca_ncelar transaÃ§Ã£o"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:290
 #: ../src/gnome/gnc-plugin-page-register.c:295
@@ -6240,11 +6229,11 @@ msgstr "_Desfazer esvaziar da transaÃ§Ã£o"
 #: ../src/gnome/gnc-plugin-page-register2.c:302
 #: ../src/gnome/gnc-plugin-page-register.c:307
 msgid "Add _Reversing Transaction"
-msgstr "Adicionar transaÃ§Ã£o _Reversa"
+msgstr "Adicionar transaÃ§Ã£o _reversa"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:306
 msgid "Move Transaction _Up"
-msgstr "Mover transaÃ§Ã£o a_Cima"
+msgstr "Mover transaÃ§Ã£o a_cima"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:307
 msgid ""
@@ -6257,7 +6246,7 @@ msgstr ""
 
 #: ../src/gnome/gnc-plugin-page-register2.c:311
 msgid "Move Transaction Do_wn"
-msgstr "Mover transaÃ§Ã£o a_Baixo"
+msgstr "Mover transaÃ§Ã£o a_baixo"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:312
 msgid ""
@@ -6293,7 +6282,7 @@ msgstr ""
 #: ../src/gnome/gnc-plugin-page-register2.c:356
 #: ../src/gnome/gnc-plugin-page-register.c:365
 msgid "_Blank Transaction"
-msgstr "TransaÃ§Ã£o em _Branco"
+msgstr "TransaÃ§Ã£o em _branco"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:357
 #: ../src/gnome/gnc-plugin-page-register.c:366
@@ -6303,7 +6292,7 @@ msgstr "Ir para a transaÃ§Ã£o em branco no final do registo"
 #: ../src/gnome/gnc-plugin-page-register2.c:361
 #: ../src/gnome/gnc-plugin-page-register.c:370
 msgid "Edit E_xchange Rate"
-msgstr "Editar ta_Xa de cÃ¢mbio"
+msgstr "Editar ta_xa de cÃ¢mbio"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:362
 #: ../src/gnome/gnc-plugin-page-register.c:371
@@ -6324,7 +6313,7 @@ msgstr "Ir para a transaÃ§Ã£o correspondente na outra conta"
 #: ../src/gnome/gnc-plugin-page-register2.c:371
 #: ../src/gnome/gnc-plugin-page-register.c:380
 msgid "Sche_dule..."
-msgstr "Agenda..."
+msgstr "Agen_da..."
 
 #: ../src/gnome/gnc-plugin-page-register2.c:372
 #: ../src/gnome/gnc-plugin-page-register.c:381
@@ -6365,7 +6354,7 @@ msgstr "Abrir um relatÃ³rio de registo para a transaÃ§Ã£o selecionada"
 #: ../src/gnome/gnc-plugin-page-register2.c:403
 #: ../src/gnome/gnc-plugin-page-register.c:412
 msgid "_Double Line"
-msgstr "Linha _Dupla"
+msgstr "Linha _dupla"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:404
 #: ../src/gnome/gnc-plugin-page-register.c:413
@@ -6375,7 +6364,7 @@ msgstr "Mostrar duas linhas de informaÃ§Ã£o para cada transaÃ§Ã£o"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:409
 msgid "Show _Extra Dates"
-msgstr "Mostrar datas _Extra"
+msgstr "Mostrar datas _extra"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:410
 msgid "Show entered and reconciled dates"
@@ -6395,7 +6384,7 @@ msgstr "Mostrar todas as parcelas da transaÃ§Ã£o atual"
 #: ../src/gnome/gnc-plugin-page-register2.c:427
 #: ../src/gnome/gnc-plugin-page-register.c:430
 msgid "_Basic Ledger"
-msgstr "Livro razÃ£o _BÃ¡sico"
+msgstr "Livro razÃ£o _bÃ¡sico"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:428
 #: ../src/gnome/gnc-plugin-page-register.c:431
@@ -6444,7 +6433,7 @@ msgstr "Parcelas"
 #: ../src/gnome/gnc-plugin-page-register.c:485
 #: ../src/gnome/gtkbuilder/dialog-fincalc.glade.h:24
 msgid "Schedule"
-msgstr "Agenda"
+msgstr "Agendar"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:485
 #: ../src/gnome/gnc-plugin-page-register.c:488
@@ -6534,7 +6523,7 @@ msgstr "RelatÃ³rio do livro razÃ£o geral"
 #: ../src/gnome/gnc-plugin-page-register2.c:2403
 #: ../src/gnome/gnc-plugin-page-register.c:2571
 msgid "Portfolio Report"
-msgstr "RelatÃ³rio de PortefÃ³lio"
+msgstr "RelatÃ³rio de PortfÃ³lio"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:2409
 #: ../src/gnome/gnc-plugin-page-register.c:2577
@@ -6545,12 +6534,12 @@ msgstr "RelatÃ³rio de resultados da procura"
 #: ../src/gnome/gnc-plugin-page-register.c:2581
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:134
 #: ../src/report/standard-reports/general-journal.scm:38
-#: ../src/report/standard-reports/register.scm:888
+#: ../src/report/standard-reports/register.scm:894
 msgid "Register"
-msgstr "Registo"
+msgstr "DiÃ¡rio"
 
 #: ../src/gnome/gnc-plugin-page-register2.c:2415
-#: ../src/report/standard-reports/register.scm:400
+#: ../src/report/standard-reports/register.scm:406
 msgid "Register Report"
 msgstr "RelatÃ³rio de registo"
 
@@ -6627,7 +6616,7 @@ msgstr "Abrir o ficheiro ou localizaÃ§Ã£o associados Ã  transaÃ§Ã£o atual"
 
 #: ../src/gnome/gnc-plugin-page-register.c:284
 msgid "Remo_ve Other Splits"
-msgstr "Remo_Ver outras parcelas"
+msgstr "Remo_ver outras parcelas"
 
 #: ../src/gnome/gnc-plugin-page-register.c:329
 #: ../src/gnome-utils/gnc-main-window.c:328
@@ -6654,14 +6643,14 @@ msgstr ""
 "Tentou abrir uma conta no diÃ¡rio antigo enquanto estÃ¡ aberta no novo diÃ¡rio."
 
 #. Define the strings here to avoid typos and make changes easier.
-#: ../../gnucash-git/po/../src/gnome/gnc-plugin-page-register.c:2565
-#: ../../gnucash-git/po/../src/gnome/gnc-plugin-page-register.c:2583
-#: ../../gnucash-git/po/../src/report/standard-reports/transaction.scm:48
+#: ../src/gnome/gnc-plugin-page-register.c:2565
+#: ../src/gnome/gnc-plugin-page-register.c:2583
+#: ../src/report/standard-reports/transaction.scm:48
 msgid "Transaction Report"
 msgstr "RelatÃ³rio de transaÃ§Ãµes"
 
 #: ../src/gnome/gnc-plugin-page-register.c:3025
-#: ../src/gnome/gnc-split-reg.c:882
+#: ../src/gnome/gnc-split-reg.c:880
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:1123
 msgid "A reversing entry has already been created for this transaction."
 msgstr "JÃ¡ foi criada uma entrada reversa para esta transaÃ§Ã£o."
@@ -6742,7 +6731,7 @@ msgstr "DiÃ¡rio2 abrir conta GL"
 
 #: ../src/gnome/gnc-plugin-register.c:54
 msgid "Old St_yle General Ledger"
-msgstr "Livro razÃ£o de _Estilo antigo"
+msgstr "Livro razÃ£o de _estilo antigo"
 
 #: ../src/gnome/gnc-plugin-register.c:55
 msgid "Open an old style general ledger window"
@@ -6752,39 +6741,39 @@ msgstr "Abrir uma janela do livro razÃ£o de estilo antigo"
 msgid "Open general ledger window"
 msgstr "Abrir uma janela do livro razÃ£o"
 
-#: ../src/gnome/gnc-split-reg2.c:625 ../src/gnome/gnc-split-reg.c:636
+#: ../src/gnome/gnc-split-reg2.c:625 ../src/gnome/gnc-split-reg.c:634
 msgid "<No information>"
 msgstr "<sem informaÃ§Ã£o>"
 
-#: ../src/gnome/gnc-split-reg2.c:764 ../src/gnome/gnc-split-reg.c:1624
+#: ../src/gnome/gnc-split-reg2.c:764 ../src/gnome/gnc-split-reg.c:1622
 msgid "Balancing entry from reconcilation"
 msgstr "A saldar entrada a partir da reconciliaÃ§Ã£o"
 
-#: ../src/gnome/gnc-split-reg2.c:935 ../src/gnome/gnc-split-reg.c:2082
+#: ../src/gnome/gnc-split-reg2.c:935 ../src/gnome/gnc-split-reg.c:2070
 msgid "Present:"
 msgstr "Atual:"
 
-#: ../src/gnome/gnc-split-reg2.c:936 ../src/gnome/gnc-split-reg.c:2083
+#: ../src/gnome/gnc-split-reg2.c:936 ../src/gnome/gnc-split-reg.c:2071
 msgid "Future:"
 msgstr "Futuro:"
 
-#: ../src/gnome/gnc-split-reg2.c:937 ../src/gnome/gnc-split-reg.c:2084
+#: ../src/gnome/gnc-split-reg2.c:937 ../src/gnome/gnc-split-reg.c:2072
 msgid "Cleared:"
 msgstr "Confirmado:"
 
-#: ../src/gnome/gnc-split-reg2.c:938 ../src/gnome/gnc-split-reg.c:2085
+#: ../src/gnome/gnc-split-reg2.c:938 ../src/gnome/gnc-split-reg.c:2073
 msgid "Reconciled:"
 msgstr "Reconciliado:"
 
-#: ../src/gnome/gnc-split-reg2.c:939 ../src/gnome/gnc-split-reg.c:2086
+#: ../src/gnome/gnc-split-reg2.c:939 ../src/gnome/gnc-split-reg.c:2074
 msgid "Projected Minimum:"
 msgstr "MÃnimo previsto:"
 
-#: ../src/gnome/gnc-split-reg2.c:943 ../src/gnome/gnc-split-reg.c:2090
+#: ../src/gnome/gnc-split-reg2.c:943 ../src/gnome/gnc-split-reg.c:2078
 msgid "Shares:"
 msgstr "AÃ§Ãµes:"
 
-#: ../src/gnome/gnc-split-reg2.c:944 ../src/gnome/gnc-split-reg.c:2091
+#: ../src/gnome/gnc-split-reg2.c:944 ../src/gnome/gnc-split-reg.c:2079
 msgid "Current Value:"
 msgstr "Valor atual:"
 
@@ -6801,11 +6790,11 @@ msgstr ""
 "O diÃ¡rio mostrado Ã© para A pagar ou A receber. Alterar as entradas pode "
 "causar danos, por favor use as opÃ§Ãµes de negÃ³cios para alterar as entradas."
 
-#: ../src/gnome/gnc-split-reg2.c:1068 ../src/gnome/gnc-split-reg.c:2165
+#: ../src/gnome/gnc-split-reg2.c:1068 ../src/gnome/gnc-split-reg.c:2153
 msgid "This account register is read-only."
 msgstr "Este diÃ¡rio de conta Ã© sÃ³ de leitura."
 
-#: ../src/gnome/gnc-split-reg2.c:1111 ../src/gnome/gnc-split-reg.c:2208
+#: ../src/gnome/gnc-split-reg2.c:1111 ../src/gnome/gnc-split-reg.c:2196
 msgid ""
 "This account may not be edited. If you want to edit transactions in this "
 "register, please open the account options and turn off the placeholder "
@@ -6814,7 +6803,7 @@ msgstr ""
 "Esta conta nÃ£o pode ser editada. Se quiser editar transaÃ§Ãµes neste diÃ¡rio, "
 "por favor abra as opÃ§Ãµes da conta e desmarque a opÃ§Ã£o Marcador de posiÃ§Ã£o."
 
-#: ../src/gnome/gnc-split-reg2.c:1118 ../src/gnome/gnc-split-reg.c:2215
+#: ../src/gnome/gnc-split-reg2.c:1118 ../src/gnome/gnc-split-reg.c:2203
 msgid ""
 "One of the sub-accounts selected may not be edited. If you want to edit "
 "transactions in this register, please open the sub-account options and turn "
@@ -6826,33 +6815,33 @@ msgstr ""
 "opÃ§Ã£o Marcador de posiÃ§Ã£o. Opcionalmente pode tambÃ©m abrir uma conta "
 "individual em vez de um conjunto de contas."
 
-#: ../src/gnome/gnc-split-reg.c:909
+#: ../src/gnome/gnc-split-reg.c:907
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:66
 msgid "Cannot modify or delete this transaction."
 msgstr "ImpossÃvel modificar ou eliminar esta transaÃ§Ã£o."
 
-#: ../src/gnome/gnc-split-reg.c:911
+#: ../src/gnome/gnc-split-reg.c:909
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:68
 #, c-format
 msgid "This transaction is marked read-only with the comment: '%s'"
 msgstr ""
 "Esta transaÃ§Ã£o estÃ¡ marcada como sÃ³ de leitura com o comentÃ¡rio: \"%s\""
 
-#: ../src/gnome/gnc-split-reg.c:923
+#: ../src/gnome/gnc-split-reg.c:921
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:83
 msgid ""
 "The date of this transaction is older than the \"Read-Only Threshold\" set "
 "for this book. This setting can be changed in File -> Properties -> Accounts."
 msgstr ""
 "A data desta transaÃ§Ã£o Ã© anterior ao limite de ediÃ§Ã£o definido para este "
-"livro. Pode alterar esta definiÃ§Ã£o em Ficheiro > Propriedades -> Contas."
+"livro. Pode alterar esta definiÃ§Ã£o em Ficheiro -> Propriedades -> Contas."
 
-#: ../src/gnome/gnc-split-reg.c:959
+#: ../src/gnome/gnc-split-reg.c:957
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:841
 msgid "Remove the splits from this transaction?"
 msgstr "Remover as parcelas desta transaÃ§Ã£o?"
 
-#: ../src/gnome/gnc-split-reg.c:960
+#: ../src/gnome/gnc-split-reg.c:958
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:842
 msgid ""
 "This transaction contains reconciled splits. Modifying it is not a good idea "
@@ -6861,22 +6850,22 @@ msgstr ""
 "Esta transaÃ§Ã£o contÃ©m parcelas reconciliadas! ModificÃ¡-la nÃ£o Ã© boa ideia, "
 "visto que farÃ¡ com que o balanÃ§o fique errado."
 
-#: ../src/gnome/gnc-split-reg.c:987
+#: ../src/gnome/gnc-split-reg.c:985
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:888
 msgid "_Remove Splits"
 msgstr "_Remover parcelas"
 
-#: ../src/gnome/gnc-split-reg.c:1180
+#: ../src/gnome/gnc-split-reg.c:1178
 msgid "This transaction is not associated with a URI."
 msgstr "Esta transaÃ§Ã£o nÃ£o estÃ¡ associada a um URI."
 
-#: ../src/gnome/gnc-split-reg.c:1236
+#: ../src/gnome/gnc-split-reg.c:1234
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:964
 #, c-format
 msgid "Delete the split '%s' from the transaction '%s'?"
 msgstr "Eliminar a parcela \"%s\" da transaÃ§Ã£o \"%s\"?"
 
-#: ../src/gnome/gnc-split-reg.c:1237
+#: ../src/gnome/gnc-split-reg.c:1235
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:965
 msgid ""
 "You would be deleting a reconciled split! This is not a good idea as it will "
@@ -6885,12 +6874,12 @@ msgstr ""
 "Estaria a eliminar uma parcela reconciliada! Isso nÃ£o Ã© boa ideia, visto que "
 "isso farÃ¡ com que o balanÃ§o fique errado."
 
-#: ../src/gnome/gnc-split-reg.c:1240
+#: ../src/gnome/gnc-split-reg.c:1238
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:968
 msgid "You cannot delete this split."
 msgstr "ImpossÃvel eliminar esta parcela."
 
-#: ../src/gnome/gnc-split-reg.c:1241
+#: ../src/gnome/gnc-split-reg.c:1239
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:969
 msgid ""
 "This is the split anchoring this transaction to the register. You may not "
@@ -6903,22 +6892,22 @@ msgstr ""
 "ou pode navegar para um diÃ¡rio que mostre outro lado desta mesma transaÃ§Ã£o e "
 "eliminar a parcela desse diÃ¡rio."
 
-#: ../src/gnome/gnc-split-reg.c:1269
+#: ../src/gnome/gnc-split-reg.c:1267
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:997
 msgid "(no memo)"
 msgstr "(sem memorando)"
 
-#: ../src/gnome/gnc-split-reg.c:1272
+#: ../src/gnome/gnc-split-reg.c:1270
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:1000
 msgid "(no description)"
 msgstr "(sem descriÃ§Ã£o)"
 
-#: ../src/gnome/gnc-split-reg.c:1313
+#: ../src/gnome/gnc-split-reg.c:1311
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:1041
 msgid "Delete the current transaction?"
 msgstr "Eliminar a transaÃ§Ã£o atual?"
 
-#: ../src/gnome/gnc-split-reg.c:1314
+#: ../src/gnome/gnc-split-reg.c:1312
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:1042
 msgid ""
 "You would be deleting a transaction with reconciled splits! This is not a "
@@ -8898,7 +8887,7 @@ msgstr ""
 
 #: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:12
 msgid "New _Price:"
-msgstr "Novo _PreÃ§o:"
+msgstr "Novo _preÃ§o:"
 
 #: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:13
 msgid "Currenc_y:"
@@ -8932,11 +8921,11 @@ msgstr "Montante auferido"
 
 #: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:19
 msgid "<b>_Income Account</b>"
-msgstr "<b>Conta de _Receitas</b>"
+msgstr "<b>Conta de _receitas</b>"
 
 #: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:20
 msgid "<b>A_sset Account</b>"
-msgstr "<b>Conta de _Ativo</b>"
+msgstr "<b>Conta de _ativo</b>"
 
 #: ../src/gnome/gtkbuilder/assistant-stock-split.glade.h:21
 msgid "Cash in Lieu"
@@ -9154,7 +9143,7 @@ msgstr "_Novo lote"
 
 #: ../src/gnome/gtkbuilder/dialog-lot-viewer.glade.h:13
 msgid "Scrub _Account"
-msgstr "Limpar _Conta"
+msgstr "Limpar _conta"
 
 #: ../src/gnome/gtkbuilder/dialog-lot-viewer.glade.h:14
 msgid "Scrub the highlighted lot"
@@ -9202,7 +9191,7 @@ msgstr ""
 
 #: ../src/gnome/gtkbuilder/dialog-new-user.glade.h:5
 msgid "C_reate a new set of accounts"
-msgstr "C_Riar um novo conjunto de contas"
+msgstr "C_riar um novo conjunto de contas"
 
 #: ../src/gnome/gtkbuilder/dialog-new-user.glade.h:6
 msgid "_Import my QIF files"
@@ -9210,7 +9199,7 @@ msgstr "_Importar os meus ficheiros QIF"
 
 #: ../src/gnome/gtkbuilder/dialog-new-user.glade.h:7
 msgid "_Open the new user tutorial"
-msgstr "_Abrir o Manual de novo utilizador"
+msgstr "_Abrir o manual de novo utilizador"
 
 #: ../src/gnome/gtkbuilder/dialog-price.glade.h:1
 msgid ""
@@ -9222,7 +9211,7 @@ msgstr ""
 
 #: ../src/gnome/gtkbuilder/dialog-price.glade.h:2
 msgid "Delete _manually entered prices"
-msgstr "Eliminar _Manualmente preÃ§os inseridos"
+msgstr "Eliminar _manualmente preÃ§os inseridos"
 
 #: ../src/gnome/gtkbuilder/dialog-price.glade.h:3
 msgid ""
@@ -9254,12 +9243,12 @@ msgstr "Editor de cotaÃ§Ãµes"
 
 #: ../src/gnome/gtkbuilder/dialog-price.glade.h:8
 msgid "_Namespace:"
-msgstr "EspaÃ§o de _Nome:"
+msgstr "EspaÃ§o de _nome:"
 
 #: ../src/gnome/gtkbuilder/dialog-price.glade.h:9
 #: ../src/gnome-utils/dialog-commodity.c:289
 msgid "_Security:"
-msgstr "_Valor mobiliÃ¡rio:"
+msgstr "_Garantia:"
 
 #: ../src/gnome/gtkbuilder/dialog-price.glade.h:10
 #: ../src/gnome-utils/dialog-commodity.c:294
@@ -9275,55 +9264,60 @@ msgid "_Price:"
 msgstr "_PreÃ§o:"
 
 #: ../src/gnome/gtkbuilder/dialog-price.glade.h:14
+#: ../src/report/standard-reports/price-scatter.scm:96
+msgid "Price Database"
+msgstr "Base de dados de preÃ§o"
+
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:15
 msgid "Add a new price."
 msgstr "Adicionar nova cotaÃ§Ã£o."
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:15
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:16
 msgid "Remove the current price."
 msgstr "Remover a cotaÃ§Ã£o atual."
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:16
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:17
 msgid "Edit the current price."
 msgstr "Editar a cotaÃ§Ã£o atual."
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:18
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:19
 msgid "Remove prices older than a user-entered date."
 msgstr "Remover cotaÃ§Ãµes anteriores Ã  data indicada."
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:19
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:20
 msgid "Remove _Old"
-msgstr "Remover _Antigo..."
+msgstr "Remover _antigo..."
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:20
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:21
 msgid "Get new online quotes for stock accounts."
 msgstr "Obter cotaÃ§Ãµes online para as contas de aÃ§Ãµes."
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:21
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:22
 msgid "Get _Quotes"
-msgstr "Obter _CotaÃ§Ãµes"
+msgstr "Obter _cotaÃ§Ãµes"
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:22
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:23
 msgid "Bid"
 msgstr "Compra"
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:23
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:24
 msgid "Ask"
 msgstr "Venda"
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:24
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:25
 msgid "Last"
 msgstr "Ãšltimo"
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:25
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:26
 msgid "Net Asset Value"
 msgstr "Valor ativo lÃquido"
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:27
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:28
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:26
 msgid "Dummy commodity Line"
 msgstr "Linha de mercadoria fictÃcia"
 
-#: ../src/gnome/gtkbuilder/dialog-price.glade.h:28
+#: ../src/gnome/gtkbuilder/dialog-price.glade.h:29
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:27
 msgid "Dummy namespace Line"
 msgstr "Linha de espaÃ§o de nome fictÃcia"
@@ -9353,11 +9347,11 @@ msgstr "_Formato do cheque:"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:5
 msgid "Check po_sition:"
-msgstr "Po_SiÃ§Ã£o do cheque:"
+msgstr "Po_siÃ§Ã£o do cheque:"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:6
 msgid "_Date format:"
-msgstr "Formato da _Data:"
+msgstr "Formato da _data:"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:7
 msgid ""
@@ -9375,7 +9369,7 @@ msgstr "_EndereÃ§o:"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:11
 msgid "Checks on first _page:"
-msgstr "Cheques na 1Âª _PÃ¡gina:"
+msgstr "Cheques na 1Âª _pÃ¡gina:"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:13
 msgid "x"
@@ -9395,11 +9389,11 @@ msgstr "_Montante (por extemo):"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:18
 msgid "Amount (_numbers):"
-msgstr "Montante (_Valor):"
+msgstr "Montante (_valor):"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:19
 msgid "_Notes:"
-msgstr "Nota_:"
+msgstr "_Nota:"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:20
 msgid "_Units:"
@@ -9427,7 +9421,7 @@ msgstr "Graus"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:26
 msgid "_Save format"
-msgstr "Formato de _GravaÃ§Ã£o"
+msgstr "Formato de _gravaÃ§Ã£o"
 
 #: ../src/gnome/gtkbuilder/dialog-print-check.glade.h:27
 msgid "_Address:"
@@ -9537,7 +9531,7 @@ msgstr ""
 
 #: ../src/gnome/gtkbuilder/dialog-sx.glade.h:10
 msgid "_Auto-create new transactions"
-msgstr "Criar novas transaÃ§Ãµes _Automaticamente"
+msgstr "Criar novas transaÃ§Ãµes _automaticamente"
 
 #: ../src/gnome/gtkbuilder/dialog-sx.glade.h:11
 msgid "Set the 'auto-create' flag on newly created scheduled transactions."
@@ -9545,7 +9539,7 @@ msgstr "Definir a bandeira\"auto-create\" em novas transaÃ§Ãµes agendadas."
 
 #: ../src/gnome/gtkbuilder/dialog-sx.glade.h:12
 msgid "Crea_te in advance:"
-msgstr "Criar an_Tecipadamente:"
+msgstr "Criar an_tecipadamente:"
 
 #: ../src/gnome/gtkbuilder/dialog-sx.glade.h:13
 msgid "R_emind in advance:"
@@ -9768,7 +9762,7 @@ msgstr "<b>Origem do nome do pagador</b>"
 
 #: ../src/gnome/gtkbuilder/dialog-tax-info.glade.h:18
 msgid "C_urrent Account"
-msgstr "Conta at_Ual"
+msgstr "Conta at_ual"
 
 #: ../src/gnome/gtkbuilder/dialog-tax-info.glade.h:19
 msgid "_Parent Account"
@@ -9872,13 +9866,13 @@ msgstr "InÃcio:"
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:10
 #: ../src/import-export/csv-exp/assistant-csv-export.glade.h:26
 msgid "_Earliest"
-msgstr "Mais recent_E"
+msgstr "Mais recent_e"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:10
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:11
 #: ../src/import-export/csv-exp/assistant-csv-export.glade.h:27
 msgid "Choo_se Date:"
-msgstr "E_Scolher data:"
+msgstr "E_scolher data:"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:11
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:12
@@ -9890,7 +9884,7 @@ msgstr "_Hoje"
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:13
 #: ../src/import-export/csv-exp/assistant-csv-export.glade.h:29
 msgid "_Latest"
-msgstr "Ãš_Ltima"
+msgstr "Ãš_ltima"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:13
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:14
@@ -9902,7 +9896,7 @@ msgstr "Fim:"
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:15
 #: ../src/import-export/csv-exp/assistant-csv-export.glade.h:31
 msgid "C_hoose Date:"
-msgstr "Escol_Her data:"
+msgstr "Escol_her data:"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:15
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:16
@@ -9924,7 +9918,7 @@ msgstr "_Reconciliada"
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:19
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:20
 msgid "C_leared"
-msgstr "C_Onfirmado"
+msgstr "C_onfirmado"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:20
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:21
@@ -9939,12 +9933,12 @@ msgstr "_Suspensa"
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:22
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:23
 msgid "Select _All"
-msgstr "Selecionar _Tudo"
+msgstr "Selecionar _tudo"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:24
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:25
 msgid "Sa_ve Filter"
-msgstr "Gra_Var filtro"
+msgstr "Gra_var filtro"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:25
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:51
@@ -9958,7 +9952,7 @@ msgstr "Motivo para esvaziar a transaÃ§Ã£o:"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:5
 msgid "_Transaction Number:"
-msgstr "NÃºmero de _TransaÃ§Ã£o:"
+msgstr "NÃºmero de _transaÃ§Ã£o:"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:26
 msgid "Sort register by..."
@@ -9966,7 +9960,7 @@ msgstr "Ordenar diÃ¡rio por..."
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:27
 msgid "_Standard Order"
-msgstr "Ordem _PadrÃ£o"
+msgstr "Ordem _padrÃ£o"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:28
 msgid "Keep normal account order."
@@ -9995,7 +9989,7 @@ msgstr ""
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:35
 msgid "Num_ber"
-msgstr "NÃºmer_O"
+msgstr "NÃºmer_o"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:36
 msgid "Sort by number."
@@ -10045,7 +10039,7 @@ msgstr "Ordenar por campo de notas."
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:47
 msgid "Sa_ve Sort Order"
-msgstr "Gra_Var ordenaÃ§Ã£o"
+msgstr "Gra_var ordenaÃ§Ã£o"
 
 #: ../src/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:48
 msgid "Save the sort order for this register."
@@ -10078,16 +10072,24 @@ msgstr "_Data do documento:"
 
 #. starting balance title/value
 #: ../src/gnome/gtkbuilder/window-reconcile.glade.h:3
-#: ../src/gnome/window-reconcile2.c:1810 ../src/gnome/window-reconcile.c:1810
+#: ../src/gnome/window-reconcile2.c:1810 ../src/gnome/window-reconcile.c:1850
 msgid "Starting Balance:"
 msgstr "BalanÃ§o inicial:"
 
 #: ../src/gnome/gtkbuilder/window-reconcile.glade.h:5
 msgid "Include _subaccounts"
-msgstr "Incluir _Subcontas"
+msgstr "Incluir _subcontas"
 
 #: ../src/gnome/gtkbuilder/window-reconcile.glade.h:6
-#: ../src/gnome/window-reconcile2.c:762 ../src/gnome/window-reconcile.c:762
+msgid ""
+"Include all descendant accounts in the reconcile. All of them must use the "
+"same commodity as this one."
+msgstr ""
+"Incluir todas as contas-filho na reconciliaÃ§Ã£o. Todas tÃªm de usar a mesma "
+"mercadoria que esta conta."
+
+#: ../src/gnome/gtkbuilder/window-reconcile.glade.h:7
+#: ../src/gnome/window-reconcile2.c:762 ../src/gnome/window-reconcile.c:799
 msgid "Enter _Interest Payment..."
 msgstr "_Inserir pagamento de juros..."
 
@@ -10205,7 +10207,7 @@ msgid "matches no accounts"
 msgstr "igual a nenhuma conta"
 
 #: ../src/gnome-search/search-account.c:219
-#: ../src/report/standard-reports/cash-flow.scm:409
+#: ../src/report/standard-reports/cash-flow.scm:260
 msgid "Selected Accounts"
 msgstr "Contas selecionadas"
 
@@ -10352,7 +10354,7 @@ msgstr "Tem de indicar um texto de procura."
 
 #: ../src/gnome-search/search-string.c:220
 #: ../src/import-export/csv-imp/csv-account-import.c:112
-#: ../src/plugins/bi_import/dialog-bi-import.c:122
+#: ../src/plugins/bi_import/dialog-bi-import.c:123
 #: ../src/plugins/customer_import/dialog-customer-import.c:102
 #, c-format
 msgid ""
@@ -10732,16 +10734,16 @@ msgstr ""
 
 #: ../src/gnome-utils/dialog-commodity.c:284
 msgid "Select security/currency"
-msgstr "Selecione moeda/tÃtulo "
+msgstr "Selecione a garantia/moeda"
 
 #: ../src/gnome-utils/dialog-commodity.c:285
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:14
 msgid "_Security/currency:"
-msgstr "_TÃtulo/Moeda:"
+msgstr "_Garantia/Moeda:"
 
 #: ../src/gnome-utils/dialog-commodity.c:288
 msgid "Select security"
-msgstr "Selecione tÃtulo"
+msgstr "Selecione a garantia"
 
 #: ../src/gnome-utils/dialog-commodity.c:293
 msgid "Select currency"
@@ -10766,15 +10768,15 @@ msgstr "InformaÃ§Ã£o da moeda"
 
 #: ../src/gnome-utils/dialog-commodity.c:1048
 msgid "Edit security"
-msgstr "Editar tÃtulo"
+msgstr "Editar garantia"
 
 #: ../src/gnome-utils/dialog-commodity.c:1048
 msgid "New security"
-msgstr "Novo tÃtulo"
+msgstr "Nova garantia"
 
 #: ../src/gnome-utils/dialog-commodity.c:1049
 msgid "Security Information"
-msgstr "InformaÃ§Ã£o do tÃtulo"
+msgstr "InformaÃ§Ã£o da garantia"
 
 #: ../src/gnome-utils/dialog-commodity.c:1325
 msgid "You may not create a new national currency."
@@ -10817,87 +10819,87 @@ msgstr "Gravar como..."
 msgid "Export"
 msgstr "Exportar"
 
-#: ../src/gnome-utils/dialog-options.c:811
-#: ../src/gnome-utils/dialog-options.c:953
+#: ../src/gnome-utils/dialog-options.c:813
+#: ../src/gnome-utils/dialog-options.c:955
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: ../src/gnome-utils/dialog-options.c:813
+#: ../src/gnome-utils/dialog-options.c:815
 msgid "Select all accounts."
 msgstr "Selecionar todas as contas."
 
-#: ../src/gnome-utils/dialog-options.c:818
-#: ../src/gnome-utils/dialog-options.c:960
+#: ../src/gnome-utils/dialog-options.c:820
+#: ../src/gnome-utils/dialog-options.c:962
 msgid "Clear All"
 msgstr "Limpar tudo"
 
-#: ../src/gnome-utils/dialog-options.c:820
+#: ../src/gnome-utils/dialog-options.c:822
 msgid "Clear the selection and unselect all accounts."
 msgstr "Limpar a seleÃ§Ã£o e remover a seleÃ§Ã£o de todas as contas."
 
-#: ../src/gnome-utils/dialog-options.c:825
+#: ../src/gnome-utils/dialog-options.c:827
 msgid "Select Children"
 msgstr "Selecionar filhos"
 
-#: ../src/gnome-utils/dialog-options.c:827
+#: ../src/gnome-utils/dialog-options.c:829
 msgid "Select all descendents of selected account."
 msgstr "Selecionar todas as contas-filho da conta selecionada."
 
-#: ../src/gnome-utils/dialog-options.c:833
-#: ../src/gnome-utils/dialog-options.c:967
+#: ../src/gnome-utils/dialog-options.c:835
+#: ../src/gnome-utils/dialog-options.c:969
 msgid "Select Default"
 msgstr "Selecionar predefiniÃ§Ã£o"
 
-#: ../src/gnome-utils/dialog-options.c:835
+#: ../src/gnome-utils/dialog-options.c:837
 msgid "Select the default account selection."
 msgstr "Selecionar a seleÃ§Ã£o predefinida de contas."
 
-#: ../src/gnome-utils/dialog-options.c:849
+#: ../src/gnome-utils/dialog-options.c:851
 msgid "Show Hidden Accounts"
 msgstr "Mostrar contas ocultas"
 
-#: ../src/gnome-utils/dialog-options.c:851
+#: ../src/gnome-utils/dialog-options.c:853
 msgid "Show accounts that have been marked hidden."
 msgstr "Mostrar contas que foram marcadas como ocultas."
 
-#: ../src/gnome-utils/dialog-options.c:955
+#: ../src/gnome-utils/dialog-options.c:957
 msgid "Select all entries."
 msgstr "Selecionar todas as entradas."
 
-#: ../src/gnome-utils/dialog-options.c:962
+#: ../src/gnome-utils/dialog-options.c:964
 msgid "Clear the selection and unselect all entries."
 msgstr "Limpar a seleÃ§Ã£o e remover a seleÃ§Ã£o de todas as entradas."
 
-#: ../src/gnome-utils/dialog-options.c:969
+#: ../src/gnome-utils/dialog-options.c:971
 msgid "Select the default selection."
 msgstr "Selecionar a seleÃ§Ã£o predefinida."
 
 #. The reset button on each option page
-#: ../src/gnome-utils/dialog-options.c:1129
+#: ../src/gnome-utils/dialog-options.c:1131
 msgid "Reset defaults"
 msgstr "Repor predefiniÃ§Ãµes"
 
-#: ../src/gnome-utils/dialog-options.c:1131
+#: ../src/gnome-utils/dialog-options.c:1133
 msgid "Reset all values to their defaults."
 msgstr "Repor todos os valores nas predefiniÃ§Ãµes."
 
-#: ../src/gnome-utils/dialog-options.c:1455
+#: ../src/gnome-utils/dialog-options.c:1457
 msgid "Page"
 msgstr "PÃ¡gina"
 
-#: ../src/gnome-utils/dialog-options.c:2070
+#: ../src/gnome-utils/dialog-options.c:2072
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../src/gnome-utils/dialog-options.c:2071
+#: ../src/gnome-utils/dialog-options.c:2073
 msgid "Clear any selected image file."
 msgstr "Limpar qualquer ficheiro de imagem selecionado."
 
-#: ../src/gnome-utils/dialog-options.c:2073
+#: ../src/gnome-utils/dialog-options.c:2075
 msgid "Select image"
 msgstr "Selecionar imagem"
 
-#: ../src/gnome-utils/dialog-options.c:2075
+#: ../src/gnome-utils/dialog-options.c:2077
 msgid "Select an image file."
 msgstr "Selecionar um ficheiro de imagem."
 
@@ -10998,27 +11000,27 @@ msgstr "Tem de inserir um preÃ§o vÃ¡lido."
 msgid "You must enter a valid `to' amount."
 msgstr "Tem de inserir um montante \"para\" vÃ¡lido."
 
-#: ../src/gnome-utils/dialog-transfer.c:1720
+#: ../src/gnome-utils/dialog-transfer.c:1740
 msgid "You must enter an amount to transfer."
 msgstr "Tem de inserir um montante para transferiri."
 
-#: ../src/gnome-utils/dialog-transfer.c:1960
+#: ../src/gnome-utils/dialog-transfer.c:1980
 msgid "Debit Account"
 msgstr "Conta de dÃ©bito"
 
-#: ../src/gnome-utils/dialog-transfer.c:1978
+#: ../src/gnome-utils/dialog-transfer.c:1998
 msgid "Transfer From"
 msgstr "Transferir de"
 
-#: ../src/gnome-utils/dialog-transfer.c:1982
+#: ../src/gnome-utils/dialog-transfer.c:2002
 msgid "Transfer To"
 msgstr "Transferir para"
 
-#: ../src/gnome-utils/dialog-transfer.c:2039
+#: ../src/gnome-utils/dialog-transfer.c:2059
 msgid "Debit Amount:"
 msgstr "Montante de dÃ©bito:"
 
-#: ../src/gnome-utils/dialog-transfer.c:2044
+#: ../src/gnome-utils/dialog-transfer.c:2064
 #: ../src/gnome-utils/gtkbuilder/dialog-transfer.glade.h:14
 msgid "To Amount:"
 msgstr "Montante de destino:"
@@ -11029,15 +11031,15 @@ msgstr "_Lembrar e nÃ£o perguntar novamente."
 
 #: ../src/gnome-utils/dialog-utils.c:548
 msgid "Don't _tell me again."
-msgstr "NÃ£o me dizer novamen_Te."
+msgstr "NÃ£o me dizer novamen_te."
 
 #: ../src/gnome-utils/dialog-utils.c:551
 msgid "Remember and don't ask me again this _session."
-msgstr "Lembrar e nÃ£o perguntar novamente nesta _SessÃ£o."
+msgstr "Lembrar e nÃ£o perguntar novamente nesta _sessÃ£o."
 
 #: ../src/gnome-utils/dialog-utils.c:552
 msgid "Don't tell me again this _session."
-msgstr "NÃ£o me dizer novamente nesta _SessÃ£o."
+msgstr "NÃ£o me dizer novamente nesta _sessÃ£o."
 
 #. create the button.
 #: ../src/gnome-utils/gnc-account-sel.c:456
@@ -11095,7 +11097,7 @@ msgstr "_Sim, desta vez"
 
 #: ../src/gnome-utils/gnc-autosave.c:117
 msgid "Yes, _always"
-msgstr "S_Im, sempre"
+msgstr "S_im, sempre"
 
 #: ../src/gnome-utils/gnc-autosave.c:118
 msgid "No, n_ever"
@@ -11103,7 +11105,7 @@ msgstr "_NÃ£o, nunca"
 
 #: ../src/gnome-utils/gnc-autosave.c:119
 msgid "_No, not this time"
-msgstr "NÃ£o, desta _Vez nÃ£o"
+msgstr "NÃ£o, desta _vez nÃ£o"
 
 #: ../src/gnome-utils/gnc-date-delta.c:218
 #: ../src/report/standard-reports/price-scatter.scm:229
@@ -11149,7 +11151,7 @@ msgstr "1 mÃªs"
 
 #: ../src/gnome-utils/gnc-dense-cal.c:288
 msgid "View:"
-msgstr "Ver:"
+msgstr "Ver: "
 
 #: ../src/gnome-utils/gnc-dense-cal.c:326
 #: ../src/report/stylesheets/stylesheet-easy.scm:439
@@ -11463,7 +11465,7 @@ msgstr[1] ""
 
 #: ../src/gnome-utils/gnc-file.c:590
 msgid "Continue _Without Saving"
-msgstr "Continuar sem gra_Var"
+msgstr "Continuar sem gra_var"
 
 #: ../src/gnome-utils/gnc-file.c:747
 #, c-format
@@ -11498,7 +11500,7 @@ msgstr "_Criar novo ficheiro"
 
 #: ../src/gnome-utils/gnc-file.c:782
 msgid "Open _Anyway"
-msgstr "Abrir _Mesmo assim"
+msgstr "_Abrir mesmo assim"
 
 #. try to load once again
 #: ../src/gnome-utils/gnc-file.c:866 ../src/gnome-utils/gnc-file.c:886
@@ -11540,6 +11542,11 @@ msgstr ""
 "A base de dados foi aberta sÃ³ para leitura. Quer gravÃ¡-la num local "
 "diferente?"
 
+#: ../src/gnome-utils/gnc-file.c:1579
+#: ../src/gnome-utils/gnc-main-window.c:1220
+msgid "<unknown>"
+msgstr "<desconhecido>"
+
 #: ../src/gnome-utils/gnc-general-select.c:218
 msgid "View..."
 msgstr "Ver..."
@@ -11582,7 +11589,7 @@ msgid "_Delete Account"
 msgstr "_Eliminar conta"
 
 #: ../src/gnome-utils/gnc-icons.c:40 ../src/gnome/window-reconcile2.c:2179
-#: ../src/gnome/window-reconcile.c:2179
+#: ../src/gnome/window-reconcile.c:2219
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
@@ -11591,7 +11598,7 @@ msgid "_New Account"
 msgstr "_Nova conta"
 
 #: ../src/gnome-utils/gnc-icons.c:42 ../src/gnome/window-reconcile2.c:2174
-#: ../src/gnome/window-reconcile.c:2174
+#: ../src/gnome/window-reconcile.c:2214
 msgid "_Open Account"
 msgstr "_Abrir conta"
 
@@ -11614,7 +11621,7 @@ msgstr "_Ficheiro"
 
 #: ../src/gnome-utils/gnc-main-window.c:263
 msgid "Tra_nsaction"
-msgstr "Tra_NsaÃ§Ã£o"
+msgstr "Tra_nsaÃ§Ã£o"
 
 #: ../src/gnome-utils/gnc-main-window.c:264
 msgid "_Reports"
@@ -11622,11 +11629,11 @@ msgstr "_RelatÃ³rios"
 
 #: ../src/gnome-utils/gnc-main-window.c:265
 msgid "_Tools"
-msgstr "Ferramen_Tas"
+msgstr "Ferramen_tas"
 
 #: ../src/gnome-utils/gnc-main-window.c:266
 msgid "E_xtensions"
-msgstr "E_XtensÃµes"
+msgstr "E_xtensÃµes"
 
 #: ../src/gnome-utils/gnc-main-window.c:267
 msgid "_Windows"
@@ -11635,10 +11642,10 @@ msgstr "_Janelas"
 #. Add the help button for the matcher
 #: ../src/gnome-utils/gnc-main-window.c:268
 #: ../src/gnome/window-reconcile2.c:2145 ../src/gnome/window-reconcile2.c:2226
-#: ../src/gnome/window-reconcile.c:2145 ../src/gnome/window-reconcile.c:2226
+#: ../src/gnome/window-reconcile.c:2185 ../src/gnome/window-reconcile.c:2266
 #: ../src/import-export/csv-imp/assistant-csv-trans-import.c:1531
 msgid "_Help"
-msgstr "A_Juda"
+msgstr "A_juda"
 
 #: ../src/gnome-utils/gnc-main-window.c:275
 msgid "_Print..."
@@ -11650,7 +11657,7 @@ msgstr "Fechar pÃ¡gina atualmente ativa"
 
 #: ../src/gnome-utils/gnc-main-window.c:282
 msgid "Pa_ge Setup..."
-msgstr "Confi_Gurar pÃ¡gina..."
+msgstr "Confi_gurar pÃ¡gina..."
 
 #: ../src/gnome-utils/gnc-main-window.c:283
 msgid "Specify the page size and orientation for printing"
@@ -11658,7 +11665,7 @@ msgstr "Especificar o tamanho e orientaÃ§Ã£o da pÃ¡gina para impressÃ£o"
 
 #: ../src/gnome-utils/gnc-main-window.c:287
 msgid "Proper_ties"
-msgstr "Proprie_Dades"
+msgstr "Proprie_dades"
 
 #: ../src/gnome-utils/gnc-main-window.c:288
 msgid "Edit the properties of the current file"
@@ -11682,7 +11689,7 @@ msgstr "Sair da aplicaÃ§Ã£o"
 
 #: ../src/gnome-utils/gnc-main-window.c:320
 msgid "Pr_eferences"
-msgstr "Pr_EferÃªncias"
+msgstr "Pr_eferÃªncias"
 
 #: ../src/gnome-utils/gnc-main-window.c:321
 msgid "Edit the global preferences of GnuCash"
@@ -11698,13 +11705,13 @@ msgstr "Selecionar os tipos de contas a serem mostradas."
 
 #. Actions menu
 #: ../src/gnome-utils/gnc-main-window.c:343
-#: ../src/gnome/window-reconcile2.c:2189 ../src/gnome/window-reconcile.c:2189
+#: ../src/gnome/window-reconcile2.c:2189 ../src/gnome/window-reconcile.c:2229
 msgid "_Check & Repair"
 msgstr "Verificar & _Corrigir"
 
 #: ../src/gnome-utils/gnc-main-window.c:345
 msgid "Reset _Warnings..."
-msgstr "Repor _Avisos..."
+msgstr "Repor _avisos..."
 
 #: ../src/gnome-utils/gnc-main-window.c:346
 msgid "Reset the state of all warning messages so they will be shown again."
@@ -11714,7 +11721,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gnc-main-window.c:350
 msgid "Re_name Page"
-msgstr "Re_Nomear pÃ¡gina"
+msgstr "Re_nomear pÃ¡gina"
 
 #: ../src/gnome-utils/gnc-main-window.c:351
 msgid "Rename this page."
@@ -11730,7 +11737,7 @@ msgstr "Abrir uma nova janela de topo do GnuCash."
 
 #: ../src/gnome-utils/gnc-main-window.c:363
 msgid "New Window with _Page"
-msgstr "Nova janela com _PÃ¡gina"
+msgstr "Nova janela com _pÃ¡gina"
 
 #: ../src/gnome-utils/gnc-main-window.c:364
 msgid "Move the current page to a new top-level GnuCash window."
@@ -11738,7 +11745,7 @@ msgstr "Mover a pÃ¡gina atual para uma nova janela de topo do GnuCash."
 
 #: ../src/gnome-utils/gnc-main-window.c:371
 msgid "Tutorial and Concepts _Guide"
-msgstr "Tutorial e _Guia de conceitos"
+msgstr "Tutorial e _guia de conceitos"
 
 #: ../src/gnome-utils/gnc-main-window.c:372
 msgid "Open the GnuCash Tutorial"
@@ -11770,7 +11777,7 @@ msgstr "Mostrar/Ocultar a barra de ferramentas nesta janela"
 
 #: ../src/gnome-utils/gnc-main-window.c:399
 msgid "Su_mmary Bar"
-msgstr "Barra de su_MÃ¡rio"
+msgstr "Barra de su_mÃ¡rio"
 
 #: ../src/gnome-utils/gnc-main-window.c:400
 msgid "Show/hide the summary bar on this window"
@@ -11778,7 +11785,7 @@ msgstr "Mostrar/Ocultar a barra de sumÃ¡rio nesta janela"
 
 #: ../src/gnome-utils/gnc-main-window.c:404
 msgid "Stat_us Bar"
-msgstr "Barra de estad_O"
+msgstr "Barra de estad_o"
 
 #: ../src/gnome-utils/gnc-main-window.c:405
 msgid "Show/hide the status bar on this window"
@@ -11847,58 +11854,54 @@ msgstr ""
 "Se nÃ£o gravar, as alteraÃ§Ãµes dos Ãºltimos %d dias e %d horas serÃ£o "
 "descartadas."
 
-#: ../src/gnome-utils/gnc-main-window.c:1220
-msgid "<unknown>"
-msgstr "<desconhecido>"
-
 #: ../src/gnome-utils/gnc-main-window.c:1257
 msgid "Close _Without Saving"
-msgstr "Fechar _Sem gravar"
+msgstr "Fechar _sem gravar"
 
 #. Translators: This string is shown in the window title if this
 #. document is, well, read-only.
-#: ../src/gnome-utils/gnc-main-window.c:1495
+#: ../src/gnome-utils/gnc-main-window.c:1482
 msgid "(read-only)"
 msgstr "(sÃ³ de leitura)"
 
-#: ../src/gnome-utils/gnc-main-window.c:1503
+#: ../src/gnome-utils/gnc-main-window.c:1490
 msgid "Unsaved Book"
 msgstr "Livro por gravar"
 
-#: ../src/gnome-utils/gnc-main-window.c:1670
+#: ../src/gnome-utils/gnc-main-window.c:1659
 msgid "Last modified on %a, %b %e, %Y at %I:%M%P"
 msgstr "Ãšltima modificaÃ§Ã£o a %a, %b %e, %Y Ã s %I:%M%P"
 
-#: ../src/gnome-utils/gnc-main-window.c:1671
+#: ../src/gnome-utils/gnc-main-window.c:1660
 #, c-format
 msgid "Last modified on %x %X"
 msgstr "Ãšltima modificaÃ§Ã£o a %x %X"
 
 #. g_warning("got time %ld, str=%s\n", mtime, time_string);
 #. Translators: This message appears in the status bar after opening the file.
-#: ../src/gnome-utils/gnc-main-window.c:1677
+#: ../src/gnome-utils/gnc-main-window.c:1666
 #, c-format
 msgid "File %s opened. %s"
 msgstr "Ficheiro %s aberto. %s"
 
-#: ../src/gnome-utils/gnc-main-window.c:2701
+#: ../src/gnome-utils/gnc-main-window.c:2690
 msgid "Unable to save to database."
 msgstr "ImpossÃvel gravar na base de dados."
 
-#: ../src/gnome-utils/gnc-main-window.c:2703
+#: ../src/gnome-utils/gnc-main-window.c:2692
 msgid "Unable to save to database: Book is marked read-only."
 msgstr "ImpossÃvel gravar na base de dados: livro sÃ³ de leitura."
 
-#: ../src/gnome-utils/gnc-main-window.c:3992
+#: ../src/gnome-utils/gnc-main-window.c:3981
 msgid "Book Options"
 msgstr "OpÃ§Ãµes do livro"
 
-#: ../src/gnome-utils/gnc-main-window.c:4378
+#: ../src/gnome-utils/gnc-main-window.c:4367
 msgid "The GnuCash personal finance manager. The GNU way to manage your money!"
 msgstr ""
 "O gestor de finanÃ§as pessoais GnuCash. O modo GNU de gerir o seu dinheiro!"
 
-#: ../src/gnome-utils/gnc-main-window.c:4380
+#: ../src/gnome-utils/gnc-main-window.c:4369
 msgid "Â© 1997-2015 Contributors"
 msgstr "Â© 1997-2014 Contribuidores"
 
@@ -11906,7 +11909,7 @@ msgstr "Â© 1997-2014 Contribuidores"
 #. * Enter your name or that of your team and an email contact for feedback.
 #. * The string can have multiple rows, so you can also add a list of
 #. * contributors.
-#: ../src/gnome-utils/gnc-main-window.c:4417
+#: ../src/gnome-utils/gnc-main-window.c:4406
 msgid "translator_credits"
 msgstr "Pedro Albuquerque <palbuquerque73 at gmail.com>"
 
@@ -11998,22 +12001,22 @@ msgstr "A transaÃ§Ã£o atual nÃ£o estÃ¡ saldada."
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:287
 #: ../src/register/ledger-core/split-register-control.c:137
 msgid "Balance it _manually"
-msgstr "Saldar _Manualmente"
+msgstr "Saldar _manualmente"
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:289
 #: ../src/register/ledger-core/split-register-control.c:139
 msgid "Let GnuCash _add an adjusting split"
-msgstr "Permitir ao GnuCash _Adicionar uma parcela de ajuste"
+msgstr "Permitir ao GnuCash _adicionar uma parcela de ajuste"
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:294
 #: ../src/register/ledger-core/split-register-control.c:144
 msgid "Adjust current account _split total"
-msgstr "Ajustar o total das parcela_S da conta atual"
+msgstr "Aju_star o total das parcelas da conta atual"
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:300
 #: ../src/register/ledger-core/split-register-control.c:150
 msgid "Adjust _other account split total"
-msgstr "Ajustar o total das parcelas de _Outra conta"
+msgstr "Ajustar o total das parcelas de _outra conta"
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:311
 #: ../src/register/ledger-core/split-register-control.c:161
@@ -12022,21 +12025,21 @@ msgstr "_Voltar a saldar"
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:405
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:413
-#: ../src/register/ledger-core/split-register-control.c:1317
-#: ../src/register/ledger-core/split-register-control.c:1330
+#: ../src/register/ledger-core/split-register-control.c:1320
+#: ../src/register/ledger-core/split-register-control.c:1333
 msgid "This register does not support editing exchange rates."
 msgstr "Este diÃ¡rio nÃ£o suporta a ediÃ§Ã£o de taxas de cÃ¢mbio."
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:421
-#: ../src/register/ledger-core/split-register-control.c:1371
-#: ../src/register/ledger-core/split-register-control.c:1446
+#: ../src/register/ledger-core/split-register-control.c:1374
+#: ../src/register/ledger-core/split-register-control.c:1449
 msgid ""
 "You need to expand the transaction in order to modify its exchange rates."
 msgstr "Tem que expandir a transaÃ§Ã£o para poder modificar as taxas de cÃ¢mbio."
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:461
-#: ../src/register/ledger-core/split-register-control.c:1418
-#: ../src/register/ledger-core/split-register-control.c:1431
+#: ../src/register/ledger-core/split-register-control.c:1421
+#: ../src/register/ledger-core/split-register-control.c:1434
 msgid "The two currencies involved equal each other."
 msgstr "As duas moedas envolvidas igualam-se."
 
@@ -12088,12 +12091,12 @@ msgid "_Return"
 msgstr "_Voltar"
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:1781
-#: ../src/register/ledger-core/split-register-control.c:1828
+#: ../src/register/ledger-core/split-register-control.c:1831
 msgid "Mark split as unreconciled?"
 msgstr "Marcar parcela como reconciliada?"
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:1783
-#: ../src/register/ledger-core/split-register-control.c:1830
+#: ../src/register/ledger-core/split-register-control.c:1833
 msgid ""
 "You are about to mark a reconciled split as unreconciled. Doing so might "
 "make future reconciliation difficult! Continue with this change?"
@@ -12102,7 +12105,7 @@ msgstr ""
 "lo poderÃ¡ tornar reconciliaÃ§Ãµes futuras difÃceis!"
 
 #: ../src/gnome-utils/gnc-tree-control-split-reg.c:1827
-#: ../src/register/ledger-core/split-register-control.c:1847
+#: ../src/register/ledger-core/split-register-control.c:1850
 msgid "_Unreconcile"
 msgstr "_NÃ£o reconciliada"
 
@@ -12258,7 +12261,7 @@ msgstr "Cheque"
 #: ../src/report/standard-reports/price-scatter.scm:41
 #: ../src/report/standard-reports/price-scatter.scm:346
 #: ../src/report/standard-reports/register.scm:160
-#: ../src/report/standard-reports/register.scm:444
+#: ../src/report/standard-reports/register.scm:450
 #: ../src/report/standard-reports/transaction.scm:396
 #: ../src/report/standard-reports/transaction.scm:456
 #: ../src/report/standard-reports/transaction.scm:957
@@ -12578,7 +12581,7 @@ msgstr "A"
 
 #: ../src/gnome-utils/gnc-tree-view-price.c:424
 msgid "Security"
-msgstr "Valor mobiliÃ¡rio"
+msgstr "Garantia"
 
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:807
 msgid "Status Bar"
@@ -12589,7 +12592,7 @@ msgid " Scheduled "
 msgstr " Agendada "
 
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:2413
-#: ../src/register/ledger-core/split-register-control.c:1531
+#: ../src/register/ledger-core/split-register-control.c:1534
 msgid "Save the changed transaction?"
 msgstr "Gravar a transaÃ§Ã£o alterada?"
 
@@ -12601,12 +12604,12 @@ msgstr ""
 "A transaÃ§Ã£o atual foi modificada. Quer gravar as alteraÃ§Ãµes ou descartÃ¡-las?"
 
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:2453
-#: ../src/register/ledger-core/split-register-control.c:1546
+#: ../src/register/ledger-core/split-register-control.c:1549
 msgid "_Discard Changes"
 msgstr "_Descartar alteraÃ§Ãµes"
 
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:2455
-#: ../src/register/ledger-core/split-register-control.c:1548
+#: ../src/register/ledger-core/split-register-control.c:1551
 msgid "_Record Changes"
 msgstr "_Gravar alteraÃ§Ãµes"
 
@@ -12655,7 +12658,7 @@ msgid "Accounts / Void Reason"
 msgstr "Contas/Motivo para esvaziar"
 
 #: ../src/gnome-utils/gnc-tree-view-split-reg.c:2962
-#: ../src/import-export/import-main-matcher.c:492
+#: ../src/import-export/import-main-matcher.c:484
 msgid "R"
 msgstr "R"
 
@@ -13050,11 +13053,11 @@ msgstr "<b>_CodificaÃ§Ãµes do sistema</b>"
 
 #: ../src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:3
 msgid "<b>_Custom encoding</b>"
-msgstr "<b>CodificaÃ§Ã£o _Personalizada</b>"
+msgstr "<b>CodificaÃ§Ã£o _personalizada</b>"
 
 #: ../src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:4
 msgid "<b>_Selected encodings</b>"
-msgstr "<b>CodificaÃ§Ãµes _Selecionadas</b>"
+msgstr "<b>CodificaÃ§Ãµes _selecionadas</b>"
 
 #: ../src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:5
 msgid "Introduction placeholder"
@@ -13130,11 +13133,11 @@ msgstr "_DescriÃ§Ã£o:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:15
 msgid "Smallest _fraction:"
-msgstr "Menor _FraÃ§Ã£o:"
+msgstr "Menor _fraÃ§Ã£o:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:16
 msgid "Account _Color:"
-msgstr "Cor da cont_A:"
+msgstr "Cor da cont_a:"
 
 #. instantiate a default style sheet
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:17
@@ -13146,11 +13149,11 @@ msgstr "PredefiniÃ§Ã£o"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:18
 msgid "No_tes:"
-msgstr "No_Tas:"
+msgstr "No_tas:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:19
 msgid "Ta_x related"
-msgstr "Relativo a _Impostos"
+msgstr "Relativo a _impostos"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:20
 msgid ""
@@ -13197,7 +13200,7 @@ msgstr "A menor fraÃ§Ã£o desta mercadoria que pode ser referenciada."
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:26
 msgid "<b>Acco_unt Type</b>"
-msgstr "<b>Tipo de conta</b>"
+msgstr "<b>T_ipo de conta</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:27
 msgid "<b>_Parent Account</b>"
@@ -13208,7 +13211,7 @@ msgstr "<b>_Conta-mÃ£e</b>"
 #: ../src/report/report-system/report.scm:71
 #: ../src/report/standard-reports/equity-statement.scm:109
 #: ../src/report/standard-reports/equity-statement.scm:113
-#: ../src/report/standard-reports/register.scm:398
+#: ../src/report/standard-reports/register.scm:404
 #: ../src/report/standard-reports/trial-balance.scm:147
 #: ../src/report/standard-reports/trial-balance.scm:151
 #: ../src/report/stylesheets/stylesheet-easy.scm:46
@@ -13275,11 +13278,11 @@ msgstr "<b>TransaÃ§Ãµes</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:38
 msgid "M_ove to:"
-msgstr "M_Over para:"
+msgstr "M_over para:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:39
 msgid "Delete all _transactions"
-msgstr "Eliminar todas as _TransaÃ§Ãµes"
+msgstr "Eliminar todas as _transaÃ§Ãµes"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:40
 msgid ""
@@ -13308,7 +13311,7 @@ msgstr "_Mover para:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:45
 msgid "Delete all _subaccounts"
-msgstr "Eliminar todas as _Subcontas"
+msgstr "Eliminar todas as _subcontas"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:46
 msgid "<b>Sub-account Transactions</b>"
@@ -13337,7 +13340,7 @@ msgstr "Filtrar por..."
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:52
 msgid "_Default"
-msgstr "Pre_DefiniÃ§Ã£o"
+msgstr "Pre_definiÃ§Ã£o"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:53
 #: ../src/report/standard-reports/account-summary.scm:106
@@ -13347,7 +13350,7 @@ msgstr "Tipo de conta"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:54
 msgid "Show _hidden accounts"
-msgstr "Mostrar contas _Ocultas"
+msgstr "Mostrar contas _ocultas"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:55
 msgid "Show accounts which have the option \"Hidden\" checked."
@@ -13355,7 +13358,7 @@ msgstr "Mostrar contas que tÃªm o atributo \"Oculta\" marcado."
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:56
 msgid "Show _zero total accounts"
-msgstr "Mostrar contas a _Zero"
+msgstr "Mostrar contas a _zero"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-account.glade.h:57
 msgid "Show accounts which have a zero total value."
@@ -13396,7 +13399,7 @@ msgstr "DescriÃ§Ã£o:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:1
 msgid "Select security/currency "
-msgstr "Selecione tÃtulo/moeda "
+msgstr "Selecione a garantia/moeda "
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:2
 msgid "Select user information here..."
@@ -13446,7 +13449,7 @@ msgstr "<b>InformaÃ§Ã£o da origem de cotaÃ§Ãµes</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:10
 msgid "Type of quote source:"
-msgstr "Tipo de origem de cotaÃ§Ãµes:"
+msgstr "Origem das cotaÃ§Ãµes:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:11
 msgid "_Full name:"
@@ -13462,7 +13465,7 @@ msgstr "ISIN, CUSI_P ou outro cÃ³digo:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:14
 msgid "F_raction traded:"
-msgstr "F_RaÃ§Ã£o transacionada:"
+msgstr "F_raÃ§Ã£o transacionada:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:15
 msgid "Warning: Finance::Quote not installed properly."
@@ -13474,7 +13477,7 @@ msgstr "_Obter cotaÃ§Ãµes online"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:17
 msgid "Si_ngle:"
-msgstr "Ãš_Nica:"
+msgstr "Ãš_nica:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:18
 msgid ""
@@ -13515,7 +13518,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:23
 msgid "Time_zone:"
-msgstr "Fuso _HorÃ¡rio:"
+msgstr "_Fuso horÃ¡rio:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-commodity.glade.h:24
 msgid ""
@@ -13535,7 +13538,7 @@ msgstr "<b>Formato da data:</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-file-access.glade.h:2
 msgid "Open _Read-Only"
-msgstr "Ab_Rrir sÃ³ para leitura"
+msgstr "Ab_rir sÃ³ para leitura"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-file-access.glade.h:3
 msgid "<b>File</b>"
@@ -13579,7 +13582,7 @@ msgstr "<b>ConteÃºdo da barra de sumÃ¡rio</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:3
 msgid "Include _grand total"
-msgstr "Incluir total _Geral"
+msgstr "Incluir total _geral"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:4
 msgid ""
@@ -13590,7 +13593,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:5
 msgid "Include _non-currency totals"
-msgstr "Incluir totais de _NÃ£o moeda"
+msgstr "Incluir totais de _nÃ£o moeda"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:6
 msgid ""
@@ -13628,7 +13631,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:13
 msgid "Re_lative:"
-msgstr "Re_Lativa:"
+msgstr "Re_lativa:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:14
 msgid ""
@@ -13640,7 +13643,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:15
 msgid "Ab_solute:"
-msgstr "Ab_Soluta:"
+msgstr "Ab_soluta:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:16
 msgid ""
@@ -13660,7 +13663,7 @@ msgstr "<b>CarÃ¡cter separador</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:19
 msgid "Use _formal accounting labels"
-msgstr "Usar rÃ³tulos contabilÃsticos _Formais"
+msgstr "Usar rÃ³tulos contabilÃsticos _formais"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:20
 msgid "Use only 'debit' and 'credit' instead of informal synonyms."
@@ -13676,7 +13679,7 @@ msgstr "_Nenhum"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:24
 msgid "C_redit accounts"
-msgstr "Contas de c_RÃ©dito"
+msgstr "Contas de c_rÃ©dito"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:26
 msgid "_Income & expense"
@@ -13696,11 +13699,11 @@ msgstr "DÃ³lares EUA (USD)"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:31
 msgid "Loc_ale:"
-msgstr "_Regional:"
+msgstr "Region_al:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:33
 msgid "Ch_oose:"
-msgstr "Esc_Olha:"
+msgstr "Esc_olha:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:35
 msgid ""
@@ -13756,7 +13759,7 @@ msgstr "<b>Formato de hora</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:47
 msgid "U_se 24-hour clock"
-msgstr "U_Sar horas em formato 24h"
+msgstr "U_sar horas em formato 24h"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:48
 msgid "Use a 24 hour (instead of a 12 hour) time format."
@@ -13795,7 +13798,7 @@ msgstr "Data/Hora"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:60
 msgid "Perform account list _setup on new file"
-msgstr "Realizar configuraÃ§Ã£o de lista de contas em ficheiro novo"
+msgstr "Realizar configuraÃ§Ã£o de li_sta de contas em ficheiro novo"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:61
 msgid "Present the new account list dialog when you choose File -> New File."
@@ -13805,7 +13808,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:64
 msgid "Display \"_tip of the day\" dialog"
-msgstr "Mostrar diÃ¡logo Dica do dia"
+msgstr "Mos_trar diÃ¡logo Dica do dia"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:65
 msgid "Display hints for using GnuCash at startup."
@@ -13817,11 +13820,11 @@ msgstr "Quantos dias manter ficheiros de diÃ¡rio/seguranÃ§a."
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:68
 msgid "_Retain log/backup files:"
-msgstr "_Manter diÃ¡rios/seguranÃ§as:"
+msgstr "Mante_r diÃ¡rios/seguranÃ§as:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:69
 msgid "Com_press files"
-msgstr "Com_Primir ficheiros"
+msgstr "Com_primir ficheiros"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:70
 msgid "Compress the data file with gzip when saving it to disk."
@@ -13833,7 +13836,7 @@ msgstr "<b>Ficheiros</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:72
 msgid "_Decimal places:"
-msgstr "Casas _Decimais:"
+msgstr "Casas _decimais:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:73
 msgid "How many automatic decimal places will be filled in."
@@ -13841,7 +13844,7 @@ msgstr "Quantas casas decimais deverÃ£o ser automaticamente preenchidas."
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:74
 msgid "_Automatic decimal point"
-msgstr "Separador decimal _AutomÃ¡tico"
+msgstr "Separador decimal _automÃ¡tico"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:75
 msgid ""
@@ -13853,7 +13856,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:76
 msgid "Display ne_gative amounts in red"
-msgstr "Mostrar montantes ne_Gativos a vermelho"
+msgstr "Mostrar montantes ne_gativos a vermelho"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:77
 msgid "Display negative amounts in red."
@@ -13869,7 +13872,7 @@ msgstr "<b>DiÃ¡logo de procura</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:80
 msgid "New search _limit:"
-msgstr "_Limite de nova procura_"
+msgstr "_Limite de nova procura"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:81
 msgid "Default to 'new search' if fewer than this number of items is returned."
@@ -13895,7 +13898,7 @@ msgstr "minutos"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:87
 msgid "Show auto-save confirmation _question"
-msgstr "Mostrar _ConfirmaÃ§Ã£o de gravaÃ§Ã£o automÃ¡tica"
+msgstr "Mostrar _confirmaÃ§Ã£o de gravaÃ§Ã£o automÃ¡tica"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:88
 msgid ""
@@ -13920,7 +13923,7 @@ msgstr "<b>Cheques</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:102
 msgid "Print _date format"
-msgstr "Imprimir formato da _Data"
+msgstr "Imprimir formato da _data"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:103
 msgid "Below the actual date, print the format of that date in 8 point type."
@@ -13928,7 +13931,7 @@ msgstr "Abaixo da data atual, imprimir o formato da data num tipo de 8 pontos."
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:104
 msgid "Default _font:"
-msgstr "_Letra predefinida:"
+msgstr "Letra prede_finida:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:105
 msgid "The default check printing font."
@@ -13936,7 +13939,7 @@ msgstr "A letra predefinida para imprimir cheques."
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:106
 msgid "Print _blocking chars"
-msgstr "Imprimir caracteres de _Bloqueio"
+msgstr "Imprimir caracteres de _bloqueio"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:107
 msgid "Print '***' before and after each text field on the check."
@@ -13953,7 +13956,7 @@ msgstr "<b>AÃ§Ãµes</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:110
 msgid "'_Enter' moves to blank transaction"
-msgstr "Enter move para uma transaÃ§Ã£o em branco"
+msgstr "\"_Enter\" move para uma transaÃ§Ã£o em branco"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:111
 msgid ""
@@ -13966,7 +13969,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:112
 msgid "_Auto-raise lists"
-msgstr "Mostrar listas _Automaticamente"
+msgstr "Mostrar listas _automaticamente"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:113
 msgid "Automatically raise the list of accounts or actions during input."
@@ -13978,7 +13981,7 @@ msgstr "<b>ReconciliaÃ§Ã£o</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:115
 msgid "Check cleared _transactions"
-msgstr "Marcar _TransaÃ§Ãµes confirmadas"
+msgstr "Marcar _transaÃ§Ãµes confirmadas"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:116
 msgid "Pre-check cleared transactions when creating a reconcile dialog."
@@ -13988,7 +13991,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:117
 msgid "Automatic _interest transfer"
-msgstr "TransferÃªncia automÃ¡t_Ica de juros"
+msgstr "TransferÃªncia automÃ¡t_ica de juros"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:119
 msgid "Automatic credit card _payment"
@@ -14004,7 +14007,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:121
 msgid "Always reconcile to t_oday"
-msgstr "Reconciliar sempre _Hoje"
+msgstr "Reconciliar sempre _hoje"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:122
 msgid ""
@@ -14016,7 +14019,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:123
 msgid "Draw _vertical lines between columns"
-msgstr "Desenhar linhas _Verticais entre colunas"
+msgstr "Desenhar linhas _verticais entre colunas"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:124
 msgid "Show vertical borders on the cells."
@@ -14024,7 +14027,7 @@ msgstr "Mostrar contornos verticais nas cÃ©lulas."
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:125
 msgid "Draw hori_zontal lines between rows"
-msgstr "Desenhar linhas _Horizontais entre colunas"
+msgstr "Desenhar linhas _horizontais entre colunas"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:126
 msgid "Show horizontal borders on the cells."
@@ -14032,7 +14035,7 @@ msgstr "Mostrar contornos horizontais nas cÃ©lulas."
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:127
 msgid "Double _mode colors alternate with transactions"
-msgstr "Cores de _Modo duplo alternam entre transaÃ§Ãµes"
+msgstr "Cores de _modo duplo alternam entre transaÃ§Ãµes"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:128
 msgid ""
@@ -14044,7 +14047,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:129
 msgid "Don't _use GnuCash built-in colors"
-msgstr "NÃ£o usar cores internas do GnuCash"
+msgstr "NÃ£o _usar cores internas do GnuCash"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:130
 msgid ""
@@ -14060,7 +14063,7 @@ msgstr "<b>GrÃ¡ficos</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:132
 msgid "Tab order in_cludes Transfer on Memorised Transactions"
-msgstr "Ordem dos separadores in_Clui TransferÃªncia nas transaÃ§Ãµes memorizadas"
+msgstr "Ordem dos separadores in_clui TransferÃªncia nas transaÃ§Ãµes memorizadas"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:133
 msgid "Move to Transfer field when memorised transaction auto filled."
@@ -14078,19 +14081,19 @@ msgstr "<b>Outras predefiniÃ§Ãµes</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:137
 msgid "_Basic ledger"
-msgstr "RazÃ£o _BÃ¡sico"
+msgstr "RazÃ£o _bÃ¡sico"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:139
 msgid "_Auto-split ledger"
-msgstr "RazÃ£o de parcelas _AutomÃ¡ticas"
+msgstr "RazÃ£o de parcelas _automÃ¡ticas"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:143
 msgid "Number of _transactions:"
-msgstr "NÃºmero de _TransaÃ§Ãµes:"
+msgstr "NÃºmero de _transaÃ§Ãµes:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:145
 msgid "_Double line mode"
-msgstr "Modo de linha _Dupla"
+msgstr "Modo de linha _dupla"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:146
 msgid ""
@@ -14102,7 +14105,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:147
 msgid "Register opens in a new _window"
-msgstr "DiÃ¡rio abre numa nova _Janela"
+msgstr "DiÃ¡rio abre numa nova _janela"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:148
 msgid ""
@@ -14114,7 +14117,7 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:149
 msgid "_Only display leaf account names"
-msgstr "Mostrar sÃ³ nomes de conta de _Folha"
+msgstr "Mostrar sÃ³ nomes de conta de _folha"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:150
 msgid ""
@@ -14130,11 +14133,11 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:151
 msgid "Number of _characters for auto complete:"
-msgstr "NÃºmero de caracteres para _ConclusÃ£o automÃ¡tica:"
+msgstr "NÃºmero de caracteres para _conclusÃ£o automÃ¡tica:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:153
 msgid "Show the _entered and reconcile dates"
-msgstr "Mostrar as datas de _Entrada e recociliaÃ§Ã£o"
+msgstr "Mostrar as datas de _entrada e reconciliaÃ§Ã£o"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:155
 msgid "Show the calendar b_uttons"
@@ -14146,7 +14149,7 @@ msgstr "_Mover a seleÃ§Ã£o para a parcela em branco ao expandir"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:159
 msgid "_Show entered and reconciled dates on selection"
-msgstr "Mo_Strar datas entradas e reconciliadas ao selecionar"
+msgstr "Mo_strar datas entradas e reconciliadas ao selecionar"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:161
 msgid "Register Defaults"
@@ -14162,7 +14165,7 @@ msgstr "<b>LocalizaÃ§Ã£o</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:166
 msgid "Report opens in a new _window"
-msgstr "RelatÃ³rio abre numa nova _Janela"
+msgstr "RelatÃ³rio abre numa nova _janela"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:167
 msgid ""
@@ -14198,7 +14201,7 @@ msgstr "<b>PosiÃ§Ã£o do separador</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:175
 msgid "To_p"
-msgstr "To_Po"
+msgstr "To_po"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:177
 msgid "B_ottom"
@@ -14222,7 +14225,7 @@ msgstr "<b>Separadores</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:189
 msgid "Show close button on _notebook tabs"
-msgstr "Mostrar botÃ£o de _Fecho em separadores"
+msgstr "Mostrar botÃ£o de _fecho em separadores"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:190
 msgid ""
@@ -14250,7 +14253,7 @@ msgstr "caracteres"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:194
 msgid "Windows"
-msgstr "Windows"
+msgstr "Janelas"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:195
 msgid "US"
@@ -14334,7 +14337,7 @@ msgstr "<b>Tabela de imposto</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:3
 msgid "_Account:"
-msgstr "Cont_A:"
+msgstr "Cont_a:"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:4
 msgid "_Value: "
@@ -14371,11 +14374,11 @@ msgstr "Percentagem %"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-totd.glade.h:1
 msgid "GnuCash Tip Of The Day"
-msgstr "SugestÃ£o do dia do GnuCash"
+msgstr "Dica do dia do GnuCash"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-totd.glade.h:2
 msgid "<b>Tip of the Day:</b>"
-msgstr "<b>SugestÃ£o do dia:</b>"
+msgstr "<b>Dica do dia:</b>"
 
 #: ../src/gnome-utils/gtkbuilder/dialog-totd.glade.h:3
 msgid "_Show tips at startup"
@@ -14516,6 +14519,26 @@ msgstr "NÃ£o agendada"
 msgid "Select occurrence date above."
 msgstr "Selecione a data de ocorrÃªncia acima."
 
+#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:7
+msgctxt "Daily"
+msgid "Every"
+msgstr "Cada"
+
+#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:8
+msgctxt "Daily"
+msgid "days."
+msgstr "dias."
+
+#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:10
+msgctxt "Weekly"
+msgid "Every"
+msgstr "Cada"
+
+#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:11
+msgctxt "Weekly"
+msgid "weeks."
+msgstr "semanas."
+
 #: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:12
 #: ../src/report/standard-reports/daily-reports.scm:355
 msgid "Saturday"
@@ -14557,6 +14580,16 @@ msgstr "Segunda"
 msgid "Tuesday"
 msgstr "TerÃ§a"
 
+#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:21
+msgctxt "Semimonthly"
+msgid "Every"
+msgstr "Cada"
+
+#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:22
+msgctxt "Semimonthly"
+msgid "months."
+msgstr "meses."
+
 #: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:23
 msgid "First on the:"
 msgstr "Primeiro no dia:"
@@ -14573,6 +14606,16 @@ msgstr "depois no dia:"
 msgid "Semi-Monthly"
 msgstr "Quinzenalmente"
 
+#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:27
+msgctxt "Monthly"
+msgid "Every"
+msgstr "Cada"
+
+#: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:28
+msgctxt "Monthly"
+msgid "months."
+msgstr "meses."
+
 #: ../src/gnome-utils/gtkbuilder/gnc-frequency.glade.h:29
 msgid "On the"
 msgstr "A"
@@ -14895,11 +14938,11 @@ msgstr ""
 
 #: ../src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade.h:2
 msgid "Only show _active owners"
-msgstr "Mostrar sÃ³ donos _Ativos"
+msgstr "Mostrar sÃ³ titulares _ativos"
 
 #: ../src/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade.h:3
 msgid "Show _zero balance owners"
-msgstr "Mostrar donos com saldo _Zero"
+msgstr "Mostrar titulares com saldo _zero"
 
 #: ../src/gnome-utils/window-main-summarybar.c:298
 #, c-format
@@ -14943,75 +14986,75 @@ msgstr ""
 msgid "The selected amount cannot be cleared."
 msgstr "O montante selecionado nÃ£o pode ser confirmado."
 
-#: ../src/gnome/window-reconcile2.c:455 ../src/gnome/window-reconcile.c:455
+#: ../src/gnome/window-reconcile2.c:455 ../src/gnome/window-reconcile.c:490
 msgid "Interest Payment"
 msgstr "Pagamento de juros"
 
-#: ../src/gnome/window-reconcile2.c:458 ../src/gnome/window-reconcile.c:458
+#: ../src/gnome/window-reconcile2.c:458 ../src/gnome/window-reconcile.c:493
 msgid "Interest Charge"
 msgstr "CobranÃ§a de juros"
 
-#: ../src/gnome/window-reconcile2.c:476 ../src/gnome/window-reconcile.c:476
+#: ../src/gnome/window-reconcile2.c:476 ../src/gnome/window-reconcile.c:511
 msgid "Payment From"
 msgstr "Pagamento de"
 
 #: ../src/gnome/window-reconcile2.c:482 ../src/gnome/window-reconcile2.c:492
-#: ../src/gnome/window-reconcile.c:482 ../src/gnome/window-reconcile.c:492
+#: ../src/gnome/window-reconcile.c:517 ../src/gnome/window-reconcile.c:527
 msgid "Reconcile Account"
 msgstr "Reconciliar conta"
 
-#: ../src/gnome/window-reconcile2.c:497 ../src/gnome/window-reconcile.c:497
+#: ../src/gnome/window-reconcile2.c:497 ../src/gnome/window-reconcile.c:532
 msgid "Payment To"
 msgstr "Pagamento a"
 
-#: ../src/gnome/window-reconcile2.c:510 ../src/gnome/window-reconcile.c:510
+#: ../src/gnome/window-reconcile2.c:510 ../src/gnome/window-reconcile.c:545
 msgid "No Auto Interest Payments for this Account"
 msgstr "Sem pagamento automÃ¡tico de juros nesta conta"
 
-#: ../src/gnome/window-reconcile2.c:511 ../src/gnome/window-reconcile.c:511
+#: ../src/gnome/window-reconcile2.c:511 ../src/gnome/window-reconcile.c:546
 msgid "No Auto Interest Charges for this Account"
 msgstr "Sem cobranÃ§a automÃ¡tica de juros nesta conta"
 
-#: ../src/gnome/window-reconcile2.c:764 ../src/gnome/window-reconcile.c:764
+#: ../src/gnome/window-reconcile2.c:764 ../src/gnome/window-reconcile.c:801
 msgid "Enter _Interest Charge..."
 msgstr "_Insira cobranÃ§a de juros..."
 
-#: ../src/gnome/window-reconcile2.c:1068 ../src/gnome/window-reconcile.c:1068
+#: ../src/gnome/window-reconcile2.c:1068 ../src/gnome/window-reconcile.c:1105
 #: ../src/report/business-reports/owner-report.scm:56
 msgid "Debits"
 msgstr "DÃ©bitos"
 
-#: ../src/gnome/window-reconcile2.c:1078 ../src/gnome/window-reconcile.c:1078
+#: ../src/gnome/window-reconcile2.c:1078 ../src/gnome/window-reconcile.c:1115
 #: ../src/report/business-reports/owner-report.scm:55
 #: ../src/report/report-system/report-utilities.scm:111
 msgid "Credits"
 msgstr "CrÃ©ditos"
 
-#: ../src/gnome/window-reconcile2.c:1270 ../src/gnome/window-reconcile.c:1270
+#: ../src/gnome/window-reconcile2.c:1270 ../src/gnome/window-reconcile.c:1307
 msgid "Are you sure you want to delete the selected transaction?"
 msgstr "Tem a certeza que deseja apagar a transaÃ§Ã£o selecionada?"
 
 #. statement date title/value
-#: ../src/gnome/window-reconcile2.c:1800 ../src/gnome/window-reconcile.c:1800
+#: ../src/gnome/window-reconcile2.c:1800 ../src/gnome/window-reconcile.c:1840
 msgid "Statement Date:"
 msgstr "Data do documento:"
 
 #. ending balance title/value
-#: ../src/gnome/window-reconcile2.c:1820 ../src/gnome/window-reconcile.c:1820
+#: ../src/gnome/window-reconcile2.c:1820 ../src/gnome/window-reconcile.c:1860
 msgid "Ending Balance:"
 msgstr "Saldo final:"
 
 #. reconciled balance title/value
-#: ../src/gnome/window-reconcile2.c:1830 ../src/gnome/window-reconcile.c:1830
+#: ../src/gnome/window-reconcile2.c:1830 ../src/gnome/window-reconcile.c:1870
 msgid "Reconciled Balance:"
 msgstr "Saldo reconciliado:"
 
 #. difference title/value
-#: ../src/gnome/window-reconcile2.c:1840 ../src/gnome/window-reconcile.c:1840
+#: ../src/gnome/window-reconcile2.c:1840 ../src/gnome/window-reconcile.c:1880
 msgid "Difference:"
 msgstr "DiferenÃ§a:"
 
-#: ../src/gnome/window-reconcile2.c:1929 ../src/gnome/window-reconcile.c:1929
+#: ../src/gnome/window-reconcile2.c:1929 ../src/gnome/window-reconcile.c:1969
 msgid ""
 "You have made changes to this reconcile window. Are you sure you want to "
 "cancel?"
@@ -15019,97 +15062,97 @@ msgstr ""
 "Fez alteraÃ§Ãµes nesta janela de reconciliaÃ§Ã£o.\n"
 "Tem a certeza que quer cancelar?"
 
-#: ../src/gnome/window-reconcile2.c:2047 ../src/gnome/window-reconcile.c:2047
+#: ../src/gnome/window-reconcile2.c:2047 ../src/gnome/window-reconcile.c:2087
 msgid "The account is not balanced. Are you sure you want to finish?"
 msgstr ""
 "A conta nÃ£o se encontra saldada.\n"
 "Tem a certeza que quer terminar?"
 
-#: ../src/gnome/window-reconcile2.c:2104 ../src/gnome/window-reconcile.c:2104
+#: ../src/gnome/window-reconcile2.c:2104 ../src/gnome/window-reconcile.c:2144
 msgid "Do you want to postpone this reconciliation and finish it later?"
 msgstr "Quer adiar esta reconciliaÃ§Ã£o e completÃ¡-la mais tarde?"
 
 #. Toplevel
-#: ../src/gnome/window-reconcile2.c:2142 ../src/gnome/window-reconcile.c:2142
+#: ../src/gnome/window-reconcile2.c:2142 ../src/gnome/window-reconcile.c:2182
 msgid "_Reconcile"
 msgstr "_Reconciliar"
 
-#: ../src/gnome/window-reconcile2.c:2143 ../src/gnome/window-reconcile.c:2143
+#: ../src/gnome/window-reconcile2.c:2143 ../src/gnome/window-reconcile.c:2183
 msgid "_Account"
-msgstr "Cont_A"
+msgstr "Cont_a"
 
-#: ../src/gnome/window-reconcile2.c:2150 ../src/gnome/window-reconcile.c:2150
+#: ../src/gnome/window-reconcile2.c:2150 ../src/gnome/window-reconcile.c:2190
 msgid "_Reconcile Information..."
-msgstr "InformaÃ§Ã£o de _ReconciliaÃ§Ã£o..."
+msgstr "InformaÃ§Ã£o de _reconciliaÃ§Ã£o..."
 
-#: ../src/gnome/window-reconcile2.c:2151 ../src/gnome/window-reconcile.c:2151
+#: ../src/gnome/window-reconcile2.c:2151 ../src/gnome/window-reconcile.c:2191
 msgid ""
 "Change the reconcile information including statement date and ending balance."
 msgstr ""
 "Alterar a informaÃ§Ã£o de reconciliaÃ§Ã£o incluindo data do documento e saldo "
 "final."
 
-#: ../src/gnome/window-reconcile2.c:2156 ../src/gnome/window-reconcile.c:2156
+#: ../src/gnome/window-reconcile2.c:2156 ../src/gnome/window-reconcile.c:2196
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: ../src/gnome/window-reconcile2.c:2157 ../src/gnome/window-reconcile.c:2157
+#: ../src/gnome/window-reconcile2.c:2157 ../src/gnome/window-reconcile.c:2197
 msgid "Finish the reconciliation of this account"
 msgstr "Terminar a reconciliaÃ§Ã£o desta conta"
 
-#: ../src/gnome/window-reconcile2.c:2161 ../src/gnome/window-reconcile.c:2161
+#: ../src/gnome/window-reconcile2.c:2161 ../src/gnome/window-reconcile.c:2201
 msgid "_Postpone"
 msgstr "_Adiar"
 
-#: ../src/gnome/window-reconcile2.c:2162 ../src/gnome/window-reconcile.c:2162
+#: ../src/gnome/window-reconcile2.c:2162 ../src/gnome/window-reconcile.c:2202
 msgid "Postpone the reconciliation of this account"
 msgstr "Adiar a reconciliaÃ§Ã£o desta conta"
 
-#: ../src/gnome/window-reconcile2.c:2167 ../src/gnome/window-reconcile.c:2167
+#: ../src/gnome/window-reconcile2.c:2167 ../src/gnome/window-reconcile.c:2207
 msgid "Cancel the reconciliation of this account"
 msgstr "Cancelar a reconciliaÃ§Ã£o desta conta"
 
-#: ../src/gnome/window-reconcile2.c:2175 ../src/gnome/window-reconcile.c:2175
+#: ../src/gnome/window-reconcile2.c:2175 ../src/gnome/window-reconcile.c:2215
 msgid "Open the account"
 msgstr "Abrir a conta"
 
-#: ../src/gnome/window-reconcile2.c:2180 ../src/gnome/window-reconcile.c:2180
+#: ../src/gnome/window-reconcile2.c:2180 ../src/gnome/window-reconcile.c:2220
 msgid "Edit the main account for this register"
 msgstr "Editar a conta principal deste diÃ¡rio"
 
-#: ../src/gnome/window-reconcile2.c:2198 ../src/gnome/window-reconcile.c:2198
+#: ../src/gnome/window-reconcile2.c:2198 ../src/gnome/window-reconcile.c:2238
 msgid "_Balance"
 msgstr "_Saldo"
 
-#: ../src/gnome/window-reconcile2.c:2199 ../src/gnome/window-reconcile.c:2199
+#: ../src/gnome/window-reconcile2.c:2199 ../src/gnome/window-reconcile.c:2239
 msgid "Add a new balancing entry to the account"
 msgstr "Adicionar uma nova entrada de saldo Ã  conta"
 
-#: ../src/gnome/window-reconcile2.c:2204 ../src/gnome/window-reconcile.c:2204
+#: ../src/gnome/window-reconcile2.c:2204 ../src/gnome/window-reconcile.c:2244
 msgid "Edit the current transaction"
 msgstr "Editar a transaÃ§Ã£o atual"
 
-#: ../src/gnome/window-reconcile2.c:2209 ../src/gnome/window-reconcile.c:2209
+#: ../src/gnome/window-reconcile2.c:2209 ../src/gnome/window-reconcile.c:2249
 msgid "Delete the selected transaction"
 msgstr "Eliminar a transaÃ§Ã£o selecionada"
 
-#: ../src/gnome/window-reconcile2.c:2213 ../src/gnome/window-reconcile.c:2213
+#: ../src/gnome/window-reconcile2.c:2213 ../src/gnome/window-reconcile.c:2253
 msgid "_Reconcile Selection"
 msgstr "_Reconciliar seleÃ§Ã£o"
 
-#: ../src/gnome/window-reconcile2.c:2214 ../src/gnome/window-reconcile.c:2214
+#: ../src/gnome/window-reconcile2.c:2214 ../src/gnome/window-reconcile.c:2254
 msgid "Reconcile the selected transactions"
 msgstr "Reconciliar as transaÃ§Ãµes selecionadas"
 
-#: ../src/gnome/window-reconcile2.c:2218 ../src/gnome/window-reconcile.c:2218
+#: ../src/gnome/window-reconcile2.c:2218 ../src/gnome/window-reconcile.c:2258
 msgid "_Unreconcile Selection"
-msgstr "SeleÃ§Ã£o _NÃ£o reconciliada"
+msgstr "SeleÃ§Ã£o _nÃ£o reconciliada"
 
-#: ../src/gnome/window-reconcile2.c:2219 ../src/gnome/window-reconcile.c:2219
+#: ../src/gnome/window-reconcile2.c:2219 ../src/gnome/window-reconcile.c:2259
 msgid "Unreconcile the selected transactions"
 msgstr "Remover reconciliaÃ§Ã£o das transaÃ§Ãµes selecionadas"
 
-#: ../src/gnome/window-reconcile2.c:2227 ../src/gnome/window-reconcile.c:2227
+#: ../src/gnome/window-reconcile2.c:2227 ../src/gnome/window-reconcile.c:2267
 msgid "Open the GnuCash help window"
 msgstr "Abre a janela de ajuda do GnuCash"
 
@@ -15203,22 +15246,23 @@ msgstr ""
 "assistente se executou com sucesso. Por favor, tente executar o \"Assistente "
 "de configuraÃ§Ã£o do AqBanking\" novamente."
 
-#. Translators: Strings are 1. Account code, 2. Bank name, 3. Bank code.
-#: ../src/import-export/aqb/assistant-ab-initial.c:581
+#. Translators: Strings are 1. Bank code, 2. Bank name,
+#. * 3. Account Number,  4. Subaccount ID
+#: ../src/import-export/aqb/assistant-ab-initial.c:582
 #, c-format
 msgid "Bank code %s (%s), Account %s (%s)"
 msgstr "CÃ³digo do banco %s (%s), conta %s (%s)"
 
-#: ../src/import-export/aqb/assistant-ab-initial.c:874
+#: ../src/import-export/aqb/assistant-ab-initial.c:875
 msgid "Online Banking Account Name"
 msgstr "Nome de conta do Online Banking"
 
-#: ../src/import-export/aqb/assistant-ab-initial.c:879
+#: ../src/import-export/aqb/assistant-ab-initial.c:880
 msgid "GnuCash Account Name"
 msgstr "Nome de conta GnuCash"
 
-#: ../src/import-export/aqb/assistant-ab-initial.c:885
-#: ../src/import-export/qif-imp/assistant-qif-import.c:545
+#: ../src/import-export/aqb/assistant-ab-initial.c:886
+#: ../src/import-export/qif-imp/assistant-qif-import.c:546
 #: ../src/import-export/qif-imp/dialog-account-picker.c:379
 msgid "New?"
 msgstr "Novo?"
@@ -15380,11 +15424,11 @@ msgstr "Data mais Antiga possÃvel"
 
 #: ../src/import-export/aqb/dialog-ab.glade.h:12
 msgid "_Last retrieval date"
-msgstr "Ãš_Ltima data a obter"
+msgstr "Ãš_ltima data a obter"
 
 #: ../src/import-export/aqb/dialog-ab.glade.h:13
 msgid "E_nter date:"
-msgstr "I_Nsira a data:"
+msgstr "I_nsira a data:"
 
 #: ../src/import-export/aqb/dialog-ab.glade.h:14
 msgid "<b>To</b>"
@@ -15396,7 +15440,7 @@ msgstr "_Agora"
 
 #: ../src/import-export/aqb/dialog-ab.glade.h:16
 msgid "Ente_r date:"
-msgstr "Insi_Ra a data:"
+msgstr "Insi_ra a data:"
 
 #: ../src/import-export/aqb/dialog-ab.glade.h:17
 msgid "Enter Password"
@@ -15428,7 +15472,7 @@ msgstr "Fechar janela de diÃ¡rio quando terminar"
 
 #: ../src/import-export/aqb/dialog-ab.glade.h:24
 msgid "_Verbose debug messages"
-msgstr "Mensagens de depuraÃ§Ã£o _Verbosas"
+msgstr "Mensagens de depuraÃ§Ã£o _verbosas"
 
 #: ../src/import-export/aqb/dialog-ab.glade.h:25
 msgid "Name for new template"
@@ -15994,7 +16038,7 @@ msgstr "Online Banking"
 #. Menus
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:94
 msgid "_Online Actions"
-msgstr "AÃ§Ãµes _Online"
+msgstr "AÃ§Ãµes _online"
 
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:98
 msgid "_Online Banking Setup..."
@@ -16010,7 +16054,7 @@ msgstr ""
 
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:103
 msgid "Get _Balance"
-msgstr "Obter _Saldo"
+msgstr "Obter _saldo"
 
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:104
 msgid "Get the account balance online through Online Banking"
@@ -16018,7 +16062,7 @@ msgstr "Obter o saldo da conta online com o Online Banking"
 
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:108
 msgid "Get _Transactions..."
-msgstr "Obter _TransaÃ§Ãµes..."
+msgstr "Obter _transaÃ§Ãµes..."
 
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:109
 msgid "Get the transactions online through Online Banking"
@@ -16046,7 +16090,7 @@ msgstr ""
 
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:123
 msgid "I_nternal Transaction..."
-msgstr "TransaÃ§Ã£o _Interna..."
+msgstr "TransaÃ§Ã£o _interna..."
 
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:124
 msgid "Issue a new bank-internal transaction online through Online Banking"
@@ -16110,7 +16154,7 @@ msgstr ""
 
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:174
 msgid "Show _log window"
-msgstr "Mostrar jane_La de diÃ¡rio"
+msgstr "Mostrar jane_la de diÃ¡rio"
 
 #: ../src/import-export/aqb/gnc-plugin-aqbanking.c:175
 msgid "Show the online banking log window."
@@ -16404,7 +16448,7 @@ msgstr "tipo"
 
 #: ../src/import-export/csv-exp/csv-tree-export.c:155
 msgid "full_name"
-msgstr "_Nome-completo"
+msgstr "Nome completo"
 
 #: ../src/import-export/csv-exp/csv-tree-export.c:155
 msgid "name"
@@ -16448,7 +16492,7 @@ msgstr "_Marcador"
 
 #: ../src/import-export/csv-exp/gnc-plugin-csv-export.c:47
 msgid "Export Account T_ree to CSV..."
-msgstr "Exporta_R Ã¡rvore de contas para CSV"
+msgstr "Exporta_r Ã¡rvore de contas para CSV"
 
 #: ../src/import-export/csv-exp/gnc-plugin-csv-export.c:48
 msgid "Export the Account Tree to a CSV file"
@@ -16456,7 +16500,7 @@ msgstr "Exportar a hierarquia de contas para um ficheiro CSV"
 
 #: ../src/import-export/csv-exp/gnc-plugin-csv-export.c:52
 msgid "Export _Transactions to CSV..."
-msgstr "Exportar _TransaÃ§Ãµes para CSV"
+msgstr "Exportar _transaÃ§Ãµes para CSV"
 
 #: ../src/import-export/csv-exp/gnc-plugin-csv-export.c:53
 msgid "Export the Transactions to a CSV file"
@@ -16636,6 +16680,11 @@ msgstr "AntevisÃ£o da importaÃ§Ã£o de contas, sÃ³ as primeiras 10 linhas"
 msgid "Import Accounts Now"
 msgstr "Importar contas agora"
 
+#: ../src/import-export/csv-imp/assistant-csv-account-import.glade.h:25
+#: ../src/import-export/csv-imp/assistant-csv-trans-import.glade.h:46
+msgid "label"
+msgstr "etiqueta"
+
 #: ../src/import-export/csv-imp/assistant-csv-account-import.glade.h:26
 #: ../src/import-export/csv-imp/assistant-csv-trans-import.glade.h:48
 msgid "Import Summary"
@@ -16648,11 +16697,11 @@ msgstr "CodificaÃ§Ã£o selecionada invÃ¡lida"
 
 #: ../src/import-export/csv-imp/assistant-csv-trans-import.c:617
 msgid "Merge with column on _left"
-msgstr "Unir com a coluna Ã  _Esquerda"
+msgstr "Unir com a coluna Ã  _esquerda"
 
 #: ../src/import-export/csv-imp/assistant-csv-trans-import.c:621
 msgid "Merge with column on _right"
-msgstr "Unir com a coluna Ã  _Direita"
+msgstr "Unir com a coluna Ã  _direita"
 
 #: ../src/import-export/csv-imp/assistant-csv-trans-import.c:626
 msgid "_Split this column"
@@ -16937,7 +16986,7 @@ msgstr "ImpossÃvel entender a coluna %s."
 
 #: ../src/import-export/csv-imp/gnc-plugin-csv-import.c:48
 msgid "Import _Accounts from CSV..."
-msgstr "Importar _Contas de CSV..."
+msgstr "Importar _contas de CSV..."
 
 #: ../src/import-export/csv-imp/gnc-plugin-csv-import.c:49
 msgid "Import Accounts from a CSV file"
@@ -16945,7 +16994,7 @@ msgstr "Importar contas de um ficheiro CSV"
 
 #: ../src/import-export/csv-imp/gnc-plugin-csv-import.c:53
 msgid "Import _Transactions from CSV..."
-msgstr "Importar _TransaÃ§Ãµes de CSV..."
+msgstr "Importar _transaÃ§Ãµes de CSV..."
 
 #: ../src/import-export/csv-imp/gnc-plugin-csv-import.c:54
 msgid "Import Transactions from a CSV file"
@@ -17037,7 +17086,7 @@ msgstr ""
 
 #: ../src/import-export/dialog-import.glade.h:11
 msgid "Commercial ATM _fees threshold"
-msgstr "Limite de _Taxas de ATMs comerciais"
+msgstr "Limite de _taxas de ATMs comerciais"
 
 #: ../src/import-export/dialog-import.glade.h:12
 msgid "Auto-c_lear threshold"
@@ -17045,11 +17094,11 @@ msgstr "_Limite de confirmaÃ§Ã£o automÃ¡tica"
 
 #: ../src/import-export/dialog-import.glade.h:13
 msgid "Auto-_add threshold"
-msgstr "Limite de _AdiÃ§Ã£o automÃ¡tica"
+msgstr "Limite de _adiÃ§Ã£o automÃ¡tica"
 
 #: ../src/import-export/dialog-import.glade.h:14
 msgid "Match _display threshold"
-msgstr "Comparar limite de _ExibiÃ§Ã£o"
+msgstr "Comparar limite de _exibiÃ§Ã£o"
 
 #: ../src/import-export/dialog-import.glade.h:15
 msgid "Use _bayesian matching"
@@ -17335,68 +17384,68 @@ msgstr "a/m/d"
 msgid "y/d/m"
 msgstr "a/d/m"
 
-#: ../src/import-export/import-main-matcher.c:263
+#: ../src/import-export/import-main-matcher.c:255
 msgid "Destination account for the auto-balance split."
 msgstr "Conta destino da parcela de saldo automÃ¡tico."
 
-#: ../src/import-export/import-main-matcher.c:487
+#: ../src/import-export/import-main-matcher.c:479
 msgid "A"
 msgstr "Ad"
 
-#: ../src/import-export/import-main-matcher.c:489
+#: ../src/import-export/import-main-matcher.c:481
 msgid "U+R"
 msgstr "At+R"
 
-#: ../src/import-export/import-main-matcher.c:498
+#: ../src/import-export/import-main-matcher.c:490
 msgid "Info"
 msgstr "InformaÃ§Ã£o"
 
-#: ../src/import-export/import-main-matcher.c:734
+#: ../src/import-export/import-main-matcher.c:726
 msgid "New, already balanced"
 msgstr "Nova, jÃ¡ saldada"
 
 #. Translators: %1$s is the amount to be
 #. transferred. %2$s is the destination account.
-#: ../src/import-export/import-main-matcher.c:760
+#: ../src/import-export/import-main-matcher.c:752
 #, c-format
 msgid "New, transfer %s to (manual) \"%s\""
 msgstr "Nova, transferir %s para \"%s\" (manual)"
 
 #. Translators: %1$s is the amount to be
 #. transferred. %2$s is the destination account.
-#: ../src/import-export/import-main-matcher.c:768
+#: ../src/import-export/import-main-matcher.c:760
 #, c-format
 msgid "New, transfer %s to (auto) \"%s\""
 msgstr "Nova, transferir %s para \"%s\" (automÃ¡tico)"
 
 #. Translators: %s is the amount to be transferred.
-#: ../src/import-export/import-main-matcher.c:779
+#: ../src/import-export/import-main-matcher.c:771
 #, c-format
 msgid "New, UNBALANCED (need acct to transfer %s)!"
 msgstr "Nova, NÃƒO SALDADA (precisa de conta para transferir %s)!"
 
-#: ../src/import-export/import-main-matcher.c:791
+#: ../src/import-export/import-main-matcher.c:783
 msgid "Reconcile (manual) match"
 msgstr "Reconciliar correspondÃªncia (manual)"
 
-#: ../src/import-export/import-main-matcher.c:795
+#: ../src/import-export/import-main-matcher.c:787
 msgid "Reconcile (auto) match"
 msgstr "Reconciliar correspondÃªncia (automÃ¡tico)"
 
-#: ../src/import-export/import-main-matcher.c:801
-#: ../src/import-export/import-main-matcher.c:820
+#: ../src/import-export/import-main-matcher.c:793
+#: ../src/import-export/import-main-matcher.c:812
 msgid "Match missing!"
 msgstr "CorrespondÃªncia em falta!"
 
-#: ../src/import-export/import-main-matcher.c:810
+#: ../src/import-export/import-main-matcher.c:802
 msgid "Update and reconcile (manual) match"
 msgstr "Atualizar e reconciliar correspondÃªncia (manual)"
 
-#: ../src/import-export/import-main-matcher.c:814
+#: ../src/import-export/import-main-matcher.c:806
 msgid "Update and reconcile (auto) match"
 msgstr "Atualizar e reconciliar correspondÃªncia (automÃ¡tico)"
 
-#: ../src/import-export/import-main-matcher.c:825
+#: ../src/import-export/import-main-matcher.c:817
 msgid "Do not import (no action selected)"
 msgstr "NÃ£o importar (sem aÃ§Ã£o selecionada)"
 
@@ -17507,17 +17556,17 @@ msgstr "Importar _OFX/QFX..."
 msgid "Process an OFX/QFX response file"
 msgstr "Processar um ficheiro OFX/QFX de resposta"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:531
+#: ../src/import-export/qif-imp/assistant-qif-import.c:532
 msgid "GnuCash account name"
 msgstr "Nome de conta GnuCash"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:833
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2666
+#: ../src/import-export/qif-imp/assistant-qif-import.c:834
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2672
 msgid "Enter a name or short description, such as \"Red Hat Stock\"."
 msgstr "Insira um nome ou descriÃ§Ã£o curta, tal como \"AÃ§Ãµes Red Hat\"."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:835
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2673
+#: ../src/import-export/qif-imp/assistant-qif-import.c:836
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2679
 msgid ""
 "Enter the ticker symbol or other well known abbreviation, such as \"RHT\". "
 "If there isn't one, or you don't know it, create your own."
@@ -17525,8 +17574,8 @@ msgstr ""
 "Insira o sÃmbolo de mercado ou outra abreviatura bem conhecida, tal como "
 "\"ARH\". Se nÃ£o houver uma ou nÃ£o a conhecer, crie a sua prÃ³pria."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:838
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2681
+#: ../src/import-export/qif-imp/assistant-qif-import.c:839
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2687
 msgid ""
 "Select the exchange on which the symbol is traded, or select the type of "
 "investment (such as FUND for mutual funds.) If you don't see your exchange "
@@ -17536,74 +17585,74 @@ msgstr ""
 "investimento (tal como FUNDO para fundos mÃºtuos). Se nÃ£o vÃª o seu cÃ¢mbio ou "
 "um tipo de investimento apropriado, pode criar um novo."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:863
+#: ../src/import-export/qif-imp/assistant-qif-import.c:864
 msgid "Enter information about"
 msgstr "Inserir informaÃ§Ã£o sobre"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:879
+#: ../src/import-export/qif-imp/assistant-qif-import.c:880
 msgid "_Name or description:"
 msgstr "_Nome ou descriÃ§Ã£o:"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:899
+#: ../src/import-export/qif-imp/assistant-qif-import.c:900
 msgid "_Ticker symbol or other abbreviation:"
 msgstr "_SÃmbolo de mercado ou outra abreviatura:"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:924
+#: ../src/import-export/qif-imp/assistant-qif-import.c:925
 msgid "_Exchange or abbreviation type:"
 msgstr "_CÃ¢mbio ou tipo de abreviatura:"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1123
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3103
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1124
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3109
 msgid "(split)"
 msgstr "(parcela)"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1518
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1519
 msgid "Please select a file to load."
 msgstr "Por favor, selecione o ficheiro a carregar."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1521
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1522
 msgid "File not found or read permission denied. Please select another file."
 msgstr ""
 "Ficheiro nÃ£o encontrado ou permissÃ£o negada. Por favor, selecione outro "
 "ficheiro."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1532
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1533
 msgid "That QIF file is already loaded. Please select another file."
 msgstr ""
 "Esse ficheiro QIF jÃ¡ estÃ¡ carregado. Por favor, selecione outro ficheiro."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1600
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1601
 msgid "Select QIF File"
 msgstr "Selecione o ficheiro QIF"
 
 #. Swap the button label between pause and resume.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1663
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1667
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2774
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2778
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1664
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1668
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2780
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2784
 msgid "_Resume"
 msgstr "_Continuar"
 
 #. Inform the user.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1752
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1822
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2860
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1753
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1824
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2866
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1766
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1770
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1767
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1771
 msgid "An error occurred while loading the QIF file."
 msgstr "Ocorreu um erro ao carregar o ficheiro QIF."
 
 #. Inform the user.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1767
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1785
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1841
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1897
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2880
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2901
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2948
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1768
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1786
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1843
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1899
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2886
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2907
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2954
 msgid "Failed"
 msgstr "Falha"
 
@@ -17611,26 +17660,26 @@ msgstr "Falha"
 #. Remove any converted data.
 #. An error occurred during duplicate checking.
 #. Remove any converted data.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1818
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1835
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2856
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2874
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2897
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2942
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1820
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1837
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2862
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2880
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2903
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2948
 msgid "Cleaning up"
 msgstr "A limpar"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1840
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1844
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1842
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1846
 msgid "A bug was detected while parsing the QIF file."
 msgstr "Foi detetado um erro ao processar o ficheiro QIF."
 
 #. The file was loaded successfully.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1916
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1918
 msgid "Loading completed"
 msgstr "Carregamento terminado"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:1947
+#: ../src/import-export/qif-imp/assistant-qif-import.c:1949
 msgid ""
 "When you press the Start Button, GnuCash will load your QIF file. If there "
 "are no errors or warnings, you will automatically proceed to the next step. "
@@ -17640,39 +17689,39 @@ msgstr ""
 "houver erros ou avisos, continuarÃ¡ automaticamente para o prÃ³ximo passo. "
 "SenÃ£o, serÃ£o mostrados abaixo os detalhes para os rever."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2512
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2518
 #: ../src/import-export/qif-imp/assistant-qif-import.glade.h:60
 msgid "Choose the QIF file currency and select Book Options"
 msgstr "Escolha a moeda do ficheiro QIF e selecione as opÃ§Ãµes do livro"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2519
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2525
 msgid "Choose the QIF file currency"
 msgstr "Escolha a moeda do ficheiro QIF"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2701
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2707
 msgid "You must enter an existing national currency or enter a different type."
 msgstr ""
 "Ten de inserir uma moeda nacional existente ou inserir um tipo diferente."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2879
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2883
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2885
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2889
 msgid "A bug was detected while converting the QIF data."
 msgstr "Foi detetado um erro ao converter os dados QIF."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2933
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2939
 msgid "Canceling"
 msgstr "A cancelar"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2947
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2951
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2953
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2957
 msgid "A bug was detected while detecting duplicates."
 msgstr "Foi detetado um erro durante a procura or duplicados."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:2970
+#: ../src/import-export/qif-imp/assistant-qif-import.c:2976
 msgid "Conversion completed"
 msgstr "ConversÃ£o terminada"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3002
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3008
 msgid ""
 "When you press the Start Button, GnuCash will import your QIF data. If there "
 "are no errors or warnings, you will automatically proceed to the next step. "
@@ -17682,36 +17731,36 @@ msgstr ""
 "houver erros ou avisos, contionuarÃ¡ automaticamente para o passo seguinte. "
 "SenÃ£o, serÃ£o mostrados abaixo os detalhes para os rever."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3198
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3204
 msgid "GnuCash was unable to save your mapping preferences."
 msgstr "O GnuCash nÃ£o pÃ´de gravar as suas preferÃªncias de mapeamento."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3231
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3237
 #, c-format
 msgid "There was a problem with the import."
 msgstr "Houve um problema com a importaÃ§Ã£o."
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3233
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3239
 #, c-format
 msgid "QIF Import Completed."
 msgstr "ImportaÃ§Ã£o QIF terminada."
 
 #. Set up the QIF account to GnuCash account matcher.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3456
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3462
 msgid "QIF account name"
 msgstr "Nome de conta QIF"
 
 #. Set up the QIF category to GnuCash account matcher.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3462
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3468
 msgid "QIF category name"
 msgstr "Nome de categoria QIF"
 
 #. Set up the QIF payee/memo to GnuCash account matcher.
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3468
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3474
 msgid "QIF payee/memo"
 msgstr "Recebedor/Memorando QIF"
 
-#: ../src/import-export/qif-imp/assistant-qif-import.c:3543
+#: ../src/import-export/qif-imp/assistant-qif-import.c:3549
 msgid "Match?"
 msgstr "Corresponde?"
 
@@ -18078,11 +18127,11 @@ msgstr "Comparar transaÃ§Ãµes existentes"
 
 #: ../src/import-export/qif-imp/assistant-qif-import.glade.h:76
 msgid "_Imported transactions needing review:"
-msgstr "TransaÃ§Ãµes _Importadas a precisar de revisÃ£o:"
+msgstr "TransaÃ§Ãµes _importadas a precisar de revisÃ£o:"
 
 #: ../src/import-export/qif-imp/assistant-qif-import.glade.h:77
 msgid "_Possible matches for the selected transaction:"
-msgstr "CorrespondÃªncias _PossÃveis para a transaÃ§Ã£o selecionada:"
+msgstr "CorrespondÃªncias _possÃveis para a transaÃ§Ã£o selecionada:"
 
 #: ../src/import-export/qif-imp/assistant-qif-import.glade.h:78
 msgid "Select possible duplicates"
@@ -18436,41 +18485,41 @@ msgstr "%#d de %B de %Y"
 msgid "%B %e, %Y"
 msgstr "%e de %B de %Y"
 
-#: ../src/plugins/bi_import/dialog-bi-import.c:285
+#: ../src/plugins/bi_import/dialog-bi-import.c:287
 #, c-format
 msgid "ROW %d DELETED, PRICE_NOT_SET: id=%s\n"
 msgstr "LINHA %d ELIMINADA, PREÃ‡O_NÃƒO_DEFINIDO: id=%s\n"
 
-#: ../src/plugins/bi_import/dialog-bi-import.c:295
+#: ../src/plugins/bi_import/dialog-bi-import.c:297
 #, c-format
 msgid "ROW %d DELETED, QTY_NOT_SET: id=%s\n"
 msgstr "LINHA %d ELIMINADA, QTD_NÃƒO_DEFINIDA: id=%s\n"
 
-#: ../src/plugins/bi_import/dialog-bi-import.c:309
+#: ../src/plugins/bi_import/dialog-bi-import.c:311
 #, c-format
 msgid "ROW %d DELETED, ID_NOT_SET\n"
 msgstr "LINHA %d ELIMINADA, ID_NÃƒO_DEFINIDA\n"
 
-#: ../src/plugins/bi_import/dialog-bi-import.c:410
+#: ../src/plugins/bi_import/dialog-bi-import.c:412
 #, c-format
 msgid "ROW %d DELETED, OWNER_NOT_SET: id=%s\n"
 msgstr "LINHA %d ELIMINADA, PROP_NÃƒO_DEFINIDO: id=%s\n"
 
-#: ../src/plugins/bi_import/dialog-bi-import.c:435
+#: ../src/plugins/bi_import/dialog-bi-import.c:437
 #, c-format
 msgid "ROW %d DELETED, VENDOR_DOES_NOT_EXIST: id=%s\n"
 msgstr "LINHA %d ELIMINADA, FORN_NÃƒO_EXISTE: id=%s\n"
 
-#: ../src/plugins/bi_import/dialog-bi-import.c:449
+#: ../src/plugins/bi_import/dialog-bi-import.c:451
 #, c-format
 msgid "ROW %d DELETED, CUSTOMER_DOES_NOT_EXIST: id=%s\n"
 msgstr "LINHA %d ELIMINADA, CLI_NÃƒO_EXISTE: id=%s\n"
 
-#: ../src/plugins/bi_import/dialog-bi-import.c:493
+#: ../src/plugins/bi_import/dialog-bi-import.c:495
 msgid "These rows were deleted:"
 msgstr "Estas linhas foram eliminadas:"
 
-#: ../src/plugins/bi_import/dialog-bi-import.c:661
+#: ../src/plugins/bi_import/dialog-bi-import.c:664
 msgid "Are you sure you have bills/invoices to update?"
 msgstr "Tem a certeza que tem pagamentos/faturas para atualizar?"
 
@@ -18506,7 +18555,7 @@ msgstr "Estas linhas foram ignoradas durante a importaÃ§Ã£o"
 
 #: ../src/plugins/bi_import/gnc-plugin-bi-import.c:57
 msgid "Import Bills & Invoices..."
-msgstr "Importar pagamentos & faturas..."
+msgstr "Importar pagamentos e faturas..."
 
 #: ../src/plugins/bi_import/gnc-plugin-bi-import.c:57
 msgid "Import bills and invoices from a CSV text file"
@@ -18701,19 +18750,19 @@ msgstr ""
 "EstÃ¡ prestes a sobrescrever uma transaÃ§Ã£o existente. Tem a certeza que o "
 "quer fazer?"
 
-#: ../src/register/ledger-core/split-register-control.c:1356
+#: ../src/register/ledger-core/split-register-control.c:1359
 msgid "You need to select a split in order to modify its exchange rate."
 msgstr "Tem de selecionar uma parcela para poder alterar a taxa de cÃ¢mbio."
 
-#: ../src/register/ledger-core/split-register-control.c:1383
+#: ../src/register/ledger-core/split-register-control.c:1386
 msgid "The entered account could not be found."
 msgstr "A conta inserida nÃ£o pÃ´de ser encontrada."
 
-#: ../src/register/ledger-core/split-register-control.c:1482
+#: ../src/register/ledger-core/split-register-control.c:1485
 msgid "The split's amount is zero, so no exchange rate is needed."
 msgstr "O montante da parcela Ã© zero, nÃ£o Ã© necessÃ¡ria uma taxa de cÃ¢mbio."
 
-#: ../src/register/ledger-core/split-register-control.c:1533
+#: ../src/register/ledger-core/split-register-control.c:1536
 msgid ""
 "The current transaction has been changed. Would you like to record the "
 "changes before moving to a new transaction, discard the changes, or return "
@@ -18941,7 +18990,7 @@ msgstr "Ordem"
 #: ../src/report/standard-reports/budget-balance-sheet.scm:103
 #: ../src/report/standard-reports/budget-flow.scm:47
 #: ../src/report/standard-reports/budget-income-statement.scm:118
-#: ../src/report/standard-reports/cash-flow.scm:51
+#: ../src/report/standard-reports/cash-flow.scm:53
 #: ../src/report/standard-reports/category-barchart.scm:78
 #: ../src/report/standard-reports/daily-reports.scm:58
 #: ../src/report/standard-reports/equity-statement.scm:79
@@ -18966,8 +19015,8 @@ msgstr "Moeda do relatÃ³rio"
 #: ../src/report/standard-reports/budget-balance-sheet.scm:104
 #: ../src/report/standard-reports/budget-flow.scm:44
 #: ../src/report/standard-reports/budget-income-statement.scm:119
-#: ../src/report/standard-reports/budget.scm:49
-#: ../src/report/standard-reports/cash-flow.scm:52
+#: ../src/report/standard-reports/budget.scm:50
+#: ../src/report/standard-reports/cash-flow.scm:54
 #: ../src/report/standard-reports/category-barchart.scm:79
 #: ../src/report/standard-reports/daily-reports.scm:59
 #: ../src/report/standard-reports/equity-statement.scm:80
@@ -19038,7 +19087,7 @@ msgstr "Ascendente"
 
 #: ../src/report/business-reports/aging.scm:365
 msgid "0 -> $999,999.99, A->Z."
-msgstr "0 -> $999,999.99, A->Z."
+msgstr "0 -> â‚¬999,999.99, A->Z."
 
 #: ../src/report/business-reports/aging.scm:366
 msgid "Decreasing"
@@ -19046,7 +19095,7 @@ msgstr "Descendente"
 
 #: ../src/report/business-reports/aging.scm:366
 msgid "$999,999.99 -> $0, Z->A."
-msgstr "$999,999.99 -> $0, Z->A."
+msgstr "â‚¬999,999.99 -> â‚¬0, Z->A"
 
 #: ../src/report/business-reports/aging.scm:373
 msgid ""
@@ -19222,7 +19271,7 @@ msgstr "NÃºmero mÃ¡ximo de nÃveis mostrados na Ã¡rvore de contas."
 #: ../src/report/standard-reports/balance-sheet.scm:94
 #: ../src/report/standard-reports/budget-balance-sheet.scm:59
 #: ../src/report/standard-reports/budget-income-statement.scm:83
-#: ../src/report/standard-reports/budget.scm:67
+#: ../src/report/standard-reports/budget.scm:68
 #: ../src/report/standard-reports/income-statement.scm:70
 msgid "Flatten list to depth limit"
 msgstr "Aplanar lista para o limite de profundidade"
@@ -19231,7 +19280,7 @@ msgstr "Aplanar lista para o limite de profundidade"
 #: ../src/report/standard-reports/balance-sheet.scm:96
 #: ../src/report/standard-reports/budget-balance-sheet.scm:61
 #: ../src/report/standard-reports/budget-income-statement.scm:85
-#: ../src/report/standard-reports/budget.scm:69
+#: ../src/report/standard-reports/budget.scm:70
 #: ../src/report/standard-reports/income-statement.scm:72
 msgid "Displays accounts which exceed the depth limit at the depth limit."
 msgstr ""
@@ -19719,7 +19768,7 @@ msgstr ""
 #: ../src/report/business-reports/fancy-invoice.scm:260
 #: ../src/report/business-reports/invoice.scm:245
 #: ../src/report/business-reports/taxinvoice.scm:166
-#: ../src/report/standard-reports/register.scm:405
+#: ../src/report/standard-reports/register.scm:411
 #: ../src/report/standard-reports/transaction.scm:942
 msgid "Display the date?"
 msgstr "Mostrar a data?"
@@ -19727,7 +19776,7 @@ msgstr "Mostrar a data?"
 #: ../src/report/business-reports/easy-invoice.scm:255
 #: ../src/report/business-reports/fancy-invoice.scm:265
 #: ../src/report/business-reports/invoice.scm:250
-#: ../src/report/standard-reports/register.scm:420
+#: ../src/report/standard-reports/register.scm:426
 #: ../src/report/standard-reports/transaction.scm:947
 msgid "Display the description?"
 msgstr "Mostrar a descriÃ§Ã£o?"
@@ -19810,19 +19859,19 @@ msgstr "Mostrar o valor da entrada?"
 #: ../src/report/business-reports/invoice.scm:336
 #: ../src/report/business-reports/taxinvoice.scm:93
 #: ../src/report/report-system/report.scm:73
-#: ../src/report/standard-reports/register.scm:404
 #: ../src/report/standard-reports/register.scm:410
-#: ../src/report/standard-reports/register.scm:414
-#: ../src/report/standard-reports/register.scm:419
-#: ../src/report/standard-reports/register.scm:424
-#: ../src/report/standard-reports/register.scm:429
-#: ../src/report/standard-reports/register.scm:434
-#: ../src/report/standard-reports/register.scm:439
-#: ../src/report/standard-reports/register.scm:444
-#: ../src/report/standard-reports/register.scm:449
-#: ../src/report/standard-reports/register.scm:458
-#: ../src/report/standard-reports/register.scm:463
-#: ../src/report/standard-reports/register.scm:468
+#: ../src/report/standard-reports/register.scm:416
+#: ../src/report/standard-reports/register.scm:420
+#: ../src/report/standard-reports/register.scm:425
+#: ../src/report/standard-reports/register.scm:430
+#: ../src/report/standard-reports/register.scm:435
+#: ../src/report/standard-reports/register.scm:440
+#: ../src/report/standard-reports/register.scm:445
+#: ../src/report/standard-reports/register.scm:450
+#: ../src/report/standard-reports/register.scm:455
+#: ../src/report/standard-reports/register.scm:464
+#: ../src/report/standard-reports/register.scm:469
+#: ../src/report/standard-reports/register.scm:474
 #: ../src/report/standard-reports/transaction.scm:380
 #: ../src/report/standard-reports/transaction.scm:382
 #: ../src/report/standard-reports/transaction.scm:384
@@ -19883,7 +19932,7 @@ msgstr "Mostrar todos os impostos individuais?"
 #: ../src/report/standard-reports/general-journal.scm:118
 #: ../src/report/standard-reports/general-ledger.scm:93
 #: ../src/report/standard-reports/general-ledger.scm:113
-#: ../src/report/standard-reports/register.scm:468
+#: ../src/report/standard-reports/register.scm:474
 #: ../src/report/standard-reports/transaction.scm:960
 msgid "Totals"
 msgstr "Totais"
@@ -19891,7 +19940,7 @@ msgstr "Totais"
 #: ../src/report/business-reports/easy-invoice.scm:315
 #: ../src/report/business-reports/fancy-invoice.scm:310
 #: ../src/report/business-reports/invoice.scm:295
-#: ../src/report/standard-reports/register.scm:469
+#: ../src/report/standard-reports/register.scm:475
 #: ../src/report/standard-reports/transaction.scm:960
 msgid "Display the totals?"
 msgstr "Mostrar os totais?"
@@ -20869,7 +20918,7 @@ msgstr ""
 
 #: ../src/report/locale-specific/us/taxtxf.scm:3532
 msgid "Tax Schedule Report & TXF Export"
-msgstr "RelatÃ³rio de impostos & ExportaÃ§Ã£o Mod. IRX"
+msgstr "RelatÃ³rio de impostos & ExportaÃ§Ã£o Mod. IRS"
 
 #. 'menu-path (list gnc:menuname-taxes)
 #: ../src/report/locale-specific/us/taxtxf.scm:3534
@@ -20899,6 +20948,12 @@ msgstr ""
 "Esta pÃ¡gina mostra detalhes de transaÃ§Ãµes para contas releventes de imposto "
 "sobre o rendimento."
 
+#. we must confirm the user wants to delete their precious custom report!
+#: ../src/report/report-gnome/dialog-custom-report.c:315
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Tem a certeza que quer eliminar %s?"
+
 #: ../src/report/report-gnome/dialog-custom-report.c:421
 msgid "You must select a report configuration to load."
 msgstr "Tem de selecionar uma configuraÃ§Ã£o de relatÃ³rio para carregar."
@@ -21885,11 +21940,11 @@ msgstr "GrÃ¡fico circular de despesas"
 
 #: ../src/report/standard-reports/account-piecharts.scm:40
 msgid "Asset Piechart"
-msgstr "GrÃ¡fico circular de ativos"
+msgstr "GrÃ¡fico circular do ativo"
 
 #: ../src/report/standard-reports/account-piecharts.scm:41
 msgid "Liability Piechart"
-msgstr "GrÃ¡fico circular de passivos"
+msgstr "GrÃ¡fico circular do passivo"
 
 #: ../src/report/standard-reports/account-piecharts.scm:46
 msgid "Shows a piechart with the Income per given time interval"
@@ -21914,7 +21969,7 @@ msgstr "Mostra um grÃ¡fico circular com o saldo do passivo num dado tempo"
 #. Option names
 #: ../src/report/standard-reports/account-piecharts.scm:63
 #: ../src/report/standard-reports/average-balance.scm:38
-#: ../src/report/standard-reports/cash-flow.scm:44
+#: ../src/report/standard-reports/cash-flow.scm:46
 #: ../src/report/standard-reports/category-barchart.scm:75
 #: ../src/report/standard-reports/daily-reports.scm:56
 #: ../src/report/standard-reports/equity-statement.scm:67
@@ -21929,7 +21984,7 @@ msgstr "Data inicial"
 
 #: ../src/report/standard-reports/account-piecharts.scm:64
 #: ../src/report/standard-reports/average-balance.scm:39
-#: ../src/report/standard-reports/cash-flow.scm:45
+#: ../src/report/standard-reports/cash-flow.scm:47
 #: ../src/report/standard-reports/category-barchart.scm:76
 #: ../src/report/standard-reports/daily-reports.scm:57
 #: ../src/report/standard-reports/equity-statement.scm:68
@@ -22248,8 +22303,8 @@ msgstr "Mostrar as notas de uma conta."
 #: ../src/report/standard-reports/balance-sheet.scm:143
 #: ../src/report/standard-reports/budget-balance-sheet.scm:108
 #: ../src/report/standard-reports/budget-income-statement.scm:123
-#: ../src/report/standard-reports/budget.scm:50
-#: ../src/report/standard-reports/cash-flow.scm:53
+#: ../src/report/standard-reports/budget.scm:51
+#: ../src/report/standard-reports/cash-flow.scm:55
 #: ../src/report/standard-reports/equity-statement.scm:84
 #: ../src/report/standard-reports/income-statement.scm:116
 #: ../src/report/standard-reports/sx-summary.scm:100
@@ -22261,7 +22316,7 @@ msgstr "Mostrar taxas de cÃ¢mbio"
 #: ../src/report/standard-reports/balance-sheet.scm:144
 #: ../src/report/standard-reports/budget-balance-sheet.scm:109
 #: ../src/report/standard-reports/budget-income-statement.scm:124
-#: ../src/report/standard-reports/cash-flow.scm:79
+#: ../src/report/standard-reports/cash-flow.scm:81
 #: ../src/report/standard-reports/equity-statement.scm:85
 #: ../src/report/standard-reports/income-statement.scm:117
 #: ../src/report/standard-reports/sx-summary.scm:101
@@ -22312,7 +22367,7 @@ msgstr "TÃtulo da conta"
 
 #: ../src/report/standard-reports/advanced-portfolio.scm:39
 msgid "Advanced Portfolio"
-msgstr "ProtfÃ³lio avanÃ§ado"
+msgstr "PortfÃ³lio avanÃ§ado"
 
 #: ../src/report/standard-reports/advanced-portfolio.scm:42
 #: ../src/report/standard-reports/portfolio.scm:38
@@ -22384,7 +22439,8 @@ msgstr "Usar o mÃ©todo last-in-first-out para base."
 
 #: ../src/report/standard-reports/advanced-portfolio.scm:103
 msgid "Prefer use of price editor pricing over transactions, where applicable."
-msgstr "Preferir o preÃ§Ã¡rio do editor de preÃ§os Ã s transaÃ§Ãµes, onde aplicÃ¡vel."
+msgstr ""
+"Preferir o preÃ§Ã¡rio do editor de cotaÃ§Ãµes Ã s transaÃ§Ãµes, onde aplicÃ¡vel."
 
 #: ../src/report/standard-reports/advanced-portfolio.scm:109
 msgid "How to report commissions and other brokerage fees."
@@ -22455,12 +22511,12 @@ msgid "Basis"
 msgstr "Base"
 
 #: ../src/report/standard-reports/advanced-portfolio.scm:1072
-#: ../src/report/standard-reports/cash-flow.scm:458
+#: ../src/report/standard-reports/cash-flow.scm:309
 msgid "Money In"
 msgstr "Dinheiro entrado"
 
 #: ../src/report/standard-reports/advanced-portfolio.scm:1073
-#: ../src/report/standard-reports/cash-flow.scm:503
+#: ../src/report/standard-reports/cash-flow.scm:354
 msgid "Money Out"
 msgstr "Dinheiro saÃdo"
 
@@ -22775,7 +22831,7 @@ msgstr ""
 #: ../src/report/standard-reports/budget-barchart.scm:62
 #: ../src/report/standard-reports/budget-flow.scm:58
 #: ../src/report/standard-reports/budget-income-statement.scm:60
-#: ../src/report/standard-reports/budget.scm:84
+#: ../src/report/standard-reports/budget.scm:85
 msgid "Budget to use."
 msgstr "OrÃ§amento a usar."
 
@@ -23026,14 +23082,14 @@ msgstr "Perda lÃquida"
 
 #: ../src/report/standard-reports/budget-income-statement.scm:758
 msgid "Budget Income Statement"
-msgstr "DeclaraÃ§Ã£o de orÃ§amento de receita"
+msgstr "Extrato de receita do orÃ§amento"
 
 #: ../src/report/standard-reports/budget-income-statement.scm:759
 msgid "Budget Profit & Loss"
 msgstr "OrÃ§amento de Lucro & PrejuÃzo"
 
 #. for gnc-build-url
-#: ../src/report/standard-reports/budget.scm:38
+#: ../src/report/standard-reports/budget.scm:39
 msgid "Budget Report"
 msgstr "RelatÃ³rio de orÃ§amento"
 
@@ -23041,62 +23097,62 @@ msgstr "RelatÃ³rio de orÃ§amento"
 #. in *one* place.
 #. (define optname-from-date (N_ "Start Date"))
 #. (define optname-to-date (N_ "End Date"))
-#: ../src/report/standard-reports/budget.scm:45
-#: ../src/report/standard-reports/cash-flow.scm:47
+#: ../src/report/standard-reports/budget.scm:46
+#: ../src/report/standard-reports/cash-flow.scm:49
 msgid "Account Display Depth"
 msgstr "Profundidade da Ã¡rvore de contas"
 
-#: ../src/report/standard-reports/budget.scm:46
-#: ../src/report/standard-reports/cash-flow.scm:48
+#: ../src/report/standard-reports/budget.scm:47
+#: ../src/report/standard-reports/cash-flow.scm:50
 msgid "Always show sub-accounts"
 msgstr "Mostrar sempre subcontas"
 
-#: ../src/report/standard-reports/budget.scm:51
-#: ../src/report/standard-reports/cash-flow.scm:54
+#: ../src/report/standard-reports/budget.scm:52
+#: ../src/report/standard-reports/cash-flow.scm:56
 msgid "Show Full Account Names"
 msgstr "Mostrar nomes de conta completos"
 
-#: ../src/report/standard-reports/budget.scm:52
+#: ../src/report/standard-reports/budget.scm:53
 msgid "Select Columns"
 msgstr "Selecionar colunas"
 
-#: ../src/report/standard-reports/budget.scm:53
+#: ../src/report/standard-reports/budget.scm:54
 msgid "Show Budget"
 msgstr "Mostrar orÃ§amento"
 
-#: ../src/report/standard-reports/budget.scm:54
+#: ../src/report/standard-reports/budget.scm:55
 msgid "Display a column for the budget values."
 msgstr "Mostrar uma coluna para os valores orÃ§amentados."
 
-#: ../src/report/standard-reports/budget.scm:55
+#: ../src/report/standard-reports/budget.scm:56
 msgid "Show Actual"
 msgstr "Mostrar atual"
 
-#: ../src/report/standard-reports/budget.scm:56
+#: ../src/report/standard-reports/budget.scm:57
 msgid "Display a column for the actual values."
 msgstr "Mostrar uma coluna para os valores atuais."
 
-#: ../src/report/standard-reports/budget.scm:57
+#: ../src/report/standard-reports/budget.scm:58
 msgid "Show Difference"
 msgstr "Mostrar diferenÃ§a"
 
-#: ../src/report/standard-reports/budget.scm:58
+#: ../src/report/standard-reports/budget.scm:59
 msgid "Display the difference as budget - actual."
 msgstr "Mostrar a diferenÃ§a como orÃ§amento - atual."
 
-#: ../src/report/standard-reports/budget.scm:59
+#: ../src/report/standard-reports/budget.scm:60
 msgid "Show Column with Totals"
 msgstr "Mostrar coluna de totais"
 
-#: ../src/report/standard-reports/budget.scm:60
+#: ../src/report/standard-reports/budget.scm:61
 msgid "Display a column with the row totals."
 msgstr "Mostrar uma coluna com os totais da linha."
 
-#: ../src/report/standard-reports/budget.scm:61
+#: ../src/report/standard-reports/budget.scm:62
 msgid "Roll up budget amounts to parent"
 msgstr "Rolar montantes orÃ§amentados para mÃ£e"
 
-#: ../src/report/standard-reports/budget.scm:62
+#: ../src/report/standard-reports/budget.scm:63
 msgid ""
 "If parent account does not have its own budget value, use the sum of the "
 "child account budget values."
@@ -23104,11 +23160,11 @@ msgstr ""
 "Se a conta-mÃ£e nÃ£o tem o seu prÃ³prio valor orÃ§amentado, usar a soma dos "
 "valores orÃ§amentados das contas-filho."
 
-#: ../src/report/standard-reports/budget.scm:63
+#: ../src/report/standard-reports/budget.scm:64
 msgid "Include accounts with zero total balances and budget values"
 msgstr "Incluir contas com saldos zero e valores orÃ§amentados"
 
-#: ../src/report/standard-reports/budget.scm:64
+#: ../src/report/standard-reports/budget.scm:65
 msgid ""
 "Include accounts with zero total (recursive) balances and budget values in "
 "this report."
@@ -23116,11 +23172,11 @@ msgstr ""
 "Incluir contas com saldo total zero (recursivo) e valores orÃ§amentados neste "
 "relatÃ³rio."
 
-#: ../src/report/standard-reports/budget.scm:65
+#: ../src/report/standard-reports/budget.scm:66
 msgid "Compress prior/later periods"
 msgstr "Comprimir perÃodos anteriores/posteriores"
 
-#: ../src/report/standard-reports/budget.scm:66
+#: ../src/report/standard-reports/budget.scm:67
 msgid ""
 "Accumulate columns for periods before and after the current period to allow "
 "focus on the current period."
@@ -23128,57 +23184,56 @@ msgstr ""
 "Acumular colunas para perÃodos antes e depois do perÃodo atual para permitir "
 "focar a atenÃ§Ã£o no perÃodo atual."
 
-#: ../src/report/standard-reports/budget.scm:104
-#: ../src/report/standard-reports/cash-flow.scm:85
+#: ../src/report/standard-reports/budget.scm:105
+#: ../src/report/standard-reports/cash-flow.scm:87
 msgid "Show full account names (including parent accounts)."
 msgstr "Mostrar nomes de conta completos (incluindo contas-mÃ£e)."
 
-#: ../src/report/standard-reports/budget.scm:447
+#: ../src/report/standard-reports/budget.scm:448
 msgid "Bgt"
 msgstr "OrÃ§"
 
-#: ../src/report/standard-reports/budget.scm:455
+#: ../src/report/standard-reports/budget.scm:456
 msgid "Act"
 msgstr "Real"
 
-#: ../src/report/standard-reports/budget.scm:463
+#: ../src/report/standard-reports/budget.scm:464
 msgid "Diff"
 msgstr "Dif."
 
-#: ../src/report/standard-reports/budget.scm:661
+#: ../src/report/standard-reports/budget.scm:621
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#. for gnc-build-url
-#: ../src/report/standard-reports/cash-flow.scm:40
+#: ../src/report/standard-reports/cash-flow.scm:42
 msgid "Cash Flow"
 msgstr "Fluxo de dinheiro"
 
-#: ../src/report/standard-reports/cash-flow.scm:55
+#: ../src/report/standard-reports/cash-flow.scm:57
 msgid "Include Trading Accounts in report"
 msgstr "Incluir contas de negociaÃ§Ã£o no relatÃ³rio"
 
-#: ../src/report/standard-reports/cash-flow.scm:104
+#: ../src/report/standard-reports/cash-flow.scm:106
 msgid "Include transfers to and from Trading Accounts in the report."
 msgstr "Incluir transferÃªncias de e para contas de negociaÃ§Ã£o no relatÃ³rio."
 
-#: ../src/report/standard-reports/cash-flow.scm:390
+#: ../src/report/standard-reports/cash-flow.scm:241
 msgid "%s and subaccounts"
 msgstr "%s e subcontas"
 
-#: ../src/report/standard-reports/cash-flow.scm:391
+#: ../src/report/standard-reports/cash-flow.scm:242
 msgid "%s and selected subaccounts"
 msgstr "%s e subcontas selecionadas"
 
-#: ../src/report/standard-reports/cash-flow.scm:423
+#: ../src/report/standard-reports/cash-flow.scm:274
 msgid "Money into selected accounts comes from"
 msgstr "Dinheiro entrado nas contas selecionadas vem de"
 
-#: ../src/report/standard-reports/cash-flow.scm:468
+#: ../src/report/standard-reports/cash-flow.scm:319
 msgid "Money out of selected accounts goes to"
 msgstr "Dinheiro saÃdo das contas selecionadas vai para"
 
-#: ../src/report/standard-reports/cash-flow.scm:513
+#: ../src/report/standard-reports/cash-flow.scm:364
 msgid "Difference"
 msgstr "DiferenÃ§a"
 
@@ -23387,7 +23442,7 @@ msgstr "DiÃ¡rio geral"
 #: ../src/report/standard-reports/general-journal.scm:109
 #: ../src/report/standard-reports/general-ledger.scm:78
 #: ../src/report/standard-reports/register.scm:145
-#: ../src/report/standard-reports/register.scm:410
+#: ../src/report/standard-reports/register.scm:416
 #: ../src/report/standard-reports/transaction.scm:386
 #: ../src/report/standard-reports/transaction.scm:945
 msgid "Num/Action"
@@ -23397,7 +23452,7 @@ msgstr "NÃºm/AÃ§Ã£o"
 #: ../src/report/standard-reports/general-journal.scm:117
 #: ../src/report/standard-reports/general-ledger.scm:92
 #: ../src/report/standard-reports/general-ledger.scm:112
-#: ../src/report/standard-reports/register.scm:463
+#: ../src/report/standard-reports/register.scm:469
 #: ../src/report/standard-reports/transaction.scm:404
 #: ../src/report/standard-reports/transaction.scm:959
 msgid "Running Balance"
@@ -23566,7 +23621,7 @@ msgstr "DeclaraÃ§Ã£o de rendimento"
 
 #: ../src/report/standard-reports/income-statement.scm:719
 msgid "Profit & Loss"
-msgstr "Lucro & Perda"
+msgstr "Lucro & PrejuÃzo"
 
 #. included since Bug726449
 #. for regexp-substitute/global, used by jpqplot
@@ -23723,10 +23778,6 @@ msgstr "TransaÃ§Ãµes atuais"
 msgid "The instantaneous price of actual currency transactions in the past."
 msgstr "O preÃ§o instantÃ¢neo de transaÃ§Ãµes de moeda atuais no passado."
 
-#: ../src/report/standard-reports/price-scatter.scm:96
-msgid "Price Database"
-msgstr "Base de dados de preÃ§o"
-
 #: ../src/report/standard-reports/price-scatter.scm:97
 msgid "The recorded prices."
 msgstr "Os preÃ§os gravados."
@@ -23811,103 +23862,103 @@ msgstr "Valor de dÃ©bito"
 msgid "Credit Value"
 msgstr "Valor de crÃ©dito"
 
-#: ../src/report/standard-reports/register.scm:399
+#: ../src/report/standard-reports/register.scm:405
 msgid "The title of the report."
 msgstr "O tÃtulo do relatÃ³rio."
 
-#: ../src/report/standard-reports/register.scm:411
+#: ../src/report/standard-reports/register.scm:417
 msgid "Display the check number/action?"
 msgstr "Mostrar o nÃºmero/aÃ§Ã£o do cheque?"
 
-#: ../src/report/standard-reports/register.scm:415
+#: ../src/report/standard-reports/register.scm:421
 #: ../src/report/standard-reports/transaction.scm:945
 #: ../src/report/standard-reports/transaction.scm:946
 msgid "Display the check number?"
 msgstr "Mostrar o nÃºmero do cheque?"
 
-#: ../src/report/standard-reports/register.scm:425
+#: ../src/report/standard-reports/register.scm:431
 #: ../src/report/standard-reports/transaction.scm:973
 msgid "Display the memo?"
 msgstr "Mostrar o memorando?"
 
-#: ../src/report/standard-reports/register.scm:430
+#: ../src/report/standard-reports/register.scm:436
 msgid "Display the account?"
 msgstr "Mostrar a conta?"
 
-#: ../src/report/standard-reports/register.scm:435
+#: ../src/report/standard-reports/register.scm:441
 #: ../src/report/standard-reports/transaction.scm:956
 msgid "Display the number of shares?"
 msgstr "Mostrar o nÃºmero de aÃ§Ãµes?"
 
-#: ../src/report/standard-reports/register.scm:440
+#: ../src/report/standard-reports/register.scm:446
 msgid "Display the name of lot the shares are in?"
 msgstr "Mostrar o nome do lote em que as aÃ§Ãµes estÃ£o?"
 
-#: ../src/report/standard-reports/register.scm:445
+#: ../src/report/standard-reports/register.scm:451
 #: ../src/report/standard-reports/transaction.scm:957
 msgid "Display the shares price?"
 msgstr "Mostrar a cotaÃ§Ã£o das aÃ§Ãµes?"
 
-#: ../src/report/standard-reports/register.scm:450
+#: ../src/report/standard-reports/register.scm:456
 #: ../src/report/standard-reports/transaction.scm:984
 msgid "Display the amount?"
 msgstr "Mostrar o montante?"
 
-#: ../src/report/standard-reports/register.scm:453
+#: ../src/report/standard-reports/register.scm:459
 #: ../src/report/standard-reports/transaction.scm:624
 #: ../src/report/standard-reports/transaction.scm:988
 msgid "Single"
 msgstr "Ãšnica"
 
-#: ../src/report/standard-reports/register.scm:453
+#: ../src/report/standard-reports/register.scm:459
 #: ../src/report/standard-reports/transaction.scm:988
 msgid "Single Column Display."
 msgstr "ExibiÃ§Ã£o em coluna Ãºnica."
 
-#: ../src/report/standard-reports/register.scm:454
+#: ../src/report/standard-reports/register.scm:460
 #: ../src/report/standard-reports/transaction.scm:989
 msgid "Double"
 msgstr "Dupla"
 
-#: ../src/report/standard-reports/register.scm:454
+#: ../src/report/standard-reports/register.scm:460
 #: ../src/report/standard-reports/transaction.scm:989
 msgid "Two Column Display."
 msgstr "ExibiÃ§Ã£o em coluna dupla."
 
-#: ../src/report/standard-reports/register.scm:459
+#: ../src/report/standard-reports/register.scm:465
 msgid "Display the value in transaction currency?"
 msgstr "Mostrar o valor na moeda da transaÃ§Ã£o?"
 
-#: ../src/report/standard-reports/register.scm:464
+#: ../src/report/standard-reports/register.scm:470
 #: ../src/report/standard-reports/transaction.scm:959
 msgid "Display a running balance?"
 msgstr "Mostrar um saldo em execuÃ§Ã£o?"
 
-#: ../src/report/standard-reports/register.scm:617
+#: ../src/report/standard-reports/register.scm:623
 msgid "Total Debits"
 msgstr "Total de dÃ©bitos"
 
-#: ../src/report/standard-reports/register.scm:619
+#: ../src/report/standard-reports/register.scm:625
 msgid "Total Credits"
 msgstr "Total de crÃ©ditos"
 
-#: ../src/report/standard-reports/register.scm:621
+#: ../src/report/standard-reports/register.scm:627
 msgid "Total Value Debits"
 msgstr "Valor total de dÃ©bitos"
 
-#: ../src/report/standard-reports/register.scm:623
+#: ../src/report/standard-reports/register.scm:629
 msgid "Total Value Credits"
 msgstr "Valor total de crÃ©ditos"
 
-#: ../src/report/standard-reports/register.scm:626
+#: ../src/report/standard-reports/register.scm:632
 msgid "Net Change"
 msgstr "AlteraÃ§Ã£o lÃquida"
 
-#: ../src/report/standard-reports/register.scm:629
+#: ../src/report/standard-reports/register.scm:635
 msgid "Value Change"
 msgstr "AlteraÃ§Ã£o de valor"
 
-#: ../src/report/standard-reports/register.scm:788
+#: ../src/report/standard-reports/register.scm:794
 msgid "Client"
 msgstr "Cliente"
 
@@ -25219,16 +25270,16 @@ msgid "GnuCash ~a has lots of nice features. Here are a few."
 msgstr ""
 "O GnuCash ~a tem muitas funcionalidades agradÃ¡veis. Aqui estÃ£o algumas."
 
-#: ../src/scm/price-quotes.scm:500 ../src/scm/price-quotes.scm:501
+#: ../src/scm/price-quotes.scm:486 ../src/scm/price-quotes.scm:487
 msgid "No commodities marked for quote retrieval."
 msgstr "Sem mercadorias marcadas para obtenÃ§Ã£o de cotaÃ§Ã£o."
 
-#: ../src/scm/price-quotes.scm:505 ../src/scm/price-quotes.scm:506
-#: ../src/scm/price-quotes.scm:529 ../src/scm/price-quotes.scm:532
+#: ../src/scm/price-quotes.scm:491 ../src/scm/price-quotes.scm:492
+#: ../src/scm/price-quotes.scm:515 ../src/scm/price-quotes.scm:518
 msgid "Unable to get quotes or diagnose the problem."
 msgstr "ImpossÃvel obter cotaÃ§Ãµes ou diagnosticar o problema."
 
-#: ../src/scm/price-quotes.scm:511 ../src/scm/price-quotes.scm:513
+#: ../src/scm/price-quotes.scm:497 ../src/scm/price-quotes.scm:499
 msgid ""
 "You are missing some needed Perl libraries.\n"
 "Run 'gnc-fq-update' as root to install them."
@@ -25236,36 +25287,36 @@ msgstr ""
 "Tem algumas bibliotecas Perl em falta.\n"
 "Execute \"gnc-fq-update\" como root para as instalar."
 
-#: ../src/scm/price-quotes.scm:519 ../src/scm/price-quotes.scm:520
+#: ../src/scm/price-quotes.scm:505 ../src/scm/price-quotes.scm:506
 msgid "There was a system error while retrieving the price quotes."
 msgstr "Houve um erro de sistema ao obter as cotaÃ§Ãµes."
 
-#: ../src/scm/price-quotes.scm:525 ../src/scm/price-quotes.scm:526
+#: ../src/scm/price-quotes.scm:511 ../src/scm/price-quotes.scm:512
 msgid "There was an unknown error while retrieving the price quotes."
 msgstr "Houve um erro desconhecido ao obter as cotaÃ§Ãµes."
 
-#: ../src/scm/price-quotes.scm:542 ../src/scm/price-quotes.scm:553
-#: ../src/scm/price-quotes.scm:561
+#: ../src/scm/price-quotes.scm:528 ../src/scm/price-quotes.scm:539
+#: ../src/scm/price-quotes.scm:547
 msgid "Unable to retrieve quotes for these items:"
 msgstr "ImpossÃvel obter cotaÃ§Ãµes para estes itens:"
 
-#: ../src/scm/price-quotes.scm:547
+#: ../src/scm/price-quotes.scm:533
 msgid "Continue using only the good quotes?"
 msgstr "Continuar a usar sÃ³ as cotaÃ§Ãµes boas?"
 
-#: ../src/scm/price-quotes.scm:566
+#: ../src/scm/price-quotes.scm:552
 msgid "Continuing with good quotes."
 msgstr "Continuar com as cotaÃ§Ãµes boas."
 
-#: ../src/scm/price-quotes.scm:581 ../src/scm/price-quotes.scm:590
+#: ../src/scm/price-quotes.scm:567 ../src/scm/price-quotes.scm:576
 msgid "Unable to create prices for these items:"
 msgstr "ImpossÃvel criar cotaÃ§Ãµes para estes itens:"
 
-#: ../src/scm/price-quotes.scm:586
+#: ../src/scm/price-quotes.scm:572
 msgid "Add remaining good quotes?"
 msgstr "Adicionar cotaÃ§Ãµes boas restantes?"
 
-#: ../src/scm/price-quotes.scm:595
+#: ../src/scm/price-quotes.scm:581
 msgid "Adding remaining good quotes."
 msgstr "Adicionar as cotaÃ§Ãµes boas restantes."
 
@@ -25624,3 +25675,21 @@ msgstr ""
 "Para procurar em todas as suas transaÃ§Ãµes, comece uma procura (Editar -> "
 "Localizar...) na pÃ¡gina principal do plano de contas. Para limitar a procura "
 "a uma conta especifica, comece a procura no diÃ¡rio dessa conta."
+
+#~ msgid "Dummy message"
+#~ msgstr "Mensagem de erro"
+
+#~ msgid "postd"
+#~ msgstr "emitido"
+
+#~ msgid "duedate"
+#~ msgstr "data de vencimento"
+
+#~ msgid "acct"
+#~ msgstr "conta"
+
+#~ msgid "question"
+#~ msgstr "questÃ£o"
+
+#~ msgid "(USD)"
+#~ msgstr "(EUR)"

commit fdfea816e1ece52925b851eea10fa4087a748dbf
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jan 8 16:41:43 2016 -0800

    Refactor the horror of gnc_sxed_check_consistent().
    
    Several extract-function refactors plus some whitespace cleanup.

diff --git a/src/gnome/dialog-sx-editor.c b/src/gnome/dialog-sx-editor.c
index 2331eec..30d2b79 100644
--- a/src/gnome/dialog-sx-editor.c
+++ b/src/gnome/dialog-sx-editor.c
@@ -439,6 +439,13 @@ typedef struct _txnCreditDebitSums
     gnc_numeric debitSum;
 } txnCreditDebitSums;
 
+static txnCreditDebitSums *
+tcds_new (void)
+{
+    txnCreditDebitSums *tcds = g_new0 (txnCreditDebitSums, 1);
+    tcds->creditSum = tcds->debitSum = gnc_numeric_zero();
+    return tcds;
+}
 
 static
 void
@@ -451,42 +458,232 @@ set_sums_to_zero( gpointer key,
     tcds->debitSum  = gnc_numeric_zero();
 }
 
+inline static gnc_numeric
+tcds_difference (txnCreditDebitSums *tcds)
+{
+    return gnc_numeric_sub_fixed (tcds->debitSum, tcds->creditSum);
+}
 
 static void
-check_credit_debit_balance( gpointer key,
-                            gpointer val,
-                            gpointer ud )
+check_credit_debit_balance (gpointer key, gpointer val, gpointer ud)
 {
     txnCreditDebitSums *tcds = (txnCreditDebitSums*)val;
     gboolean *unbalanced = (gboolean*)ud;
-    *unbalanced |= !(gnc_numeric_zero_p(
-                         gnc_numeric_sub_fixed( tcds->debitSum,
-                                                tcds->creditSum ) ));
+    gnc_numeric diff = tcds_difference (tcds);
+    const char *result = gnc_numeric_zero_p (diff) ? "true" : "false";
+    *unbalanced |= !(gnc_numeric_zero_p(diff));
+
+    DEBUG ("%p | %s [%s - %s = %s]", key, result,
+           gnc_numeric_to_string (tcds->debitSum),
+           gnc_numeric_to_string (tcds->creditSum),
+           gnc_numeric_to_string (diff));
+}
+
+static gboolean
+gnc_sxed_check_names (GncSxEditorDialog *sxed)
+{
+    gchar *name, *nameKey;
+    gboolean nameExists, nameHasChanged;
+    GList *sxList;
+
+    name = gtk_editable_get_chars( GTK_EDITABLE(sxed->nameEntry), 0, -1 );
+    if ( strlen(name) == 0 )
+    {
+        const char *sx_has_no_name_msg =
+            _( "Please name the Scheduled Transaction." );
+        gnc_error_dialog( sxed->dialog, "%s", sx_has_no_name_msg );
+        g_free( name );
+        return FALSE;
 
-    if (qof_log_check(G_LOG_DOMAIN, QOF_LOG_DEBUG))
+    }
+
+    nameExists = FALSE;
+    nameKey = g_utf8_collate_key(name, -1);
+    nameHasChanged =
+        (xaccSchedXactionGetName(sxed->sx) == NULL)
+        || (strcmp (xaccSchedXactionGetName(sxed->sx), name) != 0);
+    for (sxList = gnc_book_get_schedxactions(gnc_get_current_book())->sx_list;
+         nameHasChanged && !nameExists && sxList;
+         sxList = sxList->next)
+    {
+        char *existingName, *existingNameKey;
+        existingName = xaccSchedXactionGetName ((SchedXaction*)sxList->data);
+        existingNameKey = g_utf8_collate_key(existingName, -1);
+        nameExists |=  (strcmp(nameKey, existingNameKey) == 0 );
+        g_free (existingNameKey);
+    }
+    g_free (nameKey);
+    if (nameHasChanged && nameExists)
     {
-        if ( gnc_numeric_zero_p( gnc_numeric_sub_fixed( tcds->debitSum,
-                                                        tcds->creditSum ) ) )
+        const char *sx_has_existing_name_msg =
+            _("A Scheduled Transaction with the name \"%s\" already exists. "
+              "Are you sure you want to name this one the same?");
+        if (!gnc_verify_dialog (sxed->dialog, FALSE,
+                                sx_has_existing_name_msg, name))
         {
-            g_debug( "%p | true [%s - %s = %s]",
-                     key,
-                     gnc_numeric_to_string( tcds->debitSum ),
-                     gnc_numeric_to_string( tcds->creditSum ),
-                     gnc_numeric_to_string(gnc_numeric_sub_fixed( tcds->debitSum,
-                                                                  tcds->creditSum )) );
+            g_free (name);
+            return FALSE;
         }
-        else
+    }
+    g_free (name);
+    return TRUE;
+}
+
+static gboolean
+gnc_sxed_check_endpoint (GncSxEditorDialog *sxed)
+{
+    GDate startDate, endDate, nextDate;
+    GList *schedule = NULL;
+
+    if ( !gtk_toggle_button_get_active(sxed->optEndDate)
+         && !gtk_toggle_button_get_active(sxed->optEndCount)
+         && !gtk_toggle_button_get_active(sxed->optEndNone) )
+    {
+        const char *sx_end_spec_msg =
+            _("Please provide a valid end selection.");
+        gnc_error_dialog (sxed->dialog, "%s", sx_end_spec_msg);
+        return FALSE;
+    }
+
+    if (gtk_toggle_button_get_active (sxed->optEndCount))
+    {
+        gint occur  =
+            gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->endCountSpin));
+        gint rem =
+            gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->endRemainSpin));
+
+        if (occur == 0)
         {
-            g_debug( "%p | false [%s - %s = %s]",
-                     key,
-                     gnc_numeric_to_string( tcds->debitSum ),
-                     gnc_numeric_to_string( tcds->creditSum ),
-                     gnc_numeric_to_string(gnc_numeric_sub_fixed( tcds->debitSum,
-                                                                  tcds->creditSum )) );
+            const char *sx_occur_count_zero_msg =
+                _("There must be some number of occurrences.");
+            gnc_error_dialog (sxed->dialog, "%s", sx_occur_count_zero_msg);
+            return FALSE;
         }
+
+        if (rem > occur)
+        {
+            const char *sx_occur_counts_wrong_msg =
+                _("The number of remaining occurrences (%d) is greater than "
+                  "the number of total occurrences (%d).");
+            gnc_error_dialog (sxed->dialog, sx_occur_counts_wrong_msg,
+                              rem, occur);
+            return FALSE;
+        }
+        return TRUE;
+    }
+
+    g_date_clear (&endDate, 1);
+    if (gtk_toggle_button_get_active (sxed->optEndDate))
+    {
+        gnc_gdate_set_time64 (&endDate,
+                              gnc_date_edit_get_date (sxed-> endDateEntry));
+    }
+
+    g_date_clear (&nextDate, 1);
+    gnc_frequency_save_to_recurrence (sxed->gncfreq, &schedule, &startDate);
+    if (g_list_length(schedule) > 0)
+    {
+        g_date_subtract_days (&startDate, 1);
+        recurrenceListNextInstance (schedule, &startDate, &nextDate);
     }
+    recurrenceListFree (&schedule);
+
+    if (!g_date_valid(&nextDate) ||
+        (g_date_valid(&endDate) && (g_date_compare(&nextDate, &endDate) > 0)))
+    {
+        const char *invalid_sx_check_msg =
+            _("You have attempted to create a Scheduled Transaction which "
+              "will never run. Do you really want to do this?");
+        if (!gnc_verify_dialog(sxed->dialog, FALSE,
+                               "%s", invalid_sx_check_msg))
+            return FALSE;
+    }
+    return TRUE;
 }
 
+static gboolean
+gnc_sxed_check_autocreate (GncSxEditorDialog *sxed, int ttVarCount,
+                           int splitCount, gboolean multi_commodity)
+{
+    gboolean autocreateState;
+
+    autocreateState =
+        gtk_toggle_button_get_active (
+            GTK_TOGGLE_BUTTON(sxed->autocreateOpt));
+
+    if (((ttVarCount > 0) || multi_commodity) && autocreateState)
+    {
+        gnc_warning_dialog(sxed->dialog, "%s",
+                           _("Scheduled Transactions with variables "
+                             "or involving more than one commodity "
+                             "cannot be automatically created."));
+        return FALSE;
+    }
+
+    /* Fix for part of Bug#121740 -- auto-create transactions are
+     * only valid if there's actually a transaction to create. */
+    if (autocreateState && splitCount == 0)
+    {
+        gnc_warning_dialog(sxed->dialog, "%s",
+                           _("Scheduled Transactions without a template "
+                             "transaction cannot be automatically created.") );
+        return FALSE;
+    }
+    return TRUE;
+}
+
+static gboolean
+gnc_sxed_split_check_account (GncSxEditorDialog *sxed, Split *s,
+                     gnc_commodity *base_cmdty, gboolean *multi_cmdty)
+{
+    gnc_commodity *split_cmdty = NULL;
+    gnc_numeric split_amount = gnc_numeric_zero ();
+    Account *acct;
+    KvpFrame *f = xaccSplitGetSlots (s);
+    KvpValue *v = kvp_frame_get_slot_path(f, GNC_SX_ID, GNC_SX_ACCOUNT, NULL);
+    GncGUID *acct_guid = kvp_value_get_guid (v);
+    acct = xaccAccountLookup( acct_guid, gnc_get_current_book ());
+    split_cmdty = xaccAccountGetCommodity(acct);
+    split_amount = xaccSplitGetAmount(s);
+    if (!gnc_numeric_zero_p(split_amount) && base_cmdty == NULL)
+    {
+        base_cmdty = split_cmdty;
+    }
+    *multi_cmdty |= (!gnc_numeric_zero_p(split_amount) &&
+                    !gnc_commodity_equal(split_cmdty, base_cmdty));
+    return TRUE;
+}
+
+static gboolean
+gnc_sxed_split_calculate_formula (GncSxEditorDialog *sxed, Split *s,
+                                  GHashTable *vars, const char *key,
+                                  txnCreditDebitSums *tcds)
+{
+    KvpFrame *f = xaccSplitGetSlots (s);
+    KvpValue *v = kvp_frame_get_slot_path (f, GNC_SX_ID, key, NULL);
+    gnc_numeric tmp = gnc_numeric_zero ();
+    char *str = NULL;
+
+    if (v == NULL || (str = kvp_value_get_string(v)) == NULL ||
+        strlen(str) == 0)
+        return TRUE; /* No formula no foul */
+    if (gnc_sx_parse_vars_from_formula (str, vars, &tmp) < 0)
+    {
+        gchar *err = g_strdup_printf (_("Couldn't parse %s for split \"%s\"."),
+                                      key, xaccSplitGetMemo (s));
+        gnc_error_dialog (GTK_WIDGET(sxed->dialog), "%s", err);
+        g_free (err);
+
+        return FALSE;
+    }
+    if (g_strcmp0 (key, GNC_SX_CREDIT_FORMULA) == 0)
+        tcds->creditSum = gnc_numeric_add(tcds->creditSum, tmp, 100,
+                                          GNC_DENOM_AUTO | GNC_HOW_DENOM_LCD);
+    else
+        tcds->debitSum = gnc_numeric_add (tcds->debitSum, tmp, 100,
+                                          GNC_DENOM_AUTO | GNC_HOW_DENOM_LCD);
+    return TRUE;
+}
 
 /*******************************************************************************
  * Checks to make sure that the SX is in a reasonable state to save.
@@ -495,10 +692,6 @@ check_credit_debit_balance( gpointer key,
 static gboolean
 gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
 {
-    gboolean multi_commodity = FALSE;
-    gnc_commodity *base_cmdty = NULL;
-    gint ttVarCount, splitCount;
-    GList *schedule = NULL;
 
     /* Do checks on validity and such, interrupting the user if
      * things aren't right.
@@ -519,353 +712,106 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
      *   right... ]
      */
 
-    ttVarCount = 0;
-    splitCount = 0;
+    gboolean multi_commodity = FALSE;
+    gint ttVarCount = 0, splitCount = 0;
+    static const int NUM_ITERS_WITH_VARS = 5;
+    static const int NUM_ITERS_NO_VARS = 1;
+    int numIters = NUM_ITERS_NO_VARS, i;
+    gboolean unbalanceable = FALSE;
+    gpointer unusedKey, unusedValue;
+
+    GHashTable *vars = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+                                  (GDestroyNotify)gnc_sx_variable_free);
+    GHashTable *txns = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+                                              NULL, g_free);
+    /**
+     * Plan:
+     * . Do a first pass to get the variables.
+     * . Set each variable to random values.
+     * . see if we balance after that
+     *   . true: all good
+     *   . false: indicate to user, allow decision.
+     */
+
+    /* FIXME: This is probably superfluous. */
+    gnc_split_register_save (
+        gnc_ledger_display_get_split_register(sxed->ledger), FALSE);
+    /* numeric-formulas-get-balanced determination */
+    gnc_sx_get_variables (sxed->sx, vars);
+
+    ttVarCount = g_hash_table_size (vars);
+    if (ttVarCount != 0)
     {
-        static const int NUM_ITERS_WITH_VARS = 5;
-        static const int NUM_ITERS_NO_VARS = 1;
-        int numIters, i;
-        GHashTable *vars, *txns;
-        GList *splitList = NULL;
-        char *str;
-        kvp_frame *f;
-        kvp_value *v;
-        Split *s;
-        Transaction *t;
-        gnc_numeric tmp;
-        gboolean unbalanceable;
-        gpointer unusedKey, unusedValue;
-
-        unbalanceable = FALSE; /* innocent until proven guilty */
-        vars = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)gnc_sx_variable_free);
-        txns = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free);
-        numIters = NUM_ITERS_NO_VARS;
-        /**
-         * Plan:
-         * . Do a first pass to get the variables.
-         * . Set each variable to random values.
-         * . see if we balance after that
-         *   . true: all good
-         *   . false: indicate to user, allow decision.
+        /* balance with random variable bindings some number of times in an
+         * attempt to ferret out un-balanceable transactions.
          */
+        numIters = NUM_ITERS_WITH_VARS;
+    }
 
-        /* FIXME: This _really_ shouldn't require a modification of the
-         * SX just to get the var names... */
-        gnc_split_register_save ( gnc_ledger_display_get_split_register(sxed->ledger),
-                                  FALSE );
-        /* numeric-formulas-get-balanced determination */
-        gnc_sx_get_variables( sxed->sx, vars );
+    for ( i = 0; i < numIters && !unbalanceable; i++ )
+    {
+        gnc_sx_randomize_variables(vars);
+        g_hash_table_foreach( txns, set_sums_to_zero, NULL );
 
-        ttVarCount = g_hash_table_size( vars );
-        if ( ttVarCount != 0 )
-        {
-            /* balance with random variable bindings some number
-             * of times in an attempt to ferret out
-             * un-balanceable transactions.
-             *
-             * NOTE: The Real Way to do this is with some
-             * symbolic math to eliminate the variables.  This is
-             * hard, and we don't do it.  This solution will
-             * suffice for now, and perhaps for the lifetime of
-             * the software. --jsled */
-            numIters = NUM_ITERS_WITH_VARS;
-        }
+        GList *splitList = xaccSchedXactionGetSplits (sxed->sx);
+        splitCount += g_list_length( splitList );
 
-        for ( i = 0; i < numIters && !unbalanceable; i++ )
+        for ( ; splitList; splitList = splitList->next )
         {
-            gnc_sx_randomize_variables(vars);
-            g_hash_table_foreach( txns, set_sums_to_zero, NULL );
-            tmp = gnc_numeric_zero();
-
-            splitList = xaccSchedXactionGetSplits( sxed->sx );
-            splitCount += g_list_length( splitList );
+            gnc_commodity *base_cmdty = NULL;
+            txnCreditDebitSums *tcds;
+            Split *s = (Split*)splitList->data;
+            Transaction *t = xaccSplitGetParent (s);
 
-            for ( ; splitList; splitList = splitList->next )
+            tcds = (txnCreditDebitSums*)g_hash_table_lookup (txns, (gpointer)t);
+            if (tcds == NULL)
             {
-                GncGUID *acct_guid;
-                Account *acct;
-                gnc_commodity *split_cmdty;
-                txnCreditDebitSums *tcds;
-                gnc_numeric split_amount;
-
-                s = (Split*)splitList->data;
-                t = xaccSplitGetParent( s );
-
-                if ( !(tcds =
-                       (txnCreditDebitSums*)g_hash_table_lookup( txns,
-                                                                 (gpointer)t )) )
-                {
-                    tcds = g_new0( txnCreditDebitSums, 1 );
-                    tcds->creditSum = gnc_numeric_zero();
-                    tcds->debitSum  = gnc_numeric_zero();
-                    g_hash_table_insert( txns, (gpointer)t, (gpointer)tcds );
-                }
-
-                f = xaccSplitGetSlots( s );
-
-                /* contains the guid of the split's actual account. */
-                v = kvp_frame_get_slot_path(f,
-                                            GNC_SX_ID,
-                                            GNC_SX_ACCOUNT,
-                                            NULL);
-                acct_guid = kvp_value_get_guid( v );
-                acct = xaccAccountLookup( acct_guid, gnc_get_current_book ());
-                split_cmdty = xaccAccountGetCommodity(acct);
-                split_amount = xaccSplitGetAmount(s);
-                if (!gnc_numeric_zero_p(split_amount) && base_cmdty == NULL)
-                {
-                    base_cmdty = split_cmdty;
-                }
-                multi_commodity |= (!gnc_numeric_zero_p(split_amount) &&
-                                    !gnc_commodity_equal(split_cmdty,
-                                                         base_cmdty));
-
-                v = kvp_frame_get_slot_path( f,
-                                             GNC_SX_ID,
-                                             GNC_SX_CREDIT_FORMULA,
-                                             NULL );
-                if ( v
-                     && (str = kvp_value_get_string(v))
-                     && strlen( str ) != 0 )
-                {
-                    if ( gnc_sx_parse_vars_from_formula( str, vars, &tmp ) < 0 )
-                    {
-                        GString *errStr;
-
-                        errStr = g_string_sized_new( 32 );
-                        g_string_printf( errStr,
-                                         _( "Couldn't parse credit formula for "
-                                            "split \"%s\"." ),
-                                         xaccSplitGetMemo( s ) );
-                        gnc_error_dialog( GTK_WIDGET(sxed->dialog), "%s",
-                                          errStr->str );
-                        g_string_free( errStr, TRUE );
-
-                        return FALSE;
-                    }
-                    tcds->creditSum =
-                        gnc_numeric_add( tcds->creditSum, tmp, 100,
-                                         (GNC_DENOM_AUTO | GNC_HOW_DENOM_LCD) );
-                    tmp = gnc_numeric_zero();
-                }
-                v = kvp_frame_get_slot_path( f,
-                                             GNC_SX_ID,
-                                             GNC_SX_DEBIT_FORMULA,
-                                             NULL );
-                if ( v
-                     && (str = kvp_value_get_string(v))
-                     && strlen(str) != 0 )
-                {
-                    if ( gnc_sx_parse_vars_from_formula( str, vars, &tmp ) < 0 )
-                    {
-                        GString *errStr;
-
-                        errStr = g_string_sized_new( 32 );
-                        g_string_printf( errStr,
-                                         _( "Couldn't parse debit formula for "
-                                            "split \"%s\"." ),
-                                         xaccSplitGetMemo( s ) );
-                        gnc_error_dialog( GTK_WIDGET(sxed->dialog), "%s",
-                                          (gchar*)errStr->str );
-                        g_string_free( errStr, TRUE );
-
-                        return FALSE;
-                    }
-                    tcds->debitSum = gnc_numeric_add( tcds->debitSum, tmp, 100,
-                                                      (GNC_DENOM_AUTO | GNC_HOW_DENOM_LCD) );
-                    tmp = gnc_numeric_zero();
-                }
+                tcds = tcds_new ();
+                g_hash_table_insert (txns, (gpointer)t, (gpointer)tcds);
             }
 
-            g_hash_table_foreach( txns,
-                                  check_credit_debit_balance,
-                                  &unbalanceable );
-        }
+            if (!gnc_sxed_split_check_account (sxed, s, base_cmdty,
+                                               &multi_commodity))
+                return FALSE;
 
-        /* Subtract out pre-defined vars */
-        if (g_hash_table_lookup_extended(vars, "i",
-                                         &unusedKey,
-                                         &unusedValue))
-        {
-            ttVarCount -= 1;
+            if (!gnc_sxed_split_calculate_formula (sxed, s, vars,
+                                                   GNC_SX_CREDIT_FORMULA,
+                                                   tcds))
+                return FALSE;
+            if (!gnc_sxed_split_calculate_formula (sxed, s, vars,
+                                                   GNC_SX_DEBIT_FORMULA,
+                                                   tcds))
+                return FALSE;
         }
 
-        g_hash_table_destroy(vars);
-        g_hash_table_destroy(txns);
-
-        if ( unbalanceable
-             && !gnc_verify_dialog( sxed->dialog, FALSE,
-                                    "%s",
-                                    _("The Scheduled Transaction Editor "
-                                      "cannot automatically balance "
-                                      "this transaction. "
-                                      "Should it still be "
-                                      "entered?") ) )
-        {
-            return FALSE;
-        }
+        g_hash_table_foreach (txns, check_credit_debit_balance, &unbalanceable);
     }
 
-    /* read out data back into SchedXaction object. */
-    /* FIXME: this is getting too deep; split out. */
-    {
-        gchar *name, *nameKey;
-        gboolean nameExists, nameHasChanged;
-        GList *sxList;
-
-        name = gtk_editable_get_chars( GTK_EDITABLE(sxed->nameEntry), 0, -1 );
-        if ( strlen(name) == 0 )
-        {
-            const char *sx_has_no_name_msg =
-                _( "Please name the Scheduled Transaction." );
-            gnc_error_dialog( sxed->dialog, "%s", sx_has_no_name_msg );
-            g_free( name );
-            return FALSE;
+    /* Subtract out pre-defined vars */
+    if (g_hash_table_lookup_extended(vars, "i", &unusedKey, &unusedValue))
+        ttVarCount -= 1;
 
-        }
+    g_hash_table_destroy(vars);
+    g_hash_table_destroy(txns);
 
-        nameExists = FALSE;
-        nameKey = g_utf8_collate_key(name, -1);
-        nameHasChanged =
-            (xaccSchedXactionGetName(sxed->sx) == NULL)
-            || (strcmp( xaccSchedXactionGetName(sxed->sx), name ) != 0);
-        for ( sxList =
-                  gnc_book_get_schedxactions(gnc_get_current_book())->sx_list;
-              nameHasChanged && !nameExists && sxList;
-              sxList = sxList->next )
-        {
-            char *existingName, *existingNameKey;
-            existingName =
-                xaccSchedXactionGetName( (SchedXaction*)sxList->
-                                         data );
-            existingNameKey = g_utf8_collate_key(existingName, -1);
-            nameExists |= ( strcmp(nameKey, existingNameKey) == 0 );
-            g_free( existingNameKey );
-        }
-        if ( nameHasChanged && nameExists )
-        {
-            const char *sx_has_existing_name_msg =
-                _( "A Scheduled Transaction with the "
-                   "name \"%s\" already exists. "
-                   "Are you sure you want to name "
-                   "this one the same?" );
-            if ( ! gnc_verify_dialog( sxed->dialog, FALSE,
-                                      sx_has_existing_name_msg,
-                                      name) )
-            {
-                g_free( nameKey );
-                g_free( name );
-                return FALSE;
-            }
-        }
-        g_free( nameKey );
-        g_free( name );
-    }
-
-    // @@FIXME: similar to below, check the commodities involved, and disallow autocreation
+    if (unbalanceable)
     {
-        gboolean autocreateState;
-
-        autocreateState =
-            gtk_toggle_button_get_active (
-                GTK_TOGGLE_BUTTON(sxed->autocreateOpt));
-
-        if (((ttVarCount > 0) || multi_commodity) && autocreateState)
-        {
-            gnc_warning_dialog(sxed->dialog, "%s",
-                               _("Scheduled Transactions with variables "
-                                 "or involving more than one commodity "
-                                 "cannot be automatically created."));
+        const char *msg =
+            _("The Scheduled Transaction Editor cannot automatically "
+              "balance this transaction. Should it still be entered?");
+        if (!gnc_verify_dialog (sxed->dialog, FALSE, "%s", msg))
             return FALSE;
-        }
-
-        /* Fix for part of Bug#121740 -- auto-create transactions are
-         * only valid if there's actually a transaction to create. */
-        if ( autocreateState && splitCount == 0 )
-        {
-            gnc_warning_dialog(sxed->dialog, "%s",
-                               _("Scheduled Transactions without a template "
-                                 "transaction cannot be automatically created.") );
-            return FALSE;
-        }
     }
 
-    /* deal with time. */
-    {
-        GDate startDate, endDate, nextDate;
-
-        if ( !gtk_toggle_button_get_active(sxed->optEndDate)
-             && !gtk_toggle_button_get_active(sxed->optEndCount)
-             && !gtk_toggle_button_get_active(sxed->optEndNone) )
-        {
-            const char *sx_end_spec_msg =
-                _( "Please provide a valid end selection." );
-            gnc_error_dialog( sxed->dialog, "%s", sx_end_spec_msg );
-            return FALSE;
-        }
-
-        if ( gtk_toggle_button_get_active(sxed->optEndCount))
-        {
-            gint occur, rem;
-
-            occur  =
-                gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endCountSpin) );
-
-            rem =
-                gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endRemainSpin) );
-
-            if ( occur == 0 )
-            {
-                const char *sx_occur_count_zero_msg =
-                    _( "There must be some number of occurrences." );
-                gnc_error_dialog( sxed->dialog, "%s",
-                                  sx_occur_count_zero_msg );
-                return FALSE;
-            }
-
-            if ( rem > occur )
-            {
-                const char *sx_occur_counts_wrong_msg =
-                    _( "The number of remaining occurrences "
-                       "(%d) is greater than the number of "
-                       "total occurrences (%d)." );
-                gnc_error_dialog( sxed->dialog,
-                                  sx_occur_counts_wrong_msg,
-                                  rem, occur );
-                return FALSE;
-            }
-
-        }
-
-        g_date_clear( &endDate, 1 );
-        if ( gtk_toggle_button_get_active(sxed->optEndDate) )
-        {
-            gnc_gdate_set_time64( &endDate,
-                                  gnc_date_edit_get_date( sxed->
-                                                          endDateEntry ) );
-        }
+    if (!gnc_sxed_check_names (sxed))
+        return FALSE;
 
-        g_date_clear(&nextDate, 1);
-        gnc_frequency_save_to_recurrence(sxed->gncfreq, &schedule, &startDate);
-        if (g_list_length(schedule) > 0)
-        {
-            g_date_subtract_days(&startDate, 1);
-            recurrenceListNextInstance(schedule, &startDate, &nextDate);
-        }
-        recurrenceListFree(&schedule);
+    if (!gnc_sxed_check_autocreate (sxed, ttVarCount,
+                                    splitCount, multi_commodity))
+        return FALSE;
 
-        if (!g_date_valid(&nextDate)
-            || (g_date_valid(&endDate) && (g_date_compare(&nextDate, &endDate) > 0)))
-        {
-            const char *invalid_sx_check_msg =
-                _("You have attempted to create a Scheduled "
-                  "Transaction which will never run. Do you "
-                  "really want to do this?");
-            if (!gnc_verify_dialog(sxed->dialog, FALSE,
-                                   "%s", invalid_sx_check_msg))
-                return FALSE;
-        }
-    }
+    if (!gnc_sxed_check_endpoint (sxed))
+        return FALSE;
     return TRUE;
 }
 

commit b02e2807277ab2d9d950dca58a5c9a57befb81f5
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jan 7 14:23:52 2016 -0800

    Refactor gnc_sxed_check_changed() with a bunch of extract-functions.

diff --git a/src/gnome/dialog-sx-editor.c b/src/gnome/dialog-sx-editor.c
index d35d50b..2331eec 100644
--- a/src/gnome/dialog-sx-editor.c
+++ b/src/gnome/dialog-sx-editor.c
@@ -160,7 +160,7 @@ static void gnc_sxed_reg_check_close(GncSxEditorDialog *sxed);
 static gboolean sxed_delete_event( GtkWidget *widget, GdkEvent *event, gpointer ud );
 static gboolean sxed_confirmed_cancel( GncSxEditorDialog *sxed );
 static gboolean editor_component_sx_equality( gpointer find_data,
-        gpointer user_data );
+                                              gpointer user_data );
 
 static GtkActionEntry gnc_sxed_menu_entries [] =
 {
@@ -261,192 +261,170 @@ editor_ok_button_clicked_cb( GtkButton *b, GncSxEditorDialog *sxed )
 }
 
 
-/*************************************************************************
- * Checks to see if the SX has been modified from it's previously-saved
- * state.
- * @return TRUE if this is a 'new' SX, or if the SX has changed from it's
- *   previous configuration.
- ************************************************************************/
 static gboolean
-gnc_sxed_check_changed( GncSxEditorDialog *sxed )
+gnc_sxed_check_name_changed (GncSxEditorDialog *sxed)
 {
-    if ( sxed->newsxP )
+    char *name = gtk_editable_get_chars (GTK_EDITABLE(sxed->nameEntry), 0, -1);
+
+    if (strlen(name) == 0)
         return TRUE;
 
-    /* name */
-    {
-        char *name;
+    if (xaccSchedXactionGetName(sxed->sx) == NULL ||
+        strcmp(xaccSchedXactionGetName(sxed->sx), name) != 0)
+        return TRUE;
 
-        name = gtk_editable_get_chars( GTK_EDITABLE(sxed->nameEntry), 0, -1 );
-        if ( strlen(name) == 0 )
-        {
-            return TRUE;
+    return FALSE;
+}
 
-        }
-        if ( (xaccSchedXactionGetName(sxed->sx) == NULL)
-                || (strcmp( xaccSchedXactionGetName(sxed->sx),
-                            name ) != 0) )
-        {
-            return TRUE;
-        }
-    }
+static gboolean
+gnc_sxed_check_end_date_changed (GncSxEditorDialog *sxed)
+{
+    GDate sxEndDate, dlgEndDate;
 
-    /* end options */
-    {
-        /* dialog says... no end */
-        if ( gtk_toggle_button_get_active( sxed->optEndNone ) )
-        {
-            if ( xaccSchedXactionHasEndDate(sxed->sx)
-                    || xaccSchedXactionHasOccurDef(sxed->sx) )
-            {
-                return TRUE;
-            }
-        }
+    if (! xaccSchedXactionHasEndDate (sxed->sx))
+        return TRUE;
 
-        /* dialog says... end date */
-        if ( gtk_toggle_button_get_active( sxed->optEndDate ) )
-        {
-            GDate sxEndDate, dlgEndDate;
+    sxEndDate = *xaccSchedXactionGetEndDate (sxed->sx);
+    gnc_gdate_set_time64 (&dlgEndDate,
+                          gnc_date_edit_get_date (sxed-> endDateEntry));
 
-            if ( ! xaccSchedXactionHasEndDate( sxed->sx ) )
-            {
-                return TRUE;
-            }
-            sxEndDate = *xaccSchedXactionGetEndDate( sxed->sx );
-            gnc_gdate_set_time64( &dlgEndDate,
-                               gnc_date_edit_get_date( sxed->
-                                       endDateEntry ) );
+    if (g_date_compare (&sxEndDate, &dlgEndDate) != 0)
+        return TRUE;
 
-            if ( g_date_compare( &sxEndDate, &dlgEndDate ) != 0 )
-            {
-                return TRUE;
-            }
-        }
+    return FALSE;
+}
 
-        /* dialog says... num occur */
-        if ( gtk_toggle_button_get_active( sxed->optEndCount ) )
-        {
-            gint sxNumOccur, sxNumRem, dlgNumOccur, dlgNumRem;
+static gboolean
+gnc_sxed_check_num_occurs_changed(GncSxEditorDialog *sxed)
+{
+    gint sxNumOccur, sxNumRem, dlgNumOccur, dlgNumRem;
 
-            if ( ! xaccSchedXactionGetNumOccur( sxed->sx ) )
-            {
-                return TRUE;
-            }
+    if (! xaccSchedXactionGetNumOccur(sxed->sx))
+        return TRUE;
+    dlgNumOccur  =
+        gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->endCountSpin));
+    dlgNumRem =
+        gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->endRemainSpin));
+    sxNumOccur = xaccSchedXactionGetNumOccur (sxed->sx);
+    sxNumRem = xaccSchedXactionGetRemOccur (sxed->sx);
+
+    if (dlgNumOccur != sxNumOccur || dlgNumRem != sxNumRem)
+        return TRUE;
 
-            dlgNumOccur  =
-                gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endCountSpin) );
+    return FALSE;
+}
 
-            dlgNumRem =
-                gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endRemainSpin) );
+static gboolean
+gnc_sxed_check_creation_changed (GncSxEditorDialog *sxed)
+{
+    gboolean sxAutoCreate, sxNotify;
+    gint dlgAdvance = 0;
+    gint dlgRemind = 0;
+
+    gboolean dlgEnabled =
+        gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->enabledOpt) );
+    gboolean dlgAutoCreate =
+        gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->autocreateOpt) );
+    gboolean dlgNotify =
+        gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->notifyOpt) );
+
+    if (dlgEnabled != xaccSchedXactionGetEnabled (sxed->sx))
+        return TRUE;
 
-            sxNumOccur = xaccSchedXactionGetNumOccur( sxed->sx );
-            sxNumRem = xaccSchedXactionGetRemOccur( sxed->sx );
+    xaccSchedXactionGetAutoCreate (sxed->sx, &sxAutoCreate, &sxNotify);
+    if (dlgAutoCreate != sxAutoCreate || dlgNotify != sxNotify)
+        return TRUE;
 
-            if ( (dlgNumOccur != sxNumOccur)
-                    || (dlgNumRem != sxNumRem) )
-            {
-                return TRUE;
-            }
-        }
-    }
+    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(sxed->advanceOpt)))
+        dlgAdvance = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->advanceSpin));
+    if (dlgAdvance != xaccSchedXactionGetAdvanceCreation (sxed->sx))
+        return TRUE;
 
-    /* SX options [autocreate, notify, reminder, advance] */
-    {
-        gboolean dlgEnabled,
-                 dlgAutoCreate,
-                 dlgNotify,
-                 sxEnabled,
-                 sxAutoCreate,
-                 sxNotify;
-        gint dlgAdvance, sxAdvance;
-        gint dlgRemind, sxRemind;
-
-        dlgEnabled =
-            gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->
-                                          enabledOpt) );
-        dlgAutoCreate =
-            gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->
-                                          autocreateOpt) );
-        dlgNotify =
-            gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->
-                                          notifyOpt) );
-
-        sxEnabled = xaccSchedXactionGetEnabled( sxed->sx );
-        if ( ! ((dlgEnabled == sxEnabled)) )
-        {
-            return TRUE;
-        }
+    if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(sxed->remindOpt)))
+        dlgRemind = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->remindSpin));
+    if (dlgRemind != xaccSchedXactionGetAdvanceReminder (sxed->sx))
+        return TRUE;
 
-        xaccSchedXactionGetAutoCreate( sxed->sx, &sxAutoCreate, &sxNotify );
-        if ( ! ((dlgAutoCreate == sxAutoCreate)
-                && (dlgNotify == sxNotify)) )
-        {
-            return TRUE;
-        }
+    return FALSE;
+}
 
-        dlgAdvance = 0;
-        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->advanceOpt) ) )
-        {
-            dlgAdvance =
-                gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(sxed->
-                                                  advanceSpin) );
-        }
-        sxAdvance = xaccSchedXactionGetAdvanceCreation( sxed->sx );
-        if ( dlgAdvance != sxAdvance )
-        {
-            return TRUE;
-        }
+static gboolean
+gnc_sxed_check_dates_changed (GncSxEditorDialog *sxed)
+{
+    GList *dialog_schedule = NULL;
+    GDate dialog_start_date, sx_start_date;
+    gchar *dialog_schedule_str, *sx_schedule_str;
+    gboolean schedules_are_the_same, start_dates_are_the_same;
 
-        dlgRemind = 0;
-        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->remindOpt) ) )
-        {
-            dlgRemind =
-                gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(sxed->remindSpin) );
-        }
-        sxRemind = xaccSchedXactionGetAdvanceReminder( sxed->sx );
-        if ( dlgRemind != sxRemind )
-        {
-            return TRUE;
-        }
-    }
+    g_date_clear(&dialog_start_date, 1);
+    gnc_frequency_save_to_recurrence (sxed->gncfreq, &dialog_schedule,
+                                      &dialog_start_date);
+    dialog_schedule_str = recurrenceListToString(dialog_schedule);
+    recurrenceListFree(&dialog_schedule);
 
-    {
-        GList *dialog_schedule = NULL;
-        GDate dialog_start_date, sx_start_date;
-        gchar *dialog_schedule_str, *sx_schedule_str;
-        gboolean schedules_are_the_same, start_dates_are_the_same;
+    sx_start_date = *xaccSchedXactionGetStartDate (sxed->sx);
+    sx_schedule_str = recurrenceListToString (gnc_sx_get_schedule(sxed->sx));
 
-        g_date_clear(&dialog_start_date, 1);
-        gnc_frequency_save_to_recurrence(sxed->gncfreq, &dialog_schedule, &dialog_start_date);
-        dialog_schedule_str = recurrenceListToString(dialog_schedule);
-        recurrenceListFree(&dialog_schedule);
+    g_debug ("dialog schedule [%s], sx schedule [%s]",
+             dialog_schedule_str, sx_schedule_str);
 
-        sx_start_date = *xaccSchedXactionGetStartDate(sxed->sx);
-        sx_schedule_str = recurrenceListToString(gnc_sx_get_schedule(sxed->sx));
+    schedules_are_the_same = (strcmp(dialog_schedule_str,
+                                     sx_schedule_str) == 0);
+    g_free(dialog_schedule_str);
+    g_free(sx_schedule_str);
 
-        g_debug("dialog schedule [%s], sx schedule [%s]",
-                dialog_schedule_str, sx_schedule_str);
+    start_dates_are_the_same = (g_date_compare(&dialog_start_date,
+                                               &sx_start_date) == 0);
 
-        schedules_are_the_same = (strcmp(dialog_schedule_str, sx_schedule_str) == 0);
-        g_free(dialog_schedule_str);
-        g_free(sx_schedule_str);
+    if (schedules_are_the_same && start_dates_are_the_same)
+        return FALSE;
+    return TRUE;
+}
 
-        start_dates_are_the_same = (g_date_compare(&dialog_start_date, &sx_start_date) == 0);
+/*************************************************************************
+ * Checks to see if the SX has been modified from it's previously-saved
+ * state.
+ * @return TRUE if this is a 'new' SX, or if the SX has changed from it's
+ *   previous configuration.
+ ************************************************************************/
+static gboolean
+gnc_sxed_check_changed (GncSxEditorDialog *sxed)
+{
+    SplitRegister *sr = NULL;
+    if (sxed->newsxP)
+        return TRUE;
 
-        if (!schedules_are_the_same || !start_dates_are_the_same)
-            return TRUE;
-    }
+    /* name */
+    if (gnc_sxed_check_name_changed(sxed))
+        return TRUE;
+    /* end options */
+    /* dialog says... no end */
+    if (gtk_toggle_button_get_active (sxed->optEndNone) &&
+        (xaccSchedXactionHasEndDate (sxed->sx) ||
+         xaccSchedXactionHasOccurDef (sxed->sx)))
+        return TRUE;
+
+    /* dialog says... end date */
+    if (gtk_toggle_button_get_active( sxed->optEndDate ) &&
+        gnc_sxed_check_end_date_changed(sxed))
+        return TRUE;
+
+    /* dialog says... num occur */
+    if (gtk_toggle_button_get_active (sxed->optEndCount) &&
+        gnc_sxed_check_num_occurs_changed (sxed))
+        return TRUE;
+    /* SX options [autocreate, notify, reminder, advance] */
+    if (gnc_sxed_check_creation_changed (sxed))
+        return TRUE;
+    /* Dates and Schedules */
+    if (gnc_sxed_check_dates_changed (sxed))
+        return TRUE;
 
     /* template transactions */
-    {
-        SplitRegister *sr =
-            gnc_ledger_display_get_split_register( sxed->ledger );
+    sr = gnc_ledger_display_get_split_register( sxed->ledger );
+    if ( gnc_split_register_changed( sr ) )
+        return TRUE;
 
-        if ( gnc_split_register_changed( sr ) )
-        {
-            return TRUE;
-        }
-    }
     return FALSE;
 }
 
@@ -483,19 +461,19 @@ check_credit_debit_balance( gpointer key,
     gboolean *unbalanced = (gboolean*)ud;
     *unbalanced |= !(gnc_numeric_zero_p(
                          gnc_numeric_sub_fixed( tcds->debitSum,
-                                 tcds->creditSum ) ));
+                                                tcds->creditSum ) ));
 
     if (qof_log_check(G_LOG_DOMAIN, QOF_LOG_DEBUG))
     {
         if ( gnc_numeric_zero_p( gnc_numeric_sub_fixed( tcds->debitSum,
-                                 tcds->creditSum ) ) )
+                                                        tcds->creditSum ) ) )
         {
             g_debug( "%p | true [%s - %s = %s]",
                      key,
                      gnc_numeric_to_string( tcds->debitSum ),
                      gnc_numeric_to_string( tcds->creditSum ),
                      gnc_numeric_to_string(gnc_numeric_sub_fixed( tcds->debitSum,
-                                           tcds->creditSum )) );
+                                                                  tcds->creditSum )) );
         }
         else
         {
@@ -504,7 +482,7 @@ check_credit_debit_balance( gpointer key,
                      gnc_numeric_to_string( tcds->debitSum ),
                      gnc_numeric_to_string( tcds->creditSum ),
                      gnc_numeric_to_string(gnc_numeric_sub_fixed( tcds->debitSum,
-                                           tcds->creditSum )) );
+                                                                  tcds->creditSum )) );
         }
     }
 }
@@ -614,8 +592,8 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
                 t = xaccSplitGetParent( s );
 
                 if ( !(tcds =
-                            (txnCreditDebitSums*)g_hash_table_lookup( txns,
-                                    (gpointer)t )) )
+                       (txnCreditDebitSums*)g_hash_table_lookup( txns,
+                                                                 (gpointer)t )) )
                 {
                     tcds = g_new0( txnCreditDebitSums, 1 );
                     tcds->creditSum = gnc_numeric_zero();
@@ -647,8 +625,8 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
                                              GNC_SX_CREDIT_FORMULA,
                                              NULL );
                 if ( v
-                        && (str = kvp_value_get_string(v))
-                        && strlen( str ) != 0 )
+                     && (str = kvp_value_get_string(v))
+                     && strlen( str ) != 0 )
                 {
                     if ( gnc_sx_parse_vars_from_formula( str, vars, &tmp ) < 0 )
                     {
@@ -675,8 +653,8 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
                                              GNC_SX_DEBIT_FORMULA,
                                              NULL );
                 if ( v
-                        && (str = kvp_value_get_string(v))
-                        && strlen(str) != 0 )
+                     && (str = kvp_value_get_string(v))
+                     && strlen(str) != 0 )
                 {
                     if ( gnc_sx_parse_vars_from_formula( str, vars, &tmp ) < 0 )
                     {
@@ -716,13 +694,13 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
         g_hash_table_destroy(txns);
 
         if ( unbalanceable
-                && !gnc_verify_dialog( sxed->dialog, FALSE,
-                                       "%s",
-                                       _("The Scheduled Transaction Editor "
-                                         "cannot automatically balance "
-                                         "this transaction. "
-                                         "Should it still be "
-                                         "entered?") ) )
+             && !gnc_verify_dialog( sxed->dialog, FALSE,
+                                    "%s",
+                                    _("The Scheduled Transaction Editor "
+                                      "cannot automatically balance "
+                                      "this transaction. "
+                                      "Should it still be "
+                                      "entered?") ) )
         {
             return FALSE;
         }
@@ -752,9 +730,9 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
             (xaccSchedXactionGetName(sxed->sx) == NULL)
             || (strcmp( xaccSchedXactionGetName(sxed->sx), name ) != 0);
         for ( sxList =
-                    gnc_book_get_schedxactions(gnc_get_current_book())->sx_list;
-                nameHasChanged && !nameExists && sxList;
-                sxList = sxList->next )
+                  gnc_book_get_schedxactions(gnc_get_current_book())->sx_list;
+              nameHasChanged && !nameExists && sxList;
+              sxList = sxList->next )
         {
             char *existingName, *existingNameKey;
             existingName =
@@ -817,8 +795,8 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
         GDate startDate, endDate, nextDate;
 
         if ( !gtk_toggle_button_get_active(sxed->optEndDate)
-                && !gtk_toggle_button_get_active(sxed->optEndCount)
-                && !gtk_toggle_button_get_active(sxed->optEndNone) )
+             && !gtk_toggle_button_get_active(sxed->optEndCount)
+             && !gtk_toggle_button_get_active(sxed->optEndNone) )
         {
             const char *sx_end_spec_msg =
                 _( "Please provide a valid end selection." );
@@ -863,8 +841,8 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
         if ( gtk_toggle_button_get_active(sxed->optEndDate) )
         {
             gnc_gdate_set_time64( &endDate,
-                               gnc_date_edit_get_date( sxed->
-                                       endDateEntry ) );
+                                  gnc_date_edit_get_date( sxed->
+                                                          endDateEntry ) );
         }
 
         g_date_clear(&nextDate, 1);
@@ -877,7 +855,7 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
         recurrenceListFree(&schedule);
 
         if (!g_date_valid(&nextDate)
-                || (g_date_valid(&endDate) && (g_date_compare(&nextDate, &endDate) > 0)))
+            || (g_date_valid(&endDate) && (g_date_compare(&nextDate, &endDate) > 0)))
         {
             const char *invalid_sx_check_msg =
                 _("You have attempted to create a Scheduled "
@@ -918,8 +896,8 @@ gnc_sxed_save_sx( GncSxEditorDialog *sxed )
         {
             /* get the end date data */
             gnc_gdate_set_time64( &gdate,
-                               gnc_date_edit_get_date(
-                                   sxed->endDateEntry ) );
+                                  gnc_date_edit_get_date(
+                                      sxed->endDateEntry ) );
             xaccSchedXactionSetEndDate( sxed->sx, &gdate );
             /* set the num occurrences data */
             xaccSchedXactionSetNumOccur( sxed->sx, 0 );
@@ -1064,7 +1042,7 @@ scheduledxaction_editor_dialog_destroy(GtkWidget *object, gpointer data)
         return;
 
     gnc_unregister_gui_component_by_data
-    (DIALOG_SCHEDXACTION_EDITOR_CM_CLASS, sxed);
+        (DIALOG_SCHEDXACTION_EDITOR_CM_CLASS, sxed);
 
     gnc_embedded_window_close_page(sxed->embed_window, sxed->plugin_page);
     gtk_widget_destroy(GTK_WIDGET(sxed->embed_window));
@@ -1135,20 +1113,20 @@ gnc_ui_scheduled_xaction_editor_dialog_create (SchedXaction *sx,
         void     (*fn)();
         gpointer objectData;
     } widgets[] =
-    {
-        { "ok_button",      "clicked",       editor_ok_button_clicked_cb,     NULL },
-        { "cancel_button",  "clicked",       editor_cancel_button_clicked_cb, NULL },
-        { "help_button",    "clicked",       editor_help_button_clicked_cb,   NULL },
-        { "rb_noend",       "toggled",       endgroup_rb_toggled_cb,          GINT_TO_POINTER(END_NEVER_OPTION) },
-        { "rb_enddate",     "toggled",       endgroup_rb_toggled_cb,          GINT_TO_POINTER(END_DATE_OPTION) },
-        { "rb_num_occur",   "toggled",       endgroup_rb_toggled_cb,          GINT_TO_POINTER(NUM_OCCUR_OPTION) },
-        { "remain_spin" ,   "value-changed", sxed_excal_update_adapt_cb,      NULL },
-        { "enabled_opt",    "toggled",       enabled_toggled_cb,              NULL },
-        { "autocreate_opt", "toggled",       autocreate_toggled_cb,           NULL },
-        { "advance_opt",    "toggled",       advance_toggled_cb,              NULL },
-        { "remind_opt",     "toggled",       remind_toggled_cb,               NULL },
-        { NULL,             NULL,            NULL,                            NULL }
-    };
+          {
+              { "ok_button",      "clicked",       editor_ok_button_clicked_cb,     NULL },
+              { "cancel_button",  "clicked",       editor_cancel_button_clicked_cb, NULL },
+              { "help_button",    "clicked",       editor_help_button_clicked_cb,   NULL },
+              { "rb_noend",       "toggled",       endgroup_rb_toggled_cb,          GINT_TO_POINTER(END_NEVER_OPTION) },
+              { "rb_enddate",     "toggled",       endgroup_rb_toggled_cb,          GINT_TO_POINTER(END_DATE_OPTION) },
+              { "rb_num_occur",   "toggled",       endgroup_rb_toggled_cb,          GINT_TO_POINTER(NUM_OCCUR_OPTION) },
+              { "remain_spin" ,   "value-changed", sxed_excal_update_adapt_cb,      NULL },
+              { "enabled_opt",    "toggled",       enabled_toggled_cb,              NULL },
+              { "autocreate_opt", "toggled",       autocreate_toggled_cb,           NULL },
+              { "advance_opt",    "toggled",       advance_toggled_cb,              NULL },
+              { "remind_opt",     "toggled",       remind_toggled_cb,               NULL },
+              { NULL,             NULL,            NULL,                            NULL }
+          };
 
     dlgExists = gnc_find_gui_components( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
                                          editor_component_sx_equality,
@@ -1282,7 +1260,7 @@ schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed )
 
     sxed->gncfreq =
         GNC_FREQUENCY(gnc_frequency_new_from_recurrence(gnc_sx_get_schedule(sxed->sx),
-                      xaccSchedXactionGetStartDate(sxed->sx)));
+                                                        xaccSchedXactionGetStartDate(sxed->sx)));
     g_assert(sxed->gncfreq);
     g_signal_connect( sxed->gncfreq, "changed",
                       G_CALLBACK(gnc_sxed_freq_changed),
@@ -1489,7 +1467,7 @@ schedXact_editor_populate( GncSxEditorDialog *sxed )
         if ( splitList != NULL )
         {
             splitReg = gnc_ledger_display_get_split_register
-                       ( sxed->ledger );
+                ( sxed->ledger );
             gnc_split_register_load(splitReg, splitList, NULL );
         } /* otherwise, use the existing stuff. */
     }
@@ -1522,18 +1500,18 @@ endgroup_rb_toggled_cb( GtkButton *b, gpointer d )
 
     switch (id)
     {
-    case END_NEVER_OPTION:
-        set_endgroup_toggle_states( sxed, END_NEVER );
-        break;
-    case END_DATE_OPTION:
-        set_endgroup_toggle_states( sxed, END_DATE );
-        break;
-    case NUM_OCCUR_OPTION:
-        set_endgroup_toggle_states( sxed, END_OCCUR );
-        break;
-    default:
-        g_critical( "Unknown id %d", id );
-        break;
+        case END_NEVER_OPTION:
+            set_endgroup_toggle_states( sxed, END_NEVER );
+            break;
+        case END_DATE_OPTION:
+            set_endgroup_toggle_states( sxed, END_DATE );
+            break;
+        case NUM_OCCUR_OPTION:
+            set_endgroup_toggle_states( sxed, END_OCCUR );
+            break;
+        default:
+            g_critical( "Unknown id %d", id );
+            break;
     }
     gnc_sxed_update_cal(sxed);
 }
@@ -1584,7 +1562,7 @@ editor_component_sx_equality( gpointer find_data,
              == ((GncSxEditorDialog*)user_data)->sx );
 }
 /*
-typedef enum { NO_END, DATE_END, COUNT_END } END_TYPE;
+  typedef enum { NO_END, DATE_END, COUNT_END } END_TYPE;
 */
 
 static void
@@ -1606,8 +1584,8 @@ gnc_sxed_update_cal(GncSxEditorDialog *sxed)
 
         last_sx_inst = xaccSchedXactionGetLastOccurDate(sxed->sx);
         if (g_date_valid(last_sx_inst)
-                && g_date_valid(&first_date)
-                && g_date_compare(last_sx_inst, &first_date) != 0)
+            && g_date_valid(&first_date)
+            && g_date_compare(last_sx_inst, &first_date) != 0)
         {
             start_date = *last_sx_inst;
             recurrenceListNextInstance(recurrences, &start_date, &first_date);
@@ -1646,7 +1624,7 @@ gnc_sxed_update_cal(GncSxEditorDialog *sxed)
     else if (gtk_toggle_button_get_active(sxed->optEndCount))
     {
         gint num_remain
-        = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(sxed->endRemainSpin));
+            = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(sxed->endRemainSpin));
         gnc_dense_cal_store_update_recurrences_count_end(sxed->dense_cal_model, &first_date, recurrences, num_remain);
     }
     else
@@ -1726,7 +1704,7 @@ _open_editors(GtkDialog *dialog, gint response_code, gpointer data)
         for (sx_iter = adhd->affected_sxes; sx_iter; sx_iter = sx_iter->next)
         {
             gnc_ui_scheduled_xaction_editor_dialog_create((SchedXaction*)sx_iter->data,
-                    FALSE);
+                                                          FALSE);
         }
     }
     g_list_free(adhd->affected_sxes);
@@ -1790,8 +1768,8 @@ _sx_engine_event_handler(QofInstance *ent, QofEventId event_type, gpointer user_
 
         renderer = gtk_cell_renderer_text_new();
         name_column = gtk_tree_view_column_new_with_attributes(_("Name"),
-                      renderer,
-                      "text", 0, NULL);
+                                                               renderer,
+                                                               "text", 0, NULL);
         gtk_tree_view_append_column(list, name_column);
 
         g_signal_connect(G_OBJECT(dialog), "response",

commit f8a0108a02a07c8eb175429cffa2d85d2f5b0c7f
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jan 7 14:23:04 2016 -0800

    Don't make the $prefix/share/gnucash/gnome link on OSX_QUARTZ
    
    The directory it links to isn't there and that creates a code signing
    problem on OS X 10.11.

diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 5eee396..8593462 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -258,7 +258,7 @@ SCM_FILE_LINKS = \
   ${gncscm_DATA}
 endif
 
-.scm-links: 
+.scm-links:
 	$(RM) -rf gnucash
 	mkdir -p  gnucash
 if GNUCASH_SEPARATE_BUILDDIR
@@ -311,8 +311,9 @@ CLEANFILES = \
 
 MAINTAINERCLEANFILES = swig-gnome-utils.c
 
-# FIXME: Symlinking directories only works on non-win32.
+# We want to do this only for the Gnome help tool on Linux and MacPorts.
 if !PLATFORM_WIN32
+if !PLATFORM_OSX_QUARTZ
 #
 # I hate inconsistent standards. Autotools puts help files into
 # ${datadir}/gnome/help/${program} while the gnome2 libraries expect
@@ -324,5 +325,6 @@ install-data-hook:
 uninstall-hook:
 	rm -f ${DESTDIR}${pkgdatadir}/gnome
 endif
+endif
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\"
diff --git a/src/html/Makefile.am b/src/html/Makefile.am
index fc4885f..82bd628 100644
--- a/src/html/Makefile.am
+++ b/src/html/Makefile.am
@@ -74,8 +74,9 @@ EXTRA_DIST = \
 CLEANFILES = $(BUILT_SOURCES) gnucash
 MAINTAINERCLEANFILES = swig-gnc-html.c
 
-# FIXME: Symlinking directories only works on non-win32.
+# We do this only for the gnome help tool on Linux and MacPorts.
 if !PLATFORM_WIN32
+if !PLATFORM_OSX_QUARTZ
 #
 # I hate inconsistent standards. Autotools puts help files into
 # ${datadir}/gnome/help/${program} while the gnome2 libraries expect
@@ -87,5 +88,6 @@ install-data-hook:
 uninstall-hook:
 	rm -f ${DESTDIR}${pkgdatadir}/gnome
 endif
+endif
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.html\"

commit 7a25e2a716b1cf0e518a854fd181cb7034ad0292
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 5 17:17:45 2016 -0800

    Bug 680104 - formula not calculated when variables are mixed with constants
    
    Fixes an error from 4ea1ea02 that assumed incorrectly that
    gnc_exp_parser_parse_separate_variables() returns false if there are no variables
    found. It doesn't.

diff --git a/src/app-utils/gnc-sx-instance-model.c b/src/app-utils/gnc-sx-instance-model.c
index 292de34..cf7472e 100644
--- a/src/app-utils/gnc-sx-instance-model.c
+++ b/src/app-utils/gnc-sx-instance-model.c
@@ -283,8 +283,7 @@ gnc_sx_get_template_transaction_account(const SchedXaction *sx)
 void
 gnc_sx_get_variables(SchedXaction *sx, GHashTable *var_hash)
 {
-    Account *sx_template_acct;
-    sx_template_acct = gnc_sx_get_template_transaction_account(sx);
+    Account *sx_template_acct = gnc_sx_get_template_transaction_account(sx);
     xaccAccountForEachTransaction(sx_template_acct, _get_vars_helper, var_hash);
 }
 
@@ -988,12 +987,15 @@ _get_sx_formula_value(const SchedXaction* sx, const Split *template_split, gnc_n
                                       numeric_key,
                                       NULL);
     *numeric = kvp_value_get_numeric(kvp_val);
-    if ((gnc_numeric_check(*numeric) == GNC_ERROR_OK)
-        && !gnc_numeric_zero_p(*numeric))
+    if ((variable_bindings == NULL ||
+         g_hash_table_size(variable_bindings) == 0) &&
+        gnc_numeric_check(*numeric) == GNC_ERROR_OK &&
+        !gnc_numeric_zero_p(*numeric))
     {
-        /* Already a valid non-zero result? Then return and don't
-         * parse the string. Luckily we avoid any locale problems with
-         * decimal points here! Phew. */
+        /* If there are no variables to parse and we had a valid numeric stored
+         * then we can skip parsing the formula, which might save some
+         * localization problems with separators.
+         */
         return;
     }
 
@@ -1672,9 +1674,15 @@ create_cashflow_helper(Transaction *template_txn, void *user_data)
             gint gncn_error;
 
             /* Credit value */
-            _get_sx_formula_value(creation_data->sx, template_split, &credit_num, creation_data->creation_errors, GNC_SX_CREDIT_FORMULA, GNC_SX_CREDIT_NUMERIC, NULL);
+            _get_sx_formula_value(creation_data->sx, template_split,
+                                  &credit_num, creation_data->creation_errors,
+                                  GNC_SX_CREDIT_FORMULA, GNC_SX_CREDIT_NUMERIC,
+                                  NULL);
             /* Debit value */
-            _get_sx_formula_value(creation_data->sx, template_split, &debit_num, creation_data->creation_errors, GNC_SX_DEBIT_FORMULA, GNC_SX_DEBIT_NUMERIC, NULL);
+            _get_sx_formula_value(creation_data->sx, template_split,
+                                  &debit_num, creation_data->creation_errors,
+                                  GNC_SX_DEBIT_FORMULA, GNC_SX_DEBIT_NUMERIC,
+                                  NULL);
 
             /* The resulting cash flow number: debit minus credit,
              * multiplied with the count factor. */
diff --git a/src/register/ledger-core/split-register-model-save.c b/src/register/ledger-core/split-register-model-save.c
index b22bdee..c0908c9 100644
--- a/src/register/ledger-core/split-register-model-save.c
+++ b/src/register/ledger-core/split-register-model-save.c
@@ -705,6 +705,7 @@ gnc_template_register_save_debcred_cell (BasicCell * cell,
     char *error_loc;
     gnc_numeric new_amount;
     gboolean parse_result;
+    GHashTable *parser_vars = g_hash_table_new(g_str_hash, g_str_equal);
 
     g_return_if_fail (gnc_basic_cell_has_name (cell, FDEBT_CELL) ||
                       gnc_basic_cell_has_name (cell, FCRED_CELL));
@@ -728,16 +729,24 @@ gnc_template_register_save_debcred_cell (BasicCell * cell,
      * further variable definitions), store that numeric value
      * additionally in the kvp. Otherwise store a zero numeric
      * there.*/
-    parse_result = gnc_exp_parser_parse_separate_vars(value, &new_amount, &error_loc, NULL);
-    if (!parse_result)
+    parse_result = gnc_exp_parser_parse_separate_vars(value, &new_amount,
+                                                      &error_loc, parser_vars);
+    if (g_hash_table_size(parser_vars) == 0)
     {
-        new_amount = gnc_numeric_zero();
+        if (!parse_result)
+        {
+            new_amount = gnc_numeric_zero();
+        }
+        kvp_frame_set_slot_path (kvpf, kvp_value_new_numeric (new_amount),
+                                 GNC_SX_ID,
+                                 GNC_SX_CREDIT_NUMERIC,
+                                 NULL);
+    }
+    else
+    {
+        g_hash_table_destroy(parser_vars);
+        parser_vars = g_hash_table_new (g_str_hash, g_str_equal);
     }
-    kvp_frame_set_slot_path (kvpf, kvp_value_new_numeric (new_amount),
-                             GNC_SX_ID,
-                             GNC_SX_CREDIT_NUMERIC,
-                             NULL);
-
     value = gnc_table_layout_get_cell_value (reg->table->layout, FDEBT_CELL);
 
     kvp_frame_set_slot_path (kvpf,
@@ -748,16 +757,24 @@ gnc_template_register_save_debcred_cell (BasicCell * cell,
 
     /* If the value can be parsed into a numeric result, store that
      * numeric value additionally. See above comment.*/
-    parse_result = gnc_exp_parser_parse_separate_vars(value, &new_amount, &error_loc, NULL);
-    if (!parse_result)
+    parse_result = gnc_exp_parser_parse_separate_vars(value, &new_amount,
+                                                      &error_loc, parser_vars);
+    if (parser_vars == NULL)
     {
-        new_amount = gnc_numeric_zero();
+        if (!parse_result)
+        {
+            new_amount = gnc_numeric_zero();
+        }
+        kvp_frame_set_slot_path (kvpf, kvp_value_new_numeric (new_amount),
+                                 GNC_SX_ID,
+                                 GNC_SX_DEBIT_NUMERIC,
+                                 NULL);
+    }
+    else
+    {
+        g_hash_table_destroy(parser_vars);
+        parser_vars = NULL;
     }
-    kvp_frame_set_slot_path (kvpf, kvp_value_new_numeric (new_amount),
-                             GNC_SX_ID,
-                             GNC_SX_DEBIT_NUMERIC,
-                             NULL);
-
     DEBUG ("kvp_frame  after: %s\n", kvp_frame_to_string (kvpf));
 
     /* set the amount to an innocuous value */

commit a1126679297b04dacd5b8979a3c21dfabf94fcf6
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jan 3 10:40:19 2016 -0800

    Extract Functions split_apply_formulas and split_apply_exchange_rate.
    
    Removing a chunk of commented-out code that got the exchange rate from
    the price db.

diff --git a/src/app-utils/gnc-sx-instance-model.c b/src/app-utils/gnc-sx-instance-model.c
index d74067e..292de34 100644
--- a/src/app-utils/gnc-sx-instance-model.c
+++ b/src/app-utils/gnc-sx-instance-model.c
@@ -500,17 +500,17 @@ gnc_sx_instance_model_get_type(void)
     if (type == 0)
     {
         static const GTypeInfo info =
-        {
-            sizeof (GncSxInstanceModelClass),
-            NULL,   /* base_init */
-            NULL,   /* base_finalize */
-            (GClassInitFunc)gnc_sx_instance_model_class_init,   /* class_init */
-            NULL,   /* class_finalize */
-            NULL,   /* class_data */
-            sizeof (GncSxInstanceModel),
-            0,      /* n_preallocs */
-            (GInstanceInitFunc)gnc_sx_instance_model_init    /* instance_init */
-        };
+            {
+                sizeof (GncSxInstanceModelClass),
+                NULL,   /* base_init */
+                NULL,   /* base_finalize */
+                (GClassInitFunc)gnc_sx_instance_model_class_init,   /* class_init */
+                NULL,   /* class_finalize */
+                NULL,   /* class_data */
+                sizeof (GncSxInstanceModel),
+                0,      /* n_preallocs */
+                (GInstanceInitFunc)gnc_sx_instance_model_init    /* instance_init */
+            };
         type = g_type_register_static (G_TYPE_OBJECT,
                                        "GncSxInstanceModelType",
                                        &info, 0);
@@ -699,8 +699,8 @@ _gnc_sx_instance_event_handler(QofInstance *ent, QofEventId event_type, gpointer
                 {
                     /* it's moved from disabled to enabled, add the instances */
                     instances->sx_instance_list
-                    = g_list_append(instances->sx_instance_list,
-                                    _gnc_sx_gen_instances((gpointer)sx, (gpointer) & instances->range_end));
+                        = g_list_append(instances->sx_instance_list,
+                                        _gnc_sx_gen_instances((gpointer)sx, (gpointer) & instances->range_end));
                     g_signal_emit_by_name(instances, "added", (gpointer)sx);
                 }
             }
@@ -730,8 +730,8 @@ _gnc_sx_instance_event_handler(QofInstance *ent, QofEventId event_type, gpointer
             {
                 /* generate instances, add to instance list, emit update. */
                 instances->sx_instance_list
-                = g_list_append(instances->sx_instance_list,
-                                _gnc_sx_gen_instances((gpointer)sx, (gpointer) & instances->range_end));
+                    = g_list_append(instances->sx_instance_list,
+                                    _gnc_sx_gen_instances((gpointer)sx, (gpointer) & instances->range_end));
                 g_signal_emit_by_name(instances, "added", (gpointer)sx);
             }
         }
@@ -870,10 +870,10 @@ gnc_sx_instance_model_update_sx_instances(GncSxInstanceModel *model, SchedXactio
             {
                 gchar *to_add_key = (gchar*)var_iter->data;
                 if (!g_hash_table_lookup_extended(
-                            inst->variable_bindings, to_add_key, NULL, NULL))
+                        inst->variable_bindings, to_add_key, NULL, NULL))
                 {
                     GncSxVariable *parent_var
-                    = g_hash_table_lookup(existing->variable_names, to_add_key);
+                        = g_hash_table_lookup(existing->variable_names, to_add_key);
                     GncSxVariable *var_copy;
 
                     g_assert(parent_var != NULL);
@@ -906,8 +906,8 @@ static void
 increment_sx_state(GncSxInstance *inst, GDate **last_occur_date, int *instance_count, int *remain_occur_count)
 {
     if (!g_date_valid(*last_occur_date)
-            || (g_date_valid(*last_occur_date)
-                && g_date_compare(*last_occur_date, &inst->date) <= 0))
+        || (g_date_valid(*last_occur_date)
+            && g_date_compare(*last_occur_date, &inst->date) <= 0))
     {
         *last_occur_date = &inst->date;
     }
@@ -989,7 +989,7 @@ _get_sx_formula_value(const SchedXaction* sx, const Split *template_split, gnc_n
                                       NULL);
     *numeric = kvp_value_get_numeric(kvp_val);
     if ((gnc_numeric_check(*numeric) == GNC_ERROR_OK)
-            && !gnc_numeric_zero_p(*numeric))
+        && !gnc_numeric_zero_p(*numeric))
     {
         /* Already a valid non-zero result? Then return and don't
          * parse the string. Luckily we avoid any locale problems with
@@ -1036,15 +1036,98 @@ _get_sx_formula_value(const SchedXaction* sx, const Split *template_split, gnc_n
 }
 
 static void
-_get_credit_formula_value(GncSxInstance *instance, const Split *template_split, gnc_numeric *credit_num, GList **creation_errors)
+_get_credit_formula_value(GncSxInstance *instance,
+                          const Split *template_split, gnc_numeric *credit_num,
+                          GList **creation_errors)
+{
+    _get_sx_formula_value(instance->parent->sx, template_split, credit_num,
+                          creation_errors, GNC_SX_CREDIT_FORMULA,
+                          GNC_SX_CREDIT_NUMERIC, instance->variable_bindings);
+}
+
+static void
+_get_debit_formula_value(GncSxInstance *instance, const Split *template_split,
+                         gnc_numeric *debit_num, GList **creation_errors)
 {
-    _get_sx_formula_value(instance->parent->sx, template_split, credit_num, creation_errors, GNC_SX_CREDIT_FORMULA, GNC_SX_CREDIT_NUMERIC, instance->variable_bindings);
+    _get_sx_formula_value(instance->parent->sx, template_split, debit_num,
+                          creation_errors, GNC_SX_DEBIT_FORMULA,
+                          GNC_SX_DEBIT_NUMERIC, instance->variable_bindings);
+}
+
+static gnc_numeric
+split_apply_formulas (const Split *split, SxTxnCreationData* creation_data)
+{
+    gnc_numeric credit_num = gnc_numeric_zero();
+    gnc_numeric debit_num = gnc_numeric_zero();
+    gnc_numeric final;
+    gint gncn_error;
+    SchedXaction *sx = creation_data->instance->parent->sx;
+
+    _get_credit_formula_value(creation_data->instance, split, &credit_num,
+                              creation_data->creation_errors);
+    _get_debit_formula_value(creation_data->instance, split, &debit_num,
+                             creation_data->creation_errors);
+
+    final = gnc_numeric_sub_fixed(debit_num, credit_num);
+
+    gncn_error = gnc_numeric_check(final);
+    if (gncn_error != GNC_ERROR_OK)
+    {
+        GString *err = g_string_new("");
+        g_string_printf(err, "error %d in SX [%s] final gnc_numeric value, using 0 instead",
+                        gncn_error, xaccSchedXactionGetName(sx));
+        g_critical("%s", err->str);
+        if (creation_data->creation_errors != NULL)
+            *creation_data->creation_errors =
+                g_list_append(*creation_data->creation_errors, err);
+        else
+            g_string_free(err, TRUE);
+        final = gnc_numeric_zero();
+    }
+    return final;
 }
 
 static void
-_get_debit_formula_value(GncSxInstance *instance, const Split *template_split, gnc_numeric *debit_num, GList **creation_errors)
+split_apply_exchange_rate (Split *split, GHashTable *bindings,
+                           gnc_commodity *first_cmdty,
+                           gnc_commodity *split_cmdty, gnc_numeric *final)
 {
-    _get_sx_formula_value(instance->parent->sx, template_split, debit_num, creation_errors, GNC_SX_DEBIT_FORMULA, GNC_SX_DEBIT_NUMERIC, instance->variable_bindings);
+    GString *exchange_rate_var_name = g_string_sized_new(16);
+    GncSxVariable *exchange_rate_var;
+    gnc_numeric amt;
+    gnc_numeric exchange_rate = gnc_numeric_create (1, 1);
+
+    g_string_printf(exchange_rate_var_name, "%s -> %s",
+                    gnc_commodity_get_mnemonic(first_cmdty),
+                    gnc_commodity_get_mnemonic(split_cmdty));
+
+    g_debug("var_name is %s -> %s", gnc_commodity_get_mnemonic(first_cmdty),
+            gnc_commodity_get_mnemonic(split_cmdty));
+
+    exchange_rate_var =
+        (GncSxVariable*)g_hash_table_lookup(bindings,
+                                            exchange_rate_var_name->str);
+
+    if (exchange_rate_var != NULL)
+    {
+        exchange_rate = exchange_rate_var->value;
+        g_debug("exchange_rate is %s", gnc_numeric_to_string (exchange_rate));
+    }
+    g_string_free(exchange_rate_var_name, TRUE);
+
+    if (!gnc_commodity_is_currency (split_cmdty))
+        amt = gnc_numeric_div(*final, exchange_rate,
+                              gnc_commodity_get_fraction (split_cmdty),
+                              GNC_HOW_RND_ROUND_HALF_UP);
+    else
+        amt = gnc_numeric_mul(*final, exchange_rate, 1000,
+                              GNC_HOW_RND_ROUND_HALF_UP);
+
+
+    g_debug("amount is %s for memo split '%s'", gnc_numeric_to_string (amt),
+            xaccSplitGetMemo (split));
+    xaccSplitSetAmount(split, amt); /* marks split dirty */
+
 }
 
 static gboolean
@@ -1055,9 +1138,8 @@ create_each_transaction_helper(Transaction *template_txn, void *user_data)
     Split *copying_split;
     gnc_commodity *first_cmdty = NULL;
     gboolean err_flag = FALSE;
-    SxTxnCreationData *creation_data;
-
-    creation_data = (SxTxnCreationData*)user_data;
+    SxTxnCreationData *creation_data = (SxTxnCreationData*)user_data;
+    SchedXaction *sx = creation_data->instance->parent->sx;
 
     /* FIXME: In general, this should [correctly] deal with errors such
        as not finding the approrpiate Accounts and not being able to
@@ -1068,9 +1150,10 @@ create_each_transaction_helper(Transaction *template_txn, void *user_data)
 
     g_debug("creating template txn desc [%s] for sx [%s]",
             xaccTransGetDescription(new_txn),
-            xaccSchedXactionGetName(creation_data->instance->parent->sx));
+            xaccSchedXactionGetName(sx));
 
-    g_debug("template txn currency is %s", gnc_commodity_get_mnemonic(xaccTransGetCurrency (template_txn)));
+    g_debug("template txn currency is %s",
+            gnc_commodity_get_mnemonic(xaccTransGetCurrency (template_txn)));
 
     /* clear any copied KVP data */
     qof_instance_set_slots(QOF_INSTANCE(new_txn), kvp_frame_new());
@@ -1092,15 +1175,15 @@ create_each_transaction_helper(Transaction *template_txn, void *user_data)
     if ((template_splits == NULL) || (txn_splits == NULL))
     {
         g_critical("transaction w/o splits for sx [%s]",
-                   xaccSchedXactionGetName(creation_data->instance->parent->sx));
+                   xaccSchedXactionGetName(sx));
         xaccTransDestroy(new_txn);
         xaccTransCommitEdit(new_txn);
         return FALSE;
     }
 
     for (;
-            txn_splits && template_splits;
-            txn_splits = txn_splits->next, template_splits = template_splits->next)
+         txn_splits && template_splits;
+         txn_splits = txn_splits->next, template_splits = template_splits->next)
     {
         const Split *template_split;
         Account *split_acct;
@@ -1112,7 +1195,8 @@ create_each_transaction_helper(Transaction *template_txn, void *user_data)
         template_split = (Split*)template_splits->data;
         copying_split = (Split*)txn_splits->data;
 
-        if (!_get_template_split_account(creation_data->instance->parent->sx, template_split, &split_acct, creation_data->creation_errors))
+        if (!_get_template_split_account(sx, template_split, &split_acct,
+                                         creation_data->creation_errors))
         {
             err_flag = TRUE;
             break;
@@ -1124,109 +1208,35 @@ create_each_transaction_helper(Transaction *template_txn, void *user_data)
         split_cmdty = xaccAccountGetCommodity(split_acct);
         if (first_cmdty == NULL)
         {
-            /* Set new_txn currency to template_txn if we have one, else first split */
+            /* Set new_txn currency to template_txn if we have one, else first
+             * split
+             */
             if (xaccTransGetCurrency(template_txn))
-                xaccTransSetCurrency(new_txn, xaccTransGetCurrency(template_txn));
-            else
+                xaccTransSetCurrency(new_txn,
+                                     xaccTransGetCurrency(template_txn));
+            else /* FIXME check for marker split */
                 xaccTransSetCurrency(new_txn, split_cmdty);
 
             first_cmdty = xaccTransGetCurrency(new_txn);
         }
-        g_debug("new txn currency is %s", gnc_commodity_get_mnemonic(first_cmdty));
+        g_debug("new txn currency is %s",
+                gnc_commodity_get_mnemonic(first_cmdty));
 
         xaccSplitSetAccount(copying_split, split_acct);
 
         {
-            gnc_numeric credit_num, debit_num, final;
-            gint gncn_error;
-
-            credit_num = gnc_numeric_zero();
-            debit_num = gnc_numeric_zero();
-
-            _get_credit_formula_value(creation_data->instance, template_split, &credit_num, creation_data->creation_errors);
-            _get_debit_formula_value(creation_data->instance, template_split, &debit_num, creation_data->creation_errors);
-
-            final = gnc_numeric_sub_fixed( debit_num, credit_num );
-
-            gncn_error = gnc_numeric_check(final);
-            if (gncn_error != GNC_ERROR_OK)
-            {
-                GString *err = g_string_new("");
-                g_string_printf(err, "error %d in SX [%s] final gnc_numeric value, using 0 instead",
-                                gncn_error, xaccSchedXactionGetName(creation_data->instance->parent->sx));
-                g_critical("%s", err->str);
-                if (creation_data->creation_errors != NULL)
-                    *creation_data->creation_errors = g_list_append(*creation_data->creation_errors, err);
-                else
-                    g_string_free(err, TRUE);
-                final = gnc_numeric_zero();
-            }
-
+            gnc_numeric final = split_apply_formulas(template_split,
+                                                     creation_data);
             xaccSplitSetValue(copying_split, final);
-            g_debug("value is %s for memo split '%s'", gnc_numeric_to_string (final), xaccSplitGetMemo (copying_split));
-            if (! gnc_commodity_equal(split_cmdty, xaccTransGetCurrency (new_txn)))
+            g_debug("value is %s for memo split '%s'",
+                    gnc_numeric_to_string (final),
+                    xaccSplitGetMemo (copying_split));
+            if (! gnc_commodity_equal(split_cmdty,
+                                      xaccTransGetCurrency (new_txn)))
             {
-                GString *exchange_rate_var_name = g_string_sized_new(16);
-                GncSxVariable *exchange_rate_var;
-                gnc_numeric exchange_rate, amt;
-
-                /*
-                  GNCPriceDB *price_db = gnc_pricedb_get_db(gnc_get_current_book());
-                  GNCPrice *price;
-
-                  price = gnc_pricedb_lookup_latest(price_db, first_cmdty, split_cmdty);
-                  if (price == NULL)
-                  {
-                  price = gnc_pricedb_lookup_latest(price_db, split_cmdty, first_cmdty);
-                  if (price == NULL)
-                  {
-                  GString *err = g_string_new("");
-                  g_string_printf(err, "could not find pricedb entry for commodity-pair (%s, %s).",
-                  gnc_commodity_get_mnemonic(first_cmdty),
-                  gnc_commodity_get_mnemonic(split_cmdty));
-                  exchange = gnc_numeric_create(1, 1);
-                  *creation_data->creation_errors = g_list_append(*creation_data->creation_errors, err);
-
-                  }
-                  else
-                  {
-                  exchange = gnc_numeric_invert(gnc_price_get_value(price));
-                  exchange = gnc_numeric_convert(exchange, 1000,
-                                                 GNC_HOW_RND_ROUND_HALF_UP);
-                  }
-                  }
-                  else
-                  {
-                  exchange = gnc_price_get_value(price);
-                  }
-                */
-
-                exchange_rate = gnc_numeric_create (1, 1);
-                g_string_printf(exchange_rate_var_name, "%s -> %s",
-                                gnc_commodity_get_mnemonic(first_cmdty),
-                                gnc_commodity_get_mnemonic(split_cmdty));
-
-                g_debug("var_name is %s -> %s", gnc_commodity_get_mnemonic(first_cmdty),
-                                                gnc_commodity_get_mnemonic(split_cmdty));
-
-                exchange_rate_var = (GncSxVariable*)g_hash_table_lookup(creation_data->instance->variable_bindings,
-                                    exchange_rate_var_name->str);
-
-                if (exchange_rate_var != NULL)
-                {
-                    exchange_rate = exchange_rate_var->value;
-                    g_debug("exchange_rate is %s", gnc_numeric_to_string (exchange_rate));
-                }
-                g_string_free(exchange_rate_var_name, TRUE);
-
-                if (!gnc_commodity_is_currency (split_cmdty))
-                    amt = gnc_numeric_div(final, exchange_rate, gnc_commodity_get_fraction (split_cmdty), GNC_HOW_RND_ROUND_HALF_UP);
-                else
-                    amt = gnc_numeric_mul(final, exchange_rate, 1000, GNC_HOW_RND_ROUND_HALF_UP);
-
-
-                g_debug("amount is %s for memo split '%s'", gnc_numeric_to_string (amt), xaccSplitGetMemo (copying_split));
-                xaccSplitSetAmount(copying_split, amt); /* marks split dirty */
+                split_apply_exchange_rate(copying_split,
+                                          creation_data->instance->variable_bindings,
+                                          first_cmdty, split_cmdty, &final);
             }
 
             xaccSplitScrub(copying_split);
@@ -1236,7 +1246,7 @@ create_each_transaction_helper(Transaction *template_txn, void *user_data)
     if (err_flag)
     {
         g_critical("new transaction creation sx [%s]",
-                   xaccSchedXactionGetName(creation_data->instance->parent->sx));
+                   xaccSchedXactionGetName(sx));
         xaccTransDestroy(new_txn);
         xaccTransCommitEdit(new_txn);
         return FALSE;
@@ -1246,7 +1256,7 @@ create_each_transaction_helper(Transaction *template_txn, void *user_data)
         kvp_frame *txn_frame;
         txn_frame = xaccTransGetSlots(new_txn);
         kvp_frame_set_guid(txn_frame, "from-sched-xaction",
-		  xaccSchedXactionGetGUID(creation_data->instance->parent->sx));
+                           xaccSchedXactionGetGUID(sx));
 /* The transaction was probably marked dirty by xaccTransSetCurrency,
  * but just in case: */
 	qof_instance_set_dirty (QOF_INSTANCE (new_txn));
@@ -1257,7 +1267,8 @@ create_each_transaction_helper(Transaction *template_txn, void *user_data)
     if (creation_data->created_txn_guids != NULL)
     {
         *creation_data->created_txn_guids
-        = g_list_append(*(creation_data->created_txn_guids), (gpointer)xaccTransGetGUID(new_txn));
+            = g_list_append(*(creation_data->created_txn_guids),
+                            (gpointer)xaccTransGetGUID(new_txn));
     }
 
     return FALSE;
@@ -1328,7 +1339,7 @@ gnc_sx_instance_model_effect_change(GncSxInstanceModel *model,
             }
 
             if (inst->orig_state == SX_INSTANCE_STATE_POSTPONED
-                    && inst->state != SX_INSTANCE_STATE_POSTPONED)
+                && inst->state != SX_INSTANCE_STATE_POSTPONED)
             {
                 // remove from postponed list
                 g_assert(inst->temporal_state != NULL);
@@ -1338,32 +1349,32 @@ gnc_sx_instance_model_effect_change(GncSxInstanceModel *model,
 
             switch (inst->state)
             {
-            case SX_INSTANCE_STATE_CREATED:
-                // nop: we've already processed this.
-                break;
-            case SX_INSTANCE_STATE_IGNORED:
-                increment_sx_state(inst, &last_occur_date, &instance_count, &remain_occur_count);
-                break;
-            case SX_INSTANCE_STATE_POSTPONED:
-                if (inst->orig_state != SX_INSTANCE_STATE_POSTPONED)
-                {
-		     gnc_sx_add_defer_instance(instances->sx,
-					       gnc_sx_clone_temporal_state (inst->temporal_state));
-                }
-                increment_sx_state(inst, &last_occur_date, &instance_count, &remain_occur_count);
-                break;
-            case SX_INSTANCE_STATE_TO_CREATE:
-                create_transactions_for_instance(inst, created_transaction_guids, creation_errors);
-                increment_sx_state(inst, &last_occur_date, &instance_count, &remain_occur_count);
-                gnc_sx_instance_model_change_instance_state(model, inst, SX_INSTANCE_STATE_CREATED);
-                break;
-            case SX_INSTANCE_STATE_REMINDER:
-                // do nothing
-                // assert no non-remind instances after this?
-                break;
-            default:
-                g_assert_not_reached();
-                break;
+                case SX_INSTANCE_STATE_CREATED:
+                    // nop: we've already processed this.
+                    break;
+                case SX_INSTANCE_STATE_IGNORED:
+                    increment_sx_state(inst, &last_occur_date, &instance_count, &remain_occur_count);
+                    break;
+                case SX_INSTANCE_STATE_POSTPONED:
+                    if (inst->orig_state != SX_INSTANCE_STATE_POSTPONED)
+                    {
+                        gnc_sx_add_defer_instance(instances->sx,
+                                                  gnc_sx_clone_temporal_state (inst->temporal_state));
+                    }
+                    increment_sx_state(inst, &last_occur_date, &instance_count, &remain_occur_count);
+                    break;
+                case SX_INSTANCE_STATE_TO_CREATE:
+                    create_transactions_for_instance(inst, created_transaction_guids, creation_errors);
+                    increment_sx_state(inst, &last_occur_date, &instance_count, &remain_occur_count);
+                    gnc_sx_instance_model_change_instance_state(model, inst, SX_INSTANCE_STATE_CREATED);
+                    break;
+                case SX_INSTANCE_STATE_REMINDER:
+                    // do nothing
+                    // assert no non-remind instances after this?
+                    break;
+                default:
+                    g_assert_not_reached();
+                    break;
             }
         }
 
@@ -1375,8 +1386,8 @@ gnc_sx_instance_model_effect_change(GncSxInstanceModel *model,
 
 void
 gnc_sx_instance_model_change_instance_state(GncSxInstanceModel *model,
-        GncSxInstance *instance,
-        GncSxInstanceState new_state)
+                                            GncSxInstance *instance,
+                                            GncSxInstanceState new_state)
 {
     if (instance->state == new_state)
         return;
@@ -1517,8 +1528,8 @@ gnc_sx_instance_model_summarize(GncSxInstanceModel *model, GncSxSummary *summary
     // if all the instances are 'auto-create, no-notify', then we don't need
     // the dialog.
     summary->need_dialog
-    = (summary->num_instances != 0
-       && summary->num_auto_create_no_notify_instances != summary->num_instances);
+        = (summary->num_instances != 0
+           && summary->num_auto_create_no_notify_instances != summary->num_instances);
 }
 
 void
@@ -1632,8 +1643,8 @@ create_cashflow_helper(Transaction *template_txn, void *user_data)
     }
 
     for (;
-            template_splits;
-            template_splits = template_splits->next)
+         template_splits;
+         template_splits = template_splits->next)
     {
         Account *split_acct;
         const gnc_commodity *split_cmdty = NULL;



Summary of changes:
 po/pt_PT.po                                        | 1755 ++++++++++----------
 src/app-utils/gnc-sx-instance-model.c              |  357 ++--
 src/gnome-utils/Makefile.am                        |    6 +-
 src/gnome/dialog-sx-editor.c                       | 1014 ++++++-----
 src/html/Makefile.am                               |    4 +-
 .../ledger-core/split-register-model-save.c        |   49 +-
 6 files changed, 1609 insertions(+), 1576 deletions(-)

