[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_4-25-gcf8a512
Pierre Biava
nobody at users.sourceforge.net
Mon Sep 26 20:12:06 CEST 2011
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 cf8a51212ba49ce5169b2513966119a300758f51 (commit)
via 26ab0ab7d3e5c549703bcb2f2e3d81bc93ac5c59 (commit)
via 7f41038a536205c79534a95e593a3c54540294a7 (commit)
via 42e94104db784209a91cd3df51cb241de517692c (commit)
via 9e3df3a9a3f32827949fbcc988d41a8929552227 (commit)
from b35d74c0a6f77b2355edb340db5e3fb1f317b57c (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 cf8a51212ba49ce5169b2513966119a300758f51
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Sep 26 20:10:31 2011 +0200
utils_real.c: removes a compiler warning
commit 26ab0ab7d3e5c549703bcb2f2e3d81bc93ac5c59
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Sep 26 20:08:20 2011 +0200
update strings
commit 7f41038a536205c79534a95e593a3c54540294a7
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Sep 26 19:32:28 2011 +0200
adding a column balance_amount in the model of historical data for the graphs
commit 42e94104db784209a91cd3df51cb241de517692c
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Sep 26 19:31:43 2011 +0200
adding a conversion function of a gdouble to a formatted chain with currency
commit 9e3df3a9a3f32827949fbcc988d41a8929552227
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Sep 26 10:05:34 2011 +0200
add preferences for the bar graph
-----------------------------------------------------------------------
Changes:
diff --git a/po/cs.po b/po/cs.po
index ec1a5b8..a1f8ae6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2011-02-19 01:39+0100\n"
"Last-Translator: Markus7cz <markus7cz at gmail.com>\n"
"Language-Team: \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Poedit-Language: Czech\n"
"X-Poedit-Country: CZECH REPUBLIC\n"
@@ -570,8 +570,8 @@ msgstr "VýchozÃ"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -580,7 +580,7 @@ msgstr "Kategorie"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -610,7 +610,7 @@ 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:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -619,7 +619,7 @@ msgid "Category"
msgstr "Kategorie"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -651,9 +651,13 @@ msgstr "Datum prvnà splátky: "
msgid "Annuel rate interest: "
msgstr "RoÄnà úroková mÃra: "
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr "%"
@@ -806,13 +810,13 @@ msgstr "Zobrazit rozpis amortizace od zaÄátku"
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
msgid "Print the array"
msgstr "Vytisknout tabulku"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
msgid "Export the array"
msgstr "Exportovat tabulku"
@@ -871,12 +875,12 @@ msgstr "Amortizace"
msgid "Credits"
msgstr "PůjÄky"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "Tisk"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -886,7 +890,7 @@ msgstr "Export"
msgid "credit.csv"
msgstr "pujcka.csv"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Nelze uložit soubor."
@@ -1015,9 +1019,8 @@ msgid "Payee"
msgstr "Plátce/pÅÃjemce"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1026,9 +1029,8 @@ msgid "Debit"
msgstr "Debet"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1125,20 +1127,36 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr "Volby"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "PÅÃjmy"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "Sloupce"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr ""
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "Vybrat"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1146,15 +1164,15 @@ msgstr "Vybrat"
msgid "Amount"
msgstr "Äástka"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr "PrůmÄr"
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
msgid "Current fyear"
msgstr "Aktuálnà rok"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
msgid "Amount retained"
msgstr "Rezervovaná Äástka"
@@ -1163,40 +1181,40 @@ msgstr "Rezervovaná Äástka"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr "pohyblivých 12 mÄsÃců"
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
msgid "Assign the amount of the last operation"
msgstr "PÅiÅadit Äástku podle poslednà transakce"
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr "KopÃrovat průmÄrnou Äástku"
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "MÄna pro tento úÄet: "
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
#, fuzzy
msgid "Data graph"
msgstr "Seskupenà dat"
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "Zdroje historických dat"
@@ -2050,10 +2068,6 @@ msgstr "Žádný podrozpoÄet"
msgid "No payee"
msgstr "Bez plátce/pÅÃjemce"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "PÅÃjmy"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Výdaje"
@@ -7207,8 +7221,8 @@ msgid ""
"Transaction #%d is linked to transaction #%d, which is linked to transaction "
"#%d.\n"
msgstr ""
-"Transakce #%d je pÅipojena k transakci #%d, která je pÅipojena k transakci #%"
-"d.\n"
+"Transakce #%d je pÅipojena k transakci #%d, která je pÅipojena k transakci #"
+"%d.\n"
#. sub-category not found
#: ../src/gsb_debug.c:611
@@ -10767,10 +10781,6 @@ msgstr "Zadejte nového plátce/pÅÃjemce"
msgid "Enter the name of the new payee"
msgstr "Zadejte jméno nového plátce/pÅÃjemce"
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr "Volby"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr "Uložit plátce/pÅÃjemce do poznámek"
@@ -10820,8 +10830,8 @@ msgid ""
"\n"
"Are you sure?"
msgstr ""
-"Chystáte se nahradit %d plátců/pÅÃjemců jejichž jména obsahujà %s hodnotou %"
-"s\n"
+"Chystáte se nahradit %d plátců/pÅÃjemců jejichž jména obsahujà %s hodnotou "
+"%s\n"
"\n"
"Opravdu pokraÄovat?"
@@ -11204,19 +11214,67 @@ msgstr "Konverze se nezdaÅila, zkuste jinou znakovou sadu"
msgid "No font defined"
msgstr "Nenà zvoleno pÃsmo"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Možnosti úÄtů hotovosti"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr " <b>%s odsouhlasenÃ</b> "
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "Zobrazit tip dne"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "Zobrazit tip dne"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "Zvolte mapu znaků"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr "Osobnà správce financÃ"
diff --git a/po/da.po b/po/da.po
index a020eaa..359f6b7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2006-03-25 13:23+0100\n"
"Last-Translator: Dmitri Popov <dmpop at openoffice.org>\n"
"Language-Team: \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: KBabel 1.11.1\n"
#: ../src/accueil.c:195
@@ -612,8 +612,8 @@ msgstr ""
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -622,7 +622,7 @@ msgstr "Kategorier"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -652,7 +652,7 @@ 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:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -661,7 +661,7 @@ msgid "Category"
msgstr "Kategori"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -698,9 +698,13 @@ msgstr "Betalingstype:"
msgid "Annuel rate interest: "
msgstr "Noter:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -860,14 +864,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "Printer"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "Printer"
@@ -933,12 +937,12 @@ msgstr "Eksportér kategorier"
msgid "Credits"
msgstr "Kredit"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr ""
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -949,7 +953,7 @@ msgstr "Eksportér"
msgid "credit.csv"
msgstr "Kredit"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr ""
@@ -1082,9 +1086,8 @@ msgid "Payee"
msgstr "Papir"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1093,9 +1096,8 @@ msgid "Debit"
msgstr "Debit"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1195,21 +1197,37 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr ""
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr ""
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "kolonner"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr ""
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
msgstr "Dato"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1217,16 +1235,16 @@ msgstr "Dato"
msgid "Amount"
msgstr "Beløb"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "Valuta"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "Kontonavn"
@@ -1236,40 +1254,40 @@ msgstr "Kontonavn"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "Opret en planlagt transaktion"
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Valutaen findes allerede.:"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "Forkert dato"
@@ -2112,10 +2130,6 @@ msgstr ""
msgid "No payee"
msgstr "Ikke vist"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr ""
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr ""
@@ -10627,10 +10641,6 @@ msgstr ""
msgid "Enter the name of the new payee"
msgstr ""
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr ""
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -10967,19 +10977,67 @@ msgstr ""
msgid "No font defined"
msgstr "Ingen kategori (%d)"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Bankkonto"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr "Skjul afstemte transaktioner"
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "Vis gitter"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "Vis gitter"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "Tilføj valuta"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 5f43d8f..4cb5388 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: 2011-09-24 22:44+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2011-09-24 22:55+0200\n"
"Last-Translator: Martin Stromberger <mstromberger at aon.at>\n"
"Language-Team: deutsch <de at li.org>\n"
@@ -132,7 +132,8 @@ msgstr "%s Ausgabe am %s"
#: ../src/accueil.c:1691
#, c-format
msgid "balance of account %s is under desired and authorised minima!"
-msgstr "Der Saldo vom Konto %s ist unter dem festgelegten und zulässigen Minimum!"
+msgstr ""
+"Der Saldo vom Konto %s ist unter dem festgelegten und zulässigen Minimum!"
#: ../src/accueil.c:1695
msgid ""
@@ -178,7 +179,8 @@ msgid "Calculation of balances"
msgstr "Berechnung der Salden"
#: ../src/accueil.c:1995
-msgid "Take into account the scheduled operations in the calculation of balances"
+msgid ""
+"Take into account the scheduled operations in the calculation of balances"
msgstr "Geplante Buchungen vom Konto in die Berechnung miteinbeziehen"
#: ../src/accueil.c:2005
@@ -444,7 +446,8 @@ msgstr "Die zugehörigen Teilbuchungen von einer Buchung wiederherstellen"
#: ../src/affichage_liste.c:602
msgid "Limit the filling with payees belonging to the current account"
-msgstr "Die Vervollständigung von Empfängern auf das aktuelle Konto beschränken"
+msgstr ""
+"Die Vervollständigung von Empfängern auf das aktuelle Konto beschränken"
#: ../src/affichage_liste.c:610
msgid "Mix credit/debit categories"
@@ -568,8 +571,8 @@ msgstr "Voreinstellung"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -578,7 +581,7 @@ msgstr "Kategorien"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -608,7 +611,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr "Geschäftsjahr oder Zeitspanne von 12 Monaten"
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -617,7 +620,7 @@ msgid "Category"
msgstr "Kategorie"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -649,9 +652,13 @@ msgstr "Datum erste Rückzahlung: "
msgid "Annuel rate interest: "
msgstr "Zinssatz jährlich: "
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr "%"
@@ -806,13 +813,13 @@ msgstr "Tilgungen geplant vom Anfang anzeigen"
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
msgid "Print the array"
msgstr "Auflistung Drucken"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
msgid "Export the array"
msgstr "Auflistung Exportieren"
@@ -871,12 +878,12 @@ msgstr "Rückzahlung"
msgid "Credits"
msgstr "Einnahmen"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "Drucken"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -886,7 +893,7 @@ msgstr "Export"
msgid "credit.csv"
msgstr "credit.csv"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Datei kann nicht gespeichert werden."
@@ -1013,9 +1020,8 @@ msgid "Payee"
msgstr "Empfänger"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1024,9 +1030,8 @@ msgid "Debit"
msgstr "Ausgaben"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1124,19 +1129,35 @@ msgstr ""
"Achtung: Es fehlen eine oder mehrere Verknüpfungen zwischen den Währungen.\n"
"Bitte die Verknüpfungen wiederherstellen und Grisbi neu starten."
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr "Weitere Optionen"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "Einnahmen"
+
+#: ../src/bet_graph.c:829
msgid "Column"
msgstr "Spalte"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr "Zeile"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "Auswählen"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1144,15 +1165,15 @@ msgstr "Auswählen"
msgid "Amount"
msgstr "Betrag"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr "Durchschnitt"
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
msgid "Current fyear"
msgstr "aktuelles Geschäftsjahr"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
msgid "Amount retained"
msgstr "einbehaltener Betrag"
@@ -1161,39 +1182,39 @@ 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:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr "Zeitspanne von 12 Monaten"
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
msgid "Assign the amount of the last operation"
msgstr "Den Betrag von der letzten Aktion zuordnen"
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr "Den durchschnittlichen Betrag kopieren"
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr "Beträge zu %s in der Zeitspanne von 12 Monaten für das Konto: «%s»"
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Beträge zu %s in %s für das Konto: «%s»"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr "Daten-Graph"
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr "Den Daten-Graph anzeigen"
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
msgid "Export the historical data"
msgstr "Historische Daten exportieren"
@@ -1213,7 +1234,8 @@ msgstr "Beginndatum: "
#: ../src/bet_tab.c:559
msgid "Check the box to automatically change start date"
-msgstr "Für eine automatische Ãnderung vom Beginndatum die 'Checkbox' auswählen"
+msgstr ""
+"Für eine automatische Ãnderung vom Beginndatum die 'Checkbox' auswählen"
#. Description entry
#: ../src/bet_tab.c:674 ../src/etats_onglet.c:277 ../src/tiers_onglet.c:679
@@ -1703,8 +1725,10 @@ msgid "Grisbi made a backup file at '%s'."
msgstr "Grisbi hat eine Sicherung im Verzeichnis '%s' erstellt."
#: ../src/erreur.c:144
-msgid "Please report this problem to <tt>http://www.grisbi.org/bugtracking/</tt>. "
-msgstr "Bitte den Fehler unter <tt>http://www.grisbi.org/bugtracking/</tt> melden. "
+msgid ""
+"Please report this problem to <tt>http://www.grisbi.org/bugtracking/</tt>. "
+msgstr ""
+"Bitte den Fehler unter <tt>http://www.grisbi.org/bugtracking/</tt> melden. "
#: ../src/erreur.c:150
msgid "Copy and paste the following backtrace with your bug report."
@@ -2049,10 +2073,6 @@ msgstr "Kein Teil-Budgeteintrag"
msgid "No payee"
msgstr "Kein Empfänger"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "Einnahmen"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Ausgaben"
@@ -4798,7 +4818,8 @@ msgstr "Ein neues Konto manuell erstellen"
#: ../src/gsb_assistant_file.c:510
msgid "Import data from online bank services or from accounting software"
-msgstr "Konten und Daten von anderen Finanzprogrammen oder Ihrer Bank importieren"
+msgstr ""
+"Konten und Daten von anderen Finanzprogrammen oder Ihrer Bank importieren"
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
#: ../src/traitement_variables.c:227
@@ -5177,7 +5198,8 @@ msgstr "Abstimmung für die Zuordnung von Buchungen auswählen: "
#: ../src/gsb_assistant_reconcile_config.c:1304
msgid "No selection found, the transactions are not modified."
-msgstr "Es wurde keine Auswahl getroffen, die Buchungen werden nicht zugeordnet."
+msgstr ""
+"Es wurde keine Auswahl getroffen, die Buchungen werden nicht zugeordnet."
#: ../src/gsb_bank.c:326 ../src/gsb_reconcile.c:442
msgid "None"
@@ -5315,7 +5337,8 @@ msgstr "Verknüpfung ändern"
#: ../src/gsb_currency.c:741
#, c-format
msgid "The exchange rate or the transaction amount in %s must be filled."
-msgstr "Es müssen entweder der Wechselkurs oder der Betrag in %s eingegeben werden."
+msgstr ""
+"Es müssen entweder der Wechselkurs oder der Betrag in %s eingegeben werden."
#: ../src/gsb_currency_config.c:94 ../src/gsb_currency_config.c:95
#: ../src/gsb_currency_config.c:96 ../src/gsb_currency_config.c:97
@@ -6707,7 +6730,8 @@ msgstr "Die Währung '%s' kann nicht entfernt werden"
#: ../src/gsb_currency_config.c:645
#, c-format
msgid "Currency '%s' is used in current file. Grisbi can't delete it."
-msgstr "Die Währung '%s' ist in Verwendung und kann daher nicht gelöscht werden."
+msgstr ""
+"Die Währung '%s' ist in Verwendung und kann daher nicht gelöscht werden."
#: ../src/gsb_currency_config.c:823
msgid "Currency for payees tree: "
@@ -6760,7 +6784,8 @@ msgstr "Währungssymbol: "
msgid ""
"Currency name and either international currency code or currency nickname "
"should be set."
-msgstr "Es muss entweder der Währungsname oder der 'ISO-Code' eingegeben werden."
+msgstr ""
+"Es muss entweder der Währungsname oder der 'ISO-Code' eingegeben werden."
#: ../src/gsb_currency_config.c:1082 ../src/gsb_data_partial_balance.c:324
#: ../src/gsb_data_partial_balance.c:434
@@ -6826,8 +6851,10 @@ msgstr "Kein Name %d"
#: ../src/gsb_data_account.c:554
#, c-format
-msgid "Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
-msgstr "Bad nb rows nach gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
+msgid ""
+"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
+msgstr ""
+"Bad nb rows nach gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
#. TODO dOm : the return value of g_strdup_printf was not used !
#. I add the devel_debug to print it. Is it OK to do that ?
@@ -6857,7 +6884,8 @@ msgstr "Kein Budgeteintrag"
#: ../src/gsb_data_budget.c:1301
#, c-format
-msgid "The transaction %d has a budget n%d and sub-budget n%d but they don't exist."
+msgid ""
+"The transaction %d has a budget n%d and sub-budget n%d but they don't exist."
msgstr ""
"Die Buchung %d hat als Budgeteintrag n%d und als Teil-Budgeteintrag n%d, "
"jedoch sind diese Budgeteinträge nicht vorhanden."
@@ -6907,7 +6935,8 @@ msgid "Only one account is selected."
msgstr "Es wurde nur ein Konto ausgewählt."
#: ../src/gsb_data_partial_balance.c:322 ../src/gsb_data_partial_balance.c:432
-msgid "The name of the partial balance and the list of accounts must be completed."
+msgid ""
+"The name of the partial balance and the list of accounts must be completed."
msgstr ""
"Der Name des partiellen Saldo und die Liste der Konten müssen vollständig "
"eingegeben werden."
@@ -6915,7 +6944,8 @@ msgstr ""
#: ../src/gsb_data_partial_balance.c:1296
#, c-format
msgid "You need to create a link between currency %s and %s."
-msgstr "Es muss eine Verknüpfung zwischen den Währungen %s und %s hergestellt werden."
+msgstr ""
+"Es muss eine Verknüpfung zwischen den Währungen %s und %s hergestellt werden."
#: ../src/gsb_data_partial_balance.c:1300
msgid "Attention missing link between currencies"
@@ -7258,7 +7288,8 @@ msgstr ""
#: ../src/gsb_debug.c:611
#, c-format
msgid "Transaction %d has category %d but invalid sub-category %d.\n"
-msgstr "Die Buchung %d hat als Kategorie %d und eine ungültige Unterkategorie %d.\n"
+msgstr ""
+"Die Buchung %d hat als Kategorie %d und eine ungültige Unterkategorie %d.\n"
#. category not found
#: ../src/gsb_debug.c:625
@@ -7449,8 +7480,10 @@ msgstr "%d Sekunden"
#: ../src/gsb_file.c:849
#, c-format
-msgid "If you close without saving, all of your changes since %s will be discarded."
-msgstr "Beim SchlieÃen ohne Speichern werden alle Ãnderungen seit %s verworfen."
+msgid ""
+"If you close without saving, all of your changes since %s will be discarded."
+msgstr ""
+"Beim SchlieÃen ohne Speichern werden alle Ãnderungen seit %s verworfen."
#: ../src/gsb_file.c:885
msgid "Name the accounts file"
@@ -7808,7 +7841,8 @@ msgstr ""
"erstellt werden."
#: ../src/gsb_form.c:2941
-msgid "Cannot associate a transfer to a deleted account in a scheduled transaction."
+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:2948
@@ -7848,11 +7882,13 @@ msgstr ""
#: ../src/gsb_form.c:3026
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."
+msgstr ""
+"Für Buchungen an mehrere Empfänger muss eine neue Buchung erfasst werden."
#: ../src/gsb_form.c:3031
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."
+msgstr ""
+"Eine Buchung an mehrere Empfänger darf kein Teil einer Splitt-Buchung sein."
#: ../src/gsb_form.c:3042
msgid "The word \"Report\" is reserved. Please use another one."
@@ -8464,7 +8500,8 @@ msgstr "Soll die geplante Teil-Buchung mit dem Empfänger '%s' gelöscht werden?
#: ../src/gsb_scheduler_list.c:1989
#, c-format
-msgid "Do you really want to delete the scheduled transaction with party '%s' ?"
+msgid ""
+"Do you really want to delete the scheduled transaction with party '%s' ?"
msgstr "Soll die geplante Buchung mit dem Empfänger '%s' gelöscht werden?"
#: ../src/gsb_scheduler_list.c:2038
@@ -8773,7 +8810,8 @@ msgstr "Abstimmung für die Zuordnung der Buchung auswählen: "
#: ../src/gsb_transactions_list.c:2179
msgid "Grisbi couldn't get the selection, operation canceled..."
-msgstr "Grisbi konnte die Auswahl nicht übernehmen, der Vorgang wurde abgebrochen..."
+msgstr ""
+"Grisbi konnte die Auswahl nicht übernehmen, der Vorgang wurde abgebrochen..."
#: ../src/gsb_transactions_list.c:2223
msgid "Impossible to delete an archived transaction."
@@ -8793,7 +8831,8 @@ msgstr ""
#: ../src/gsb_transactions_list.c:2247
#, c-format
-msgid "Do you really want to delete the child of the transaction with party '%s' ?"
+msgid ""
+"Do you really want to delete the child of the transaction with party '%s' ?"
msgstr "Soll die Teil-Buchung mit dem Empfänger '%s' gelöscht werden?"
#: ../src/gsb_transactions_list.c:2259
@@ -9245,7 +9284,8 @@ msgstr "Markieren"
#: ../src/import.c:3373
msgid "The id of the imported and chosen accounts are different"
-msgstr "Die ID's des importieren und des selektierten Kontos sind unterschiedlich"
+msgstr ""
+"Die ID's des importieren und des selektierten Kontos sind unterschiedlich"
#: ../src/import.c:3374
msgid ""
@@ -10210,7 +10250,8 @@ msgstr "Planer Meldungen"
#: ../src/parametres.c:1114
msgid "Warn/Execute the scheduled transactions arriving at expiration date"
-msgstr "am Fälligkeitsdatum einen Hinweis anzeigen und die geplante Buchung ausführen"
+msgstr ""
+"am Fälligkeitsdatum einen Hinweis anzeigen und die geplante Buchung ausführen"
#: ../src/parametres.c:1115
msgid "Warn/Execute the scheduled transactions of the month"
@@ -10411,7 +10452,8 @@ msgstr "Ungültige Ofx-Datei"
#: ../src/plugins/ofx/ofx.c:202
msgid "OFX processing returned following message:\n"
-msgstr "Bei der Verarbeitung der Ofx-Datei wurde folgende Warnung zurückgegeben:\n"
+msgstr ""
+"Bei der Verarbeitung der Ofx-Datei wurde folgende Warnung zurückgegeben:\n"
#: ../src/plugins/ofx/ofx.c:208
msgid "OFX processing ended in a warning message which is not valid."
@@ -10419,7 +10461,8 @@ msgstr "Die Datei ist keine gültige Ofx-Datei."
#: ../src/plugins/ofx/ofx.c:214
msgid "OFX processing returned following error message:\n"
-msgstr "Bei der Verarbeitung der Ofx-Datei wurde folgender Fehler zurückgegeben:\n"
+msgstr ""
+"Bei der Verarbeitung der Ofx-Datei wurde folgender Fehler zurückgegeben:\n"
#: ../src/plugins/ofx/ofx.c:220
msgid "OFX processing returned an error message which is not valid."
@@ -10849,10 +10892,6 @@ msgstr "Empfänger eingeben"
msgid "Enter the name of the new payee"
msgstr "Den Namen vom neuen Empfänger eingeben"
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr "Weitere Optionen"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr "Den Namen vom Empfänger in das Feld Notizen eintragen"
@@ -10912,7 +10951,8 @@ msgstr "Es muss der Name von einem Empfänger für die Suche eingegeben werden."
#: ../src/tiers_onglet.c:1562
msgid "Beware you don't use one of models for the research."
-msgstr "Einen Empfänger auswählen oder bei der Eingabe das '%' Zeichen verwenden."
+msgstr ""
+"Einen Empfänger auswählen oder bei der Eingabe das '%' Zeichen verwenden."
#: ../src/tiers_onglet.c:1660
#, c-format
@@ -11148,7 +11188,8 @@ msgstr ""
"angeordnet werden können?"
#: ../src/tip.c:100
-msgid "You can have future scheduled transactions 'executed' before their date, "
+msgid ""
+"You can have future scheduled transactions 'executed' before their date, "
msgstr ""
"... geplante Buchungen auch manuell ausgeführt werden können?\n"
"\n"
@@ -11200,7 +11241,8 @@ msgstr ""
#: ../src/transaction_list_sort.c:145
#, c-format
-msgid "Asked to sort by column %d, wich is bigger than the visible columns (%d)"
+msgid ""
+"Asked to sort by column %d, wich is bigger than the visible columns (%d)"
msgstr ""
"Es wurde ein Sortierung nach Spalte %d aufgerufen, dieses Spalte ist breiter "
"als die sichtbaren Spalten (%d)"
@@ -11310,18 +11352,65 @@ msgstr ""
msgid "No font defined"
msgstr "Keine Schrift definiert"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Einstellungen für Bargeldkonten"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr " <b>%s Abstimmung</b> "
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
msgid "Display the data graph"
msgstr "Den Daten-Graph anzeigen"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "Den Daten-Graph anzeigen"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
msgid "Select the chart type"
msgstr "Den Chart-Typ auswählen"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr "Finanzprogramm für Privatpersonen"
-
diff --git a/po/el.po b/po/el.po
index 45affb0..100c4bc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Grisbi 0.5.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2009-04-13 14:53+0200\n"
"Last-Translator: \n"
"Language-Team: KASKAS <ttnfy17 at yahoo.gr>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -620,8 +620,8 @@ msgstr "ΠίÏÏ ÏÏην ÏÏοεÏιλογή"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -630,7 +630,7 @@ msgstr "ÎαÏηγοÏίεÏ"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -660,7 +660,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr "ÎÏιλÎξÏε Ïο Î¿Î¹ÎºÎ¿Î½Î¿Î¼Î¹ÎºÏ ÎÏοÏ"
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -669,7 +669,7 @@ msgid "Category"
msgstr "ÎαÏηγοÏία"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -706,9 +706,13 @@ msgstr "μÎÎ¸Î¿Î´Î¿Ï ÏληÏÏμήÏ:"
msgid "Annuel rate interest: "
msgstr "ÎÏήÏÎ¹Î¿Ï ÏÏοÏÏολογιÏμÏÏ:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -868,14 +872,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "ÎκÏÏ
ÏÏÏήÏ"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "ÎκÏÏ
ÏÏÏήÏ"
@@ -941,12 +945,12 @@ msgstr "ΣειÏά εκÏίμηÏηÏ"
msgid "Credits"
msgstr "ΠίÏÏÏÏη"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "ÎκÏÏÏÏÏη"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -957,7 +961,7 @@ msgstr "ÎξαγÏγή"
msgid "credit.csv"
msgstr "ΠίÏÏÏÏη"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "ÎδÏναÏη η αÏοθήκεÏ
Ïη αÏÏείοÏ
"
@@ -1086,9 +1090,8 @@ msgid "Payee"
msgstr "ÎικαιοÏÏÎ¿Ï ÏληÏÏμήÏ"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1097,9 +1100,8 @@ msgid "Debit"
msgstr "ΧÏÎÏÏη"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1200,20 +1202,36 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr "ÎÏιλογÎÏ"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "ÎιÏοδήμαÏα"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "ΣÏήλεÏ"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr ""
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "ÎÏιλÎξÏε"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1221,16 +1239,16 @@ msgstr "ÎÏιλÎξÏε"
msgid "Amount"
msgstr "ΠοÏÏ"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr "ÎÎÏÎ¿Ï ÏÏοÏ"
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "ΤÏÎÏον ÎÏοÏ"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "Îνομα λογαÏιαÏμοÏ"
@@ -1240,41 +1258,41 @@ msgstr "Îνομα λογαÏιαÏμοÏ"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "ÎναÏÏÏÎÏÏε Ïο ÏοÏÏ ÏÏν ειÏαγÏμενÏν ÏÏ
ναλλαγÏν"
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "ÎÏμιÏμα για Ïον λογαÏιαÏμÏ.:"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
#, fuzzy
msgid "Data graph"
msgstr "ÎμαδοÏοίηÏη ÏÏοιÏείÏν"
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "ÎÏÏική ημεÏομηνία"
@@ -2168,10 +2186,6 @@ msgstr "Îαμία Ï
Ïο--δημοÏιονομική γÏαμμή"
msgid "No payee"
msgstr "ÎανÎÎ½Î±Ï Î´Î¹ÎºÎ±Î¹Î¿ÏÏÎ¿Ï ÏληÏÏμήÏ"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "ÎιÏοδήμαÏα"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Îξοδα"
@@ -7543,8 +7557,8 @@ msgstr "Î ÏÏ
ναλλαγή %d ÎÏει Ïην άκÏ
Ïη καÏηγοÏία %
#, c-format
msgid "Transaction %d has budget %d but invalid sub-budget %d.\n"
msgstr ""
-"Î ÏÏ
ναλλαγή %d ÎÏει Ïον ÏÏοÏÏολογιÏÎ¼Ï %d αλλά Ïον άκÏ
Ïο Ï
Ïο--ÏÏοÏÏολογιÏÎ¼Ï %"
-"d.\n"
+"Î ÏÏ
ναλλαγή %d ÎÏει Ïον ÏÏοÏÏολογιÏÎ¼Ï %d αλλά Ïον άκÏ
Ïο Ï
Ïο--ÏÏοÏÏολογιÏÎ¼Ï "
+"%d.\n"
#. budget not found
#: ../src/gsb_debug.c:729
@@ -9694,8 +9708,8 @@ msgstr "Îι ειÏαγÏÎ¼ÎµÎ½ÎµÏ ÏÏ
ναλλαγÎÏ Î¸Î± ÏÏοÏÏεθοÏ
#, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr ""
-"Îι ειÏαγÏÎ¼ÎµÎ½ÎµÏ ÏÏ
ναλλαγÎÏ Î¸Î± ÏαÏακÏηÏίÏοÏ
ν ÏÎ¹Ï ÏÏ
ναλλαγÎÏ ÏÏον λογαÏιαÏÎ¼Ï %"
-"s.\n"
+"Îι ειÏαγÏÎ¼ÎµÎ½ÎµÏ ÏÏ
ναλλαγÎÏ Î¸Î± ÏαÏακÏηÏίÏοÏ
ν ÏÎ¹Ï ÏÏ
ναλλαγÎÏ ÏÏον λογαÏιαÏÎ¼Ï "
+"%s.\n"
#. textstring 2
#: ../src/import.c:4582
@@ -11209,10 +11223,6 @@ msgstr "ÎιÏάγεÏε Ïο νÎο δικαιοÏÏο ÏληÏÏμήÏ"
msgid "Enter the name of the new payee"
msgstr "ÎιÏάγεÏε Ïο Ïνομα ÏοÏ
νÎοÏ
δικαιοÏÏοÏ
ÏληÏÏμήÏ"
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr "ÎÏιλογÎÏ"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr "ÎκÏÏÏ Î±ÏÏ ÏοÏ
Ï Î´Î¹ÎºÎ±Î¹Î¿ÏÏοÏ
Ï ÏληÏÏÎ¼Î®Ï ÏÏÎ¹Ï ÏημειÏÏειÏ"
@@ -11576,19 +11586,67 @@ msgstr ""
msgid "No font defined"
msgstr "Îεν καθοÏίÏÏηκε γÏαμμαÏοÏειÏά"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "ÎÏιλÎξÏε ÏοÏ
Ï Î»Î¿Î³Î±ÏιαÏμοÏÏ Î¼ÎµÏÏηÏÏν"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr " <b>%s ÏÏ
μÏÏνία</b> "
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "ÎμÏάνιÏη ÏÏ
μβοÏ
Î»Î®Ï ÏÎ·Ï Î·Î¼ÎÏαÏ"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "ÎμÏάνιÏη ÏÏ
μβοÏ
Î»Î®Ï ÏÎ·Ï Î·Î¼ÎÏαÏ"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "ÎÏιλÎξÏε Ïο βαÏÎ¹ÎºÏ Î½ÏμιÏμα"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
#, fuzzy
msgid "Personnal finances manager"
diff --git a/po/eo.po b/po/eo.po
index 81b3e32..2167439 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: eo\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2009-06-28 20:04+0200\n"
"Last-Translator: Cyril Castelbou <cyril.castelbou at free.fr>\n"
"Language-Team: esperanto <eo at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
#: ../src/accueil.c:195
msgid "Closed liabilities accounts"
@@ -558,8 +558,8 @@ msgstr ""
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -568,7 +568,7 @@ msgstr ""
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -596,7 +596,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr ""
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -605,7 +605,7 @@ msgid "Category"
msgstr ""
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -637,9 +637,13 @@ msgstr ""
msgid "Annuel rate interest: "
msgstr ""
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -786,13 +790,13 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
msgid "Print the array"
msgstr ""
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
msgid "Export the array"
msgstr ""
@@ -851,12 +855,12 @@ msgstr ""
msgid "Credits"
msgstr ""
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr ""
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -866,7 +870,7 @@ msgstr ""
msgid "credit.csv"
msgstr ""
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr ""
@@ -993,9 +997,8 @@ msgid "Payee"
msgstr ""
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1004,9 +1007,8 @@ msgid "Debit"
msgstr ""
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1100,19 +1102,35 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr ""
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr ""
+
+#: ../src/bet_graph.c:829
msgid "Column"
msgstr ""
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr ""
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr ""
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1120,15 +1138,15 @@ msgstr ""
msgid "Amount"
msgstr ""
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
msgid "Current fyear"
msgstr ""
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
msgid "Amount retained"
msgstr ""
@@ -1137,39 +1155,39 @@ msgstr ""
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
msgid "Assign the amount of the last operation"
msgstr ""
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
msgid "Export the historical data"
msgstr ""
@@ -1968,10 +1986,6 @@ msgstr ""
msgid "No payee"
msgstr ""
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr ""
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr ""
@@ -10051,10 +10065,6 @@ msgstr ""
msgid "Enter the name of the new payee"
msgstr ""
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr ""
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -10383,17 +10393,62 @@ msgstr ""
msgid "No font defined"
msgstr ""
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+msgid "<b>Options for the columns</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:6
+msgid "<b>Position</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
msgid "Display the data graph"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+msgid "Display the grids above the plot"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
msgid "Select the chart type"
msgstr ""
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 3ccf304..b8536b5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2010-05-09 11:48+0100\n"
"Last-Translator: Carlos M. Cámara Mora <cmcamara at gmail.com>\n"
"Language-Team: Spanish <es at li.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
"X-Poedit-Bookmarks: -1,-1,806,-1,-1,-1,-1,-1,-1,-1\n"
#: ../src/accueil.c:195
@@ -584,8 +584,8 @@ msgstr "Por defecto"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -594,7 +594,7 @@ msgstr "CategorÃas"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -624,7 +624,7 @@ 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:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -633,7 +633,7 @@ msgid "Category"
msgstr "CategorÃa"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -670,9 +670,13 @@ msgstr "la forma de pago: "
msgid "Annuel rate interest: "
msgstr "Presupuesto anual: "
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -830,14 +834,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "Impresora"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "Impresora"
@@ -903,12 +907,12 @@ msgstr "Estimar tabla"
msgid "Credits"
msgstr "Crédito"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "Imprimir"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -919,7 +923,7 @@ msgstr "Exportar"
msgid "credit.csv"
msgstr "Crédito"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "No puedo guardar el archivo."
@@ -1048,9 +1052,8 @@ msgid "Payee"
msgstr "Tercero"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1059,9 +1062,8 @@ msgid "Debit"
msgstr "Débito"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1159,20 +1161,36 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr "Opciones"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "Ingresos"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "Columnas"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr ""
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "Seleccionar"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcil src/export_csv.c:800 nsactions_list.c:170 ¹Ï ÏημειÏÏειÏ" Ï ÏÏον λογαÏιαÏÎ¼Ï " àqÿ uR¿Ú* ªS¿Ú* ¥s¿Ú* oÀÚ* PÄàqÿ °ÀÚ* @¹àqÿ ¸àqÿ k R¿Ú* 6 è è! è! àÃàqÿ PÄàqÿ xToÀÚ* @ºàqÿ R¿Ú* R¿Ú* àÃàqÿ `R¿Ú* Äàqÿ ÀOÓÀÚ* uR¿Ú* @ÓÀÚ* ØDÓÀÚ* ¨IÓÀÚ* ªS¿Ú* xToÀÚ* @ºàqÿ ¹àqÿ k R¿Ú* à! à! àÃàqÿ PÄàqÿ HOÀÚ* »àqÿ R¿Ú* R¿Ú* àÃàqÿ `R¿Ú* Äàqÿ Äàqÿ Äàqÿ 8«s¿Ú* p PÄàqÿ uR¿Ú* ªS¿Ú* »àqÿ ð¹àqÿ k R¿Ú* G H I J K M N O P àÃàqÿ PÄàqÿ HÕ%ÀÚ* À¼àqÿ R¿Ú* R¿Ú* àÃàqÿ 0OÓÀÚ* uR¿Ú* `oÀÚ* ÀÚ* @ÓÀÚ* ØDÓÀÚ* ¨IÓÀÚ* ªS¿Ú* HÕ%ÀÚ* À¼àqÿ
»àqÿ k R¿Ú* 8Õ%ÀÚ* À¼àqÿ 0»àqÿ k R¿Ú* (Õ%ÀÚ* À¼àqÿ `»àqÿ k R¿Ú* Õ%ÀÚ* À¼àqÿ »àqÿ k R¿Ú* ¨NÓÀÚ* uR¿Ú* ¨IÓÀÚ* ¶àqÿ XÀÚ* eR¿Ú* ØDÓÀÚ* 0¼àqÿ yXÀÚ* eR¿Ú* @ÓÀÚ* `¼àqÿ ZXÀÚ* eR¿Ú* ØÀÚ* `oÀÚ* ÀÚ* @ÓÀÚ* ØdoÀÚ* ØDÓÀÚ* ¨IÓÀÚ* ªS¿Ú* 8«s¿Ú* ÍοÚ* PÄàqÿ pÀÚ* ¾àqÿ à¼àqÿ k R¿Ú* 5 6 7 8 : < = > ? @ B D àÃàqÿ PÄàqÿ àÍË¿Ú* PÄàqÿ uR¿Ú* ¥s¿Ú* ¼àqÿ ÍοÚ* eR¿Ú* ¥s¿Ú* Õ_ at fÆS Qöl±íÁã¿Ú* PÄàqÿ àÍË¿Ú* ¿àqÿ ð½àqÿ k R¿Ú* u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*ÄvàÃàqÿ PÄàqÿ H¿Ú* dÔ¿Ú* Åàqÿ ¦p6ÁÚ* ¦p6ÁÚ* ¶Ñ¿Ú* Äàqÿ PÅàqÿ Äàqÿ pÀàqÿ ooÀÚ* uR¿Ú* ØdoÀÚ* ÐÆàqÿ ¢p6ÁÚ* Åàqÿ 0Áàq
ÿ ÿÿÿÿÿÿÿÿ¢p6ÁÚ* XÄàqÿ e_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1180,16 +1198,16 @@ msgstr "Seleccionar"
msgid "Amount"
msgstr "Cantidad"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr "Promedio"
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "Año actual"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
msgid "Amount retained"
msgstr "Cantidad retenida"
@@ -1198,40 +1216,40 @@ msgstr "Cantidad retenida"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr "12 meses naturales"
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
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:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr "Copiar la cantidad promedio"
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Moneda para la cuenta: "
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
#, fuzzy
msgid "Data graph"
msgstr "Agroupación de datos"
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "Fuentes de datos históricos"
@@ -2105,10 +2123,6 @@ msgstr "Sin lÃnea subpresupuestaria"
msgid "No payee"
msgstr "Sin Tercero"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "Ingresos"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Salidas"
@@ -10960,10 +10974,6 @@ msgstr "Introduzca la nueva tercera parte"
msgid "Enter the name of the new payee"
msgstr "Introduzca el nombre de la nueva tercera parte"
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr "Opciones"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr "Guardar las terceras partes en las notas"
@@ -11397,19 +11407,67 @@ msgstr "La conversión falló, pruebe otro conjunto de caracteres"
msgid "No font defined"
msgstr "No se definión ninguna fuente"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Seleccionar las cuentas de efectivo"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr " <b>%s reconciliación</b> "
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "Mostrar el consejo del dÃa"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "Mostrar el consejo del dÃa"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "Seleccione un mapa de caracteres"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
#, fuzzy
msgid "Personnal finances manager"
diff --git a/po/fa.po b/po/fa.po
index eb68a7a..cf97a04 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,14 +9,14 @@ msgid ""
msgstr ""
"Project-Id-Version: girisbi VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2008-10-02 10:07+0330\n"
"Last-Translator: hadi <hadi60 at gmail.com>\n"
"Language-Team: farsi <en at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
#: ../src/accueil.c:195
msgid "Closed liabilities accounts"
@@ -598,8 +598,8 @@ msgstr "ÙÛØ´ Ùرض"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -608,7 +608,7 @@ msgstr ""
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -637,7 +637,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr ""
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -646,7 +646,7 @@ msgid "Category"
msgstr "بخش"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -682,9 +682,13 @@ msgstr ""
msgid "Annuel rate interest: "
msgstr "درآÙ
د Ùا:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -842,14 +846,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "پرÛÙتر"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "پرÛÙتر"
@@ -915,12 +919,12 @@ msgstr "تÙضÛØات"
msgid "Credits"
msgstr "Ù
ا٠جارÛ"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "پرÛÙت"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -931,7 +935,7 @@ msgstr "صادر"
msgid "credit.csv"
msgstr "Ù
ا٠جارÛ"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "ÙاÛ٠ذخÛر٠Ùشد."
@@ -1060,9 +1064,8 @@ msgid "Payee"
msgstr ""
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1071,9 +1074,8 @@ msgid "Debit"
msgstr ""
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1171,21 +1173,37 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr ""
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "درآÙ
د Ùا"
+
+#: ../src/bet_graph.c:829
msgid "Column"
msgstr ""
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
#, fuzzy
msgid "Line"
msgstr "ÙÛÙÚ© Ùا"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
msgstr "ØØ°Ù"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1193,16 +1211,16 @@ msgstr "ØØ°Ù"
msgid "Amount"
msgstr "Ù
Ùدار"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "سا٠جارÛ"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "Øساب Ùا"
@@ -1212,39 +1230,39 @@ msgstr "Øساب Ùا"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
msgid "Assign the amount of the last operation"
msgstr ""
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Øساب باÙÚ©:"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "پرÛÙتر"
@@ -2068,10 +2086,6 @@ msgstr ""
msgid "No payee"
msgstr ""
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "درآÙ
د Ùا"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr ""
@@ -10420,10 +10434,6 @@ msgstr ""
msgid "Enter the name of the new payee"
msgstr ""
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr ""
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -10757,19 +10767,66 @@ msgstr ""
msgid "No font defined"
msgstr ""
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Øساب باÙÚ©"
+
+#: ../src/ui/bet_graph.ui.h:6
+msgid "<b>Position</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "ÙÙ
اÛØ´ ÙاÙ
Øساب"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "ÙÙ
اÛØ´ ÙاÙ
Øساب"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "اÙتخاب ÙاØد"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 33590cd..120124b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,14 +14,14 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
-"PO-Revision-Date: 2011-02-01 21:33+0100\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
+"PO-Revision-Date: 2011-09-26 20:02+0200\n"
"Last-Translator: Pierre Biava <pierre at pierre.biava.name>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Poedit-Language: french\n"
#: ../src/accueil.c:195
@@ -577,8 +577,8 @@ msgstr "Par défaut"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -587,7 +587,7 @@ msgstr "Catégories"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -617,7 +617,7 @@ 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:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -626,7 +626,7 @@ msgid "Category"
msgstr "Catégorie"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -658,9 +658,13 @@ msgstr "Date de la première échéance : "
msgid "Annuel rate interest: "
msgstr "Taux d'intérêt annuel : "
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr "%"
@@ -815,13 +819,13 @@ msgstr "Afficher le tableau d'amortissement depuis le début"
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
msgid "Print the array"
msgstr "Imprimer le tableau"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
msgid "Export the array"
msgstr "Exporter le tableau"
@@ -880,12 +884,12 @@ msgstr "Amortissement"
msgid "Credits"
msgstr "Crédits"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "Imprimer"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -895,7 +899,7 @@ msgstr "Exporter"
msgid "credit.csv"
msgstr "crédit.csv"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Impossible d'enregistrer le fichier."
@@ -1024,9 +1028,8 @@ msgid "Payee"
msgstr "Tiers"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1035,9 +1038,8 @@ msgid "Debit"
msgstr "Débit"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1135,19 +1137,35 @@ msgstr ""
"Erreur : il manque un ou plusieurs liens entre les devises.\n"
" Vous devez corriger ça et recommencer."
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr "Graphique"
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr "Options"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr "Dépenses"
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "Revenus"
+
+#: ../src/bet_graph.c:829
msgid "Column"
msgstr "Colonnes"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr "Ligne"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "Sélectionner"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1155,15 +1173,15 @@ msgstr "Sélectionner"
msgid "Amount"
msgstr "Montant"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr "Moyenne"
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
msgid "Current fyear"
msgstr "Année en cours"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
msgid "Amount retained"
msgstr "Montant retenu"
@@ -1172,39 +1190,39 @@ msgstr "Montant retenu"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr "12 mois glissants"
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
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:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr "Copier la valeur moyenne"
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr "Montants par %s sur 12 mois glissants pour le compte : «%s»"
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Montants par %s en %s pour le compte : «%s»"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr "Graphique"
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr "Afficher le graphique"
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
msgid "Export the historical data"
msgstr "Exporter les données historiques"
@@ -1656,8 +1674,8 @@ msgstr ""
"les montants des rapprochements n'était pas sauvegardé. C'est désormais le "
"cas, Grisbi va tenter de deviner ces valeurs à partir de vos comptes. Bien "
"que cela n'ait aucune incidence sur l'intégrité des données, de mauvaises "
-"valeurs peuvent être trouvées. Vérifier dans la fenêtre « Préférences » pour "
-"plus d'information."
+"valeurs peuvent être trouvées. Vérifier dans la fenêtre « Préférences » "
+"pour plus d'information."
#: ../src/dialog.c:109
#, c-format
@@ -2068,10 +2086,6 @@ msgstr "Pas de sous-imputation"
msgid "No payee"
msgstr "Pas de tiers"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "Revenus"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Dépenses"
@@ -7407,8 +7421,8 @@ msgid ""
"with another name or activate the \"%s\" option in preferences."
msgstr ""
"Grisbi n'a pas pu sauvegarder ce fichier car il est marqué comme utilisé. "
-"Veuillez le sauvegarder sous un autre nom ou activer l'option « %s » dans les "
-"préférences."
+"Veuillez le sauvegarder sous un autre nom ou activer l'option « %s » dans "
+"les préférences."
#. Warn if file is used by someone else?
#: ../src/gsb_file.c:561 ../src/gsb_file.c:814 ../src/parametres.c:883
@@ -8487,7 +8501,8 @@ msgstr "%d ans"
msgid ""
"Do you really want to delete the child of the scheduled transaction with "
"party '%s' ?"
-msgstr "Voulez vous vraiment supprimer la sous-opération avec le tiers « %s » ?"
+msgstr ""
+"Voulez vous vraiment supprimer la sous-opération avec le tiers « %s » ?"
#: ../src/gsb_scheduler_list.c:1989
#, c-format
@@ -8817,7 +8832,8 @@ msgstr ""
#, c-format
msgid ""
"Do you really want to delete the child of the transaction with party '%s' ?"
-msgstr "Voulez vous vraiment supprimer la sous-opération avec le tiers « %s » ?"
+msgstr ""
+"Voulez vous vraiment supprimer la sous-opération avec le tiers « %s » ?"
#: ../src/gsb_transactions_list.c:2259
#, c-format
@@ -9091,8 +9107,8 @@ msgid ""
msgstr ""
"<span size=\"x-large\">%s</span>\n"
"\n"
-"Que voulez vous faire avec les données du fichier <span foreground=\"blue\">%"
-"s</span> ?\n"
+"Que voulez vous faire avec les données du fichier <span foreground=\"blue\">"
+"%s</span> ?\n"
#: ../src/import.c:1277
msgid "Add transactions to an account"
@@ -10851,10 +10867,6 @@ msgstr "Entrez le nouveau tiers"
msgid "Enter the name of the new payee"
msgstr "Entrez le nom du nouveau tiers : "
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr "Options"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr "Sauvegarder les tiers dans les notes"
@@ -11317,17 +11329,62 @@ msgstr "La conversion à échoué essayez un autre jeu de caractères"
msgid "No font defined"
msgstr "Aucune police définie"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr "Graduation principale"
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr "Options de l'axe X"
+
+#: ../src/ui/bet_graph.ui.h:5
+msgid "<b>Options for the columns</b>"
+msgstr "Option des barres du graphique"
+
+#: ../src/ui/bet_graph.ui.h:6
+msgid "<b>Position</b>"
+msgstr " <b>Position</b> "
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr "Croise l'axe des Y Ã 0"
+
+#: ../src/ui/bet_graph.ui.h:8
msgid "Display the data graph"
msgstr "Afficher le graphique"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+msgid "Display the grids above the plot"
+msgstr "Afficher les étiquettes sur les barres"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr "Espacement"
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr "En haut"
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr "A l'intérieur"
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr "En bas"
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr "A l'extérieur"
+
+#: ../src/ui/bet_graph.ui.h:15
msgid "Select the chart type"
msgstr "Sélectionnez le type de graphique"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr "Afficher les étiquettes"
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr "Gestionnaire de finances personnelles"
diff --git a/po/he.po b/po/he.po
index fdb00fe..27146e8 100644
--- a/po/he.po
+++ b/po/he.po
@@ -283,14 +283,14 @@ msgid ""
msgstr ""
"Project-Id-Version: he\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2006-02-11 16:08+0200\n"
"Last-Translator: dotan\n"
"Language-Team: <en at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: KBabel 1.9.1\n"
#: ../src/accueil.c:195
@@ -898,8 +898,8 @@ msgstr "×××¨× ×× ×××ר×ת ×ר×רת ×××××"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -908,7 +908,7 @@ msgstr "ק×××ר××ת"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -938,7 +938,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr "×××רת ×©× ×ª ××ספ××"
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -947,7 +947,7 @@ msgid "Category"
msgstr "ק×××ר××"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -984,9 +984,13 @@ msgstr "××¨× ×תש×××:"
msgid "Annuel rate interest: "
msgstr "תקצ×× ×©× ×ª×:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -1147,14 +1151,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "××פסת"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "××פסת"
@@ -1220,12 +1224,12 @@ msgstr "פע×××"
msgid "Credits"
msgstr "×××ת"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "××פס×"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -1236,7 +1240,7 @@ msgstr "××צ××"
msgid "credit.csv"
msgstr "×××ת"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "×× × ××ª× ×ש××ר ×ת ×ק×××¥."
@@ -1370,9 +1374,8 @@ msgid "Payee"
msgstr "×ש××/×ק××"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1381,9 +1384,8 @@ msgid "Debit"
msgstr "××××"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1484,22 +1486,39 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+#, fuzzy
+msgid "Options"
+msgstr "××צ××ת"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "××× ×¡×ת"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "×ער×ת"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
#, fuzzy
msgid "Line"
msgstr "ר×ש×××"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
msgstr "×ס×× ×××"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1507,16 +1526,16 @@ msgstr "×ס×× ×××"
msgid "Amount"
msgstr "×××ת"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "×©× × × ××××ת"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "ס××× ××§× ×ª×§×¦××"
@@ -1526,42 +1545,42 @@ msgstr "ס××× ××§× ×ª×§×¦××"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "×××× ×ס××× ×ת×ר×× ×©× ××¢××¡×§× ××××××ת."
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"××××¢ %s ×× × ×צ×.\n"
":"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "ת×ר×× ×ת×××"
@@ -2430,10 +2449,6 @@ msgstr "××× ×ª×ª-×§× ×ª×§×¦××"
msgid "No payee"
msgstr "××× ×©×"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "××× ×¡×ת"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "××צ××ת"
@@ -7701,8 +7716,8 @@ msgid ""
"with another name or activate the \"%s\" option in preferences."
msgstr ""
"×ר×ס×× ×× ×צ××× ×ש××ר ק×××¥ ×× ×××× ×©××× × ×¢××. ×ש ×ש××ר ×××ª× ××©× ××ר, ×× "
-"××פע×× ×ת ××פשר×ת ×©× \"%s\" ××××ר×ת ×ת××× ×. ×××××פ××, × ××ª× ××××ר ××פשר×ת \"%"
-"s\" ×שר × ×צ×ת ×ת×ת."
+"××פע×× ×ת ××פשר×ת ×©× \"%s\" ××××ר×ת ×ת××× ×. ×××××פ××, × ××ª× ××××ר ××פשר×ת "
+"\"%s\" ×שר × ×צ×ת ×ת×ת."
#. Warn if file is used by someone else?
#: ../src/gsb_file.c:561 ../src/gsb_file.c:814 ../src/parametres.c:883
@@ -11186,11 +11201,6 @@ msgstr "× × ××××× ×ת ×©× ××¦× ×ש×××©× ×××ש"
msgid "Enter the name of the new payee"
msgstr "× × ××××× ×©× ×¢××ר תת-×§× ×תקצ×× ×××ש"
-#: ../src/tiers_onglet.c:1064
-#, fuzzy
-msgid "Options"
-msgstr "××צ××ת"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -11536,19 +11546,67 @@ msgstr ""
msgid "No font defined"
msgstr "××× ×§× ×ª×§×¦××"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "×××רת ×ש××× ×ת ×××××"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr "×ת×××"
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "×צ×ת ש××ת (תת×) ×ק×××ר××ת"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "×צ×ת ש××ת (תת×) ×ק×××ר××ת"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "×××רת ×ש××× ×ת ×× ×§"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
@@ -12982,8 +13040,8 @@ msgstr ""
#~ msgstr "×× × ××ª× ×פת×× ×ת ×ק×××¥ '%s' : ×× ××× × ×§×××¥ ×©× ×ר×ס××"
#~ msgid ""
-#~ "Warning: Grisbi data format has changed. Grisbi made a backup under '%"
-#~ "s'.\n"
+#~ "Warning: Grisbi data format has changed. Grisbi made a backup under "
+#~ "'%s'.\n"
#~ "Keep it for a while just in case."
#~ msgstr ""
#~ "×××ר×: ××¨× ×©××רת ×××××¢ ×©× ×ר×ס×× ××©×ª× ×ª×. ×ר×ס×× ×¢×©× ××××× ××©× '%s'.\n"
diff --git a/po/it.po b/po/it.po
index ed3f7e4..47aa95a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2007-04-05 00:03+0000\n"
"Last-Translator: Fabio Erculiani <fabio.erculiani at gmail.com>\n"
"Language-Team: Italian <LL at li.org>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
#: ../src/accueil.c:195
msgid "Closed liabilities accounts"
@@ -621,8 +621,8 @@ msgstr "Ripristina i valori predefiniti"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -631,7 +631,7 @@ msgstr "Categorie"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -661,7 +661,7 @@ 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:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -670,7 +670,7 @@ msgid "Category"
msgstr "Categoria"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -707,9 +707,13 @@ msgstr "metodo di pagamento:"
msgid "Annuel rate interest: "
msgstr "Budget annuale:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -870,14 +874,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "Stampante"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "Stampante"
@@ -943,12 +947,12 @@ msgstr "Azione"
msgid "Credits"
msgstr "Credito"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "Stampa"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -959,7 +963,7 @@ msgstr "Esporta"
msgid "credit.csv"
msgstr "Credito"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Impossibile salvare il file."
@@ -1093,9 +1097,8 @@ msgid "Payee"
msgstr "Debitore/Creditore"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1104,9 +1107,8 @@ msgid "Debit"
msgstr "Debito"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1207,22 +1209,39 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+#, fuzzy
+msgid "Options"
+msgstr "Uscite"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "Entrate"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "Commenti"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
#, fuzzy
msgid "Line"
msgstr "Licenza"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
msgstr "Seleziona tutto"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1230,16 +1249,16 @@ msgstr "Seleziona tutto"
msgid "Amount"
msgstr "Totale"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "Anno corrente"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "Importo per linea budget"
@@ -1249,42 +1268,42 @@ msgstr "Importo per linea budget"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, 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:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"Moneta %s non trovata.\n"
":"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "Data inizio"
@@ -2154,10 +2173,6 @@ msgstr "Nessuna linea sotto-budget"
msgid "No payee"
msgstr "Conto %d"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "Entrate"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Uscite"
@@ -10926,11 +10941,6 @@ msgstr "Inserisci il nuovo nome della categoria personalizzata"
msgid "Enter the name of the new payee"
msgstr "Inserisci il nome della linea sotto-budget"
-#: ../src/tiers_onglet.c:1064
-#, fuzzy
-msgid "Options"
-msgstr "Uscite"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -11276,19 +11286,67 @@ msgstr ""
msgid "No font defined"
msgstr "Nessuna linea budget"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Seleziona conti contanti"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr "Riconciliazione"
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "Visualizza il nome della sotto-categoria"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "Visualizza il nome della sotto-categoria"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "Seleziona conti bancari"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
@@ -12654,8 +12712,8 @@ msgstr ""
#~ msgstr "Impossibile aprire il file '%s' : non è un file di grisbi"
#~ msgid ""
-#~ "Warning: Grisbi data format has changed. Grisbi made a backup under '%"
-#~ "s'.\n"
+#~ "Warning: Grisbi data format has changed. Grisbi made a backup under "
+#~ "'%s'.\n"
#~ "Keep it for a while just in case."
#~ msgstr ""
#~ "Attenzione: Il formato della data di Grisbi è cambiato. Grisbi ha fatto "
diff --git a/po/lv.po b/po/lv.po
index 81449cd..e773184 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2010-11-08 20:02+0300\n"
"Last-Translator: Valdis VÄ«toliÅÅ¡ <valdis.vitolins at odo.lv>\n"
"Language-Team: LATVIAN <info at odo.lv>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Poedit-Country: Latvia\n"
"X-Poedit-Language: Latvian\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -590,8 +590,8 @@ msgstr "PÄc noklusÄjuma"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -600,7 +600,7 @@ msgstr "Kategorijas"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -630,7 +630,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr "IzvÄlÄties finanÅ¡u gadu, vai pÄdÄjos 12 mÄneÅ¡us"
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -639,7 +639,7 @@ msgid "Category"
msgstr "Kategorija"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -676,9 +676,13 @@ msgstr "maksÄÅ¡anas veids:"
msgid "Annuel rate interest: "
msgstr "Gada budžets:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -836,14 +840,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "PrintÄt"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "EksportÄt budžeta sarakstus"
@@ -909,12 +913,12 @@ msgstr "Importa apvienības"
msgid "Credits"
msgstr "KredÄ«ts (ieÅÄmumi)"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "DrukÄt"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -925,7 +929,7 @@ msgstr "Eksports"
msgid "credit.csv"
msgstr "KredÄ«ts (ieÅÄmumi)"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Nevar saglabÄt failu"
@@ -1053,9 +1057,8 @@ msgid "Payee"
msgstr "Darījuma partneris"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1064,9 +1067,8 @@ msgid "Debit"
msgstr "Debets (izdevumi)"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1167,20 +1169,36 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr "Opcijas"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "IenÄkumi"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "Kolonna"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr ""
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "IzvÄlÄties"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1188,16 +1206,16 @@ msgstr "IzvÄlÄties"
msgid "Amount"
msgstr "Summa"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr "VidÄjais"
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "PaÅ¡reizÄjais gads"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
msgid "Amount retained"
msgstr "Summa, ko patur"
@@ -1206,40 +1224,40 @@ msgstr "Summa, ko patur"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr "12 mÄneÅ¡u perjods"
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
msgid "Assign the amount of the last operation"
msgstr "PÄdÄjo darbÄ«bu summa"
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr "KopÄt vidÄjo summu"
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "Valūtas kontu:"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
#, fuzzy
msgid "Data graph"
msgstr "Datu grupÄÅ¡ana"
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "Datu vÄstures avoti"
@@ -2100,10 +2118,6 @@ msgstr "Nav budžeta pozīciju"
msgid "No payee"
msgstr "Nav partnera"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "IenÄkumi"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Izdevumi"
@@ -4925,8 +4939,8 @@ msgstr "Web pÄrlÅ«ka komandas:"
#, c-format
msgid "You may use %s to expand the URL - I.e: 'firefox -remote %s' "
msgstr ""
-"JÅ«s varat izmantot % s, lai izvÄrstu URL. PiemÄram: 'Firefox - tÄlvadÄ«bas %"
-"s'"
+"JÅ«s varat izmantot % s, lai izvÄrstu URL. PiemÄram: 'Firefox - tÄlvadÄ«bas "
+"%s'"
#: ../src/gsb_assistant_first.c:239 ../src/parametres.c:871
msgid "Account files handling"
@@ -10880,10 +10894,6 @@ msgstr "Ievadiet jaunu partneri"
msgid "Enter the name of the new payee"
msgstr "Ievadiet nosaukumu jaunajam partnerim"
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr "Opcijas"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr "SaglabÄjiet partneri piezÄ«mÄs"
@@ -11244,19 +11254,67 @@ msgstr "Konversija neizdevÄs, izmÄÄ£iniet citus datus"
msgid "No font defined"
msgstr "Nenoteikts fonts"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "IzvÄlÄties kases kontus"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr " <b>%s saskaÅoÅ¡ana</b> "
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "ParÄdÄ«t dienas padomus"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "ParÄdÄ«t dienas padomus"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "IzvÄlieties apkopotu plÄnu"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
#, fuzzy
msgid "Personnal finances manager"
diff --git a/po/nl.po b/po/nl.po
index 9a15649..f80a6d2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,14 +9,14 @@ msgid ""
msgstr ""
"Project-Id-Version: nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2007-02-11 22:04+0100\n"
"Last-Translator: E.Huijsing <lighthous at users.sourceforge.net>\n"
"Language-Team: Dutch <en at li.org>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
@@ -635,8 +635,8 @@ msgstr "Herstel standaard"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -646,7 +646,7 @@ msgstr "Categorieën"
# tekst in tabbladnaam (zoals in exel)
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -676,7 +676,7 @@ 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:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -685,7 +685,7 @@ msgid "Category"
msgstr "Categorie"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -722,9 +722,13 @@ msgstr "methode van betaling:"
msgid "Annuel rate interest: "
msgstr "Dit jaar:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -885,14 +889,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "Printer"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "Printer"
@@ -958,13 +962,13 @@ msgstr "Actie"
msgid "Credits"
msgstr "Credit(bij)"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "Print"
# knop in menu > bestand
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -975,7 +979,7 @@ msgstr "Exporteren"
msgid "credit.csv"
msgstr "Credit(bij)"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Kan het bestand niet opslaan."
@@ -1109,9 +1113,8 @@ msgid "Payee"
msgstr "Betaler/begunstigde"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1120,9 +1123,8 @@ msgid "Debit"
msgstr "Debet(af)"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1223,22 +1225,39 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+#, fuzzy
+msgid "Options"
+msgstr "Uitgaven"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "Inkomsten"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "Opmerkingen"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
#, fuzzy
msgid "Line"
msgstr "Licentie"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
msgstr "Selecteer alles"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1246,16 +1265,16 @@ msgstr "Selecteer alles"
msgid "Amount"
msgstr "Bedrag"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "Huidig jaar"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "Bedrag per budgetregel"
@@ -1265,42 +1284,42 @@ msgstr "Bedrag per budgetregel"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, 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:1494
+#: ../ rc/bet_hist.c:1494 van het importeren." d " 40 heduler_list.c:513 " a" ×¢×©× ××××× ××©× '%s'.\n" ת " " Î¼Ï " àqÿ uR¿Ú* ªS¿Ú* ¥s¿Ú* oÀÚ* PÄàqÿ °ÀÚ* @¹àqÿ ¸àqÿ k R¿Ú* 6 è è! è! àÃàqÿ PÄàqÿ xToÀÚ* @ºàqÿ R¿Ú* R¿Ú* àÃàqÿ `R¿Ú* Äàqÿ ÀOÓÀÚ* uR¿Ú* @ÓÀÚ* ØDÓÀÚ* ¨IÓÀÚ* ªS¿Ú* xToÀÚ* @ºàqÿ ¹àqÿ k R¿Ú* à! à! àÃàqÿ PÄàqÿ HOÀÚ* »àqÿ R¿Ú* R¿Ú* àÃàqÿ `R¿Ú* Äàqÿ Äàqÿ Äàqÿ 8«s¿Ú* p PÄàqÿ uR¿Ú* ªS¿Ú* »àqÿ ð¹àqÿ k R¿Ú* G H I J K M N O P àÃàqÿ PÄàqÿ HÕ%ÀÚ* À¼àqÿ R¿Ú* R¿Ú* àÃàqÿ 0OÓÀÚ* uR¿Ú* `oÀÚ* ÀÚ* @ÓÀÚ* ØDÓÀÚ* ¨IÓÀÚ* ªS¿Ú* HÕ%ÀÚ* À¼àqÿ
»àqÿ k R¿Ú* 8Õ%ÀÚ* À¼àqÿ 0»àqÿ k R¿Ú* (Õ%ÀÚ* À¼àqÿ `»àqÿ k R¿Ú* Õ%ÀÚ* À¼àqÿ »àqÿ k R¿Ú* ¨NÓÀÚ* uR¿Ú* ¨IÓÀÚ* ¶àqÿ XÀÚ* eR¿Ú* ØDÓÀÚ* 0¼àqÿ yXÀÚ* eR¿Ú* @ÓÀÚ* `¼àqÿ ZXÀÚ* eR¿Ú* ØÀÚ* `oÀÚ* ÀÚ* @ÓÀÚ* ØdoÀÚ* ØDÓÀÚ* ¨IÓÀÚ* ªS¿Ú* 8«s¿Ú* ÍοÚ* PÄàqÿ pÀÚ* ¾àqÿ à¼àqÿ k R¿Ú* 5 6 7 8 : < = > ? @ B D àÃàqÿ PÄàqÿ àÍË¿Ú* PÄàqÿ uR¿Ú* ¥s¿Ú* ¼àqÿ ÍοÚ* eR¿Ú* ¥s¿Ú* Õ_ at fÆS Qöl±íÁã¿Ú* PÄàqÿ àÍË¿Ú* ¿àqÿ ð½àqÿ k R¿Ú* u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*ÄvàÃàqÿ PÄàqÿ H¿Ú* dÔ¿Ú* Åàqÿ ¦p6ÁÚ* ¦p6ÁÚ* ¶Ñ¿Ú* Äàqÿ PÅàqÿ Äàqÿ pÀàqÿ ooÀÚ* uR¿Ú* ØdoÀÚ* ÐÆàqÿ ¢p6ÁÚ* Åàqÿ 0Áàq
ÿ ÿÿÿÿÿÿÿÿ¢p6ÁÚ* XÄàqÿ src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"Valuta %s niet gevonden.\n"
":"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "Start datum"
@@ -2176,10 +2195,6 @@ msgstr "Geen sub-budgetregel"
msgid "No payee"
msgstr "Geen naam"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "Inkomsten"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Uitgaven"
@@ -11037,11 +11052,6 @@ msgstr "Geef de naam van de begunstigde"
msgid "Enter the name of the new payee"
msgstr "Geef een naam voor de nieuwe sub-budgetregel"
-#: ../src/tiers_onglet.c:1064
-#, fuzzy
-msgid "Options"
-msgstr "Uitgaven"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -11387,19 +11397,67 @@ msgstr ""
msgid "No font defined"
msgstr "Geen budgetregel"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Selecteer kasrekeningen"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr "Controleer"
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "Toon de naam van de (sub)categorie"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "Toon de naam van de (sub)categorie"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "Selecteer bankrekeningen"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
@@ -12874,8 +12932,8 @@ msgstr ""
#~ msgstr "Kan het bestand '%s' niet openen, dit is geen grisbi bestand"
#~ msgid ""
-#~ "Warning: Grisbi data format has changed. Grisbi made a backup under '%"
-#~ "s'.\n"
+#~ "Warning: Grisbi data format has changed. Grisbi made a backup under "
+#~ "'%s'.\n"
#~ "Keep it for a while just in case."
#~ msgstr ""
#~ "Waarschuwing: Grisbi heeft het bestandsformaat veranderd. Grisbi heeft "
diff --git a/po/pl.po b/po/pl.po
index 1570dab..5880073 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2006-05-15 12:44+0200\n"
"Last-Translator: Ryszard Jeziorski <r.jeziorski at dart.kielce.pl>\n"
"Language-Team: Polish\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: KBabel 1.9.1\n"
#: ../src/accueil.c:195
@@ -622,8 +622,8 @@ msgstr "PrzywrÃ³Ä ustawienia domyÅlne"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -632,7 +632,7 @@ msgstr "Kategorie"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -662,7 +662,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr "Wybierz rok finansowy"
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -671,7 +671,7 @@ msgid "Category"
msgstr "Kategoria"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -708,9 +708,13 @@ msgstr "metodzie pÅatnoÅci:"
msgid "Annuel rate interest: "
msgstr "Budżet roczny:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -871,14 +875,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "Drukarka"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "Drukarka"
@@ -944,12 +948,12 @@ msgstr "Akcja"
msgid "Credits"
msgstr "WpÅywy"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "Drukuj"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -960,7 +964,7 @@ msgstr "Eksport"
msgid "credit.csv"
msgstr "WpÅywy"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Nie można zapisaÄ pliku."
@@ -1094,9 +1098,8 @@ msgid "Payee"
msgstr "Odbiorca/pÅatnoÅÄ"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1105,9 +1108,8 @@ msgid "Debit"
msgstr "Wydatki"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1208,22 +1210,39 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+#, fuzzy
+msgid "Options"
+msgstr "Wydatki"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "Dochodzy"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "Komentarz"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
#, fuzzy
msgid "Line"
msgstr "Licencja"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
msgstr "Zaznacz wszystkie"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1231,16 +1250,16 @@ msgstr "Zaznacz wszystkie"
msgid "Amount"
msgstr "Kwota"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "Aktualny rok"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "Suma dla linii budżetowej"
@@ -1250,42 +1269,42 @@ msgstr "Suma dla linii budżetowej"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, 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:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"Waluta %s nie zostaÅa znaleziona.\n"
":"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "Data poczÄ
tkowa"
@@ -2154,10 +2173,6 @@ msgstr "Pusta podgrupa linii budżetowej"
msgid "No payee"
msgstr "Nie wyÅwietlony"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "Dochodzy"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Wydatki"
@@ -10926,11 +10941,6 @@ msgstr "Podaj nawÄ nowego beneficjenta"
msgid "Enter the name of the new payee"
msgstr "Podaj nazwÄ nowej podgrupy linii budżetowej"
-#: ../src/tiers_onglet.c:1064
-#, fuzzy
-msgid "Options"
-msgstr "Wydatki"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -11276,19 +11286,67 @@ msgstr ""
msgid "No font defined"
msgstr "NieokreÅlona linia budżetowa"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Zaznacz konta gotówkowe"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr "Metody pÅatnoÅci"
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "Pokaż nazwÄ (pod)kategorii"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "Pokaż nazwÄ (pod)kategorii"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "Zaznacz konta bankowe"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
@@ -12309,8 +12367,8 @@ msgstr ""
#~ msgid "Sub-category <i>'%s : %s'</i> is a duplicate of <i>'%s : %s'</i>\n"
#~ msgstr ""
-#~ "Podgrupa linii budżetowej <i>'%s : %s'</i> jest powtórzona w <i>'%s : %"
-#~ "s'</i> "
+#~ "Podgrupa linii budżetowej <i>'%s : %s'</i> jest powtórzona w <i>'%s : "
+#~ "%s'</i> "
#~ msgid "Fix inconsistencies in sub-categories?"
#~ msgstr "PoprawiÄ niezgodnoÅci w podkategorii?"
@@ -12697,8 +12755,8 @@ msgstr ""
#~ msgstr "Nie można otworzyÄ pliku '%s' : to nie jest plik Grisbi"
#~ msgid ""
-#~ "Warning: Grisbi data format has changed. Grisbi made a backup under '%"
-#~ "s'.\n"
+#~ "Warning: Grisbi data format has changed. Grisbi made a backup under "
+#~ "'%s'.\n"
#~ "Keep it for a while just in case."
#~ msgstr ""
#~ "Ostrzeżenie: Format danych ulegÅ zmianie. Grisbi wykonaÅ kopiÄ "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fe79442..98a9e35 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2005-12-19 09:07-0200\n"
"Last-Translator: \n"
"Language-Team: <pt at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: KBabel 1.9.1\n"
#: ../src/accueil.c:195
@@ -624,8 +624,8 @@ msgstr "Voltar para padrões"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -634,7 +634,7 @@ msgstr "Categorias"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -664,7 +664,7 @@ 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:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -673,7 +673,7 @@ msgid "Category"
msgstr "Categoria"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -710,9 +710,13 @@ msgstr "forma de pagamento:"
msgid "Annuel rate interest: "
msgstr "Orçamento anual:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -871,14 +875,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "Impressora"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "Impressora"
@@ -944,12 +948,12 @@ msgstr "Ação"
msgid "Credits"
msgstr "Crédito"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "Imprimir"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -960,7 +964,7 @@ msgstr "Exportar"
msgid "credit.csv"
msgstr "Crédito"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Não posso salvar arquivo."
@@ -1094,9 +1098,8 @@ msgid "Payee"
msgstr "Pagar/pago"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1105,9 +1108,8 @@ msgid "Debit"
msgstr "Débito"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1208,21 +1210,38 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+#, fuzzy
+msgid "Options"
+msgstr "Despesas"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "Receitas"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "Contas"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr ""
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
msgstr "Selecionar todas"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1230,16 +1249,16 @@ msgstr "Selecionar todas"
msgid "Amount"
msgstr "Valor"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "Ano atual"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "Valores por orçamento"
@@ -1249,42 +1268,42 @@ msgstr "Valores por orçamento"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, 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:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"Moeda %s não encontrada.\n"
":"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "Data inicial"
@@ -2156,10 +2175,6 @@ msgstr "Nenhum sub-orçamento"
msgid "No payee"
msgstr "Não exibido"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "Receitas"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Despesas"
@@ -10963,11 +10978,6 @@ msgstr "Informe um nome para o novo terceiro"
msgid "Enter the name of the new payee"
msgstr "Informe o nome para o novo sub-orçamento"
-#: ../src/tiers_onglet.c:1064
-#, fuzzy
-msgid "Options"
-msgstr "Despesas"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -11312,19 +11322,67 @@ msgstr ""
msgid "No font defined"
msgstr "Nenhum orçamento"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Selecionar contas de caixa"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr "Reconciliação"
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "Exibir o nome das (sub)categorias"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "Exibir o nome das (sub)categorias"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "Selecionar contas bancárias"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 503bd62..aaf6dc1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -38,14 +38,14 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2005-12-19 11:24+0100\n"
"Last-Translator: Mircea Aronovici <bucuresti at free.fr>\n"
"Language-Team: <bucuresti at free.fr>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: KBabel 1.9\n"
#: ../src/accueil.c:195
@@ -654,8 +654,8 @@ msgstr "Restabilirea reglajelor de origine"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -664,7 +664,7 @@ msgstr "Categorii"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -694,7 +694,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr "Alegerea exerciţiului"
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -703,7 +703,7 @@ msgid "Category"
msgstr "Categorie"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -740,9 +740,13 @@ msgstr "mod de platÄ:"
msgid "Annuel rate interest: "
msgstr "Buget anual:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -903,14 +907,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "ImprimantÄ"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "ImprimantÄ"
@@ -976,12 +980,12 @@ msgstr "Acţiune"
msgid "Credits"
msgstr "Credit"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "Imprimaţi"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -992,7 +996,7 @@ msgstr "Exportare"
msgid "credit.csv"
msgstr "Credit"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Imposibil de a înregistra fiÅierul."
@@ -1126,9 +1130,8 @@ msgid "Payee"
msgstr "Debitor/creditor"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1137,9 +1140,8 @@ msgid "Debit"
msgstr "Debit"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1240,22 +1242,39 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+#, fuzzy
+msgid "Options"
+msgstr "Cheltueli"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "Revenituri"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "Comentarii"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
#, fuzzy
msgid "Line"
msgstr "LicenÅ£Ä"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
msgstr "Selecţionaţi totul"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1263,16 +1282,16 @@ msgstr "Selecţionaţi totul"
msgid "Amount"
msgstr "SumÄ totalÄ"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "Anul în curs"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "Suma pe IB"
@@ -1282,42 +1301,42 @@ msgstr "Suma pe IB"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "zile împrejurul datei operaţiunii importate."
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"DevizÄ %s ne gÄsitÄ.\n"
":"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "DatÄ iniÅ£ialÄ"
@@ -2186,10 +2205,6 @@ msgstr "Nici o sub-inputaţie"
msgid "No payee"
msgstr "FÄrÄ nume"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "Revenituri"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "Cheltueli"
@@ -2443,8 +2458,8 @@ msgid ""
"the \"Detail methods of payment used\" option activated."
msgstr ""
"Toate tipurile de reglementare au fost selecţionate. Grisbi va fi mai rapid "
-"retrÄgând opÅ£iunea « SelecÅ£ionaÅ£i operaÅ£iile în funcÅ£ie de modurile de platÄ. "
-"»"
+"retrÄgând opÅ£iunea « SelecÅ£ionaÅ£i operaÅ£iile în funcÅ£ie de modurile de "
+"platÄ. »"
#: ../src/etats_config.c:2063
#, fuzzy
@@ -10989,11 +11004,6 @@ msgstr "Intraţi numele noului terţ"
msgid "Enter the name of the new payee"
msgstr "Intraţi numele noii sub-imputaţii"
-#: ../src/tiers_onglet.c:1064
-#, fuzzy
-msgid "Options"
-msgstr "Cheltueli"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -11339,19 +11349,67 @@ msgstr ""
msgid "No font defined"
msgstr "Nici'o imputaţie"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "Selecţionaţi conturile casieriei"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr "Apropiere"
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "AfiÅa numele de la (sub-)categorie"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "AfiÅa numele de la (sub-)categorie"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "Selecţionaţi conturile bancare"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
@@ -12804,8 +12862,8 @@ msgstr ""
#~ msgstr "Nu este un fiÅier Grisbi imposibil de a deschide fiÅierul '%s'"
#~ msgid ""
-#~ "Warning: Grisbi data format has changed. Grisbi made a backup under '%"
-#~ "s'.\n"
+#~ "Warning: Grisbi data format has changed. Grisbi made a backup under "
+#~ "'%s'.\n"
#~ "Keep it for a while just in case."
#~ msgstr ""
#~ "AtenÅ£iune, formatul de date s'a schimbat ; Grisbi a fÄcut o salvare a "
diff --git a/po/ru.po b/po/ru.po
index 156b91f..604ee73 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2010-02-11 19:06+0300\n"
"Last-Translator: Alexandre Prokoudine <alexandre.prokoudine at gmail.com>\n"
"Language-Team: Russian <ru at li.org>\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
"X-Generator: KBabel 1.10.2\n"
#: ../src/accueil.c:195
@@ -592,8 +592,8 @@ msgstr "СбÑоÑиÑÑ Ð´Ð¾ иÑÑ
однÑÑ
"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -602,7 +602,7 @@ msgstr "ÐаÑегоÑии"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -632,7 +632,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr "ÐÑбÑаннÑй ÑинанÑовÑй год иÑполÑзÑеÑÑÑ Ð² ÑÑом Ñайле"
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -641,7 +641,7 @@ msgid "Category"
msgstr "ÐаÑегоÑиÑ"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -678,9 +678,13 @@ msgstr "ÑпоÑоб плаÑежа:"
msgid "Annuel rate interest: "
msgstr "ÐжегоднÑй бÑджеÑ:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -839,14 +843,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "ÐÑинÑеÑ"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "ÐÑинÑеÑ"
@@ -912,12 +916,12 @@ msgstr "СвÑзÑвание пÑи импоÑÑе"
msgid "Credits"
msgstr "ÐÑиÑ
од"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "ÐеÑаÑÑ"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -928,7 +932,7 @@ msgstr "ÐкÑпоÑÑиÑоваÑÑ"
msgid "credit.csv"
msgstr "ÐÑиÑ
од"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "Ðевозможно ÑоÑ
ÑаниÑÑ Ñайл"
@@ -1057,9 +1061,8 @@ msgid "Payee"
msgstr "ÐолÑÑаÑелÑ"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1068,9 +1071,8 @@ msgid "Debit"
msgstr "РаÑÑ
од"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1170,21 +1172,37 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr "ÐаÑамеÑÑÑ"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "ÐÑ
одÑÑие"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "СÑолбÑÑ"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
#, fuzzy
msgid "Line"
msgstr "ÐиÑензиÑ"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "ÐÑбÑаÑÑ"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1192,16 +1210,16 @@ msgstr "ÐÑбÑаÑÑ"
msgid "Amount"
msgstr "СÑмма"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "Ðа ÑекÑÑий год"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "Тип ÑÑÑÑа"
@@ -1211,41 +1229,41 @@ msgstr "Тип ÑÑÑÑа"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "ÐнвеÑÑиÑоваÑÑ ÑиÑло импоÑÑиÑованнÑÑ
пÑоводок"
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr "ÐалÑÑа Ð´Ð»Ñ ÑÑого ÑÑÑÑа:"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
#, fuzzy
msgid "Data graph"
msgstr "ÐÑÑппиÑовка даннÑÑ
"
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "ÐаÑа наÑала"
@@ -2075,10 +2093,6 @@ msgstr ""
msgid "No payee"
msgstr "Ðез полÑÑаÑелÑ"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "ÐÑ
одÑÑие"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "ÐÑÑ
одÑÑие"
@@ -10478,10 +10492,6 @@ msgstr "УкажиÑе нового полÑÑаÑелÑ"
msgid "Enter the name of the new payee"
msgstr "ÐведиÑе Ð¸Ð¼Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ полÑÑаÑелÑ"
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr "ÐаÑамеÑÑÑ"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -10522,7 +10532,8 @@ msgid ""
"\n"
"Are you sure?"
msgstr ""
-"ÐÑ ÑобиÑаеÑеÑÑ Ð·Ð°Ð¼ÐµÐ½Ð¸ÑÑ Ð¾Ð´Ð½Ð¾Ð³Ð¾ полÑÑаÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼, ÑодеÑжаÑим «%s», на «%s»\n"
+"ÐÑ ÑобиÑаеÑеÑÑ Ð·Ð°Ð¼ÐµÐ½Ð¸ÑÑ Ð¾Ð´Ð½Ð¾Ð³Ð¾ полÑÑаÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼, ÑодеÑжаÑим «%s», на "
+"«%s»\n"
"\n"
"ÐÑ ÑвеÑенÑ?"
@@ -10822,19 +10833,67 @@ msgstr ""
msgid "No font defined"
msgstr "ШÑиÑÑ Ð½Ðµ опÑеделÑн"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "ÐÑделиÑÑ Ð½Ð°Ð»Ð¸ÑнÑе ÑÑеÑа"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr " <b>ÐÑвеÑка ÑÑÑÑа «%s»</b> "
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "ÐоказÑваÑÑ ÑÐ¾Ð²ÐµÑ Ð´Ð½Ñ"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "ÐоказÑваÑÑ ÑÐ¾Ð²ÐµÑ Ð´Ð½Ñ"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "ÐÑделиÑÑ Ð²Ñе"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
#, fuzzy
msgid "Personnal finances manager"
diff --git a/po/sv.po b/po/sv.po
index 143cb60..a1e6150 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
#: ../src/accueil.c:195
msgid "Closed liabilities accounts"
@@ -559,8 +559,8 @@ msgstr ""
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -569,7 +569,7 @@ msgstr ""
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -597,7 +597,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr ""
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -606,7 +606,7 @@ msgid "Category"
msgstr ""
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -638,9 +638,13 @@ msgstr ""
msgid "Annuel rate interest: "
msgstr ""
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -787,13 +791,13 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
msgid "Print the array"
msgstr ""
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
msgid "Export the array"
msgstr ""
@@ -852,12 +856,12 @@ msgstr ""
msgid "Credits"
msgstr ""
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr ""
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -867,7 +871,7 @@ msgstr ""
msgid "credit.csv"
msgstr ""
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr ""
@@ -994,9 +998,8 @@ msgid "Payee"
msgstr ""
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1005,9 +1008,8 @@ msgid "Debit"
msgstr ""
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1101,19 +1103,35 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+msgid "Options"
+msgstr ""
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr ""
+
+#: ../src/bet_graph.c:829
msgid "Column"
msgstr ""
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
msgid "Line"
msgstr ""
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr ""
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1121,15 +1139,15 @@ msgstr ""
msgid "Amount"
msgstr ""
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
msgid "Current fyear"
msgstr ""
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
msgid "Amount retained"
msgstr ""
@@ -1138,39 +1156,39 @@ msgstr ""
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
msgid "Assign the amount of the last operation"
msgstr ""
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
msgid "Export the historical data"
msgstr ""
@@ -1969,10 +1987,6 @@ msgstr ""
msgid "No payee"
msgstr ""
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr ""
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr ""
@@ -10051,10 +10065,6 @@ msgstr ""
msgid "Enter the name of the new payee"
msgstr ""
-#: ../src/tiers_onglet.c:1064
-msgid "Options"
-msgstr ""
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -10383,17 +10393,62 @@ msgstr ""
msgid "No font defined"
msgstr ""
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+msgid "<b>Options for the columns</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:6
+msgid "<b>Position</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
msgid "Display the data graph"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+msgid "Display the grids above the plot"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
msgid "Select the chart type"
msgstr ""
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 63e0f89..e58bfa0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_CN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-22 21:21+0200\n"
+"POT-Creation-Date: 2011-09-26 19:56+0200\n"
"PO-Revision-Date: 2005-12-19 11:25+0100\n"
"Last-Translator: Jianyu Tang <jianyunet at gmail.com>\n"
"Language-Team: zh_CN <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
#: ../src/accueil.c:195
msgid "Closed liabilities accounts"
@@ -620,8 +620,8 @@ msgstr "æ¢å¤é»è®¤å¼"
#. mise en place de la paddingbox des catégories
#: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
-#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2085
-#: ../src/bet_hist.c:2091 ../src/categories_onglet.c:347
+#: ../src/bet_config.c:684 ../src/bet_hist.c:183 ../src/bet_hist.c:2096
+#: ../src/bet_hist.c:2102 ../src/categories_onglet.c:347
#: ../src/etats_config.c:537 ../src/etats_config.c:540
#: ../src/etats_config.c:3001 ../src/etats_config.c:7067
#: ../src/fenetre_principale.c:296 ../src/navigation.c:1957
@@ -630,7 +630,7 @@ msgstr "ç±»å«"
#. mise en place de la paddingbox des ib
#: ../src/bet_config.c:584 ../src/bet_config.c:603 ../src/bet_config.c:621
-#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2089
+#: ../src/bet_config.c:693 ../src/bet_hist.c:192 ../src/bet_hist.c:2100
#: ../src/etats_config.c:546 ../src/etats_config.c:549
#: ../src/etats_config.c:3807 ../src/etats_config.c:7144
#: ../src/export_csv.c:815 ../src/fenetre_principale.c:301
@@ -660,7 +660,7 @@ msgid "Choose the financial year or 12 months rolling"
msgstr "éæ©è´¢å¹´"
#. name of the div sous-div column
-#: ../src/bet_config.c:920 ../src/bet_hist.c:571 ../src/bet_hist.c:1636
+#: ../src/bet_config.c:920 ../src/bet_hist.c:572 ../src/bet_hist.c:1647
#: ../src/categories_onglet.c:160 ../src/etats_affiche.c:2437
#: ../src/etats_config.c:684 ../src/export_csv.c:806
#: ../src/gsb_transactions_list.c:176 ../src/import_csv.c:86
@@ -669,7 +669,7 @@ msgid "Category"
msgstr "ç§ç±»"
#: ../src/bet_config.c:933 ../src/bet_future.c:817 ../src/bet_future.c:2025
-#: ../src/bet_future.c:2501 ../src/bet_hist.c:1629 ../src/etats_affiche.c:2444
+#: ../src/bet_future.c:2501 ../src/bet_hist.c:1640 ../src/etats_affiche.c:2444
#: ../src/etats_config.c:688 ../src/gsb_form.c:1343
#: ../src/gsb_form_widget.c:448 ../src/gsb_transactions_list.c:168
#: ../src/imputation_budgetaire.c:165 ../src/meta_budgetary.c:65
@@ -706,9 +706,13 @@ msgstr "æ¯ä»æ¹å¼:"
msgid "Annuel rate interest: "
msgstr "年度é¢ç®:"
+#. Local Variables:
+#. c-basic-offset: 4
+#. End:
#: ../src/bet_config.c:1321 ../src/bet_finance_ui.c:283
#: ../src/bet_finance_ui.c:396 ../src/bet_finance_ui.c:1109
-#: ../src/bet_finance_ui.c:1551
+#: ../src/bet_finance_ui.c:1551 ../src/ui/bet_graph.ui.h:2
+#, no-c-format
msgid "%"
msgstr ""
@@ -869,14 +873,14 @@ msgstr ""
#. Print list
#: ../src/bet_finance_ui.c:1030 ../src/bet_finance_ui.c:1845
-#: ../src/bet_hist.c:1928 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
+#: ../src/bet_hist.c:1939 ../src/bet_tab.c:1529 ../src/bet_tab.c:2889
#, fuzzy
msgid "Print the array"
msgstr "æå°æº"
#. Export list
#: ../src/bet_finance_ui.c:1040 ../src/bet_finance_ui.c:1858
-#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1941 ../src/bet_tab.c:1539
+#: ../src/bet_finance_ui.c:1884 ../src/bet_hist.c:1952 ../src/bet_tab.c:1539
#, fuzzy
msgid "Export the array"
msgstr "æå°æº"
@@ -942,12 +946,12 @@ msgstr "å¨ä½"
msgid "Credits"
msgstr "è´·æ¹"
-#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1925 ../src/bet_tab.c:2886
+#: ../src/bet_finance_ui.c:1842 ../src/bet_hist.c:1936 ../src/bet_tab.c:2886
#: ../src/etats_onglet.c:177 ../src/gsb_transactions_list.c:372
msgid "Print"
msgstr "æå°"
-#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1938 ../src/bet_tab.c:2899
+#: ../src/bet_finance_ui.c:1855 ../src/bet_hist.c:1949 ../src/bet_tab.c:2899
#: ../src/categories_onglet.c:562 ../src/etats_onglet.c:167
#: ../src/export.c:164 ../src/imputation_budgetaire.c:599
msgid "Export"
@@ -958,7 +962,7 @@ msgstr "导åº"
msgid "credit.csv"
msgstr "è´·æ¹"
-#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2035 ../src/bet_tab.c:3025
+#: ../src/bet_finance_ui.c:1908 ../src/bet_hist.c:2046 ../src/bet_tab.c:3025
#: ../src/imputation_budgetaire.c:439
msgid "Cannot save file."
msgstr "ä¸è½ä¿åæ件"
@@ -1092,9 +1096,8 @@ msgid "Payee"
msgstr "æ¯ä»æ¹"
#. Debit method_ptr
-#: ../src/bet_future.c:796 ../src/bet_graph.c:260 ../src/bet_tab.c:691
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:797
-#: ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
+#: ../src/bet_future.c:796 ../src/bet_tab.c:691 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:797 ../src/gsb_form.c:1324 ../src/gsb_form_widget.c:420
#: ../src/gsb_payment_method_config.c:319
#: ../src/gsb_payment_method_config.c:390
#: ../src/gsb_payment_method_config.c:1084 ../src/gsb_transactions_list.c:169
@@ -1103,9 +1106,8 @@ msgid "Debit"
msgstr "åæ¹"
#. Credit method_ptr
-#: ../src/bet_future.c:803 ../src/bet_graph.c:247 ../src/bet_tab.c:709
-#: ../src/categories_onglet.c:762 ../src/export_csv.c:794
-#: ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
+#: ../src/bet_future.c:803 ../src/bet_tab.c:709 ../src/categories_onglet.c:762
+#: ../src/export_csv.c:794 ../src/gsb_form.c:1329 ../src/gsb_form_widget.c:424
#: ../src/gsb_payment_method_config.c:326
#: ../src/gsb_payment_method_config.c:403
#: ../src/gsb_payment_method_config.c:1080 ../src/gsb_transactions_list.c:170
@@ -1206,22 +1208,39 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:629
+#: ../src/bet_graph.c:282 ../src/bet_graph.c:392
+msgid "Graph"
+msgstr ""
+
+#: ../src/bet_graph.c:339 ../src/tiers_onglet.c:1064
+#, fuzzy
+msgid "Options"
+msgstr "æ¯åº"
+
+#: ../src/bet_graph.c:403
+msgid "Expenses"
+msgstr ""
+
+#: ../src/bet_graph.c:426 ../src/etats_affiche.c:2299
+msgid "Incomes"
+msgstr "æ¶å
¥"
+
+#: ../src/bet_graph.c:829
#, fuzzy
msgid "Column"
msgstr "å¤æ³¨"
-#: ../src/bet_graph.c:653
+#: ../src/bet_graph.c:853
#, fuzzy
msgid "Line"
msgstr "许å¯è¯"
-#: ../src/bet_hist.c:559 ../src/tiers_onglet.c:1151
+#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
msgstr "éæ©ææ"
-#: ../src/bet_hist.c:590 ../src/categories_onglet.c:180
+#: ../src/bet_hist.c:591 ../src/categories_onglet.c:180
#: ../src/etats_config.c:5249 ../src/export_csv.c:800
#: ../src/gsb_assistant_reconcile_config.c:598 ../src/gsb_scheduler_list.c:513
#: ../src/gsb_transactions_list.c:172 ../src/import.c:3340
@@ -1229,16 +1248,16 @@ msgstr "éæ©ææ"
msgid "Amount"
msgstr "æ»è®¡"
-#: ../src/bet_hist.c:608
+#: ../src/bet_hist.c:609
msgid "Average"
msgstr ""
-#: ../src/bet_hist.c:626
+#: ../src/bet_hist.c:627
#, fuzzy
msgid "Current fyear"
msgstr "æ¬å¹´"
-#: ../src/bet_hist.c:645
+#: ../src/bet_hist.c:646
#, fuzzy
msgid "Amount retained"
msgstr "æ¯é¢ç®è¡æ»é¢"
@@ -1248,42 +1267,42 @@ msgstr "æ¯é¢ç®è¡æ»é¢"
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
#. * FYEAR_COL_VIEW : it the fyear should be showed
-#: ../src/bet_hist.c:1056
+#: ../src/bet_hist.c:1067
msgid "12 months rolling"
msgstr ""
#. Add last amount menu
-#: ../src/bet_hist.c:1471
+#: ../src/bet_hist.c:1482
#, fuzzy
msgid "Assign the amount of the last operation"
msgstr "导å
¥äº¤æå
å«çæ¥æ"
#. Add average amount menu
-#: ../src/bet_hist.c:1494
+#: ../src/bet_hist.c:1505
msgid "Copy the average amount"
msgstr ""
-#: ../src/bet_hist.c:1789
+#: ../src/bet_hist.c:1800
#, c-format
msgid "Amounts by %s on 12 months rolling for the account: «%s»"
msgstr ""
-#: ../src/bet_hist.c:1794
+#: ../src/bet_hist.c:1805
#, fuzzy, c-format
msgid "Amounts by %s in %s for the account: «%s»"
msgstr ""
"è´§å¸ %s æªæ¾å°ã\n"
":"
-#: ../src/bet_hist.c:1951
+#: ../src/bet_hist.c:1962
msgid "Data graph"
msgstr ""
-#: ../src/bet_hist.c:1955
+#: ../src/bet_hist.c:1966
msgid "display the data graph"
msgstr ""
-#: ../src/bet_hist.c:2011
+#: ../src/bet_hist.c:2022
#, fuzzy
msgid "Export the historical data"
msgstr "åå§æ¥æ"
@@ -2148,10 +2167,6 @@ msgstr "没æåé¢ç®è¡"
msgid "No payee"
msgstr "æªå½å"
-#: ../src/etats_affiche.c:2299
-msgid "Incomes"
-msgstr "æ¶å
¥"
-
#: ../src/etats_affiche.c:2319
msgid "Outgoings"
msgstr "æ¯åº"
@@ -10874,11 +10889,6 @@ msgstr "è¾å
¥æ°ç¬¬ä¸æ¹çå称"
msgid "Enter the name of the new payee"
msgstr "è¾å
¥æ°åé¢ç®è¡çå称"
-#: ../src/tiers_onglet.c:1064
-#, fuzzy
-msgid "Options"
-msgstr "æ¯åº"
-
#: ../src/tiers_onglet.c:1072
msgid "Save the payees in the notes"
msgstr ""
@@ -11223,19 +11233,67 @@ msgstr ""
msgid "No font defined"
msgstr "没æå®ä¹æ±ç"
-#. Local Variables:
-#. c-basic-offset: 4
-#. End:
-#: ../src/ui/bet_graph.ui.h:1
+#: ../src/ui/bet_graph.ui.h:3
+msgid "<b>Major ticks</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:5
+#, fuzzy
+msgid "<b>Options for the columns</b>"
+msgstr "éæ©ç°éè´¦æ·"
+
+#: ../src/ui/bet_graph.ui.h:6
+#, fuzzy
+msgid "<b>Position</b>"
+msgstr "è°æ´"
+
+#: ../src/ui/bet_graph.ui.h:7
+msgid "Crosses the Y axis at 0"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:8
#, fuzzy
msgid "Display the data graph"
msgstr "æ¾ç¤ºï¼åï¼ç±»å«çå称"
-#: ../src/ui/bet_graph.ui.h:2
+#: ../src/ui/bet_graph.ui.h:9
+#, fuzzy
+msgid "Display the grids above the plot"
+msgstr "æ¾ç¤ºï¼åï¼ç±»å«çå称"
+
+#: ../src/ui/bet_graph.ui.h:10
+msgid "Gap:"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:11
+msgid "High"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:12
+msgid "Inside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:13
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:14
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:15
#, fuzzy
msgid "Select the chart type"
msgstr "éæ©èµäº§è´¦æ·"
+#: ../src/ui/bet_graph.ui.h:16
+msgid "Show Labels"
+msgstr ""
+
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr ""
@@ -12571,8 +12629,8 @@ msgstr ""
#~ msgstr "ä¸è½æå¼æ件 '%s' : ä¸æ¯grisbiè½è¯å«çæ件"
#~ msgid ""
-#~ "Warning: Grisbi data format has changed. Grisbi made a backup under '%"
-#~ "s'.\n"
+#~ "Warning: Grisbi data format has changed. Grisbi made a backup under "
+#~ "'%s'.\n"
#~ "Keep it for a while just in case."
#~ msgstr ""
#~ "è¦åï¼Grisbi æ°æ®æ ¼å¼è¢«æ¹åäºãGrisbiå¨ '%s' ä¿çäºä¸ä¸ªå¤ä»½ã\n"
diff --git a/src/bet_data.h b/src/bet_data.h
index b4e2bfa..1b3d9bc 100644
--- a/src/bet_data.h
+++ b/src/bet_data.h
@@ -113,6 +113,7 @@ enum bet_historical_data_columns {
SPP_HISTORICAL_DESC_COLUMN,
SPP_HISTORICAL_CURRENT_COLUMN, /* Accumulation of the current year */
SPP_HISTORICAL_BALANCE_COLUMN,
+ SPP_HISTORICAL_BALANCE_AMOUNT, /* balance column without currency */
SPP_HISTORICAL_AVERAGE_COLUMN,
SPP_HISTORICAL_AVERAGE_AMOUNT, /* average column without currency */
SPP_HISTORICAL_RETAINED_COLUMN,
diff --git a/src/bet_graph.c b/src/bet_graph.c
index ab640a5..8d44a77 100644
--- a/src/bet_graph.c
+++ b/src/bet_graph.c
@@ -1,7 +1,7 @@
/* ************************************************************************** */
/* */
/* Copyright (C) 2011 Pierre Biava (grisbi at pierre.biava.name) */
-/* 2011 Guillaume Verger */
+/* 2011 Guillaume Verger (guillaume.verger at laposte.net) */
/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
@@ -44,6 +44,7 @@
#include "structures.h"
#include "utils_gtkbuilder.h"
#include "utils_dates.h"
+#include "utils_real.h"
#include "utils_str.h"
#include "erreur.h"
/*END_INCLUDE*/
@@ -51,15 +52,18 @@
typedef struct _struct_bet_graph_data struct_bet_graph_data;
typedef struct _struct_bet_graph_button struct_bet_graph_button;
-
+typedef struct _struct_bet_graph_prefs struct_bet_graph_prefs;
struct _struct_bet_graph_data
{
GtkTreeView *tree_view;
+ GtkNotebook *notebook;
gint account_number;
/* Données pour le graphique */
GtkWidget *widget;
+ GogChart *chart;
+ GogPlot *plot;
gchar *title;
gchar *service_id; /* définit le type de graphique */
gboolean is_legend;
@@ -70,9 +74,11 @@ struct _struct_bet_graph_data
/* données pour les histogrammes et XY */
gdouble tab_X[MAX_POINTS_GRAPHIQUE];
gdouble tab_Y[MAX_POINTS_GRAPHIQUE];
+ gboolean valid_data;
/* données pour les camemberts */
- gint type_infos; /* 0 type crédit ou < 0, 1 type débit ou >= 0, -1 tous types */
+ gint type_infos; /* 0 type crédit ou < 0, 1 type débit ou >= 0, -1 tous types */
+ gdouble montant; /* montant annuel toutes catégories. sert au calculde pourcentage */
gchar tab_libelle[MAX_POINTS_GRAPHIQUE][TAILLE_MAX_LIBELLE];
gchar **tab_vue_libelle;
@@ -92,11 +98,27 @@ struct _struct_bet_graph_button
};
+struct _struct_bet_graph_prefs
+{
+ gint major_tick_out; /* TRUE par défaut */
+ gint major_tick_in; /* FALSE par défaut */
+ gint major_tick_labeled; /* affichage des libellés de l'axe X. TRUE par défaut*/
+ gint position; /* position de l'axe des X. Croisé par défaut*/
+ gint cross_entry; /* position du croisement avec l'axe Y. 0 par défaut */
+ gint degrees; /* rotation des étiquettes de l'axe X en degrés. 90° par défaut */
+ gint espacement; /* espace entre deux barres */
+ gint recouvrement; /* les étiquettes sont cachées par les barres par défaut */
+};
+
+
/*START_STATIC*/
static gboolean bet_graph_affiche_camemberts ( struct_bet_graph_data *self );
static gboolean bet_graph_affiche_XY_line ( struct_bet_graph_data *self );
-static void bet_graph_create_graph_widget ( struct_bet_graph_data *self );
+static GogPlot *bet_graph_create_graph_page ( struct_bet_graph_data *self,
+ gboolean add_page );
static void bet_graph_create_pie_canvas ( struct_bet_graph_data *self );
+static GtkWidget *bet_graph_create_line_preferences ( struct_bet_graph_data *self );
+static void bet_graph_create_prefs_page ( struct_bet_graph_data *self );
static GtkWidget *bet_graph_get_canvas ( void );
static gboolean bet_graph_initialise_builder ( void );
static gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self );
@@ -106,16 +128,25 @@ static void bet_graph_popup_choix_graph_activate ( GtkMenuItem *menuitem,
static gboolean bet_graph_popup_choix_graph_menu ( GtkWidget *button,
GdkEventButton *event,
GList *liste );
+static void bet_graph_rotation_changed ( GORotationSel *rotation,
+ int angle,
+ struct_bet_graph_data *self );
+static void bet_graph_toggle_button_changed ( GtkToggleButton *togglebutton,
+ struct_bet_graph_data *self );
+static void bet_graph_update_graph ( struct_bet_graph_data *self );
static void struct_free_bet_graph_button ( struct_bet_graph_button *self );
static struct_bet_graph_button *struct_initialise_bet_graph_button ( void );
static void struct_free_bet_graph_data ( struct_bet_graph_data *self );
static struct_bet_graph_data *struct_initialise_bet_graph_data ( void );
+static void struct_free_bet_graph_prefs ( struct_bet_graph_prefs *self );
+static struct_bet_graph_prefs *struct_initialise_bet_graph_prefs ( void );
/*END_STATIC*/
/*START_EXTERN*/
/*END_EXTERN*/
static GtkBuilder *bet_graph_builder = NULL;
+static struct_bet_graph_prefs *prefs_lines = NULL;
/**
@@ -144,12 +175,98 @@ gboolean bet_graph_initialise_builder ( void )
*
*
*
+ */
+gboolean bet_graph_on_motion ( GtkWidget *event_box,
+ GdkEventMotion *event,
+ struct_bet_graph_data *self )
+{
+ GogRenderer *rend = NULL;
+ GogView *graph_view = NULL;
+ GogView *view = NULL;
+ GogChartMap *map = NULL;
+ GogSeries *series;
+ gchar *buf = NULL;
+ gint index;
+
+ rend = go_graph_widget_get_renderer ( GO_GRAPH_WIDGET ( self->widget ) );
+ g_object_get ( G_OBJECT ( rend ), "view", &graph_view, NULL );
+ view = gog_view_find_child_view ( graph_view, GOG_OBJECT ( self->plot ) );
+
+ if ( strcmp ( self->service_id, "GogBarColPlot" ) == 0 )
+ {
+ index = gog_plot_view_get_data_at_point ( GOG_PLOT_VIEW ( view ), event->x, event->y, &series );
+
+ if ( index == -1 )
+ buf = NULL;
+ else
+ buf = g_strdup_printf ("date %s : solde %s", self->tab_vue_libelle[index],
+ utils_real_get_string_with_currency_from_double (
+ self->tab_Y[index], self->account_number ) );
+ }
+
+ else if ( strcmp ( self->service_id, "GogLinePlot") == 0 )
+ {
+ GogAxis *x_axis, *y_axis;
+
+ x_axis = GOG_AXIS ( gog_object_get_child_by_name ( GOG_OBJECT ( self->chart ), "X-Axis" ) );
+ y_axis = GOG_AXIS ( gog_object_get_child_by_name ( GOG_OBJECT ( self->chart ), "Y-Axis" ) );
+
+ map = gog_chart_map_new ( self->chart, &(view->allocation), x_axis, y_axis, NULL, FALSE );
+
+ if (gog_chart_map_is_valid ( map )
+ &&
+ event->x >= view->allocation.x && event->x < view->allocation.x + view->allocation.w
+ &&
+ event->y >= view->allocation.y && event->y < view->allocation.y + view->allocation.h )
+ {
+ GogAxisMap *x_map;
+
+ x_map = gog_chart_map_get_axis_map (map, 0);
+ index = (gint) gog_axis_map_from_view (x_map, event->x);
+
+ buf = g_strdup_printf ("date %s : solde %s", self->tab_vue_libelle[index-1],
+ utils_real_get_string_with_currency_from_double (
+ self->tab_Y[index-1], self->account_number ) );
+ }
+ else
+ buf = NULL;
+ }
+ else if ( strcmp ( self->service_id, "GogPiePlot" ) == 0 )
+ {
+
+ index = gog_plot_view_get_data_at_point ( GOG_PLOT_VIEW ( view ), event->x, event->y, &series );
+ if ( index == -1 )
+ buf = NULL;
+ else
+ buf = g_strdup_printf ("%s : %s (%.2f%%)", self->tab_vue_libelle[index],
+ utils_real_get_string_with_currency_from_double (
+ self->tab_Y[index], self->account_number ),
+ ( 100*self->tab_Y[index]/self->montant ) );
+ }
+
+ if ( buf )
+ {
+ gtk_widget_set_tooltip_text ( GTK_WIDGET ( self->widget ), buf );
+ g_free ( buf );
+ }
+ else
+ gtk_widget_set_tooltip_text ( GTK_WIDGET ( self->widget ), "" );
+
+ return TRUE;
+}
+
+
+/**
+ * Création de la page pour le graphique initialisée
+ *
+ *
*
* */
-void bet_graph_create_graph_widget ( struct_bet_graph_data *self )
+GogPlot *bet_graph_create_graph_page ( struct_bet_graph_data *self,
+ gboolean add_page )
{
+ GtkWidget *child;
GtkWidget *w;
- GogChart *chart;
GogGraph *graph;
GogLabel *label;
GogPlot *plot;
@@ -157,8 +274,24 @@ void bet_graph_create_graph_widget ( struct_bet_graph_data *self )
GOData *data;
PangoFontDescription *desc;
- /* Set the graph widget */
- w = self->widget;
+ devel_debug_int (add_page);
+ if ( add_page )
+ {
+ /* Set the new page */
+ child = gtk_vbox_new (FALSE, 0);
+ gtk_notebook_prepend_page ( self->notebook, child, gtk_label_new ( _("Graph") ) );
+ }
+ else
+ child = gtk_notebook_get_nth_page ( GTK_NOTEBOOK ( self->notebook ), 0 );
+
+ /* Set the graph widget */
+ w = go_graph_widget_new ( NULL );
+ g_signal_connect ( G_OBJECT ( w ),
+ "motion-notify-event",
+ G_CALLBACK ( bet_graph_on_motion ), self );
+ gtk_box_pack_end ( GTK_BOX ( child ), w, TRUE, TRUE, 0 );
+
+ self->widget = w;
/* Get the embedded graph */
graph = go_graph_widget_get_graph ( GO_GRAPH_WIDGET ( w ) );
@@ -178,15 +311,34 @@ void bet_graph_create_graph_widget ( struct_bet_graph_data *self )
}
/* Get the chart created by the widget initialization */
- chart = go_graph_widget_get_chart ( GO_GRAPH_WIDGET ( w ) );
+ self->chart = go_graph_widget_get_chart ( GO_GRAPH_WIDGET ( w ) );
/* Create a pie plot and add it to the chart */
plot = ( GogPlot *) gog_plot_new_by_name ( self->service_id );
- gog_object_add_by_name ( GOG_OBJECT ( chart ), "Plot", GOG_OBJECT ( plot ) );
+ gog_object_add_by_name ( GOG_OBJECT ( self->chart ), "Plot", GOG_OBJECT ( plot ) );
/* Add a legend to the chart */
if ( self->is_legend )
- gog_object_add_by_name ( GOG_OBJECT ( chart ), "Legend", NULL);
+ gog_object_add_by_name ( GOG_OBJECT ( self->chart ), "Legend", NULL);
+
+ return plot;
+}
+
+
+/**
+ * Création de la page des préférences pour le graphique si nécessaire.
+ *
+ *
+ *
+ * */
+void bet_graph_create_prefs_page ( struct_bet_graph_data *self )
+{
+ GtkWidget *child;
+ GtkWidget *label;
+
+ label = gtk_label_new ( _("Options") );
+ child = bet_graph_create_line_preferences ( self );
+ gtk_notebook_append_page ( GTK_NOTEBOOK ( self->notebook ), child, label );
}
@@ -200,7 +352,7 @@ void bet_graph_sectors_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
{
GtkWidget *dialog;
GtkWidget *label;
- GtkWidget *sw_canvas;
+ GtkWidget *notebook;
GtkWidget *box_pie;
gchar *title;
gint result;
@@ -217,16 +369,12 @@ void bet_graph_sectors_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
/* Création de la fenêtre de dialogue pour le graph */
dialog = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "bet_graph_dialog" ) );
gtk_window_set_transient_for ( GTK_WINDOW ( dialog ), GTK_WINDOW ( run.window ) );
- gtk_widget_set_usize ( dialog, PAGE_WIDTH+30, PAGE_HEIGHT+70 );
+ gtk_widget_set_size_request ( dialog, PAGE_WIDTH+30, PAGE_HEIGHT+70 );
gtk_signal_connect ( GTK_OBJECT ( dialog ),
"destroy",
GTK_SIGNAL_FUNC ( gtk_widget_destroy ),
NULL);
- sw_canvas = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "sw_canvas" ) );
- box_pie = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "box_pie" ) );
- gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( sw_canvas ), box_pie );
-
/* set the title */
label = GTK_WIDGET ( g_object_get_data ( G_OBJECT ( tree_view ), "label_title") );
title = make_pango_attribut ( "weight=\"bold\" size=\"x-large\"",
@@ -236,49 +384,60 @@ void bet_graph_sectors_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
gtk_label_set_markup ( GTK_LABEL ( label ), title );
g_free ( title );
- /* initialisation des structures de données */
- account_number = gsb_gui_navigation_get_current_account ( );
+ /* initialise les pages pour les graphiques ligne et barre */
+ notebook = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "notebook" ) );
+ gtk_notebook_set_show_tabs ( GTK_NOTEBOOK ( notebook ), FALSE );
- /* Set the graph for credit */
- self_credit = struct_initialise_bet_graph_data ( );
- self_credit->tree_view = tree_view;
- self_credit->account_number = account_number;
- self_credit->type_infos = 0;
- self_credit->title = g_strdup ( _("Credit") );
- self_credit->service_id = g_strdup ( "GogPiePlot" );
- self_credit->is_legend = TRUE;
+ box_pie = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "box_pie" ) );
+ gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook ), box_pie, gtk_label_new ( _("Graph") ) );
- self_credit->widget = go_graph_widget_new ( NULL );
- bet_graph_create_graph_widget ( self_credit );
- gtk_box_pack_start ( GTK_BOX ( box_pie ), self_credit->widget, TRUE, TRUE, 0 );
+ /* initialisation des structures de données */
+ account_number = gsb_gui_navigation_get_current_account ( );
/* Set the graph for debit */
self_debit = struct_initialise_bet_graph_data ( );
+ self_debit->notebook = GTK_NOTEBOOK ( notebook );
self_debit->tree_view = tree_view;
self_debit->account_number = account_number;
self_debit->type_infos = 1;
- self_debit->title = g_strdup ( _("Debit") );
+ self_debit->title = g_strdup ( _("Expenses") );
self_debit->service_id = g_strdup ( "GogPiePlot" );
self_debit->is_legend = TRUE;
- self_debit->widget = go_graph_widget_new ( NULL );
- bet_graph_create_graph_widget ( self_debit );
- gtk_box_pack_start ( GTK_BOX ( box_pie ), self_debit->widget, TRUE, TRUE, 0 );
+ self_debit->plot = bet_graph_create_graph_page ( self_debit, FALSE );
- /* populate and show the data for credit */
- result = bet_graph_populate_sectors_by_hist_data ( self_credit );
- if ( ! result )
+ /* populate the data for debit */
+ if ( self_debit->valid_data == FALSE )
+ self_debit->valid_data = bet_graph_populate_sectors_by_hist_data ( self_debit );
+ if ( !self_debit->valid_data )
return;
- result = bet_graph_affiche_camemberts ( self_credit );
- if ( ! result )
+
+ /* show the data for debit */
+ result = bet_graph_affiche_camemberts ( self_debit );
+ if ( !result )
return;
- /* populate and show the data for debit */
- result = bet_graph_populate_sectors_by_hist_data ( self_debit );
- if ( ! result )
+ /* Set the graph for credit */
+ self_credit = struct_initialise_bet_graph_data ( );
+ self_credit->notebook = GTK_NOTEBOOK ( notebook );
+ self_credit->tree_view = tree_view;
+ self_credit->account_number = account_number;
+ self_credit->type_infos = 0;
+ self_credit->title = g_strdup ( _("Incomes") );
+ self_credit->service_id = g_strdup ( "GogPiePlot" );
+ self_credit->is_legend = TRUE;
+
+ self_credit->plot = bet_graph_create_graph_page ( self_credit, FALSE );
+
+ /* populate the data for credit */
+ if ( self_credit->valid_data == FALSE )
+ self_credit->valid_data = bet_graph_populate_sectors_by_hist_data ( self_credit );
+ if ( !self_credit->valid_data )
return;
- result = bet_graph_affiche_camemberts ( self_debit );
- if ( ! result )
+
+ /* show the data for credit */
+ result = bet_graph_affiche_camemberts ( self_credit );
+ if ( !result )
return;
gtk_widget_show_all ( dialog );
@@ -333,7 +492,7 @@ gboolean bet_graph_populate_sectors_by_hist_data ( struct_bet_graph_data *self )
gtk_tree_model_get ( GTK_TREE_MODEL( model ),
&iter,
SPP_HISTORICAL_DESC_COLUMN, &desc,
- SPP_HISTORICAL_RETAINED_AMOUNT, &amount,
+ SPP_HISTORICAL_BALANCE_AMOUNT, &amount,
SPP_HISTORICAL_DIV_NUMBER, &div,
-1 );
@@ -343,6 +502,7 @@ gboolean bet_graph_populate_sectors_by_hist_data ( struct_bet_graph_data *self )
strncpy ( &libelle_division[self -> nbre_elemnts * TAILLE_MAX_LIBELLE], desc, TAILLE_MAX_LIBELLE );
tab_montant_division[self -> nbre_elemnts] = utils_str_strtod ( ( amount == NULL) ? "0" : amount, NULL );
+ self->montant += tab_montant_division[self -> nbre_elemnts];
self -> nbre_elemnts++;
}
@@ -367,15 +527,13 @@ gboolean bet_graph_populate_sectors_by_hist_data ( struct_bet_graph_data *self )
* */
gboolean bet_graph_affiche_camemberts ( struct_bet_graph_data *self )
{
- GogChart *chart;
- GogObject *cur_plot;
+ GogPlot *cur_plot;
GogSeries *series;
GOData *data;
GError * error = NULL;
/* Afficher les montants des divisions de type débit dans le camembert */
- chart = go_graph_widget_get_chart ( GO_GRAPH_WIDGET ( self -> widget ) );
- cur_plot = gog_object_get_child_by_name ( GOG_OBJECT ( chart ), "Plot" );
+ cur_plot = self->plot;
gog_plot_clear_series ( GOG_PLOT ( cur_plot ) );
series = GOG_SERIES ( gog_plot_new_series ( GOG_PLOT ( cur_plot ) ) );
@@ -414,8 +572,6 @@ void bet_graph_line_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
{
GtkWidget *dialog;
GtkWidget *label;
- GtkWidget *sw_canvas;
- GtkWidget *box_line;
gchar *title;
gchar *service_id;
gint result;
@@ -429,6 +585,9 @@ void bet_graph_line_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
return;
/* initialisation des structures de données */
+ if ( prefs_lines == NULL )
+ prefs_lines = struct_initialise_bet_graph_prefs ( );
+
account_number = gsb_gui_navigation_get_current_account ( );
service_id = g_object_get_data ( G_OBJECT ( button ), "service_id" );
@@ -440,16 +599,12 @@ void bet_graph_line_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
/* Création de la fenêtre de dialogue pour le graph */
dialog = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "bet_graph_dialog" ) );
gtk_window_set_transient_for ( GTK_WINDOW ( dialog ), GTK_WINDOW ( run.window ) );
- gtk_widget_set_usize ( dialog, PAGE_WIDTH+30, PAGE_HEIGHT+70 );
+ gtk_widget_set_size_request ( dialog, PAGE_WIDTH+30, PAGE_HEIGHT+70 );
gtk_signal_connect ( GTK_OBJECT ( dialog ),
"destroy",
GTK_SIGNAL_FUNC ( gtk_widget_destroy ),
NULL);
- sw_canvas = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "sw_canvas" ) );
- box_line = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "box_line" ) );
- gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( sw_canvas ), box_line );
-
/* set the title */
label = GTK_WIDGET ( g_object_get_data ( G_OBJECT ( tree_view ), "label_title") );
title = make_pango_attribut ( "weight=\"bold\" size=\"x-large\"",
@@ -459,20 +614,34 @@ void bet_graph_line_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
gtk_label_set_markup ( GTK_LABEL ( label ), title );
g_free ( title );
- /* Set the graph for credit */
- self->widget = go_graph_widget_new ( NULL );
- bet_graph_create_graph_widget ( self );
- gtk_box_pack_start ( GTK_BOX ( box_line ), self->widget, TRUE, TRUE, 0 );
+ /* initialise les pages pour les graphiques ligne et barre */
+ self->notebook = GTK_NOTEBOOK ( gtk_builder_get_object ( bet_graph_builder, "notebook" ) );
+
+ /* set the graphique page */
+ self->plot = bet_graph_create_graph_page ( self, TRUE );
+
+ /* set the preferences page */
+ bet_graph_create_prefs_page ( self );
+
+ /* populate data */
+ self->valid_data = bet_graph_populate_lines_by_forecast_data ( self );
+ if ( !self->valid_data )
+ return;
+
+ /* affiche les données */
+ result = bet_graph_affiche_XY_line ( self );
+ if ( !result )
+ return;
- bet_graph_populate_lines_by_forecast_data ( self );
- bet_graph_affiche_XY_line ( self );
gtk_widget_show_all ( dialog );
+ gtk_notebook_set_current_page ( self->notebook, 0 );
result = gtk_dialog_run ( GTK_DIALOG ( dialog ) );
/* free the data */
struct_free_bet_graph_data ( self );
g_object_unref ( G_OBJECT ( bet_graph_builder ) );
+
gtk_widget_destroy ( dialog );
}
@@ -487,6 +656,7 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
{
GtkTreeModel *model = NULL;
GtkTreeIter iter;
+ gdouble prev_montant;
model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( self -> tree_view ) );
if ( model == NULL )
@@ -496,12 +666,9 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
{
gchar *libelle_axe_x = self -> tab_libelle[0];
gchar **tab_libelle_axe_x;
-/* gdouble *tab_X = self -> tab_X; */
gdouble *tab_Y = self -> tab_Y;
gdouble montant = 0.;
- GDateMonth mois_courant;
-
-/* gint x_axis = 0; */
+ GDateDay day_courant;
tab_libelle_axe_x = &libelle_axe_x;
@@ -511,7 +678,7 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
gchar *str_date;
GValue date_value = {0,};
GDate *date;
-/* GDateMonth mois; */
+ GDateDay day;
gtk_tree_model_get_value ( model,
&iter,
@@ -525,40 +692,36 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
date = g_value_get_boxed ( &date_value );
montant += (gdouble) utils_str_strtod ( ( amount == NULL) ? "0" : amount, NULL );
- tab_Y[self->nbre_elemnts] = montant;
if ( self -> nbre_elemnts == 0 )
{
g_date_add_days ( date, 1 );
- mois_courant = g_date_get_month ( date );
+ day_courant = g_date_get_day ( date );
strncpy ( &libelle_axe_x[self -> nbre_elemnts * TAILLE_MAX_LIBELLE], str_date, TAILLE_MAX_LIBELLE );
+ self -> nbre_elemnts++;
}
else
{
-/* mois = g_date_get_month ( date );
- * if ( mois == mois_courant )
- * {
- * strncpy ( &libelle_axe_x[self -> nbre_elemnts * TAILLE_MAX_LIBELLE], "", TAILLE_MAX_LIBELLE );
- * }
- * else
- * {
- */
+ day = g_date_get_day ( date );
+ if ( day != day_courant )
+ {
strncpy ( &libelle_axe_x[self -> nbre_elemnts * TAILLE_MAX_LIBELLE], str_date, TAILLE_MAX_LIBELLE );
- mois_courant = g_date_get_month ( date );
-/* printf ("self -> nbre_elemnts = %d\tdate_value = %s date_texte = %s x = %d y = %.2f\n",
- * self -> nbre_elemnts, gsb_format_gdate (date), str_date, (gint) tab_X[self->nbre_elemnts], tab_Y[self->nbre_elemnts]);
- */
+ tab_Y[self->nbre_elemnts-1] = prev_montant;
-/* } */
+ day_courant = day;
+ self -> nbre_elemnts++;
+ }
}
- self -> nbre_elemnts++;
+ prev_montant = montant;
if ( self -> nbre_elemnts >= MAX_POINTS_GRAPHIQUE )
break;
}
while ( gtk_tree_model_iter_next ( GTK_TREE_MODEL ( model ), &iter ) );
+ tab_Y[self->nbre_elemnts-1] = prev_montant;
+
return TRUE;
}
@@ -574,16 +737,53 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
* */
gboolean bet_graph_affiche_XY_line ( struct_bet_graph_data *self )
{
- GogChart *chart;
- GogObject *cur_plot;
+ GogPlot *cur_plot;
GogSeries *series;
GOData *data;
- GError * error = NULL;
+ GOStyle *style;
+ GogObject *axis;
+ GError *error = NULL;
+ gchar *position;
+
+ devel_debug (NULL);
/* Afficher données dans le graphique */
- chart = go_graph_widget_get_chart ( GO_GRAPH_WIDGET ( self->widget ) );
- cur_plot = gog_object_get_child_by_name ( GOG_OBJECT ( chart ), "Plot" );
+ cur_plot = self->plot;
+
+ /* on met en vertical les libellés de l'axe X */
+ axis = gog_object_get_child_by_name ( GOG_OBJECT ( self->chart ), "X-Axis" );
+
+ style = go_styled_object_get_style ( GO_STYLED_OBJECT ( axis ) );
+ go_style_set_text_angle ( style, prefs_lines->degrees );
+
+ /* on positionne l'axe des x sur le 0 par défaut */
+ switch ( prefs_lines->position )
+ {
+ case 0:
+ position = "low";
+ break;
+ case 1:
+ position = "high";
+ break;
+ case 2:
+ position = "cross";
+ break;
+ default :
+ position = "cross";
+ }
+ g_object_set ( G_OBJECT ( axis ),
+ "pos-str", position,
+ "cross-axis-id", gog_object_get_id ( GOG_OBJECT ( axis ) ),
+ NULL );
+
+ g_object_set ( G_OBJECT ( axis ),
+ "major-tick-in", prefs_lines->major_tick_in,
+ "major-tick-out", prefs_lines->major_tick_out,
+ "major-tick-labeled", prefs_lines->major_tick_labeled,
+ NULL);
+
+ /* on met à jour les données à afficher */
series = GOG_SERIES ( gog_plot_new_series ( GOG_PLOT ( cur_plot ) ) );
data = go_data_vector_str_new ( (const char * const*) self -> tab_vue_libelle, self -> nbre_elemnts, NULL );
@@ -777,6 +977,182 @@ void bet_graph_popup_choix_graph_activate ( GtkMenuItem *menuitem,
/**
+ * Création de la page de préférences pour les graphiques lignes
+ *
+ *
+ *
+ * */
+GtkWidget *bet_graph_create_line_preferences ( struct_bet_graph_data *self )
+{
+ GtkWidget *box_prefs_line;
+ GtkWidget *rot_align;
+ GtkWidget *widget;
+ GtkWidget *button_1;
+ GtkWidget *button_2;
+ GtkWidget *button_3;
+ GtkWidget *rotation;
+
+ box_prefs_line = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "box_prefs_line") );
+ rot_align = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "rot_align") );
+
+ /* configure les options d'affichage de l'axe X */
+ widget = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "major-tick-out" ) );
+ if ( prefs_lines->major_tick_out )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), prefs_lines->major_tick_out );
+
+ g_object_set_data ( G_OBJECT ( widget ), "rang", GINT_TO_POINTER ( 0 ) );
+ g_signal_connect ( widget,
+ "toggled",
+ G_CALLBACK ( bet_graph_toggle_button_changed ),
+ self );
+
+ widget = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "major-tick-in" ) );
+ if ( prefs_lines->major_tick_in )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), prefs_lines->major_tick_in );
+
+ g_object_set_data ( G_OBJECT ( widget ), "rang", GINT_TO_POINTER ( 1 ) );
+ g_signal_connect ( widget,
+ "toggled",
+ G_CALLBACK ( bet_graph_toggle_button_changed ),
+ self );
+
+ widget = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "major-tick-labeled" ) );
+ if ( prefs_lines->major_tick_labeled )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), prefs_lines->major_tick_labeled );
+
+ g_object_set_data ( G_OBJECT ( widget ), "rang", GINT_TO_POINTER ( 2 ) );
+ g_signal_connect ( widget,
+ "toggled",
+ G_CALLBACK ( bet_graph_toggle_button_changed ),
+ self );
+
+ /* Configuration de la position de l'axe des X */
+ button_1 = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "axis_low" ) );
+ if ( prefs_lines->position == 0 )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button_1 ), TRUE );
+
+ g_object_set_data ( G_OBJECT ( button_1 ), "rang", GINT_TO_POINTER ( 3 ) );
+ button_2 = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "axis_high" ) );
+ if ( prefs_lines->position == 1 )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON (button_2 ), TRUE );
+
+ g_object_set_data ( G_OBJECT ( button_2 ), "rang", GINT_TO_POINTER ( 4 ) );
+ button_3 = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "axis_cross" ) );
+ if ( prefs_lines->position == 2 )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button_3 ), TRUE );
+
+ g_object_set_data ( G_OBJECT ( button_3 ), "rang", GINT_TO_POINTER ( 5 ) );
+
+ /* set the signal */
+ g_signal_connect ( button_1,
+ "toggled",
+ G_CALLBACK ( bet_graph_toggle_button_changed ),
+ self );
+
+ g_signal_connect ( button_2,
+ "toggled",
+ G_CALLBACK ( bet_graph_toggle_button_changed ),
+ self );
+
+ g_signal_connect ( button_3,
+ "toggled",
+ G_CALLBACK ( bet_graph_toggle_button_changed ),
+ self );
+
+ /* configure l'orientation des étiquettes de l'axe X */
+ rotation = go_rotation_sel_new ( );
+ go_rotation_sel_set_rotation (GO_ROTATION_SEL ( rotation ), prefs_lines->degrees );
+ g_signal_connect ( G_OBJECT ( rotation ),
+ "rotation-changed",
+ G_CALLBACK ( bet_graph_rotation_changed ),
+ self );
+
+ gtk_container_add ( GTK_CONTAINER ( rot_align ), rotation );
+
+ return box_prefs_line;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+void bet_graph_toggle_button_changed ( GtkToggleButton *togglebutton,
+ struct_bet_graph_data *self )
+{
+ gint rang;
+ gboolean active;
+
+ active = gtk_toggle_button_get_active ( togglebutton );
+
+ rang = GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( togglebutton ), "rang" ) );
+
+ switch ( rang )
+ {
+ case 0:
+ prefs_lines->major_tick_out = active;
+ break;
+ case 1:
+ prefs_lines->major_tick_in = active;
+ break;
+ case 2:
+ prefs_lines->major_tick_labeled = active;
+ break;
+ case 3:
+ prefs_lines->position = 0;
+ break;
+ case 4:
+ prefs_lines->position = 1;
+ break;
+ case 5:
+ prefs_lines->position = 2;
+ break;
+ }
+
+ /* on met à jour le graph */
+ bet_graph_update_graph ( self );
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+void bet_graph_rotation_changed ( GORotationSel *rotation,
+ int angle,
+ struct_bet_graph_data *self )
+{
+ prefs_lines->degrees = angle;
+
+ /* on met à jour le graph */
+ bet_graph_update_graph ( self );
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+void bet_graph_update_graph ( struct_bet_graph_data *self )
+{
+ devel_debug (NULL);
+
+ gtk_notebook_remove_page ( self->notebook, 0 );
+
+ self->plot = bet_graph_create_graph_page ( self, TRUE );
+ gtk_widget_show_all ( GTK_WIDGET ( self->notebook ) );
+
+ bet_graph_affiche_XY_line ( self );
+}
+
+
+/**
*
*
*
@@ -826,6 +1202,12 @@ struct_bet_graph_data *struct_initialise_bet_graph_data ( void )
}
+/**
+ *
+ *
+ *
+ *
+ * */
void struct_free_bet_graph_data ( struct_bet_graph_data *self )
{
g_free ( self->title );
@@ -842,6 +1224,39 @@ void struct_free_bet_graph_data ( struct_bet_graph_data *self )
*
*
* */
+struct_bet_graph_prefs *struct_initialise_bet_graph_prefs ( void )
+{
+ struct_bet_graph_prefs *self;
+
+ self = g_new0 ( struct_bet_graph_prefs, 1 );
+
+ self->major_tick_out = TRUE;
+ self->major_tick_labeled = TRUE;
+ self->position = 2;
+ self->degrees = 90;
+
+ return self;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+void struct_free_bet_graph_prefs ( struct_bet_graph_prefs *self )
+{
+ g_free ( self );
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
void bet_graph_free_builder ( void )
{
g_object_unref ( G_OBJECT ( bet_graph_builder ) );
diff --git a/src/bet_hist.c b/src/bet_hist.c
index da48d28..c5ea6aa 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -517,8 +517,9 @@ 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_CURRENT_COLUMN */
+ G_TYPE_STRING, /* SPP_HISTORICAL_CURRENT_COLUMN */
G_TYPE_STRING, /* SPP_HISTORI AL_CURRENT_COLUMN */ r ) k_labeled ); NULL ); _elemnts]); ½Ð° " s»\n" àqÿ uR¿Ú* ªS¿Ú* ¥s¿Ú* oÀÚ* PÄàqÿ °ÀÚ* @¹àqÿ ¸àqÿ k R¿Ú* 6 è è! è! àÃàqÿ PÄàqÿ xToÀÚ* @ºàqÿ R¿Ú* R¿Ú* àÃàqÿ `R¿Ú* Äàqÿ ÀOÓÀÚ* uR¿Ú* @ÓÀÚ* ØDÓÀÚ* ¨IÓÀÚ* ªS¿Ú* xToÀÚ* @ºàqÿ ¹àqÿ k R¿Ú* à! à! àÃàqÿ PÄàqÿ HOÀÚ* »àqÿ R¿Ú* R¿Ú* àÃàqÿ `R¿Ú* Äàqÿ Äàqÿ Äàqÿ 8«s¿Ú* p PÄàqÿ uR¿Ú* ªS¿Ú* »àqÿ ð¹àqÿ k R¿Ú* G H I J K M N O P àÃàqÿ PÄàqÿ HÕ%ÀÚ* À¼àqÿ R¿Ú* R¿Ú* àÃàqÿ 0OÓÀÚ* uR¿Ú* `oÀÚ* ÀÚ* @ÓÀÚ* ØDÓÀÚ* ¨IÓÀÚ* ªS¿Ú* HÕ%ÀÚ* À¼àqÿ
»àqÿ k R¿Ú* 8Õ%ÀÚ* À¼àqÿ 0»àqÿ k R¿Ú* (Õ%ÀÚ* À¼àqÿ `»àqÿ k R¿Ú* Õ%ÀÚ* À¼àqÿ »àqÿ k R¿Ú* ¨NÓÀÚ* uR¿Ú* ¨IÓÀÚ* ¶àqÿ XÀÚ* eR¿Ú* ØDÓÀÚ* 0¼àqÿ yXÀÚ* eR¿Ú* @ÓÀÚ* `¼àqÿ ZXÀÚ* eR¿Ú* ØÀÚ* `oÀÚ* ÀÚ* @ÓÀÚ* ØdoÀÚ* ØDÓÀÚ* ¨IÓÀÚ* ªS¿Ú* 8«s¿Ú* ÍοÚ* PÄàqÿ pÀÚ* ¾àqÿ à¼àqÿ k R¿Ú* 5 6 7 8 : < = > ? @ B D àÃàqÿ PÄàqÿ àÍË¿Ú* PÄàqÿ uR¿Ú* ¥s¿Ú* ¼àqÿ ÍοÚ* eR¿Ú* ¥s¿Ú* Õ_ at fÆS Qöl±íÁã¿Ú* PÄàqÿ àÍË¿Ú* ¿àqÿ ð½àqÿ k R¿Ú* u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*ÄvàÃàqÿ PÄàqÿ H¿Ú* dÔ¿Ú* Åàqÿ ¦p6ÁÚ* ¦p6ÁÚ* ¶Ñ¿Ú* Äàqÿ PÅàqÿ Äàqÿ pÀàqÿ ooÀÚ* uR¿Ú* ØdoÀÚ* ÐÆàqÿ ¢p6ÁÚ* Åàqÿ 0Áàq
ÿ ÿÿÿÿÿÿÿÿ¢p6ÁÚ* XÄàqÿ CAL_BALANCE_COLUMN */
+ G_TYPE_STRING, /* SPP_HISTORICAL_BALANCE_AMOUNT */
G_TYPE_STRING, /* SPP_HISTORICAL_AVERAGE_COLUMN */
G_TYPE_STRING, /* SPP_HISTORICAL_AVERAGE_AMOUNT */
G_TYPE_STRING, /* SPP_HISTORICAL_RETAINED_COLUMN */
@@ -830,6 +831,7 @@ void bet_historical_populate_div_model ( gpointer key,
gpointer sub_key, sub_value;
gchar *div_name = NULL;
gchar *str_balance;
+ gchar *str_balance_amount;
gchar *str_average;
gchar *str_amount;
gchar *str_retained = NULL;
@@ -857,6 +859,8 @@ void bet_historical_populate_div_model ( gpointer key,
model = gtk_tree_view_get_model ( tree_view );
+ str_balance_amount = gsb_real_safe_real_to_string ( sbr->current_balance,
+ gsb_data_currency_get_floating_point ( currency_number ) );
str_balance = utils_real_get_string_with_currency ( sbr -> current_balance, currency_number, TRUE );
average = gsb_real_div ( sbr -> current_balance, period );
str_amount = gsb_real_safe_real_to_string ( average,
@@ -871,6 +875,7 @@ void bet_historical_populate_div_model ( gpointer key,
SPP_HISTORICAL_DESC_COLUMN, div_name,
SPP_HISTORICAL_CURRENT_COLUMN, str_current_fyear,
SPP_HISTORICAL_BALANCE_COLUMN, str_balance,
+ SPP_HISTORICAL_BALANCE_AMOUNT, str_balance_amount,
SPP_HISTORICAL_AVERAGE_COLUMN, str_average,
SPP_HISTORICAL_AVERAGE_AMOUNT, str_amount,
SPP_HISTORICAL_RETAINED_AMOUNT, str_amount,
@@ -902,6 +907,8 @@ void bet_historical_populate_div_model ( gpointer key,
}
/* printf ("division = %d div_name = %s\n", div_number, div_name); */
g_free ( div_name );
+ g_free ( str_balance );
+ g_free ( str_balance_amount );
g_free ( str_average );
g_free ( str_amount );
g_free ( str_current_fyear );
@@ -933,7 +940,9 @@ void bet_historical_populate_div_model ( gpointer key,
g_strfreev ( tab_str );
}
- str_balance = utils_real_get_string_with_currency ( sub_sbr -> current_balance,
+ str_balance_amount = gsb_real_safe_real_to_string ( sub_sbr->current_balance,
+ gsb_data_currency_get_floating_point ( currency_number ) );
+ str_balance = utils_real_get_string_with_currency ( sub_sbr -> current_balance,
currency_number, TRUE );
average = gsb_real_div ( sub_sbr -> current_balance, period );
str_amount = gsb_real_safe_real_to_string ( average,
@@ -949,6 +958,7 @@ void bet_historical_populate_div_model ( gpointer key,
SPP_HISTORICAL_DESC_COLUMN, div_name,
SPP_HISTORICAL_CURRENT_COLUMN, str_current_fyear,
SPP_HISTORICAL_BALANCE_COLUMN, str_balance,
+ SPP_HISTORICAL_BALANCE_AMOUNT, str_balance_amount,
SPP_HISTORICAL_AVERAGE_COLUMN, str_average,
SPP_HISTORICAL_AVERAGE_AMOUNT, str_amount,
SPP_HISTORICAL_RETAINED_AMOUNT, str_amount,
@@ -999,6 +1009,7 @@ void bet_historical_populate_div_model ( gpointer key,
}
g_free ( div_name );
g_free ( str_balance );
+ g_free ( str_balance_amount );
g_free ( str_average );
g_free ( str_amount );
g_free ( str_current_fyear );
diff --git a/src/ui/bet_graph.ui b/src/ui/bet_graph.ui
index 76d0be3..0f76f94 100644
--- a/src/ui/bet_graph.ui
+++ b/src/ui/bet_graph.ui
@@ -1,22 +1,66 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">500</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkArrow" id="arrow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">down</property>
+ <property name="shadow_type">etched-out</property>
+ </object>
<object class="GtkDialog" id="bet_graph_dialog">
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="type_hint">normal</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label_canvas">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -26,38 +70,320 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="sw_canvas">
+ <object class="GtkVBox" id="box_canvas">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
<child>
- <placeholder/>
+ <object class="GtkNotebook" id="notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">10</property>
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">button1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkVBox" id="box_pie">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <object class="GtkVBox" id="box_prefs_line">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Options for the X axis</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box_options">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkVBox" id="axis_base_pref_box">
<property name="visible">True</property>
- <property name="layout_style">end</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="spacing">12</property>
<child>
- <placeholder/>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">24</property>
+ <child>
+ <object class="GtkVBox" id="major_tick_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Major ticks</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="major-tick-out">
+ <property name="label" translatable="yes">Outside</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="major-tick-in">
+ <property name="label" translatable="yes">Inside</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="major-tick-labeled">
+ <property name="label" translatable="yes">Show Labels</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-close</property>
+ <object class="GtkVBox" id="position_box">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Position</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="cross_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="axis_low">
+ <property name="label" translatable="yes">Low</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="axis_high">
+ <property name="label" translatable="yes">High</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">axis_low</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkAlignment" id="alignment15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <child>
+ <object class="GtkRadioButton" id="axis_cross">
+ <property name="label" translatable="yes">Crosses the Y axis at 0</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">axis_low</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -67,52 +393,192 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkVSeparator" id="vseparator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="rot_align">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">12</property>
+ <property name="left_padding">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
- <action-widgets>
- <action-widget response="0">button1</action-widget>
- </action-widgets>
- </object>
- <object class="GtkVBox" id="box_pie">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="homogeneous">True</property>
<child>
- <placeholder/>
+ <object class="GtkHSeparator" id="hseparator2">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="label2">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes"><b>Options for the columns</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
</child>
- </object>
- <object class="GtkVBox" id="box_line">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
- <placeholder/>
+ <object class="GtkHSeparator" id="hseparator3">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xscale">0</property>
+ <child>
+ <object class="GtkTable" id="gog_barcol_prefs">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label61">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Gap:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">gap_spinner</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label63">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">%</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="gap_spinner">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â¢</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">10</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="before-grid">
+ <property name="label" translatable="yes">Display the grids above the plot</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
</child>
</object>
<object class="GtkHBox" id="button_menu_box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<child>
<object class="GtkVBox" id="box_button">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Display the data graph</property>
- <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -123,18 +589,16 @@
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Select the chart type</property>
+ <property name="use_action_appearance">False</property>
<property name="image">arrow</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
- <object class="GtkArrow" id="arrow">
- <property name="visible">True</property>
- <property name="arrow_type">down</property>
- <property name="shadow_type">etched-out</property>
- </object>
</interface>
diff --git a/src/utils_real.c b/src/utils_real.c
index 0184eee..83ce770 100644
--- a/src/utils_real.c
+++ b/src/utils_real.c
@@ -24,12 +24,13 @@
#endif
#include "include.h"
-#include "gsb_data_currency.h"
-#include "gsb_locale.h"
+/*START_INCLUDE*/
#include "utils_real.h"
-
-
+#include "gsb_data_account.h"
+#include "gsb_data_currency.h"
+#include "gsb_locale.h"
+/*END_INCLUDE*/
/*START_EXTERN*/
extern gsb_real error_real;
@@ -132,3 +133,30 @@ gsb_real utils_real_get_from_string ( const gchar *string )
return result;
}
+
+
+/**
+ * Retourne le gdouble formaté comme dans la fonction source.
+ * Le symbole de la monnaie est présent par défaut.
+ *
+ * \param number Number to format.
+ * \param account_number
+ *
+ * \return A newly allocated string of the number
+ * */
+gchar *utils_real_get_string_with_currency_from_double ( gdouble number,
+ gint account_number )
+{
+ gint currency_number;
+ gsb_real real;
+
+ currency_number = gsb_data_account_get_currency ( account_number );
+ real = gsb_real_double_to_real ( number );
+
+ return utils_real_get_string_with_currency ( real, currency_number, TRUE );
+}
+
+
+/* Local Variables: */
+/* c-basic-offset: 4 */
+/* End: */
diff --git a/src/utils_real.h b/src/utils_real.h
index 36b8c0b..5345a9b 100644
--- a/src/utils_real.h
+++ b/src/utils_real.h
@@ -10,6 +10,9 @@ gchar *utils_real_get_string_with_currency ( gsb_real number,
gint currency_number,
gboolean show_symbol );
+gchar *utils_real_get_string_with_currency_from_double ( gdouble number,
+ gint account_number );
+
gsb_real utils_real_get_from_string ( const gchar *string );
#endif
hooks/post-receive
--
grisbi
More information about the cvs
mailing list