[grisbi-cvs] [SCM] grisbi branch, grisbi-gtk3, updated. grisbi_gtk3_1_3_0-222-g90fd22a
Pierre Biava
nobody at users.sourceforge.net
Mon Apr 16 20:33:10 CEST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, grisbi-gtk3 has been updated
via 90fd22a9e6dfe00e2367af936764a060a3e41aff (commit)
via af277978122d85849b8517acd75271c8e71db21a (commit)
via 9b3d81d02e0c312315bf985ac3fc59192b4f21f4 (commit)
via 4a844c92d1f23650ac54e456055652be28f51f55 (commit)
via d3b5809bfd75a0b9a0e46e53b259b3d387593418 (commit)
via ecba25d21cf10bf31f81229521bcfe9214225e79 (commit)
from c952062b6f6fe6e6d557d81f7227979c18ff19be (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 90fd22a9e6dfe00e2367af936764a060a3e41aff
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Apr 16 20:32:09 2012 +0200
traitement_variables.c: deleting "titre_fichier" variable
commit af277978122d85849b8517acd75271c8e71db21a
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Apr 16 20:31:25 2012 +0200
fixes various crashes when closing Grisbi
commit 9b3d81d02e0c312315bf985ac3fc59192b4f21f4
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Apr 15 09:29:44 2012 +0200
Add the parameter "GrisbiAppConf *conf" to some functions for files in gsb_file
commit 4a844c92d1f23650ac54e456055652be28f51f55
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Apr 14 16:35:31 2012 +0200
update all strings
commit d3b5809bfd75a0b9a0e46e53b259b3d387593418
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Apr 14 08:30:22 2012 +0200
Adding the modification for the accounts with deferred debit card
commit ecba25d21cf10bf31f81229521bcfe9214225e79
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Apr 8 11:29:38 2012 +0200
new version of italian categories
-----------------------------------------------------------------------
Changes:
diff --git a/po/cs.po b/po/cs.po
index bd18062..a7d6786 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2011-02-19 01:39+0100\n"
"Last-Translator: Markus7cz <markus7cz at gmail.com>\n"
"Language-Team: \n"
@@ -181,7 +181,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Souhrnné zůstatky v seznamu úÄtů"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -483,100 +483,100 @@ msgstr "Chovánà seznamu transakcÃ"
msgid "Transactions list contents"
msgstr "Obsah seznamu transakcÃ"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
msgid "Month"
msgstr "MÄsÃc"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Rok"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
msgid "General Options"
msgstr "Obecné volby"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
msgid "Common data"
msgstr "BÄžná data"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
msgid "Option for cash accounts"
msgstr "Možnosti úÄtů hotovosti"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
msgid "Add the forecast tab for cash accounts"
msgstr "PÅidat záložku prognóz k hotovostnÃm úÄtům"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
msgid "Beginning of period"
msgstr "ZaÄátek obdobÃ"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
msgid "1st day of month"
msgstr "prvnà den v mÄsÃci"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr "dnešnà datum"
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr "Poznámka: toto nastavenà platà pro prognózy bez poÄáteÄnÃho data"
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
msgid "Accounts data"
msgstr "Detaily úÄtu"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
msgid "Data for the forecast"
msgstr "Data pro prognózu"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
msgid "Sources of historical data"
msgstr "Zdroje historických dat"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
msgid "Credit Data"
msgstr "Data půjÄky"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
msgid "Account: "
msgstr "ÃÄet: "
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
msgid "Use the budget module"
msgstr "PoužÃt modul rozpoÄtů"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
msgid "Duration estimation"
msgstr "Odhad trvánÃ"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
msgid "Labels for transactions"
msgstr "Popisky transakcÃ"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
msgid "By default"
msgstr "VýchozÃ"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "Kategorie"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -584,15 +584,15 @@ msgstr "Kategorie"
msgid "Budgetary lines"
msgstr "RozpoÄty"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
msgid "Labels for scheduled transactions"
msgstr "Popisky plánovaných transakcÃ"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr "Popisek budoucÃch dat"
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
@@ -600,12 +600,12 @@ msgstr ""
"Výchozà ÅazenÃ, pokud jsou neprázdná data: poznámky, plátce/pÅÃjemce, "
"kategorie a rozpoÄet."
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
msgid "Choose the financial year or 12 months rolling"
msgstr "Zvolte fiskálnà rok nebo pohyblivých 12 mÄsÃců"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -613,35 +613,35 @@ msgstr "Zvolte fiskálnà rok nebo pohyblivých 12 mÄsÃců"
msgid "Category"
msgstr "Kategorie"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "RozpoÄet"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
msgid "Loan Capital: "
msgstr "Výše jistiny: "
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
msgid "Duration: "
msgstr "TrvánÃ: "
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
msgid "year"
msgstr "rok"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
msgid "Date of first Repayment: "
msgstr "Datum prvnà splátky: "
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
msgid "Annuel rate interest: "
msgstr "RoÄnà úroková mÃra: "
@@ -649,45 +649,49 @@ msgstr "RoÄnà úroková mÃra: "
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr "%"
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
msgid "Fees per month: "
msgstr "MÄsÃÄnà poplatky: "
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
msgid "Rate Type: "
msgstr "Typ úroÄenÃ: "
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr "CAGR"
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr "proporcionálnà sazba"
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr "PoužÃt"
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
msgid " year "
msgstr " rok "
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
msgid " years "
msgstr " let "
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr "MusÃte zadat nejménÄ jednu hodnotu pro půjÄku"
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
msgid "Credits simulator"
@@ -805,13 +809,13 @@ msgstr "Zobrazit rozpis amortizace od zaÄátku"
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
msgid "Print the array"
msgstr "Vytisknout tabulku"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
msgid "Export the array"
msgstr "Exportovat tabulku"
@@ -870,12 +874,12 @@ msgstr "Amortizace"
msgid "Credits"
msgstr "PůjÄky"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "Tisk"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -885,7 +889,7 @@ msgstr "Export"
msgid "credit.csv"
msgstr "pujcka.csv"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Nelze uložit soubor."
@@ -902,8 +906,8 @@ msgstr ""
"Chyba: frekvence nenà uživatelem definována, nebo nenà zadána Äástka, nebo "
"je neplatné datum."
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
msgid "One field is not filled in"
msgstr "Jedno z polà nenà vyplnÄné"
@@ -1026,7 +1030,7 @@ msgstr "Debet"
msgid "Credit"
msgstr "Kredit"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Kategorie : Podkategorie"
@@ -1051,15 +1055,35 @@ msgstr "Pozn."
msgid "Transfer"
msgstr "PÅevod"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Bankovnà úÄet"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Hotovostnà úÄet"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "ÃÄet závazků"
+
+#: ../src/bet_future.c:1898
+msgid "Partial balance"
+msgstr "Souhrnný zůstatek"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
msgid "Error: You must select an account."
msgstr "Chyba: MusÃte vybrat úÄet."
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr "ChybÄjÃcà data"
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
#, fuzzy
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
@@ -1069,47 +1093,51 @@ msgstr ""
"je neplatné datum."
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
msgid "Select an account"
msgstr "Vyberte úÄet"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
msgid "List of accounts"
msgstr "Seznam úÄtů"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr "Datum úÄinnosti a datum pro nahrazenà plánované operace"
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "ÃÄet celkem: (transakcÃ: %d): "
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "Jméno importovaného souboru: "
+
+#: ../src/bet_future.c:2091
msgid "Effective date: "
msgstr "̀inn̩ datum: "
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
msgid "Monthly auto-increment"
msgstr "Automatické mÄsÃÄnà navýšenÃ"
-#: ../src/bet_future.c:1973
-msgid "Check the box to replace a planned operation"
-msgstr "ZatrhnÄte volbu pro nahrazenà plánované operace"
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Hotovostnà úÄet"
+#: ../src/bet_future.c:2105
+#, fuzzy
+msgid "Replacement of the scheduled operation"
+msgstr "Odstranit tuto plánovanou transakci?"
-#: ../src/bet_future.c:2114
-msgid "Partial balance"
-msgstr "Souhrnný zůstatek"
+#: ../src/bet_future.c:2116
+#, fuzzy
+msgid "Automatic creation of the direct debit transaction"
+msgstr "Automaticky opravit detaily pÅipojené transakce"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Typ"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1189,40 +1217,40 @@ msgstr "Rezervovaná Äástka"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr "pohyblivých 12 mÄsÃců"
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
msgid "Assign the amount of the last operation"
msgstr "PÅiÅadit Äástku podle poslednà transakce"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr "KopÃrovat průmÄrnou Äástku"
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "MÄna pro tento úÄet: "
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
#, fuzzy
msgid "Data graph"
msgstr "Seskupenà dat"
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "Zdroje historických dat"
@@ -1303,7 +1331,8 @@ msgid "Convert selection to scheduled transaction"
msgstr "ZmÄnit výbÄr na plánovanou transakci"
#: ../src/bet_tab.c:1494
-msgid "Insert the balance of a cash account"
+#, fuzzy
+msgid "Insert the balance of a deferred debit account"
msgstr "Vložte saldo hotovostnÃho úÄtu"
#. redo item
@@ -1340,15 +1369,15 @@ msgstr "Žádná kategorie"
msgid "No budgetary line"
msgstr "Žádný rozpoÄet"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
msgid "Export the array of forecast"
msgstr "Exportovat tabulku prognózy"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
msgid "Balance at "
msgstr "Zůstatek k "
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr "prognoza.csv"
@@ -3522,17 +3551,6 @@ msgstr "Minimálnà požadovaný zůstatek: "
msgid "Comments"
msgstr "KomentáÅ"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Bankovnà úÄet"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "ÃÄet závazků"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6285,12 +6303,12 @@ msgstr "Datum zmÄny"
msgid "Invalid"
msgstr "Neplatné"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Bez jména %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6299,7 +6317,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6311,7 +6329,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6872,7 +6890,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "Nelze uložit konfiguraÄnà soubor '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Toto nenà soubor Grisbi... Nahrávánà bylo pÅeruÅ¡eno."
@@ -6888,7 +6906,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -6897,7 +6915,7 @@ msgstr ""
"Pro otevÅenà tohoto souboru potÅebujete verzi Grisbi %s.\n"
"Vy použÃváte verzi %s."
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6910,7 +6928,7 @@ msgstr ""
"důležitých informacà mÄjte na pamÄti, že se jedná o již archivované "
"transakce."
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr "Archiv Grisbi otevÅen"
@@ -10957,6 +10975,12 @@ msgstr "Grisbi"
msgid "Personnal finances manager"
msgstr "Osobnà správce financÃ"
+#~ msgid "Effective date and data for the replacement of a planned operation"
+#~ msgstr "Datum úÄinnosti a datum pro nahrazenà plánované operace"
+
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "ZatrhnÄte volbu pro nahrazenà plánované operace"
+
#~ msgid "Manage import associations"
#~ msgstr "Nastavit párovánà pÅi importu"
diff --git a/po/da.po b/po/da.po
index d19857d..2850139 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2006-03-25 13:23+0100\n"
"Last-Translator: Dmitri Popov <dmpop at openoffice.org>\n"
"Language-Team: \n"
@@ -185,7 +185,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Fly transaktioner til kategori"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -510,114 +510,114 @@ msgstr "Overførselsformular"
msgid "Transactions list contents"
msgstr "Transaktionsnummer"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
#, fuzzy
msgid "Month"
msgstr "MÃ¥neder"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr ""
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "Generelt"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "Fælles adresse"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "Bankkonto"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "Skrifttype i liste over transaktioner"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
#, fuzzy
msgid "Beginning of period"
msgstr "Balancer"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "MÃ¥neder"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "Kontooplysninger"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
msgid "Data for the forecast"
msgstr ""
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "Forkert dato"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "Kreditkort"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "Konto:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "Brug logoet"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
#, fuzzy
msgid "Duration estimation"
msgstr "Overførselsformular"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "Kontotransaktioner"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
msgid "By default"
msgstr ""
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "Kategorier"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -625,28 +625,28 @@ msgstr "Kategorier"
msgid "Budgetary lines"
msgstr ""
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "Lukkede planlagte transaktioner"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "Vælg regnskabsår"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -654,39 +654,39 @@ msgstr "Vælg regnskabsår"
msgid "Category"
msgstr "Kategori"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "Budgetlinje"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "Bankkonto:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "Overførselsformular:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "Ã
r"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "Betalingstype:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -695,48 +695,52 @@ msgstr "Noter:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "MÃ¥neder:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
msgid "Rate Type: "
msgstr ""
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "Ã
r"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "Ã
r"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -858,14 +862,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "Printer"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "Printer"
@@ -931,12 +935,12 @@ msgstr "Eksportér kategorier"
msgid "Credits"
msgstr "Kredit"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr ""
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -947,7 +951,7 @@ msgstr "Eksportér"
msgid "credit.csv"
msgstr "Kredit"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr ""
@@ -963,8 +967,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "Alle felter skal være udfyldt!"
@@ -1091,7 +1095,7 @@ msgstr "Debit"
msgid "Credit"
msgstr "Kredit"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Kategorier: Underkategorier"
@@ -1116,68 +1120,91 @@ msgstr "Noter"
msgid "Transfer"
msgstr "Overførsel"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Bankkonto"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Kontanter"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Passiver"
+
+#: ../src/bet_future.c:1898
+#, fuzzy
+msgid "Partial balance"
+msgstr "Balancer"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "Fly transaktioner til kategori"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "Slet konto"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "Kontanter"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "Kategori ialt (%d transaktioner):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "Betalingstype:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "efter dato:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
msgid "Monthly auto-increment"
msgstr ""
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "Kategori ialt (%d transaktion)"
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Kontanter"
+msgid "Replacement of the scheduled operation"
+msgstr "Opret en planlagt transaktion"
-#: ../src/bet_future.c:2114
+#: ../src/bet_future.c:2116
#, fuzzy
-msgid "Partial balance"
-msgstr "Balancer"
+msgid "Automatic creation of the direct debit transaction"
+msgstr "Opret en planlagt transaktion"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr ""
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1260,40 +1287,40 @@ msgstr "Kontonavn"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "Opret en planlagt transaktion"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Valutaen findes allerede.:"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "Forkert dato"
@@ -1378,7 +1405,7 @@ msgid "Convert selection to scheduled transaction"
msgstr "Opret en planlagt transaktion"
#: ../src/bet_tab.c:1494
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr ""
#. redo item
@@ -1415,16 +1442,16 @@ msgstr "Ingen kategori"
msgid "No budgetary line"
msgstr ""
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
msgid "Export the array of forecast"
msgstr ""
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "Balance"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3592,17 +3619,6 @@ msgstr "Konti under det ønskede minimumsbeløb:"
msgid "Comments"
msgstr "Kommentarer"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Bankkonto"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Passiver"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6279,12 +6295,12 @@ msgstr ""
msgid "Invalid"
msgstr "Forkert dato"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Ingen navn %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6292,7 +6308,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6301,7 +6317,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6810,7 +6826,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr ""
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Denne fil er ikke en Grisbi-rapport"
@@ -6824,14 +6840,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6839,7 +6855,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
@@ -10728,6 +10744,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Kategori ialt (%d transaktion)"
+
+#, fuzzy
#~ msgid "Manage import associations"
#~ msgstr "Yderligere info"
diff --git a/po/de.po b/po/de.po
index 03fd317..9b36a2c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2012-02-15 21:21+0100\n"
"Last-Translator: Martin Stromberger <ma.stromberger at gmx.at>\n"
"Language-Team: deutsch <de at li.org>\n"
@@ -184,7 +184,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Teilsalden"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -483,102 +483,102 @@ msgstr "Buchungsübersicht Vorschau"
msgid "Transactions list contents"
msgstr "Buchungsübersicht Inhalt"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
msgid "Month"
msgstr "Monat"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Jahr"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
msgid "General Options"
msgstr "Allgemein"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
msgid "Common data"
msgstr "Allgemeine Einstellungen"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
msgid "Option for cash accounts"
msgstr "Einstellungen für Bargeldkonten"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
msgid "Add the forecast tab for cash accounts"
msgstr "Prognose bei Bargeldkonten anzeigen"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
msgid "Beginning of period"
msgstr "Zeitspanne Anfang"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
msgid "1st day of month"
msgstr "erster Tag vom Monat"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr "aktuelles Datum"
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
"Bemerkung: Diese Einstellung wird herangezogen wenn kein Beginndatum für die "
"Prognose vorhanden ist."
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
msgid "Accounts data"
msgstr "Konten Einstellungen"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
msgid "Data for the forecast"
msgstr "Daten für die Prognose"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
msgid "Sources of historical data"
msgstr "Buchungen Auswahl"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
msgid "Credit Data"
msgstr "Kredit Daten"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
msgid "Account: "
msgstr "Konto: "
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
msgid "Use the budget module"
msgstr "Prognose anzeigen"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
msgid "Duration estimation"
msgstr "Daten Zusammenstellung"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
msgid "Labels for transactions"
msgstr "Bezeichnungen für Buchungen"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
msgid "By default"
msgstr "Voreinstellung"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "Kategorien"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -586,15 +586,15 @@ msgstr "Kategorien"
msgid "Budgetary lines"
msgstr "Budgeteinträge"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
msgid "Labels for scheduled transactions"
msgstr "Bezeichnungen für geplante Buchungen"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr "Bezeichnungen für zukünftige Daten"
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
@@ -602,12 +602,12 @@ msgstr ""
"Standardsortierung wenn Daten vorhanden sind: Notizen, Empfänger, Kategorie "
"und Budgeteintrag."
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
msgid "Choose the financial year or 12 months rolling"
msgstr "Geschäftsjahr oder Zeitspanne von 12 Monaten"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -615,35 +615,35 @@ msgstr "Geschäftsjahr oder Zeitspanne von 12 Monaten"
msgid "Category"
msgstr "Kategorie"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "Budgeteintrag"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
msgid "Loan Capital: "
msgstr "Kredit Betrag: "
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
msgid "Duration: "
msgstr "Zeitspanne: "
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
msgid "year"
msgstr "Jahr"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
msgid "Date of first Repayment: "
msgstr "Datum erste Rückzahlung: "
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
msgid "Annuel rate interest: "
msgstr "Zinssatz jährlich: "
@@ -651,45 +651,49 @@ msgstr "Zinssatz jährlich: "
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr "%"
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
msgid "Fees per month: "
msgstr "Gebühren pro Monat: "
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
msgid "Rate Type: "
msgstr "Ratenart: "
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr "kumulierte jährliche Wachstumsrate"
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr "anteilsmäÃige Rate"
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr "Anwenden"
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
msgid " year "
msgstr " Jahr "
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
msgid " years "
msgstr " Jahre "
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr "Es muss zumindest ein Wert für den Betrag erfasst werden"
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
msgid "Credits simulator"
@@ -809,13 +813,13 @@ msgstr "Tilgungen geplant vom Anfang anzeigen"
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
msgid "Print the array"
msgstr "Auflistung Drucken"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
msgid "Export the array"
msgstr "Auflistung Exportieren"
@@ -874,12 +878,12 @@ msgstr "Rückzahlung"
msgid "Credits"
msgstr "Einnahmen"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "Drucken"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -889,7 +893,7 @@ msgstr "Export"
msgid "credit.csv"
msgstr "credit.csv"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Datei kann nicht gespeichert werden."
@@ -904,8 +908,8 @@ msgid ""
"the date is invalid."
msgstr "Fehler: Die Frequenz ist nicht festgelegt oder das Datum ist ungültig."
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
msgid "One field is not filled in"
msgstr "Es wurden nicht alle Eingabefelder befüllt"
@@ -1028,7 +1032,7 @@ msgstr "Ausgaben"
msgid "Credit"
msgstr "Einnahmen"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Kategorien : Unterkategorien"
@@ -1053,15 +1057,35 @@ msgstr "Notizen"
msgid "Transfer"
msgstr "Umbuchung"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Bankkonto"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Bargeldkonto"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Kreditkonto"
+
+#: ../src/bet_future.c:1898
+msgid "Partial balance"
+msgstr "Teilsaldo"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
msgid "Error: You must select an account."
msgstr "Es muss mindestens ein Konto ausgewählt werden."
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr "Fehlende Daten"
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
@@ -1070,47 +1094,51 @@ msgstr ""
"Datum ist ungültig."
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
msgid "Select an account"
msgstr "Ein Konto auswählen"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
msgid "List of accounts"
msgstr "Auflistung von Konten"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr "Effektives Datum und Daten für Ersetzung durch eine geplante Buchung"
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "Konto gesamt: (%d Buchungen): "
+
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "Importdatei: "
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2091
msgid "Effective date: "
msgstr "Effektives Datum: "
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
msgid "Monthly auto-increment"
msgstr "Automatische Erhöhung pro Monat"
-#: ../src/bet_future.c:1973
-msgid "Check the box to replace a planned operation"
-msgstr "Die 'Checkbox' auswählen um die geplante Buchung zu ersetzen"
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Bargeldkonto"
+#: ../src/bet_future.c:2105
+#, fuzzy
+msgid "Replacement of the scheduled operation"
+msgstr "Diese geplante Buchung löschen?"
-#: ../src/bet_future.c:2114
-msgid "Partial balance"
-msgstr "Teilsaldo"
+#: ../src/bet_future.c:2116
+#, fuzzy
+msgid "Automatic creation of the direct debit transaction"
+msgstr "Die zugehörigen Teilbuchungen von einer Buchung wiederherstellen"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Art"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1191,40 +1219,40 @@ msgstr "einbehaltener Betrag"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr "Zeitspanne von 12 Monaten"
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
msgid "Assign the amount of the last operation"
msgstr "Den Betrag von der letzten Aktion zuordnen"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr "Den durchschnittlichen Betrag kopieren"
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
"Auflistung nach %s mit einer Zeitspanne von 12 Monaten für das Konto: «%s»"
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Auflistung nach %s in %s für das Konto: «%s»"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr "Diagramm"
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr "Das Diagramm anzeigen"
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
msgid "Export the historical data"
msgstr "Historische Daten exportieren"
@@ -1303,7 +1331,8 @@ msgid "Convert selection to scheduled transaction"
msgstr "Buchung regelmäÃig ausführen"
#: ../src/bet_tab.c:1494
-msgid "Insert the balance of a cash account"
+#, fuzzy
+msgid "Insert the balance of a deferred debit account"
msgstr "Den Saldo von einem Bargeldkonto eingeben"
#. redo item
@@ -1340,15 +1369,15 @@ msgstr "Keine Kategorie"
msgid "No budgetary line"
msgstr "Kein Budgeteintrag"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
msgid "Export the array of forecast"
msgstr "Prognose exportieren - Grisbi"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
msgid "Balance at "
msgstr "Bilanz am "
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr "forecast.csv"
@@ -3538,17 +3567,6 @@ msgstr "Mindestsaldo festgelegt: "
msgid "Comments"
msgstr "Notizen"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Bankkonto"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Kreditkonto"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6329,12 +6347,12 @@ msgstr "Aktualisierung Datum"
msgid "Invalid"
msgstr "Ungültig"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Kein Name %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6343,7 +6361,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6354,7 +6372,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6935,7 +6953,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "Die Konfiguration kann nicht gespeichert werden '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Diese Datei ist kein Grisbi-Datei...der Ladevorgang wird abgebrochen."
@@ -6951,7 +6969,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -6960,7 +6978,7 @@ msgstr ""
"Grisbi mit Version %s ist zum Ãffnen der Datei notwendig.\n"
"Sie verwenden Version %s."
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6971,7 +6989,7 @@ msgstr ""
"Bevor Buchungen oder wichtige Informationen geändert werden sollten Sie "
"beachten, dass es sich um ein Archiv handelt."
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr "Grisbi Archiv geöffnet"
@@ -11087,6 +11105,13 @@ msgstr "Grisbi"
msgid "Personnal finances manager"
msgstr "Finanzprogramm für Privatpersonen"
+#~ msgid "Effective date and data for the replacement of a planned operation"
+#~ msgstr ""
+#~ "Effektives Datum und Daten für Ersetzung durch eine geplante Buchung"
+
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Die 'Checkbox' auswählen um die geplante Buchung zu ersetzen"
+
#~ msgid "Enter a scheduled transaction"
#~ msgstr "Geplante Buchung ausführen - Grisbi"
diff --git a/po/el.po b/po/el.po
index f52f0d1..ce45e03 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Grisbi 0.5.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2009-04-13 14:53+0200\n"
"Last-Translator: \n"
"Language-Team: KASKAS <ttnfy17 at yahoo.gr>\n"
@@ -194,7 +194,7 @@ msgid "Balances partials of the list of accounts"
msgstr "ÎÏιλÎξÏε ÏÏ
ναλλαγÎÏ ÎµÎ½ÏÏ Î»Î¿Î³Î±ÏιαÏμοÏ."
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -518,115 +518,115 @@ msgstr "ΣÏ
μÏεÏιÏοÏά καÏαλÏγÏν ÏÏ
ναλλαγήÏ"
msgid "Transactions list contents"
msgstr "ΠεÏιεÏÏμενο ÏÏ
ναλλαγήÏ"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
msgid "Month"
msgstr "ÎήναÏ"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "ΧÏÏνοÏ"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "ÎενικÏÏηÏεÏ"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "Îοινή διεÏθÏ
νÏη"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "ÎÏιλÎξÏε ÏοÏ
Ï Î»Î¿Î³Î±ÏιαÏμοÏÏ Î¼ÎµÏÏηÏÏν"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "Î ÏοÏθÎÏÏε ÏÎ¹Ï ÏÏ
ναλλαγÎÏ Ïε Îναν λογαÏιαÏμÏ."
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
#, fuzzy
msgid "Beginning of period"
msgstr "ÎÏÏή ÏÎ·Ï ÎµÎ²Î´Î¿Î¼Î¬Î´Î±Ï"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "ΤελεÏ
ÏÎ±Î¯ÎµÏ 30 ημÎÏεÏ"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "ÎεÏÏομÎÏÎµÎ¹ÎµÏ Î»Î¿Î³Î±ÏιαÏμοÏ"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
#, fuzzy
msgid "Data for the forecast"
msgstr "ÎμεÏομηνία λανθαÏμÎνη για Ïη διαÏαγή"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "ÎÏÏική ημεÏομηνία"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "ΠιÏÏÏÏική κάÏÏα"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "ÎογαÏιαÏμÏÏ:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "ÎονδÏλια ÏοÏ
ειÏοδημαÏÎ¹ÎºÎ¿Ï ÏÏοÏÏολογιÏμοÏ"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
#, fuzzy
msgid "Duration estimation"
msgstr "ÎÏγάνÏÏη ÏÏοιÏείÏν"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "ΣÏ
ναλλαγÎÏ Î¼Îµ Îνα κλικ"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "ΠίÏÏ ÏÏην ÏÏοεÏιλογή"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "ÎαÏηγοÏίεÏ"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -634,28 +634,28 @@ msgstr "ÎαÏηγοÏίεÏ"
msgid "Budgetary lines"
msgstr "ÎημοÏιονομικÎÏ Î³ÏαμμÎÏ"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "ÎλειÏÏÎÏ ÏÏογÏαμμαÏιÏμÎÎ½ÎµÏ ÏÏ
ναλλαγÎÏ"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "ÎÏιλÎξÏε Ïο Î¿Î¹ÎºÎ¿Î½Î¿Î¼Î¹ÎºÏ ÎÏοÏ"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -663,39 +663,39 @@ msgstr "ÎÏιλÎξÏε Ïο Î¿Î¹ÎºÎ¿Î½Î¿Î¼Î¹ÎºÏ ÎÏοÏ"
msgid "Category"
msgstr "ÎαÏηγοÏία"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "ÎημοÏιονομική γÏαμμή"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "ΦÏÏÏÏÏη λογαÏιαÏμÏν:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "ΤαξινÏμηÏη Ïε Ïίνακα:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "ΧÏÏνια"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "μÎÎ¸Î¿Î´Î¿Ï ÏληÏÏμήÏ:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -704,49 +704,53 @@ msgstr "ÎÏήÏÎ¹Î¿Ï ÏÏοÏÏολογιÏμÏÏ:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "ΤÏÎµÎ¹Ï Î¼Î®Î½ÎµÏ:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "ΤÏÏοÏ:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "ÎÏÎ¿Ï %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "ΧÏÏνια"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -867,14 +871,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "ÎκÏÏ
ÏÏÏήÏ"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "ÎκÏÏ
ÏÏÏήÏ"
@@ -940,12 +944,12 @@ msgstr "ΣειÏά εκÏίμηÏηÏ"
msgid "Credits"
msgstr "ΠίÏÏÏÏη"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "ÎκÏÏÏÏÏη"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -956,7 +960,7 @@ msgstr "ÎξαγÏγή"
msgid "credit.csv"
msgstr "ΠίÏÏÏÏη"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "ÎδÏναÏη η αÏοθήκεÏ
Ïη αÏÏείοÏ
"
@@ -971,8 +975,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "Îεν ÎÏοÏ
ν ÏÏ
μÏληÏÏθεί Ïλοι οι ÏομείÏ"
@@ -1096,7 +1100,7 @@ msgstr "ΧÏÎÏÏη"
msgid "Credit"
msgstr "ΠίÏÏÏÏη"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "ÎαÏηγοÏÎ¯ÎµÏ :Î¥ÏοκαÏηγοÏίεÏ"
@@ -1121,69 +1125,92 @@ msgstr "ΣημειÏÏειÏ"
msgid "Transfer"
msgstr "ÎεÏαÏοÏά"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "ΤÏαÏεζικÏÏ Î»Î¿Î³Î±ÏιαÏμÏÏ"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "ÎογαÏιαÏμÏÏ Î¼ÎµÏÏηÏÏν"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "ÎογαÏιαÏμÏÏ ÏαθηÏικοÏ"
+
+#: ../src/bet_future.c:1898
+#, fuzzy
+msgid "Partial balance"
+msgstr "ÎÏÏική ιÏοÏÏοÏία"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "ÎÏιλÎξÏε ÏοÏ
Ï Î»Î¿Î³Î±ÏιαÏμοÏÏ ÎµÎ½ÎµÏγηÏικοÏ"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "ÎÏιλÎξÏε ÏοÏ
Ï ÏÏαÏεζικοÏÏ Î»Î¿Î³Î±ÏιαÏμοÏÏ"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "%s ÎογαÏιαÏμÏÏ"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "ΣÏνολο λογαÏιαÏμοÏ: (%d ÏÏ
ναλλαγÎÏ):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "Îνομα ÏοÏ
αÏÏείοÏ
ÏÏÎ¿Ï ÎµÎ¹ÏαγÏγή:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "ÎνεÏγοÏοιήÏÏε:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "Îηνιαία Îξοδα ανά δικαιοÏÏο ÏληÏÏμήÏ"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "ÎδειάÏÏε Ïην ÏÏÏμα για να δημιοÏ
ÏγήÏεÏε νÎα ÏÏ
ναλλαγή"
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "ÎογαÏιαÏμÏÏ Î¼ÎµÏÏηÏÏν"
+msgid "Replacement of the scheduled operation"
+msgstr "ÎιαγÏάÏÏε αÏ
Ïήν Ïην ÏÏεδιαÏμÎνη ÏÏ
ναλλαγή;"
-#: ../src/bet_future.c:2114
+#: ../src/bet_future.c:2116
#, fuzzy
-msgid "Partial balance"
-msgstr "ÎÏÏική ιÏοÏÏοÏία"
+msgid "Automatic creation of the direct debit transaction"
+msgstr "ÎÏ
ÏÏμαÏη ÏÏÏÏÏÏη ÏελεÏ
ÏαίοÏ
αÏÏείοÏ
ÏÏο ξεκίνημα"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "ΤÏÏοÏ"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1265,41 +1292,41 @@ msgstr "Îνομα λογαÏιαÏμοÏ"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "ÎναÏÏÏÎÏÏε Ïο ÏοÏÏ ÏÏν ειÏαγÏμενÏν ÏÏ
ναλλαγÏν"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "ÎÏμιÏμα για Ïον λογαÏιαÏμÏ.:"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
#, fuzzy
msgid "Data graph"
msgstr "ÎμαδοÏοίηÏη ÏÏοιÏείÏν"
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "ÎÏÏική ημεÏομηνία"
@@ -1385,7 +1412,7 @@ msgstr "ÎεÏαÏÏÎÏÏε Ïη ÏÏ
ναλλαγή ÏÏη ÏÏεδιαÏμÎν
#: ../src/bet_tab.c:1494
#, fuzzy
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr "ÎδÏναÏη η εκÏοή ÏÎ·Ï Î¼ÎµÏαÏοÏÎ¬Ï Ïε Îναν κλειÏÏÏ Î»Î¿Î³Î±ÏιαÏμÏ"
#. redo item
@@ -1425,17 +1452,17 @@ msgstr "Îαμία καÏηγοÏία"
msgid "No budgetary line"
msgstr "Îαμία δημοÏιονομική γÏαμμή"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "ÎξάγεÏε ÏÎ¹Ï Î´Î·Î¼Î¿ÏιονομικÎÏ Î³ÏαμμÎÏ"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "ÎÏοÏÏοÏία"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3675,17 +3702,6 @@ msgstr "ÎλάÏιÏÏη εÏιθÏ
μηÏή ιÏοÏÏοÏία:"
msgid "Comments"
msgstr "ΣÏÏλια"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "ΤÏαÏεζικÏÏ Î»Î¿Î³Î±ÏιαÏμÏÏ"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "ÎογαÏιαÏμÏÏ ÏαθηÏικοÏ"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6547,12 +6563,12 @@ msgstr "ÎμεÏομηνία οÏίοÏ
"
msgid "Invalid"
msgstr "Îη ÎγκÏ
ÏοÏ"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "ÎίÏÏÏ Ïνομα %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6561,7 +6577,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6572,7 +6588,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in d ta_account.c\n" ¿Ïία:" Ï Î»Î¿Î³Î±ÏιαÏμÏ" rD¥+ @/ïÿ °/ïÿ u
D¥+ *D¥+ %,D¥+ (E¥+ °/ïÿ 0JE¥+ $ïÿ p#ïÿ k D¥+ 6 è è! è! @/ïÿ °/ïÿ xÔ'E¥+ %ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ ÀÏE¥+ u
D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ xÔ'E¥+ %ïÿ p$ïÿ k D¥+ à! à! @/ïÿ °/ïÿ HE¥+ &ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ p/ïÿ h/ïÿ 8+,D¥+ p °/ïÿ u
D¥+ *D¥+ &ïÿ P%ïÿ k D¥+ G H I J K M N O P @/ïÿ °/ïÿ HUÞD¥+ (ïÿ D¥+ D¥+ @/ïÿ 0ÏE¥+ u
D¥+ à'E¥+ »D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ HUÞD¥+ (ïÿ `&ïÿ k D¥+ 8UÞD¥+ (ïÿ &ïÿ k D¥+ (UÞD¥+ (ïÿ À&ïÿ k D¥+ UÞD¥+ (ïÿ ð&ïÿ k D¥+ ¨ÎE¥+ u
D¥+ ¨ÉE¥+ p!ïÿ Ø»D¥+ e D¥+ ØÄE¥+ 'ïÿ yØ»D¥+ e D¥+ ÀE¥+ À'ïÿ ZØ»D¥+ e D¥+ Ø»D¥+ à'E¥+ »D¥+ ÀE¥+ Øä'E¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ 8+,D¥+ MD¥+ °/ïÿ p»D¥+ p)ïÿ @(ïÿ k D¥+ 5 6 7 8 : < = > ? @ B D @/ïÿ °/ïÿ àMD¥+ °/ïÿ u
D¥+ %,D¥+ ð'ïÿ MD¥+ e D¥+ %,D¥+ Õ_ at fÆS Qöl±íÁcSD¥+ °/ïÿ àMD¥+ *ïÿ P)ïÿ k D¥+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv@/ïÿ °/ïÿ HPD¥+ äD¥+ ð0ïÿ ¦ðîE¥+ ¦ðîE¥+ 6D¥+ /ïÿ °0ïÿ h/ïÿ Ð+ïÿ ï'E¥+ u
D¥+ Øä'E¥+ 02ïÿ ¢ðîE¥+ 1ïÿ ,ïÿ ÿÿÿÿÿÿÿÿ¢ðîE¥+ ¸/ïÿ ata_account.c\n"
@@ -7175,7 +7191,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "ÎδÏναÏη η αÏοθήκεÏ
Ïη ÏοÏ
αÏÏείοÏ
διαμÏÏÏÏÏÎ·Ï '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr "ÎÏ
ÏÏ Î´ÎµÎ½ είναι Îνα αÏÏείο Grisbi⦠ΠÏÏÏÏÏÏη αναβάλλεÏαι."
@@ -7191,7 +7207,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -7200,7 +7216,7 @@ msgstr ""
"Î ÎκδοÏη Grisbi %s αÏαιÏείÏαι για να ανοίξει αÏ
ÏÏ Ïο αÏÏείο.\n"
"EÏÎµÎ¯Ï ÏÏηÏιμοÏοιείÏαι Ïην ÎκδοÏη %s."
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
#, fuzzy
msgid ""
"You have opened an archive.\n"
@@ -7213,7 +7229,7 @@ msgstr ""
"θÎλεÏε και ÏÏζεÏε αÏγÏÏεÏα (νÎÎµÏ ÎµÎºÎ¸ÎÏειÏâ¦) αλλά θÏ
μηθείÏε ÏÏι είναι Îνα "
"αÏÏείο ÏÏιν ÏÏοÏοÏοιηθοÏν μεÏικÎÏ ÏÏ
ναλλαγÎÏ Î® ÏημανÏικÎÏ ÏληÏοÏοÏίεÏ."
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr "ÎÏÏείο Grisbi ÏοÏ
ανοίγοÏ
ν"
@@ -11334,6 +11350,10 @@ msgid "Personnal finances manager"
msgstr "Î ÏοÏÏÏικÏÏ Î´Î¹ÎµÏ
θÏ
νÏÎ®Ï ÏÏημαÏοδÏÏηÏÎ·Ï Î³Î¹Î± Ïον καθÎναν\n"
#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "ÎδειάÏÏε Ïην ÏÏÏμα για να δημιοÏ
ÏγήÏεÏε νÎα ÏÏ
ναλλαγή"
+
+#, fuzzy
#~ msgid "Manage import associations"
#~ msgstr "ÎÏ
ÏÏμαÏη ÎνÏÏη ÎναÏξηÏ"
diff --git a/po/eo.po b/po/eo.po
index b3524a8..82d0b87 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: eo\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2009-06-28 20:04+0200\n"
"Last-Translator: Cyril Castelbou <cyril.castelbou at free.fr>\n"
"Language-Team: esperanto <eo at li.org>\n"
@@ -173,7 +173,7 @@ msgid "Balances partials of the list of accounts"
msgstr ""
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -471,100 +471,100 @@ msgstr ""
msgid "Transactions list contents"
msgstr ""
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
msgid "Month"
msgstr ""
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr ""
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
msgid "General Options"
msgstr ""
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
msgid "Common data"
msgstr ""
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
msgid "Option for cash accounts"
msgstr ""
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
msgid "Add the forecast tab for cash accounts"
msgstr ""
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
msgid "Beginning of period"
msgstr ""
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
msgid "1st day of month"
msgstr ""
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
msgid "Accounts data"
msgstr ""
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
msgid "Data for the forecast"
msgstr ""
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
msgid "Sources of historical data"
msgstr ""
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
msgid "Credit Data"
msgstr ""
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
msgid "Account: "
msgstr ""
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
msgid "Use the budget module"
msgstr ""
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
msgid "Duration estimation"
msgstr ""
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
msgid "Labels for transactions"
msgstr ""
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
msgid "By default"
msgstr ""
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr ""
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -572,26 +572,26 @@ msgstr ""
msgid "Budgetary lines"
msgstr ""
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
msgid "Labels for scheduled transactions"
msgstr ""
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
msgid "Choose the financial year or 12 months rolling"
msgstr ""
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -599,35 +599,35 @@ msgstr ""
msgid "Category"
msgstr ""
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr ""
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
msgid "Loan Capital: "
msgstr ""
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
msgid "Duration: "
msgstr ""
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
msgid "year"
msgstr ""
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
msgid "Date of first Repayment: "
msgstr ""
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
msgid "Annuel rate interest: "
msgstr ""
@@ -635,45 +635,49 @@ msgstr ""
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
msgid "Fees per month: "
msgstr ""
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
msgid "Rate Type: "
msgstr ""
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
msgid " year "
msgstr ""
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
msgid " years "
msgstr ""
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
msgid "Credits simulator"
@@ -785,13 +789,13 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
msgid "Print the array"
msgstr ""
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
msgid "Export the array"
msgstr ""
@@ -850,12 +854,12 @@ msgstr ""
msgid "Credits"
msgstr ""
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr ""
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -865,7 +869,7 @@ msgstr ""
msgid "credit.csv"
msgstr ""
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr ""
@@ -880,8 +884,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
msgid "One field is not filled in"
msgstr ""
@@ -1004,7 +1008,7 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr ""
@@ -1029,62 +1033,82 @@ msgstr ""
msgid "Transfer"
msgstr ""
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr ""
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr ""
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr ""
+
+#: ../src/bet_future.c:1898
+msgid "Partial balance"
+msgstr ""
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
msgid "Error: You must select an account."
msgstr ""
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
msgid "Select an account"
msgstr ""
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
msgid "List of accounts"
msgstr ""
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
+#. Others data
+#: ../src/bet_future.c:2078
+msgid "Account data and actions"
msgstr ""
-#: ../src/bet_future.c:1955
-msgid "Effective date: "
+#: ../src/bet_future.c:2084
+msgid "Date of change of month: "
msgstr ""
-#: ../src/bet_future.c:1962
-msgid "Monthly auto-increment"
+#: ../src/bet_future.c:2091
+msgid "Effective date: "
msgstr ""
-#: ../src/bet_future.c:1973
-msgid "Check the box to replace a planned operation"
+#: ../src/bet_future.c:2098
+msgid "Monthly auto-increment"
msgstr ""
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
+#: ../src/bet_future.c:2105
+msgid "Replacement of the scheduled operation"
msgstr ""
-#: ../src/bet_future.c:2114
-msgid "Partial balance"
+#: ../src/bet_future.c:2116
+msgid "Automatic creation of the direct debit transaction"
msgstr ""
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr ""
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1161,39 +1185,39 @@ msgstr ""
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
msgid "Assign the amount of the last operation"
msgstr ""
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
msgid "Export the historical data"
msgstr ""
@@ -1271,7 +1295,7 @@ msgid "Convert selection to scheduled transaction"
msgstr ""
#: ../src/bet_tab.c:1494
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr ""
#. redo item
@@ -1308,15 +1332,15 @@ msgstr ""
msgid "No budgetary line"
msgstr ""
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
msgid "Export the array of forecast"
msgstr ""
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
msgid "Balance at "
msgstr ""
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3352,17 +3376,6 @@ msgstr ""
msgid "Comments"
msgstr ""
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr ""
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr ""
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -5933,12 +5946,12 @@ msgstr ""
msgid "Invalid"
msgstr ""
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr ""
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -5946,7 +5959,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -5955,7 +5968,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6451,7 +6464,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr ""
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
@@ -6464,14 +6477,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6479,7 +6492,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
diff --git a/po/es.po b/po/es.po
index d9783e7..a0139f3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2010-05-09 11:48+0100\n"
"Last-Translator: Carlos M. Cámara Mora <cmcamara at gmail.com>\n"
"Language-Team: Spanish <es at li.org>\n"
@@ -182,7 +182,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Balances parciales de la lista de cuentas"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -493,104 +493,104 @@ msgstr "Comportamiento de la lista de transacciones"
msgid "Transactions list contents"
msgstr "Contenido de las transacciones"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
msgid "Month"
msgstr "Mes"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Año"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
msgid "General Options"
msgstr "Opciones Generales"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
msgid "Common data"
msgstr "Datos comunes"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "Seleccionar las cuentas de efectivo"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "Añadir transacciones a una cuenta"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
msgid "Beginning of period"
msgstr "Comienzo del periodo"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
msgid "1st day of month"
msgstr "Primer dÃa del mes"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr "Fecha de hoy"
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
"Nota: Esta opción se usa si no hay una fecha de inicio para las predicciones."
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
msgid "Accounts data"
msgstr "Datos de la cuenta"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
msgid "Data for the forecast"
msgstr "Datos para la predicción"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
msgid "Sources of historical data"
msgstr "Fuentes de datos históricos"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "Tarjeta de crédito"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
msgid "Account: "
msgstr "Cuenta: "
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
msgid "Use the budget module"
msgstr "Usar el módulo de presupuestos"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
msgid "Duration estimation"
msgstr "Duración estimada"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
msgid "Labels for transactions"
msgstr "Etiquetas para las transacciones"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
msgid "By default"
msgstr "Por defecto"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "CategorÃas"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -598,15 +598,15 @@ msgstr "CategorÃas"
msgid "Budgetary lines"
msgstr "LÃneas presupuestarias"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
msgid "Labels for scheduled transactions"
msgstr "Etiquetas para las transacciones programadas"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr "Etiquetas para futuros datos"
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
@@ -614,12 +614,12 @@ msgstr ""
"Orden por defecto si los datos no son cero: notas, tercero, categorÃa y "
"lÃnea presupuestaria."
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
msgid "Choose the financial year or 12 months rolling"
msgstr "Elija el año financiero o 12 meses naturales"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -627,39 +627,39 @@ msgstr "Elija el año financiero o 12 meses naturales"
msgid "Category"
msgstr "CategorÃa"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "LÃnea presupuestaria"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "Préstamo/Hipoteca : Capital:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "Tabulación:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "años"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "la forma de pago: "
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -668,47 +668,51 @@ msgstr "Presupuesto anual: "
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
msgid "Fees per month: "
msgstr "Tres meses: "
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
msgid "Rate Type: "
msgstr "Tipo: "
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "año %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "años"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -829,14 +833,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "Impresora"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "Impresora"
@@ -902,12 +906,12 @@ msgstr "Estimar tabla"
msgid "Credits"
msgstr "Crédito"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "Imprimir"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -918,7 +922,7 @@ msgstr "Exportar"
msgid "credit.csv"
msgstr "Crédito"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "No puedo guardar el archivo."
@@ -935,8 +939,8 @@ msgstr ""
"Error: la periodicidad definida por el usuario o la cantidad no están "
"especificadas o la fecha no es válida."
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
msgid "One field is not filled in"
msgstr "Un campo no está relleno"
@@ -1059,7 +1063,7 @@ msgstr "Débito"
msgid "Credit"
msgstr "Crédito"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "CategorÃas: SubcategorÃas"
@@ -1084,15 +1088,35 @@ msgstr "Anotaciones"
msgid "Transfer"
msgstr "Transferencia"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Cuenta bancaria"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Cuenta de caja"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Cuenta de Pasivo"
+
+#: ../src/bet_future.c:1898
+msgid "Partial balance"
+msgstr "Balance parcial"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
msgid "Error: You must select an account."
msgstr "Error: Debe seleccionar una cuenta."
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr "No se encuentran los datos"
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
#, fuzzy
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
@@ -1102,48 +1126,52 @@ msgstr ""
"especificadas o la fecha no es válida."
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
msgid "Select an account"
msgstr "Seleccionar una cuenta"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
msgid "List of accounts"
msgstr "Lista de cuentas"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr "Fecha y datos efectivos para el cambio de una operación programada"
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "Total de la cuenta: (%d transacciones): "
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "Nombre del fichero a importar: "
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "Fecha efectiva: "
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
msgid "Monthly auto-increment"
msgstr "Autoincremento Mensual"
-#: ../src/bet_future.c:1973
-msgid "Check the box to replace a planned operation"
-msgstr "Seleccione la casilla para reemplazar una operación planeada"
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Cuenta de caja"
+#: ../src/bet_future.c:2105
+#, fuzzy
+msgid "Replacement of the scheduled operation"
+msgstr "¿ Borrar esta transacción programada ?"
-#: ../src/bet_future.c:2114
-msgid "Partial balance"
-msgstr "Balance parcial"
+#: ../src/bet_future.c:2116
+#, fuzzy
+msgid "Automatic creation of the direct debit transaction"
+msgstr "Cargar automáticamente el último archivo abierto al inicio"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Tipo"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1224,40 +1252,40 @@ msgstr "Cantidad retenida"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr "12 meses naturales"
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
msgid "Assign the amount of the last operation"
msgstr "Asignar la cantidad de la última operación"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr "Copiar la cantidad promedio"
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Moneda para la cuenta: "
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
#, fuzzy
msgid "Data graph"
msgstr "Agroupación de datos"
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "Fuentes de datos históricos"
@@ -1339,7 +1367,8 @@ msgid "Convert selection to scheduled transaction"
msgstr "Convertir la selección en un transacción programada"
#: ../src/bet_tab.c:1494
-msgid "Insert the balance of a cash account"
+#, fuzzy
+msgid "Insert the balance of a deferred debit account"
msgstr "Inserte el balance de una cuenta de efectivo"
#. redo item
@@ -1376,17 +1405,17 @@ msgstr "Sin categorÃa"
msgid "No budgetary line"
msgstr "Sin lÃnea presupuestaria"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "Exportar las lÃneas presupuestarias"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "Balance "
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
#, fuzzy
msgid "forecast.csv"
msgstr "Predicción"
@@ -3589,17 +3618,6 @@ msgstr "Balance mÃnimo deseado: "
msgid "Comments"
msgstr "Comentarios"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Cuenta bancaria"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Cuenta de Pasivo"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6392,12 +6410,12 @@ msgstr "Fecha modificada"
msgid "Invalid"
msgstr "No válido"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Sin nombre %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6407,7 +6425,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6418,7 +6436,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6996,7 +7014,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "No se puede guardar el fichero de configuración '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Este fichero no es de de Grisbi... Carga interrumpida."
@@ -7012,7 +7030,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -7021,7 +7039,7 @@ msgstr ""
"Se necesita la versión de Grisbi %s para abrir este archivo.\n"
"Usted está usando la versión %s."
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7033,7 +7051,7 @@ msgstr ""
"más tarde (nuevos informes...) pero recuerde que es un archivo antes de "
"modificar algunas transacciones o informaciones importantes."
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr "Archivo de Grisbi abierto"
@@ -11151,6 +11169,12 @@ msgstr "Grisbi"
msgid "Personnal finances manager"
msgstr "Gestor de finanzas personal para todo el mundo\n"
+#~ msgid "Effective date and data for the replacement of a planned operation"
+#~ msgstr "Fecha y datos efectivos para el cambio de una operación programada"
+
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Seleccione la casilla para reemplazar una operación planeada"
+
#~ msgid "Manage import associations"
#~ msgstr "Administrar la importación de asociaciones"
diff --git a/po/fa.po b/po/fa.po
index 5c1e581..24071ff 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: girisbi VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2008-10-02 10:07+0330\n"
"Last-Translator: hadi <hadi60 at gmail.com>\n"
"Language-Team: farsi <en at li.org>\n"
@@ -181,7 +181,7 @@ msgid "Balances partials of the list of accounts"
msgstr ""
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -502,109 +502,109 @@ msgstr "تراکÙØ´"
msgid "Transactions list contents"
msgstr "تراکÙØ´"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
#, fuzzy
msgid "Month"
msgstr "Ù
ا٠Ùا"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "ساÙ"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "عÙ
ÙÙ
Û"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
msgid "Common data"
msgstr ""
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "Øساب باÙÚ©"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
msgid "Add the forecast tab for cash accounts"
msgstr ""
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
msgid "Beginning of period"
msgstr ""
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "Ù
ا٠Ùا"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "ØسابÙا"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
msgid "Data for the forecast"
msgstr ""
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
msgid "Sources of historical data"
msgstr ""
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "Ù
ا٠جارÛ"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "Øساب Ùا:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
msgid "Use the budget module"
msgstr ""
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
msgid "Duration estimation"
msgstr ""
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "Øذ٠تراکÙØ´"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "ÙÛØ´ Ùرض"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr ""
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -612,27 +612,27 @@ msgstr ""
msgid "Budgetary lines"
msgstr ""
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
msgid "Choose the financial year or 12 months rolling"
msgstr ""
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -640,38 +640,38 @@ msgstr ""
msgid "Category"
msgstr "بخش"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr ""
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "Øساب باÙÚ©:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "ترجÙ
Ù:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "سا٠Ùا"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
msgid "Date of first Repayment: "
msgstr ""
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -680,48 +680,52 @@ msgstr "درآÙ
د Ùا:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "Ù
ا٠Ùا:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
msgid "Rate Type: "
msgstr ""
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "سا٠%d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "سا٠Ùا"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -841,14 +845,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "پرÛÙتر"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "پرÛÙتر"
@@ -914,12 +918,12 @@ msgstr "تÙضÛØات"
msgid "Credits"
msgstr "Ù
ا٠جارÛ"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "پرÛÙت"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -930,7 +934,7 @@ msgstr "صادر"
msgid "credit.csv"
msgstr "Ù
ا٠جارÛ"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "ÙاÛ٠ذخÛر٠Ùشد."
@@ -945,8 +949,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
msgid "One field is not filled in"
msgstr ""
@@ -1071,7 +1075,7 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr ""
@@ -1096,66 +1100,90 @@ msgstr ""
msgid "Transfer"
msgstr ""
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Øساب باÙÚ©"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr ""
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr ""
+
+#: ../src/bet_future.c:1898
+msgid "Partial balance"
+msgstr ""
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "باÛد تارÛØ® را Ùارد Ú©ÙÛد."
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "Øساب Øذ٠شدÙ"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "Øساب بست٠شدÙ"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´:"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "ÙÛراÛØ´ گزارش:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "Ùعا٠سازÛ:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
msgid "Monthly auto-increment"
msgstr ""
-#: ../src/bet_future.c:1973
-msgid "Check the box to replace a planned operation"
-msgstr ""
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr ""
+#: ../src/bet_future.c:2105
+#, fuzzy
+msgid "Replacement of the scheduled operation"
+msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
-#: ../src/bet_future.c:2114
-msgid "Partial balance"
-msgstr ""
+#: ../src/bet_future.c:2116
+#, fuzzy
+msgid "Automatic creation of the direct debit transaction"
+msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr ""
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1237,39 +1265,39 @@ msgstr "Øساب Ùا"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
msgid "Assign the amount of the last operation"
msgstr ""
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Øساب باÙÚ©:"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "پرÛÙتر"
@@ -1354,7 +1382,7 @@ msgid "Convert selection to scheduled transaction"
msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
#: ../src/bet_tab.c:1494
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr ""
#. redo item
@@ -1391,15 +1419,15 @@ msgstr ""
msgid "No budgetary line"
msgstr ""
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
msgid "Export the array of forecast"
msgstr ""
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
msgid "Balance at "
msgstr ""
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3490,17 +3518,6 @@ msgstr ""
msgid "Comments"
msgstr ""
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Øساب باÙÚ©"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr ""
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6165,12 +6182,12 @@ msgstr ""
msgid "Invalid"
msgstr ""
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr ""
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6178,7 +6195,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6187,7 +6204,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6693,7 +6710,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr ""
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
@@ -6706,14 +6723,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6721,7 +6738,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 19b884c..a364040 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2012-02-18 19:32+0100\n"
"Last-Translator: Pierre Biava <pierre at pierre.biava.name>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
@@ -188,7 +188,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Soldes partiels de la liste des comptes"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -488,102 +488,102 @@ msgstr "Prévisualisation de la liste des opérations"
msgid "Transactions list contents"
msgstr "Contenu de la liste des opération"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
msgid "Month"
msgstr "Mois"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Année"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
msgid "General Options"
msgstr "Généralités"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
msgid "Common data"
msgstr "Données communes"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
msgid "Option for cash accounts"
msgstr "Option pour les comptes de caisse"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
msgid "Add the forecast tab for cash accounts"
msgstr "Ajouter le tableau des prévisions aux comptes de caisse"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
msgid "Beginning of period"
msgstr "Début de la période"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
msgid "1st day of month"
msgstr "1er jour du mois"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr "Aujourd'hui"
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
"Note : cette option est utilisée en l'absence d'une date de début pour les "
"prévisions."
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
msgid "Accounts data"
msgstr "Données des comptes"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
msgid "Data for the forecast"
msgstr "Données pour le tableau des prévisions"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
msgid "Sources of historical data"
msgstr "Sources des données historiques"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
msgid "Credit Data"
msgstr "Données du crédit"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
msgid "Account: "
msgstr "Compte : "
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
msgid "Use the budget module"
msgstr "Utiliser le module budgétaire"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
msgid "Duration estimation"
msgstr "Durée d'estimation"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
msgid "Labels for transactions"
msgstr "Libellé des opérations"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
msgid "By default"
msgstr "Par défaut"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "Catégories"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -591,15 +591,15 @@ msgstr "Catégories"
msgid "Budgetary lines"
msgstr "Imputations budgétaires"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
msgid "Labels for scheduled transactions"
msgstr "Libellé des opérations planifiées"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr "Libellé des données prévisionnelles"
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
@@ -607,12 +607,12 @@ msgstr ""
"Classement des données par défaut si elles existent :\n"
"\tremarques, tiers, catégories et imputations budgétaires."
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
msgid "Choose the financial year or 12 months rolling"
msgstr "Choix de l'exercice ou 12 mois glissants"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -620,35 +620,35 @@ msgstr "Choix de l'exercice ou 12 mois glissants"
msgid "Category"
msgstr "Catégorie"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "Imputation budgétaire"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
msgid "Loan Capital: "
msgstr "Capital emprunté : "
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
msgid "Duration: "
msgstr "Durée : "
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
msgid "year"
msgstr "année"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
msgid "Date of first Repayment: "
msgstr "Date de la première échéance : "
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
msgid "Annuel rate interest: "
msgstr "Taux d'intérêt annuel : "
@@ -656,45 +656,49 @@ msgstr "Taux d'intérêt annuel : "
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr "%"
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
msgid "Fees per month: "
msgstr "Frais par échéance : "
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
msgid "Rate Type: "
msgstr "Type de taux : "
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr "Taux actuariel"
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr "Taux proportionnel"
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr "Appliquer"
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
msgid " year "
msgstr " an "
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
msgid " years "
msgstr " ans "
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr "Vous devez entrer au moins une valeur pour le capital"
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr "Compte avec carte à débit différé"
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
msgid "Credits simulator"
@@ -814,13 +818,13 @@ msgstr "Afficher le tableau d'amortissement depuis le début"
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
msgid "Print the array"
msgstr "Imprimer le tableau"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
msgid "Export the array"
msgstr "Exporter le tableau"
@@ -879,12 +883,12 @@ msgstr "Amortissement"
msgid "Credits"
msgstr "Crédits"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "Imprimer"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -894,7 +898,7 @@ msgstr "Exporter"
msgid "credit.csv"
msgstr "crédit.csv"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Impossible d'enregistrer le fichier."
@@ -911,8 +915,8 @@ msgstr ""
"Erreur: la périodicité définie par l'utilisateur ou le montant n'est pas "
"défini ou la date est invalide."
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
msgid "One field is not filled in"
msgstr "Un champs n'est pas rempli !"
@@ -1035,7 +1039,7 @@ msgstr "Débit"
msgid "Credit"
msgstr "Crédit"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Catégories : Sous-catégories"
@@ -1060,15 +1064,35 @@ msgstr "Remarques"
msgid "Transfer"
msgstr "Virement"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Compte bancaire"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Compte de caisse"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Compte de passif"
+
+#: ../src/bet_future.c:1898
+msgid "Partial balance"
+msgstr "Solde partiel"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
msgid "Error: You must select an account."
msgstr "Erreur : Vous devez sélectionner un compte."
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr "Données manquantes"
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
@@ -1077,47 +1101,47 @@ msgstr ""
"est invalide."
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
msgid "Select an account"
msgstr "Sélectionner un compte"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
msgid "List of accounts"
msgstr "Liste des Comptes"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr "Date d'effet et données pour le remplacement de l'opération planifiée"
+#. Others data
+#: ../src/bet_future.c:2078
+msgid "Account data and actions"
+msgstr "Données des comptes et actions"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+msgid "Date of change of month: "
+msgstr "Date de changement de mois : "
+
+#: ../src/bet_future.c:2091
msgid "Effective date: "
msgstr "Date d'effet : "
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
msgid "Monthly auto-increment"
msgstr "Incrémentation automatique mensuelle"
-#: ../src/bet_future.c:1973
-msgid "Check the box to replace a planned operation"
-msgstr "Cochez la case pour remplacer l'opération planifiée"
+#: ../src/bet_future.c:2105
+msgid "Replacement of the scheduled operation"
+msgstr "Remplacement de l'opération planifiée"
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Compte de caisse"
-
-#: ../src/bet_future.c:2114
-msgid "Partial balance"
-msgstr "Solde partiel"
+#: ../src/bet_future.c:2116
+msgid "Automatic creation of the direct debit transaction"
+msgstr "Création automatique de l'opération de prélèvement"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Type"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1196,39 +1220,39 @@ msgstr "Montant retenu"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr "12 mois glissants"
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
msgid "Assign the amount of the last operation"
msgstr "Assigner le montant de la dernière opération"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr "Copier la valeur moyenne"
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr "Montants par %s sur 12 mois glissants pour le compte : «%s»"
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Montants par %s en %s pour le compte : «%s»"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr "Graphique"
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr "Afficher le graphique"
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
msgid "Export the historical data"
msgstr "Exporter les données historiques"
@@ -1308,8 +1332,8 @@ msgid "Convert selection to scheduled transaction"
msgstr "Convertir la ligne en opération planifiée"
#: ../src/bet_tab.c:1494
-msgid "Insert the balance of a cash account"
-msgstr "Insérer le solde d'un compte de caisse"
+msgid "Insert the balance of a deferred debit account"
+msgstr "Insérez le solde d'un compte à débit différé"
#. redo item
#: ../src/bet_tab.c:1520
@@ -1345,15 +1369,15 @@ msgstr "Pas de catégorie"
msgid "No budgetary line"
msgstr "Pas d'imputation budgétaire"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
msgid "Export the array of forecast"
msgstr "Exporter les prévisions"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
msgid "Balance at "
msgstr "Solde au "
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr "prévisions.csv"
@@ -3548,17 +3572,6 @@ msgstr "Solde minimal voulu : "
msgid "Comments"
msgstr "Commentaires"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Compte bancaire"
-
-#: ../src/gsb_account e" _balance.c:230 c/gsb_assistant_account.c:431 nifiée" νÎα ÏÏ
ναλλαγή" ληÏοÏοÏίεÏ." °/ïÿ u
D¥+ *D¥+ %,D¥+ (E¥+ °/ïÿ 0JE¥+ $ïÿ p#ïÿ k D¥+ 6 è è! è! @/ïÿ °/ïÿ xÔ'E¥+ %ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ ÀÏE¥+ u
D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ xÔ'E¥+ %ïÿ p$ïÿ k D¥+ à! à! @/ïÿ °/ïÿ HE¥+ &ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ p/ïÿ h/ïÿ 8+,D¥+ p °/ïÿ u
D¥+ *D¥+ &ïÿ P%ïÿ k D¥+ G H I J K M N O P @/ïÿ °/ïÿ HUÞD¥+ (ïÿ D¥+ D¥+ @/ïÿ 0ÏE¥+ u
D¥+ à'E¥+ »D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ HUÞD¥+ (ïÿ `&ïÿ k D¥+ 8UÞD¥+ (ïÿ &ïÿ k D¥+ (UÞD¥+ (ïÿ À&ïÿ k D¥+ UÞD¥+ (ïÿ ð&ïÿ k D¥+ ¨ÎE¥+ u
D¥+ ¨ÉE¥+ p!ïÿ Ø»D¥+ e D¥+ ØÄE¥+ 'ïÿ yØ»D¥+ e D¥+ ÀE¥+ À'ïÿ ZØ»D¥+ e D¥+ Ø»D¥+ à'E¥+ »D¥+ ÀE¥+ Øä'E¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ 8+,D¥+ MD¥+ °/ïÿ p»D¥+ p)ïÿ @(ïÿ k D¥+ 5 6 7 8 : < = > ? @ B D @/ïÿ °/ïÿ àMD¥+ °/ïÿ u
D¥+ %,D¥+ ð'ïÿ MD¥+ e D¥+ %,D¥+ Õ_ at fÆS Qöl±íÁcSD¥+ °/ïÿ àMD¥+ *ïÿ P)ïÿ k D¥+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv@/ïÿ °/ïÿ HPD¥+ äD¥+ ð0ïÿ ¦ðîE¥+ ¦ðîE¥+ 6D¥+ /ïÿ °0ïÿ h/ïÿ Ð+ïÿ ï'E¥+ u
D¥+ Øä'E¥+ 02ïÿ ¢ðîE¥+ 1ïÿ ,ïÿ ÿÿÿÿÿÿÿÿ¢ðîE¥+ ¸/ïÿ _property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Compte de passif"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6334,12 +6347,12 @@ msgstr "Date de modification"
msgid "Invalid"
msgstr "Non valide"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Sans nom %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6349,7 +6362,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6361,7 +6374,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6939,7 +6952,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "Impossible d'enregistrer le fichier de configuration « %s » : %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Ce n'est pas un fichier Grisbi...chargement interrompu"
@@ -6955,7 +6968,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -6964,7 +6977,7 @@ msgstr ""
"Pour ouvrir ce fichier, il vous faut la version %s de Grisbi.\n"
"Vous utilisez la version %s."
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6977,7 +6990,7 @@ msgstr ""
"c'est une archive avant de modifier certaines transactions ou informations "
"importantes."
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr "Archive grisbi ouverte"
@@ -11050,6 +11063,13 @@ msgstr "Grisbi"
msgid "Personnal finances manager"
msgstr "Gestionnaire de finances personnelles"
+#~ msgid "Effective date and data for the replacement of a planned operation"
+#~ msgstr ""
+#~ "Date d'effet et données pour le remplacement de l'opération planifiée"
+
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Cochez la case pour remplacer l'opération planifiée"
+
#~ msgid "Manage import associations"
#~ msgstr "Gérer les associations pour l'import"
diff --git a/po/he.po b/po/he.po
index 6dd762c..c5f8b85 100644
--- a/po/he.po
+++ b/po/he.po
@@ -283,7 +283,7 @@ msgid ""
msgstr ""
"Project-Id-Version: he\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2006-02-11 16:08+0200\n"
"Last-Translator: dotan\n"
"Language-Team: <en at li.org>\n"
@@ -464,7 +464,7 @@ msgid "Balances partials of the list of accounts"
msgstr "××¢×רת ××¢××¡×§× ××ש××× ××ר"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -794,116 +794,116 @@ msgstr "ק××× ×¨×©××ת ×¢×סק××ת"
msgid "Transactions list contents"
msgstr "ת×× ×¨×©××ת ××¢×סק××ת"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
#, fuzzy
msgid "Month"
msgstr "×××ש××"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "×©× ×"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "××××"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "×ת××ת ר××××"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "×××רת ×ש××× ×ת ×××××"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "××¢×רת ××¢××¡×§× ××ש××× ××ר"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
#, fuzzy
msgid "Beginning of period"
msgstr "×תרת פת×××"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "3 ××××ש×× ×××ר×× ××"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "פר×× ×ש×××"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
#, fuzzy
msgid "Data for the forecast"
msgstr "×ר×ש ×××\"×"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "ת×ר×× ×ת×××"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "×ר××ס ×שר××"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "×ש×××:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "×§× ×תקצ××"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
#, fuzzy
msgid "Duration estimation"
msgstr "×××¤× ×¨×©××ת ×××¢×ר×ת"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "×× ××¢×סק××ת"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "×××¨× ×× ×××ר×ת ×ר×רת ×××××"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "ק×××ר××ת"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -911,28 +911,28 @@ msgstr "ק×××ר××ת"
msgid "Budgetary lines"
msgstr "ק××× ×ª×§×¦××"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "××¢×ר×ת ס××ר×ת ×©× ×§××¢× ×ר×ש"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "×××רת ×©× ×ª ××ספ××"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -940,39 +940,39 @@ msgstr "×××רת ×©× ×ª ××ספ××"
msgid "Category"
msgstr "ק×××ר××"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "×§× ×ª×§×¦×××"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "××××××/×ש×× ×ª× : ×××:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "תר×××:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "×©× ××"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "××¨× ×תש×××:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -981,49 +981,53 @@ msgstr "תקצ×× ×©× ×ª×:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "%d ×××ש××:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "ס××:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "×©× × %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "×©× ××"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -1145,14 +1149,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "××פסת"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "××פסת"
@@ -1218,12 +1222,12 @@ msgstr "פע×××"
msgid "Credits"
msgstr "×××ת"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "××פס×"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -1234,7 +1238,7 @@ msgstr "××צ××"
msgid "credit.csv"
msgstr "×××ת"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "×× × ××ª× ×ש××ר ×ת ×ק×××¥."
@@ -1250,8 +1254,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "×× ×ש××ת ××× × ×××××××!"
@@ -1379,7 +1383,7 @@ msgstr "××××"
msgid "Credit"
msgstr "×××ת"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "ק×××ר××ת : תת×-ק×××ר××ת"
@@ -1404,69 +1408,92 @@ msgstr "×ער×ת"
msgid "Transfer"
msgstr "××¢×ר×"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "×ש××× ×× ×§"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "×ש××× ×××××"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "×ש××× ×ת×××××××ת"
+
+#: ../src/bet_future.c:1898
+#, fuzzy
+msgid "Partial balance"
+msgstr "×תרת פת×××"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "×××רת ×ש××× ×ת × ×ס××"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "×××רת ×ש××× ×ת ×× ×§"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "×ש××× ×××××"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "×¡× ××× ××ש×××: (%d ×¢×סק××ת):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "×©× ×§×××¥ ××ש××× ×ת:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "×פע××:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "××צ××ת ×××ש××ת ××¤× ×¦×××× ×©××ש×××"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "×¡× ××× ×ק×××ר×× (%d ×¢×סק×)"
+msgid "Replacement of the scheduled operation"
+msgstr "×× × ××ª× ××צע ×¢××¡×§× ×ת××× × ×ª ×ר×ש"
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "×ש××× ×××××"
-
-#: ../src/bet_future.c:2114
+#: ../src/bet_future.c:2116
#, fuzzy
-msgid "Partial balance"
-msgstr "×תרת פת×××"
+msgid "Automatic creation of the direct debit transaction"
+msgstr "×××¢×× ×ת ×ק×××¥ ×××ר×× ×©××× ××¢×××× ×¢× ×¢×××ת ×ת××× ×"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "ס××"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1551,42 +1578,42 @@ msgstr "ס××× ××§× ×ª×§×¦××"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "×××× ×ס××× ×ת×ר×× ×©× ××¢××¡×§× ××××××ת."
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"××××¢ %s ×× × ×צ×.\n"
":"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "ת×ר×× ×ת×××"
@@ -1672,7 +1699,7 @@ msgstr "××רת ××¢××¡×§× ××¢××¡×§× ×ת×××× ×ª"
#: ../src/bet_tab.c:1494
#, fuzzy
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr "×× × ××ª× ××צע ××¢××¨× ××ש××× ×¡××ר."
#. redo item
@@ -1712,17 +1739,17 @@ msgstr "××× ×§×××ר××"
msgid "No budgetary line"
msgstr "××× ×§× ×ª×§×¦××"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "××צ×× ×§××× ×תקצ××"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "××××"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3967,17 +3994,6 @@ msgstr "××ª×¨× ××× ××××ת רצ×××:"
msgid "Comments"
msgstr "×ער×ת"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "×ש××× ×× ×§"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "×ש××× ×ת×××××××ת"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6673,12 +6689,12 @@ msgstr "××××ת ת×ר××"
msgid "Invalid"
msgstr "ת×ר×× ×× ×ª×§××"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "%d ××× ×©×"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6686,7 +6702,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6695,7 +6711,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -7246,7 +7262,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "×× × ××ª× ×ש××ר ×ת ×ק×××¥ '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "ק×××¥ ×× ××× × ××\"× ×©× ×ר×ס××"
@@ -7260,14 +7276,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "×ר×ס×× ××××¨×¡× %s ××× × ×ס××× ×פת×× ×§×××¥ ××"
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7275,7 +7291,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
@@ -11296,6 +11312,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "×¡× ××× ×ק×××ר×× (%d ×¢×סק×)"
+
+#, fuzzy
#~ msgid "Manage import associations"
#~ msgstr "פ×ר×× ×§×××ר××ת"
@@ -12527,9 +12547,6 @@ msgstr ""
#~ "ש×××¨× ×× ×©× ×¢××¡×§× ××××ת ××¢××¨× ×¢×¦××ת. ×× ×©×××¢×©× ×©×× ×× ×תת-××¢××¡×§× ××× "
#~ "×××¢××ר ××ש××× ××ר, ×× ×©×××¢×©× ×©×× ×× ××ש××× ×××¢××¨× ×¢×¦××."
-#~ msgid "Can't issue scheduled operation"
-#~ msgstr "×× × ××ª× ××צע ×¢××¡×§× ×ת××× × ×ª ×ר×ש"
-
#~ msgid "Calendar"
#~ msgstr "××××"
diff --git a/po/it.po b/po/it.po
index fb940a5..d8b29fc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2007-04-05 00:03+0000\n"
"Last-Translator: Fabio Erculiani <fabio.erculiani at gmail.com>\n"
"Language-Team: Italian <LL at li.org>\n"
@@ -187,7 +187,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Sposta la transazione ad un altro conto"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -517,116 +517,116 @@ msgstr "Linee elenco transazioni"
msgid "Transactions list contents"
msgstr "Lista delle celle di registrazione"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
#, fuzzy
msgid "Month"
msgstr "Mesi"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Anno"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "Generalità "
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "Indirizzi comuni"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "Seleziona conti contanti"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "Sposta la transazione ad un altro conto"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
#, fuzzy
msgid "Beginning of period"
msgstr "Bilancio iniziale"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "Ultimi 3 mesi"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "Dettagli conto"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
#, fuzzy
msgid "Data for the forecast"
msgstr "in cima al rapporto"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "Data inizio"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "Carta di credito"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "Conto:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "la linea budget"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
#, fuzzy
msgid "Duration estimation"
msgstr "Carattere della lista di registrazione"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "Tutte le transazioni"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "Ripristina i valori predefiniti"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "Categorie"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -634,28 +634,28 @@ msgstr "Categorie"
msgid "Budgetary lines"
msgstr "Controllo spese"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "Transazioni pianificate chiuse"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "Scegli l'anno finanziario"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -663,39 +663,39 @@ msgstr "Scegli l'anno finanziario"
msgid "Category"
msgstr "Categoria"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "Imputazione del budget"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "Ipoteche/Mutui : Capitale:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "Traduzione:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "Anni"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "metodo di pagamento:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -704,49 +704,53 @@ msgstr "Budget annuale:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "%d mesi:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "Tipo:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "anno %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "Anni"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -868,14 +872,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "Stampante"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "Stampante"
@@ -941,12 +945,12 @@ msgstr "Azione"
msgid "Credits"
msgstr "Credito"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "Stampa"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -957,7 +961,7 @@ msgstr "Esporta"
msgid "credit.csv"
msgstr "Credito"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Impossibile salvare il file."
@@ -973,8 +977,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "Sono presenti dei campi vuoti!"
@@ -1102,7 +1106,7 @@ msgstr "Debito"
msgid "Credit"
msgstr "Credito"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Categorie : Sottocategorie"
@@ -1127,69 +1131,92 @@ msgstr "Note"
msgid "Transfer"
msgstr "Tasferimento"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Conto bancario"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Conto monetario"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Conto per le responsabilità "
+
+#: ../src/bet_future.c:1898
+#, fuzzy
+msgid "Partial balance"
+msgstr "Bilancio iniziale"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "Seleziona conti di beni"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "Seleziona conti bancari"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "Conto monetario"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "Totale conto (%d transazioni):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "Nome del documento dei conti:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "Attiva:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "Uscite mensili a causa di categorie personalizzate"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "Totale (%d transazione)"
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Conto monetario"
+msgid "Replacement of the scheduled operation"
+msgstr "Inserisci una transazione pianificata"
-#: ../src/bet_future.c:2114
+#: ../src/bet_future.c:2116
#, fuzzy
-msgid "Partial balance"
-msgstr "Bilancio iniziale"
+msgid "Automatic creation of the direct debit transaction"
+msgstr "Carica l'ultimo file aperto all'avvio"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Tipo"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1274,42 +1301,42 @@ msgstr "Importo per linea budget"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "giorni vicini alla data nella transazione importata."
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"Moneta %s non trovata.\n"
":"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "Data inizio"
@@ -1395,7 +1422,7 @@ msgstr "Converti la transazione in una transazione schedulata"
#: ../src/bet_tab.c:1494
#, fuzzy
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr "Impossible effettuare un trasferimento su un conto chiuso."
#. redo item
@@ -1435,17 +1462,17 @@ msgstr "Nessuna categoria"
msgid "No budgetary line"
msgstr "Nessuna linea budget"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "Esporta le linee budget"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "Saldo"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3704,17 +3731,6 @@ msgstr "Minimo bilancio desiderato:"
msgid "Comments"
msgstr "Commenti"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Conto bancario"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Conto per le responsabilità "
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6410,12 +6426,12 @@ msgstr "Data limite"
msgid "Invalid"
msgstr "Data non valida"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Conto %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6423,7 +6439,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6432,7 +6448,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6969,7 +6985,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "Impossibile salvare il gile '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Il file non è un Rapporto Grisbi valido"
@@ -6983,14 +6999,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Grisbi versione %s è richiesta per aprire il file"
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6998,7 +7014,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
@@ -11036,6 +11052,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Totale (%d transazione)"
+
+#, fuzzy
#~ msgid "Manage import associations"
#~ msgstr "Dettagli categorie"
@@ -12203,9 +12223,6 @@ msgstr ""
#~ "stessa. Puoi cambiare la sottotransazione con un trasferimento ad un "
#~ "altro contoo cambiare il conto a cui è destinata la transazione."
-#~ msgid "Can't issue scheduled operation"
-#~ msgstr "Inserisci una transazione pianificata"
-
#~ msgid "Calendar"
#~ msgstr "Calendario"
diff --git a/po/lv.po b/po/lv.po
index 64e8eb0..d68ab0a 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2010-11-08 20:02+0300\n"
"Last-Translator: Valdis VÄ«toliÅÅ¡ <valdis.vitolins at odo.lv>\n"
"Language-Team: LATVIAN <info at odo.lv>\n"
@@ -185,7 +185,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Kontu atlikumu saraksts"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -498,105 +498,105 @@ msgstr "Darījumu saraksta darbība"
msgid "Transactions list contents"
msgstr "Darījuma saturs"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
msgid "Month"
msgstr "MÄnesis"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Gads"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
msgid "General Options"
msgstr "VispÄrÄ«gas opcijas"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
msgid "Common data"
msgstr "Parasti dati"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "IzvÄlÄties kases kontus"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "Pievienot darÄ«jumu kontÄ"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
msgid "Beginning of period"
msgstr "Perjoda sÄkums"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
msgid "1st day of month"
msgstr "PirmÄ mÄneÅ¡a diena"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr "Å odienas datums"
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr "PiezÄ«me: Å Ä« iespÄja tiek izmantota, ja nav paredzÄts sÄkuma datums."
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
msgid "Accounts data"
msgstr "Kontu dati"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
msgid "Data for the forecast"
msgstr "PrognozÄjamie dati"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
msgid "Sources of historical data"
msgstr "Datu vÄstures avoti"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "Kredītkarte"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "Konts:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "Ievadiet budžeta pozīciju"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
msgid "Duration estimation"
msgstr "NovÄrtÄjuma ilgums"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
msgid "Labels for transactions"
msgstr "Darījumu etiķete"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
msgid "By default"
msgstr "PÄc noklusÄjuma"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "Kategorijas"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -604,15 +604,15 @@ msgstr "Kategorijas"
msgid "Budgetary lines"
msgstr "Budžeta pozīcijas"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
msgid "Labels for scheduled transactions"
msgstr "PlÄnoto darÄ«jumu etiÄ·ete"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr "NÄkoÅ¡o datu etiÄ·ete"
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
@@ -620,12 +620,12 @@ msgstr ""
"Å Ä·irot pÄc noklusÄjuma, ja dati nav (0): piezÄ«mes, saÅÄmÄjs, kategorija, "
"budžeta pozīcija"
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
msgid "Choose the financial year or 12 months rolling"
msgstr "IzvÄlÄties finanÅ¡u gadu, vai pÄdÄjos 12 mÄneÅ¡us"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -633,39 +633,39 @@ msgstr "IzvÄlÄties finanÅ¡u gadu, vai pÄdÄjos 12 mÄneÅ¡us"
msgid "Category"
msgstr "Kategorija"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "BudžÄta pozÄ«cija"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "Kontu ielÄdÄÅ¡ana:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "Tabulogramma:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "gads"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "maksÄÅ¡anas veids:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -674,48 +674,52 @@ msgstr "Gada budžets:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
msgid "Fees per month: "
msgstr ""
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "Tips:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "gadÄ %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "gads"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -835,14 +839,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "PrintÄt"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "EksportÄt budžeta sarakstus"
@@ -908,12 +912,12 @@ msgstr "Importa apvienības"
msgid "Credits"
msgstr "KredÄ«ts (ieÅÄmumi)"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "DrukÄt"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -924,7 +928,7 @@ msgstr "Eksports"
msgid "credit.csv"
msgstr "KredÄ«ts (ieÅÄmumi)"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Nevar saglabÄt failu"
@@ -940,8 +944,8 @@ msgid ""
msgstr ""
"Kļūda: biežumu nosaka lietotÄjs, apmÄrs nav precizÄts, vai datums ir nederÄ«gs"
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
msgid "One field is not filled in"
msgstr "Viens lauks netiek aizpildīts"
@@ -1064,7 +1068,7 @@ msgstr "Debets (izdevumi)"
msgid "Credit"
msgstr "KredÄ«ts (ieÅÄmumi)"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Kategorijas : Sub-kategorijas"
@@ -1089,16 +1093,36 @@ msgstr "Piezīmes"
msgid "Transfer"
msgstr "PÄrvietoÅ¡ana"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Bankas konts"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Kases konts"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Pasīvu konts"
+
+#: ../src/bet_future.c:1898
+msgid "Partial balance"
+msgstr "DaļÄja bilance"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "Ir jÄatlasa vismaz divi konti."
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
#, fuzzy
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
@@ -1107,51 +1131,54 @@ msgstr ""
"Kļūda: biežumu nosaka lietotÄjs, apmÄrs nav precizÄts, vai datums ir nederÄ«gs"
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
msgid "Select an account"
msgstr "IzvÄlÄties kontu"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "%s konts"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "KontÄ kopÄ: (%d darÄ«jumi):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "ImportÄjamÄ faila nosaukums:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "AktivizÄts:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "IkmÄneÅ¡a maksa caur darÄ«juma partneriem"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "Tukša veidlapa, lai izveidotu jaunu darījumu"
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Kases konts"
+msgid "Replacement of the scheduled operation"
+msgstr "DzÄst Å¡o plÄnoto darÄ«jumu?"
-#: ../src/bet_future.c:2114
-msgid "Partial balance"
-msgstr "DaļÄja bilance"
+#: ../src/bet_future.c:2116
+#, fuzzy
+msgid "Automatic creation of the direct debit transaction"
+msgstr "StartÄjot automÄtiski ielÄdÄt pÄdÄjo failu"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Tips"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1232,40 +1259,40 @@ msgstr "Summa, ko patur"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr "12 mÄneÅ¡u perjods"
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
msgid "Assign the amount of the last operation"
msgstr "PÄdÄjo darbÄ«bu summa"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr "KopÄt vidÄjo summu"
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Valūtas kontu:"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
#, fuzzy
msgid "Data graph"
msgstr "Datu grupÄÅ¡ana"
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "Datu vÄstures avoti"
@@ -1348,7 +1375,7 @@ msgstr "PÄrvÄrst atlasi uz plÄnoto darÄ«jumu"
#: ../src/bet_tab.c:1494
#, fuzzy
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr "Nevar izdot darÄ«jumu uz slÄgtÄ konta."
#. redo item
@@ -1385,17 +1412,17 @@ msgstr "Nav kategorijas"
msgid "No budgetary line"
msgstr "Nav budžet pozīcijas"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "EksportÄt budžeta sarakstus"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "Bilance"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
#, fuzzy
msgid "forecast.csv"
msgstr "Prognoze"
@@ -3586,17 +3613,6 @@ msgstr "MinimÄlÄ vÄlamÄ bilance:"
msgid "Comments"
msgstr "KomentÄri"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Bankas konts"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Pasīvu konts"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6372,12 +6388,12 @@ msgstr "ModificÄts datums"
msgid "Invalid"
msgstr "Nederīgs"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Nav nosaukuma %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6386,7 +6402,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6397,7 +6413,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6956,7 +6972,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "Nevar saglabÄt konfigurÄcijas failu '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Å is nav grisbi fails... IelÄde pÄrtraukta."
@@ -6972,7 +6988,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -6981,7 +6997,7 @@ msgstr ""
"Grisbi versijai %s ir nepiecieÅ¡ams, lai atvÄrtu Å¡o failu.\n"
"JÅ«s izmantojat versiju %s"
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6992,7 +7008,7 @@ msgstr ""
"JÅ«s varat to izmainÄ«t un saglabÄt vÄlÄk ( jauns pÄrskats), bet atceraties, "
"ka tas ir arhÄ«vs pirms veiktajÄm izmaiÅÄm iepriekÅ¡."
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr "Grisbi arhÄ«va atvÄrÅ¡ana"
@@ -11000,6 +11016,10 @@ msgstr "Grisbi"
msgid "Personnal finances manager"
msgstr "PersonÄlais finanÅ¡u vadÄ«tÄjs\n"
+#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Tukša veidlapa, lai izveidotu jaunu darījumu"
+
#~ msgid "Manage import associations"
#~ msgstr "PÄrvaldÄ«t importa apvienÄ«bas"
diff --git a/po/nl.po b/po/nl.po
index a26e4d7..f496e16 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2007-02-11 22:04+0100\n"
"Last-Translator: E.Huijsing <lighthous at users.sourceforge.net>\n"
"Language-Team: Dutch <en at li.org>\n"
@@ -194,7 +194,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Verplaats de transactie naar een andere rekening"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -530,109 +530,109 @@ msgstr "Transactieregels"
msgid "Transactions list contents"
msgstr "Cellen transactielijst"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
#, fuzzy
msgid "Month"
msgstr "Maanden"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Jaar"
# tablad header raport bewerken>toon data>algemeen
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "Algemeen"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "Standaard adres"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "Selecteer kasrekeningen"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "Verplaats de transactie naar een andere rekening"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
#, fuzzy
msgid "Beginning of period"
msgstr "Begin saldo"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "Laatste 3 maanden"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "Rekening details"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
#, fuzzy
msgid "Data for the forecast"
msgstr "aan de bovenkant van het rapport"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "Start datum"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "Creditcard"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "Rekening:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "de budgetregel"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
#, fuzzy
msgid "Duration estimation"
msgstr "Transactie lijst lettertype"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "Alle transacties"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "Herstel standaard"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
@@ -640,8 +640,8 @@ msgid "Categories"
msgstr "Categorieën"
# tekst in tabbladnaam (zoals in exel)
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -649,28 +649,28 @@ msgstr "Categorieën"
msgid "Budgetary lines"
msgstr "Budgetregels"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "Gesloten geplande transacties"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "Kies een financieel jaar"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -678,39 +678,39 @@ msgstr "Kies een financieel jaar"
msgid "Category"
msgstr "Categorie"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "Budgetregel"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "Lening/Hypotheek : Kapitaal:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "Vertaling:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "Jaren"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "methode van betaling:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -719,49 +719,53 @@ msgstr "Dit jaar:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "%d maanden:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "Soort:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "jaar %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "Jaren"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -883,14 +887,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "Printer"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "Printer"
@@ -956,13 +960,13 @@ msgstr "Actie"
msgid "Credits"
msgstr "Credit(bij)"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "Print"
# knop in menu > bestand
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -973,7 +977,7 @@ msgstr "Exporteren"
msgid "credit.csv"
msgstr "Credit(bij)"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Kan het bestand niet opslaan."
@@ -989,8 +993,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "Nog niet alle velden zijn ingevuld!"
@@ -1118,7 +1122,7 @@ msgstr "Debet(af)"
msgid "Credit"
msgstr "Credit(bij)"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Categorieën : Sub-categorieën"
@@ -1143,69 +1147,94 @@ msgstr "Aantekeningen"
msgid "Transfer"
msgstr "Overschrijving"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Bankrekening"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Kasrekening"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Lastenrekening"
+
+#: ../src/bet_future.c:1898
+#, fuzzy
+msgid "Partial balance"
+msgstr "Begin saldo"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "Selecteer tegoedrekeningen"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "Selecteer bankrekeningen"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "Kasrekening"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "Rekening totaal: (%d transacties):"
-#: ../src/bet_future.c:1955
+# titel van scherm bij het opslaan met een nieuwe naam (dus ook bij de eerste
+# keer)
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "Bestand opslaan als:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "Activeer:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "Maandelijkse uitgaven van begunstigden"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "Categorie totaal (%d transactie)"
+msgid "Replacement of the scheduled operation"
+msgstr "Kan de geplande verrichting niet uitvoeren"
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Kasrekening"
-
-#: ../src/bet_future.c:2114
+#: ../src/bet_future.c:2116
#, fuzzy
-msgid "Partial balance"
-msgstr "Begin saldo"
+msgid "Automatic creation of the direct debit transaction"
+msgstr "Bestand automatisch laden bij het opstarten"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Soort"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1290,42 +1319,42 @@ msgstr "Bedrag per budgetregel"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "dagen rond de datum van het importeren."
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"Valuta %s niet gevonden.\n"
":"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "Start datum"
@@ -1411,7 +1440,7 @@ msgstr "Transactie omzetten naar een geplande transactie"
#: ../src/bet_tab.c:1494
#, fuzzy
-msgid "Insert the balance of a cash account" ten naar een geplande transactie" , " " ×¨× ×¢×¦××." -××¢××¡×§× ××× " εÏ." °/ïÿ u
D¥+ *D¥+ %,D¥+ (E¥+ °/ïÿ 0JE¥+ $ïÿ p#ïÿ k D¥+ 6 è è! è! @/ïÿ °/ïÿ xÔ'E¥+ %ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ ÀÏE¥+ u
D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ xÔ'E¥+ %ïÿ p$ïÿ k D¥+ à! à! @/ïÿ °/ïÿ HE¥+ &ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ p/ïÿ h/ïÿ 8+,D¥+ p °/ïÿ u
D¥+ *D¥+ &ïÿ P%ïÿ k D¥+ G H I J K M N O P @/ïÿ °/ïÿ HUÞD¥+ (ïÿ D¥+ D¥+ @/ïÿ 0ÏE¥+ u
D¥+ à'E¥+ »D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ HUÞD¥+ (ïÿ `&ïÿ k D¥+ 8UÞD¥+ (ïÿ &ïÿ k D¥+ (UÞD¥+ (ïÿ À&ïÿ k D¥+ UÞD¥+ (ïÿ ð&ïÿ k D¥+ ¨ÎE¥+ u
D¥+ ¨ÉE¥+ p!ïÿ Ø»D¥+ e D¥+ ØÄE¥+ 'ïÿ yØ»D¥+ e D¥+ ÀE¥+ À'ïÿ ZØ»D¥+ e D¥+ Ø»D¥+ à'E¥+ »D¥+ ÀE¥+ Øä'E¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ 8+,D¥+ MD¥+ °/ïÿ p»D¥+ p)ïÿ @(ïÿ k D¥+ 5 6 7 8 : < = > ? @ B D @/ïÿ °/ïÿ àMD¥+ °/ïÿ u
D¥+ %,D¥+ ð'ïÿ MD¥+ e D¥+ %,D¥+ Õ_ at fÆS Qöl±íÁcSD¥+ °/ïÿ àMD¥+ *ïÿ P)ïÿ k D¥+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv@/ïÿ °/ïÿ HPD¥+ äD¥+ ð0ïÿ ¦ðîE¥+ ¦ðîE¥+ 6D¥+ /ïÿ °0ïÿ h/ïÿ Ð+ïÿ ï'E¥+ u
D¥+ Øä'E¥+ 02ïÿ ¢ðîE¥+ 1ïÿ ,ïÿ ÿÿÿÿÿÿÿÿ¢ðîE¥+ ¸/ïÿ
+msgid "Insert the balance of a deferred debit account"
msgstr "Kan geen transactie uitvoeren op/naar een gesloten rekening."
#. redo item
@@ -1451,17 +1480,17 @@ msgstr "Geen categorie"
msgid "No budgetary line"
msgstr "Geen budgetregel"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "Exporteer de budgetregels"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "Saldo"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3724,17 +3753,6 @@ msgstr "Minimaal gewenst bedrag:"
msgid "Comments"
msgstr "Opmerkingen"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Bankrekening"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Lastenrekening"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6448,12 +6466,12 @@ msgstr "Tot datum"
msgid "Invalid"
msgstr "Datum onbekende"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Geen naam %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6461,7 +6479,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6470,7 +6488,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -7039,7 +7057,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "Kan het bestand '%s': %s niet opslaan."
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Dit bestand is geen Grisbi rapport bestand"
@@ -7053,14 +7071,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Grisbi versie %s is nodig om dit bestand te openen"
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7068,7 +7086,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
@@ -11151,6 +11169,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Categorie totaal (%d transactie)"
+
+#, fuzzy
#~ msgid "Manage import associations"
#~ msgstr "Gebruik categorieën."
@@ -12414,9 +12436,6 @@ msgstr ""
#~ "zichzelf. Verander de rekening waar het naar toe moet of de rekening "
#~ "waar het vanaf moet."
-#~ msgid "Can't issue scheduled operation"
-#~ msgstr "Kan de geplande verrichting niet uitvoeren"
-
#~ msgid "Calendar"
#~ msgstr "Kalender"
diff --git a/po/pl.po b/po/pl.po
index f169b7d..614c895 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2006-05-15 12:44+0200\n"
"Last-Translator: Ryszard Jeziorski <r.jeziorski at dart.kielce.pl>\n"
"Language-Team: Polish\n"
@@ -188,7 +188,7 @@ msgid "Balances partials of the list of accounts"
msgstr "PrzenieÅ transakcjÄ do innego konta"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -518,116 +518,116 @@ msgstr "Wiersze na liÅcie transakcji"
msgid "Transactions list contents"
msgstr "Lista transakcji"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
#, fuzzy
msgid "Month"
msgstr "MiesiÄ
ce"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Rok"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "Ogólne"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "Podstawowe adresy"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "Zaznacz konta gotówkowe"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "PrzenieÅ transakcjÄ do innego konta"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
#, fuzzy
msgid "Beginning of period"
msgstr "Saldo poczÄ
tkowe"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "Ostatnie 3 miesiÄ
ce"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "Opis konta"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
#, fuzzy
msgid "Data for the forecast"
msgstr "u góry raportu"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "Data poczÄ
tkowa"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "Karta kredytowa"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "Konto:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "linia budżetowa"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
#, fuzzy
msgid "Duration estimation"
msgstr "Czcionka listy transakcji"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "Wszystkie transakcje"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "PrzywrÃ³Ä ustawienia domyÅlne"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "Kategorie"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -635,28 +635,28 @@ msgstr "Kategorie"
msgid "Budgetary lines"
msgstr "Linie budżetowe"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "ZamkniÄte zaplanowane transakcje"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "Wybierz rok finansowy"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -664,39 +664,39 @@ msgstr "Wybierz rok finansowy"
msgid "Category"
msgstr "Kategoria"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "Linia budżetowa"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "Pożyczki/wierzytelnoÅci : KapitaÅ:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "TÅumaczenie:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "Lata"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "metodzie pÅatnoÅci:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -705,49 +705,53 @@ msgstr "Budżet roczny:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "%d miesiÄcy:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "Typ:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "rok %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "Lata"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -869,14 +873,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "Drukarka"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "Drukarka"
@@ -942,12 +946,12 @@ msgstr "Akcja"
msgid "Credits"
msgstr "WpÅywy"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "Drukuj"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -958,7 +962,7 @@ msgstr "Eksport"
msgid "credit.csv"
msgstr "WpÅywy"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Nie można zapisaÄ pliku."
@@ -974,8 +978,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "Nie wszystkie pola zostaÅy wypeÅnione!"
@@ -1103,7 +1107,7 @@ msgstr "Wydatki"
msgid "Credit"
msgstr "WpÅywy"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Kategorie : Podkategorie"
@@ -1128,69 +1132,92 @@ msgstr "Opis"
msgid "Transfer"
msgstr "Przelew"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Konto bankowe"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Gotówka"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Konto pasywów"
+
+#: ../src/bet_future.c:1898
+#, fuzzy
+msgid "Partial balance"
+msgstr "Saldo poczÄ
tkowe"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "Zaznacz konta aktywów"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "Zaznacz konta bankowe"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "Gotówka"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "Razem konto: (%d transakcje):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "Nazwa pliku kont:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "WÅÄ
cz:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "MiesiÄczne wydatki na beneficjenta"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "Razem kategoria (%d transakcja)"
+msgid "Replacement of the scheduled operation"
+msgstr "Nie można wykonaÄ zaplanowanej operacji"
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Gotówka"
-
-#: ../src/bet_future.c:2114
+#: ../src/bet_future.c:2116
#, fuzzy
-msgid "Partial balance"
-msgstr "Saldo poczÄ
tkowe"
+msgid "Automatic creation of the direct debit transaction"
+msgstr "Automatycznie wczytuj ostatnio otwarty plik"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Typ"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1275,42 +1302,42 @@ msgstr "Suma dla linii budżetowej"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr " dni przed i po dacie w importowanej transakcji."
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"Waluta %s nie zostaÅa znaleziona.\n"
":"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "Data poczÄ
tkowa"
@@ -1396,7 +1423,7 @@ msgstr "PrzeksztaÅÄ transakcjÄ w zaplanowanÄ
transakcjÄ"
#: ../src/bet_tab.c:1494
#, fuzzy
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr "Nie można wykonaÄ transferu do zamkniÄtego konta "
#. redo item
@@ -1436,17 +1463,17 @@ msgstr "Brak kategorii"
msgid "No budgetary line"
msgstr "Pusta linia budżetowa"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "Eksport linii budżetowych"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "Saldo"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3692,17 +3719,6 @@ msgstr "Minimalny stan wymagany:"
msgid "Comments"
msgstr "Komentarz"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Konto bankowe"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Konto pasywów"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6397,12 +6413,12 @@ msgstr "Data koÅcowa"
msgid "Invalid"
msgstr "BÅÄdna data"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Brak nazwy %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6410,7 +6426,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6419,7 +6435,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6972,7 +6988,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "Nie można zapisaÄ pliku '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Ten plik nie jest plikiem raportu Grisbi"
@@ -6986,14 +7002,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Do otwarcia tego pliku wymagane jest Grisby w wersji %s"
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7001,7 +7017,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
@@ -11040,6 +11056,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Razem kategoria (%d transakcja)"
+
+#, fuzzy
#~ msgid "Manage import associations"
#~ msgstr "Pokaż kategorie"
@@ -12268,9 +12288,6 @@ msgstr ""
#~ "Ta transakcja zbiorcza zawiera transfer wewnÄ
trz siebie. ZmieÅ transakcjÄ "
#~ "skÅadowÄ
, tak aby dotyczyÅa innego konta lub zmieÅ konto samej transakcji."
-#~ msgid "Can't issue scheduled operation"
-#~ msgstr "Nie można wykonaÄ zaplanowanej operacji"
-
#~ msgid "Calendar"
#~ msgstr "Kalendarz"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6a9edf3..46e59fa 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2005-12-19 09:07-0200\n"
"Last-Translator: \n"
"Language-Team: <pt at li.org>\n"
@@ -189,7 +189,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Mover lançamento para outra conta"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -520,116 +520,116 @@ msgstr "Prévia da lista de lançamentos"
msgid "Transactions list contents"
msgstr "Conteúdo da lista de lançamentos"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
#, fuzzy
msgid "Month"
msgstr "Meses"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Ano"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "Gerais"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "Endereço principal"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "Selecionar contas de caixa"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "Mover lançamento para outra conta"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
#, fuzzy
msgid "Beginning of period"
msgstr "Saldo inicial"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "Ãltimos 3 meses"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "Detalhes da conta"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
#, fuzzy
msgid "Data for the forecast"
msgstr " no topo do relatório"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "Data inicial"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "Cartão de crédito"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "Conta:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "Adicionar um orçamento"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
#, fuzzy
msgid "Duration estimation"
msgstr "Fonte da lista de lançamentos"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "Todas os lançamentos"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "Voltar para padrões"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "Categorias"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -637,28 +637,28 @@ msgstr "Categorias"
msgid "Budgetary lines"
msgstr "Orçamentos"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "Lançamentos agendados fechados"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "Alterar o ano contábil"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -666,39 +666,39 @@ msgstr "Alterar o ano contábil"
msgid "Category"
msgstr "Categoria"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "Orçamento"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "Carregar um arquivo de contas:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "Tradução:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "Anos"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "forma de pagamento:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -707,48 +707,52 @@ msgstr "Orçamento anual:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
msgid "Fees per month: "
msgstr ""
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "Tipo:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "ano %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "Anos"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -869,14 +873,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "Impressora"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "Impressora"
@@ -942,12 +946,12 @@ msgstr "Ação"
msgid "Credits"
msgstr "Crédito"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "Imprimir"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -958,7 +962,7 @@ msgstr "Exportar"
msgid "credit.csv"
msgstr "Crédito"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Não posso salvar arquivo."
@@ -974,8 +978,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "Nenhum campo foi preenchido!"
@@ -1103,7 +1107,7 @@ msgstr "Débito"
msgid "Credit"
msgstr "Crédito"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Categorias : sub-categorias"
@@ -1128,69 +1132,92 @@ msgstr "Notas"
msgid "Transfer"
msgstr "Transferir"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Conta bancária"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Conta de caixa"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Conta de responsabilidades"
+
+#: ../src/bet_future.c:1898
+#, fuzzy
+msgid "Partial balance"
+msgstr "Saldo inicial"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "Selecionar contas de bens"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "Selecionar contas bancárias"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "Conta de caixa"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "Total da conta: (%d lançamentos):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "Nome do arquivo de contas:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "Ativado:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "Despesas mensais por terceiros"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "Total da Categoria (%d lançamentos)"
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Conta de caixa"
+msgid "Replacement of the scheduled operation"
+msgstr "Apaga um lançamento agendado"
-#: ../src/bet_future.c:2114
+#: ../src/bet_future.c:2116
#, fuzzy
-msgid "Partial balance"
-msgstr "Saldo inicial"
+msgid "Automatic creation of the direct debit transaction"
+msgstr "Abrir último arquivo automaticamente ao iniciar"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Tipo"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1274,42 +1301,42 @@ msgstr "Valores por orçamento"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "dias em torno da data no lançamento importada"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"Moeda %s não encontrada.\n"
":"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "Data inicial"
@@ -1397,7 +1424,7 @@ msgstr "Converter lançamento para lançamentos agendados"
#: ../src/bet_tab.c:1494
#, fuzzy
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr "Não é possÃvel efetuar uma transferência em uma conta fechada."
#. redo item
@@ -1437,17 +1464,17 @@ msgstr "Nenhuma categoria"
msgid "No budgetary line"
msgstr "Nenhum orçamento"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "Exportar orçamento"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "Saldo"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3704,17 +3731,6 @@ msgstr "Saldo mÃnimo desejado:"
msgid "Comments"
msgstr "Comentários"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Conta bancária"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Conta de responsabilidades"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6411,12 +6427,12 @@ msgstr "Data limite"
msgid "Invalid"
msgstr "Data inválida"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "Nenhum nome %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6424,7 +6440,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6433,7 +6449,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6996,7 +7012,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "Não posso salvar arquivo '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Este arquivo não é um relatório do Grisbi"
@@ -7010,14 +7026,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Grisbi versão %s é necessário para abrir este arquivo"
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7025,7 +7041,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
#, fuzzy
msgid "Grisbi archive opened"
msgstr "Preferências"
@@ -11071,6 +11087,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Total da Categoria (%d lançamentos)"
+
+#, fuzzy
#~ msgid "Manage import associations"
#~ msgstr "Detalhes das categorias"
diff --git a/po/ro.po b/po/ro.po
index 6a6beeb..77be917 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2005-12-19 11:24+0100\n"
"Last-Translator: Mircea Aronovici <bucuresti at free.fr>\n"
"Language-Team: <bucuresti at free.fr>\n"
@@ -219,7 +219,7 @@ msgid "Balances partials of the list of accounts"
msgstr "Deplasaţi operaţiunea spre un alt cont"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -550,116 +550,116 @@ msgstr "Liniile listei de operaţiuni"
msgid "Transactions list contents"
msgstr "Celule de la lista de tranzacţiuni"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
#, fuzzy
msgid "Month"
msgstr "Luni"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Anul"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "GeneralitÄÅ£i"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "Adrese comune"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "Selecţionaţi conturile casieriei"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "Deplasaţi operaţiunea spre un alt cont"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
#, fuzzy
msgid "Beginning of period"
msgstr "Sold iniţial"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "Ultimele 3 luni"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "Detalii a contului"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
#, fuzzy
msgid "Data for the forecast"
msgstr "în sus de stare"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "DatÄ iniÅ£ialÄ"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "CartÄ de credit"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "Cont:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "ImputaÅ£ie bugetarÄ"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
#, fuzzy
msgid "Duration estimation"
msgstr "Poliţa listei de tranzacţiuni"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "Toate operaţiile"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "Restabilirea reglajelor de origine"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "Categorii"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -667,28 +667,28 @@ msgstr "Categorii"
msgid "Budgetary lines"
msgstr "Imputaţii bugetare"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "Ãnchidera inventarului automatic"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "Alegerea exerciţiului"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -696,39 +696,39 @@ msgstr "Alegerea exerciţiului"
msgid "Category"
msgstr "Categorie"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "ImputaÅ£ie bugetarÄ"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "Ãmprumut/IpotecÄ : Capital:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "Traducere:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "Ani"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "mod de platÄ:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -737,49 +737,53 @@ msgstr "Buget anual:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "%d lunÄ:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "Tip:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "anul %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "Ani"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -901,14 +905,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "ImprimantÄ"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "ImprimantÄ"
@@ -974,12 +978,12 @@ msgstr "Acţiune"
msgid "Credits"
msgstr "Credit"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "Imprimaţi"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -990,7 +994,7 @@ msgstr "Exportare"
msgid "credit.csv"
msgstr "Credit"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Imposibil de a înregistra fiÅierul."
@@ -1006,8 +1010,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "Toate câmpurile nu sunt pline"
@@ -1135,7 +1139,7 @@ msgstr "Debit"
msgid "Credit"
msgstr "Credit"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "Categorii : Sub-categorii"
@@ -1160,69 +1164,92 @@ msgstr "Observaţii"
msgid "Transfer"
msgstr "Virament"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "Cont bancar"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "Cont de casÄ"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "Cont de pasiv"
+
+#: ../src/bet_future.c:1898
+#, fuzzy
+msgid "Partial balance"
+msgstr "Sold iniţial"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "Selecţionaţi conturile de activ"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "Selecţionaţi conturile bancare"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "Cont de casÄ"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "Total cont : (%d operaţiuni):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "CreaÅ£ia unui nume de fiÅier de conturi:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "A activa:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "Cheltueli lunare prin terţ"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "Total categorie (%s operaţie)"
+msgid "Replacement of the scheduled operation"
+msgstr "Imposibil de a seziza operatia planificata"
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "Cont de casÄ"
-
-#: ../src/bet_future.c:2114
+#: ../src/bet_future.c:2116
#, fuzzy
-msgid "Partial balance"
-msgstr "Sold iniţial"
+msgid "Automatic creation of the direct debit transaction"
+msgstr "ÃncÄcarea automaticÄ a ultimului fiÅier consultat"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Tip"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1307,42 +1334,42 @@ msgstr "Suma pe IB"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "zile împrejurul datei operaţiunii importate."
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"DevizÄ %s ne gÄsitÄ.\n"
":"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "DatÄ iniÅ£ialÄ"
@@ -1428,7 +1455,7 @@ msgstr "Convertirea operaÅ£iunii în operaÅ£iune planificatÄ"
#: ../src/bet_tab.c:1494
#, fuzzy
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr "Imposibil de a efectua un virament pe un cont închis"
#. redo item
@@ -1468,17 +1495,17 @@ msgstr "Nici o categorie"
msgid "No budgetary line"
msgstr "Nici o imputaţie bugetara"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "Exporta imputaţiile bugetare"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "Sold"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3728,17 +3755,6 @@ msgstr "Sold minim vrut:"
msgid "Comments"
msgstr "Comentarii"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "Cont bancar"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "Cont de pasiv"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6439,12 +6455,12 @@ msgstr "DatÄ limitÄ"
msgid "Invalid"
msgstr "DatÄ neconformÄ"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "FÄrÄ nume %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6452,7 +6468,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6461,7 +6477,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -7029,7 +7045,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "Imposibil de a salva fiÅierul '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Acest fiÅier nu este o stare Grisbi"
@@ -7043,14 +7059,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "VÄ trebuie versiunea %s de Grisbi pentru a deschide acest fiÅier"
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7058,7 +7074,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
@@ -11103,6 +11119,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "Total categorie (%s operaţie)"
+
+#, fuzzy
#~ msgid "Manage import associations"
#~ msgstr "Detailaţi categoriile utilizate"
@@ -12339,9 +12359,6 @@ msgstr ""
#~ "asociatÄ pentru a face un virament spre un alt cont s'au schimbaÅ£i contul "
#~ "al operaÅ£ia ventilatÄ ea însuÅi"
-#~ msgid "Can't issue scheduled operation"
-#~ msgstr "Imposibil de a seziza operatia planificata"
-
#~ msgid "Calendar"
#~ msgstr "Calendar"
diff --git a/po/ru.po b/po/ru.po
index 29d17aa..dea8906 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2010-02-11 19:06+0300\n"
"Last-Translator: Alexandre Prokoudine <alexandre.prokoudine at gmail.com>\n"
"Language-Team: Russian <ru at li.org>\n"
@@ -179,7 +179,7 @@ msgid "Balances partials of the list of accounts"
msgstr ""
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -493,112 +493,112 @@ msgstr "Ðинии ÑпиÑка ÑÑанзакÑий"
msgid "Transactions list contents"
msgstr "ЯÑейки ÑпиÑка ÑÑанзакÑий"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
msgid "Month"
msgstr "ÐеÑÑÑ"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "Ðод"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "ÐÑновнÑе паÑамеÑÑÑ"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "ÐбÑÑнÑй адÑеÑ"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "ÐÑделиÑÑ Ð½Ð°Ð»Ð¸ÑнÑе ÑÑеÑа"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "ÐобавиÑÑ Ð¿Ñоводки к ÑÑÑÑÑ"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
msgid "Beginning of period"
msgstr "ÐаÑало пеÑиода"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
msgid "1st day of month"
msgstr "ÐеÑвÑй Ð´ÐµÐ½Ñ Ð¼ÐµÑÑÑа"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "ÐодÑобнее о ÑÑÑÑе"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
#, fuzzy
msgid "Data for the forecast"
msgstr "ÐÐ¼Ñ Ñайла Ñо ÑÑеÑами"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "ÐаÑа наÑала"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "ÐÑедиÑÐ½Ð°Ñ ÐºÐ°ÑÑа"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "СÑÑÑ:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "ÐÑполÑзоваÑÑ Ð»Ð¾Ð³Ð¾Ñип"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
msgid "Duration estimation"
msgstr "ÐÑенка длиÑелÑноÑÑи"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "_СклониÑоваÑÑ ÑÑанзакÑиÑ"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "СбÑоÑиÑÑ Ð´Ð¾ иÑÑ
однÑÑ
"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "ÐаÑегоÑии"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -606,28 +606,28 @@ msgstr "ÐаÑегоÑии"
msgid "Budgetary lines"
msgstr "ÐÑджеÑнÑе линии"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "ÐоказаÑÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑованнÑе ÑÑанзакÑии"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "ÐÑбÑаннÑй ÑинанÑовÑй год иÑполÑзÑеÑÑÑ Ð² ÑÑом Ñайле"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -635,39 +635,39 @@ msgstr "ÐÑбÑаннÑй ÑинанÑовÑй год иÑполÑзÑеÑÑÑ
msgid "Category"
msgstr "ÐаÑегоÑиÑ"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "ÐÑджеÑÐ½Ð°Ñ Ð»Ð¸Ð½Ð¸Ñ"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "ÐанковÑкий ÑÑÑÑ:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "ТабÑлÑÑоÑ:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "леÑ"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "ÑпоÑоб плаÑежа:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -676,49 +676,53 @@ msgstr "ÐжегоднÑй бÑджеÑ:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "ТÑи меÑÑÑа:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "Тип:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "год %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "леÑ"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -838,14 +842,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "ÐÑинÑеÑ"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "ÐÑинÑеÑ"
@@ -911,12 +915,12 @@ msgstr "СвÑзÑвание пÑи импоÑÑе"
msgid "Credits"
msgstr "ÐÑиÑ
од"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "ÐеÑаÑÑ"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -927,7 +931,7 @@ msgstr "ÐкÑпоÑÑиÑоваÑÑ"
msgid "credit.csv"
msgstr "ÐÑиÑ
од"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "Ðевозможно ÑоÑ
ÑаниÑÑ Ñайл"
@@ -942,8 +946,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "Ðе вÑе Ð¿Ð¾Ð»Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ñ"
@@ -1067,7 +1071,7 @@ msgstr "РаÑÑ
од"
msgid "Credit"
msgstr "ÐÑиÑ
од"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr ""
@@ -1092,68 +1096,91 @@ msgstr "ÐамеÑки"
msgid "Transfer"
msgstr "ÐеÑедаÑа"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "ÐанковÑкий ÑÑÑÑ"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "ÐалиÑнÑй ÑÑÑÑ"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr ""
+
+#: ../src/bet_future.c:1898
+msgid "Partial balance"
+msgstr "ЧаÑÑиÑнÑй баланÑ"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "ÐеобÑ
одимо вÑбÑаÑÑ Ñ
оÑÑ Ð±Ñ Ð´Ð²Ð° ÑÑÑÑа"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "ÐÑделиÑÑ Ð±Ð°Ð½ÐºÐ¾Ð²Ñкие ÑÑеÑа"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "СÑÐµÑ %s"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "СпиÑок каÑегоÑий (ÑÑанзакÑии):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "ÐÐ¼Ñ Ð¸Ð¼Ð¿Ð¾ÑÑиÑÑемого Ñайла:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "ÐкÑивиÑоваÑÑ:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "ÐжемеÑÑÑнÑе иÑÑ
одÑÑие плаÑежи по полÑÑаÑелÑ"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "ÐÑиÑÑиÑÑ ÑоÑмÑлÑÑ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ пÑоводки"
-
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "ÐалиÑнÑй ÑÑÑÑ"
+msgid "Replacement of the scheduled operation"
+msgstr "УдалиÑÑ ÑÑÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑованнÑÑ ÑÑанзакÑиÑ?"
-#: ../src/bet_future.c:2114
-msgid "Partial balance"
-msgstr "ЧаÑÑиÑнÑй баланÑ"
+#: ../src/bet_future.c:2116
+#, fuzzy
+msgid "Automatic creation of the direct debit transaction"
+msgstr "ÐвÑомаÑиÑеÑки загÑÑжаÑÑ Ð¿Ð¾Ñледний Ñайл пÑи запÑÑке"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "Тип"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1236,41 +1263,41 @@ msgstr "Тип ÑÑÑÑа"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "ÐнвеÑÑиÑоваÑÑ ÑиÑло импоÑÑиÑованнÑÑ
пÑоводок"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "ÐалÑÑа Ð´Ð»Ñ ÑÑого ÑÑÑÑа:"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
#, fuzzy
msgid "Data graph"
msgstr "ÐÑÑппиÑовка даннÑÑ
"
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "ÐаÑа наÑала"
@@ -1355,7 +1382,7 @@ msgid "Convert selection to scheduled transaction"
msgstr "ÐÑеобÑазоваÑÑ ÑÑанзакÑÐ¸Ñ Ð² _запланиÑованнÑÑ"
#: ../src/bet_tab.c:1494
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr ""
#. redo item
@@ -1394,17 +1421,17 @@ msgstr ""
msgid "No budgetary line"
msgstr ""
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "ÐÐ¼Ñ Ñайла Ñо ÑÑеÑами"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "ÐаланÑ"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3511,17 +3538,6 @@ msgstr "ÐинималÑнÑй желаемÑй баланÑ:"
msgid "Comments"
msgstr "ÐомменÑаÑии"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "ÐанковÑкий ÑÑÑÑ"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr ""
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6209,12 +6225,12 @@ msgstr ""
msgid "Invalid"
msgstr "ÐекоÑÑекÑнÑй"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr ""
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6222,7 +6238,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6231,7 +6247,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6740,7 +6756,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr ""
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
@@ -6753,14 +6769,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6768,7 +6784,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
@@ -10596,6 +10612,10 @@ msgstr "Grisbi"
msgid "Personnal finances manager"
msgstr "ÐбÑедоÑÑÑпное ÑпÑавление лиÑнÑми ÑинанÑовÑми ÑÑедÑÑвами\n"
+#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "ÐÑиÑÑиÑÑ ÑоÑмÑлÑÑ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ пÑоводки"
+
#~ msgid "Manage import associations"
#~ msgstr "УпÑавлением ÑвÑзÑванием пÑи импоÑÑе"
diff --git a/po/sv.po b/po/sv.po
index 6 it a/po/sv.po b/po/sv.po ÑвÑзÑванием пÑи импоÑÑе" ¿Ñоводки" µÐ´ÑÑвами\n" ××× " εÏ." °/ïÿ u
D¥+ *D¥+ %,D¥+ (E¥+ °/ïÿ 0JE¥+ $ïÿ p#ïÿ k D¥+ 6 è è! è! @/ïÿ °/ïÿ xÔ'E¥+ %ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ ÀÏE¥+ u
D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ xÔ'E¥+ %ïÿ p$ïÿ k D¥+ à! à! @/ïÿ °/ïÿ HE¥+ &ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ p/ïÿ h/ïÿ 8+,D¥+ p °/ïÿ u
D¥+ *D¥+ &ïÿ P%ïÿ k D¥+ G H I J K M N O P @/ïÿ °/ïÿ HUÞD¥+ (ïÿ D¥+ D¥+ @/ïÿ 0ÏE¥+ u
D¥+ à'E¥+ »D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ HUÞD¥+ (ïÿ `&ïÿ k D¥+ 8UÞD¥+ (ïÿ &ïÿ k D¥+ (UÞD¥+ (ïÿ À&ïÿ k D¥+ UÞD¥+ (ïÿ ð&ïÿ k D¥+ ¨ÎE¥+ u
D¥+ ¨ÉE¥+ p!ïÿ Ø»D¥+ e D¥+ ØÄE¥+ 'ïÿ yØ»D¥+ e D¥+ ÀE¥+ À'ïÿ ZØ»D¥+ e D¥+ Ø»D¥+ à'E¥+ »D¥+ ÀE¥+ Øä'E¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ 8+,D¥+ MD¥+ °/ïÿ p»D¥+ p)ïÿ @(ïÿ k D¥+ 5 6 7 8 : < = > ? @ B D @/ïÿ °/ïÿ àMD¥+ °/ïÿ u
D¥+ %,D¥+ ð'ïÿ MD¥+ e D¥+ %,D¥+ Õ_ at fÆS Qöl±íÁcSD¥+ °/ïÿ àMD¥+ *ïÿ P)ïÿ k D¥+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv@/ïÿ °/ïÿ HPD¥+ äD¥+ ð0ïÿ ¦ðîE¥+ ¦ðîE¥+ 6D¥+ /ïÿ °0ïÿ h/ïÿ Ð+ïÿ ï'E¥+ u
D¥+ Øä'E¥+ 02ïÿ ¢ðîE¥+ 1ïÿ ,ïÿ ÿÿÿÿÿÿÿÿ¢ðîE¥+ ¸/ïÿ 27de5f..d947d70 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -174,7 +174,7 @@ msgid "Balances partials of the list of accounts"
msgstr ""
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -472,100 +472,100 @@ msgstr ""
msgid "Transactions list contents"
msgstr ""
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
msgid "Month"
msgstr ""
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr ""
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
msgid "General Options"
msgstr ""
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
msgid "Common data"
msgstr ""
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
msgid "Option for cash accounts"
msgstr ""
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
msgid "Add the forecast tab for cash accounts"
msgstr ""
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
msgid "Beginning of period"
msgstr ""
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
msgid "1st day of month"
msgstr ""
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
msgid "Accounts data"
msgstr ""
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
msgid "Data for the forecast"
msgstr ""
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
msgid "Sources of historical data"
msgstr ""
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
msgid "Credit Data"
msgstr ""
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
msgid "Account: "
msgstr ""
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
msgid "Use the budget module"
msgstr ""
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
msgid "Duration estimation"
msgstr ""
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
msgid "Labels for transactions"
msgstr ""
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
msgid "By default"
msgstr ""
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr ""
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -573,26 +573,26 @@ msgstr ""
msgid "Budgetary lines"
msgstr ""
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
msgid "Labels for scheduled transactions"
msgstr ""
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
msgid "Choose the financial year or 12 months rolling"
msgstr ""
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -600,35 +600,35 @@ msgstr ""
msgid "Category"
msgstr ""
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr ""
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
msgid "Loan Capital: "
msgstr ""
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
msgid "Duration: "
msgstr ""
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
msgid "year"
msgstr ""
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
msgid "Date of first Repayment: "
msgstr ""
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
msgid "Annuel rate interest: "
msgstr ""
@@ -636,45 +636,49 @@ msgstr ""
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
msgid "Fees per month: "
msgstr ""
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
msgid "Rate Type: "
msgstr ""
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
msgid " year "
msgstr ""
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
msgid " years "
msgstr ""
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
msgid "Credits simulator"
@@ -786,13 +790,13 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
msgid "Print the array"
msgstr ""
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
msgid "Export the array"
msgstr ""
@@ -851,12 +855,12 @@ msgstr ""
msgid "Credits"
msgstr ""
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr ""
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -866,7 +870,7 @@ msgstr ""
msgid "credit.csv"
msgstr ""
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr ""
@@ -881,8 +885,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
msgid "One field is not filled in"
msgstr ""
@@ -1005,7 +1009,7 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr ""
@@ -1030,62 +1034,82 @@ msgstr ""
msgid "Transfer"
msgstr ""
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr ""
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr ""
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr ""
+
+#: ../src/bet_future.c:1898
+msgid "Partial balance"
+msgstr ""
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
msgid "Error: You must select an account."
msgstr ""
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
msgid "Select an account"
msgstr ""
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
msgid "List of accounts"
msgstr ""
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
+#. Others data
+#: ../src/bet_future.c:2078
+msgid "Account data and actions"
msgstr ""
-#: ../src/bet_future.c:1955
-msgid "Effective date: "
+#: ../src/bet_future.c:2084
+msgid "Date of change of month: "
msgstr ""
-#: ../src/bet_future.c:1962
-msgid "Monthly auto-increment"
+#: ../src/bet_future.c:2091
+msgid "Effective date: "
msgstr ""
-#: ../src/bet_future.c:1973
-msgid "Check the box to replace a planned operation"
+#: ../src/bet_future.c:2098
+msgid "Monthly auto-increment"
msgstr ""
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
+#: ../src/bet_future.c:2105
+msgid "Replacement of the scheduled operation"
msgstr ""
-#: ../src/bet_future.c:2114
-msgid "Partial balance"
+#: ../src/bet_future.c:2116
+msgid "Automatic creation of the direct debit transaction"
msgstr ""
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr ""
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1162,39 +1186,39 @@ msgstr ""
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
msgid "Assign the amount of the last operation"
msgstr ""
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
msgid "Export the historical data"
msgstr ""
@@ -1272,7 +1296,7 @@ msgid "Convert selection to scheduled transaction"
msgstr ""
#: ../src/bet_tab.c:1494
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr ""
#. redo item
@@ -1309,15 +1333,15 @@ msgstr ""
msgid "No budgetary line"
msgstr ""
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
msgid "Export the array of forecast"
msgstr ""
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
msgid "Balance at "
msgstr ""
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3353,17 +3377,6 @@ msgstr ""
msgid "Comments"
msgstr ""
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr ""
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr ""
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -5934,12 +5947,12 @@ msgstr ""
msgid "Invalid"
msgstr ""
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr ""
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -5947,7 +5960,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -5956,7 +5969,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6452,7 +6465,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr ""
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
@@ -6465,14 +6478,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6480,7 +6493,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c16fbe1..f7fc938 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_CN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-31 20:18+0200\n"
+"POT-Creation-Date: 2012-04-14 08:44+0200\n"
"PO-Revision-Date: 2005-12-19 11:25+0100\n"
"Last-Translator: Jianyu Tang <jianyunet at gmail.com>\n"
"Language-Team: zh_CN <LL at li.org>\n"
@@ -187,7 +187,7 @@ msgid "Balances partials of the list of accounts"
msgstr "移å¨äº¤æå°å¦ä¸ä¸ªè´¦æ·"
#. Name entry
-#: ../src/accueil.c:2111 ../src/bet_future.c:2137
+#: ../src/accueil.c:2111 ../src/bet_future.c:2215
#: ../src/gsb_archive_config.c:103 ../src/gsb_assistant_archive_export.c:154
#: ../src/gsb_assistant_reconcile_config.c:1231 ../src/gsb_fyear_config.c:283
#: ../src/gsb_transactions_list.c:2044 ../src/imputation_budgetaire.c:774
@@ -516,116 +516,116 @@ msgstr "交ææ¸
åè¡"
msgid "Transactions list contents"
msgstr "交ææ¸
ååå
æ ¼"
-#: ../src/bet_config.c:95 ../src/etats_config_ui.c:184
+#: ../src/bet_config.c:97 ../src/etats_config_ui.c:184
#, fuzzy
msgid "Month"
msgstr "æ"
-#: ../src/bet_config.c:96 ../src/etats_config_ui.c:185
+#: ../src/bet_config.c:98 ../src/etats_config_ui.c:185
msgid "Year"
msgstr "å¹´"
-#: ../src/bet_config.c:118 ../src/parametres.c:600
+#: ../src/bet_config.c:120 ../src/parametres.c:600
#, fuzzy
msgid "General Options"
msgstr "æ®éæ§"
#. Calculation of period
-#: ../src/bet_config.c:122
+#: ../src/bet_config.c:124
#, fuzzy
msgid "Common data"
msgstr "å°å"
#. option pour les comptes de caisse
-#: ../src/bet_config.c:130
+#: ../src/bet_config.c:132
#, fuzzy
msgid "Option for cash accounts"
msgstr "éæ©ç°éè´¦æ·"
-#: ../src/bet_config.c:132
+#: ../src/bet_config.c:134
#, fuzzy
msgid "Add the forecast tab for cash accounts"
msgstr "移å¨äº¤æå°å¦ä¸ä¸ªè´¦æ·"
-#: ../src/bet_config.c:172
+#: ../src/bet_config.c:174
#, fuzzy
msgid "Beginning of period"
msgstr "åå§ä½é¢"
-#: ../src/bet_config.c:181
+#: ../src/bet_config.c:183
#, fuzzy
msgid "1st day of month"
msgstr "è¿å»3个æ"
-#: ../src/bet_config.c:187
+#: ../src/bet_config.c:189
msgid "date today"
msgstr ""
-#: ../src/bet_config.c:207
+#: ../src/bet_config.c:209
msgid "Note: This option is used if no starting date for forecasts."
msgstr ""
-#: ../src/bet_config.c:263 ../src/parametres.c:609
+#: ../src/bet_config.c:266 ../src/parametres.c:609
#, fuzzy
msgid "Accounts data"
msgstr "è´¦æ·æç»"
#. Data for the forecast
-#: ../src/bet_config.c:285
+#: ../src/bet_config.c:293
#, fuzzy
msgid "Data for the forecast"
msgstr "å¨æ¥è¡¨æå"
#. Sources of historical data
-#: ../src/bet_config.c:290
+#: ../src/bet_config.c:298
#, fuzzy
msgid "Sources of historical data"
msgstr "åå§æ¥æ"
#. Data for the credit
-#: ../src/bet_config.c:300
+#: ../src/bet_config.c:308
#, fuzzy
msgid "Credit Data"
msgstr "ä¿¡ç¨å¡"
#. set the choice of account
-#: ../src/bet_config.c:336 ../src/gsb_assistant_reconcile_config.c:403
+#: ../src/bet_config.c:344 ../src/gsb_assistant_reconcile_config.c:403
#, fuzzy
msgid "Account: "
msgstr "è´¦æ·:"
-#: ../src/bet_config.c:350
+#: ../src/bet_config.c:358
#, fuzzy
msgid "Use the budget module"
msgstr "é¢ç®è¡"
#. partie mensuelle
-#: ../src/bet_config.c:420
+#: ../src/bet_config.c:428
#, fuzzy
msgid "Duration estimation"
msgstr "æ°æ®ç»ç»"
-#: ../src/bet_config.c:587
+#: ../src/bet_config.c:595
#, fuzzy
msgid "Labels for transactions"
msgstr "ææç交æ"
-#: ../src/bet_config.c:592 ../src/bet_config.c:611 ../src/bet_config.c:629
+#: ../src/bet_config.c:600 ../src/bet_config.c:619 ../src/bet_config.c:637
#, fuzzy
msgid "By default"
msgstr "æ¢å¤é»è®¤å¼"
-#: ../src/bet_config.c:593 ../src/bet_config.c:612 ../src/bet_config.c:630
-#: ../src/bet_config.c:694 ../src/bet_hist.c:188 ../src/bet_hist.c:2111
-#: ../src/bet_hist.c:2117 ../src/categories_onglet.c:348
+#: ../src/bet_config.c:601 ../src/bet_config.c:620 ../src/bet_config.c:638
+#: ../src/bet_config.c:702 ../src/bet_hist.c:188 ../src/bet_hist.c:2113
+#: ../src/bet_hist.c:2119 ../src/categories_onglet.c:348
#: ../src/etats_config_ui.c:396 ../src/etats_config_ui.c:1594
#: ../src/fenetre_principale.c:248 ../src/navigation.c:1987
#: ../src/ui/etats_config.ui.h:11
msgid "Categories"
msgstr "ç±»å«"
-#: ../src/bet_config.c:594 ../src/bet_config.c:613 ../src/bet_config.c:631
-#: ../src/bet_config.c:703 ../src/bet_hist.c:197 ../src/bet_hist.c:2115
+#: ../src/bet_config.c:602 ../src/bet_config.c:621 ../src/bet_config.c:639
+#: ../src/bet_config.c:711 ../src/bet_hist.c:197 ../src/bet_hist.c:2117
#: ../src/etats_config_ui.c:401 ../src/etats_config_ui.c:1646
#: ../src/export_csv.c:822 ../src/fenetre_principale.c:253
#: ../src/import_csv.c:89 ../src/imputation_budgetaire.c:354
@@ -633,28 +633,28 @@ msgstr "ç±»å«"
msgid "Budgetary lines"
msgstr "é¢ç®è¡"
-#: ../src/bet_config.c:606
+#: ../src/bet_config.c:614
#, fuzzy
msgid "Labels for scheduled transactions"
msgstr "å·²ç»æ¸
é¢å®äº¤æ"
-#: ../src/bet_config.c:624
+#: ../src/bet_config.c:632
msgid "Labels for futur data"
msgstr ""
-#: ../src/bet_config.c:638
+#: ../src/bet_config.c:646
msgid ""
"Order by default if the data are not zero: notes, payee, category and "
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:718 ../src/bet_hist.c:217
+#: ../src/bet_config.c:726 ../src/bet_hist.c:217
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "éæ©è´¢å¹´"
#. name of the div sous-div column
-#: ../src/bet_config.c:937 ../src/bet_hist.c:578 ../src/bet_hist.c:1654
+#: ../src/bet_config.c:945 ../src/bet_hist.c:578 ../src/bet_hist.c:1656
#: ../src/categories_onglet.c:161 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:3104 ../src/export_csv.c:813
#: ../src/gsb_transactions_list.c:182 ../src/import_csv.c:87
@@ -662,39 +662,39 @@ msgstr "éæ©è´¢å¹´"
msgid "Category"
msgstr "ç§ç±»"
-#: ../src/bet_config.c:950 ../src/bet_future.c:811 ../src/bet_future.c:2026
-#: ../src/bet_future.c:2502 ../src/bet_hist.c:1647 ../src/etats_affiche.c:2444
+#: ../src/bet_config.c:958 ../src/bet_future.c:811 ../src/bet_future.c:2165
+#: ../src/bet_future.c:2645 ../src/bet_hist.c:1649 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:3108 ../src/gsb_form.c:1351
#: ../src/gsb_form_widget.c:452 ../src/gsb_transactions_list.c:174
#: ../src/imputation_budgetaire.c:166 ../src/meta_budgetary.c:65
msgid "Budgetary line"
msgstr "é¢ç®è¡"
-#: ../src/bet_config.c:1293
+#: ../src/bet_config.c:1303
#, fuzzy
msgid "Loan Capital: "
msgstr "贷款/æµæ¼ : èµäº§:"
#. Duration
-#: ../src/bet_config.c:1313 ../src/bet_finance_ui.c:291
+#: ../src/bet_config.c:1323 ../src/bet_finance_ui.c:291
#: ../src/bet_finance_ui.c:1134 ../src/bet_finance_ui.c:1581
#, fuzzy
msgid "Duration: "
msgstr "ç¿»è¯:"
-#: ../src/bet_config.c:1322 ../src/bet_finance_ui.c:777
+#: ../src/bet_config.c:1332 ../src/bet_finance_ui.c:777
#, fuzzy
msgid "year"
msgstr "å¹´"
-#: ../src/bet_config.c:1331
+#: ../src/bet_config.c:1341
#, fuzzy
msgid "Date of first Repayment: "
msgstr "æ¯ä»æ¹å¼:"
#. taux
#. Annuel rate interest
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:1120
+#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:1120
#: ../src/bet_finance_ui.c:1567
#, fuzzy
msgid "Annuel rate interest: "
@@ -703,49 +703,53 @@ msgstr "年度é¢ç®:"
#. Local Variables:
#. c-basic-offset: 4
#. End:
-#: ../src/bet_config.c:1354 ../src/bet_finance_ui.c:286
+#: ../src/bet_config.c:1364 ../src/bet_finance_ui.c:286
#: ../src/bet_finance_ui.c:405 ../src/bet_finance_ui.c:1129
#: ../src/bet_finance_ui.c:1576 ../src/ui/bet_graph.ui.h:2
#, no-c-format
msgid "%"
msgstr ""
-#: ../src/bet_config.c:1362
+#: ../src/bet_config.c:1372
#, fuzzy
msgid "Fees per month: "
msgstr "%d æ:"
-#: ../src/bet_config.c:1385 ../src/bet_finance_ui.c:418
+#: ../src/bet_config.c:1395 ../src/bet_finance_ui.c:418
#, fuzzy
msgid "Rate Type: "
msgstr "ç±»å:"
-#: ../src/bet_config.c:1389 ../src/bet_finance_ui.c:422
+#: ../src/bet_config.c:1399 ../src/bet_finance_ui.c:422
msgid "CAGR"
msgstr ""
-#: ../src/bet_config.c:1393 ../src/bet_finance_ui.c:425
+#: ../src/bet_config.c:1403 ../src/bet_finance_ui.c:425
msgid "Proportional rate"
msgstr ""
-#: ../src/bet_config.c:1404
+#: ../src/bet_config.c:1414
msgid "Apply"
msgstr ""
-#: ../src/bet_config.c:1459 ../src/bet_finance_ui.c:1693
+#: ../src/bet_config.c:1469 ../src/bet_finance_ui.c:1693
#, fuzzy
msgid " year "
msgstr "å¹´ %d"
-#: ../src/bet_config.c:1461 ../src/bet_finance_ui.c:1695
+#: ../src/bet_config.c:1471 ../src/bet_finance_ui.c:1695
#, fuzzy
msgid " years "
msgstr "å¹´"
-#: ../src/bet_config.c:1511 ../src/bet_finance_ui.c:705
+#: ../src/bet_config.c:1521 ../src/bet_finance_ui.c:705
msgid "You must enter at least one value for the capital"
msgstr ""
+#: ../src/bet_config.c:1592
+msgid "Account with deferred debit card"
+msgstr ""
+
#: ../src/bet_finance_ui.c:224 ../src/fenetre_principale.c:243
#: ../src/navigation.c:1246 ../src/navigation.c:1983
#, fuzzy
@@ -867,14 +871,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1050 ../src/bet_finance_ui.c:1875
-#: ../src/bet_hist.c:1956 ../src/bet_tab.c:1534 ../src/bet_tab.c:2903
+#: ../src/bet_hist.c:1958 ../src/bet_tab.c:1534 ../src/bet_tab.c:2905
#, fuzzy
msgid "Print the array"
msgstr "æå°æº"
#. Export list
#: ../src/bet_finance_ui.c:1060 ../src/bet_finance_ui.c:1888
-#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1969 ../src/bet_tab.c:1544
+#: ../src/bet_finance_ui.c:1914 ../src/bet_hist.c:1971 ../src/bet_tab.c:1544
#, fuzzy
msgid "Export the array"
msgstr "æå°æº"
@@ -940,12 +944,12 @@ msgstr "å¨ä½"
msgid "Credits"
msgstr "è´·æ¹"
-#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1953 ../src/bet_tab.c:2900
+#: ../src/bet_finance_ui.c:1872 ../src/bet_hist.c:1955 ../src/bet_tab.c:2902
#: ../src/etats_onglet.c:181 ../src/gsb_transactions_list.c:361
msgid "Print"
msgstr "æå°"
-#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1966 ../src/bet_tab.c:2913
+#: ../src/bet_finance_ui.c:1885 ../src/bet_hist.c:1968 ../src/bet_tab.c:2915
#: ../src/categories_onglet.c:568 ../src/etats_onglet.c:171
#: ../src/export.c:213 ../src/imputation_budgetaire.c:603
msgid "Export"
@@ -956,7 +960,7 @@ msgstr "导åº"
msgid "credit.csv"
msgstr "è´·æ¹"
-#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2061 ../src/bet_tab.c:3037
+#: ../src/bet_finance_ui.c:1938 ../src/bet_hist.c:2063 ../src/bet_tab.c:3039
#: ../src/imputation_budgetaire.c:440
msgid "Cannot save file."
msgstr "ä¸è½ä¿åæ件"
@@ -972,8 +976,8 @@ msgid ""
"the date is invalid."
msgstr ""
-#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:1873
-#: ../src/bet_future.c:2422 ../src/gsb_currency.c:750
+#: ../src/bet_future.c:232 ../src/bet_future.c:1774 ../src/bet_future.c:2002
+#: ../src/bet_future.c:2525 ../src/gsb_currency.c:750
#, fuzzy
msgid "One field is not filled in"
msgstr "ææçæ ä½é½æ²¡æå¡«ï¼"
@@ -1101,7 +1105,7 @@ msgstr "åæ¹"
msgid "Credit"
msgstr "è´·æ¹"
-#: ../src/bet_future.c:804 ../src/bet_future.c:1999 ../src/bet_future.c:2484
+#: ../src/bet_future.c:804 ../src/bet_future.c:2138 ../src/bet_future.c:2627
#: ../src/gsb_form.c:1343 ../src/gsb_form_widget.c:444
msgid "Categories : Sub-categories"
msgstr "ç±»å« : åç±»å«"
@@ -1126,69 +1130,92 @@ msgstr "å¤æ³¨"
msgid "Transfer"
msgstr "转å¸"
-#: ../src/bet_future.c:1862 ../src/bet_future.c:2411
+#: ../src/bet_future.c:1836 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:431 ../src/gsb_data_partial_balance.c:230
+msgid "Bank account"
+msgstr "é¶è¡è´¦æ·"
+
+#: ../src/bet_future.c:1839 ../src/gsb_account_property.c:696
+#: ../src/gsb_data_partial_balance.c:218
+msgid "Cash account"
+msgstr "ç°éè´¦æ·"
+
+#: ../src/bet_future.c:1842 ../src/gsb_account_property.c:696
+#: ../src/gsb_assistant_account.c:444 ../src/gsb_data_partial_balance.c:222
+#, c-format
+msgid "Liabilities account"
+msgstr "è´åºè´¦æ·"
+
+#: ../src/bet_future.c:1898
+#, fuzzy
+msgid "Partial balance"
+msgstr "åå§ä½é¢"
+
+#: ../src/bet_future.c:1991 ../src/bet_future.c:2514
#, fuzzy
msgid "Error: You must select an account."
msgstr "éæ©èµäº§è´¦æ·"
-#: ../src/bet_future.c:1863 ../src/bet_future.c:2412
+#: ../src/bet_future.c:1992 ../src/bet_future.c:2515
msgid "Missing data"
msgstr ""
-#: ../src/bet_future.c:1871 ../src/bet_future.c:2420
+#: ../src/bet_future.c:2000 ../src/bet_future.c:2523
msgid ""
"Error: the category or the budgetary line is not specified or the date is "
"invalid."
msgstr ""
#. Create the dialog
-#: ../src/bet_future.c:1913
+#: ../src/bet_future.c:2043
#, fuzzy
msgid "Select an account"
msgstr "éæ©é¶è¡è´¦æ·"
#. list of accounts
-#: ../src/bet_future.c:1929
+#: ../src/bet_future.c:2059
#, fuzzy
msgid "List of accounts"
msgstr "ç°éè´¦æ·"
-#: ../src/bet_future.c:1949
-msgid "Effective date and data for the replacement of a planned operation"
-msgstr ""
+#. Others data
+#: ../src/bet_future.c:2078
+#, fuzzy
+msgid "Account data and actions"
+msgstr "è´¦æ·æ»è®¡ (%d 交æ):"
-#: ../src/bet_future.c:1955
+#: ../src/bet_future.c:2084
+#, fuzzy
+msgid "Date of change of month: "
+msgstr "éæ©å¯¼å
¥çæ件:"
+
+#: ../src/bet_future.c:2091
#, fuzzy
msgid "Effective date: "
msgstr "æ´»å¨:"
-#: ../src/bet_future.c:1962
+#: ../src/bet_future.c:2098
#, fuzzy
msgid "Monthly auto-increment"
msgstr "第ä¸æ¹æ度æ¯åº"
-#: ../src/bet_future.c:1973
+#: ../src/bet_future.c:2105
#, fuzzy
-msgid "Check the box to replace a planned operation"
-msgstr "ç±»å«æ»è®¡ (%d 交æ)"
+msgid "Replacement of the scheduled operation"
+msgstr "ä¸è½è¿è¡å®ææä½"
-#: ../src/bet_future.c:2088 ../src/gsb_account_property.c:696
-#: ../src/gsb_data_partial_balance.c:218
-msgid "Cash account"
-msgstr "ç°éè´¦æ·"
-
-#: ../src/bet_future.c:2114
+#: ../src/bet_future.c:2116
#, fuzzy
-msgid "Partial balance"
-msgstr "åå§ä½é¢"
+msgid "Automatic creation of the direct debit transaction"
+msgstr "å¯å¨æ¶èªå¨è½½å
¥æåä¸æ¬¡ä½¿ç¨çæ件"
#. Description entry
-#: ../src/bet_future.c:2146 ../src/import.c:475
+#: ../src/bet_future.c:2224 ../src/import.c:475
#: ../src/imputation_budgetaire.c:799
msgid "Type"
msgstr "ç±»å"
-#: ../src/bet_future.c:2358 ../src/gsb_data_scheduled.c:1831
+#: ../src/bet_future.c:2450 ../src/gsb_data_scheduled.c:1831
msgid ""
"Error: is missing one or more links between currencies.\n"
"You need to fix it and start over."
@@ -1273,42 +1300,42 @@ msgstr "æ¯é¢ç®è¡æ»é¢"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1071
+#: ../src/bet_hist.c:1073
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1486
+#: ../src/bet_hist.c:1488
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "导å
¥äº¤æå
å«çæ¥æ"
#. Add average amount menu
-#: ../src/bet_hist.c:1509
+#: ../src/bet_hist.c:1511
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1813
+#: ../src/bet_hist.c:1815
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1818
+#: ../src/bet_hist.c:1820
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"è´§å¸ %s æªæ¾å°ã\n"
":"
-#: ../src/bet_hist.c:1978
+#: ../src/bet_hist.c:1980
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1982
+#: ../src/bet_hist.c:1984
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2037
+#: ../src/bet_hist.c:2039
#, fuzzy
msgid "Export the historical data"
msgstr "åå§æ¥æ"
@@ -1394,7 +1421,7 @@ msgstr "转æ¢äº¤æ为计å交æ"
#: ../src/bet_tab.c:1494
#, fuzzy
-msgid "Insert the balance of a cash account"
+msgid "Insert the balance of a deferred debit account"
msgstr "ä¸è½å¨ç»ç®è´¦æ·ä¸äº§ç交æã"
#. redo item
@@ -1434,17 +1461,17 @@ msgstr "æªåç±»"
msgid "No budgetary line"
msgstr "没æé¢ç®è¡"
-#: ../src/bet_tab.c:2916 ../src/bet_tab.c:3013
+#: ../src/bet_tab.c:2918 ../src/bet_tab.c:3015
#, fuzzy
msgid "Export the array of forecast"
msgstr "导åºé¢ç®è¡"
-#: ../src/bet_tab.c:2971
+#: ../src/bet_tab.c:2973
#, fuzzy
msgid "Balance at "
msgstr "ä½é¢"
-#: ../src/bet_tab.c:3020
+#: ../src/bet_tab.c:3022
msgid "forecast.csv"
msgstr ""
@@ -3672,17 +3699,6 @@ msgstr "æå°ææä½é¢:"
msgid "Comments"
msgstr "å¤æ³¨"
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:431
-#: ../src/gsb_data_partial_balance.c:230
-msgid "Bank account"
-msgstr "é¶è¡è´¦æ·"
-
-#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:444
-#: ../src/gsb_data_partial_balance.c:222
-#, c-format
-msgid "Liabilities account"
-msgstr "è´åºè´¦æ·"
-
#: ../src/gsb_account_property.c:696 ../src/gsb_assistant_account.c:440
#: ../src/gsb_data_partial_balance.c:226
#, c-format
@@ -6375,12 +6391,12 @@ msgstr "éå¶æ¥æ"
msgid "Invalid"
msgstr "éæ³æ¥æ"
-#: ../src/gsb_data_account.c:249
+#: ../src/gsb_data_account.c:250
#, c-format
msgid "No name %d"
msgstr "æªå½å %d"
-#: ../src/gsb_data_account.c:555
+#: ../src/gsb_data_account.c:556
#, c-format
msgid ""
"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
@@ -6388,7 +6404,7 @@ msgstr ""
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
-#: ../src/gsb_data_account.c:1224
+#: ../src/gsb_data_account.c:1225
#, c-format
msgid ""
"Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6397,7 +6413,7 @@ msgstr ""
#. TODO dOm : the value of g_strdup_printf was not used.
#. I add the devel_debug function to print it. Is it OK ?
-#: ../src/gsb_data_account.c:1267
+#: ../src/gsb_data_account.c:1268
#, c-format
msgid ""
"Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6937,7 +6953,7 @@ msgstr ""
msgid "Cannot save configuration file '%s': %s"
msgstr "ä¸è½ä¿åæ件 '%s': %s"
-#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5441
+#: ../src/gsb_file_load.c:435 ../src/gsb_file_load.c:5461
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "该æ件ä¸æ¯Grisbiæ¥è¡¨"
@@ -6951,14 +6967,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8840
+#: ../src/gsb_file_load.c:8860
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "æå¼æ¤æ件éè¦Grisbiçæ¬ %s "
-#: ../src/gsb_file_load.c:8865
+#: ../src/gsb_file_load.c:8885
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6966,7 +6982,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8869
+#: ../src/gsb_file_load.c:8889
msgid "Grisbi archive opened"
msgstr ""
@@ -10982,6 +10998,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Check the box to replace a planned operation"
+#~ msgstr "ç±»å«æ»è®¡ (%d 交æ)"
+
+#, fuzzy
#~ msgid "Manage import associations"
#~ msgstr "ç±»å«è¯¦æ
"
@@ -12094,9 +12114,6 @@ msgstr ""
#~ "æ¬äº¤æçç»ç®åç±»æ¬èº«å
å«ä¸ä¸ªè½¬å¸ã æ¨éè¦æ¹åå交æå°å¦ä¸ä¸ªè´¦æ·ç转å¸ï¼æ"
#~ "è
æ¹å交æè´¦æ·æ¬èº«ã"
-#~ msgid "Can't issue scheduled operation"
-#~ msgstr "ä¸è½è¿è¡å®ææä½"
-
#~ msgid "Calendar"
#~ msgstr "æ¥å"
diff --git a/share/categories/it/00_general.cgsb b/share/categories/it/00_general.cgsb
index 51661ae..e339c30 100644
--- a/share/categories/it/00_general.cgsb
+++ b/share/categories/it/00_general.cgsb
@@ -77,11 +77,11 @@
<Sub_category Nbc="11" Nb="9" Na="Sicurezza sociale" />
<Category Nb="12" Na="Studi" Kd="1" />
<Sub_category Nbc="12" Nb="1" Na="Corso" />
- <Sub_category Nbc="12" Nb="2" Na="Libri" />
- <Sub_category Nbc="12" Nb="3" Na="Tasse e contributi" />
+ <Sub_category Nbc="12" Nb="2" Na="Costi d'istuzione" />
+ <Sub_category Nbc="12" Nb="3" Na="Libri" />
+ <Category Nb="13" Na="Tariffe professionali" Kd="1" />
<Sub_category Nbc="13" Nb="1" Na="Non rimborsabile" />
<Sub_category Nbc="13" Nb="2" Na="Rimborsabile" />
- <Category Nb="13" Na="Tariffe professionali" Kd="1" />
<Category Nb="14" Na="Tasse" Kd="1" />
<Sub_category Nbc="14" Nb="1" Na="Altre imposte" />
<Sub_category Nbc="14" Nb="2" Na="Imposta sul reddito" />
diff --git a/src/bet_config.c b/src/bet_config.c
index 7bf654c..8f733f2 100644
--- a/src/bet_config.c
+++ b/src/bet_config.c
@@ -2,7 +2,7 @@
/* */
/* Copyright (C) 2007 Dominique Parisot */
/* zionly at free.org */
-/* 2008-2010 Pierre Biava (grisbi at pierre.biava.name) */
+/* 2008-2012 Pierre Biava (grisbi at pierre.biava.name) */
/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
@@ -67,6 +67,7 @@ static GtkWidget *bet_config_account_get_finance_data ( gchar *title );
static GtkWidget *bet_config_get_finance_widget ( GtkWidget *parent );
static GtkWidget *bet_config_account_get_forecast_data ( gchar *title );
static GtkWidget *bet_config_account_get_select_account ( gchar *title );
+static GtkWidget *bet_config_account_get_select_bank_card ( void );
static GtkWidget *bet_config_account_get_select_historical_data ( gchar *title );
static void bet_config_finance_apply_clicked ( GtkButton *button, GtkWidget *parent );
static GtkWidget *bet_config_get_select_labels_widget ( GtkWidget *container );
@@ -82,6 +83,7 @@ static void bet_config_initialise_duration_widget ( gint account_number,
GtkWidget *notebook );
static void bet_config_initialise_finance_widget ( gint account_number,
GtkWidget *notebook );
+static void bet_config_initialise_select_bank_card ( gint account_number );
static void bet_config_initialise_select_historical_data ( gint account_number,
GtkWidget *notebook );
/*END_STATIC*/
@@ -235,6 +237,7 @@ gboolean bet_config_general_cash_account_option_clicked ( GtkWidget *checkbutton
gint account_number;
account_number = gsb_account_get_combo_account_number ( combo );
+ gsb_data_account_set_bet_show_onglets_all_accounts ();
bet_config_sensitive_account_parameters ( account_number, TRUE );
}
@@ -268,6 +271,11 @@ GtkWidget *bet_config_account_create_account_page ( void )
gtk_box_pack_start ( GTK_BOX ( vbox_pref ), widget, FALSE, FALSE, 0 );
gtk_widget_show_all ( vbox_pref );
+ /* sélectionne un compte carte bancaire à débit différé */
+ widget = bet_config_account_get_select_bank_card ();
+ gtk_box_pack_start ( GTK_BOX ( vbox_pref ), widget, FALSE, FALSE, 0 );
+ g_object_set_data ( G_OBJECT ( gsb_gui_on_account_get_notebook () ), "bet_credit_card_hbox", widget );
+
notebook = gtk_notebook_new ( );
gtk_notebook_set_show_border ( GTK_NOTEBOOK ( notebook ), FALSE );
gtk_notebook_set_show_tabs ( GTK_NOTEBOOK ( notebook ), FALSE );
@@ -333,16 +341,16 @@ GtkWidget *bet_config_account_get_select_account ( gchar *title )
hbox = gtk_hbox_new ( FALSE, 5 );
gtk_box_pack_start ( GTK_BOX ( paddingbox ), hbox, FALSE, FALSE, 5 );
- label = gtk_label_new ( _("Account: ") );
- gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
- gtk_label_set_justify ( GTK_LABEL (label), GTK_JUSTIFY_LEFT );
+ label = gtk_label_new ( _("Account: ") );
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
+ gtk_label_set_justify ( GTK_LABEL (label), GTK_JUSTIFY_LEFT );
gtk_box_pack_start ( GTK_BOX (hbox ), label, FALSE, FALSE, 0 );
- combo = gsb_account_create_combo_list ( G_CALLBACK ( bet_config_change_account ),
+ combo = gsb_account_create_combo_list ( G_CALLBACK ( bet_config_change_account ),
NULL, FALSE );
g_object_set_data ( G_OBJECT ( gsb_gui_on_account_get_notebook ( ) ), "account_combo", combo );
if ( ( account_number = gsb_gui_navigation_get_current_account ( ) ) == -1 )
- gtk_combo_box_set_active ( GTK_COMBO_BOX ( combo ), 0 );
+ gtk_combo_box_set_active ( GTK_COMBO_BOX ( combo ), 0 );
else
gsb_account_set_combo_account_number ( combo, account_number );
gtk_box_pack_start ( GTK_BOX ( hbox ), combo, FALSE, FALSE, 0 );
@@ -352,9 +360,9 @@ GtkWidget *bet_config_account_get_select_account ( gchar *title )
g_object_set_data ( G_OBJECT ( combo ), "bet_use_budget", button );
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 5 );
g_signal_connect ( G_OBJECT ( button ),
- "toggled",
- G_CALLBACK ( bet_config_use_budget_toggle ),
- combo );
+ "toggled",
+ G_CALLBACK ( bet_config_use_budget_toggle ),
+ combo );
return vbox;
}
@@ -1010,8 +1018,8 @@ gboolean bet_config_change_account ( GtkWidget *combo )
GtkWidget *widget = NULL;
gint account_number;
gint bet_use_budget;
- kind_account kind;
GrisbiWindowEtat *etat;
+ bet_type_onglets bet_show_onglets;
devel_debug (NULL);
etat = grisbi_window_get_struct_etat ();
@@ -1045,31 +1053,29 @@ gboolean bet_config_change_account ( GtkWidget *combo )
break;
}
- kind = gsb_data_account_get_kind ( account_number );
- if ( etat->bet_deb_cash_account_option == 1 && kind == GSB_TYPE_CASH )
- kind = GSB_TYPE_BANK;
-
account_page = gsb_gui_on_account_get_notebook ( );
+ bet_show_onglets = gsb_data_account_get_bet_show_onglets ( account_number );
notebook = g_object_get_data ( G_OBJECT ( account_page ), "config_notebook" );
- switch ( kind )
+ switch ( bet_show_onglets )
{
- case GSB_TYPE_BALANCE:
- break;
- case GSB_TYPE_BANK:
+ case BET_ONGLETS_PREV:
gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook ), 0 );
+ bet_config_initialise_select_bank_card ( account_number );
bet_config_initialise_duration_widget ( account_number, account_page );
bet_config_initialise_select_historical_data ( account_number, account_page );
break;
- case GSB_TYPE_CASH:
+ case BET_ONGLETS_HIST:
gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook ), 0 );
+ bet_config_initialise_select_bank_card ( account_number );
bet_config_initialise_select_historical_data ( account_number, account_page );
break;
- case GSB_TYPE_LIABILITIES:
+ case BET_ONGLETS_CAP:
gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook ), 1 );
+ bet_config_initialise_select_bank_card ( account_number );
bet_config_initialise_finance_widget ( account_number, account_page );
break;
- case GSB_TYPE_ASSET:
+ default:
gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook ), 0 );
break;
}
@@ -1146,20 +1152,19 @@ void bet_config_sensitive_account_parameters ( gint account_number, gboolean sen
if ( sensitive )
{
- kind_account kind;
GrisbiWindowEtat *etat;
etat = grisbi_window_get_struct_etat ();
- kind = gsb_data_account_get_kind ( account_number );
- if ( etat->bet_deb_cash_account_option == 1 && kind == GSB_TYPE_CASH )
- kind = GSB_TYPE_BANK;
+ bet_type_onglets bet_show_onglets;
+
+ bet_show_onglets = gsb_data_account_get_bet_show_onglets ( account_number );
- switch ( kind )
+ switch ( bet_show_onglets )
{
- case GSB_TYPE_BALANCE:
- break;
- case GSB_TYPE_BANK:
+ case BET_ONGLETS_PREV:
+ widget = g_object_get_data ( G_OBJECT ( account_page ), "bet_credit_card_hbox" );
+ gtk_widget_show_all ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
gtk_widget_show_all ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
@@ -1167,7 +1172,9 @@ void bet_config_sensitive_account_parameters ( gint account_number, gboolean sen
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
gtk_widget_hide ( widget );
break;
- case GSB_TYPE_CASH:
+ case BET_ONGLETS_HIST:
+ widget = g_object_get_data ( G_OBJECT ( account_page ), "bet_credit_card_hbox" );
+ gtk_widget_show_all ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
@@ -1175,7 +1182,9 @@ void bet_config_sensitive_account_parameters ( gint account_number, gboolean sen
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
gtk_widget_hide ( widget );
break;
- case GSB_TYPE_LIABILITIES:
+ case BET_ONGLETS_CAP:
+ widget = g_object_get_data ( G_OBJECT ( account_page ), "bet_credit_card_hbox" );
+ gtk_widget_show_all ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
@@ -1183,7 +1192,9 @@ void bet_config_sensitive_account_parameters ( gint account_number, gboolean sen
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
gtk_widget_show_all ( widget );
break;
- case GSB_TYPE_ASSET:
+ default:
+ widget = g_object_get_data ( G_OBJECT ( account_page ), "bet_credit_card_hbox" );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
@@ -1195,10 +1206,14 @@ void bet_config_sensitive_account_parameters ( gint account_number, gboolean sen
}
else
{
+ widget = g_object_get_data ( G_OBJECT ( account_page ), "bet_credit_card_hbox" );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
gtk_widget_hide ( widget );
+ widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
+ gtk_widget_hide ( widget );
}
}
@@ -1211,7 +1226,6 @@ void bet_config_sensitive_account_parameters ( gint account_number, gboolean sen
* */
void bet_config_use_budget_toggle ( GtkToggleButton *button, GtkWidget *combo )
{
- GtkWidget *widget;
gint account_number;
account_number = gsb_account_get_combo_account_number ( combo );
@@ -1219,6 +1233,7 @@ void bet_config_use_budget_toggle ( GtkToggleButton *button, GtkWidget *combo )
if ( gtk_toggle_button_get_active ( button ) )
{
gsb_data_account_set_bet_use_budget ( account_number, 1 );
+ gsb_data_account_set_bet_show_onglets ( account_number );
bet_config_change_account ( combo );
gsb_data_account_set_bet_maj ( account_number, BET_MAJ_ALL );
@@ -1230,12 +1245,7 @@ void bet_config_use_budget_toggle ( GtkToggleButton *button, GtkWidget *combo )
account_page = gsb_gui_on_account_get_notebook ( );
bet_data_remove_all_bet_data ( account_number );
gsb_data_account_set_bet_use_budget ( account_number, 0 );
- widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
- gtk_widget_hide ( widget );
- widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
- gtk_widget_hide ( widget );
- widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
- gtk_widget_hide ( widget );
+ bet_config_sensitive_account_parameters ( account_number, FALSE );
}
if ( gsb_gui_navigation_get_current_account ( ) == account_number )
@@ -1543,6 +1553,84 @@ void bet_config_finance_apply_clicked ( GtkButton *button, GtkWidget *parent )
*
*
* */
+static void bet_config_select_bank_card_toggle ( GtkToggleButton *button,
+ GtkWidget *combo )
+{
+ gint account_number;
+
+ account_number = gsb_account_get_combo_account_number ( combo );
+
+ if ( gtk_toggle_button_get_active ( button ) )
+ gsb_data_account_set_bet_credit_card ( account_number, 1 );
+ else
+ gsb_data_account_set_bet_credit_card ( account_number, 0 );
+
+ gsb_data_account_set_bet_show_onglets ( account_number );
+ bet_config_change_account ( combo );
+
+ if ( gsb_gui_navigation_get_current_account ( ) == account_number )
+ bet_data_select_bet_pages ( account_number );
+}
+
+/**
+ * widget qui permet de dire que le compte concerné sert à gérer une carte
+ * bancaire à débit différé.
+ *
+ * \param
+ *
+ * \return hbox
+ * */
+static GtkWidget *bet_config_account_get_select_bank_card ( void )
+{
+ GtkWidget *hbox;
+ GtkWidget *button;
+ GtkWidget *combo;
+
+ /* partie de gestion des comptes cartes avec débit différé */
+ hbox = gtk_hbox_new ( FALSE, 0 );
+
+ button = gtk_check_button_new_with_label ( _("Account with deferred debit card") );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button ), FALSE );
+ g_object_set_data ( G_OBJECT ( gsb_gui_on_account_get_notebook () ), "bet_credit_card_button", button );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
+
+ /* set the signal */
+ combo = g_object_get_data ( G_OBJECT ( gsb_gui_on_account_get_notebook () ), "account_combo" );
+ g_signal_connect ( G_OBJECT ( button ),
+ "toggled",
+ G_CALLBACK ( bet_config_select_bank_card_toggle ),
+ combo );
+
+ /* return */
+ return hbox;
+}
+
+
+/**
+ * initialise l'option credit_card
+ *
+ * \param account_number
+ *
+ * \return
+ * */
+static void bet_config_initialise_select_bank_card ( gint account_number )
+{
+ GtkWidget *button;
+ gint active;
+
+ button = g_object_get_data ( G_OBJECT ( gsb_gui_on_account_get_notebook () ), "bet_credit_card_button" );
+ active = gsb_data_account_get_bet_credit_card ( account_number );
+
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button ), active );
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/bet_data.c b/src/bet_data.c
index f66060a..614ffcb 100644
--- a/src/bet_data.c
+++ b/src/bet_data.c
@@ -38,6 +38,7 @@
#include "gsb_data_budget.h"
#include "gsb_data_category.h"
#include "gsb_data_mix.h"
+#include "gsb_data_partial_balance.h"
#include "gsb_data_scheduled.h"
#include "gsb_data_transaction.h"
#include "gsb_file.h"
@@ -103,31 +104,17 @@ void bet_data_select_bet_pages ( gint account_number )
{
GtkWidget *account_page;
GtkWidget *page;
- kind_account kind;
gint current_page;
- gint bet_use_budget;
- GrisbiWindowEtat *etat;
+ bet_type_onglets bet_show_onglets;
devel_debug_int ( account_number );
-
- etat = grisbi_window_get_struct_etat ();
-
- kind = gsb_data_account_get_kind ( account_number );
-
- account_page = gsb_gui_on_account_get_notebook ( );
+ bet_show_onglets = gsb_data_account_get_bet_show_onglets ( account_number );
+ account_page = gsb_gui_on_account_get_notebook ();
current_page = gtk_notebook_get_current_page ( GTK_NOTEBOOK ( account_page ) );
- bet_use_budget = gsb_data_account_get_bet_use_budget ( account_number );
- if ( bet_use_budget <= 0 )
- kind = GSB_TYPE_ASSET;
- else if ( etat->bet_deb_cash_account_option == 1 && kind == GSB_TYPE_CASH )
- kind = GSB_TYPE_BANK;
-
- switch ( kind )
+ switch ( bet_show_onglets )
{
- case GSB_TYPE_BALANCE:
- break;
- case GSB_TYPE_BANK:
+ case BET_ONGLETS_PREV:
page = gtk_notebook_get_nth_page ( GTK_NOTEBOOK ( account_page ), GSB_ESTIMATE_PAGE );
gtk_widget_show ( page );
page = gtk_notebook_get_nth_page ( GTK_NOTEBOOK ( account_page ), GSB_HISTORICAL_PAGE );
@@ -143,7 +130,7 @@ void bet_data_select_bet_pages ( gint account_number )
if ( current_page == GSB_FINANCE_PAGE )
gtk_notebook_set_current_page ( GTK_NOTEBOOK ( account_page ), GSB_ESTIMATE_PAGE );
break;
- case GSB_TYPE_CASH:
+ case BET_ONGLETS_HIST:
page = gtk_notebook_get_nth_page ( GTK_NOTEBOOK ( account_page ), GSB_ESTIMATE_PAGE );
gtk_widget_hide ( page );
page = gtk_notebook_get_nth_page ( GTK_NOTEBOOK ( account_page ), GSB_HISTORICAL_PAGE );
@@ -155,7 +142,7 @@ void bet_data_select_bet_pages ( gint account_number )
bet_historical_g_signal_block_tree_view ( );
gsb_data_account_set_bet_maj ( account_number, BET_MAJ_HISTORICAL );
break;
- case GSB_TYPE_LIABILITIES:
+ case BET_ONGLETS_CAP:
page = gtk_notebook_get_nth_page ( GTK_NOTEBOOK ( account_page ), GSB_ESTIMATE_PAGE );
gtk_widget_hide ( page );
page = gtk_notebook_get_nth_page ( GTK_NOTEBOOK ( account_page ), GSB_HISTORICAL_PAGE );
@@ -165,7 +152,7 @@ void bet_data_select_bet_pages ( gint account_number )
if ( current_page == GSB_ESTIMATE_PAGE || current_page == GSB_HISTORICAL_PAGE )
gtk_notebook_set_current_page ( GTK_NOTEBOOK ( account_page ), GSB_FINANCE_PAGE );
break;
- case GSB_TYPE_ASSET:
+ default:
if ( current_page < GSB_PROPERTIES_PAGE )
gtk_notebook_set_current_page ( GTK_NOTEBOOK ( account_page ), GSB_TRANSACTIONS_PAGE );
page = gtk_notebook_get_nth_page ( GTK_NOTEBOOK ( account_page ), GSB_ESTIMATE_PAGE );
@@ -922,24 +909,28 @@ GPtrArray *bet_data_get_strings_to_save ( void )
{
struct_transfert_data *transfert = ( struct_transfert_data* ) value;
gchar *date;
+ gchar *date_bascule;
/* set the dates */
- date = gsb_format_gdate_safe ( transfert -> date );
+ date = gsb_format_gdate_safe ( transfert->date );
+ date_bascule = gsb_format_gdate_safe ( transfert->date_bascule );
tmp_str = g_markup_printf_escaped ( "\t<Bet_transfert Nb=\"%d\" Dt=\"%s\" Ac=\"%d\" "
- "Ty=\"%d\" Ra=\"%d\" Rt=\"%d\" Aim=\"%d\" Ca=\"%d\" Sca=\"%d\" "
- "Bu=\"%d\" Sbu=\"%d\" />\n",
- ++index,
- my_safe_null_str ( date ),
- transfert -> account_number,
- transfert -> type,
- transfert -> replace_account,
- transfert -> replace_transaction,
- transfert -> auto_inc_month,
- transfert -> category_number,
- transfert -> sub_category_number,
- transfert -> budgetary_number,
- transfert -> sub_budgetary_number );
+ "Ty=\"%d\" Ra=\"%d\" Rt=\"%d\" Aim=\"%d\" Dd=\"%d\" Dtb=\"%s\" "
+ "Ca=\"%d\" Sca=\"%d\" Bu=\"%d\" Sbu=\"%d\" />\n",
+ ++index,
+ my_safe_null_str ( date ),
+ transfert->account_number,
+ transfert->type,
+ transfert->replace_account,
+ transfert->replace_transaction,
+ transfert->auto_inc_month,
+ transfert->direct_debit,
+ my_safe_null_str ( date_bascule ),
+ transfert->category_number,
+ transfert->sub_category_number,
+ transfert->budgetary_number,
+ transfert->sub_budgetary_number );
g_ptr_array_add ( tab, tmp_str );
@@ -1576,7 +1567,8 @@ struct_transfert_data *struct_initialise_bet_transfert ( void )
transfert = g_malloc0 ( sizeof ( struct_transfert_data ) );
- transfert -> date = NULL;
+ transfert->date = NULL;
+ transfert->date_bascule = NULL;
return transfert;
}
@@ -1590,8 +1582,10 @@ struct_transfert_data *struct_initialise_bet_transfert ( void )
* */
void struct_free_bet_transfert ( struct_transfert_data *transfert )
{
- if ( transfert -> date )
- g_date_free ( transfert -> date );
+ if ( transfert->date )
+ g_date_free ( transfert->date );
+ if ( transfert->date_bascule )
+ g_date_free ( transfert->date_bascule );
g_free ( transfert );
}
@@ -1709,28 +1703,37 @@ gboolean bet_data_transfert_modify_line ( struct_transfert_data *transfert )
/**
+ * update la date de la ligne transfert lorsque la date de bascule est atteinte
*
+ * \param struct transfert contenant les données
*
- *
- *
+ * \return
* */
void bet_data_transfert_update_date_if_necessary ( struct_transfert_data *transfert )
{
- GDate *date_jour_1;
+ GDate *date_jour;
GDate *tmp_date;
- date_jour_1 = gdate_today ( );
- g_date_set_day ( date_jour_1, 1 );
- tmp_date = gsb_date_copy ( transfert -> date );
+ date_jour = gdate_today ( );
- if ( g_date_get_month ( date_jour_1 ) == g_date_get_month ( tmp_date ) )
+ if ( g_date_compare ( date_jour, transfert -> date_bascule ) >= 0 )
{
+ gboolean same_month = FALSE;
+
+ if ( g_date_get_month ( transfert->date ) == g_date_get_month ( transfert->date_bascule ) )
+ same_month = TRUE;
+
+ if ( transfert->direct_debit )
+ bet_array_create_transaction_from_transfert ( transfert, same_month );
+
+ tmp_date = gsb_date_copy ( transfert -> date );
+
g_date_free ( transfert -> date );
g_date_add_months ( tmp_date, 1 );
transfert -> date = tmp_date;
}
- g_date_free ( date_jour_1 );
+ g_date_free ( date_jour );
}
@@ -1901,6 +1904,63 @@ gchar *bet_data_get_str_amount_in_account_currency ( gsb_real amount,
}
+/**
+ *
+ *
+ *
+ *
+ * */
+void bet_data_transfert_create_new_transaction ( struct_transfert_data *transfert )
+{
+ gint transaction_number;
+ gsb_real amount;
+
+ transaction_number = gsb_data_transaction_new_transaction ( transfert->account_number );
+
+ /* set the date */
+ gsb_data_transaction_set_date ( transaction_number, transfert->date );
+
+ /* set the amount */
+ if ( transfert -> type == 0 )
+ {
+ amount = gsb_data_account_get_current_balance ( transfert -> replace_account );
+ }
+ else
+ {
+ amount = gsb_data_partial_balance_get_current_amount ( transfert -> replace_account );
+ }
+ gsb_data_transaction_set_amount ( transaction_number, amount );
+
+ /* set the currency */
+ gsb_data_transaction_set_currency_number ( transaction_number,
+ gsb_data_account_get_currency ( transfert->account_number ) );
+
+ /* set the payement mode */
+ if ( amount.mantissa < 0 )
+ gsb_data_transaction_set_method_of_payment_number ( transaction_number,
+ gsb_data_account_get_default_debit ( transfert->account_number ) );
+ else
+ gsb_data_transaction_set_method_of_payment_number ( transaction_number,
+ gsb_data_account_get_default_credit ( transfert->account_number ) );
+
+ /* set the category sub_category */
+ if ( transfert->category_number )
+ {
+ gsb_data_transaction_set_category_number ( transaction_number, transfert->category_number );
+ if ( transfert -> sub_category_number )
+ gsb_data_transaction_set_sub_category_number ( transaction_number, transfert->sub_category_number );
+ }
+
+ /* set the IB sub_IB */
+ if ( transfert->budgetary_number )
+ {
+ gsb_data_transaction_set_budgetary_number ( transaction_number, transfert->budgetary_number );
+ if ( transfert -> sub_category_number )
+ gsb_data_transaction_set_sub_budgetary_number ( transaction_number, transfert->sub_budgetary_number );
+ }
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/bet_data.h b/src/bet_data.h
index 1b3d9bc..d5616d5 100644
--- a/src/bet_data.h
+++ b/src/bet_data.h
@@ -76,11 +76,13 @@ struct _transfert_data
{
gint number;
gint account_number;
- gint type;
+ gint type; /* 0 = account 1 = partial balance */
gint replace_account; /* Account number or partial balance concerned */
gint replace_transaction;
gint auto_inc_month;
+ gint direct_debit;
GDate *date;
+ GDate *date_bascule;
gint category_number;
gint sub_category_number;
gint budgetary_number;
@@ -178,6 +180,7 @@ gboolean bet_data_set_div_ptr ( gint type_div );
void bet_data_set_maj ( gint account_number, gint type_maj );
void bet_data_synchronise_hist_div_list ( GHashTable *list_div );
gboolean bet_data_transfert_add_line ( struct_transfert_data *transfert );
+void bet_data_transfert_create_new_transaction ( struct_transfert_data *transfert );
GHashTable *bet_data_transfert_get_list ( void );
gboolean bet_data_transfert_modify_line ( struct_transfert_data *transfert );
gboolean bet_data_transfert_remove_line ( gint account_number, gint number );
diff --git a/src/bet_future.c b/src/bet_future.c
index a22b64c..70fdce0 100644
--- a/src/bet_future.c
+++ b/src/bet_future.c
@@ -1752,7 +1752,7 @@ gboolean bet_future_modify_line ( gint account_number,
bet_future_set_form_data_from_line ( account_number, number );
dialog_return:
- result = gtk_dialog_run ( GTK_DIALOG ( bet_futur_dialog ) );
+ result = gtk_dialog_run ( GTK_DIALOG ( bet_futur_dialog ) );
if ( result == GTK_RESPONSE_OK )
{
@@ -1793,6 +1793,126 @@ dialog_return:
/**
+ * retourne une list_store avec la liste des comptes concernés
+ *
+ *
+ *
+ * */
+static GtkListStore *bet_transfert_create_account_list_store ( gint account_number )
+{
+ GtkListStore *list_store;
+ GSList *tmp_list;
+ gint nbre_rows = 0;
+
+ /* create the model */
+ list_store = gtk_list_store_new ( 4,
+ G_TYPE_STRING, /* account name */
+ G_TYPE_STRING, /* account kind : Cash account or Partial balance */
+ G_TYPE_INT, /* account_number or partial_balance_number */
+ G_TYPE_BOOLEAN ); /* FALSE = account, TRUE = partial balance */
+
+ /* populate the model if necessary */
+ tmp_list = gsb_data_account_get_list_accounts ( );
+ while ( tmp_list )
+ {
+ gint tmp_account_number;
+ gint bet_credit_card;
+ GtkTreeIter iter;
+
+ tmp_account_number = gsb_data_account_get_no_account ( tmp_list -> data );
+
+ if ( tmp_account_number != account_number )
+ {
+ bet_credit_card = gsb_data_account_get_bet_credit_card ( tmp_account_number );
+ if ( bet_credit_card )
+ {
+ kind_account kind;
+ gchar *tmp_str = NULL;
+
+ kind = gsb_data_account_get_kind ( tmp_account_number );
+ switch ( kind )
+ {
+ case GSB_TYPE_BANK:
+ tmp_str = g_strdup ( _("Bank account") );
+ break;
+ case GSB_TYPE_CASH:
+ tmp_str = g_strdup ( _("Cash account") );
+ break;
+ case GSB_TYPE_LIABILITIES:
+ tmp_str = g_strdup ( _("Liabilities account") );
+ break;
+ case GSB_TYPE_BALANCE:
+ tmp_str = NULL;
+ break;
+ case GSB_TYPE_ASSET:
+ tmp_str = NULL;
+ break;
+
+ }
+ gtk_list_store_append ( list_store, &iter );
+ gtk_list_store_set ( list_store,
+ &iter,
+ 0, gsb_data_account_get_name ( tmp_account_number ),
+ 1, tmp_str,
+ 2, tmp_account_number,
+ 3, FALSE,
+ -1 );
+ nbre_rows ++;
+ g_free ( tmp_str );
+ }
+ }
+
+ tmp_list = tmp_list -> next;
+ }
+
+ tmp_list = gsb_data_partial_balance_get_list ( );
+ while ( tmp_list )
+ {
+ gint tmp_number;
+ GtkTreeIter iter;
+ const gchar *liste_cptes;
+ gchar **tab;
+ gint bet_credit_card = 0;
+ gint i;
+
+ tmp_number = gsb_data_partial_balance_get_number ( tmp_list -> data );
+
+ liste_cptes = gsb_data_partial_balance_get_liste_cptes ( tmp_number );
+ tab = g_strsplit ( liste_cptes, ";", 0 );
+ for ( i = 0; i < g_strv_length ( tab ); i++ )
+ {
+ gint tmp_account_number;
+
+ tmp_account_number = utils_str_atoi ( tab[i] );
+ bet_credit_card = gsb_data_account_get_bet_credit_card ( tmp_account_number );
+ }
+
+ g_strfreev ( tab );
+
+ if ( bet_credit_card )
+ {
+ gtk_list_store_append ( list_store, &iter );
+ gtk_list_store_set ( list_store,
+ &iter,
+ 0, gsb_data_partial_balance_get_name ( tmp_number ),
+ 1, _("Partial balance"),
+ 2, tmp_number,
+ 3, TRUE,
+ -1 );
+ nbre_rows ++;
+ }
+
+ tmp_list = tmp_list -> next;
+ }
+
+ if ( nbre_rows == 0 )
+ return NULL;
+ else
+ return list_store;
+}
+
+
+/**
*
*
*
@@ -1810,7 +1930,7 @@ gboolean bet_transfert_new_line_dialog ( GtkTreeModel *tab_model,
account_number = gsb_gui_navigation_get_current_account ( );
if ( account_number == -1 )
return FALSE;
-
+
/* Create the dialog */
if ( bet_transfert_dialog == NULL )
{
@@ -1818,6 +1938,15 @@ gboolean bet_transfert_new_line_dialog ( GtkTreeModel *tab_model,
}
else
{
+ GtkWidget *tree_view;
+ GtkListStore *list_store;
+
+ tree_view = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ), "tree_view" );
+ list_store = GTK_LIST_STORE ( gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) ) );
+ gtk_list_store_clear ( GTK_LIST_STORE ( list_store ) );
+ list_store = bet_transfert_create_account_list_store ( account_number );
+ gtk_tree_view_set_model ( GTK_TREE_VIEW ( tree_view ), GTK_TREE_MODEL ( list_store ) );
+
gtk_widget_show ( bet_transfert_dialog );
}
@@ -1899,6 +2028,7 @@ GtkWidget *bet_transfert_create_dialog ( gint account_number )
GtkWidget *vbox;
GtkWidget *paddingbox;
GtkWidget *hbox;
+ GtkWidget *date_bascule;
GtkWidget *date_entry;
GtkWidget *button;
GtkWidget *combo;
@@ -1945,13 +2075,19 @@ GtkWidget *bet_transfert_create_dialog ( gint account_number )
gtk_container_set_resize_mode (GTK_CONTAINER ( sw ), GTK_RESIZE_PARENT );
/* Others data */
- paddingbox = new_paddingbox_with_title (vbox, FALSE,
- _("Effective date and data for the replacement of a planned operation") );
+ paddingbox = new_paddingbox_with_title (vbox, FALSE, _("Account data and actions") );
/* Effective Date */
- hbox = gtk_hbox_new ( FALSE, 0 );
+ hbox = gtk_hbox_new ( FALSE, 5 );
gtk_box_pack_start ( GTK_BOX ( paddingbox ), hbox, FALSE, TRUE, 5 );
+ label = gtk_label_new ( _("Date of change of month: ") );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), label, FALSE, FALSE, 0 );
+
+ date_bascule = gsb_calendar_entry_new ( FALSE );
+ g_object_set_data ( G_OBJECT ( dialog ), "date_bascule", date_bascule );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), date_bascule, FALSE, FALSE, 0 );
+
label = gtk_label_new ( _("Effective date: ") );
gtk_box_pack_start ( GTK_BOX ( hbox ), label, FALSE, FALSE, 0 );
@@ -1962,22 +2098,25 @@ GtkWidget *bet_transfert_create_dialog ( gint account_number )
button = gtk_check_button_new_with_label ( _("Monthly auto-increment") );
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button ), FALSE );
g_object_set_data ( G_OBJECT ( dialog ), "bet_transfert_auto_inc", button );
- gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 5 );
- /* g_signal_connect ( G_OBJECT ( button ),
- "toggled",
- G_CALLBACK ( bet_transfert_auto_inc_toggle ),
- NULL ); */
+ gtk_box_pack_start ( GTK_BOX ( paddingbox ), button, FALSE, FALSE, 5 );
/* check button replace planned line */
- button = gtk_check_button_new_with_label (
- _("Check the box to replace a planned operation") );
+ button = gtk_check_button_new_with_label (
+ _("Replacement of the scheduled operation") );
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button ), FALSE );
g_object_set_data ( G_OBJECT ( dialog ), "bet_transfert_replace_data", button );
gtk_box_pack_start ( GTK_BOX ( paddingbox ), button, FALSE, FALSE, 0 );
g_signal_connect ( G_OBJECT ( button ),
- "toggled",
- G_CALLBACK ( bet_transfert_replace_data_toggle ),
- dialog );
+ "toggled",
+ G_CALLBACK ( bet_transfert_replace_data_toggle ),
+ dialog );
+
+ /* check button replace planned line */
+ button = gtk_check_button_new_with_label (
+ _("Automatic creation of the direct debit transaction") );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button ), FALSE );
+ g_object_set_data ( G_OBJECT ( dialog ), "bet_transfert_direct_debit", button );
+ gtk_box_pack_start ( GTK_BOX ( paddingbox ), button, FALSE, FALSE, 0 );
/* Line replaced */
hbox = gtk_hbox_new ( FALSE, 0 );
@@ -2049,85 +2188,24 @@ GtkWidget *bet_transfert_create_dialog ( gint account_number )
*
*
* */
-GtkWidget *bet_transfert_create_account_list_part ( GtkWidget *dialog, gint account_number )
+GtkWidget *bet_transfert_create_account_list_part ( GtkWidget *dialog,
+ gint account_number )
{
GtkWidget *tree_view;
GtkListStore *list_store;
GtkTreeViewColumn *column;
GtkCellRenderer *cell;
GtkTreeSelection *selection;
- GSList *tmp_list;
- gint nbre_rows = 0;
-
- /* create the model */
- list_store = gtk_list_store_new ( 4,
- G_TYPE_STRING, /* account name */
- G_TYPE_STRING, /* account kind : Cash account or Partial balance */
- G_TYPE_INT, /* account_number or partial_balance_number */
- G_TYPE_BOOLEAN ); /* FALSE = account, TRUE = partial balance */
-
- /* populate the model if necessary */
- tmp_list = gsb_data_account_get_list_accounts ( );
- while ( tmp_list )
- {
- gint tmp_account_number;
- kind_account type_compte;
- GtkTreeIter iter;
- tmp_account_number = gsb_data_account_get_no_account ( tmp_list -> data );
-
- if ( tmp_account_number != account_number )
- {
- type_compte = gsb_data_account_get_kind ( tmp_account_number );
- if ( type_compte == GSB_TYPE_CASH )
- {
- gtk_list_store_append ( list_store, &iter );
- gtk_list_store_set ( list_store,
- &iter,
- 0, gsb_data_account_get_name ( tmp_account_number ),
- 1, _("Cash account"),
- 2, tmp_account_number,
- 3, FALSE,
- -1 );
- nbre_rows ++;
- }
- }
-
- tmp_list = tmp_list -> next;
- }
-
- tmp_list = gsb_data_partial_balance_get_list ( );
- while ( tmp_list )
- {
- gint tmp_number;
- kind_account type_compte;
- GtkTreeIter iter;
-
- tmp_number = gsb_data_partial_balance_get_number ( tmp_list -> data );
- type_compte = gsb_data_partial_balance_get_kind ( tmp_number );
- if ( type_compte == GSB_TYPE_CASH )
- {
- gtk_list_store_append ( list_store, &iter );
- gtk_list_store_set ( list_store,
- &iter,
- 0, gsb_data_partial_balance_get_name ( tmp_number ),
- 1, _("Partial balance"),
- 2, tmp_number,
- 3, TRUE,
- -1 );
- nbre_rows ++;
- }
-
- tmp_list = tmp_list -> next;
- }
-
- if ( nbre_rows == 0 )
+ list_store = bet_transfert_create_account_list_store ( account_number );
+ if ( list_store == NULL )
return NULL;
/* create the treeview */
tree_view = gtk_tree_view_new_with_model ( GTK_TREE_MODEL ( list_store ) );
g_object_unref ( list_store );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
gtk_tree_view_set_rules_hint ( GTK_TREE_VIEW ( tree_view ), TRUE );
gtk_widget_set_size_request ( tree_view, 400, 150 );
g_object_set_data ( G_OBJECT ( dialog ), "tree_view", tree_view );
@@ -2152,9 +2230,9 @@ GtkWidget *bet_transfert_create_account_list_part ( GtkWidget *dialog, gint acco
selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW ( tree_view ) );
g_signal_connect ( G_OBJECT ( selection ),
- "changed",
+ "changed",
G_CALLBACK ( bet_transfert_selection_changed ),
- dialog );
+ dialog );
return tree_view;
}
@@ -2285,6 +2363,16 @@ gboolean bet_transfert_take_data ( struct_transfert_data *transfert, GtkWidget
transfert -> replace_account = replace_account;
transfert -> type = type;
+ widget = g_object_get_data ( G_OBJECT ( dialog ), "date_bascule" );
+ if ( gsb_form_widget_check_empty ( widget ) == FALSE )
+ {
+ transfert -> date_bascule = gsb_calendar_entry_get_date ( widget );
+ if ( transfert -> date_bascule == NULL )
+ return FALSE;
+ }
+ else
+ return FALSE;
+
widget = g_object_get_data ( G_OBJECT ( dialog ), "date_entry" );
if ( gsb_form_widget_check_empty ( widget ) == FALSE )
{
@@ -2324,6 +2412,10 @@ gboolean bet_transfert_take_data ( struct_transfert_data *transfert, GtkWidget
if ( empty )
return FALSE;
}
+
+ widget = g_object_get_data ( G_OBJECT ( dialog ), "bet_transfert_direct_debit" );
+ transfert->direct_debit = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( widget ) );
+
return TRUE;
}
@@ -2379,13 +2471,24 @@ gboolean bet_transfert_modify_line ( gint account_number, gint number )
if ( bet_transfert_dialog == NULL )
bet_transfert_dialog = bet_transfert_create_dialog ( account_number );
else
+ {
+ GtkWidget *tree_view;
+ GtkListStore *list_store;
+
+ tree_view = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ), "tree_view" );
+ list_store = GTK_LIST_STORE ( gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) ) );
+ gtk_list_store_clear ( GTK_LIST_STORE ( list_store ) );
+ list_store = bet_transfert_create_account_list_store ( gsb_gui_navigation_get_current_account () );
+ gtk_tree_view_set_model ( GTK_TREE_VIEW ( tree_view ), GTK_TREE_MODEL ( list_store ) );
+
gtk_widget_show ( bet_transfert_dialog );
+ }
/* init data */
bet_transfert_set_form_data_from_line ( account_number, number );
dialog_return:
- result = gtk_dialog_run ( GTK_DIALOG ( bet_transfert_dialog ) );
+ result = gtk_dialog_run ( GTK_DIALOG ( bet_transfert_dialog ) );
if ( result == GTK_RESPONSE_OK )
{
@@ -2440,6 +2543,40 @@ dialog_return:
/**
+ * sélectionne le compte concerné par la modification du solde.
+ *
+ * \param struct transfert
+ *
+ * \return
+ * */
+static void bet_transfert_select_account_in_treeview ( struct_transfert_data *transfert )
+{
+ GtkWidget *tree_view;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ tree_view = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ), "tree_view" );
+ model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) );
+ gtk_tree_model_get_iter_first ( model, &iter );
+ do
+ {
+ gint tmp_number;
+ gint type_de_compte;
+
+ gtk_tree_model_get ( GTK_TREE_MODEL ( model ), &iter, 2, &tmp_number, 3, &type_de_compte, -1 );
+
+ if ( transfert->type == type_de_compte && tmp_number == transfert->replace_account )
+ {
+ gtk_tree_selection_select_iter ( GTK_TREE_SELECTION (
+ gtk_tree_view_get_selection ( GTK_TREE_VIEW ( tree_view ) ) ), &iter );
+ break;
+ }
+ }
+ while ( gtk_tree_model_iter_next ( GTK_TREE_MODEL ( model ), &iter ) );
+}
+
+
+/**
*
*
*
@@ -2464,6 +2601,12 @@ gboolean bet_transfert_set_form_data_from_line ( gint account_number, gint numbe
if ( transfert == NULL )
return FALSE;
+ bet_transfert_select_account_in_treeview ( transfert );
+
+ widget = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ), "date_bascule" );
+ gsb_calendar_entry_set_date ( widget, transfert -> date_bascule );
+ gsb_form_widget_set_empty ( widget, FALSE );
+
widget = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ), "date_entry" );
gsb_calendar_entry_set_date ( widget, transfert -> date );
gsb_form_widget_set_empty ( widget, FALSE );
@@ -2507,13 +2650,14 @@ gboolean bet_transfert_set_form_data_from_line ( gint account_number, gint numbe
widget = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ),
"bet_transfert_auto_inc" );
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ),
- transfert -> auto_inc_month );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), transfert->auto_inc_month );
widget = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ),
"bet_transfert_replace_data" );
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ),
- transfert -> replace_transaction );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), transfert->replace_transaction );
+
+ widget = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ), "bet_transfert_direct_debit" );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), transfert->direct_debit );
return TRUE;
}
@@ -2525,22 +2669,6 @@ gboolean bet_transfert_set_form_data_from_line ( gint account_number, gint numbe
*
*
* */
-/*void bet_transfert_auto_inc_toggle ( GtkToggleButton *button, gpointer data )
-{
- gint account_number;
-
- account_number = gsb_gui_navigation_ge oggleButton *button, gpointer data ) nt_number, gint numbe ); ; " " ××× " εÏ." °/ïÿ u
D¥+ *D¥+ %,D¥+ (E¥+ °/ïÿ 0JE¥+ $ïÿ p#ïÿ k D¥+ 6 è è! è! @/ïÿ °/ïÿ xÔ'E¥+ %ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ ÀÏE¥+ u
D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ xÔ'E¥+ %ïÿ p$ïÿ k D¥+ à! à! @/ïÿ °/ïÿ HE¥+ &ïÿ D¥+ D¥+ @/ïÿ `D¥+ /ïÿ p/ïÿ h/ïÿ 8+,D¥+ p °/ïÿ u
D¥+ *D¥+ &ïÿ P%ïÿ k D¥+ G H I J K M N O P @/ïÿ °/ïÿ HUÞD¥+ (ïÿ D¥+ D¥+ @/ïÿ 0ÏE¥+ u
D¥+ à'E¥+ »D¥+ ÀE¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ HUÞD¥+ (ïÿ `&ïÿ k D¥+ 8UÞD¥+ (ïÿ &ïÿ k D¥+ (UÞD¥+ (ïÿ À&ïÿ k D¥+ UÞD¥+ (ïÿ ð&ïÿ k D¥+ ¨ÎE¥+ u
D¥+ ¨ÉE¥+ p!ïÿ Ø»D¥+ e D¥+ ØÄE¥+ 'ïÿ yØ»D¥+ e D¥+ ÀE¥+ À'ïÿ ZØ»D¥+ e D¥+ Ø»D¥+ à'E¥+ »D¥+ ÀE¥+ Øä'E¥+ ØÄE¥+ ¨ÉE¥+ *D¥+ 8+,D¥+ MD¥+ °/ïÿ p»D¥+ p)ïÿ @(ïÿ k D¥+ 5 6 7 8 : < = > ? @ B D @/ïÿ °/ïÿ àMD¥+ °/ïÿ u
D¥+ %,D¥+ ð'ïÿ MD¥+ e D¥+ %,D¥+ Õ_ at fÆS Qöl±íÁcSD¥+ °/ïÿ àMD¥+ *ïÿ P)ïÿ k D¥+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv@/ïÿ °/ïÿ HPD¥+ äD¥+ ð0ïÿ ¦ðîE¥+ ¦ðîE¥+ 6D¥+ /ïÿ °0ïÿ h/ïÿ Ð+ïÿ ï'E¥+ u
D¥+ Øä'E¥+ 02ïÿ ¢ðîE¥+ 1ïÿ ,ïÿ ÿÿÿÿÿÿÿÿ¢ðîE¥+ ¸/ïÿ t_current_account ( );
- gsb_data_account_set_bet_maj ( account_number, BET_MAJ_ESTIMATE );
- bet_data_update_bet_module ( account_number, GSB_ESTIMATE_PAGE );
-}*/
-
-
-/**
- *
- *
- *
- *
- * */
void bet_transfert_replace_data_toggle ( GtkToggleButton *button, GtkWidget *dialog )
{
GtkWidget *widget;
@@ -2573,7 +2701,6 @@ void bet_transfert_replace_data_toggle ( GtkToggleButton *button, GtkWidget *dia
*
*
* */
-
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/bet_hist.c b/src/bet_hist.c
index ba7ddc3..975c881 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -853,12 +853,14 @@ void bet_historical_populate_div_model ( gpointer key,
gsb_real retained;
gsb_real amount;
kind_account kind;
+ GrisbiWindowEtat *etat;
+ etat = grisbi_window_get_struct_etat ();
div_number = sh -> div;
div_name = bet_data_get_div_name ( div_number, 0, NULL );
account_nb = sh -> account_nb;
kind = gsb_data_account_get_kind ( account_nb );
- if ( kind == GSB_TYPE_CASH && etat.bet_deb_cash_account_option == 0 )
+ if ( kind == GSB_TYPE_CASH && etat->bet_deb_cash_account_option == 0 )
edited = FALSE;
currency_number = gsb_data_account_get_currency ( account_nb );
diff --git a/src/bet_tab.c b/src/bet_tab.c
index f3c15ed..b3ba69d 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -32,7 +32,6 @@
/*START_INCLUDE*/
#include "bet_tab.h"
#include "bet_config.h"
-#include "bet_data.h"
#include "bet_future.h"
#include "bet_graph.h"
#include "bet_hist.h"
@@ -153,6 +152,7 @@ static gboolean bet_array_update_average_column ( GtkTreeModel *model,
/*START_EXTERN*/
extern GtkWidget *account_page;
+extern gboolean execute_scheduled_of_month;
extern gint mise_a_jour_liste_echeances_auto_accueil;
extern gsb_real null_real;
extern const gdouble prev_month_max;
@@ -1491,7 +1491,7 @@ void bet_array_list_context_menu ( GtkWidget *tree_view,
image = gtk_image_new_from_file ( tmp_str );
g_free ( tmp_str );
menu_item = gtk_image_menu_item_new_with_label (
- _("Insert the balance of a cash account") );
+ _("Insert the balance of a deferred debit account") );
gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM ( menu_item ), image );
g_signal_connect ( G_OBJECT ( menu_item ),
"activate",
@@ -2712,10 +2712,12 @@ gboolean bet_array_refresh_transfert_data ( GtkTreeModel *tab_model,
/**
+ * Remplace l'opération planifiée par la ligne de solde de carte à débit différé
*
+ * \param model du treeview
+ * \param struct transfert contenant les données de remplacement
*
- *
- *
+ * \return FALSE
* */
gboolean bet_array_list_replace_planned_line_by_transfert ( GtkTreeModel *tab_model,
struct_transfert_data *transfert )
@@ -3047,6 +3049,12 @@ void bet_array_export_tab ( GtkWidget *menu_item, GtkTreeView *tree_view )
}
+/**
+ *
+ *
+ *
+ *
+ * */
void bet_array_update_toolbar ( void )
{
GtkWidget *page;
@@ -3067,6 +3075,210 @@ void bet_array_update_toolbar ( void )
gtk_container_add ( GTK_CONTAINER ( bet_array_toolbar ),
bet_array_list_create_toolbar ( page, tree_view ) );
}
+/**
+ * crée une transacction du montant et à la date du transfert en exécutant
+ * éventuellement la transaction planifiée concernée
+ *
+ * \param struct transfert contenant les données
+ *
+ * \return
+ * */
+void bet_array_create_transaction_from_transfert ( struct_transfert_data *transfert,
+ gboolean same_month )
+{
+ GSList *tmp_list;
+ gboolean find = FALSE;
+
+ if ( same_month )
+ {
+ GDate *date_jour;
+ GrisbiAppConf *conf;
+
+ conf = grisbi_app_get_conf ();
+
+ date_jour = gdate_today ();
+
+ if ( conf->execute_scheduled_of_month || g_date_compare ( date_jour, transfert -> date ) >= 0 )
+ {
+ /* on recherche une transaction */
+ tmp_list = gsb_data_transaction_get_transactions_list ( );
+
+ while ( tmp_list )
+ {
+ gint transaction_number;
+ gint div_number = 0;
+ gint sub_div_number = 0;
+ gint account_number;
+ const GDate *date;
+ gsb_real amount;
+
+ transaction_number = gsb_data_transaction_get_transaction_number ( tmp_list->data );
+ tmp_list = tmp_list->next;
+
+ account_number = gsb_data_transaction_get_account_number ( transaction_number );
+ if ( account_number != transfert->account_number )
+ continue;
+
+ date = gsb_data_transaction_get_value_date_or_date ( transaction_number );
+
+ /* ignore transaction which are different date */
+ if ( g_date_compare ( date, transfert->date ) != 0 )
+ continue;
+
+ if ( transfert->category_number )
+ {
+ div_number = gsb_data_transaction_get_category_number ( transaction_number );
+ if ( transfert -> sub_category_number )
+ {
+ sub_div_number = gsb_data_transaction_get_sub_category_number ( transaction_number );
+ }
+ if ( transfert -> category_number == div_number
+ &&
+ transfert -> sub_category_number == sub_div_number )
+ {
+ if ( transfert -> type == 0 )
+ {
+ amount = gsb_data_account_get_current_balance ( transfert -> replace_account );
+ }
+ else
+ {
+ amount = gsb_data_partial_balance_get_current_amount ( transfert -> replace_account );
+ }
+ gsb_data_transaction_set_amount ( transaction_number, amount );
+ find = TRUE;
+ break;
+ }
+ }
+ else if ( transfert->budgetary_number )
+ {
+ div_number = gsb_data_transaction_get_budgetary_number ( transaction_number );
+ if ( transfert -> sub_budgetary_number )
+ {
+ sub_div_number = gsb_data_transaction_get_sub_budgetary_number ( transaction_number );
+ }
+ if ( transfert -> budgetary_number == div_number
+ &&
+ transfert -> sub_budgetary_number == sub_div_number )
+ {
+ if ( transfert -> type == 0 )
+ {
+ amount = gsb_data_account_get_current_balance ( transfert -> replace_account );
+ }
+ else
+ {
+ amount = gsb_data_partial_balance_get_current_amount ( transfert -> replace_account );
+ }
+ gsb_data_transaction_set_amount ( transaction_number, amount );
+ find = TRUE;
+ break;
+ }
+ }
+ }
+ if ( find == FALSE )
+ {
+ bet_data_transfert_create_new_transaction ( transfert );
+ }
+ }
+ g_date_free ( date_jour );
+ }
+ else
+ {
+ /* on recherche une opération planifiée */
+ tmp_list = gsb_data_scheduled_get_scheduled_list ( );
+
+ while (tmp_list)
+ {
+ gint scheduled_number;
+ gint div_number = 0;
+ gint sub_div_number = 0;
+ gint account_number;
+ const GDate *date;
+ gsb_real amount;
+
+ scheduled_number = gsb_data_scheduled_get_scheduled_number ( tmp_list->data );
+ tmp_list = tmp_list->next;
+
+ account_number = gsb_data_scheduled_get_account_number ( scheduled_number );
+ if ( account_number != transfert->account_number )
+ continue;
+
+ date = gsb_data_scheduled_get_date ( scheduled_number );
+
+ /* ignore scheduled which are different date */
+ if ( g_date_compare ( date, transfert->date ) != 0 )
+ continue;
+
+ if ( transfert->category_number )
+ {
+ div_number = gsb_data_scheduled_get_category_number ( scheduled_number );
+ if ( transfert -> sub_category_number )
+ {
+ sub_div_number = gsb_data_scheduled_get_sub_category_number ( scheduled_number );
+ }
+ if ( transfert -> category_number == div_number
+ &&
+ transfert -> sub_category_number == sub_div_number )
+ {
+ if ( transfert -> type == 0 )
+ {
+ amount = gsb_data_account_get_current_balance ( transfert -> replace_account );
+ }
+ else
+ {
+ amount = gsb_data_partial_balance_get_current_amount ( transfert -> replace_account );
+ }
+ gsb_data_scheduled_set_amount ( scheduled_number, amount );
+ find = TRUE;
+ break;
+ }
+ }
+ else if ( transfert->budgetary_number )
+ {
+ div_number = gsb_data_scheduled_get_budgetary_number ( scheduled_number );
+ if ( transfert -> sub_budgetary_number )
+ {
+ sub_div_number = gsb_data_scheduled_get_sub_budgetary_number ( scheduled_number );
+ }
+ if ( transfert -> budgetary_number == div_number
+ &&
+ transfert -> sub_budgetary_number == sub_div_number )
+ {
+ if ( transfert -> type == 0 )
+ {
+ amount = gsb_data_account_get_current_balance ( transfert -> replace_account );
+ }
+ else
+ {
+ amount = gsb_data_partial_balance_get_current_amount ( transfert -> replace_account );
+ }
+ gsb_data_scheduled_set_amount ( scheduled_number, amount );
+ find = TRUE;
+ break;
+ }
+ }
+ if ( find )
+ {
+ GDate *tmp_date;
+
+ tmp_date = gsb_date_copy ( transfert -> date );
+ g_date_add_months ( tmp_date, 1 );
+
+ gsb_data_scheduled_set_date ( scheduled_number, tmp_date );
+
+ g_date_free ( tmp_date );
+ }
+ bet_data_transfert_create_new_transaction ( transfert );
+ }
+ }
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/bet_tab.h b/src/bet_tab.h
index 13805a5..164f859 100644
--- a/src/bet_tab.h
+++ b/src/bet_tab.h
@@ -23,10 +23,13 @@
#include <gtk/gtk.h>
/* START_INCLUDE_H */
+#include "bet_data.h"
/* END_INCLUDE_H */
/* START_DECLARATION */
GtkWidget *bet_array_create_page ( void );
+void bet_array_create_transaction_from_transfert ( struct_transfert_data *transfert,
+ gboolean same_month );
void bet_array_list_add_new_hist_line ( GtkTreeModel *tab_model,
GtkTreeModel *model,
GtkTreeIter *iter,
diff --git a/src/erreur.c b/src/erreur.c
index e874aeb..b393860 100644
--- a/src/erreur.c
+++ b/src/erreur.c
@@ -78,24 +78,54 @@ static FILE *debug_file = NULL;
*/
void traitement_sigsegv ( gint signal_nb )
{
- const gchar *gsb_file_default_dir;
gchar *errmsg = g_strdup ( "" );
gchar *old_errmsg;
- gchar *tmp_str;
- gchar *nom_fichier_comptes;
+ gchar *nom_fichier_comptes = NULL;
+ gchar *long_filename = NULL;
GtkWidget *dialog;
gboolean compress_file = FALSE;
- GrisbiAppConf *conf = NULL;
- GrisbiWindowRun *run = NULL;
+ gboolean is_loading = FALSE;
+ gboolean is_saving = FALSE;
+ GrisbiApp *app = NULL;
#ifdef HAVE_BACKTRACE
- GtkWidget * expander;
+ GtkWidget *expander;
#endif
+devel_debug (NULL);
- nom_fichier_comptes = g_strdup ( grisbi_app_get_active_filename () );
- if ( nom_fichier_comptes )
+ app = grisbi_app_get_default ( TRUE );
+ if ( app )
{
- conf = grisbi_app_get_conf ( );
- grisbi_window_get_struct_run ( NULL );
+ GrisbiWindow *window;
+ const gchar *gsb_file_default_dir;
+
+ window = grisbi_app_get_active_window ( app );
+ if ( window )
+ nom_fichier_comptes = g_strdup ( grisbi_window_get_filename ( window ) );
+ gsb_file_default_dir = gsb_dirs_get_home_dir ( );
+
+ if ( nom_fichier_comptes )
+ {
+ gchar *tmp_str2;
+ gchar *tmp_str;
+ GrisbiAppConf *conf = NULL;
+ GrisbiWindowRun *run = NULL;
+
+ conf = grisbi_app_get_conf ( );
+ grisbi_window_get_struct_run ( NULL );
+
+ compress_file = conf->compress_file;
+ is_loading = run->is_loading;
+ is_saving = run->is_saving;
+
+ /* set # around the filename */
+ tmp_str = g_path_get_basename ( nom_fichier_comptes );
+ tmp_str2 = g_strconcat ( "#", tmp_str, "#", NULL );
+ long_filename = g_build_filename ( gsb_file_default_dir, tmp_str2, NULL );
+ g_free ( tmp_str );
+ g_free ( tmp_str2 );
+ }
+ else
+ long_filename = g_build_filename ( gsb_file_default_dir, "#grisbi_save_no_name.gsb#", NULL );
}
/* il y a 4 possibilités :
@@ -104,25 +134,13 @@ void traitement_sigsegv ( gint signal_nb )
* - Sauvegarde d'un fichier -> on peut rien faire
* - Erreur de mémoire -> tentative de sauver le fichier sous le nom entouré de #
*/
- if ( ( signal_nb == SIGINT || signal_nb == SIGTERM ) && gsb_file_get_modified ( ) )
+ if ( ( signal_nb == SIGINT || signal_nb == SIGTERM ) && gsb_file_get_modified () )
{
gint res;
- gsb_file_default_dir = gsb_dirs_get_home_dir ( );
-
- if ( nom_fichier_comptes )
- {
- /* set # around the filename */
- tmp_str = g_path_get_basename ( nom_fichier_comptes );
- compress_file = conf->compress_file;
- }
- else
- /* no name for the file, create it */
- tmp_str = g_build_filename ( gsb_file_default_dir, "#grisbi_save_no_name.gsb#", NULL );
-
old_errmsg = g_strdup ( _("Request for forced shutdown of Grisbi\n") );
errmsg = g_markup_printf_escaped ( _("The file '%s' has been modified. Do you want to save it?\n"),
- tmp_str );
+ long_filename );
dialog = gtk_message_dialog_new ( GTK_WINDOW ( grisbi_app_get_active_window ( NULL ) ),
GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -140,27 +158,27 @@ void traitement_sigsegv ( gint signal_nb )
if ( res == GTK_RESPONSE_YES )
{
gsb_status_message ( _("Save file") );
- gsb_file_save_save_file ( tmp_str, compress_file, FALSE );
- gsb_status_clear ( );
+ gsb_file_save_save_file ( long_filename, compress_file, FALSE );
+ gsb_status_clear ();
}
gtk_widget_destroy ( dialog );
gsb_file_util_modify_lock ( FALSE );
g_free ( nom_fichier_comptes );
- g_free ( tmp_str );
+ g_free ( long_filename );
exit ( 0 );
}
- else if ( nom_fichier_comptes && ( run->is_loading || run->is_saving || !gsb_file_get_modified ( ) ) )
+ else if ( nom_fichier_comptes && ( is_loading || is_saving || !gsb_file_get_modified ( ) ) )
{
- if ( run->is_loading )
+ if ( is_loading )
{
old_errmsg = errmsg;
errmsg = g_strconcat ( errmsg, _("File is corrupted."), NULL );
g_free ( old_errmsg );
}
- if ( run->is_saving )
+ if ( is_saving )
{
old_errmsg = errmsg;
errmsg = g_strconcat ( errmsg, _("Error occured saving file."), NULL );
@@ -172,32 +190,21 @@ void traitement_sigsegv ( gint signal_nb )
/* c'est un bug pendant le fonctionnement de Grisbi s'il n'y a
pas de nom de fichier, on le crée, sinon on rajoute #
autour */
- gsb_file_default_dir = gsb_dirs_get_home_dir ( );
-
- if ( nom_fichier_comptes )
+ if ( long_filename )
{
- /* set # around the filename */
- tmp_str = g_path_get_basename ( nom_fichier_comptes );
- compress_file = conf->compress_file;
- }
- else
- /* no name for the file, create it */
- tmp_str = g_build_filename ( gsb_file_default_dir, "#grisbi_crash_no_name#", NULL );
-
- gsb_status_message ( _("Save file") );
-
- gsb_file_save_save_file ( tmp_str, compress_file, FALSE );
-
- gsb_status_clear ( );
+ gsb_status_message ( _("Save file") );
+ gsb_file_save_save_file ( long_filename, compress_file, FALSE );
+ gsb_status_clear ( );
- old_errmsg = errmsg;
- errmsg = g_strconcat ( errmsg,
+ old_errmsg = errmsg;
+ errmsg = g_strconcat ( errmsg,
g_strdup_printf ( _("Grisbi made a backup file at '%s'."),
- tmp_str ),
+ long_filename ),
NULL );
- g_free ( old_errmsg );
- g_free ( nom_fichier_comptes );
- g_free ( tmp_str );
+ g_free ( old_errmsg );
+ g_free ( nom_fichier_comptes );
+ g_free ( long_filename );
+ }
}
old_errmsg = errmsg;
@@ -223,6 +230,7 @@ void traitement_sigsegv ( gint signal_nb )
#ifdef HAVE_BACKTRACE
{
+ gchar *tmp_str;
tmp_str = g_strconcat ( "<b>", _("Backtrace"), "</b>", NULL );
expander = gtk_expander_new ( tmp_str );
diff --git a/src/fenetre_principale.c b/src/fenetre_principale.c
index b6a45cd..5a09ce0 100644
--- a/src/fenetre_principale.c
+++ b/src/fenetre_principale.c
@@ -119,7 +119,7 @@ void gsb_gui_new_general_notebook ( void )
{
GrisbiWindow *window;
- window = grisbi_app_get_active_window ( grisbi_app_get_default ( ) );
+ window = grisbi_app_get_active_window ( grisbi_app_get_default ( FALSE ) );
gsb_gui_create_general_notebook ( window );
}
diff --git a/src/grisbi_app.c b/src/grisbi_app.c
index 6a497da..f9b7886 100644
--- a/src/grisbi_app.c
+++ b/src/grisbi_app.c
@@ -307,7 +307,7 @@ static void grisbi_app_window_set_size_and_position ( GrisbiWindow *window )
GrisbiApp *app;
GrisbiAppConf *conf;
- app = grisbi_app_get_default ( );
+ app = grisbi_app_get_default ( FALSE );
conf = app->priv->conf;
/* set the size of the window */
@@ -448,8 +448,8 @@ gboolean grisbi_app_close_file ( void )
devel_debug (NULL);
- app = grisbi_app_get_default ( );
- conf = grisbi_app_get_conf ( );
+ app = grisbi_app_get_default ( FALSE );
+ conf = grisbi_app_get_conf ();
etat = grisbi_window_get_struct_etat ();
/* on récupère la fenetre active */
@@ -459,12 +459,14 @@ gboolean grisbi_app_close_file ( void )
gsb_file_close ();
/* on libère la mémoire utilisée par la fenêtre active */
- grisbi_window_free_priv ( main_window, etat );
- free_variables ();
+ grisbi_window_free_priv_file ( main_window );
+
+ /* initialisation de la structure etat */
+ grisbi_window_init_struct_etat ( main_window );
gtk_widget_hide ( grisbi_window_get_widget_by_name ( "vbox_general" ) );
gtk_widget_hide ( grisbi_window_get_headings_eb ( main_window ) );
- gtk_widget_show ( grisbi_window_get_widget_by_name ( "accueil_page" ) );
+ gtk_widget_show ( grisbi_window_get_accueil_page ( main_window ) );
return TRUE;
}
@@ -482,10 +484,15 @@ const gchar *grisbi_app_get_active_filename ( void )
GrisbiApp *app;
GrisbiWindow *window;
- app = grisbi_app_get_default ( );
- window = grisbi_app_get_active_window ( app );
+ app = grisbi_app_get_default ( TRUE );
+ if ( app )
+ {
+ window = grisbi_app_get_active_window ( app );
- return grisbi_window_get_filename ( window );
+ return grisbi_window_get_filename ( window );
+ }
+ else
+ return NULL;
}
@@ -501,7 +508,7 @@ gboolean grisbi_app_set_active_filename ( const gchar *filename )
GrisbiApp *app;
GrisbiWindow *window;
- app = grisbi_app_get_default ( );
+ app = grisbi_app_get_default ( FALSE );
window = grisbi_app_get_active_window ( app );
grisbi_window_set_filename ( window, filename );
@@ -522,7 +529,7 @@ const gchar *grisbi_app_get_active_file_title ( void )
GrisbiApp *app;
GrisbiWindow *window;
- app = grisbi_app_get_default ( );
+ app = grisbi_app_get_default ( FALSE );
window = grisbi_app_get_active_window ( app );
return grisbi_window_get_file_title ( window );
@@ -541,7 +548,7 @@ gboolean grisbi_app_set_active_file_title ( const gchar *file_title )
GrisbiApp *app;
GrisbiWindow *window;
- app = grisbi_app_get_default ( );
+ app = grisbi_app_get_default ( FALSE );
window = grisbi_app_get_active_window ( app );
grisbi_window_set_file_title ( window, file_title );
@@ -563,7 +570,7 @@ GtkUIManager *grisbi_app_get_active_ui_manager ( void )
GrisbiWindow *window;
GtkUIManager *ui_manager;
- app = grisbi_app_get_default ( );
+ app = grisbi_app_get_default ( FALSE );
window = grisbi_app_get_active_window ( app );
ui_manager = grisbi_window_get_ui_manager ( window );
@@ -584,11 +591,11 @@ GrisbiWindow *grisbi_app_get_active_window ( GrisbiApp *app )
GrisbiApp *tmp_app;
if ( app == NULL )
- tmp_app = grisbi_app_get_default ( );
+ tmp_app = grisbi_app_get_default ( TRUE );
else
tmp_app = app;
- if ( !GRISBI_IS_APP ( tmp_app ) )
+ if ( tmp_app == NULL || !GRISBI_IS_APP ( tmp_app ) )
return NULL;
if ( tmp_app->priv->active_window != 0
@@ -612,8 +619,11 @@ GrisbiAppConf *grisbi_app_get_conf ( void )
{
GrisbiApp *app;
- app = grisbi_app_get_default ( );
- return app->priv->conf;
+ app = grisbi_app_get_default ( TRUE );
+ if ( app )
+ return app->priv->conf;
+ else
+ return NULL;
}
@@ -624,16 +634,17 @@ GrisbiAppConf *grisbi_app_get_conf ( void )
*
* \return the GrisbiApp pointer
*/
-GrisbiApp *grisbi_app_get_default ( void )
+GrisbiApp *grisbi_app_get_default ( gboolean return_null )
{
static GrisbiApp *app = NULL;
if ( app != NULL )
return app;
- app = GRISBI_APP ( g_object_new ( GRISBI_TYPE_APP, NULL ) );
+ if ( return_null )
+ return NULL;
- if ( app == NULL );
+ app = GRISBI_APP ( g_object_new ( GRISBI_TYPE_APP, NULL ) );
g_object_add_weak_pointer ( G_OBJECT ( app ), (gpointer) &app );
g_object_weak_ref ( G_OBJECT ( app ), grisbi_app_weak_notify, NULL );
@@ -672,8 +683,8 @@ gboolean grisbi_app_quit ( void )
devel_debug (NULL);
- app = grisbi_app_get_default ( );
- conf = grisbi_app_get_conf ( );
+ app = grisbi_app_get_default ( FALSE );
+ conf = app->priv->conf;
/* on récupère la fenetre active */
window = grisbi_app_get_active_window ( app );
@@ -690,7 +701,7 @@ gboolean grisbi_app_quit ( void )
gsb_file_config_save_config ( conf );
g_mutex_unlock ( grisbi_app_conf_mutex );
- if ( gsb_file_close ( ) )
+ if ( gsb_file_close () )
gtk_widget_destroy ( GTK_WIDGET ( window ) );
/* clean finish of the debug file */
diff --git a/src/grisbi_app.h b/src/grisbi_app.h
index a091936..ed00f35 100644
--- a/src/grisbi_app.h
+++ b/src/grisbi_app.h
@@ -57,7 +57,7 @@ const gchar *grisbi_app_get_active_file_title ( void );
GtkUIManager *grisbi_app_get_active_ui_manager ( void );
GrisbiWindow *grisbi_app_get_active_window ( GrisbiApp *app );
GrisbiAppConf *grisbi_app_get_conf ( void );
-GrisbiApp *grisbi_app_get_default ( void );
+GrisbiApp *grisbi_app_get_default ( gboolean return_null );
gboolean grisbi_app_get_first_use ( GrisbiApp *app );
const GList *grisbi_app_get_windows ( GrisbiApp *app );
gboolean grisbi_app_quit ( void );
diff --git a/src/grisbi_window.c b/src/grisbi_window.c
index 646d109..ed0d9a0 100644
--- a/src/grisbi_window.c
+++ b/src/grisbi_window.c
@@ -151,10 +151,7 @@ static void grisbi_window_finalize ( GObject *object )
run = window->priv->run;
/* libère la mémoire utilisée par les données de priv */
- grisbi_window_free_priv ( window, etat );
-
- /* libération de la mémoiré utilisée par etat */
- g_free ( etat );
+ grisbi_window_free_priv_file ( window );
/* libération mémoire de la structure run */
g_free ( run->reconcile_final_balance );
@@ -774,16 +771,45 @@ static void grisbi_window_init_etat_mutex ( void )
/**
+ * définit la structure etat
+ *
+ * \param window
+ * \param etat
+ *
+ * \return TRUE if OK or FALSE
+ **/
+static gboolean grisbi_window_set_struct_etat ( GrisbiWindow *window,
+ GrisbiWindowEtat *etat )
+{
+ if ( !GRISBI_IS_WINDOW ( window ) )
+ return FALSE;
+
+ window->priv->etat = etat;
+
+ return TRUE;
+}
+
+
+/**
* Init la structure etat
*
* \param
*
* \return
**/
-static void grisbi_window_init_struct_etat ( GrisbiWindowEtat *etat )
+void grisbi_window_init_struct_etat ( GrisbiWindow *window )
{
+ GrisbiWindowEtat *etat;
+
devel_debug (NULL);
+ /* creation de la structure etat */
+ etat = g_malloc0 ( sizeof ( GrisbiWindowEtat ) );
+ grisbi_window_set_struct_etat ( window, etat );
+
+ /* blocage du mutex */
+ g_mutex_lock ( grisbi_window_etat_mutex );
+
/* init logo */
etat->is_pixmaps_dir = TRUE;
if ( etat->name_logo && strlen ( etat->name_logo ) )
@@ -823,6 +849,43 @@ static void grisbi_window_init_struct_etat ( GrisbiWindowEtat *etat )
/* initializes the variables for the estimate balance module */
etat->bet_deb_period = 1;
+ /* initialisation des autres variables */
+ init_variables ( window->priv->etat, window->priv->run );
+
+ /* libération du mutex */
+ g_mutex_unlock ( grisbi_window_etat_mutex );
+
+}
+
+
+/**
+ * libère la mémoire utilisée par etat
+ *
+ * \param object
+ *
+ * \return
+ **/
+static void grisbi_window_free_struct_etat ( GrisbiWindowEtat *etat )
+{
+
+ devel_debug (NULL);
+
+ g_free ( etat->name_logo );
+ etat->name_logo = NULL;
+
+ g_free ( etat->csv_separator );
+ etat->csv_separator = NULL;
+
+ g_free ( etat->transaction_column_width );
+ etat->transaction_column_width = NULL;
+
+ g_free ( etat->scheduler_column_width );
+ etat->scheduler_column_width = NULL;
+
+ g_free ( etat );
+
+ /* free others variables */
+ free_variables ();
}
@@ -847,11 +910,14 @@ static void grisbi_window_init ( GrisbiWindow *window )
if ( !grisbi_window_initialise_builder ( window ) )
exit ( 1 );
+ /* initialisation du mutex */
+ grisbi_window_init_etat_mutex ();
+
/* creation de la structure run */
window->priv->run = g_malloc0 ( sizeof ( GrisbiWindowRun ) );
- /* initialisation de la variable etat */
- window->priv->etat = g_malloc0 ( sizeof ( GrisbiWindowEtat ) );
+ /* initialisation de la structure etat */
+ grisbi_window_init_struct_etat ( window );
/* Création de la fenêtre principale de Grisbi */
gtk_container_add ( GTK_CONTAINER ( window ), window->priv->main_box );
@@ -877,13 +943,6 @@ static void grisbi_window_init ( GrisbiWindow *window )
if ( conf->load_last_file && conf->nb_derniers_fichiers_ouverts > 0 )
gtk_widget_hide ( window->priv->accueil_page );
- /* initialisation des variables de la fenêtre */
- grisbi_window_init_etat_mutex ();
- g_mutex_lock ( grisbi_window_etat_mutex );
- grisbi_window_init_struct_etat ( window->priv->etat );
- init_variables ( window->priv->etat, window->priv->run );
- g_mutex_unlock ( grisbi_window_etat_mutex );
-
/* set the signals */
g_signal_connect ( G_OBJECT ( window ),
"realize",
@@ -897,6 +956,20 @@ static void grisbi_window_init ( GrisbiWindow *window )
}
/* FONCTIONS PUBLIQUES */
+/* PAGE_ACCUEIL */
+/**
+ * retourne la page d'accueil de grisbi
+ *
+ * \param active window
+ *
+ * \return accueil_page
+ **/
+GtkWidget *grisbi_window_get_accueil_page ( GrisbiWindow *window )
+{
+ return window->priv->accueil_page;
+}
+
+
/* GENERAL_WIDGET */
/**
* Create the main widget that holds all the user interface save the
@@ -907,9 +980,8 @@ static void grisbi_window_init ( GrisbiWindow *window )
GtkWidget *grisbi_window_new_general_widget ( void )
{
GrisbiWindow *window;
-devel_debug (NULL);
- window = grisbi_app_get_active_window ( grisbi_app_get_default ( ) );
+ window = grisbi_app_get_active_window ( grisbi_app_get_default ( FALSE ) );
/* on cache la page d'accueil si elle est visible */
if ( gtk_widget_get_visible ( window->priv->accueil_page ) )
@@ -1127,7 +1199,7 @@ gboolean grisbi_window_set_active_title ( gint account_number )
devel_debug_int ( account_number );
- app = grisbi_app_get_default ( );
+ app = grisbi_app_get_default ( FALSE );
window = grisbi_app_get_active_window ( app );
conf = grisbi_app_get_conf ();
@@ -1282,40 +1354,67 @@ void grisbi_window_headings_update_label_markup ( gchar *label_name,
}
-/* FONCTIONS UTILITAIRES */
+/* STRUCTURE ETAT */
/**
- * retourne le widget nommé
+ * retourne la structure etat
*
- * \param nom du widget recherché
+ * \param
*
- * \return
+ * \return etat
**/
-GtkWidget *grisbi_window_get_widget_by_name ( const gchar *name )
+GrisbiWindowEtat *grisbi_window_get_struct_etat ( void )
{
- GtkWidget *widget;
+ GrisbiApp *app;
+ GrisbiWindow *window;
- widget = GTK_WIDGET ( gtk_builder_get_object ( grisbi_window_builder, name ) );
+ app = grisbi_app_get_default ( TRUE );
+
+ window = grisbi_app_get_active_window ( app );
- return widget;
+ return window->priv->etat;
}
+/* STRUCTURE RUN */
/**
+ * retourne la structure run
*
+ * \param GrisbiWindow
*
- * \param
+ * \return struct GrisbiWindowRun
+ **/
+GrisbiWindowRun *grisbi_window_get_struct_run ( GrisbiWindow *window )
+{
+ if ( window == NULL )
+ {
+ GrisbiApp *app;
+
+ app = grisbi_app_get_default ( TRUE );
+ if ( app )
+ window = grisbi_app_get_active_window ( app );
+ }
+ if ( window )
+ return window->priv->run;
+ else
+ return NULL;
+}
+
+
+/* FONCTIONS UTILITAIRES */
+/**
+ * retourne le widget nommé
+ *
+ * \param nom du widget recherché
*
* \return
**/
-GrisbiWindowEtat *grisbi_window_get_struct_etat ( void )
+GtkWidget *grisbi_window_get_widget_by_name ( const gchar *name )
{
- GrisbiApp *app;
- GrisbiWindow *window;
+ GtkWidget *widget;
- app = grisbi_app_get_default ();
- window = grisbi_app_get_active_window ( app );
+ widget = GTK_WIDGET ( gtk_builder_get_object ( grisbi_window_builder, name ) );
- return window->priv->etat;
+ return widget;
}
@@ -1346,14 +1445,14 @@ void grisbi_window_etat_mutex_unlock ( void )
/**
- * libère la mémoire utilisée par priv
+ * libère la mémoire utilisée par la partie de priv propre a un fichier
*
- * \param object
+ * \param active window
+ * \param struct etat
*
* \return
**/
-void grisbi_window_free_priv ( GrisbiWindow *window,
- GrisbiWindowEtat *etat )
+void grisbi_window_free_priv_file ( GrisbiWindow *window )
{
devel_debug (NULL);
@@ -1369,33 +1468,8 @@ void grisbi_window_free_priv ( GrisbiWindow *window,
window->priv->window_title = NULL;
/* libération de la mémoiré utilisée par etat */
- g_free ( etat->name_logo );
- etat->name_logo = NULL;
-
- g_free ( etat->csv_separator );
- etat->csv_separator = NULL;
-
- g_free ( etat->transaction_column_width );
- etat->transaction_column_width = NULL;
-
- g_free ( etat->scheduler_column_width );
- etat->scheduler_column_width = NULL;
-}
-
-
-/**
- * retourne la structure run
- *
- * \param GrisbiWindow
- *
- * \return struct GrisbiWindowRun
- **/
-GrisbiWindowRun *grisbi_window_get_struct_run ( GrisbiWindow *window )
-{
- if ( window == NULL )
- window = grisbi_app_get_active_window ( grisbi_app_get_default () );
-
- return window->priv->run;
+ grisbi_window_free_struct_etat ( window->priv->etat );
+ window->priv->etat = NULL;
}
diff --git a/src/grisbi_window.h b/src/grisbi_window.h
index 5a9078e..32df459 100644
--- a/src/grisbi_window.h
+++ b/src/grisbi_window.h
@@ -51,8 +51,8 @@ GtkActionGroup *grisbi_window_get_action_group ( GrisbiWindow *window,
const gchar *action_group_name );
void grisbi_window_etat_mutex_lock ( void );
void grisbi_window_etat_mutex_unlock ( void );
-void grisbi_window_free_priv ( GrisbiWindow *window,
- GrisbiWindowEtat *etat );
+void grisbi_window_free_priv_file ( GrisbiWindow *window );
+GtkWidget *grisbi_window_get_accueil_page ( GrisbiWindow *window );
const gchar *grisbi_window_get_filename ( GrisbiWindow *window );
const gchar *grisbi_window_get_file_title ( GrisbiWindow *window );
GtkWidget *grisbi_window_get_headings_eb ( GrisbiWindow *window );
@@ -66,6 +66,7 @@ GtkWidget *grisbi_window_new_general_widget ( void );
void grisbi_window_headings_update_label_markup ( gchar *label_name,
const gchar *text,
gboolean escape_text );
+void grisbi_window_init_struct_etat ( GrisbiWindow *window );
gboolean grisbi_window_set_active_title ( gint account_number );
gboolean grisbi_window_set_filename ( GrisbiWindow *window,
const gchar *filename );
diff --git a/src/gsb_data_account.c b/src/gsb_data_account.c
index 3dce633..a6f112c 100644
--- a/src/gsb_data_account.c
+++ b/src/gsb_data_account.c
@@ -2,7 +2,7 @@
/* */
/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
-/* 2008-2009 Pierre Biava (grisbi at pierre.biava.name) */
+/* 2008-2012 Pierre Biava (grisbi at pierre.biava.name) */
/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
@@ -48,7 +48,6 @@
#include "gsb_select_icon.h"
#include "gsb_transactions_list.h"
#include "navigation.h"
-#include "structures.h"
#include "traitement_variables.h"
#include "utils.h"
#include "utils_dates.h"
@@ -127,6 +126,8 @@ typedef struct
/** @name bet data */
gint bet_use_budget; /* 1 = use the budget module */
+ gint bet_credit_card; /* 1 = compte type CB à débit différé */
+ bet_type_onglets bet_show_onglets; /* enum des onglets à afficher pour le module budgetaire */
GDate *bet_start_date; /* date de début */
gint bet_months; /* nombre de mois ou d'années */
gint bet_spin_range; /* echelle de la période 0 = mois 1 = années */
@@ -3304,6 +3305,8 @@ gboolean gsb_data_account_set_bet_use_budget ( gint account_number, gint value )
return TRUE;
}
+
+
/**
*
*
@@ -3527,6 +3530,179 @@ gint gsb_data_account_get_currency_floating_point ( gint account_number )
/**
+ * retourne l'option carte CB à débit différé.
+ *
+ * \param account_number
+ *
+ * \return -1 pas de CB possible 0 non utilisé 1 utilisé
+ * */
+gint gsb_data_account_get_bet_credit_card ( gint account_number )
+{
+ struct_account *account;
+ kind_account kind;
+
+ account = gsb_data_account_get_structure ( account_number );
+
+ if ( !account )
+ return 0;
+
+ kind = account -> account_kind;
+
+ switch ( kind )
+ {
+ case GSB_TYPE_BANK:
+ case GSB_TYPE_CASH:
+ case GSB_TYPE_LIABILITIES:
+ return account->bet_credit_card;
+ break;
+ case GSB_TYPE_ASSET:
+ return 0;
+ break;
+ default:
+ return 0;
+ break;
+ }
+
+ return -1;
+}
+
+
+/**
+ * positionne l'option bet_credit_card
+ *
+ * \param account_number
+ * \param value
+ *
+ * \ return TRUE if OK
+ * */
+gboolean gsb_data_account_set_bet_credit_card ( gint account_number,
+ gint value )
+{
+ struct_account *account;
+
+ account = gsb_data_account_get_structure ( account_number );
+
+ if ( !account )
+ return FALSE;
+
+ account->bet_credit_card = value;
+
+ return TRUE;
+}
+
+
+/**
+ * retourne le type d'onglet à afficher pour le module budgetaire.
+ *
+ * \param account_number
+ *
+ * \return enum bet_type_onglets
+ * */
+bet_type_onglets gsb_data_account_get_bet_show_onglets ( gint account_number )
+{
+ struct_account *account;
+
+ account = gsb_data_account_get_structure ( account_number );
+
+ if ( !account )
+ return BET_ONGLETS_SANS;
+
+ return account->bet_show_onglets;
+}
+
+
+/**
+ * positionne l'option bet_show_onglets
+ *
+ * \param account_number
+ *
+ * \ return TRUE if OK
+ * */
+gboolean gsb_data_account_set_bet_show_onglets ( gint account_number )
+{
+ struct_account *account;
+ gint bet_use_budget;
+ kind_account kind;
+ GrisbiWindowEtat *etat;
+
+ account = gsb_data_account_get_structure ( account_number );
+
+ if ( !account )
+ return FALSE;
+
+ etat = grisbi_window_get_struct_etat ();
+ bet_use_budget = gsb_data_account_get_bet_use_budget ( account_number );
+
+ if ( bet_use_budget == 0 )
+ {
+ account->bet_show_onglets = BET_ONGLETS_SANS;
+ return TRUE;
+ }
+
+ kind = gsb_data_account_get_kind ( account_number );
+
+ switch ( kind )
+ {
+ case GSB_TYPE_BALANCE:
+ account->bet_show_onglets = BET_ONGLETS_SANS;
+ break;
+ case GSB_TYPE_BANK:
+ account->bet_show_onglets = BET_ONGLETS_PREV;
+ break;
+ case GSB_TYPE_CASH:
+ if ( etat->bet_deb_cash_account_option == 1 )
+ account->bet_show_onglets = BET_ONGLETS_PREV;
+ else
+ account->bet_show_onglets = BET_ONGLETS_HIST;
+ break;
+ case GSB_TYPE_LIABILITIES:
+ if ( account->bet_credit_card )
+ {
+ if ( etat->bet_deb_cash_account_option == 1 )
+ account->bet_show_onglets = BET_ONGLETS_PREV;
+ else
+ account->bet_show_onglets = BET_ONGLETS_HIST;
+ }
+ else
+ account->bet_show_onglets = BET_ONGLETS_CAP;
+ break;
+ case GSB_TYPE_ASSET:
+ account->bet_show_onglets = BET_ONGLETS_SANS;
+ break;
+ }
+
+ return TRUE;
+}
+
+
+/**
+ * positionne l'option bet_show_onglets pour tous les comptes
+ *
+ * \param
+ *
+ * \return FALSE
+ * */
+gboolean gsb_data_account_set_bet_show_onglets_all_accounts ( void )
+{
+ GSList *list_tmp;
+
+ list_tmp = gsb_data_account_get_list_accounts ();
+
+ while ( list_tmp )
+ {
+ gint account_number;
+
+ account_number = gsb_data_account_get_no_account ( list_tmp -> data );
+ gsb_data_account_set_bet_show_onglets ( account_number );
+
+ list_tmp = list_tmp -> next;
+ }
+
+ return FALSE;
+}
+
+
+/**
*
*
*
diff --git a/src/gsb_data_account.h b/src/gsb_data_account.h
index ed3441d..887fbf6 100644
--- a/src/gsb_data_account.h
+++ b/src/gsb_data_account.h
@@ -5,6 +5,7 @@
/* START_INCLUDE_H */
#include "gsb_real.h"
+#include "structures.h"
/* END_INCLUDE_H */
@@ -46,6 +47,7 @@ gchar *gsb_data_account_get_bank_account_key ( gint account_number );
gchar *gsb_data_account_get_bank_account_number ( gint account_number );
gchar *gsb_data_account_get_bank_branch_code ( gint account_number );
gboolean gsb_data_account_get_bet_auto_inc_month ( gint account_number );
+gint gsb_data_account_get_bet_credit_card ( gint account_number );
gdouble gsb_data_account_get_bet_finance_capital ( gint account_number );
gdouble gsb_data_account_get_bet_finance_frais ( gint account_number );
gdouble gsb_data_account_get_bet_finance_taux_annuel ( gint account_number );
@@ -55,6 +57,7 @@ gint gsb_data_account_get_bet_hist_fyear ( gint account_number );
gint gsb_data_account_get_bet_maj ( gint account_number );
gint gsb_data_account_get_bet_months ( gint account_number );
gint gsb_data_account_get_bet_select_label ( gint account_number, gint origine );
+bet_type_onglets gsb_data_account_get_bet_show_onglets ( gint account_number );
gint gsb_data_account_get_bet_spin_range ( gint account_number );
GDate *gsb_data_account_get_bet_start_date ( gint account_number );
gint gsb_data_account_get_bet_use_budget ( gint account_number );
@@ -115,6 +118,8 @@ gboolean gsb_data_account_set_bank_branch_code ( gint account_number,
const gchar *bank_branch_code );
gboolean gsb_data_account_set_bet_auto_inc_month ( gint account_number,
gboolean auto_inc_month );
+gboolean gsb_data_account_set_bet_credit_card ( gint account_number,
+ gint value );
gboolean gsb_data_account_set_bet_finance_capital ( gint account_number, gdouble capital );
gboolean gsb_data_account_set_bet_finance_frais ( gint account_number, gdouble frais );
gboolean gsb_data_account_set_bet_finance_taux_annuel ( gint account_number, gdouble taux_annuel );
@@ -126,6 +131,8 @@ gboolean gsb_data_account_set_bet_months ( gint account_number, gint months );
gboolean gsb_data_account_set_bet_select_label ( gint account_number,
gint origine,
gint type );
+gboolean gsb_data_account_set_bet_show_onglets ( gint account_number );
+gboolean gsb_data_account_set_bet_show_onglets_all_accounts ( void );
gboolean gsb_data_account_set_bet_spin_range ( gint account_number, gint spin_range );
gboolean gsb_data_account_set_bet_start_date ( gint account_number, const GDate *date );
gboolean gsb_data_account_set_bet_use_budget ( gint account_number, gint value );
diff --git a/src/gsb_data_print_config.c b/src/gsb_data_print_config.c
index e2338f7..516c154 100644
--- a/src/gsb_data_print_config.c
+++ b/src/gsb_data_print_config.c
@@ -81,6 +81,8 @@ void gsb_data_print_config_init ( void )
GrisbiAppConf *conf;
conf = grisbi_app_get_conf ( );
+ if ( conf == NULL );
+ return;
/* init transactions list config */
draw_lines = TRUE;
diff --git a/src/gsb_file.c b/src/gsb_file.c
index 33c7573..d22d418 100644
--- a/src/gsb_file.c
+++ b/src/gsb_file.c
@@ -39,7 +39,6 @@
#include "dialog.h"
#include "fenetre_principale.h"
#include "grisbi_prefs.h"
-#include "grisbi_window.h"
#include "gsb_account_property.h"
#include "gsb_assistant_account.h"
#include "gsb_assistant_file.h"
@@ -239,17 +238,20 @@ const gchar *gsb_file_get_last_path ( void )
/**
* get the backup path
*
- * \param
+ * \param conf
*
* \return a const gchar with the backup path
* */
-const gchar *gsb_file_get_backup_path ( void )
+const gchar *gsb_file_get_backup_path ( GrisbiAppConf *conf )
{
- GrisbiAppConf *conf;
+ GrisbiAppConf *tmp_conf;
- conf = grisbi_app_get_conf ();
+ if ( conf == NULL )
+ tmp_conf = grisbi_app_get_conf ();
+ else
+ tmp_conf = conf;
- return conf->backup_path;
+ return tmp_conf->backup_path;
}
@@ -304,7 +306,7 @@ gboolean gsb_file_open_direct_menu ( GtkMenuItem *item,
if ( !gsb_file_close ( ) )
return FALSE;
- app = grisbi_app_get_default ( );
+ app = grisbi_app_get_default ( FALSE );
conf = grisbi_app_get_conf ( );
file_number = GPOINTER_TO_INT ( file_number_ptr );
@@ -389,7 +391,7 @@ gboolean gsb_file_open_file ( gchar *filename )
}
else
{
- if ( gsb_file_get_backup_path ( ) )
+ if ( gsb_file_get_backup_path ( conf ) )
utils_files_display_dialog_error ( GSB_FAILED_LOAD_WITH_BACKUP, filename, NULL );
else
utils_files_display_dialog_error ( GSB_FAILED_LOAD_WITHOUT_BACKUP, filename, NULL );
@@ -615,10 +617,8 @@ gboolean gsb_file_save_backup ( void )
conf = grisbi_app_get_conf ( );
- if (!gsb_file_get_backup_path ()
- ||
- !gsb_file_get_modified ( ) )
- return FALSE;
+ if (!gsb_file_get_backup_path ( conf ) || !gsb_file_get_modified () )
+ return FALSE;
gsb_status_message ( _("Saving backup") );
@@ -641,7 +641,7 @@ gboolean gsb_file_save_backup ( void )
if ( conf->make_bakup_single_file )
{
filename = g_strdup_printf ( "%s%s%s_backup.gsb",
- gsb_file_get_backup_path ( ),
+ gsb_file_get_backup_path ( conf ),
G_DIR_SEPARATOR_S,
name );
}
@@ -650,7 +650,7 @@ gboolean gsb_file_save_backup ( void )
time ( &temps );
day_time = localtime (&temps);
filename = g_strdup_printf ( "%s%s%s_%d%02d%02dT%02d%02d%02d.gsb",
- gsb_file_get_backup_path (),
+ gsb_file_get_backup_path ( conf ),
G_DIR_SEPARATOR_S,
name,
day_time -> tm_year + 1900,
@@ -1295,15 +1295,12 @@ gboolean gsb_file_open_from_commandline ( GSList *file_list )
/**
* get the account files path
*
- * \param
+ * \param conf
*
* \return a const gchar with the backup path
* */
-const gchar *gsb_file_get_account_files_path ( void )
+const gchar *gsb_file_get_account_files_path ( GrisbiAppConf *conf )
{
- GrisbiAppConf *conf;
-
- conf = grisbi_app_get_conf ();
return conf->account_files_path;
}
@@ -1343,15 +1340,12 @@ void gsb_file_set_account_files_path ( const gchar *path,
/**
* get the import files path
*
- * \param
+ * \param conf
*
* \return a const gchar with the backup path
* */
-const gchar *gsb_file_get_import_files_path ( void )
+const gchar *gsb_file_get_import_files_path ( GrisbiAppConf *conf )
{
- GrisbiAppConf *conf;
-
- conf = grisbi_app_get_conf ();
return conf->import_files_path;
}
diff --git a/src/gsb_file.h b/src/gsb_file.h
index f4ea5a6..3889a10 100644
--- a/src/gsb_file.h
+++ b/src/gsb_file.h
@@ -14,9 +14,9 @@ gboolean gsb_file_automatic_backup_change_time ( GtkWidget *spinbutton,
gboolean gsb_file_automatic_backup_start ( GtkWidget *checkbutton,
gpointer null );
gboolean gsb_file_close ( void );
-const gchar *gsb_file_get_account_files_path ( void );
-const gchar *gsb_file_get_backup_path ( void );
-const gchar *gsb_file_get_import_files_path ( void );
+const gchar *gsb_file_get_account_files_path ( GrisbiAppConf *conf );
+const gchar *gsb_file_get_backup_path ( GrisbiAppConf *conf );
+const gchar *gsb_file_get_import_files_path ( GrisbiAppConf *conf );
const gchar *gsb_file_get_last_path ( void );
gboolean gsb_file_new ( void );
gboolean gsb_file_new_finish ( void );
diff --git a/src/gsb_file_config.c b/src/gsb_file_config.c
index ce4424f..68be19a 100644
--- a/src/gsb_file_config.c
+++ b/src/gsb_file_config.c
@@ -499,6 +499,7 @@ gboolean gsb_file_config_save_config ( GrisbiAppConf *conf )
GKeyFile *config;
gchar *file_content;
gchar *name;
+ const gchar *tmp_str;
gsize length;
FILE *conf_file;
gint i;
@@ -575,10 +576,11 @@ gboolean gsb_file_config_save_config ( GrisbiAppConf *conf )
"Can modify R",
conf->r_modifiable );
+ tmp_str = gsb_file_get_last_path ();
g_key_file_set_string ( config,
"General",
"Path",
- gsb_file_get_last_path () );
+ tmp_str );
g_key_file_set_integer ( config,
"General",
@@ -629,10 +631,11 @@ gboolean gsb_file_config_save_config ( GrisbiAppConf *conf )
"Metatree_action_2button_press",
conf->metatree_action_2button_press );
+ tmp_str = gsb_file_get_import_files_path ( conf );
g_key_file_set_string ( config,
"General",
"Import_files_path",
- gsb_file_get_import_files_path () );
+ tmp_str );
/* save backup part */
g_key_file_set_integer ( config,
@@ -660,10 +663,11 @@ gboolean gsb_file_config_save_config ( GrisbiAppConf *conf )
"Make backup nb minutes",
conf->make_backup_nb_minutes );
+ tmp_str = gsb_file_get_backup_path ( conf );
g_key_file_set_string ( config,
"Backup",
"Backup path",
- gsb_file_get_backup_path () );
+ tmp_str );
g_key_file_set_integer ( config,
"Backup",
@@ -705,10 +709,11 @@ gboolean gsb_file_config_save_config ( GrisbiAppConf *conf )
(const gchar **) conf->tab_noms_derniers_fichiers_ouverts,
conf->nb_derniers_fichiers_ouverts);
+ tmp_str = gsb_file_get_account_files_path ( conf );
g_key_file_set_string ( config,
"IO",
"Account_files_path",
- gsb_file_get_account_files_path () );
+ tmp_str );
/* archival part */
g_key_file_set_integer ( config,
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index 96ab33a..3d01e66 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -2,7 +2,7 @@
/* */
/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
/* 2003-2009 Benjamin Drieu (bdrieu at april.org) */
-/* 2008-2010 Pierre Biava (grisbi at pierre.biava.name) */
+/* 2008-2012 Pierre Biava (grisbi at pierre.biava.name) */
/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
@@ -1537,6 +1537,12 @@ void gsb_file_load_account_part ( const gchar **attribute_names,
utils_str_atoi ( attribute_values[i] ) );
}
+ else if ( !strcmp ( attribute_names[i], "Bet_credit_card" ))
+ {
+ gsb_data_account_set_bet_credit_card ( account_number,
+ utils_str_atoi ( attribute_values[i] ) );
+ }
+
else if ( !strcmp ( attribute_names[i], "Bet_start_date" ))
{
gsb_data_account_set_bet_start_date ( account_number,
@@ -4230,6 +4236,20 @@ void gsb_file_load_bet_transfert_part ( const gchar **attribute_names,
continue;
}
+ if ( !strcmp ( attribute_names[i], "Dd" ) )
+ {
+ transfert->direct_debit = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Dtb" ) )
+ {
+ transfert->date_bascule = gsb_parse_date_string_safe ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
if ( !strcmp ( attribute_names[i], "Ca" ) )
{
transfert -> category_number = utils_str_atoi ( attribute_values[i] );
@@ -8867,6 +8887,10 @@ gboolean gsb_file_load_update_previous_version ( void )
"but remember it's an archive before modifying some transactions "
"or important information."),
_("Grisbi archive opened"));
+
+ /* positionnement de l'option bet_show_onglets pour tous les comptes */
+ gsb_data_account_set_bet_show_onglets_all_accounts ();
+
return TRUE;
}
diff --git a/src/gsb_file_save.c b/src/gsb_file_save.c
index 214220c..f9764b2 100644
--- a/src/gsb_file_save.c
+++ b/src/gsb_file_save.c
@@ -1156,15 +1156,32 @@ gulong gsb_file_save_account_part ( gulong iterator,
gsb_data_account_get_bet_use_budget ( account_number ) );
if ( gsb_data_account_get_bet_use_budget ( account_number ) > 0 )
- switch ( kind )
{
- case GSB_TYPE_LIABILITIES:
- bet_str = g_markup_printf_escaped ( "\t\tBet_start_date=\"%s\"\n"
+ bet_type_onglets bet_show_onglets;
+
+ bet_show_onglets = gsb_data_account_get_bet_show_onglets ( account_number );
+
+ switch ( bet_show_onglets )
+ {
+ case BET_ONGLETS_HIST:
+ bet_str = g_markup_printf_escaped ( "\t\tBet_credit_card=\"%d\"\n"
+ "\t\tBet_SD=\"%d\"\n"
+ "\t\tBet_Fi=\"%d\" />\n",
+ gsb_data_account_get_bet_credit_card ( account_number ),
+ gsb_data_account_get_bet_hist_data ( account_number ),
+ gsb_data_account_get_bet_hist_fyear ( account_number ) );
+ new_string = g_strconcat ( new_string, "\n", bet_str, NULL );
+ g_free ( bet_str );
+ break;
+ case BET_ONGLETS_CAP:
+ bet_str = g_markup_printf_escaped ( "\t\tBet_credit_card=\"%d\"\n"
+ "\t\tBet_start_date=\"%s\"\n"
"\t\tBet_months=\"%d\"\n"
"\t\tBet_capital=\"%s\"\n"
"\t\tBet_taux_annuel=\"%s\"\n"
"\t\tBet_frais=\"%s\"\n"
"\t\tBet_type_taux=\"%d\" />\n",
+ gsb_data_account_get_bet_credit_card ( account_number ),
my_safe_null_str ( gsb_format_gdate_safe (
gsb_data_account_get_bet_start_date ( account_number ) ) ),
gsb_data_account_get_bet_months ( account_number ),
@@ -1179,19 +1196,22 @@ gulong gsb_file_save_account_part ( gulong iterator,
new_string = g_strconcat ( new_string, "\n", bet_str, NULL );
g_free ( bet_str );
break;
- case GSB_TYPE_ASSET:
+ case BET_ONGLETS_ASSET:
+ case BET_ONGLETS_SANS:
new_string = g_strconcat ( new_string, " />\n", NULL );
break;
default:
- bet_str = g_markup_printf_escaped ( "\t\tBet_start_date=\"%s\"\n"
+ bet_str = g_markup_printf_escaped ( "\t\tBet_credit_card=\"%d\"\n"
+ "\t\tBet_start_date=\"%s\"\n"
"\t\tBet_months=\"%d\"\n"
"\t\tBet_UT=\"%d\"\n"
"\t\tBet_auto_inc_month=\"%d\"\n"
- "\t\tBet_select_transaction_label=\"%d\"\n"
- "\t\tBet_select_scheduled_label=\"%d\"\n"
+ "\t\tBet_select_transaction_label=\"%d\"\n"
+ "\t\tBet_select_scheduled_label=\"%d\"\n"
"\t\tBet_select_futur_label=\"%d\"\n"
- "\t\tBet_SD=\"%d\"\n"
+ "\t\tBet_SD=\"%d\"\n"
"\t\tBet_Fi=\"%d\" />\n",
+ gsb_data_account_get_bet_credit_card ( account_number ),
my_safe_null_str ( gsb_format_gdate_safe (
gsb_data_account_get_bet_start_date ( account_number ) ) ),
gsb_data_account_get_bet_months ( account_number ),
@@ -1205,6 +1225,7 @@ gulong gsb_file_save_account_part ( gulong iterator,
new_string = g_strconcat ( new_string, "\n", bet_str, NULL );
g_free ( bet_str );
break;
+ }
}
else
new_string = g_strconcat ( new_string, " />\n", NULL );
diff --git a/src/gsb_regex.c b/src/gsb_regex.c
index 72fe084..8d90978 100644
--- a/src/gsb_regex.c
+++ b/src/gsb_regex.c
@@ -131,6 +131,7 @@ void gsb_regex_destroy ( void )
{
if ( regex_store )
g_hash_table_destroy ( regex_store );
+ regex_store = NULL;
}
diff --git a/src/gsb_status.c b/src/gsb_status.c
index 3db738d..552985d 100644
--- a/src/gsb_status.c
+++ b/src/gsb_status.c
@@ -59,7 +59,10 @@ void gsb_status_message ( gchar *message )
GrisbiApp *app;
GrisbiWindow *window;
- app = grisbi_app_get_default ( );
+ app = grisbi_app_get_default ( TRUE );
+ if ( app == NULL )
+ return;
+
window = grisbi_app_get_active_window ( app );
gsb_status_clear ();
@@ -79,7 +82,10 @@ void gsb_status_clear ( )
GrisbiApp *app;
GrisbiWindow *window;
- app = grisbi_app_get_default ( );
+ app = grisbi_app_get_default ( TRUE );
+ if ( app == NULL )
+ return;
+
window = grisbi_app_get_active_window ( app );
grisbi_window_statusbar_remove ( window );
diff --git a/src/main.c b/src/main.c
index 1909330..95f4ba1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -275,7 +275,7 @@ gint main ( int argc, char **argv )
gsb_main_trappe_signal_sigsegv ();
/* création de l'application */
- app = grisbi_app_get_default ();
+ app = grisbi_app_get_default ( FALSE );
/* create the toplevel window and the main menu */
window = grisbi_app_create_window ( app, NULL );
diff --git a/src/navigation.c b/src/navigation.c
index a62570a..7d7353d 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -1932,6 +1932,9 @@ void gsb_gui_navigation_clear_pages_list ( void )
*/
void gsb_gui_navigation_free_pages_list ( void )
{
+ if ( pages_list == NULL )
+ return;
+
g_queue_foreach ( pages_list, (GFunc) g_free, NULL );
g_queue_free ( pages_list );
}
diff --git a/src/structures.h b/src/structures.h
index 35c2ff4..62df337 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -23,6 +23,8 @@ typedef struct gsb_conf_t GrisbiAppConf;
typedef struct gsb_etat_t GrisbiWindowEtat;
typedef struct gsb_run_t GrisbiWindowRun;
+typedef enum _bet_type_onglets bet_type_onglets;
+
/** structure etat
* variables contenant juste 0 ou 1
@@ -314,4 +316,15 @@ typedef enum GSB_FILE_ERROR
GSB_FAILED_LOAD_WITHOUT_BACKUP = 1 << 9
} GsbFileErrorType;
+
+/* définition du type d'onglets du module budgétaire affiché */
+enum _bet_type_onglets
+{
+ BET_ONGLETS_SANS = 0,
+ BET_ONGLETS_PREV,
+ BET_ONGLETS_HIST,
+ BET_ONGLETS_ASSET,
+ BET_ONGLETS_CAP,
+};
+
#endif
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index 4a93724..6a0998b 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -91,7 +91,6 @@ static void initialise_number_separators ( void );
static void initialise_tab_affichage_ope ( void );
/*END_STATIC*/
-gchar *titre_fichier = NULL;
gchar *adresse_commune = NULL;
gchar *adresse_secondaire = NULL;
@@ -205,11 +204,6 @@ void init_variables ( GrisbiWindowEtat *etat,
no_devise_totaux_categ = 1;
no_devise_totaux_ib = 1;
- /* initialization of titles and logo part */
- if ( titre_fichier && strlen ( titre_fichier ) )
- g_free ( titre_fichier );
- titre_fichier = g_strdup( _("My accounts") );
-
gsb_select_icon_init_logo_variables ();
/* reconcile (etat) */
diff --git a/src/utils_files.c b/src/utils_files.c
index 7b02db3..47d8dd3 100644
--- a/src/utils_files.c
+++ b/src/utils_files.c
@@ -813,7 +813,7 @@ devel_debug_int (error_type);
"Please contact the Grisbi's team on devel at listes.grisbi.org "
"to find what happened to you current file."),
filename,
- gsb_file_get_backup_path () );
+ gsb_file_get_backup_path ( NULL ) );
tmp_str2 = g_strdup ( _("Error loading file.") );
break;
@@ -824,7 +824,7 @@ devel_debug_int (error_type);
"Please contact the Grisbi's team on devel at listes.grisbi.org "
"to find what happened to you current file."),
filename,
- gsb_file_get_backup_path () );
+ gsb_file_get_backup_path ( NULL ) );
tmp_str2 = g_strdup ( _("Error loading file.") );
break;
hooks/post-receive
--
grisbi
More information about the cvs
mailing list