[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_4-69-gab11f17
Pierre Biava
nobody at users.sourceforge.net
Mon Nov 1 11:30:18 CET 2010
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, master has been updated
via ab11f1783381a0f6460510dd71b8078859899916 (commit)
via 366f781ac64b7721d8fc3c3a8951546ef3930178 (commit)
via e277b95252ed445b172bb749f5b8a535cbcfedd9 (commit)
via 807ff92e157ec58ffde22d3b50755a740642f839 (commit)
via c5dbb7253ec210373dc5be402e4f3711d029e45a (commit)
via 02523182bb2ad7342e471e9e88dcac604511d6a2 (commit)
via 36f93e552a5e3c3683f3e086366cd17cdf1db1f3 (commit)
via 2de79f2341d27cfa274814f628b6c220c195d745 (commit)
via e0609eeadcf9fac8f95a34414fa8e093ca5aabc0 (commit)
via 6a6d9918b09a6f908a9cfcf8955698c50a43d17b (commit)
via 6f94b8fd9f02e8a2ff0e169ad21e93d566630b12 (commit)
via 28b26d44fedbd8bfe8bcef9ed98a1de2952aa9b6 (commit)
via b09bbb3f3a911aeb37ab15cd3868a56461fab4f7 (commit)
from 775b78982c0362af8fc0912f436868669f5bbbce (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 ab11f1783381a0f6460510dd71b8078859899916
Merge: 366f781ac64b7721d8fc3c3a8951546ef3930178 775b78982c0362af8fc0912f436868669f5bbbce
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Nov 1 11:28:14 2010 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 366f781ac64b7721d8fc3c3a8951546ef3930178
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Nov 1 11:09:38 2010 +0100
update strings
commit e277b95252ed445b172bb749f5b8a535cbcfedd9
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Nov 1 11:07:56 2010 +0100
new unstable version 0.7.91
commit 807ff92e157ec58ffde22d3b50755a740642f839
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Nov 1 10:53:05 2010 +0100
fixes a bug in update of a financial year for an existing transaction
commit c5dbb7253ec210373dc5be402e4f3711d029e45a
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Oct 27 20:59:19 2010 +0200
update string
-----------------------------------------------------------------------
Changes:
diff --git a/configure.in b/configure.in
index 718f981..ec0a6e4 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
m4_define(grisbi_major_version, 0)
m4_define(grisbi_minor_version, 7)
-m4_define(grisbi_micro_version, 90)
+m4_define(grisbi_micro_version, 91)
m4_define(grisbi_version, grisbi_major_version.grisbi_minor_version.grisbi_micro_version)
AC_INIT([grisbi],[grisbi_version],[http://grisbi.tuxfamily.org/mantis/login_select_proj_page.php?ref=bug_report_page.php],[grisbi],[http://www.grisbi.org/index.fr.html])
diff --git a/grisbi.spec b/grisbi.spec
index b9a5d17..73cd1ed 100644
--- a/grisbi.spec
+++ b/grisbi.spec
@@ -1,5 +1,5 @@
%define name grisbi
-%define version 0.7.90
+%define version 0.7.91
%define release %mkrel 1
%define _disable_ld_no_undefined 1
diff --git a/po/cs.po b/po/cs.po
index 9b5b5f6..2d446b6 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\n"
"PO-Revision-Date: 2010-04-27 00:47+0100\n"
"Last-Translator: Markus7cz <markus7cz at gmail.com>\n"
"Language-Team: \n"
@@ -581,7 +581,7 @@ msgstr "VýchozÃ"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -591,7 +591,7 @@ msgstr "Kategorie"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -616,12 +616,12 @@ msgstr ""
"Výchozà ÅazenÃ, pokud jsou neprázdná data: poznámky, plátce/pÅÃjemce, "
"kategorie a rozpoÄet."
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
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:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1137,15 +1137,11 @@ msgstr "Hotovostnà úÄet"
msgid "Type"
msgstr "Typ"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
msgid "Select"
msgstr "Vybrat"
-#: ../src/bet_hist.c:547
-msgid "Period"
-msgstr "ObdobÃ"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1154,11 +1150,16 @@ msgstr "ObdobÃ"
msgid "Amount"
msgstr "Äástka"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr "PrůmÄr"
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "Aktuálnà rok"
+
+#: ../src/bet_hist.c:600
msgid "Amount retained"
msgstr "Zadržená Äástka"
@@ -1167,21 +1168,21 @@ msgstr "Zadržená Äá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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr "pohyblivých 12 mÄsÃců"
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
msgid "Assign the amount of the last operation"
msgstr "PÅiÅadit Äástku podle poslednà transakce"
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr "KopÃrovat průmÄrnou Äástku"
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "ProsÃm vyberte zdroj dat pro úÄet: \"%s\""
@@ -2149,7 +2150,7 @@ msgstr "Celkový souÄet"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "RozdÄlenà transakce"
@@ -4576,7 +4577,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr "Grisbi zaarchivuje transakce podle zvolené sestavy."
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Sestava"
@@ -7468,7 +7469,7 @@ msgstr ""
"zrušit tuto akci a uložit jej pod jiným jménem, nebo v Možnostech aktivovat "
"volbu \"%s\"."
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "nepojmenovaný"
@@ -7508,11 +7509,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr "Pojmenujte soubor úÄtů"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr "Odstranit kopii souboru z pÅedchozà verze Grisbi."
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7766,7 +7767,7 @@ msgid "Transfer : Deleted account"
msgstr "PÅevod : OdstranÄný úÄet"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr "PÅevod : "
@@ -7802,25 +7803,25 @@ msgstr "VýbÄr hotovosti"
msgid "No payee selected for this report."
msgstr "Pro tuto sestavu nebyly vybrány žádnà plátci/pÅÃjemci."
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "MusÃte zadat datum."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, c-format
msgid "Invalid date %s"
msgstr "Neplatné datum %s"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, c-format
msgid "Invalid value date %s"
msgstr "Neplatné datum pohybu %s"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
msgid "You must enter an amount."
msgstr "MusÃte zadat datum."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
@@ -7828,26 +7829,26 @@ msgstr ""
"Nemůžete nastavit rozdÄlenà transakce do kategorià pro detail rozdÄlené "
"transakce."
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Transakci plánovaného pÅevodu nelze pÅiÅadit smazaný úÄet."
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "PÅipojený úÄet pro tento pÅevod nenà zadaný, nebo je neplatný."
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "Nelze pÅevést na ten samý úÄet"
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "Nelze pÅevádÄt na uzavÅený úÄet."
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7857,7 +7858,7 @@ msgstr ""
"ale neobsahuje žádné ÄÃslo.\n"
"PÅesto pokraÄovat?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7865,27 +7866,27 @@ msgstr ""
"Pozor: toto ÄÃslo Å¡eku již bylo použito.\n"
"PÅesto pokraÄovat?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
msgid "A transaction with a multiple payee must be a new one."
msgstr "Transakce s vÃce plátci/pÅÃjemci musà být nová."
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "Transakce s vÃce plátci/pÅÃjemci nemůže být detailem jiné transakce."
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr "Slovo \"Report\" je vyhrazené. ProsÃm použijte jiné."
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
msgid "Invalid multiple payee."
msgstr "Neplatných vÃce plátců/pÅÃjemců."
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
msgid "Modifying a transaction"
msgstr "Ãprava transakce"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7899,7 +7900,7 @@ msgstr ""
"Jste si jist(a)?"
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr "Nastavit formuláÅ"
@@ -10964,6 +10965,9 @@ msgstr ""
msgid "Personnal finances manager"
msgstr "Osobnà správce financà pro každého\n"
+#~ msgid "Period"
+#~ msgstr "ObdobÃ"
+
#, fuzzy
#~ msgid "%s, %2f : %s - %s:%d:%s - %"
#~ msgstr "%s : %s - %s:%d:%s - %s\n"
diff --git a/po/da.po b/po/da.po
index 85fe76b..d49c244 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\n"
"PO-Revision-Date: 2006-03-25 13:23+0100\n"
"Last-Translator: Dmitri Popov <dmpop at openoffice.org>\n"
"Language-Team: \n"
@@ -617,7 +617,7 @@ msgstr ""
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -627,7 +627,7 @@ msgstr "Kategorier"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -651,13 +651,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, 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:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1177,17 +1177,12 @@ msgstr "Kontanter"
msgid "Type"
msgstr ""
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
#, fuzzy
msgid "Select"
msgstr "Dato"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "Papir"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1196,11 +1191,16 @@ msgstr "Papir"
msgid "Amount"
msgstr "Beløb"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "Valuta"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "Kontonavn"
@@ -1210,22 +1210,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "Opret en planlagt transaktion"
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "Lukkede planlagte transaktioner"
@@ -2175,7 +2175,7 @@ msgstr ""
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr ""
@@ -4540,7 +4540,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Rapport"
@@ -7304,7 +7304,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "unavngivet"
@@ -7342,11 +7342,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr ""
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7566,7 +7566,7 @@ msgid "Transfer : Deleted account"
msgstr "Slet konto"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr "Overførsel"
@@ -7603,85 +7603,85 @@ msgstr ""
msgid "No payee selected for this report."
msgstr ""
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr ""
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "Forkert dato"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "Forkert dato"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "Fly transaktioner til kategori"
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr ""
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr ""
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr ""
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
"Continue anyway?"
msgstr ""
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
msgstr ""
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
msgid "Invalid multiple payee."
msgstr ""
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
#, fuzzy
msgid "Modifying a transaction"
msgstr "Vis transaktioner"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7691,7 +7691,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -10679,6 +10679,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "Papir"
+
+#, fuzzy
#~ msgid "_Open"
#~ msgstr "Ã
bn"
diff --git a/po/de.po b/po/de.po
index 76d0706..7aeaeeb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\n"
"PO-Revision-Date: 2010-05-16 14:55+0200\n"
"Last-Translator: Martin Stromberger <mstromberger at aon.at>\n"
"Language-Team: deutsch <de at li.org>\n"
@@ -585,7 +585,7 @@ msgstr "Voreinstellung"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -595,7 +595,7 @@ msgstr "Kategorien"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -620,12 +620,12 @@ msgstr ""
"Standardsortierung wenn Daten vorhanden sind: Notizen, Empfänger, Kategorie "
"und Budgeteintrag."
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
msgid "Choose the financial year or 12 months rolling"
msgstr "Geschäftsjahr oder Zeitraum von 12 Monaten"
#. name of the div sous-div column
-#: ../src/bet_config.c:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1134,15 +1134,11 @@ msgstr "Bargeldkonto"
msgid "Type"
msgstr "Art"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
msgid "Select"
msgstr "Auswählen"
-#: ../src/bet_hist.c:547
-msgid "Period"
-msgstr "Zeitspanne"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1151,11 +1147,16 @@ msgstr "Zeitspanne"
msgid "Amount"
msgstr "Betrag"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr "Durchschnitt"
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "aktuelles Jahr"
+
+#: ../src/bet_hist.c:600
msgid "Amount retained"
msgstr "einbehaltener Betrag"
@@ -1164,21 +1165,21 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr "Zeitraum von 12 Monaten"
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
msgid "Assign the amount of the last operation"
msgstr "Den Betrag von der letzten Aktion zuordnen"
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr "Den durchschnittlichen Betrag kopieren"
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "Eine Datenquelle für das Konto: \"%s\" auswählen"
@@ -2150,7 +2151,7 @@ msgstr "Gesamtsumme"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "Buchung splitten"
@@ -4595,7 +4596,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr "Es werden alle Buchungen aus einem gewählten Bericht archiviert."
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Bericht"
@@ -7532,7 +7533,7 @@ msgstr ""
"speichern wollen, müssen Sie den Vorgang abbrechen und die Datei unter einem "
"anderen Namen speichern oder die Option \"%s\" in den Einstellungen setzen."
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "Unbenannt"
@@ -7571,11 +7572,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr "Datei speichern - Grisbi"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr "Die Kopie einer älteren Grisbi-Datei löschen"
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7838,7 +7839,7 @@ msgid "Transfer : Deleted account"
msgstr "Buchung: gelöschtes Konto"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr "Umbuchung : "
@@ -7874,25 +7875,25 @@ msgstr "Barzahlung"
msgid "No payee selected for this report."
msgstr "Für den Bericht wurden keine Empfänger ausgewählt."
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "Sie müssen ein Datum eingeben."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, c-format
msgid "Invalid date %s"
msgstr "Ungültiges Datum %s"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, c-format
msgid "Invalid value date %s"
msgstr "Ungültiges Betragsdatum %s"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
msgid "You must enter an amount."
msgstr "Sie müssen einen Betrag eingeben"
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
@@ -7900,12 +7901,12 @@ msgstr ""
"Für eine Element einer Splitt-Buchung kann keine weitere Splitt-Buchung "
"erstellt werden."
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Das Konto für die zeitlich geplante Umbuchung ist gelöscht."
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
@@ -7913,15 +7914,15 @@ msgstr ""
"Das zugeordnete Konto für diese Umbuchung ist nicht mehr vorhanden oder "
"geschlossen."
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "Eine Umbuchung auf das gleiche Konto ist nicht möglich."
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "Eine Umbuchung auf ein geschlossenes Konto ist nicht möglich."
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7932,7 +7933,7 @@ msgstr ""
"jedoch sind keine Nummern vorhanden.\n"
"Soll der Vorgang fortgesetzt werden?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7940,29 +7941,29 @@ msgstr ""
"Achtung: Diese Schecknummer wird bereit benützt.\n"
"Soll der Vorgang fortgesetzt werden?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
"Für Buchungen an mehrere Empfänger muss eine neue Buchung erfasst werden."
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"Eine Buchung an mehrere Empfänger darf kein Teil einer Splitt-Buchung sein."
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr "Das Wort \"Report\" ist reserviert, bitte ein anderes Wort verwenden."
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
msgid "Invalid multiple payee."
msgstr "Ungültige Gruppe von Empfängern."
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
msgid "Modifying a transaction"
msgstr "Eine Buchung bearbeiten"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7975,7 +7976,7 @@ msgstr ""
"Soll der Vorgang fortgesetzt werden?"
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr "Buchungsformular Einstellungen"
@@ -11195,6 +11196,9 @@ msgstr ""
msgid "Personnal finances manager"
msgstr "Finanzprogramm für Privatpersonen"
+#~ msgid "Period"
+#~ msgstr "Zeitspanne"
+
#, fuzzy
#~ msgid "%s, %2f : %s - %s:%d:%s - %"
#~ msgstr "%s : %s - %s:%d:%s - %s\n"
diff --git a/po/el.po b/po/el.po
index 6acca2c..11fb01e 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\n"
"PO-Revision-Date: 2009-04-13 14:53+0200\n"
"Last-Translator: \n"
"Language-Team: KASKAS <ttnfy17 at yahoo.gr>\n"
@@ -619,7 +619,7 @@ msgstr "ΠίÏÏ ÏÏην ÏÏοεÏιλογή"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -629,7 +629,7 @@ msgstr "ÎαÏηγοÏίεÏ"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -653,13 +653,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "ÎÏιλÎξÏε Ïο Î¿Î¹ÎºÎ¿Î½Î¿Î¼Î¹ÎºÏ ÎÏοÏ"
#. name of the div sous-div column
-#: ../src/bet_config.c:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1178,16 +1178,11 @@ msgstr "ÎογαÏιαÏμÏÏ Î¼ÎµÏÏηÏÏν"
msgid "Type"
msgstr "ΤÏÏοÏ"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
msgid "Select"
msgstr "ÎÏιλÎξÏε"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "Î ÎÏο"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1196,11 +1191,16 @@ msgstr "Î ÎÏο"
msgid "Amount"
msgstr "ΠοÏÏ"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr "ÎÎÏÎ¿Ï ÏÏοÏ"
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "ΤÏÎÏον ÎÏοÏ"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "Îνομα λογαÏιαÏμοÏ"
@@ -1210,22 +1210,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "ÎναÏÏÏÎÏÏε Ïο ÏοÏÏ ÏÏν ειÏαγÏμενÏν ÏÏ
ναλλαγÏν"
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "ΠαÏÎ±ÎºÎ±Î»Ï ÎµÏιλÎξÏε ÏÎ¹Ï ÏÏ
ναλλαγÎÏ ÏοÏ
ÏÏ
γÏÏνεÏονÏαι"
@@ -2215,7 +2215,7 @@ msgstr "ÎÎµÎ½Î¹ÎºÏ ÏÏνολο"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "ÎιάÏÏαÏη ÏÎ·Ï ÏÏ
ναλλαγήÏ"
@@ -4678,7 +4678,7 @@ msgstr ""
"Το Grisbi θα αÏÏειοθεÏήÏει ÏÎ¹Ï ÏÏ
ναλλαγÎÏ ÏοÏ
εÏιλÎγονÏαι αÏÏ Î¼Î¹Î± ÎκθεÏη."
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "ÎναÏοÏά"
@@ -7668,7 +7668,7 @@ msgstr ""
"ÏÏÎÏει να Ïο ακÏ
ÏÏÏεÏε και Ïο ÏÏζεÏε με Îνα άλλο Ïνομα ή ενεÏγοÏοιείÏε Ïην "
"εÏιλογή \"%s\" ÏÏην οÏγάνÏÏη."
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "αÏÏοÏδιÏÏιÏÏοÏ"
@@ -7707,11 +7707,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr "ÎνομάÏÏε Ïο αÏÏείο λογαÏιαÏμÏν"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, fuzzy, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7970,7 +7970,7 @@ msgid "Transfer : Deleted account"
msgstr "ÎεÏαÏοÏά: ÎιαγÏαμμÎÎ½Î¿Ï Î»Î¿Î³Î±ÏιαÏμÏÏ"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr "ÎεÏαÏοÏά : "
@@ -8006,26 +8006,26 @@ msgstr "ÎÏÏÏÏ
ÏÏη μεÏÏηÏÏν"
msgid "No payee selected for this report."
msgstr "Îεν εÏιλÎÏÏηκε κανÎÎ½Î±Ï Î´Î¹ÎºÎ±Î¹Î¿ÏÏÎ¿Ï ÏληÏÏÎ¼Î®Ï Ïε αÏ
Ïήν Ïην ÎκθεÏη."
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "Î ÏÎÏει να ειÏαγάγεÏε μια ημεÏομηνία."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, c-format
msgid "Invalid date %s"
msgstr "ÎκÏ
Ïη ημεÏομηνία %s"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, c-format
msgid "Invalid value date %s"
msgstr "ÎκÏ
Ïη ÏοκοÏÏÏÎ¿Ï Î·Î¼ÎµÏομηνία %s"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "Î ÏÎÏει να ειÏαγάγεÏε μια ημεÏομηνία."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
@@ -8033,14 +8033,14 @@ msgstr ""
"Îεν μÏοÏείÏε να θÎÏεÏε Ïη διάÏÏαÏη ÏÎ·Ï ÏÏ
Î½Î±Î»Î»Î±Î³Î®Ï ÏÏην καÏηγοÏία για μια "
"αÏÏγονο Î¼Î¹Î±Ï Î´Î¹Î¬ÏÏαÏÎ·Ï ÏÎ·Ï ÏÏ
ναλλαγήÏ."
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
"ÎδÏναÏη η ÏÏνδεÏη Î¼Î¹Î±Ï Î¼ÎµÏαÏοÏÎ¬Ï Ïε Îναν διαγÏαμμÎνο λογαÏιαÏÎ¼Ï Ïε μια "
"ÏÏεδιαÏμÎνη ÏÏ
ναλλαγή."
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
@@ -8048,15 +8048,15 @@ msgstr ""
"Îεν Ï
ÏάÏÏει κανÎÎ½Î±Ï ÏÏεÏικÏÏ Î»Î¿Î³Î±ÏιαÏμÏÏ Î³Î¹Î± αÏ
Ïήν Ïην μεÏαÏοÏά ή ο ÏÏεÏικÏÏ "
"λογαÏιαÏμÏÏ ÎµÎ¯Î½Î±Î¹ άκÏ
ÏοÏ."
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "ÎδÏναÏη η εκÏοή ÏÎ·Ï Î¼ÎµÏαÏοÏÎ¬Ï ÏÏον λογαÏιαÏμÏ"
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "ÎδÏναÏη η εκÏοή ÏÎ·Ï Î¼ÎµÏαÏοÏÎ¬Ï Ïε Îναν κλειÏÏÏ Î»Î¿Î³Î±ÏιαÏμÏ"
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -8066,7 +8066,7 @@ msgstr ""
"αλλά δεν ÏεÏιÎÏει οÏοιοδήÏοÏε αÏιθμÏ.\n"
"Îα ÏÏ
νεÏίÏεÏε ÏαÏÏλα αÏ
Ïά;"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -8074,31 +8074,31 @@ msgstr ""
"Î ÏοειδοÏοίηÏη: αÏ
ÏÏÏ Î¿ αÏιθμÏÏ ÎµÏιÏαγÏν ÏÏηÏιμοÏοιείÏαι ήδη.\n"
"θα ÏÏ
νεÏίÏεÏε ÏαÏÏλα αÏ
Ïά;"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
"Îια ÏÏ
ναλλαγή με Îναν ÏολλαÏλάÏιο δικαιοÏÏο ÏληÏÏÎ¼Î®Ï ÏÏÎÏει να είναι νÎα."
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"Îια ÏÏ
ναλλαγή με Îναν ÏολλαÏλάÏιο δικαιοÏÏο ÏληÏÏÎ¼Î®Ï Î´ÎµÎ½ μÏοÏεί να είναι "
"διαÏÏαÏμÎÎ½Î¿Ï Î±ÏÏγονοÏ."
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
"ΠλÎξη \"ÎκθεÏη \" είναι διαÏηÏημÎνη. ΠαÏÎ±ÎºÎ±Î»Ï ÏÏηÏιμοÏοιήÏÏε μια άλλη."
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
msgid "Invalid multiple payee."
msgstr "ÎκÏ
ÏÎ¿Ï ÏολλαÏλάÏÎ¹Î¿Ï Î´Î¹ÎºÎ±Î¹Î¿ÏÏÎ¿Ï ÏληÏÏμήÏ."
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
msgid "Modifying a transaction"
msgstr "ΤÏοÏοÏοίηÏη Î¼Î¹Î±Ï ÏÏ
ναλλαγήÏ"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -8113,7 +8113,7 @@ msgstr ""
"ÎίÏÏε βÎβαιοι;"
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr "ÎιαμοÏÏÏÏÏε Ïη μοÏÏή"
@@ -11246,6 +11246,10 @@ msgid "Personnal finances manager"
msgstr "Î ÏοÏÏÏικÏÏ Î´Î¹ÎµÏ
θÏ
νÏÎ®Ï ÏÏημαÏοδÏÏηÏÎ·Ï Î³Î¹Î± Ïον καθÎναν\n"
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "Î ÎÏο"
+
+#, fuzzy
#~ msgid "%s, %2f : %s - %s:%d:%s - %"
#~ msgstr "%s : %s - %s:%d:%s - %s\n"
diff --git a/po/eo.po b/po/eo.po
index 56bc113..6562d71 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\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"
@@ -569,7 +569,7 @@ msgstr ""
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -579,7 +579,7 @@ msgstr ""
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -602,12 +602,12 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
msgid "Choose the financial year or 12 months rolling"
msgstr ""
#. name of the div sous-div column
-#: ../src/bet_config.c:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1096,15 +1096,11 @@ msgstr ""
msgid "Type"
msgstr ""
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
msgid "Select"
msgstr ""
-#: ../src/bet_hist.c:547
-msgid "Period"
-msgstr ""
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1113,11 +1109,15 @@ msgstr ""
msgid "Amount"
msgstr ""
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+msgid "Current fyear"
+msgstr ""
+
+#: ../src/bet_hist.c:600
msgid "Amount retained"
msgstr ""
@@ -1126,21 +1126,21 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
msgid "Assign the amount of the last operation"
msgstr ""
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr ""
@@ -2043,7 +2043,7 @@ msgstr ""
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr ""
@@ -4321,7 +4321,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr ""
@@ -7011,7 +7011,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr ""
@@ -7049,11 +7049,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr ""
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7268,7 +7268,7 @@ msgid "Transfer : Deleted account"
msgstr ""
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr ""
@@ -7304,83 +7304,83 @@ msgstr ""
msgid "No payee selected for this report."
msgstr ""
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr ""
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, c-format
msgid "Invalid date %s"
msgstr ""
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, c-format
msgid "Invalid value date %s"
msgstr ""
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
msgid "You must enter an amount."
msgstr ""
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr ""
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr ""
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr ""
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
"Continue anyway?"
msgstr ""
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
msgstr ""
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
msgid "Invalid multiple payee."
msgstr ""
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
msgid "Modifying a transaction"
msgstr ""
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7390,7 +7390,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 949e97b..6e3b1b4 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\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"
@@ -586,7 +586,7 @@ msgstr "Por defecto"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -596,7 +596,7 @@ msgstr "CategorÃas"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -621,12 +621,12 @@ msgstr ""
"Orden por defecto si los datos no son cero: notas, tercero, categorÃa y "
"lÃnea presupuestaria."
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
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:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1141,15 +1141,11 @@ msgstr "Cuenta de caja"
msgid "Type"
msgstr "Tipo"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
msgid "Select"
msgstr "Seleccionar"
-#: ../src/bet_hist.c:547
-msgid "Period"
-msgstr "Periodo"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1158,11 +1154,16 @@ msgstr "Periodo"
msgid "Amount"
msgstr "Cantidad"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr "Promedio"
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "Año actual"
+
+#: ../src/bet_hist.c:600
msgid "Amount retained"
msgstr "Cantidad retenida"
@@ -1171,21 +1172,21 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr "12 meses naturales"
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
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:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr "Copiar la cantidad promedio"
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "Por favor, elija la fuente de datos para la cuenta: \"%s\""
@@ -2164,7 +2165,7 @@ msgstr "Total general"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "Anotación en la transacción"
@@ -4609,7 +4610,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr "Grisbi archivará todas las transacciones seleccionadas por un informe."
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Informe"
@@ -7547,7 +7548,7 @@ msgstr ""
"debe cancelar y guardarlo con otro nombre o activar la opción \"%s\" en la "
"configuración."
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "Sin nombre"
@@ -7585,11 +7586,11 @@ msgstr "Si cierra sin guardar, todos los cambios desde %s se perderán."
msgid "Name the accounts file"
msgstr "Nombre de los ficheros de cuentas"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr "Borrar una copia del fichero de la versión antigua de Grisbi"
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7844,7 +7845,7 @@ msgid "Transfer : Deleted account"
msgstr "Transferencia: Cuenta borrada"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr "Transferencia : "
@@ -7880,25 +7881,25 @@ msgstr "Retirada de efectivo"
msgid "No payee selected for this report."
msgstr "No hay terceros seleccionados para este informe."
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "Debe introducir una fecha."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, c-format
msgid "Invalid date %s"
msgstr "Fecha no válida %s"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, c-format
msgid "Invalid value date %s"
msgstr "Fecha no válida %s"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
msgid "You must enter an amount."
msgstr "Debe introducir una cantidad."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
@@ -7906,14 +7907,14 @@ msgstr ""
"No puede poner una anotación de transacción en la categorÃa para un hijo de "
"una anotación de transacción."
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
"No se puede asociar una transferencia a una cuenta borrada en una "
"transacción programada."
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
@@ -7921,15 +7922,15 @@ msgstr ""
"No hay una cuenta asociada para esta transferencia o la cuenta asociada no "
"es válida."
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "No puede emitir una transferencia hacia su propia cuenta"
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "No puedo realizar una transferencia sobre una cuenta cerrada."
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7939,7 +7940,7 @@ msgstr ""
"pero no contiene ningún número.\n"
"¿Continuar de todas formas?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7947,28 +7948,28 @@ msgstr ""
"Aviso: Este número de cheque ya está usado.\n"
"¿Continuar de todas formas?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
msgid "A transaction with a multiple payee must be a new one."
msgstr "Una transacción con múltiples terceros debe ser nueva."
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"Una transacción con múltiples terceros no puede ser el hijo de un desglose."
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr "La palabra \"Informe\" está reservada. Por favor, use otra."
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
msgid "Invalid multiple payee."
msgstr "Múltiples terceros no válidos."
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
msgid "Modifying a transaction"
msgstr "Modificando una transacción"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7982,7 +7983,7 @@ msgstr ""
"¿ Está seguro ?"
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr "Configurar el formulario"
@@ -11158,6 +11159,9 @@ msgstr ""
msgid "Personnal finances manager"
msgstr "Gestor de finanzas personal para todo el mundo\n"
+#~ msgid "Period"
+#~ msgstr "Periodo"
+
#, fuzzy
#~ msgid "%s, %2f : %s - %s:%d:%s - %"
#~ msgstr "%s : %s - %s:%d:%s - %s\n"
diff --git a/po/fa.po b/po/fa.po
index e2ff589..73c4fa4 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\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"
@@ -603,7 +603,7 @@ msgstr "ÙÛØ´ Ùرض"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -613,7 +613,7 @@ msgstr ""
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -637,12 +637,12 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
msgid "Choose the financial year or 12 months rolling"
msgstr ""
#. name of the div sous-div column
-#: ../src/bet_config.c:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1156,17 +1156,12 @@ msgstr ""
msgid "Type"
msgstr ""
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
#, fuzzy
msgid "Select"
msgstr "ØØ°Ù"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "کاغذ"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1175,11 +1170,16 @@ msgstr "کاغذ"
msgid "Amount"
msgstr "Ù
Ùدار"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "سا٠جارÛ"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "Øساب Ùا"
@@ -1189,21 +1189,21 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
msgid "Assign the amount of the last operation"
msgstr ""
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
@@ -2124,7 +2124,7 @@ msgstr ""
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr ""
@@ -4451,7 +4451,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "گزارش"
@@ -7199,7 +7199,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "Ø¨Û ÙاÙ
"
@@ -7237,11 +7237,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr ""
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7459,7 +7459,7 @@ msgid "Transfer : Deleted account"
msgstr "Øساب Øذ٠شدÙ"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr ""
@@ -7495,85 +7495,85 @@ msgstr ""
msgid "No payee selected for this report."
msgstr ""
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "باÛد تارÛØ® را Ùارد Ú©ÙÛد."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "ÙاÙ
ÙاÛÙ Ù
عتبر ÙÛست \"%s\"!"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "ÙاÙ
ÙاÛÙ Ù
عتبر ÙÛست \"%s\"!"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "باÛد تارÛØ® را Ùارد Ú©ÙÛد."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr ""
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr ""
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr ""
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
"Continue anyway?"
msgstr ""
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
msgstr ""
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
msgid "Invalid multiple payee."
msgstr ""
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
#, fuzzy
msgid "Modifying a transaction"
msgstr "Øذ٠تراکÙØ´"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7583,7 +7583,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -10470,6 +10470,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "کاغذ"
+
+#, fuzzy
#~ msgid "Print amortization table"
#~ msgstr "پرÛÙت در ÙاÛÙ"
diff --git a/po/fr.po b/po/fr.po
index 807875a..82a8ba1 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\n"
"PO-Revision-Date: 2010-05-02 23:26+0200\n"
"Last-Translator: Pierre Biava <pierre at pierre.biava.name>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
@@ -587,7 +587,7 @@ msgstr "Par défaut"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -597,7 +597,7 @@ msgstr "Catégories"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -622,12 +622,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:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
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:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1126,15 +1126,11 @@ msgstr "Compte de caisse"
msgid "Type"
msgstr "Type"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
msgid "Select"
msgstr "Sélectionner"
-#: ../src/bet_hist.c:547
-msgid "Period"
-msgstr "Période utilisée"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1143,11 +1139,15 @@ msgstr "Période utilisée"
msgid "Amount"
msgstr "Montant"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr "Moyenne"
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+msgid "Current fyear"
+msgstr "Année en cours"
+
+#: ../src/bet_hist.c:600
msgid "Amount retained"
msgstr "Montant retenu"
@@ -1156,21 +1156,21 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr "12 mois glissants"
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
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:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr "Copier la valeur moyenne"
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "Sélectionnez la source des données pour le compte : %s"
@@ -2140,7 +2140,7 @@ msgstr "Total général"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "Opération ventilée"
@@ -4589,7 +4589,7 @@ msgstr ""
"Grisbi archivera toutes les transactions appartenant à l'état sélectionné"
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Ãtat"
@@ -7515,7 +7515,7 @@ msgstr ""
"l'enregistrer, vous devez annuler et le sauvegarder sous un autre nom ou "
"alors activer l'option « %s » dans les préférences."
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "sans nom"
@@ -7555,11 +7555,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr "Création d'un nom de fichier de comptes"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr "Supprimer la copie du fichier de la version précédente de grisbi"
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7823,7 +7823,7 @@ msgid "Transfer : Deleted account"
msgstr "Virement : Compte supprimé"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr "Virement : "
@@ -7859,25 +7859,25 @@ msgstr "Liquide"
msgid "No payee selected for this report."
msgstr "Cet état ne comporte pas de tiers sélectionnés."
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "Une date est obligatoire."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, c-format
msgid "Invalid date %s"
msgstr "Date invalide %s"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, c-format
msgid "Invalid value date %s"
msgstr "La date est invalide %s"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
msgid "You must enter an amount."
msgstr "Un montant est obligatoire."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
@@ -7885,28 +7885,28 @@ msgstr ""
"Vous ne pouvez pas choisir la catégorie « opération ventilée » pour une "
"opération fille"
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
"Vous ne pouvez pas associer un virement pour un compte supprimé dans une "
"opération programmée."
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "Il n'y a pas de compte associé à ce virement où il est invalide"
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "Impossible d'effectuer un virement sur son propre compte"
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "Impossible d'effectuer un virement sur un compte clos"
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7916,7 +7916,7 @@ msgstr ""
"aucun numéro.\n"
"Souhaitez-vous continuer ?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7924,30 +7924,30 @@ msgstr ""
"Attention, le numéro du chèque est déjà utilisé.\n"
"Souhaitez-vous continuer ?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
"Une opération dont le tiers est un état doit forcément être une nouvelle "
"opération."
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"Une opération dont le tiers est un état ne peut pas être une sous-opération."
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr "Le mot « Ãtat » est réservé. Veuillez en utiliser un autre."
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
msgid "Invalid multiple payee."
msgstr "Nom de tiers déjà utilisé."
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
msgid "Modifying a transaction"
msgstr "Modifier une opération"
-#: ../src/gsb_form.c:3199
+ : ../src/gsb_form.c:3199 tion" é." é. Veuillez en utiliser un autre." on." erderán." θÎναν\n" μια άλλη." αι " Ï " sbi.org/index.fr.html]) ÐÔÛ³ÿ à èã{+ Èéã{+ è ä{+ $ øå{+ ÐÔÛ³ÿ 'å{+ àÉÛ³ÿ °ÈÛ³ÿ »èã{+ è è! è! `ÔÛ³ÿ ÐÔÛ³ÿ x´å{+ àÊÛ³ÿ íèã{+ Öèã{+ `ÔÛ³ÿ °èã{+ ÔÛ³ÿ À¯hå{+ à èã{+ hå{+ ؤhå{+ ¨©hå{+ Èéã{+ x´å{+ àÊÛ³ÿ °ÉÛ³ÿ »èã{+ `ÔÛ³ÿ ÐÔÛ³ÿ È}ää{+ ÀËÛ³ÿ íèã{+ Öèã{+ `ÔÛ³ÿ °èã{+ ÔÛ³ÿ ÔÛ³ÿ ÔÛ³ÿ ä{+ : ÐÔÛ³ÿ à èã{+ Èéã{+ ÀËÛ³ÿ ÊÛ³ÿ »èã{+ H I J K M N O P `ÔÛ³ÿ ÐÔÛ³ÿ H5»ä{+ `ÍÛ³ÿ íèã{+ 85»ä{+ Öèã{+ `ÔÛ³ÿ 0¯hå{+ à èã{+ Àå{+ iä{+ hå{+ ؤhå{+ ¨©hå{+ Èéã{+
H5»ä{+ `ÍÛ³ÿ ËÛ³ÿ »èã{+ 85»ä{+ `ÍÛ³ÿ ÐËÛ³ÿ »èã{+ (5»ä{+ `ÍÛ³ÿ ÌÛ³ÿ »èã{+ 5»ä{+ `ÍÛ³ÿ 0ÌÛ³ÿ »èã{+ ¨®hå{+ à èã{+ ¨©hå{+ °ÆÛ³ÿ ¸ä{+ ¶èã{+ ÿ ؤhå{+ ÐÌÛ³ÿ y¸ä{+ ¶èã{+ hå{+ ÍÛ³ÿ Z¸ä{+ ¶èã{+ Ødä{+ Àå{+ iä{+ hå{+ ØÄå{+ ؤhå{+ ¨©hå{+ Èéã{+ àä{+ ÎÛ³ÿ PÍÛ³ÿ »èã{+ ) * - . 0 3 5 6 7 8 : < = `ÔÛ³ÿ ÐÔÛ³ÿ pëbä{+ ÏÛ³ÿ íèã{+ S T 8Ïå{+ à èã{+ ØÄå{+ Éå{+ Èéã{+ c f Õ_ at fÆS -/ä{+ ÐÔÛ³ÿ pëbä{+ ÏÛ³ÿ pÎÛ³ÿ »èã{+ øÒ êÓïs¨Ó,~9×u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv`ÔÛ³ÿ ÐÔÛ³ÿ H-ä{+ ÐÑÛ³ÿ ÐÔÛ³ÿ à èã{+ è ä{+ 0ÍÛ³ÿ -/ä{+ ¶èã{+ è ä{+ `ÔÛ³ÿ ÔÛ³ÿ õ¬ ä
{+ ÐÔÛ³ÿ H-ä{+ ÐÑÛ³ÿ ÏÛ³ÿ »èã{+ 8-ä{+ #: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7962,7 +7962,7 @@ msgstr ""
"Etes vous certain ?"
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr "Configurer le formulaire"
@@ -9983,7 +9983,7 @@ msgstr "Fichier de configuration"
#: ../src/parametres.c:943
msgid "Use the config file of version stable as model"
-msgstr "Utiliser le fichier de configuration de la version stable comme model"
+msgstr "Utiliser le fichier de configuration de la version stable comme modèle"
#: ../src/parametres.c:1033
#, c-format
@@ -10035,7 +10035,7 @@ msgstr ""
#: ../src/parametres.c:1181
msgid "Sort option for transactions"
-msgstr "Option de tri pour les opérations"
+msgstr "Options de tri pour les opérations"
#: ../src/parametres.c:1182
msgid "by number"
@@ -11139,6 +11139,9 @@ msgstr " : "
msgid "Personnal finances manager"
msgstr "Gestionnaire de finances personnelles"
+#~ msgid "Period"
+#~ msgstr "Période utilisée"
+
#~ msgid "%s, %2f : %s - %s:%d:%s - %ld E %d\n"
#~ msgstr "%s, %2f : %s - %s:%d:%s - %ld E %d\n"
diff --git a/po/he.po b/po/he.po
index 4de820b..7167180 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\n"
"PO-Revision-Date: 2006-02-11 16:08+0200\n"
"Last-Translator: dotan\n"
"Language-Team: <en at li.org>\n"
@@ -906,7 +906,7 @@ msgstr "×××¨× ×× ×××ר×ת ×ר×רת ×××××"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -916,7 +916,7 @@ msgstr "ק×××ר××ת"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -940,13 +940,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "×××רת ×©× ×ª ××ספ××"
#. name of the div sous-div column
-#: ../src/bet_config.c:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1471,17 +1471,12 @@ msgstr "×ש××× ×××××"
msgid "Type"
msgstr "ס××"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
#, fuzzy
msgid "Select"
msgstr "×ס×× ×××"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "× ××ר"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1490,11 +1485,16 @@ msgstr "× ××ר"
msgid "Amount"
msgstr "×××ת"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "×©× × × ××××ת"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "ס××× ××§× ×ª×§×¦××"
@@ -1504,22 +1504,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "×××× ×ס××× ×ת×ר×× ×©× ××¢××¡×§× ××××××ת."
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "ש×××ש ××¢××¡×§× ×× ××רת ×ת×ר ת×× ×ת"
@@ -2500,7 +2500,7 @@ msgstr "×¡× ××× ×××××"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "ש××רת ×¢×סק×"
@@ -4948,7 +4948,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "××\"×"
@@ -7758,7 +7758,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "××× ×©×"
@@ -7796,11 +7796,11 @@ msgstr "×××§×¨× ×©× ×¡×××¨× ××× ×©××ר×, ×× ×ש×× ×××× ×©×
msgid "Name the accounts file"
msgstr "×©× ×§×××¥ ××ש××× ×ת"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -8029,7 +8029,7 @@ msgid "Transfer : Deleted account"
msgstr "××¢×ר×: ×ש××× ×©× ××ק"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
#, fuzzy
msgid "Transfer : "
msgstr "××¢×ר×"
@@ -8067,53 +8067,53 @@ msgstr ""
msgid "No payee selected for this report."
msgstr "×× × ××ר ×× ×¦× ×©×××©× ×××\"× ××."
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "×ש ×××× ×ס ת×ר××."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "ת×ר×× ×× ×ª×§××"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "ת×ר×× ×× ×ª×§××"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "×ש ×××× ×ס ת×ר××."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "××רת ××¢××¡×§× ××¢××¡×§× ×ת×××× ×ª"
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "××ש××× ××ק×שר ×××¢××¨× ×× ××× × ×ª×§××"
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "×× × ××ª× ×××¢××ר ××××ª× ××ש××× ××××ª× ××ש×××."
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "×× × ××ª× ××צע ××¢××¨× ××ש××× ×¡××ר."
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -8123,7 +8123,7 @@ msgstr ""
"×× ××× × ××××× ××£ ×ספר.\n"
"××× ×××ש×× ××× ××ת?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -8131,31 +8131,31 @@ msgstr ""
"×××ר×: ×ספר ××××× ×× ××ר × ××¦× ×ש×××ש.\n"
"××× ×××ש×× ××× ××ת?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "×¢××¡×§× ×¢× ×¦× ×©×××©× ×ר××× ×שתתפ×× ××××ת ××××ת ×¢××¡×§× ××ש×."
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "×¢××¡×§× ×¢× ×¦× ×©×××©× ×ר××× ×שתתפ×× ××××ת ××××ת ×¢××¡×§× ××ש×."
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
#, fuzzy
msgid "Invalid multiple payee."
msgstr "×¦× ×©×××©× ×ר××× ×שת×ש×× ××× × ×ª×§××."
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
#, fuzzy
msgid "Modifying a transaction"
msgstr "ער××ת ×¢×סק×"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -8165,7 +8165,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -11249,6 +11249,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "× ××ר"
+
+#, fuzzy
#~ msgid "Print amortization table"
#~ msgstr "×××¤×¡× ×ק×××¥"
diff --git a/po/it.po b/po/it.po
index 21a09bf..9649146 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\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"
@@ -627,7 +627,7 @@ msgstr "Ripristina i valori predefiniti"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -637,7 +637,7 @@ msgstr "Categorie"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -661,13 +661,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, 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:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1192,17 +1192,12 @@ msgstr "Conto monetario"
msgid "Type"
msgstr "Tipo"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
#, fuzzy
msgid "Select"
msgstr "Seleziona tutto"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "Carta"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1211,11 +1206,16 @@ msgstr "Carta"
msgid "Amount"
msgstr "Totale"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "Anno corrente"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "Importo per linea budget"
@@ -1225,22 +1225,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, 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:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "Usa le transazioni selezionate come template"
@@ -2222,7 +2222,7 @@ msgstr "Totale generale"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "Ripartizione della categoria"
@@ -4687,7 +4687,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Rapporto"
@@ -7485,7 +7485,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "Senza nome"
@@ -7524,11 +7524,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr "Nome del documento dei conti"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7753,7 +7753,7 @@ msgid "Transfer : Deleted account"
msgstr "Trasferimento: conto eliminato"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
#, fuzzy
msgid "Transfer : "
msgstr "Tasferimento"
@@ -7792,53 +7792,53 @@ msgstr ""
msgid "No payee selected for this report."
msgstr "Nessua categoria personalizzata selezionata per questo rapporto."
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "Devi impostare una data."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "Data non valida"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "Data non valida"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "Devi impostare una data."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Converti la transazione in una transazione schedulata"
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "Il conto associato a questo trasferimento non è valido"
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "Impossibile eseguire un trasferimento a sé stessi."
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "Impossible effettuare un trasferimento su un conto chiuso."
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7848,7 +7848,7 @@ msgstr ""
"ma non contiene alcun numero.\n"
"Continuare?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7856,33 +7856,33 @@ msgstr ""
"Attenzione: questo numero di assegno è già usato.\n"
"Continuare?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
"Una transazione con più categorie personalizzate deve averne una nuova."
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"Una transazione con più categorie personalizzate deve averne una nuova."
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
#, fuzzy
msgid "Invalid multiple payee."
msgstr "Categoria multipla personalizzata non valida."
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
#, fuzzy
msgid "Modifying a transaction"
msgstr "Modifica transazione"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7892,7 +7892,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -10994,6 +10994,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "Carta"
+
+#, fuzzy
#~ msgid "Print amortization table"
#~ msgstr "Stampa in un file"
diff --git a/po/nl.po b/po/nl.po
index 01b8dfe..8bc3cc3 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\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"
@@ -643,7 +643,7 @@ msgstr "Herstel standaard"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -654,7 +654,7 @@ msgstr "Categorieën"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -678,13 +678,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, 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:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1210,17 +1210,12 @@ msgstr "Kasrekening"
msgid "Type"
msgstr "Soort"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
#, fuzzy
msgid "Select"
msgstr "Selecteer alles"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "Opmaak"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1229,11 +1224,16 @@ msgstr "Opmaak"
msgid "Amount"
msgstr "Bedrag"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "Huidig jaar"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "Bedrag per budgetregel"
@@ -1243,22 +1243,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, 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:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "Gebruik de gekozen transactie als sjabloon"
@@ -2247,7 +2247,7 @@ msgstr "Totaal algemeen"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "Opsplitsen van transactie"
@@ -4711,7 +4711,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Rapport"
@@ -7546,7 +7546,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "Niet benoemd"
@@ -7586,11 +7586,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr "Bestand opslaan als"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7820,7 +7820,7 @@ msgid "Transfer : Deleted account"
msgstr "Overschrijving : verwijderde rekening"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr "Overschrijving : "
@@ -7858,53 +7858,53 @@ msgstr ""
msgid "No payee selected for this report."
msgstr "Er is geen begunstigde geselecteerd voor dit rapport"
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "U moet een datum invullen."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "Datum onbekende"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "Datum onbekende"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "U moet een datum invullen."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Transactie omzetten naar een geplande transactie"
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "De bijbehorende rekening voor deze overschrijving bestaat niet"
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "U kunt geen overschrijving maken naar dezelfde rekening"
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "Kan geen transactie uitvoeren op/naar een gesloten rekening."
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7914,7 +7914,7 @@ msgstr ""
"maar heeft geen nummer.\n"
"Toch door gaan?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7922,31 +7922,31 @@ msgstr ""
"Waarschuwing dit chequenummer wordt al gebruikt.\n"
"Toch door gaan?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "Een transactie met meerdere begunstigden moet een nieuwe zijn"
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "Een transactie met meerdere begunstigden moet een nieuwe zijn"
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
#, fuzzy
msgid "Invalid multiple payee."
msgstr "Ongeldige meervoudige begunstigde"
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
#, fuzzy
msgid "Modifying a transaction"
msgstr "Bewerk transacties"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7956,7 +7956,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -11083,6 +11083,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "Opmaak"
+
+#, fuzzy
#~ msgid "Print amortization table"
#~ msgstr "Print naar bestand"
diff --git a/po/pl.po b/po/pl.po
index 7d4cb9e..e9b262e 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\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"
@@ -630,7 +630,7 @@ msgstr "PrzywrÃ³Ä ustawienia domyÅlne"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -640,7 +640,7 @@ msgstr "Kategorie"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -664,13 +664,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, 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:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1195,17 +1195,12 @@ msgstr "Gotówka"
msgid "Type"
msgstr "Typ"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
#, fuzzy
msgid "Select"
msgstr "Zaznacz wszystkie"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "Papier"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1214,11 +1209,16 @@ msgstr "Papier"
msgid "Amount"
msgstr "Kwota"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "Aktualny rok"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "Suma dla linii budżetowej"
@@ -1228,22 +1228,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, 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:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "Użyj zaznaczonej transakcji jako szablonu"
@@ -2225,7 +2225,7 @@ msgstr "Razem"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "Transakcja zbiorcza"
@@ -4671,7 +4671,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Raport"
@@ -7482,7 +7482,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "bez nazwy"
@@ -7521,11 +7521,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr "Nazwa pliku kont"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7750,7 +7750,7 @@ msgid "Transfer : Deleted account"
msgstr "Transfer: usuniÄte konto"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
#, fuzzy
msgid "Transfer : "
msgstr "Przelew"
@@ -7788,53 +7788,53 @@ msgstr ""
msgid "No payee selected for this report."
msgstr "Nie wybrano beneficjenta dla tego raportu"
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "Musisz podaÄ datÄ"
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "BÅÄdna data"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "BÅÄdna data"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "Musisz podaÄ datÄ"
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "PrzeksztaÅÄ transakcjÄ w zaplanowanÄ
transakcjÄ"
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "Konto powiÄ
zane z tym transferem jest nieprawidÅowe"
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "Nie można wykonaÄ transferu do tego samego konta"
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "Nie można wykonaÄ transferu do zamkniÄtego konta "
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7844,7 +7844,7 @@ msgstr ""
"ale nie zawiera żadnego numeru.\n"
"KontynuowaÄ?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7852,31 +7852,31 @@ msgstr ""
"Ostrzeżenie: podany numer czeku zostaŠjuż użyty.\n"
" KontynuowaÄ mimo to?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "Transakcja z wielokrotnym beneficjentem musi byÄ nowÄ
transakcjÄ
."
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "Transakcja z wielokrotnym beneficjentem musi byÄ nowÄ
transakcjÄ
."
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
#, fuzzy
msgid "Invalid multiple payee."
msgstr "NieprawidÅowy wielokrotny benficjent"
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
#, fuzzy
msgid "Modifying a transaction"
msgstr "Edytuj transakcjÄ"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7886,7 +7886,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -10991,6 +10991,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "Papier"
+
+#, fuzzy
#~ msgid "Print amortization table"
#~ msgstr "Wydruk do pliku"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0110679..7b12e0f 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\n"
"PO-Revision-Date: 2005-12-19 09:07-0200\n"
"Last-Translator: \n"
"Language-Team: <pt at li.org>\n"
@@ -631,7 +631,7 @@ msgstr "Voltar para padrões"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -641,7 +641,7 @@ msgstr "Categorias"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -665,13 +665,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, 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:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1192,17 +1192,12 @@ msgstr "Conta de caixa"
msgid "Type"
msgstr "Tipo"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
#, fuzzy
msgid "Select"
msgstr "Selecionar todas"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "Papel"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1211,11 +1206,16 @@ msgstr "Papel"
msgid "Amount"
msgstr "Valor"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "Ano atual"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "Valores por orçamento"
@@ -1225,22 +1225,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, 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:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "Use os lançamentos como modelo"
@@ -2226,7 +2226,7 @@ msgstr "Total geral"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "Divisão do lançamento"
@@ -4687,7 +4687,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Relatório"
@@ -7511,7 +7511,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "sem nome"
@@ -7549,11 +7549,11 @@ msgstr "Se você fechar sem salvar, todos as sua alterações serão perdidas."
msgid "Name the accounts file"
msgstr "Nome do arquivo de contas"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7782,7 +7782,7 @@ msgid "Transfer : Deleted account"
msgstr "Transferir: conta apagada."
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr "Transferir"
@@ -7819,53 +7819,53 @@ msgstr ""
msgid "No payee selected for this report."
msgstr "Nenhum terceiro selecionado para este relatório."
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "Você deve informar uma data."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "Data inválida"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "Data inválida."
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "Você deve informar uma data."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Converter lançamento para lançamentos agendados"
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "A conta associadas para esta transferência é inválida"
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "Não é possÃvel fazer uma transferência para a própria conta."
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "Não é possÃvel efetuar uma transferência em uma conta fechada."
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7875,7 +7875,7 @@ msgstr ""
"não contém nenhum número.\n"
"Continuar mesmo assim ?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7883,31 +7883,31 @@ msgstr ""
"Atenção: este número de cheque já foi usado.\n"
"Continuar mesmo assim ?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "Cada lançamento com vários terceiros deverá ser única."
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "Cada lançamento com vários terceiros deverá ser única."
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
#, fuzzy
msgid "Invalid multiple payee."
msgstr "Vários terceiros inválido"
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
#, fuzzy
msgid "Modifying a transaction"
msgstr "Editar lançamento"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7917,7 +7917,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -11026,6 +11026,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "Papel"
+
+#, fuzzy
#~ msgid "Print amortization table"
#~ msgstr "Imprimir para arquivo"
diff --git a/po/ro.po b/po/ro.po
index 5cd7db0..495ba4a 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\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"
@@ -662,7 +662,7 @@ msgstr "Restabilirea reglajelor de origine"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -672,7 +672,7 @@ msgstr "Categorii"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -696,13 +696,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, 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:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1227,17 +1227,12 @@ msgstr "Cont de casÄ"
msgid "Type"
msgstr "Tip"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
#, fuzzy
msgid "Select"
msgstr "Selecţionaţi totul"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "Hârtie"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1246,11 +1241,16 @@ msgstr "Hârtie"
msgid "Amount"
msgstr "SumÄ totalÄ"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "Anul în curs"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "Suma pe IB"
@@ -1260,22 +1260,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "zile împrejurul datei operaţiunii importate."
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "Utiliza operaÅ£iunea selecÅ£ionatÄ ca model"
@@ -2257,7 +2257,7 @@ msgstr "Total general"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr "TranzacÅ£ie ventilatÄ"
@@ -4713,7 +4713,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "Stare"
@@ -7544,7 +7544,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "fÄra nume"
@@ -7584,11 +7584,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr "CreaÅ£ia unui nume de fiÅier de conturi"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7813,7 +7813,7 @@ msgid "Transfer : Deleted account"
msgstr "Virament : Cont suprimat"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
#, fuzzy
msgid "Transfer : "
msgstr "Virament"
@@ -7851,53 +7851,53 @@ msgstr ""
msgid "No payee selected for this report."
msgstr "AceastÄ stare nu comportÄ terÅ£i selecÅ£ionaÅ£i."
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "O datÄ este obligatorie."
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "DatÄ neconformÄ"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "DatÄ neconformÄ"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "O datÄ este obligatorie."
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Convertirea operaÅ£iunii în operaÅ£iune planificatÄ"
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "Contul asociat la virament nu este valid"
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "Impusibilitate de transfer pe contul sÄu"
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "Imposibil de a efectua un virament pe un cont închis"
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7907,7 +7907,7 @@ msgstr ""
"numÄr.\n"
"VreÅ£i sÄ continuaÅ£i ?"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7915,35 +7915,35 @@ msgstr ""
"AtenÅ£iune, numÄrul cecului este deja utilizat.\n"
"VreÅ£i sÄ continuaÅ£i ?"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
"O operaÅ£iune a cÄrui terÅ£ este o stare trebuie sÄ fie fÄrÄ Ã®ndoialÄ o nouÄ "
"operaţiune. "
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"O operaÅ£iune a cÄrui terÅ£ este o stare trebuie sÄ fie fÄrÄ Ã®ndoialÄ o nouÄ "
"operaţiune. "
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
#, fuzzy
msgid "Invalid multiple payee."
msgstr "Numele de stare în terÅ£ este invalidÄ"
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
#, fuzzy
msgid "Modifying a transaction"
msgstr "Edtarea operaţiunii"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7953,7 +7953,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -11058,6 +11058,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "Hârtie"
+
+#, fuzzy
#~ msgid "Print amortization table"
#~ msgstr "Imprima într'un fiÅier"
diff --git a/po/ru.po b/po/ru.po
index d83a5d9..445e916 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\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"
@@ -586,7 +586,7 @@ msgstr "СбÑоÑиÑÑ Ð´Ð¾ иÑÑ
однÑÑ
"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -596,7 +596,7 @@ msgstr "ÐаÑегоÑии"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -620,13 +620,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "ÐÑбÑаннÑй ÑинанÑовÑй год иÑполÑзÑеÑÑÑ Ð² ÑÑом Ñайле"
#. name of the div sous-div column
-#: ../src/bet_config.c:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1144,15 +1144,11 @@ msgstr "ÐалиÑнÑй ÑÑÑÑ"
msgid "Type"
msgstr "Тип"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
msgid "Select"
msgstr "ÐÑбÑаÑÑ"
-#: ../src/bet_hist.c:547
-msgid "Period"
-msgstr "ÐеÑиод"
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1161,11 +1157,16 @@ msgstr "ÐеÑиод"
msgid "Amount"
msgstr "СÑмма"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "Ðа ÑекÑÑий год"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "Тип ÑÑÑÑа"
@@ -1175,22 +1176,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "ÐнвеÑÑиÑоваÑÑ ÑиÑло импоÑÑиÑованнÑÑ
пÑоводок"
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "ÐÑбеÑиÑе обÑединÑемÑе пÑоводки"
@@ -2111,7 +2112,7 @@ msgstr "ÐÑого в Ñелом"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
msgid "Split of transaction"
msgstr ""
@@ -4446,7 +4447,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr "Grisbi зааÑÑ
ивиÑÑÐµÑ Ð²Ñе ÑÑанзакÑии, попавÑие в оÑÑÑÑ."
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "ÐÑÑÑÑ"
@@ -7199,7 +7200,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr ""
@@ -7238,11 +7239,11 @@ msgstr ""
msgid "Name the accounts file"
msgstr "ÐÐ¼Ñ Ñайла Ñо ÑÑеÑами"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7458,7 +7459,7 @@ msgid "Transfer : Deleted account"
msgstr "ÐеÑедаÑа: ÑÑÑÑ ÑдалÑн"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
msgid "Transfer : "
msgstr "ÐеÑедаÑа:"
@@ -7495,85 +7496,85 @@ msgstr ""
msgid "No payee selected for this report."
msgstr ""
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr ""
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, c-format
msgid "Invalid date %s"
msgstr "ÐекоÑÑекÑÐ½Ð°Ñ Ð´Ð°Ñа %s"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "вÑе даÑÑ"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "ÐеобÑ
одимо вÑбÑаÑÑ Ñ
оÑÑ Ð±Ñ Ð´Ð²Ð° ÑÑÑÑа"
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "ÐÑеобÑазоваÑÑ ÑÑанзакÑÐ¸Ñ Ð² _запланиÑованнÑÑ"
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr ""
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr ""
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr ""
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
"Continue anyway?"
msgstr ""
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
msgstr ""
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
msgid "Invalid multiple payee."
msgstr ""
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
msgid "Modifying a transaction"
msgstr "ÐзменÑеÑÑÑ Ð¿Ñоводка"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7583,7 +7584,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -10483,6 +10484,9 @@ msgstr ""
msgid "Personnal finances manager"
msgstr "ÐбÑедоÑÑÑпное ÑпÑавление лиÑнÑми ÑинанÑовÑми ÑÑедÑÑвами\n"
+#~ msgid "Period"
+#~ msgstr "ÐеÑиод"
+
#, fuzzy
#~ msgid "Print amortization table"
#~ msgstr "ÐапеÑаÑаÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5d0d59b..efb90e6 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: 2010-10-24 14:57+0200\n"
+"POT-Creation-Date: 2010-11-01 11:08+0100\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"
@@ -627,7 +627,7 @@ msgstr "æ¢å¤é»è®¤å¼"
#. mise en place de la paddingbox des catégories
#. set the title
#: ../src/bet_config.c:537 ../src/bet_config.c:555 ../src/bet_config.c:572
-#: ../src/bet_config.c:635 ../src/bet_hist.c:156 ../src/etats_config.c:526
+#: ../src/bet_config.c:635 ../src/bet_hist.c:160 ../src/etats_config.c:526
#: ../src/etats_config.c:529 ../src/etats_config.c:2991
#: ../src/etats_config.c:7057 ../src/fenetre_principale.c:282
#: ../src/navigation.c:314 ../src/navigation.c:1211
@@ -637,7 +637,7 @@ msgstr "ç±»å«"
#. mise en place de la paddingbox des ib
#. set the title
#: ../src/bet_config.c:538 ../src/bet_config.c:556 ../src/bet_config.c:573
-#: ../src/bet_config.c:644 ../src/bet_hist.c:165 ../src/etats_config.c:535
+#: ../src/bet_config.c:644 ../src/bet_hist.c:169 ../src/etats_config.c:535
#: ../src/etats_config.c:538 ../src/etats_config.c:3797
#: ../src/etats_config.c:7134 ../src/export_csv.c:802
#: ../src/fenetre_principale.c:287 ../src/import_csv.c:86
@@ -661,13 +661,13 @@ msgid ""
"budgetary line."
msgstr ""
-#: ../src/bet_config.c:659 ../src/bet_hist.c:185
+#: ../src/bet_config.c:659 ../src/bet_hist.c:189
#, fuzzy
msgid "Choose the financial year or 12 months rolling"
msgstr "éæ©è´¢å¹´"
#. name of the div sous-div column
-#: ../src/bet_config.c:874 ../src/bet_hist.c:530
+#: ../src/bet_config.c:874 ../src/bet_hist.c:534
#: ../src/categories_onglet.c:143 ../src/etats_affiche.c:2433
#: ../src/etats_config.c:673 ../src/export_csv.c:793
#: ../src/gsb_transactions_list.c:157 ../src/import_csv.c:84
@@ -1192,17 +1192,12 @@ msgstr "ç°éè´¦æ·"
msgid "Type"
msgstr "ç±»å"
-#: ../src/bet_hist.c:520 ../src/tiers_onglet.c:1111
+#: ../src/bet_hist.c:524 ../src/tiers_onglet.c:1111
#, fuzzy
msgid "Select"
msgstr "éæ©ææ"
-#: ../src/bet_hist.c:547
-#, fuzzy
-msgid "Period"
-msgstr "çº¸å¼ "
-
-#: ../src/bet_hist.c:562 ../src/categories_onglet.c:161
+#: ../src/bet_hist.c:551 ../src/categories_onglet.c:161
#: ../src/etats_config.c:5239 ../src/export_csv.c:787
#: ../src/gsb_assistant_reconcile_config.c:594 ../src/gsb_scheduler_list.c:340
#: ../src/gsb_transactions_list.c:153 ../src/import.c:3254
@@ -1211,11 +1206,16 @@ msgstr "çº¸å¼ "
msgid "Amount"
msgstr "æ»è®¡"
-#: ../src/bet_hist.c:578
+#: ../src/bet_hist.c:567
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:595
+#: ../src/bet_hist.c:583
+#, fuzzy
+msgid "Current fyear"
+msgstr "æ¬å¹´"
+
+#: ../src/bet_hist.c:600
#, fuzzy
msgid "Amount retained"
msgstr "æ¯é¢ç®è¡æ»é¢"
@@ -1225,22 +1225,22 @@ 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:670 ../src/bet_hist.c:972
+#: ../src/bet_hist.c:995
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1372
+#: ../src/bet_hist.c:1395
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "导å
¥äº¤æå
å«çæ¥æ"
#. Add average amount menu
-#: ../src/bet_hist.c:1395
+#: ../src/bet_hist.c:1418
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1656
+#: ../src/bet_hist.c:1679
#, fuzzy, c-format
msgid "Please select the data source for the account: \"%s\""
msgstr "使ç¨éä¸äº¤æå模æ¿"
@@ -2217,7 +2217,7 @@ msgstr "ä¸è¬æ»è®¡"
#: ../src/etats_affiche.c:1853 ../src/export_csv.c:574
#: ../src/gsb_data_category.c:1054 ../src/gsb_form.c:727
-#: ../src/gsb_form.c:2772 ../src/gsb_form.c:3175
+#: ../src/gsb_form.c:2773 ../src/gsb_form.c:3176
#: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3407
#, fuzzy
msgid "Split of transaction"
@@ -4651,7 +4651,7 @@ msgid "Grisbi will archive transactions selected by a report."
msgstr ""
#: ../src/gsb_assistant_archive.c:314 ../src/gsb_data_payee.c:541
-#: ../src/gsb_form.c:2885 ../src/gsb_form.c:2886 ../src/navigation.c:1236
+#: ../src/gsb_form.c:2886 ../src/gsb_form.c:2887 ../src/navigation.c:1236
msgid "Report"
msgstr "æ¥è¡¨"
@@ -7448,7 +7448,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:779
+#: ../src/gsb_file.c:820 ../src/gsb_file.c:831 ../src/main.c:781
msgid "unnamed"
msgstr "æªå½å"
@@ -7486,11 +7486,11 @@ msgstr "å¦ææ¨ä¸ä¿åå°±å
³éæ件ï¼å°ä¸¢å¤±æ´æ°çæ°æ®"
msgid "Name the accounts file"
msgstr "å½åè´¦æ·æ件"
-#: ../src/gsb_file.c:1140
+#: ../src/gsb_file.c:1144
msgid "Delete file copy from a previous version of grisbi"
msgstr ""
-#: ../src/gsb_file.c:1160
+#: ../src/gsb_file.c:1164
#, c-format
msgid ""
"Caution, you are about to delete a file copy\n"
@@ -7719,7 +7719,7 @@ msgid "Transfer : Deleted account"
msgstr "转å¸ï¼å·²å é¤çè´¦æ·"
#: ../src/gsb_form.c:759 ../src/gsb_form.c:1883 ../src/gsb_form.c:1884
-#: ../src/gsb_form_widget.c:1044
+#: ../src/gsb_form_widget.c:1046
#, fuzzy
msgid "Transfer : "
msgstr "转å¸"
@@ -7757,53 +7757,53 @@ msgstr ""
msgid "No payee selected for this report."
msgstr "æ¬æ¥è¡¨æ²¡æéæ©ç¬¬ä¸æ¹ã"
-#: ../src/gsb_form.c:2689
+#: ../src/gsb_form.c:2690
msgid "You must enter a date."
msgstr "æ¨å¿
é¡»è¾å
¥æ¥æ"
-#: ../src/gsb_form.c:2696
+#: ../src/gsb_form.c:2697
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "éæ³æ¥æ"
-#: ../src/gsb_form.c:2719
+#: ../src/gsb_form.c:2720
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "éæ³æ¥æ"
-#: ../src/gsb_form.c:2754
+#: ../src/gsb_form.c:2755
#, fuzzy
msgid "You must enter an amount."
msgstr "æ¨å¿
é¡»è¾å
¥æ¥æ"
-#: ../src/gsb_form.c:2774
+#: ../src/gsb_form.c:2775
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: ../src/gsb_form.c:2808
+#: ../src/gsb_form.c:2809
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "转æ¢äº¤æ为计å交æ"
-#: ../src/gsb_form.c:2815
+#: ../src/gsb_form.c:2816
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "æ¬è½¬å¸å
³èçè´¦æ·ä¸åæ³"
-#: ../src/gsb_form.c:2823
+#: ../src/gsb_form.c:2824
msgid "Can't issue a transfer its own account."
msgstr "ä¸è½è½¬å¸å°æ¬è´¦æ·ã"
-#: ../src/gsb_form.c:2828
+#: ../src/gsb_form.c:2829
msgid "Can't issue a transfer on a closed account."
msgstr "ä¸è½å¨ç»ç®è´¦æ·ä¸äº§ç交æã"
-#: ../src/gsb_form.c:2854
+#: ../src/gsb_form.c:2855
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7813,7 +7813,7 @@ msgstr ""
"ä½æ¯æ²¡æä»»ä½ç¼å·ã\n"
"ä»ç¶ç»§ç»ï¼"
-#: ../src/gsb_form.c:2872
+#: ../src/gsb_form.c:2873
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7821,31 +7821,31 @@ msgstr ""
"è¦åï¼è¯¥æ¯ç¥¨çç¼å·å·²ç»ä½¿ç¨è¿äºã\n"
"ä»ç¶ç»§ç»ï¼"
-#: ../src/gsb_form.c:2893
+#: ../src/gsb_form.c:2894
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "æå¤ä¸ªç¬¬ä¸æ¹ç交æå¿
é¡»çææ°ç交æã"
-#: ../src/gsb_form.c:2898
+#: ../src/gsb_form.c:2899
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "æå¤ä¸ªç¬¬ä¸æ¹ç交æå¿
é¡»çææ°ç交æã"
-#: ../src/gsb_form.c:2909
+#: ../src/gsb_form.c:2910
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: ../src/gsb_form.c:2916
+#: ../src/gsb_form.c:2917
#, fuzzy
msgid "Invalid multiple payee."
msgstr "æ æçå¤ç¬¬ä¸æ¹ã"
-#: ../src/gsb_form.c:3198
+#: ../src/gsb_form.c:3199
#, fuzzy
msgid "Modifying a transaction"
msgstr "æ´æ¹äº¤æ"
-#: ../src/gsb_form.c:3199
+#: ../src/gsb_form.c:3200
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7855,7 +7855,7 @@ msgid ""
msgstr ""
#. propose to configure the form
-#: ../src/gsb_form.c:3502
+#: ../src/gsb_form.c:3503
msgid "Configure the form"
msgstr ""
@@ -10933,6 +10933,10 @@ msgid "Personnal finances manager"
msgstr ""
#, fuzzy
+#~ msgid "Period"
+#~ msgstr "çº¸å¼ "
+
+#, fuzzy
#~ msgid "Print amortization table"
#~ msgstr "æå°å°æ件"
diff --git a/src/bet_data.c b/src/bet_data.c
index 451a8a6..eeb664f 100644
--- a/src/bet_data.c
+++ b/src/bet_data.c
@@ -55,7 +55,10 @@ static GDate *bet_data_futur_get_next_date ( str " is " °çæ°æ®" ÑÑедÑÑвами\n" άλλη." αι " Ï " sbi.org/index.fr.html]) ÐÔÛ³ÿ à èã{+ Èéã{+ è ä{+ $ øå{+ ÐÔÛ³ÿ 'å{+ àÉÛ³ÿ °ÈÛ³ÿ »èã{+ è è! è! `ÔÛ³ÿ ÐÔÛ³ÿ x´å{+ àÊÛ³ÿ íèã{+ Öèã{+ `ÔÛ³ÿ °èã{+ ÔÛ³ÿ À¯hå{+ à èã{+ hå{+ ؤhå{+ ¨©hå{+ Èéã{+ x´å{+ àÊÛ³ÿ °ÉÛ³ÿ »èã{+ `ÔÛ³ÿ ÐÔÛ³ÿ È}ää{+ ÀËÛ³ÿ íèã{+ Öèã{+ `ÔÛ³ÿ °èã{+ ÔÛ³ÿ ÔÛ³ÿ ÔÛ³ÿ ä{+ : ÐÔÛ³ÿ à èã{+ Èéã{+ ÀËÛ³ÿ ÊÛ³ÿ »èã{+ H I J K M N O P `ÔÛ³ÿ ÐÔÛ³ÿ H5»ä{+ `ÍÛ³ÿ íèã{+ 85»ä{+ Öèã{+ `ÔÛ³ÿ 0¯hå{+ à èã{+ Àå{+ iä{+ hå{+ ؤhå{+ ¨©hå{+ Èéã{+
H5»ä{+ `ÍÛ³ÿ ËÛ³ÿ »èã{+ 85»ä{+ `ÍÛ³ÿ ÐËÛ³ÿ »èã{+ (5»ä{+ `ÍÛ³ÿ ÌÛ³ÿ »èã{+ 5»ä{+ `ÍÛ³ÿ 0ÌÛ³ÿ »èã{+ ¨®hå{+ à èã{+ ¨©hå{+ °ÆÛ³ÿ ¸ä{+ ¶èã{+ ÿ ؤhå{+ ÐÌÛ³ÿ y¸ä{+ ¶èã{+ hå{+ ÍÛ³ÿ Z¸ä{+ ¶èã{+ Ødä{+ Àå{+ iä{+ hå{+ ØÄå{+ ؤhå{+ ¨©hå{+ Èéã{+ àä{+ ÎÛ³ÿ PÍÛ³ÿ »èã{+ ) * - . 0 3 5 6 7 8 : < = `ÔÛ³ÿ ÐÔÛ³ÿ pëbä{+ ÏÛ³ÿ íèã{+ S T 8Ïå{+ à èã{+ ØÄå{+ Éå{+ Èéã{+ c f Õ_ at fÆS -/ä{+ ÐÔÛ³ÿ pëbä{+ ÏÛ³ÿ pÎÛ³ÿ »èã{+ øÒ êÓïs¨Ó,~9×u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv`ÔÛ³ÿ ÐÔÛ³ÿ H-ä{+ ÐÑÛ³ÿ ÐÔÛ³ÿ à èã{+ è ä{+ 0ÍÛ³ÿ -/ä{+ ¶èã{+ è ä{+ `ÔÛ³ÿ ÔÛ³ÿ õ¬ ä
{+ ÐÔÛ³ÿ H-ä{+ ÐÑÛ³ÿ ÏÛ³ÿ »èã{+ 8-ä{+ uct_futur_data *scheduled,
const GDate *date_max );
static struct_futur_data *bet_data_future_copy_struct ( struct_futur_data *scheduled );
static void bet_data_future_set_max_number ( gint number );
-static gboolean bet_data_update_div ( SH *sh, gint transaction_number, gint sub_div );
+static gboolean bet_data_update_div ( SH *sh,
+ gint transaction_number,
+ gint sub_div,
+ gint type_de_transaction );
static void struct_free_bet_future ( struct_futur_data *scheduled );
static void struct_free_bet_range ( SBR *sbr );
static void struct_free_bet_transfert ( struct_transfert_data *transfert );
@@ -719,7 +722,8 @@ gint bet_data_get_selected_currency ( void )
* */
gboolean bet_data_populate_div ( gint transaction_number,
gboolean is_transaction,
- GHashTable *list_div )
+ GHashTable *list_div,
+ gint type_de_transaction )
{
gint div = 0;
gint sub_div = 0;
@@ -732,13 +736,13 @@ gboolean bet_data_populate_div ( gint transaction_number,
return FALSE;
if ( (sh = g_hash_table_lookup ( list_div, utils_str_itoa ( div ) ) ) )
- bet_data_update_div ( sh, transaction_number, sub_div );
+ bet_data_update_div ( sh, transaction_number, sub_div, type_de_transaction );
else
{
sh = struct_initialise_bet_historical ( );
sh -> div = div;
sh -> account_nb = gsb_data_transaction_get_account_number ( transaction_number );
- bet_data_update_div ( sh, transaction_number, sub_div );
+ bet_data_update_div ( sh, transaction_number, sub_div, type_de_transaction );
g_hash_table_insert ( list_div, utils_str_itoa ( div ), sh );
}
@@ -752,26 +756,42 @@ gboolean bet_data_populate_div ( gint transaction_number,
*
*
* */
-gboolean bet_data_update_div ( SH *sh, gint transaction_number, gint sub_div )
+gboolean bet_data_update_div ( SH *sh,
+ gint transaction_number,
+ gint sub_div,
+ gint type_de_transaction )
{
SBR *sbr = ( SBR*) sh -> sbr;
gsb_real amount;
SH *tmp_sh = NULL;
amount = gsb_data_transaction_get_amount ( transaction_number );
- sbr-> current_balance = gsb_real_add ( sbr -> current_balance, amount );
+
+ switch ( type_de_transaction )
+ {
+ case 0:
+ sbr-> current_balance = gsb_real_add ( sbr -> current_balance, amount );
+ break;
+ case 1:
+ sbr-> current_fyear = gsb_real_add ( sbr -> current_fyear, amount );
+ break;
+ case 2:
+ sbr-> current_balance = gsb_real_add ( sbr -> current_balance, amount );
+ sbr-> current_fyear = gsb_real_add ( sbr -> current_fyear, amount );
+ break;
+ }
if ( sub_div < 1 )
return FALSE;
if ( ( tmp_sh = g_hash_table_lookup ( sh -> list_sub_div, utils_str_itoa ( sub_div ) ) ) )
- bet_data_update_div ( tmp_sh, transaction_number, -1 );
+ bet_data_update_div ( tmp_sh, transaction_number, -1, type_de_transaction );
else
{
tmp_sh = struct_initialise_bet_historical ( );
tmp_sh -> div = sub_div;
tmp_sh -> account_nb = gsb_data_transaction_get_account_number ( transaction_number );
- bet_data_update_div ( tmp_sh, transaction_number, -1 );
+ bet_data_update_div ( tmp_sh, transaction_number, -1, type_de_transaction );
g_hash_table_insert ( sh -> list_sub_div, utils_str_itoa ( sub_div ), tmp_sh );
}
@@ -981,8 +1001,7 @@ SBR *struct_initialise_bet_range ( void )
sbr -> first_pass = TRUE;
sbr -> min_date = NULL;
sbr -> max_date = NULL;
- sbr -> min_balance = null_real;
- sbr -> max_balance = null_real;
+ sbr -> current_fyear = null_real;
sbr -> current_balance = null_real;
return sbr;
diff --git a/src/bet_data.h b/src/bet_data.h
index bec9220..41ad654 100644
--- a/src/bet_data.h
+++ b/src/bet_data.h
@@ -21,11 +21,11 @@ struct _bet_range
gboolean first_pass;
GDate *min_date;
GDate *max_date;
- gsb_real min_balance;
- gsb_real max_balance;
+ gsb_real current_fyear;
gsb_real current_balance;
};
+/* utilisée pour gérer la liste des données historiques dans la vue historique */
struct _historical
{
gint div;
@@ -34,7 +34,7 @@ struct _historical
GHashTable *list_sub_div;
};
-
+/* utilisée pour gérer la liste des données historiques dans le tableau des prévisions */
struct _hist_div
{
gint account_nb;
@@ -115,7 +115,8 @@ gboolean bet_data_init_variables ( void );
void bet_data_insert_div_hist ( struct_hist_div *shd, struct_hist_div *sub_shd );
gboolean bet_data_populate_div ( gint transaction_number,
gboolean is_transaction,
- GHashTable *list_div );
+ GHashTable *list_div,
+ gint type_de_transaction );
gboolean bet_data_remove_all_bet_data ( gint account_number );
gboolean bet_data_remove_div_hist ( gint account_nb, gint div_number, gint sub_div_nb );
gboolean bet_data_search_div_hist ( gint account_nb, gint div_number, gint sub_div_nb );
diff --git a/src/bet_hist.c b/src/bet_hist.c
index c40c6a4..1435ece 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -74,6 +74,10 @@ static gboolean bet_historical_fyear_create_combobox_store ( void );
static gsb_real bet_historical_get_children_amount ( GtkTreeModel *model, GtkTreeIter *parent );
static GtkWidget *bet_historical_get_data_tree_view ( GtkWidget *container );
static gboolean bet_historical_get_full_div ( GtkTreeModel *model, GtkTreeIter *parent );
+static GDate *bet_historical_get_start_date_current_fyear ( void );
+static gint bet_historical_get_type_transaction ( const GDate *date,
+ GDate *start_current_fyear,
+ GDate *date_max );
static gboolean bet_historical_initializes_account_settings ( gint account_number );
static void bet_historical_populate_div_model ( gpointer key,
gpointer value,
@@ -478,7 +482,7 @@ GtkWidget *bet_historical_get_data_tree_view ( GtkWidget *container )
tree_model = gtk_tree_store_new ( SPP_HISTORICAL_NUM_COLUMNS,
G_TYPE_BOOLEAN, /* SPP_HISTORICAL_SELECT_COLUMN */
G_TYPE_STRING, /* SPP_HISTORICAL_DESC_COLUMN */
- G_TYPE_STRING, /* SPP_HISTORICAL_PERIOD_COLUMN */
+ G_TYPE_STRING, /* SPP_HISTORICAL_CURRENT_COLUMN */
G_TYPE_STRING, /* SPP_HISTORICAL_BALANCE_COLUMN */
G_TYPE_STRING, /* SPP_HISTORICAL_AVERAGE_COLUMN */
G_TYPE_STRING, /* SPP_HISTORICAL_AVERAGE_AMOUNT */
@@ -541,26 +545,27 @@ GtkWidget *bet_historical_get_data_tree_view ( GtkWidget *container )
gtk_tree_view_column_set_expand ( GTK_TREE_VIEW_COLUMN ( column ), TRUE );
gtk_tree_view_column_set_resizable ( column, TRUE );
- /* period analysis column */
+ /* amount column */
cell = gtk_cell_renderer_text_new ( );
column = gtk_tree_view_column_new_with_attributes (
- _("Period"), cell,
- "text", SPP_HISTORICAL_PERIOD_COLUMN,
+ _("Amount"), cell,
+ "text", SPP_HISTORICAL_BALANCE_COLUMN,
+ "foreground", SPP_HISTORICAL_BALANCE_COLOR,
"cell-background-gdk", SPP_HISTORICAL_BACKGROUND_COLOR,
NULL);
- g_object_set (cell, "xalign", 0.5, NULL);
-
- gtk_tree_view_column_set_alignment ( column, 0.5 );
gtk_tree_view_append_column ( GTK_TREE_VIEW ( tree_view ),
GTK_TREE_VIEW_COLUMN ( column ) );
+ g_object_set ( G_OBJECT ( GTK_CELL_RENDERER ( cell ) ), "xalign", 1.0, NULL );
+ gtk_tree_view_column_set_alignment ( column, 1 );
+ gtk_tree_view_column_set_clickable ( GTK_TREE_VIEW_COLUMN ( column ), TRUE );
gtk_tree_view_column_set_expand ( GTK_TREE_VIEW_COLUMN ( column ), TRUE );
gtk_tree_view_column_set_resizable ( column, TRUE );
- /* amount column */
+ /* average column */
cell = gtk_cell_renderer_text_new ( );
column = gtk_tree_view_column_new_with_attributes (
- _("Amount"), cell,
- "text", SPP_HISTORICAL_BALANCE_COLUMN,
+ _("Average"), cell,
+ "text", SPP_HISTORICAL_AVERAGE_COLUMN,
"foreground", SPP_HISTORICAL_BALANCE_COLOR,
"cell-background-gdk", SPP_HISTORICAL_BACKGROUND_COLOR,
NULL);
@@ -572,11 +577,11 @@ GtkWidget *bet_historical_get_data_tree_view ( GtkWidget *container )
gtk_tree_view_column_set_expand ( GTK_TREE_VIEW_COLUMN ( column ), TRUE );
gtk_tree_view_column_set_resizable ( column, TRUE );
- /* average column */
+ /* current fyear column */
cell = gtk_cell_renderer_text_new ( );
column = gtk_tree_view_column_new_with_attributes (
- _("Average"), cell,
- "text", SPP_HISTORICAL_AVERAGE_COLUMN,
+ _("Current fyear"), cell,
+ "text", SPP_HISTORICAL_CURRENT_COLUMN,
"foreground", SPP_HISTORICAL_BALANCE_COLOR,
"cell-background-gdk", SPP_HISTORICAL_BACKGROUND_COLOR,
NULL);
@@ -642,8 +647,10 @@ void bet_historical_populate_data ( gint account_number )
GtkWidget *tree_view;
GtkTreeModel *model;
gint fyear_number;
+ GDate *date_jour;
GDate *date_min;
GDate *date_max;
+ GDate *start_current_fyear;
GSList* tmp_list;
GHashTable *list_div;
@@ -658,7 +665,9 @@ void bet_historical_populate_data ( gint account_number )
model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) );
gtk_tree_store_clear ( GTK_TREE_STORE ( model ) );
- /* calculate date_min and date_max */
+ /* calculate date_jour, date_min and date_max */
+ date_jour = gdate_today ( );
+
fyear_number = gsb_data_account_get_bet_hist_fyear ( account_number );
if ( fyear_number == 0 )
{
@@ -666,16 +675,17 @@ void bet_historical_populate_data ( gint account_number )
g_date_subtract_years ( date_min, 1 );
date_max = gdate_today ( );
g_date_subtract_days ( date_max, 1 );
- g_object_set_data ( G_OBJECT ( account_page ), "bet_historical_period",
- g_strdup ( _("12 months rolling") ) );
}
else
{
- date_min = gsb_data_fyear_get_beginning_date ( fyear_number );
- date_max = gsb_data_fyear_get_end_date ( fyear_number );
- g_object_set_data ( G_OBJECT ( account_page ), "bet_historical_period",
- g_strdup ( gsb_data_fyear_get_name ( fyear_number ) ) );
+ date_min = gsb_date_copy ( gsb_data_fyear_get_beginning_date ( fyear_number ) );
+ date_max = gsb_date_copy ( gsb_data_fyear_get_end_date ( fyear_number ) );
}
+
+ /* calculate the current_fyear */
+ start_current_fyear = bet_historical_get_start_date_current_fyear ( );
+/* printf ("start_current_fyear = %s\n", gsb_format_gdate ( start_current_fyear )); */
+
list_div = g_hash_table_new_full ( g_str_hash,
g_str_equal,
(GDestroyNotify) g_free,
@@ -688,22 +698,22 @@ void bet_historical_populate_data ( gint account_number )
gint transaction_number;
gint tmp_account_number;
const GDate *date;
+ gint type_de_transaction;
- transaction_number = gsb_data_transaction_get_transaction_number (
- tmp_list->data );
+ transaction_number = gsb_data_transaction_get_transaction_number ( tmp_list->data );
tmp_list = tmp_list -> next;
- tmp_account_number = gsb_data_transaction_get_account_number (
- transaction_number );
+ tmp_account_number = gsb_data_transaction_get_account_number ( transaction_number );
if ( tmp_account_number != account_number )
continue;
date = gsb_data_transaction_get_date ( transaction_number );
- /* ignore transaction which are before date_min (today) */
+ /* ignore transaction which are before date_min */
if ( g_date_compare ( date, date_min ) <= 0 )
continue;
- /* ignore transaction which are after date_max */
- if ( g_date_compare (date, date_max ) > 0 )
+
+ /* ignore transaction which is after date_jour */
+ if ( g_date_compare ( date, date_jour ) > 0 )
continue;
/* ignore splitted transactions */
@@ -711,13 +721,20 @@ void bet_historical_populate_data ( gint account_number )
transaction_number ) != 0 )
continue;
- bet_data_populate_div ( transaction_number, TRUE, list_div );
+ /* on détermine le type de transaction pour l'affichage */
+ type_de_transaction = bet_historical_get_type_transaction ( date, start_current_fyear, date_max );
+
+ bet_data_populate_div ( transaction_number, TRUE, list_div, type_de_transaction );
}
bet_historical_affiche_div ( list_div, tree_view );
/* bet_data_synchronise_hist_div_list ( list_div ); */
g_hash_table_remove_all ( list_div );
+ g_date_free ( date_jour );
+ g_date_free ( date_min );
+ g_date_free ( date_max );
+ g_date_free ( start_current_fyear );
bet_historical_set_background_color ( tree_view );
}
@@ -764,9 +781,10 @@ void bet_historical_populate_div_model ( gpointer key,
gchar *str_average;
gchar *str_amount;
gchar *str_retained = NULL;
- gchar *titre;
+ gchar *str_current_fyear;
gint div_number;
gint account_nb;
+ gint currency_number;
gboolean sub_div_visible = FALSE;
gboolean edited = TRUE;
gsb_real period = { 12, 0 };
@@ -782,22 +800,22 @@ void bet_historical_populate_div_model ( gpointer key,
if ( kind == GSB_TYPE_CASH )
edited = FALSE;
- titre = g_object_get_data ( G_OBJECT ( account_page ), "bet_historical_period" );
+ currency_number = gsb_data_account_get_currency ( account_nb );
model = gtk_tree_view_get_model ( tree_view );
- str_balance = gsb_real_get_string_with_currency ( sbr -> current_balance,
- gsb_data_account_get_currency ( account_nb ), TRUE );
+ str_balance = gsb_real_get_string_with_currency ( sbr -> current_balance, currency_number, TRUE );
average = gsb_real_div ( sbr -> current_balance, period );
str_amount = gsb_real_save_real_to_string ( average, 2 );
- str_average = gsb_real_get_string_with_currency ( average,
- gsb_data_account_get_currency ( account_nb ), TRUE );
+ str_average = gsb_real_get_string_with_currency ( average, currency_number, TRUE );
+
+ str_current_fyear = gsb_real_get_string_with_currency ( sbr -> current_fyear, currency_number, TRUE );
gtk_tree_store_append ( GTK_TREE_STORE ( model ), &parent, NULL);
gtk_tree_store_set ( GTK_TREE_STORE ( model ),
&parent,
SPP_HISTORICAL_DESC_COLUMN, div_name,
- SPP_HISTORICAL_PERIOD_COLUMN, titre,
+ SPP_HISTORICAL_CURRENT_COLUMN, str_current_fyear,
SPP_HISTORICAL_BALANCE_COLUMN, str_balance,
SPP_HISTORICAL_AVERAGE_COLUMN, str_average,
SPP_HISTORICAL_AVERAGE_AMOUNT, str_amount,
@@ -832,6 +850,7 @@ void bet_historical_populate_div_model ( gpointer key,
g_free ( div_name );
g_free ( str_average );
g_free ( str_amount );
+ g_free ( str_current_fyear );
if ( g_hash_table_size ( sh -> list_sub_div ) <= 1 )
return;
@@ -866,11 +885,14 @@ void bet_historical_populate_div_model ( gpointer key,
str_amount = gsb_real_save_real_to_string ( average, 2 );
str_average = gsb_real_get_string_with_currency ( average,
gsb_data_account_get_currency ( sh -> account_nb ), TRUE );
+ str_current_fyear = gsb_real_get_string_with_currency ( sub_sbr -> current_fyear,
+ currency_number, TRUE );
gtk_tree_store_append ( GTK_TREE_STORE ( model ), &fils, &parent );
gtk_tree_store_set ( GTK_TREE_STORE ( model ),
&fils,
SPP_HISTORICAL_DESC_COLUMN, div_name,
+ SPP_HISTORICAL_CURRENT_COLUMN, str_current_fyear,
SPP_HISTORICAL_BALANCE_COLUMN, str_balance,
SPP_HISTORICAL_AVERAGE_COLUMN, str_average,
SPP_HISTORICAL_AVERAGE_AMOUNT, str_amount,
@@ -920,6 +942,7 @@ void bet_historical_populate_div_model ( gpointer key,
g_free ( str_balance );
g_free ( str_average );
g_free ( str_amount );
+ g_free ( str_current_fyear );
}
if ( sub_div_visible && bet_historical_get_full_div ( model, &parent ) )
@@ -1662,12 +1685,83 @@ void bet_historical_set_page_title ( gint account_number )
/**
+ * retourne la date de début de l'exercice en cours ou la date de l'année en cours.
+ *
+ *
+ * \return date de début de la période courante
+ * */
+GDate *bet_historical_get_start_date_current_fyear ( void )
+{
+ GSList *tmp_list;
+ GDate *date = NULL;
+
+ tmp_list = gsb_data_fyear_get_fyears_list ( );
+
+ if ( g_slist_length ( tmp_list ) == 0 )
+ {
+ date = gdate_today ( );
+ g_date_set_month ( date, 1 );
+ g_date_set_day ( date, 1 );
+
+ return date;
+ }
+
+ while ( tmp_list )
+ {
+ struct_fyear *fyear;
+
+ fyear = tmp_list -> data;
+
+ if ( date == NULL )
+ date = fyear -> beginning_date;
+ else
+ {
+ if ( g_date_compare ( date, fyear -> beginning_date ) < 0 )
+ date = fyear -> beginning_date;
+ }
+
+ tmp_list = tmp_list -> next;
+ }
+
+ return gsb_date_copy ( date );
+}
+
+
+/**
+ * \return 0 opération <= à date_max et < start_current_fyear (n'appartient pas à l'exercice en cours)
+ * \return 1 opération > à date_max et > start_current_fyear (appartient à l'exercice en cours)
+ * \return 2 opération <= à date_max et > start_current_fyear (appartient à l'exercice en cours)
+ * \return -1 toutes les autres opérations
+ * */
+gint bet_historical_get_type_transaction ( const GDate *date,
+ GDate *start_current_fyear,
+ GDate *date_max )
+{
+ gint result = -1;
+
+ if ( g_date_compare ( date, date_max ) <= 0 )
+ {
+ if ( g_date_compare ( date, start_current_fyear ) >= 0 )
+ result = 2;
+ else
+ result = 0;
+ }
+ else
+ {
+ if ( g_date_compare ( date, start_current_fyear ) >= 0 )
+ result = 1;
+ }
+
+ return result;
+}
+
+
+/**
*
*
*
*
* */
-
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/bet_hist.h b/src/bet_hist.h
index c25f325..897e3f1 100644
--- a/src/bet_hist.h
+++ b/src/bet_hist.h
@@ -9,7 +9,7 @@
enum bet_historical_data_columns {
SPP_HISTORICAL_SELECT_COLUMN,
SPP_HISTORICAL_DESC_COLUMN,
- SPP_HISTORICAL_PERIOD_COLUMN,
+ SPP_HISTORICAL_CURRENT_COLUMN, /* Accumulation of the current year */
SPP_HISTORICAL_BALANCE_COLUMN,
SPP_HISTORICAL_AVERAGE_COLUMN,
SPP_HISTORICAL_AVERAGE_AMOUNT, /* average column without currency */
diff --git a/src/gsb_file.c b/src/gsb_file.c
index d6b9e25..12f6849 100644
--- a/src/gsb_file.c
+++ b/src/gsb_file.c
@@ -1043,7 +1043,10 @@ void gsb_file_append_name_to_opened_list ( gchar * path_fichier )
{
/* si ce fichier est déjà le dernier ouvert, on laisse tomber */
if ( !i )
+ {
+ g_free ( real_name );
return;
+ }
position = i;
}
@@ -1062,6 +1065,7 @@ void gsb_file_append_name_to_opened_list ( gchar * path_fichier )
tab_noms_derniers_fichiers_ouverts[0] = my_strdup ( "<no file>" );
affiche_derniers_fichiers_ouverts ( );
+ g_free ( real_name );
return;
}
diff --git a/src/gsb_file_util.c b/src/gsb_file_util.c
index b2e508a..6f1d068 100644
--- a/src/gsb_file_util.c
+++ b/src/gsb_file_util.c
@@ -281,7 +281,7 @@ gboolean gsb_file_util_modify_lock ( gboolean create_swp )
gchar *lock_filename;
gchar **tab_str;
gint i;
-
+devel_debug_int ( create_swp );
/* if the file was already opened and we don't force the saving, we do nothing */
if ( (etat.fichier_deja_ouvert
&&
diff --git a/src/gsb_form_widget.c b/src/gsb_form_widget.c
index 6002254..e9726d7 100644
--- a/src/gsb_form_widget.c
+++ b/src/gsb_form_widget.c
@@ -776,7 +776,9 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
case TRANSACTION_FORM_VALUE_DATE:
/* set the financial year on automatic by default */
fyear_button = gsb_form_widget_get_widget (TRANSACTION_FORM_EXERCICE);
- if (fyear_button)
+ if ( fyear_button
+ &&
+ gsb_data_account_get_current_transaction_number (account_number) == -1 )
gsb_fyear_set_combobox_history ( fyear_button, 0 );
break;
case TRANSACTION_FORM_DEBIT :
diff --git a/src/main.c b/src/main.c
index f0fed99..bd574a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -772,6 +772,8 @@ gboolean gsb_main_set_grisbi_title ( gint account_number )
if ( titre && strlen ( titre ) > 0 )
{
titre_grisbi = g_strconcat ( titre, " - ", _("Grisbi"), NULL );
+ g_free ( titre );
+
return_value = TRUE;
}
else
@@ -784,9 +786,6 @@ gboolean gsb_main_set_grisbi_title ( gint account_number )
gsb_main_page_update_homepage_title ( titre_grisbi );
- if ( titre && strlen ( titre ) )
- g_free ( titre );
-
if ( titre_grisbi && strlen ( titre_grisbi ) > 0 )
g_free ( titre_grisbi );
hooks/post-receive
--
grisbi
More information about the cvs
mailing list