[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_4-72-gf362015
Pierre Biava
nobody at users.sourceforge.net
Sat Oct 1 21:15:42 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 f362015c51f2cb6a922365896846d5bcb4467d4e (commit)
via 64186b5cd1aa147105c7c430fc5e348ff54297c6 (commit)
via 6238b0f4432e26065b50879f0e1907affd7ac6c5 (commit)
via 70b45e315595e8f9155000a21dd68c523a08da1d (commit)
via c8b31d8ea16b2503e43c22a5d529a7f1a9eb3308 (commit)
via 5816fc48136c5fbd3ff6b4415569d6118ac6a4e0 (commit)
via 3ba9ae3bca4293235d8527682cddf94c0b26ca7c (commit)
via 79166ede6d2264b5e978c5bfc824454bf325522c (commit)
via 91914ed11af446d874c09cdd9acce0c1a3766feb (commit)
via 191d577c2ab28740daebab187dae57863c837ddc (commit)
via 0e7f81bd595e50caae55902e9ffe7b677d07b4f4 (commit)
via 87597d242fc885497b04e4adda089399c76bde46 (commit)
via 08dcfbba257f85f48904a6201eef529f24c692df (commit)
via 45efa502610bc6ee85995ab883f09a043695055d (commit)
via 3d109150f64957f94215c05f67d6703cb688b45d (commit)
via 138b21aa9526a7db07a23808bb6b47da1653b2c1 (commit)
from d8c34468b0fe48df1ab4e1fc2a8860e5c3fdebef (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 f362015c51f2cb6a922365896846d5bcb4467d4e
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 1 21:09:18 2011 +0200
Add file gsb_color.c in the files to translate and update all strings
commit 64186b5cd1aa147105c7c430fc5e348ff54297c6
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 1 20:14:10 2011 +0200
minor changes which result of the merger with pbiava_graph_tools
commit 6238b0f4432e26065b50879f0e1907affd7ac6c5
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 1 20:05:19 2011 +0200
Adds the backup of graphs parameters
commit 70b45e315595e8f9155000a21dd68c523a08da1d
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 1 18:55:08 2011 +0200
Add UI_DIR and function gsb_dirs_get_ui_dir ()
commit c8b31d8ea16b2503e43c22a5d529a7f1a9eb3308
Merge: d8c3446 5816fc4
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 1 18:14:10 2011 +0200
Merge branch 'pbiava_graph_tools'
-----------------------------------------------------------------------
Changes:
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index af0faa1..c7db64d 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -32,6 +32,7 @@ grisbi_pixmaps_DATA = \
graph-histo.png \
graph-line.png \
graph-sectors.png \
+ grille.png \
grisbi-logo.png \
grisbi.png \
hide_r.png \
diff --git a/pixmaps/grille.png b/pixmaps/grille.png
new file mode 100644
index 0000000..67aa456
Binary files /dev/null and b/pixmaps/grille.png differ
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cbaf1c8..c5a9b51 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -47,6 +47,7 @@ src/gsb_bank.c
src/gsb_calendar.c
src/gsb_calendar_entry.c
src/gsb_category.c
+src/gsb_color.c
src/gsb_combo_box.c
src/gsb_currency.c
src/gsb_currency_config.c
diff --git a/po/cs.po b/po/cs.po
index b07714d..ba55947 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+0200\n"
"PO-Revision-Date: 2011-02-19 01:39+0100\n"
"Last-Translator: Markus7cz <markus7cz at gmail.com>\n"
"Language-Team: \n"
@@ -1127,31 +1127,50 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr "Volby"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "PÅÃjmy"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "Sloupce"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr ""
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "Archivy"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "Zobrazit _odsouhlasené"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "Vybrat"
@@ -4789,7 +4808,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr "Importovat data z online bankovnÃch služeb nebo z úÄetnÃho software"
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr "Moje úÄty"
@@ -5265,6 +5284,62 @@ msgstr "Nelze otevÅÃt soubor kategoriÃ."
msgid "Unnamed category list"
msgstr "Nepojmenovaný seznam kategoriÃ"
+#: ../src/gsb_color.c:428
+msgid "Transaction list background 1"
+msgstr "Pozadà seznamu transakcà 1"
+
+#: ../src/gsb_color.c:429
+msgid "Transaction list background 2"
+msgstr "Pozadà seznamu transakcà 2"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr "Barva pro transakce, které dávajà dneÅ¡nà souÄet"
+
+#: ../src/gsb_color.c:431
+msgid "Color of transaction's text"
+msgstr "Barva textu transakce"
+
+#: ../src/gsb_color.c:432
+msgid "Text of unfinished split transaction"
+msgstr "Text nedokonÄené rozdÄlené transakce"
+
+#: ../src/gsb_color.c:433
+msgid "Children of split transaction"
+msgstr "Detaily rozdÄlené transakce"
+
+#: ../src/gsb_color.c:434
+msgid "Selection color"
+msgstr "Barva výbÄru"
+
+#: ../src/gsb_color.c:435
+msgid "Background of non selectable scheduled transactions"
+msgstr "Pozadà plánovaných transakcÃ, které nejdou oznaÄit"
+
+#: ../src/gsb_color.c:436
+msgid "Archive color"
+msgstr "Barva archivu"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr "Pozadà chybnÄ zadaného data"
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr "Pozadà oddÄlovaÄů v proznóze"
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr "Pozadà dat v proznóze"
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr "Pozadà zůstatku"
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr "Pozadà transakce pÅevodu"
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Vložte smÄnný kurz"
@@ -7282,8 +7357,8 @@ msgstr "Nahrávánà úÄtů"
msgid "Failed to load accounts"
msgstr "NepodaÅilo se nahrát úÄty"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr "Chyba pÅi nahrávánà souboru '%s'"
@@ -7385,7 +7460,7 @@ msgstr ""
"zrušit tuto akci a uložit jej pod jiným jménem, nebo v Možnostech aktivovat "
"volbu \"%s\"."
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "nepojmenovaný"
@@ -7495,18 +7570,18 @@ msgstr ""
"\n"
"a stisknÄte tlaÄÃtko 'OK'."
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Nelze otevÅÃt soubor '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr "Soubor neexistuje"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7516,7 +7591,7 @@ msgstr ""
"%s vypadá, že nenà správný soubor,\n"
"prosÃm zkontrolujte jej a spuÅ¥te akci znovu."
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7528,15 +7603,15 @@ msgstr ""
"ProsÃm ujistÄte se, že je nainstalovaný (tzn. ovÄÅte že je nainstalovaný "
"balÃÄek 'grisbi-ssl') a akci zopakujte."
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr "Plugin pro šifrovánà nebyl nalezen."
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Toto nenà soubor Grisbi... Nahrávánà bylo pÅeruÅ¡eno."
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7548,7 +7623,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -7557,7 +7632,7 @@ msgstr ""
"Pro otevÅenà tohoto souboru potÅebujete verzi Grisbi %s.\n"
"Vy použÃváte verzi %s."
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7570,7 +7645,7 @@ msgstr ""
"důležitých informacà mÄjte na pamÄti, že se jedná o již archivované "
"transakce."
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr "Archiv Grisbi otevÅen"
@@ -7580,8 +7655,8 @@ msgid "There is no category to record. Back."
msgstr "Žádný plátce / pÅÃjemce k odstranÄnÃ."
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "Nelze uložit soubor '%s': %s"
@@ -9565,12 +9640,12 @@ msgstr "Spravovat podrozpoÄet"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "PÅesunout vÅ¡echny transakce do jiného podrozpoÄtu"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Chyba sigaction: SIGSEGV nebude zachycen\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11220,63 +11295,86 @@ msgid "<b>Additional line</b>"
msgstr "Dalšà zůstatek"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr " <b>%s odsouhlasenÃ</b> "
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Možnosti úÄtů hotovosti"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Možnosti úÄtů hotovosti"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Možnosti úÄtů hotovosti"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr " <b>%s odsouhlasenÃ</b> "
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "Zobrazit tip dne"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "Zobrazit tip dne"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "Zvolte mapu znaků"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11287,48 +11385,6 @@ msgstr "Osobnà správce financÃ"
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "ProsÃm vyberte zdroj dat pro úÄet: \"%s\""
-#~ msgid "Transaction list background 1"
-#~ msgstr "Pozadà seznamu transakcà 1"
-
-#~ msgid "Transaction list background 2"
-#~ msgstr "Pozadà seznamu transakcà 2"
-
-#~ msgid "Color for the operation that gives the balance today"
-#~ msgstr "Barva pro transakce, které dávajà dneÅ¡nà souÄet"
-
-#~ msgid "Color of transaction's text"
-#~ msgstr "Barva textu transakce"
-
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "Text nedokonÄené rozdÄlené transakce"
-
-#~ msgid "Children of split transaction"
-#~ msgstr "Detaily rozdÄlené transakce"
-
-#~ msgid "Selection color"
-#~ msgstr "Barva výbÄru"
-
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr "Pozadà plánovaných transakcÃ, které nejdou oznaÄit"
-
-#~ msgid "Archive color"
-#~ msgstr "Barva archivu"
-
-#~ msgid "Background of invalid date entry"
-#~ msgstr "Pozadà chybnÄ zadaného data"
-
-#~ msgid "Background of bet division"
-#~ msgstr "Pozadà oddÄlovaÄů v proznóze"
-
-#~ msgid "Background of bet futur"
-#~ msgstr "Pozadà dat v proznóze"
-
-#~ msgid "Background of bet solde"
-#~ msgstr "Pozadà zůstatku"
-
-#~ msgid "Background of bet transfer"
-#~ msgstr "Pozadà transakce pÅevodu"
-
#~ msgid "Reconciliation ref."
#~ msgstr "Ref. odsouhlasenÃ"
@@ -11345,10 +11401,6 @@ msgstr "Osobnà správce financÃ"
#~ msgstr "Odstranit archiv"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "Archivy"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "Archivace transakcÃ"
diff --git a/po/da.po b/po/da.po
index a25fde9..e8374fc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+0200\n"
"PO-Revision-Date: 2006-03-25 13:23+0100\n"
"Last-Translator: Dmitri Popov <dmpop at openoffice.org>\n"
"Language-Team: \n"
@@ -1197,31 +1197,50 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr ""
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr ""
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "kolonner"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr ""
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "Grisbi logo"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "Vis afstemte transaktioner"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
@@ -4771,7 +4790,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
#, fuzzy
msgid "My accounts"
msgstr "Vis konti"
@@ -5208,6 +5227,70 @@ msgstr "Eksportér kategorier"
msgid "Unnamed category list"
msgstr "Ny konto"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "Skrifttype i liste over transaktioner"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "Skrifttype i liste over transaktioner"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "Fly transaktioner til kategori"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "Opret en planlagt transaktion"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "Lukkede planlagte transaktioner"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "Skjul afstemte transaktioner"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr "Lukkede planlagte transaktioner"
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "Lukkede planlagte transaktioner"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr ""
@@ -7223,8 +7306,8 @@ msgstr "Bankkonto"
msgid "Failed to load accounts"
msgstr "Slet konto"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr ""
@@ -7307,7 +7390,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "unavngivet"
@@ -7401,18 +7484,18 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr ""
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr ""
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7420,7 +7503,7 @@ msgid ""
"please check it and try again."
msgstr ""
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7428,17 +7511,17 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
#, fuzzy
msgid "Encryption plugin not found."
msgstr "Konto %s blev ikke fundet.\n"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Denne fil er ikke en Grisbi-rapport"
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7447,14 +7530,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7462,7 +7545,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7471,8 +7554,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr ""
@@ -9408,12 +9491,12 @@ msgstr "Budgetlinje"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "Fly transaktioner til kategori"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr ""
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -10983,63 +11066,86 @@ msgid "<b>Additional line</b>"
msgstr "Balancer"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr "Skjul afstemte transaktioner"
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Bankkonto"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Bankkonto"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Bankkonto"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr "Skjul afstemte transaktioner"
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "Vis gitter"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "Vis gitter"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "Tilføj valuta"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11052,38 +11158,6 @@ msgstr ""
#~ msgstr "Lukkede planlagte transaktioner"
#, fuzzy
-#~ msgid "Transaction list background 1"
-#~ msgstr "Skrifttype i liste over transaktioner"
-
-#, fuzzy
-#~ msgid "Transaction list background 2"
-#~ msgstr "Skrifttype i liste over transaktioner"
-
-#, fuzzy
-#~ msgid "Color of transaction's text"
-#~ msgstr "Fly transaktioner til kategori"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "Opret en planlagt transaktion"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "Lukkede planlagte transaktioner"
-
-#, fuzzy
-#~ msgid "Selection color"
-#~ msgstr "Skjul afstemte transaktioner"
-
-#, fuzzy
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr "Lukkede planlagte transaktioner"
-
-#, fuzzy
-#~ msgid "Archive color"
-#~ msgstr "Lukkede planlagte transaktioner"
-
-#, fuzzy
#~ msgid "Export a category file (.cgsb)"
#~ msgstr "Eksportér kategorier"
diff --git a/po/de.po b/po/de.po
index 1907f7e..abbf03c 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-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1129,30 +1129,49 @@ 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:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr "Weitere Optionen"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "Einnahmen"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
msgid "Column"
msgstr "Spalte"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr "Zeile"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "Passwort verbergen"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "_Abgestimmte Buchungen anzeigen"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "Auswählen"
@@ -4822,7 +4841,7 @@ 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
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr "Meine Konten"
@@ -5305,6 +5324,71 @@ msgstr "Die Kategoriendatei konnte nicht geöffnet werden."
msgid "Unnamed category list"
msgstr "Kategorienliste ohne Namen"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "Buchungsübersicht Einstellungen"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "Buchungsübersicht Einstellungen"
+
+#: ../src/gsb_color.c:430
+#, fuzzy
+msgid "Color for the operation that gives the balance today"
+msgstr "Aktuellen Saldo hervorheben"
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "Splittbuchungen"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "Buchung in geplante Buchung _konvertieren"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "Buchung bearbeiten"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "Verzeichnis für Symbole - Grisbi"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr "Geplante Buchung manuell ausführen"
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "Archivierung nach Bericht"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Wechselkurs eingeben - Grisbi"
@@ -7345,8 +7429,8 @@ msgstr "Konten laden"
msgid "Failed to load accounts"
msgstr "Fehler beim Laden der Konten"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr "Fehler beim Ãffnen der Datei '%s'"
@@ -7450,7 +7534,7 @@ msgstr ""
"speichern wollen, müssen Sie den Vorgang abbrechen und die Datei unter einem "
"anderen Namen speichern oder die Option \"%s\" in den Einstellungen setzen."
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "Unbenannt"
@@ -7559,18 +7643,18 @@ msgstr ""
"\n"
"Die Eingabe mit 'OK' bestätigen."
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Die Datei kann nicht geöffnet werden '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr "Die Datei ist nicht vorhanden"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7580,7 +7664,7 @@ msgstr ""
"%s scheint keine reguläre Datei zu sein,\n"
"bitte prüfen und erneut versuchen."
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7592,15 +7676,15 @@ msgstr ""
"\n"
"Bitte prüfen, ob das Modul installiert ist und erneut versuchen."
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr "Das Modul für die Verschlüsselung kann nicht gefunden werden."
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Diese Datei ist kein Grisbi-Datei...der Ladevorgang wird abgebrochen."
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7612,7 +7696,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -7621,7 +7705,7 @@ msgstr ""
"Grisbi mit Version %s ist zum Ãffnen der Datei notwendig.\n"
"Sie verwenden Version %s."
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7632,7 +7716,7 @@ msgstr ""
"Bevor Buchungen oder wichtige Informationen geändert werden sollten Sie "
"beachten, dass es sich um ein Archiv handelt."
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr "Grisbi Archiv geöffnet"
@@ -7641,8 +7725,8 @@ msgid "There is no category to record. Back."
msgstr "Es ist keine Kategorie für eine Erfassung vorhanden."
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "Die Datei kann nicht gespeichert werden '%s': %s"
@@ -9670,12 +9754,12 @@ msgstr "Teil-Budgeteintrag verwalten"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "Alle Buchungen einem anderen Teil-Budgeteintrag zuordnen"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Fehler bei der Sigaktion. SIGSEGV wird nicht eingeschlossen\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11358,61 +11442,84 @@ msgid "<b>Additional line</b>"
msgstr "Zusätzlicher Saldo"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr " <b>%s Abstimmung</b> "
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Einstellungen für Bargeldkonten"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Einstellungen für Bargeldkonten"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Einstellungen für Bargeldkonten"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr " <b>%s Abstimmung</b> "
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
msgid "Display the data graph"
msgstr "Den Daten-Graph anzeigen"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "Den Daten-Graph anzeigen"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
msgid "Select the chart type"
msgstr "Den Chart-Typ auswählen"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
diff --git a/po/el.po b/po/el.po
index 530ff57..99a786d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Grisbi 0.5.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+0200\n"
"PO-Revision-Date: 2009-04-13 14:53+0200\n"
"Last-Translator: \n"
"Language-Team: KASKAS <ttnfy17 at yahoo.gr>\n"
@@ -1202,31 +1202,50 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr "ÎÏιλογÎÏ"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "ÎιÏοδήμαÏα"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "ΣÏήλεÏ"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr ""
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "ÎÏÏεία"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "ΠαÏοÏ
ÏιάÏÏε _ÏÏ
μÏÏνίεÏ"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "ÎÏιλÎξÏε"
@@ -5015,7 +5034,7 @@ msgstr ""
"λογιÏμικÏ."
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr "Îι λογαÏιαÏμοί μοÏ
"
@@ -5518,6 +5537,68 @@ msgstr "ÎδÏναÏο Ïο άνοιγμα ÏοÏ
αÏÏείοÏ
καÏηγοÏ
msgid "Unnamed category list"
msgstr "ÎίÏÏα καÏηγοÏιÏν ÏÏÏÎ¯Ï Ïνομα"
+#: ../src/gsb_color.c:428
+msgid "Transaction list background 1"
+msgstr "Î¥ÏÏβαθÏο 1 καÏαλÏγÏν ÏÏ
ναλλαγήÏ"
+
+#: ../src/gsb_color.c:429
+msgid "Transaction list background 2"
+msgstr "Î¥ÏÏβαθÏο 2 καÏαλÏγÏν ÏÏ
ναλλαγήÏ"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+msgid "Color of transaction's text"
+msgstr "ΧÏÏμα ÏοÏ
κειμÎνοÏ
ÏÎ·Ï ÏÏ
ναλλαγήÏ"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr " κείμενο αÏελοÏÏ ÏÏ
ναλλαγήÏ"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "ÎÏοÏελÎÏμαÏα διαÏÏαÏμÎÎ½Î·Ï ÏÏ
ναλλαγήÏ"
+
+#: ../src/gsb_color.c:434
+msgid "Selection color"
+msgstr "ΧÏÏμα εÏιλογήÏ"
+
+#: ../src/gsb_color.c:435
+msgid "Background of non selectable scheduled transactions"
+msgstr "Î¥ÏÏβαθÏο ÏÏν μη εÏιλÎξιμÏν ÏÏεδιαÏμÎνÏν ÏÏ
ναλλαγÏν"
+
+#: ../src/gsb_color.c:436
+msgid "Archive color"
+msgstr "ΧÏÏμα αÏÏείÏν"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
+
+#: ../src/gsb_color.c:438
+#, fuzzy
+msgid "Background of bet division"
+msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
+
+#: ../src/gsb_color.c:439
+#, fuzzy
+msgid "Background of bet futur"
+msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
+
+#: ../src/gsb_color.c:440
+#, fuzzy
+msgid "Background of bet solde"
+msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
+
+#: ../src/gsb_color.c:441
+#, fuzzy
+msgid "Background of bet transfer"
+msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "ÎιÏάγεÏε Ïη ÏÏ
ναλλαγμαÏική ιÏοÏιμία"
@@ -7602,8 +7683,8 @@ msgstr "ΦÏÏÏÏÏη λογαÏιαÏμÏν"
msgid "Failed to load accounts"
msgstr "ÎδÏ
ναμία ÏÏÏÏÏÏÎ·Ï Î»Î¿Î³Î±ÏιαÏμÏν"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr "ÎÎ¬Î¸Î¿Ï ÏÏÏÏÏÏÎ·Ï Î±ÏÏείοÏ
'%s'"
@@ -7706,7 +7787,7 @@ msgstr ""
"ÏÏÎÏει να Ïο ακÏ
ÏÏÏεÏε και Ïο ÏÏζεÏε με Îνα άλλο Ïνομα ή ενεÏγοÏοιείÏε Ïην "
"εÏιλογή \"%s\" ÏÏην οÏγάνÏÏη."
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "αÏÏοÏδιÏÏιÏÏοÏ"
@@ -7815,18 +7896,18 @@ msgstr ""
"\n"
"και ÏιÎÏÏε Ïο ÏλήκÏÏο 'OK'"
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "ÎδÏναÏο Ïο άνοιγμαι ÏοÏ
αÏÏείο '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr "Το αÏÏείο δεν Ï
ÏάÏÏει"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7836,7 +7917,7 @@ msgstr ""
"%s δεν ÏαίνεÏαι να είναι Îνα ÎºÎ±Î½Î¿Î½Î¹ÎºÏ Î±ÏÏείο,\n"
"ÏαÏÎ±ÎºÎ±Î»Ï ÎµÎ»ÎγξÏε Ïο και ÏÏοÏÏαθήÏÏε Ïάλι."
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7849,15 +7930,15 @@ msgstr ""
"ΠαÏÎ±ÎºÎ±Î»Ï ÏιγοÏ
ÏεÏ
ÏείÏε εάν είναι εγκαÏεÏÏημÎνο (δηλ. ελÎγξÏε ÏÏι Ïο ÏακÎÏο "
"'grisbi-ssl' εγκαÏαÏÏάθηκε) και ÏÏοÏÏαθήÏÏε Ïάλι."
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr "Το plugin ÏÎ·Ï ÎºÏÏ
ÏÏογÏάÏηÏÎ·Ï Î´ÎµÎ½ βÏÎθηκε."
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr "ÎÏ
ÏÏ Î´ÎµÎ½ είναι Îνα αÏÏείο Grisbi⦠ΠÏÏÏÏÏÏη αναβάλλεÏαι."
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7869,7 +7950,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -7878,7 +7959,7 @@ msgstr ""
"Î ÎκδοÏη Grisbi %s αÏαιÏείÏαι για να ανοίξει αÏ
ÏÏ Ïο αÏÏείο.\n"
"EÏÎµÎ¯Ï ÏÏηÏιμοÏοιείÏαι Ïην ÎκδοÏη %s."
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
#, fuzzy
msgid ""
"You have opened an archive.\n"
@@ -7891,7 +7972,7 @@ msgstr ""
"θÎλεÏε και ÏÏζεÏε αÏγÏÏεÏα (νÎÎµÏ ÎµÎºÎ¸ÎÏειÏâ¦) αλλά θÏ
μηθείÏε ÏÏι είναι Îνα "
"αÏÏείο ÏÏιν ÏÏοÏοÏοιηθοÏν μεÏικÎÏ ÏÏ
ναλλαγÎÏ Î® ÏημανÏικÎÏ ÏληÏοÏοÏίεÏ."
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr "ÎÏÏείο Grisbi ÏοÏ
ανοίγοÏ
ν"
@@ -7900,8 +7981,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "ÎδÏναÏη η αÏοθήκεÏ
Ïη ÏοÏ
αÏÏείοÏ
'%s': %s"
@@ -9968,12 +10049,12 @@ msgstr "Ï
Ïο--δημοÏιονομική γÏαμμή"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "ΣÏ
ναλλαγÎÏ Î¼ÎµÏαÏοÏÎ¬Ï %s"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "ÎÎ¬Î¸Î¿Ï ÏÏο sigaction: SIGSEGV δεν είναι ÏαγιδεÏ
μÎνο\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11592,63 +11673,86 @@ msgid "<b>Additional line</b>"
msgstr "ÎÏÏική ιÏοÏÏοÏία"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr " <b>%s ÏÏ
μÏÏνία</b> "
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "ÎÏιλÎξÏε ÏοÏ
Ï Î»Î¿Î³Î±ÏιαÏμοÏÏ Î¼ÎµÏÏηÏÏν"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "ÎÏιλÎξÏε ÏοÏ
Ï Î»Î¿Î³Î±ÏιαÏμοÏÏ Î¼ÎµÏÏηÏÏν"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "ÎÏιλÎξÏε ÏοÏ
Ï Î»Î¿Î³Î±ÏιαÏμοÏÏ Î¼ÎµÏÏηÏÏν"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr " <b>%s ÏÏ
μÏÏνία</b> "
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "ÎμÏάνιÏη ÏÏ
μβοÏ
Î»Î®Ï ÏÎ·Ï Î·Î¼ÎÏαÏ"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "ÎμÏάνιÏη ÏÏ
μβοÏ
Î»Î®Ï ÏÎ·Ï Î·Î¼ÎÏαÏ"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "ÎÏιλÎξÏε Ïο βαÏÎ¹ÎºÏ Î½ÏμιÏμα"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11661,51 +11765,6 @@ msgstr "Î ÏοÏÏÏικÏÏ Î´Î¹ÎµÏ
θÏ
νÏÎ®Ï ÏÏημαÏοδÏÏηÏηÏ
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "ΠαÏÎ±ÎºÎ±Î»Ï ÎµÏιλÎξÏε ÏÎ¹Ï ÏÏ
ναλλαγÎÏ ÏοÏ
ÏÏ
γÏÏνεÏονÏαι"
-#~ msgid "Transaction list background 1"
-#~ msgstr "Î¥ÏÏβαθÏο 1 καÏαλÏγÏν ÏÏ
ναλλαγήÏ"
-
-#~ msgid "Transaction list background 2"
-#~ msgstr "Î¥ÏÏβαθÏο 2 καÏαλÏγÏν ÏÏ
ναλλαγήÏ"
-
-#~ msgid "Color of transaction's text"
-#~ msgstr "ΧÏÏμα ÏοÏ
κειμÎνοÏ
ÏÎ·Ï ÏÏ
ναλλαγήÏ"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr " κείμενο αÏελοÏÏ ÏÏ
ναλλαγήÏ"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "ÎÏοÏελÎÏμαÏα διαÏÏαÏμÎÎ½Î·Ï ÏÏ
ναλλαγήÏ"
-
-#~ msgid "Selection color"
-#~ msgstr "ΧÏÏμα εÏιλογήÏ"
-
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr "Î¥ÏÏβαθÏο ÏÏν μη εÏιλÎξιμÏν ÏÏεδιαÏμÎνÏν ÏÏ
ναλλαγÏν"
-
-#~ msgid "Archive color"
-#~ msgstr "ΧÏÏμα αÏÏείÏν"
-
-#~ msgid "Background of invalid date entry"
-#~ msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
-
-#, fuzzy
-#~ msgid "Background of bet division"
-#~ msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
-
-#, fuzzy
-#~ msgid "Background of bet futur"
-#~ msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
-
-#, fuzzy
-#~ msgid "Background of bet solde"
-#~ msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
-
-#, fuzzy
-#~ msgid "Background of bet transfer"
-#~ msgstr "Î¥ÏÏβαθÏο ÏÎ·Ï Î¬ÎºÏ
ÏÎ·Ï ÎµÎ¹ÏÏδοÏ
ημεÏομηνίαÏ"
-
#~ msgid "Reconciliation ref."
#~ msgstr "ΣÏ
μÏÏνία ÏαÏ."
@@ -11722,10 +11781,6 @@ msgstr "Î ÏοÏÏÏικÏÏ Î´Î¹ÎµÏ
θÏ
νÏÎ®Ï ÏÏημαÏοδÏÏηÏηÏ
#~ msgstr "ÎιαγÏάÏÏε Ïο αÏÏείο"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "ÎÏÏεία"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "ÎÏÏείο ÏÏ
ναλλαγÏν"
diff --git a/po/eo.po b/po/eo.po
index 1a53ac6..193a997 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: eo\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1102,30 +1102,47 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr ""
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr ""
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
msgid "Column"
msgstr ""
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr ""
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+msgid "Hide grid"
+msgstr ""
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+msgid "Show grid"
+msgstr ""
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr ""
@@ -4506,7 +4523,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr ""
@@ -4917,6 +4934,62 @@ msgstr ""
msgid "Unnamed category list"
msgstr ""
+#: ../src/gsb_color.c:428
+msgid "Transaction list background 1"
+msgstr ""
+
+#: ../src/gsb_color.c:429
+msgid "Transaction list background 2"
+msgstr ""
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+msgid "Color of transaction's text"
+msgstr ""
+
+#: ../src/gsb_color.c:432
+msgid "Text of unfinished split transaction"
+msgstr ""
+
+#: ../src/gsb_color.c:433
+msgid "Children of split transaction"
+msgstr ""
+
+#: ../src/gsb_color.c:434
+msgid "Selection color"
+msgstr ""
+
+#: ../src/gsb_color.c:435
+msgid "Background of non selectable scheduled transactions"
+msgstr ""
+
+#: ../src/gsb_color.c:436
+msgid "Archive color"
+msgstr ""
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr ""
@@ -6876,8 +6949,8 @@ msgstr ""
msgid "Failed to load accounts"
msgstr ""
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr ""
@@ -6959,7 +7032,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr ""
@@ -7052,18 +7125,18 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr ""
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr ""
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7071,7 +7144,7 @@ msgid ""
"please check it and try again."
msgstr ""
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7079,15 +7152,15 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr ""
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7096,14 +7169,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7111,7 +7184,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7120,8 +7193,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr ""
@@ -8935,12 +9008,12 @@ msgstr ""
msgid "Transfer all transactions in another sub-budgetary line"
msgstr ""
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr ""
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr ""
@@ -10398,58 +10471,78 @@ msgid "<b>Additional line</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:4
-msgid "<b>Major ticks</b>"
+msgid "<b>Grid</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:5
-msgid "<b>Options for the X axis</b>"
+msgid "<b>Major ticks</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:6
-msgid "<b>Options for the columns</b>"
+msgid "<b>Options for the X axis</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:7
-msgid "<b>Position</b>"
+msgid "<b>Options for the Y axis</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:8
-msgid "Crosses the Y axis at 0"
+msgid "<b>Options for the axis</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:9
-msgid "Display the data graph"
+msgid "<b>Options for the columns</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:10
-msgid "Display the grids above the plot"
+msgid "<b>Position</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:11
-msgid "Gap:"
+msgid "Crosses the Y axis at 0"
msgstr ""
#: ../src/ui/bet_graph.ui.h:12
-msgid "High"
+msgid "Display the data graph"
msgstr ""
#: ../src/ui/bet_graph.ui.h:13
-msgid "Inside"
+msgid "Display the grids above the plot"
msgstr ""
#: ../src/ui/bet_graph.ui.h:14
-msgid "Low"
+msgid "Gap:"
msgstr ""
#: ../src/ui/bet_graph.ui.h:15
-msgid "Outside"
+msgid "High"
msgstr ""
#: ../src/ui/bet_graph.ui.h:16
-msgid "Select the chart type"
+msgid "Inside"
msgstr ""
#: ../src/ui/bet_graph.ui.h:17
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:21
+msgid "Select the chart type"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 0d62582..c477a1f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1161,31 +1161,50 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr "Opciones"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "Ingresos"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "Columnas"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr ""
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "Archivos"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "Mostrar _reconciliados"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "Seleccionar"
@@ -4873,7 +4892,7 @@ msgstr ""
"contabilidad"
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr "Mis cuentas"
@@ -5365,6 +5384,63 @@ msgstr "No se puede abrir el fichero de categorÃas"
msgid "Unnamed category list"
msgstr "Lista de categorÃas sin nombre"
+#: ../src/gsb_color.c:428
+msgid "Transaction list background 1"
+msgstr "Fondo 1 de la lista de transacciónes"
+
+#: ../src/gsb_color.c:429
+msgid "Transaction list background 2"
+msgstr "Fondo 2 de la lista de transacciones"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr "Color de la operación que da el balance diario"
+
+#: ../src/gsb_color.c:431
+msgid "Color of transaction's text"
+msgstr "Color del texto de la transacción"
+
+#: ../src/gsb_color.c:432
+msgid "Text of unfinished split transaction"
+msgstr "Texto de la transacción dividida sin finalizar"
+
+#: ../src/gsb_color.c:433
+msgid "Children of split transaction"
+msgstr "Hijos de una transacción dividida"
+
+#: ../src/gsb_color.c:434
+msgid "Selection color"
+msgstr "Color de la selección"
+
+#: ../src/gsb_color.c:435
+msgid "Background of non selectable scheduled transactions"
+msgstr "Fondo de las transacciones programadas no seleccionables"
+
+#: ../src/gsb_color.c:436
+msgid "Archive color"
+msgstr "Color del archivo"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr "Fondo de una entrada de fecha incorrecta"
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr "Fondo de la división de apuestas"
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr "Trasfondo de la división de apuestas"
+
+#: ../src/gsb_color.c:440
+#, fuzzy
+msgid "Background of bet solde"
+msgstr "Fondo de la división de apuestas"
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr "Trasfondo de la transferencia de apuestas"
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Introduzca la tasa de cambio"
@@ -7411,8 +7487,8 @@ msgstr "Cargando cuentas"
msgid "Failed to load accounts"
msgstr "Fallo al cargar las cuentas"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr "Error abriendo el archivo '%s'"
@@ -7515,7 +7591,7 @@ msgstr ""
"debe cancelar y guardarlo con otro nombre o activar la opción \"%s\" en la "
"configuración."
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "Sin nombre"
@@ -7623,18 +7699,18 @@ msgstr ""
"\n"
"y pulse el botón de 'OK'."
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "No se puede abrir el archivo '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr "El fichero no existe"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7644,7 +7720,7 @@ msgstr ""
"%s No parece que sea un fichero convencional,\n"
"por favor compruébelo y pruebe de nuevo."
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7656,15 +7732,15 @@ msgstr ""
"Por favor, asegúrese de que está instalado (por ejemplo, compruebe que el "
"paquete 'grisbi-ssl' está instalado) y pruebe de nuevo."
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr "No se ha"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Este fichero no es de de Grisbi... Carga interrumpida."
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7676,7 +7752,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -7685,7 +7761,7 @@ msgstr ""
"Se necesita la versión de Grisbi %s para abrir este archivo.\n"
"Usted está usando la versión %s."
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7697,7 +7773,7 @@ msgstr ""
"más tarde (nuevos informes...) pero recuerde que es un archivo antes de "
"modificar algunas transacciones o informaciones importantes."
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr "Archivo de Grisbi abierto"
@@ -7707,8 +7783,8 @@ msgid "There is no category to record. Back."
msgstr "No hay un tercero que borrar"
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "No se puede guardar el archivo '%s': %s"
@@ -9741,12 +9817,12 @@ msgstr "lÃnea subpresupuestaria"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "Transferir las transacciones a %s"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Error en sigaction: SIGSEGV no será interrumpido\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11413,63 +11489,86 @@ msgid "<b>Additional line</b>"
msgstr "Balance adicional"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr " <b>%s reconciliación</b> "
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Seleccionar las cuentas de efectivo"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Seleccionar las cuentas de efectivo"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Seleccionar las cuentas de efectivo"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr " <b>%s reconciliación</b> "
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "Mostrar el consejo del dÃa"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "Mostrar el consejo del dÃa"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "Seleccione un mapa de caracteres"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11481,49 +11580,6 @@ msgstr "Gestor de finanzas personal para todo el mundo\n"
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "Por favor, elija la fuente de datos para la cuenta: \"%s\""
-#~ msgid "Transaction list background 1"
-#~ msgstr "Fondo 1 de la lista de transacciónes"
-
-#~ msgid "Transaction list background 2"
-#~ msgstr "Fondo 2 de la lista de transacciones"
-
-#~ msgid "Color for the operation that gives the balance today"
-#~ msgstr "Color de la operación que da el balance diario"
-
-#~ msgid "Color of transaction's text"
-#~ msgstr "Color del texto de la transacción"
-
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "Texto de la transacción dividida sin finalizar"
-
-#~ msgid "Children of split transaction"
-#~ msgstr "Hijos de una transacción dividida"
-
-#~ msgid "Selection color"
-#~ msgstr "Color de la selección"
-
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr "Fondo de las transacciones programadas no seleccionables"
-
-#~ msgid "Archive color"
-#~ msgstr "Color del archivo"
-
-#~ msgid "Background of invalid date entry"
-#~ msgstr "Fondo de una entrada de fecha incorrecta"
-
-#~ msgid "Background of bet division"
-#~ msgstr "Fondo de la división de apuestas"
-
-#~ msgid "Background of bet futur"
-#~ msgstr "Trasfondo de la división de apuestas"
-
-#, fuzzy
-#~ msgid "Background of bet solde"
-#~ msgstr "Fondo de la división de apuestas"
-
-#~ msgid "Background of bet transfer"
-#~ msgstr "Trasfondo de la transferencia de apuestas"
-
#~ msgid "Reconciliation ref."
#~ msgstr "Ref. de reconciliación"
@@ -11540,10 +11596,6 @@ msgstr "Gestor de finanzas personal para todo el mundo\n"
#~ msgstr "Borrar el fichero"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "Archivos"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "Archivar transacciones"
diff --git a/po/fa.po b/po/fa.po
index efa9ff2..c77ccc3 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: girisbi VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1173,31 +1173,49 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr ""
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "درآÙ
د Ùا"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
msgid "Column"
msgstr ""
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
#, fuzzy
msgid "Line"
msgstr "ÙÛÙÚ© Ùا"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "Ùعا٠سازÛ"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+msgid "Show grid"
+msgstr ""
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
@@ -4690,7 +4708,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr ""
@@ -5117,6 +5135,70 @@ msgstr "ÙاÛÙ \"%s\" ذخÛر٠Ùشد."
msgid "Unnamed category list"
msgstr "بخش ÙØ§Û Ø¯Ø±Ø¢Ù
د"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "تراکÙØ´"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "تراکÙØ´"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "Øساب Øذ٠شدÙ"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "Ùعا٠سازÛ"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr ""
@@ -7130,8 +7212,8 @@ msgstr "Øساب باÙÚ©"
msgid "Failed to load accounts"
msgstr "Øساب Øذ٠شدÙ"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr "خطا در ÙÙگاÙ
Ø®ÙاÙد٠'%s'"
@@ -7214,7 +7296,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "Ø¨Û ÙاÙ
"
@@ -7308,19 +7390,19 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr ""
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
#, fuzzy
msgid "File does not exist"
msgstr "اÛÙ ÙاÛÙ Ù
ÙجÙد است."
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7328,7 +7410,7 @@ msgid ""
"please check it and try again."
msgstr ""
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7336,15 +7418,15 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr ""
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7353,14 +7435,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7368,7 +7450,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7377,8 +7459,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr ""
@@ -9264,12 +9346,12 @@ msgstr "بخش ÙØ§Û Ø¯Ø±Ø¢Ù
د"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr ""
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr ""
@@ -10772,62 +10854,84 @@ msgid "<b>Additional line</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:4
-msgid "<b>Major ticks</b>"
+msgid "<b>Grid</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:5
-msgid "<b>Options for the X axis</b>"
+msgid "<b>Major ticks</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:6
+msgid "<b>Options for the X axis</b>"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Øساب باÙÚ©"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Øساب باÙÚ©"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Øساب باÙÚ©"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
msgid "<b>Position</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "ÙÙ
اÛØ´ ÙاÙ
Øساب"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "ÙÙ
اÛØ´ ÙاÙ
Øساب"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: . /src/ui/bet_graph.ui.h:16 ب" ot" nal line</b>" sktop.in.h:1 later " ting software" ÏÎ·Ï ½" ÏληÏοÏοÏίεÏ." " Óÿ u*äá+ Jåá+ Eâ+ 8ã+ Óÿ P#ã+ Óÿ `Óÿ k@äá+ 6 è è! è! 0Óÿ Óÿ xô ã+ Óÿ "äá+ @äá+ 0Óÿ `"äá+ oÓÿ Àïdã+ u*äá+ àdã+ Øädã+ ¨édã+ Jåá+ xô ã+ Óÿ `Óÿ k@äá+ à! à! 0Óÿ Óÿ H¾àâ+ p Óÿ "äá+ @äá+ 0Óÿ `"äá+ oÓÿ `Óÿ XÓÿ 8Kâ+ p Óÿ u*äá+ Jåá+ p Óÿ @Óÿ k@äá+ G H I J K M N O P 0Óÿ Óÿ Hu·â+ Óÿ "äá+ @äá+ 0Óÿ 0ïdã+ u*äá+ ã+ ©â+ àdã+ Øädã+ ¨édã+ Jåá+ Hu·â+ Óÿ
P Óÿ k@äá+ 8u·â+ Óÿ Óÿ k@äá+ (u·â+ Óÿ ° Óÿ k@äá+ u·â+ Óÿ à Óÿ k@äá+ ¨îdã+ u*äá+ ¨édã+ `Óÿ øâ+ e)äá+ Øädã+
Óÿ yøâ+ e)äá+ àdã+ °
Óÿ Zøâ+ e)äá+ ؤâ+ ã+ ©â+ àdã+ Øã+ Øädã+ ¨édã+ Jåá+ 8Kâ+ m`â+ Óÿ p;â+ `Óÿ 0Óÿ k@äá+ 5 6 7 8 : < = > ? @ B D 0Óÿ Óÿ àm]â+ Óÿ u*äá+ Eâ+ à
Óÿ m`â+ e)äá+ Eâ+ Õ_ at fÆS Qöl±íÁ,â+ Óÿ àm]â+ p
Óÿ @Óÿ k@äá+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv0Óÿ Óÿ H¾)â+ fâ+ àÓÿ ¦Èã+ ¦Èã+ Vcâ+ oÓÿ Óÿ XÓÿ ÀÓÿ ã+ u*äá+ Øã+ Óÿ ¢Èã+ ðÓÿ Óÿ ÿÿÿÿÿÿÿÿ¢Èã+ ¨Óÿ ./src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "اÙتخاب ÙاØد"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -10840,46 +10944,10 @@ msgstr ""
#~ msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
#, fuzzy
-#~ msgid "Transaction list background 1"
-#~ msgstr "تراکÙØ´"
-
-#, fuzzy
-#~ msgid "Transaction list background 2"
-#~ msgstr "تراکÙØ´"
-
-#, fuzzy
-#~ msgid "Color of transaction's text"
-#~ msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
-
-#, fuzzy
-#~ msgid "Selection color"
-#~ msgstr "Øساب Øذ٠شدÙ"
-
-#, fuzzy
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
-
-#, fuzzy
-#~ msgid "Archive color"
-#~ msgstr "Ùعا٠سازÛ"
-
-#, fuzzy
#~ msgid "Recreates the archive"
#~ msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "Ùعا٠سازÛ"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
diff --git a/po/fr.po b/po/fr.po
index 8c26236..8fff7ce 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
-"PO-Revision-Date: 2011-09-26 20:02+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+0200\n"
+"PO-Revision-Date: 2011-09-29 09:35+0200\n"
"Last-Translator: Pierre Biava <pierre at pierre.biava.name>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
"Language: \n"
@@ -1137,30 +1137,47 @@ msgstr ""
"Erreur : il manque un ou plusieurs liens entre les devises.\n"
" Vous devez corriger ça et recommencer."
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr "Graphique"
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr "Options"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr "Dépenses"
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "Revenus"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr "Vous ne pouvez pas visualiser plus d'une année"
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr "Dépassement"
+
+#: ../src/bet_graph.c:962
msgid "Column"
msgstr "Colonnes"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr "Ligne"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+msgid "Hide grid"
+msgstr "Cacher la grille"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+msgid "Show grid"
+msgstr "Montrer la grille"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "Sélectionner"
@@ -4829,7 +4846,7 @@ msgstr ""
"A partir de données provenant d'un fichier bancaire ou d'un autre logiciel."
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr "Mes comptes"
@@ -5313,6 +5330,62 @@ msgstr "Impossible d'ouvrir le fichier des catégories."
msgid "Unnamed category list"
msgstr "Liste des catégories anonymes"
+#: ../src/gsb_color.c:428
+msgid "Transaction list background 1"
+msgstr "Couleur de fond 1 de la liste des opérations"
+
+#: ../src/gsb_color.c:429
+msgid "Transaction list background 2"
+msgstr "Couleur de fond 2 de la liste des opérations"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr "Couleur de l'opération qui donne le solde à aujourd'hui"
+
+#: ../src/gsb_color.c:431
+msgid "Color of transaction's text"
+msgstr "Couleur du texte des opérations"
+
+#: ../src/gsb_color.c:432
+msgid "Text of unfinished split transaction"
+msgstr "Couleur d'une transaction ventilée non terminée"
+
+#: ../src/gsb_color.c:433
+msgid "Children of split transaction"
+msgstr "Couleur d'une sous-opération"
+
+#: ../src/gsb_color.c:434
+msgid "Selection color"
+msgstr "Couleur d'une sélection"
+
+#: ../src/gsb_color.c:435
+msgid "Background of non selectable scheduled transactions"
+msgstr "Couleur d'une opération planifiée non sélectionnable"
+
+#: ../src/gsb_color.c:436
+msgid "Archive color"
+msgstr "Couleur d'une la ligne archive"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr "Couleur d'une zone de saisie d'une date invalide"
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr "Couleur des divisions dans l'onglet prévisions"
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr "Couleur des données futures dans l'onglet prévisions"
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr "Couleurs des lignes de solde de début de mois"
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr "Couleur des transferts dans l'onglet prévisions"
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Entrer le taux de change"
@@ -7354,8 +7427,8 @@ msgstr "Chargement des comptes"
msgid "Failed to load accounts"
msgstr "Ãchec du chargement des comptes"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr "Erreur lors de l'ouverture du fichier « %s »."
@@ -7458,7 +7531,7 @@ msgstr ""
"l'enregistrer, vous devez annuler et le sauvegarder sous un autre nom ou "
"alors activer l'option « %s » dans les préférences."
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "sans nom"
@@ -7567,18 +7640,18 @@ msgstr ""
"\n"
"puis appuyez le bouton Valider"
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Impossible d'ouvrir le fichier « %s » : %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr "Le fichier n'existe pas"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7588,7 +7661,7 @@ msgstr ""
"%s ne semble pas être un fichier normal,\n"
"veuillez vérifier et réessayer."
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7601,15 +7674,15 @@ msgstr ""
"Vérifiez qu'il soit bien installé (i.e. vérifiez que le paquet 'grisbi-ssl' "
"est installé) et essayez à nouveau."
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr "Plugin de cryptage non trouvé"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Ce n'est pas un fichier Grisbi...chargement interrompu"
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7621,7 +7694,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -7630,7 +7703,7 @@ msgstr ""
"Pour ouvrir ce fichier, il vous faut la version %s de Grisbi.\n"
"Vous utilisez la version %s."
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7643,7 +7716,7 @@ msgstr ""
"c'est une archive avant de modifier certaines transactions ou informations "
"importantes."
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr "Archive grisbi ouverte"
@@ -7652,8 +7725,8 @@ msgid "There is no category to record. Back."
msgstr "Il n'y a pas de catégorie à enregistrer. Retour."
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr ""
@@ -9664,12 +9737,12 @@ msgstr "Gérer les sous-imputations"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "Transférer les opérations dans une autre sous-catégorie"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Erreur sur sigaction, le signal SIGSEGV ne sera pas détourné\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11334,58 +11407,78 @@ msgid "<b>Additional line</b>"
msgstr "<b>Ligne supplémentaire</b>"
#: ../src/ui/bet_graph.ui.h:4
+msgid "<b>Grid</b>"
+msgstr "<b>Grille</b>"
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr "<b>Graduation principale</b>"
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr "<b>Options de l'axe X</b>"
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+msgid "<b>Options for the Y axis</b>"
+msgstr "<b>Options de l'axe Y</b>"
+
+#: ../src/ui/bet_graph.ui.h:8
+msgid "<b>Options for the axis</b>"
+msgstr "<b>Options des axes du graphique</b>"
+
+#: ../src/ui/bet_graph.ui.h:9
msgid "<b>Options for the columns</b>"
msgstr "<b>Option des barres du graphique</b>"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
msgid "<b>Position</b>"
msgstr " <b>Position</b> "
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr "Croise l'axe des Y Ã 0"
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
msgid "Display the data graph"
msgstr "Afficher le graphique"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
msgid "Display the grids above the plot"
msgstr "Afficher la grille sur les barres"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr "Espacement"
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr "En haut"
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr "A l'intérieur"
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr "En bas"
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr "Grille principale"
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr "Grille secondaire"
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr "A l'extérieur"
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
msgid "Select the chart type"
msgstr "Sélectionnez le type de graphique"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr "Afficher les étiquettes"
diff --git a/po/he.po b/po/he.po
index 7b781a9..52ef458 100644
--- a/po/he.po
+++ b/po/he.po
@@ -283,7 +283,7 @@ msgid ""
msgstr ""
"Project-Id-Version: he\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+0200\n"
"PO-Revision-Date: 2006-02-11 16:08+0200\n"
"Last-Translator: dotan\n"
"Language-Team: <en at li.org>\n"
@@ -1486,33 +1486,52 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
#, fuzzy
msgid "Options"
msgstr "××צ××ת"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "××× ×¡×ת"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "×ער×ת"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
#, fuzzy
msgid "Line"
msgstr "ר×ש×××"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "×פע××"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "×ת×××"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
@@ -5175,7 +5194,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
#, fuzzy
msgid "My accounts"
msgstr "×צ×ת ×ש××× ×ת"
@@ -5620,6 +5639,72 @@ msgstr "××××× ×§×××ר××ת"
msgid "Unnamed category list"
msgstr "ק×××ר××ת ××× ×¡×ת"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "תצ××× ××ק××ת ×©× ×¨×©××ת ××¢×סק××ת"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "תצ××× ××ק××ת ×©× ×¨×©××ת ××¢×סק××ת"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "ש××רת ×¢×סק×"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "×××קת ×¢××¡×§× ×ת××× × ×ª"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "×××קת ×¢××¡×§× ×ת××× × ×ª"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "×ס×× ×××"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr ""
+"Fall due selected\n"
+"×¢××¡×§× ×ת××× × ×ª"
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "×פע××"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "שער ××××פ××"
@@ -7663,8 +7748,8 @@ msgstr "××¢×× ×ª ק×××¥ ×ש××× ×ת"
msgid "Failed to load accounts"
msgstr "×××רת ×ש××× ×ת ×× ×§"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, fuzzy, c-format
msgid "Error loading file '%s'"
msgstr "ש×××× ×פת××ת ×ק×××¥ '%s'."
@@ -7752,7 +7837,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "××× ×©×"
@@ -7848,19 +7933,19 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "×× × ××ª× ×פת×× ×ת ×ק×××¥ '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
#, fuzzy
msgid "File does not exist"
msgstr "×ק×××¥ ××ר ק×××"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, fuzzy, c-format
msgid ""
@@ -7870,7 +7955,7 @@ msgstr ""
"× ×¨×× ××%s ××× × ×§×××¥ ר×××.\n"
"× × ××××ק ××ת ××× ×¡×ת ×©× ×ת."
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7878,17 +7963,17 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
#, fuzzy
msgid "Encryption plugin not found."
msgstr "×ש××× %s ××× × × ×צ×.\n"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "ק×××¥ ×× ××× × ××\"× ×©× ×ר×ס××"
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7897,14 +7982,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "×ר×ס×× ××××¨×¡× %s ××× × ×ס××× ×פת×× ×§×××¥ ××"
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7912,7 +7997,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7921,8 +8006,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "×× × ××ª× ×ש××ר ×ת ×ק×××¥ '%s': %s"
@@ -9933,12 +10018,12 @@ msgstr "××× ×ª×ª-×§× ×ª×§×¦××"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "×××¢××ר ×ת ××¢×סק××ת ××"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Error on sigaction: SIGSEGV won't be trapped\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "×ר×ס××"
@@ -11552,63 +11637,86 @@ msgid "<b>Additional line</b>"
msgstr "×תרת פת×××"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr "×ת×××"
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "×××רת ×ש××× ×ת ×××××"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "×××רת ×ש××× ×ת ×××××"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "×××רת ×ש××× ×ת ×××××"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr "×ת×××"
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "×צ×ת ש××ת (תת×) ×ק×××ר××ת"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "×צ×ת ש××ת (תת×) ×ק×××ר××ת"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "×××רת ×ש××× ×ת ×× ×§"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11620,40 +11728,6 @@ msgstr ""
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "ש×××ש ××¢××¡×§× ×× ××רת ×ת×ר ת×× ×ת"
-#, fuzzy
-#~ msgid "Transaction list background 1"
-#~ msgstr "תצ××× ××ק××ת ×©× ×¨×©××ת ××¢×סק××ת"
-
-#, fuzzy
-#~ msgid "Transaction list background 2"
-#~ msgstr "תצ××× ××ק××ת ×©× ×¨×©××ת ××¢×סק××ת"
-
-#, fuzzy
-#~ msgid "Color of transaction's text"
-#~ msgstr "ש××רת ×¢×סק×"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "×××קת ×¢××¡×§× ×ת××× × ×ª"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "×××קת ×¢××¡×§× ×ת××× × ×ª"
-
-#, fuzzy
-#~ msgid "Selection color"
-#~ msgstr "×ס×× ×××"
-
-#, fuzzy
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr ""
-#~ "Fall due selected\n"
-#~ "×¢××¡×§× ×ת××× × ×ª"
-
-#, fuzzy
-#~ msgid "Archive color"
-#~ msgstr "×פע××"
-
#~ msgid "Reconciliation ref."
#~ msgstr "××¤× ××× ×ת××××"
@@ -11670,10 +11744,6 @@ msgstr ""
#~ msgstr "×××קת ×¦× ×©××ש×"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "×פע××"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "××ספת ××¢×סק××ת"
diff --git a/po/it.po b/po/it.po
index d9470c0..27b1983 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1209,33 +1209,52 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
#, fuzzy
msgid "Options"
msgstr "Uscite"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "Entrate"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "Commenti"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
#, fuzzy
msgid "Line"
msgstr "Licenza"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "Attiva"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "Riconcilia"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
@@ -4913,7 +4932,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
#, fuzzy
msgid "My accounts"
msgstr "Mostra conti"
@@ -5360,6 +5379,70 @@ msgstr "Unisci categorie"
msgid "Unnamed category list"
msgstr "Categorie entrate"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "Lista di anteprima delle registrazioni"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "Lista di anteprima delle registrazioni"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "Ripartizione della categoria"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "Inserisci una transazione pianificata"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "Inserisci una transazione pianificata"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "Seleziona tutto"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr "Inserisci una transazione pianificata"
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "Attiva"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Immettere tasso di cambio"
@@ -7389,8 +7472,8 @@ msgstr "Carica un documento di conto"
msgid "Failed to load accounts"
msgstr "Seleziona conti bancari"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, fuzzy, c-format
msgid "Error loading file '%s'"
msgstr "Errore nell'apertura del file '%s'."
@@ -7478,7 +7561,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "Senza nome"
@@ -7573,19 +7656,19 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Impossibile aprire il file '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
#, fuzzy
msgid "File does not exist"
msgstr "Il file esiste già "
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7593,7 +7676,7 @@ msgid ""
"please check it and try again."
msgstr ""
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7601,17 +7684,17 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
#, fuzzy
msgid "Encryption plugin not found."
msgstr "Conto %s non trovato.\n"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Il file non è un Rapporto Grisbi valido"
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7620,14 +7703,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Grisbi versione %s è richiesta per aprire il file"
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7635,7 +7718,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7644,8 +7727,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "Impossibile salvare il gile '%s': %s"
@@ -9669,12 +9752,12 @@ msgstr "Nessuna linea sotto-budget"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "Trasferire la transazione a"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Erorre su sigaction: SIGSEGV non sarà catturato \n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr ""
@@ -11292,63 +11375,86 @@ msgid "<b>Additional line</b>"
msgstr "Bilancio iniziale"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr "Riconciliazione"
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Seleziona conti contanti"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Seleziona conti contanti"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Seleziona conti contanti"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr "Riconciliazione"
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "Visualizza il nome della sotto-categoria"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "Visualizza il nome della sotto-categoria"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "Seleziona conti bancari"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11360,38 +11466,6 @@ msgstr ""
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "Usa le transazioni selezionate come template"
-#, fuzzy
-#~ msgid "Transaction list background 1"
-#~ msgstr "Lista di anteprima delle registrazioni"
-
-#, fuzzy
-#~ msgid "Transaction list background 2"
-#~ msgstr "Lista di anteprima delle registrazioni"
-
-#, fuzzy
-#~ msgid "Color of transaction's text"
-#~ msgstr "Ripartizione della categoria"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "Inserisci una transazione pianificata"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "Inserisci una transazione pianificata"
-
-#, fuzzy
-#~ msgid "Selection color"
-#~ msgstr "Seleziona tutto"
-
-#, fuzzy
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr "Inserisci una transazione pianificata"
-
-#, fuzzy
-#~ msgid "Archive color"
-#~ msgstr "Attiva"
-
#~ msgid "Reconciliation ref."
#~ msgstr "Rif. di riconciliazione"
@@ -11408,10 +11482,6 @@ msgstr ""
#~ msgstr "Elimina una categoria personalizzata"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "Attiva"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "Aggiungi transazioni"
diff --git a/po/lv.po b/po/lv.po
index 3e3c933..63eb407 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1169,31 +1169,50 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr "Opcijas"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "IenÄkumi"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "Kolonna"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr ""
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "Arhīvs"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "RÄdÄ«t _saskaÅojumus"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "IzvÄlÄties"
@@ -4865,7 +4884,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr "ImportÄt datus no bankas vietnes, vai no grÄmatvedÄ«bas programmas"
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr "Mans konts"
@@ -5346,6 +5365,64 @@ msgstr "Nevar atvÄrt kategorijas failu."
msgid "Unnamed category list"
msgstr "Nenosaukts kategorijas saraksts"
+#: ../src/gsb_color.c:428
+msgid "Transaction list background 1"
+msgstr "IepriekÅ¡Äjais darÄ«jumu saraksts 1"
+
+#: ../src/gsb_color.c:429
+msgid "Transaction list background 2"
+msgstr "IepriekÅ¡Äjais darÄ«jumu saraksts 2"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr "Å odienas atlikuma krÄsas"
+
+#: ../src/gsb_color.c:431
+msgid "Color of transaction's text"
+msgstr "DarÄ«juma teksta krÄsas"
+
+#: ../src/gsb_color.c:432
+msgid "Text of unfinished split transaction"
+msgstr "Nepabeigtu, sadalītu darījumu teksts"
+
+#: ../src/gsb_color.c:433
+msgid "Children of split transaction"
+msgstr "SadalÄ«to darÄ«jumu rezultÄts"
+
+#: ../src/gsb_color.c:434
+msgid "Selection color"
+msgstr "AtlasÄ«t krÄsas"
+
+#: ../src/gsb_color.c:435
+msgid "Background of non selectable scheduled transactions"
+msgstr "PamatÄ nav izvÄlÄts plÄnotais darÄ«jums"
+
+#: ../src/gsb_color.c:436
+msgid "Archive color"
+msgstr "ArhÄ«va krÄsa"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr "PamatÄ ievadÄ«ts nepareizs datums"
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr "Nodaļas vispÄrÄ«ga informÄcija"
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr "Preces vispÄrÄ«ga informÄcija"
+
+#: ../src/gsb_color.c:440
+#, fuzzy
+msgid "Background of bet solde"
+msgstr "Nodaļas vispÄrÄ«ga informÄcija"
+
+#: ../src/gsb_color.c:441
+#, fuzzy
+msgid "Background of bet transfer"
+msgstr "Preces vispÄrÄ«ga informÄcija"
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Ievadiet valūtas kursu"
@@ -7378,8 +7455,8 @@ msgstr "Kontu ielÄdÄÅ¡ana"
msgid "Failed to load accounts"
msgstr "NeizdevÄs ielÄdÄt kontu"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr "Kļūda ielÄdÄjot failu '%s'"
@@ -7478,7 +7555,7 @@ msgstr ""
"jÄatceļ izmaiÅas un jÄsaglabÄ ar citu nosaukumu vai jÄaktivizÄ \"% s \" "
"opciju iestatīšana."
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "nenosaukts"
@@ -7586,18 +7663,18 @@ msgstr ""
"\n"
"un spiediet 'Labi' pogu."
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Nevar atvÄrt failu '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr "Fails neeksistÄ"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7607,7 +7684,7 @@ msgstr ""
"%s neÅ¡Ä·iet, ka tas ir regulÄrs fails.\n"
"lÅ«dzu, pÄrbaudiet to un mÄÄ£iniet vÄlreiz."
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7619,15 +7696,15 @@ msgstr ""
"LÅ«dzu, pÄrliecinieties, vai ir instalÄta 'grisbi-ssl' komplekss un mÄÄ£iniet "
"vÄlreiz."
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr "Å ifrÄÅ¡anas spraudnis nav atrasts."
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Å is nav grisbi fails... IelÄde pÄrtraukta."
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7639,7 +7716,7 @@ msgstr ""
"%s"
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -7648,7 +7725,7 @@ msgstr ""
"Grisbi versijai %s ir nepiecieÅ¡ams, lai atvÄrtu Å¡o failu.\n"
"JÅ«s izmantojat versiju %s"
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7659,7 +7736,7 @@ msgstr ""
"JÅ«s varat to izmainÄ«t un saglabÄt vÄlÄk ( jauns pÄrskats), bet atceraties, "
"ka tas ir arhÄ«vs pirms veiktajÄm izmaiÅÄm iepriekÅ¡."
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr "Grisbi arhÄ«va atvÄrÅ¡ana"
@@ -7669,8 +7746,8 @@ msgid "There is no category to record. Back."
msgstr "Nav darÄ«juma partnera, lai noÅemtu."
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "Nevar saglabÄt failu '%s': %s"
@@ -9667,12 +9744,12 @@ msgstr "apakšbudžeta pozīcija"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "PÄrsÅ«tÄ«t darÄ«jumus uz %s"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Kļūda par (sig) darbību: SIGSEGV netiek artasts\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11260,63 +11337,86 @@ msgid "<b>Additional line</b>"
msgstr "Papildu bilance"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr " <b>%s saskaÅoÅ¡ana</b> "
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "IzvÄlÄties kases kontus"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "IzvÄlÄties kases kontus"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "IzvÄlÄties kases kontus"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr " <b>%s saskaÅoÅ¡ana</b> "
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "ParÄdÄ«t dienas padomus"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "ParÄdÄ«t dienas padomus"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "IzvÄlieties apkopotu plÄnu"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11328,50 +11428,6 @@ msgstr "PersonÄlais finanÅ¡u vadÄ«tÄjs\n"
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "LÅ«dzu izvÄlieties konta datu avotus: \"%s\""
-#~ msgid "Transaction list background 1"
-#~ msgstr "IepriekÅ¡Äjais darÄ«jumu saraksts 1"
-
-#~ msgid "Transaction list background 2"
-#~ msgstr "IepriekÅ¡Äjais darÄ«jumu saraksts 2"
-
-#~ msgid "Color for the operation that gives the balance today"
-#~ msgstr "Å odienas atlikuma krÄsas"
-
-#~ msgid "Color of transaction's text"
-#~ msgstr "DarÄ«juma teksta krÄsas"
-
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "Nepabeigtu, sadalītu darījumu teksts"
-
-#~ msgid "Children of split transaction"
-#~ msgstr "SadalÄ«to darÄ«jumu rezultÄts"
-
-#~ msgid "Selection color"
-#~ msgstr "AtlasÄ«t krÄsas"
-
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr "PamatÄ nav izvÄlÄts plÄnotais darÄ«jums"
-
-#~ msgid "Archive color"
-#~ msgstr "ArhÄ«va krÄsa"
-
-#~ msgid "Background of invalid date entry"
-#~ msgstr "PamatÄ ievadÄ«ts nepareizs datums"
-
-#~ msgid "Background of bet division"
-#~ msgstr "Nodaļas vispÄrÄ«ga informÄcija"
-
-#~ msgid "Background of bet futur"
-#~ msgstr "Preces vispÄrÄ«ga informÄcija"
-
-#, fuzzy
-#~ msgid "Background of bet solde"
-#~ msgstr "Nodaļas vispÄrÄ«ga informÄcija"
-
-#, fuzzy
-#~ msgid "Background of bet transfer"
-#~ msgstr "Preces vispÄrÄ«ga informÄcija"
-
#~ msgid "Reconciliation ref."
#~ msgstr "SaskaÅoÅ¡anas ref."
@@ -11388,10 +11444,6 @@ msgstr "PersonÄlais finanÅ¡u vadÄ«tÄjs\n"
#~ msgstr "DzÄst arhÄ«vu"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "Arhīvs"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "DarÄ«jumu arhivÄÅ¡ana"
diff --git a/po/nl.po b/po/nl.po
index 4653325..121fad7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1225,33 +1225,52 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
#, fuzzy
msgid "Options"
msgstr "Uitgaven"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "Inkomsten"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "Opmerkingen"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
#, fuzzy
msgid "Line"
msgstr "Licentie"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "Activeer"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "Controleer"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
@@ -4939,7 +4958,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
#, fuzzy
msgid "My accounts"
msgstr "Toon rekening"
@@ -5397,6 +5416,72 @@ msgstr "Categorieën samenvoegen"
msgid "Unnamed category list"
msgstr "Inkomsten categorieën"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "Voorbeeld transactielijst"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "Voorbeeld transactielijst"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "Opsplitsen van transactie"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "Verwijder geplande transactie"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "Verwijder geplande transactie"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "Selecteer alles"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr ""
+"Kies een geplande transactie\n"
+"om te laten vervallen."
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "Activeer"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Aanpassen wisselkoers"
@@ -7456,8 +7541,8 @@ msgstr "Bestand aan het laden"
msgid "Failed to load accounts"
msgstr "Selecteer bankrekeningen"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, fuzzy, c-format
msgid "Error loading file '%s'"
msgstr "Er is een fout opgetreden bij het openen van het bestand '%s'."
@@ -7545,7 +7630,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "Niet benoemd"
@@ -7644,19 +7729,19 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Kan het bestand '%s' niet openen %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
#, fuzzy
msgid "File does not exist"
msgstr "Bestand bestaat reeds"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, fuzzy, c-format
msgid ""
@@ -7666,7 +7751,7 @@ msgstr ""
"%s lijkt een verkeerd bestandstype te zijn,\n"
"controleer het bestand en probeer het opnieuw."
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7674,17 +7759,17 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
#, fuzzy
msgid "Encryption plugin not found."
msgstr "Rekening %s niet gevonden. \n"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Dit bestand is geen Grisbi rapport bestand"
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7693,14 +7778,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Grisbi versie %s is nodig om dit bestand te openen"
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7708,7 +7793,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7717,8 +7802,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "Kan het bestand '%s': %s niet opslaan."
@@ -9773,12 +9858,12 @@ msgstr "Geen sub-budgetregel"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "Transacties overschrijven naar "
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Er is een sigaction fout: het programma sluit zich af\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11403,63 +11488,86 @@ msgid "<b>Additional line</b>"
msgstr "Begin saldo"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr "Controleer"
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Selecteer kasrekeningen"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Selecteer kasrekeningen"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Selecteer kasrekeningen"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr "Controleer"
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "Toon de naam van de (sub)categorie"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "Toon de naam van de (sub)categorie"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "Selecteer bankrekeningen"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11471,40 +11579,6 @@ msgstr ""
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "Gebruik de gekozen transactie als sjabloon"
-#, fuzzy
-#~ msgid "Transaction list background 1"
-#~ msgstr "Voorbeeld transactielijst"
-
-#, fuzzy
-#~ msgid "Transaction list background 2"
-#~ msgstr "Voorbeeld transactielijst"
-
-#, fuzzy
-#~ msgid "Color of transaction's text"
-#~ msgstr "Opsplitsen van transactie"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "Verwijder geplande transactie"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "Verwijder geplande transactie"
-
-#, fuzzy
-#~ msgid "Selection color"
-#~ msgstr "Selecteer alles"
-
-#, fuzzy
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr ""
-#~ "Kies een geplande transactie\n"
-#~ "om te laten vervallen."
-
-#, fuzzy
-#~ msgid "Archive color"
-#~ msgstr "Activeer"
-
#~ msgid "Reconciliation ref."
#~ msgstr "Controle ref."
@@ -11521,10 +11595,6 @@ msgstr ""
#~ msgstr "Verwijder begunstigde"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "Activeer"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "De transacties toevoegen"
diff --git a/po/pl.po b/po/pl.po
index 22c7893..17ec0bd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1210,33 +1210,52 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
#, fuzzy
msgid "Options"
msgstr "Wydatki"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "Dochodzy"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "Komentarz"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
#, fuzzy
msgid "Line"
msgstr "Licencja"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "WÅÄ
cz"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "Potwierdzenie sald"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
@@ -4899,7 +4918,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
#, fuzzy
msgid "My accounts"
msgstr "Pokaż konta"
@@ -5344,6 +5363,72 @@ msgstr "DoÅÄ
cz kategorie"
msgid "Unnamed category list"
msgstr "Kategorie przychodów"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "PodglÄ
d listy transakcji"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "PodglÄ
d listy transakcji"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "Transakcja zbiorcza"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "Kasowanie zaplanowanej transakcji"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "Kasowanie zaplanowanej transakcji"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "Zaznacz wszystkie"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr ""
+"Wykonaj zaznaczone\n"
+"zaplanowane transakcje"
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "WÅÄ
cz"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Podaj kurs wymiany"
@@ -7388,8 +7473,8 @@ msgstr "Wczytaj plik kont"
msgid "Failed to load accounts"
msgstr "Zaznacz konta bankowe"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, fuzzy, c-format
msgid "Error loading file '%s'"
msgstr "BÅÄ
d otwarcia pliku '%s'."
@@ -7477,7 +7562,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "bez nazwy"
@@ -7572,19 +7657,19 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Nie można otworzyÄ pliku '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
#, fuzzy
msgid "File does not exist"
msgstr "Plik już istnieje"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7592,7 +7677,7 @@ msgid ""
"please check it and try again."
msgstr ""
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7600,17 +7685,17 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
#, fuzzy
msgid "Encryption plugin not found."
msgstr "Konto %s nie zostaÅo znalezione.\n"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Ten plik nie jest plikiem raportu Grisbi"
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7619,14 +7704,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Do otwarcia tego pliku wymagane jest Grisby w wersji %s"
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7634,7 +7719,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7643,8 +7728,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "Nie można zapisaÄ pliku '%s': %s"
@@ -9667,13 +9752,13 @@ msgstr "Pusta podgrupa linii budżetowej"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "PrzenieÅ transakcje do"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr ""
"BÅÄ
d podczas przechwytywania sygnaÅu: SIGSEGV nie bÄdzie przechwycony\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11292,63 +11377,86 @@ msgid "<b>Additional line</b>"
msgstr "Saldo poczÄ
tkowe"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr "Metody pÅatnoÅci"
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Zaznacz konta gotówkowe"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Zaznacz konta gotówkowe"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Zaznacz konta gotówkowe"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr "Metody pÅatnoÅci"
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "Pokaż nazwÄ (pod)kategorii"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "Pokaż nazwÄ (pod)kategorii"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "Zaznacz konta bankowe"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11360,40 +11468,6 @@ msgstr ""
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "Użyj zaznaczonej transakcji jako szablonu"
-#, fuzzy
-#~ msgid "Transaction list background 1"
-#~ msgstr "PodglÄ
d listy transakcji"
-
-#, fuzzy
-#~ msgid "Transaction list background 2"
-#~ msgstr "PodglÄ
d listy transakcji"
-
-#, fuzzy
-#~ msgid "Color of transaction's text"
-#~ msgstr "Transakcja zbiorcza"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "Kasowanie zaplanowanej transakcji"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "Kasowanie zaplanowanej transakcji"
-
-#, fuzzy
-#~ msgid "Selection color"
-#~ msgstr "Zaznacz wszystkie"
-
-#, fuzzy
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr ""
-#~ "Wykonaj zaznaczone\n"
-#~ "zaplanowane transakcje"
-
-#, fuzzy
-#~ msgid "Archive color"
-#~ msgstr "WÅÄ
cz"
-
#~ msgid "Reconciliation ref."
#~ msgstr "Potwierdzenie salda"
@@ -11410,10 +11484,6 @@ msgstr ""
#~ msgstr "UsuÅ beneficjenta"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "WÅÄ
cz"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "Dodaj transakcjÄ"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3f07b3f..c3e5c5e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+0200\n"
"PO-Revision-Date: 2005-12-19 09:07-0200\n"
"Last-Translator: \n"
"Language-Team: <pt at li.org>\n"
@@ -1210,32 +1210,51 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
#, fuzzy
msgid "Options"
msgstr "Despesas"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "Receitas"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "Contas"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr ""
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "Ativado"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "Lançamentos não reconciliadas"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
@@ -4914,7 +4933,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
#, fuzzy
msgid "My accounts"
msgstr "Exibir contas"
@@ -5360,6 +5379,72 @@ msgstr "Mesclar categorias"
msgid "Unnamed category list"
msgstr "Categorias de receitas"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "Prévia da lista de lançamentos"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "Prévia da lista de lançamentos"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "Divisão do lançamento"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "Informe um lançamento agendado"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "Divisão do lançamento"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "Selecionar todas"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr ""
+"Efetuar baixa do lançamento\n"
+"selecionado da agenda"
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "Ativado"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Informe a taxa do câmbio"
@@ -7416,8 +7501,8 @@ msgstr "Carregar um arquivo de contas"
msgid "Failed to load accounts"
msgstr "Selecionar contas bancárias"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, fuzzy, c-format
msgid "Error loading file '%s'"
msgstr "Erro abrindo arquivo '%s'."
@@ -7505,7 +7590,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "sem nome"
@@ -7601,19 +7686,19 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Não posso abrir arquivo '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
#, fuzzy
msgid "File does not exist"
msgstr "Arquivo já existe"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, fuzzy, c-format
msgid ""
@@ -7623,7 +7708,7 @@ msgstr ""
"%s não parece ser um arquivo regular,\n"
"por favor, verifique e tente novamente."
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7631,17 +7716,17 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
#, fuzzy
msgid "Encryption plugin not found."
msgstr "Conta %s não encontrada.\n"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Este arquivo não é um relatório do Grisbi"
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7650,14 +7735,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Grisbi versão %s é necessário para abrir este arquivo"
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7665,7 +7750,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
#, fuzzy
msgid "Grisbi archive opened"
msgstr "Preferências"
@@ -7675,8 +7760,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "Não posso salvar arquivo '%s': %s"
@@ -9707,12 +9792,12 @@ msgstr "Nenhum sub-orçamento"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "Transferir os lançamentos para"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Erro em sigaction: SIGSEGV não será prendido\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11328,63 +11413,86 @@ msgid "<b>Additional line</b>"
msgstr "Saldo inicial"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr "Reconciliação"
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Selecionar contas de caixa"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Selecionar contas de caixa"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Selecionar contas de caixa"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr "Reconciliação"
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: .. "" ses the Y axis at 0" a" " ional line</b>" sktop.in.h:1 later " ting software" ÏÎ·Ï ½" ÏληÏοÏοÏίεÏ." " Óÿ u*äá+ Jåá+ Eâ+ 8ã+ Óÿ P#ã+ Óÿ `Óÿ k@äá+ 6 è è! è! 0Óÿ Óÿ xô ã+ Óÿ "äá+ @äá+ 0Óÿ `"äá+ oÓÿ Àïdã+ u*äá+ àdã+ Øädã+ ¨édã+ Jåá+ xô ã+ Óÿ `Óÿ k@äá+ à! à! 0Óÿ Óÿ H¾àâ+ p Óÿ "äá+ @äá+ 0Óÿ `"äá+ oÓÿ `Óÿ XÓÿ 8Kâ+ p Óÿ u*äá+ Jåá+ p Óÿ @Óÿ k@äá+ G H I J K M N O P 0Óÿ Óÿ Hu·â+ Óÿ "äá+ @äá+ 0Óÿ 0ïdã+ u*äá+ ã+ ©â+ àdã+ Øädã+ ¨édã+ Jåá+ Hu·â+ Óÿ
P Óÿ k@äá+ 8u·â+ Óÿ Óÿ k@äá+ (u·â+ Óÿ ° Óÿ k@äá+ u·â+ Óÿ à Óÿ k@äá+ ¨îdã+ u*äá+ ¨édã+ `Óÿ øâ+ e)äá+ Øädã+
Óÿ yøâ+ e)äá+ àdã+ °
Óÿ Zøâ+ e)äá+ ؤâ+ ã+ ©â+ àdã+ Øã+ Øädã+ ¨édã+ Jåá+ 8Kâ+ m`â+ Óÿ p;â+ `Óÿ 0Óÿ k@äá+ 5 6 7 8 : < = > ? @ B D 0Óÿ Óÿ àm]â+ Óÿ u*äá+ Eâ+ à
Óÿ m`â+ e)äá+ Eâ+ Õ_ at fÆS Qöl±íÁ,â+ Óÿ àm]â+ p
Óÿ @Óÿ k@äá+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv0Óÿ Óÿ H¾)â+ fâ+ àÓÿ ¦Èã+ ¦Èã+ Vcâ+ oÓÿ Óÿ XÓÿ ÀÓÿ ã+ u*äá+ Øã+ Óÿ ¢Èã+ ðÓÿ Óÿ ÿÿÿÿÿÿÿÿ¢Èã+ ¨Óÿ /src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "Exibir o nome das (sub)categorias"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "Exibir o nome das (sub)categorias"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "Selecionar contas bancárias"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11396,40 +11504,6 @@ msgstr ""
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "Use os lançamentos como modelo"
-#, fuzzy
-#~ msgid "Transaction list background 1"
-#~ msgstr "Prévia da lista de lançamentos"
-
-#, fuzzy
-#~ msgid "Transaction list background 2"
-#~ msgstr "Prévia da lista de lançamentos"
-
-#, fuzzy
-#~ msgid "Color of transaction's text"
-#~ msgstr "Divisão do lançamento"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "Informe um lançamento agendado"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "Divisão do lançamento"
-
-#, fuzzy
-#~ msgid "Selection color"
-#~ msgstr "Selecionar todas"
-
-#, fuzzy
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr ""
-#~ "Efetuar baixa do lançamento\n"
-#~ "selecionado da agenda"
-
-#, fuzzy
-#~ msgid "Archive color"
-#~ msgstr "Ativado"
-
#~ msgid "Reconciliation ref."
#~ msgstr "Reconciliação ref."
@@ -11446,10 +11520,6 @@ msgstr ""
#~ msgstr "Apagar um terceiro"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "Ativado"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "Adicionar lançamentos"
diff --git a/po/ro.po b/po/ro.po
index e0da14c..39c14b0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1242,33 +1242,52 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
#, fuzzy
msgid "Options"
msgstr "Cheltueli"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "Revenituri"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "Comentarii"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
#, fuzzy
msgid "Line"
msgstr "LicenÅ£Ä"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "A activa"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "Apropiaţi"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
@@ -4937,7 +4956,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
#, fuzzy
msgid "My accounts"
msgstr "AfiÅarea conturilor"
@@ -5385,6 +5404,72 @@ msgstr "Fuziona categoriile"
msgid "Unnamed category list"
msgstr "Categorii de venituri"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "Previzualizarea listei de tranzacţiuni"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "Previzualizarea listei de tranzacţiuni"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "TranzacÅ£ie ventilatÄ"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "Återge o operaÅ£ie planificatÄ"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "Återge o operaÅ£ie planificatÄ"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "Selecţionaţi totul"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr ""
+"Scadenţa operaţiei\n"
+"planificatÄ selecÅ£ionatÄ"
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "A activa"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "Intraţi cursul de schimb"
@@ -7446,8 +7531,8 @@ msgstr "ÃncÄrcarea fiÅierului"
msgid "Failed to load accounts"
msgstr "Selecţionaţi conturile bancare"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, fuzzy, c-format
msgid "Error loading file '%s'"
msgstr "Eroare la deschiderea fiÅierului '%s'."
@@ -7535,7 +7620,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "fÄra nume"
@@ -7631,19 +7716,19 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Imposibil de a deschide fiÅierul '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
#, fuzzy
msgid "File does not exist"
msgstr "FiÅierul existÄ deja"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7651,7 +7736,7 @@ msgid ""
"please check it and try again."
msgstr ""
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7659,17 +7744,17 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
#, fuzzy
msgid "Encryption plugin not found."
msgstr "Cont %s ne gÄsit.\n"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Acest fiÅier nu este o stare Grisbi"
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7678,14 +7763,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "VÄ trebuie versiunea %s de Grisbi pentru a deschide acest fiÅier"
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7693,7 +7778,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7702,8 +7787,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "Imposibil de a salva fiÅierul '%s': %s"
@@ -9734,12 +9819,12 @@ msgstr "Nici o sub-inputaţie"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "Transfera operaţiunile pe terţi"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "Eroare pe sigaction, semnalul SIGSEGV nu va fi deturnat\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11355,63 +11440,86 @@ msgid "<b>Additional line</b>"
msgstr "Sold iniţial"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr "Apropiere"
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "Selecţionaţi conturile casieriei"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "Selecţionaţi conturile casieriei"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "Selecţionaţi conturile casieriei"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr "Apropiere"
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "AfiÅa numele de la (sub-)categorie"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "AfiÅa numele de la (sub-)categorie"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "Selecţionaţi conturile bancare"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11423,40 +11531,6 @@ msgstr ""
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "Utiliza operaÅ£iunea selecÅ£ionatÄ ca model"
-#, fuzzy
-#~ msgid "Transaction list background 1"
-#~ msgstr "Previzualizarea listei de tranzacţiuni"
-
-#, fuzzy
-#~ msgid "Transaction list background 2"
-#~ msgstr "Previzualizarea listei de tranzacţiuni"
-
-#, fuzzy
-#~ msgid "Color of transaction's text"
-#~ msgstr "TranzacÅ£ie ventilatÄ"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "Återge o operaÅ£ie planificatÄ"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "Återge o operaÅ£ie planificatÄ"
-
-#, fuzzy
-#~ msgid "Selection color"
-#~ msgstr "Selecţionaţi totul"
-
-#, fuzzy
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr ""
-#~ "Scadenţa operaţiei\n"
-#~ "planificatÄ selecÅ£ionatÄ"
-
-#, fuzzy
-#~ msgid "Archive color"
-#~ msgstr "A activa"
-
#~ msgid "Reconciliation ref."
#~ msgstr "ReferenÅ£Ä de apropiere"
@@ -11473,10 +11547,6 @@ msgstr ""
#~ msgstr "Suprimarea unui terţ"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "A activa"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "AgÄugaÅ£i operaÅ£iunile"
diff --git a/po/ru.po b/po/ru.po
index f8907c9..41c63af 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1172,32 +1172,51 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr "ÐаÑамеÑÑÑ"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "ÐÑ
одÑÑие"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "СÑолбÑÑ"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
#, fuzzy
msgid "Line"
msgstr "ÐиÑензиÑ"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "ÐÑÑ
ивÑ"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "ÐоказаÑÑ _вÑвеÑеннÑе"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr "ÐÑбÑаÑÑ"
@@ -4750,7 +4769,7 @@ msgstr ""
"пÑиложениÑ"
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr "Ðои ÑÑеÑа"
@@ -5181,6 +5200,66 @@ msgstr "Ðе ÑдалоÑÑ Ð¾ÑкÑÑÑÑ Ñайл каÑегоÑии."
msgid "Unnamed category list"
msgstr "ÐезÑмÑннÑй ÑпиÑок каÑегоÑий"
+#: ../src/gsb_color.c:428
+msgid "Transaction list background 1"
+msgstr "Фон ÑпиÑка пÑоводок â1"
+
+#: ../src/gsb_color.c:429
+msgid "Transaction list background 2"
+msgstr "Фон ÑпиÑка пÑоводок â2"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr "Ð¦Ð²ÐµÑ Ð¾Ð¿ÐµÑаÑии, коÑоÑÐ°Ñ Ð²ÑÐ²Ð¾Ð´Ð¸Ñ ÑекÑÑий баланÑ"
+
+#: ../src/gsb_color.c:431
+msgid "Color of transaction's text"
+msgstr "Ð¦Ð²ÐµÑ ÑекÑÑа пÑоводок"
+
+#: ../src/gsb_color.c:432
+msgid "Text of unfinished split transaction"
+msgstr "ТекÑÑ Ð½ÐµÐ·Ð°Ð²ÐµÑÑÑнной ÑазделÑнной пÑоводки"
+
+#: ../src/gsb_color.c:433
+msgid "Children of split transaction"
+msgstr "ÐоÑомки ÑазделÑнной пÑоводки"
+
+#: ../src/gsb_color.c:434
+msgid "Selection color"
+msgstr "Ð¦Ð²ÐµÑ Ð²ÑделениÑ"
+
+#: ../src/gsb_color.c:435
+msgid "Background of non selectable scheduled transactions"
+msgstr "Фон невÑбÑаннÑÑ
запланиÑованнÑÑ
пÑоводок"
+
+#: ../src/gsb_color.c:436
+msgid "Archive color"
+msgstr "Ð¦Ð²ÐµÑ Ð°ÑÑ
ива"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
+
+#: ../src/gsb_color.c:438
+#, fuzzy
+msgid "Background of bet division"
+msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
+
+#: ../src/gsb_color.c:439
+#, fuzzy
+msgid "Background of bet futur"
+msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
+
+#: ../src/gsb_color.c:440
+#, fuzzy
+msgid "Background of bet solde"
+msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
+
+#: ../src/gsb_color.c:441
+#, fuzzy
+msgid "Background of bet transfer"
+msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr ""
@@ -7168,8 +7247,8 @@ msgstr "ÐанковÑкий ÑÑÑÑ"
msgid "Failed to load accounts"
msgstr "УдалÑÐ½Ð½Ð°Ñ ÑÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr "ÐÑибка пÑи загÑÑзке Ñайла «%s»"
@@ -7251,7 +7330,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr ""
@@ -7345,18 +7424,18 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "Ðе ÑдалоÑÑ Ð¾ÑкÑÑÑÑ Ñайл «%s»: %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr "Файл не ÑÑÑеÑÑвÑеÑ"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7364,7 +7443,7 @@ msgid ""
"please check it and try again."
msgstr ""
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7372,15 +7451,15 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr ""
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7389,14 +7468,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7404,7 +7483,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7413,8 +7492,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr ""
@@ -9296,12 +9375,12 @@ msgstr "СÑббÑджеÑÐ½Ð°Ñ Ð»Ð¸Ð½Ð¸Ñ"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "ТÑи линии на ÑÑанзакÑиÑ"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr ""
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -10839,63 +10918,86 @@ msgid "<b>Additional line</b>"
msgstr "ÐополниÑелÑнÑй баланÑ"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr " <b>ÐÑвеÑка ÑÑÑÑа «%s»</b> "
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "ÐÑделиÑÑ Ð½Ð°Ð»Ð¸ÑнÑе ÑÑеÑа"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "ÐÑделиÑÑ Ð½Ð°Ð»Ð¸ÑнÑе ÑÑеÑа"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "ÐÑделиÑÑ Ð½Ð°Ð»Ð¸ÑнÑе ÑÑеÑа"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr " <b>ÐÑвеÑка ÑÑÑÑа «%s»</b> "
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "ÐоказÑваÑÑ ÑÐ¾Ð²ÐµÑ Ð´Ð½Ñ"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "ÐоказÑваÑÑ ÑÐ¾Ð²ÐµÑ Ð´Ð½Ñ"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "ÐÑделиÑÑ Ð²Ñе"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -10908,52 +11010,6 @@ msgstr "ÐбÑедоÑÑÑпное ÑпÑавление лиÑнÑми Ñина
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "ÐÑбеÑиÑе обÑединÑемÑе пÑоводки"
-#~ msgid "Transaction list background 1"
-#~ msgstr "Фон ÑпиÑка пÑоводок â1"
-
-#~ msgid "Transaction list background 2"
-#~ msgstr "Фон ÑпиÑка пÑоводок â2"
-
-#~ msgid "Color for the operation that gives the balance today"
-#~ msgstr "Ð¦Ð²ÐµÑ Ð¾Ð¿ÐµÑаÑии, коÑоÑÐ°Ñ Ð²ÑÐ²Ð¾Ð´Ð¸Ñ ÑекÑÑий баланÑ"
-
-#~ msgid "Color of transaction's text"
-#~ msgstr "Ð¦Ð²ÐµÑ ÑекÑÑа пÑоводок"
-
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "ТекÑÑ Ð½ÐµÐ·Ð°Ð²ÐµÑÑÑнной ÑазделÑнной пÑоводки"
-
-#~ msgid "Children of split transaction"
-#~ msgstr "ÐоÑомки ÑазделÑнной пÑоводки"
-
-#~ msgid "Selection color"
-#~ msgstr "Ð¦Ð²ÐµÑ Ð²ÑделениÑ"
-
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr "Фон невÑбÑаннÑÑ
запланиÑованнÑÑ
пÑоводок"
-
-#~ msgid "Archive color"
-#~ msgstr "Ð¦Ð²ÐµÑ Ð°ÑÑ
ива"
-
-#~ msgid "Background of invalid date entry"
-#~ msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
-
-#, fuzzy
-#~ msgid "Background of bet division"
-#~ msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
-
-#, fuzzy
-#~ msgid "Background of bet futur"
-#~ msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
-
-#, fuzzy
-#~ msgid "Background of bet solde"
-#~ msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
-
-#, fuzzy
-#~ msgid "Background of bet transfer"
-#~ msgstr "Фон некоÑÑекÑной запиÑи о даÑе"
-
#, fuzzy
#~ msgid "Export a category file (.cgsb)"
#~ msgstr "ÐкÑпоÑÑиÑоваÑÑ Ñайл Ñ ÐºÐ°ÑегоÑиÑми Grisbi (.cgsb)"
@@ -10967,10 +11023,6 @@ msgstr "ÐбÑедоÑÑÑпное ÑпÑавление лиÑнÑми Ñина
#~ msgstr "УдалиÑÑ ÑÑÐ¾Ñ Ð°ÑÑ
ив"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "ÐÑÑ
ивÑ"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "ÐÑÑ
иваÑÐ¸Ñ ÑÑанзакÑий"
diff --git a/po/sv.po b/po/sv.po
index 9dda82e..9128b6f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1103,30 +1103,47 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
msgid "Options"
msgstr ""
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr ""
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
msgid "Column"
msgstr ""
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
msgid "Line"
msgstr ""
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+msgid "Hide grid"
+msgstr ""
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+msgid "Show grid"
+msgstr ""
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
msgid "Select"
msgstr ""
@@ -4507,7 +4524,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
msgid "My accounts"
msgstr ""
@@ -4918,6 +4935,62 @@ msgstr ""
msgid "Unnamed category list"
msgstr ""
+#: ../src/gsb_color.c:428
+msgid "Transaction list background 1"
+msgstr ""
+
+#: ../src/gsb_color.c:429
+msgid "Transaction list background 2"
+msgstr ""
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+msgid "Color of transaction's text"
+msgstr ""
+
+#: ../src/gsb_color.c:432
+msgid "Text of unfinished split transaction"
+msgstr ""
+
+#: ../src/gsb_color.c:433
+msgid "Children of split transaction"
+msgstr ""
+
+#: ../src/gsb_color.c:434
+msgid "Selection color"
+msgstr ""
+
+#: ../src/gsb_color.c:435
+msgid "Background of non selectable scheduled transactions"
+msgstr ""
+
+#: ../src/gsb_color.c:436
+msgid "Archive color"
+msgstr ""
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr ""
@@ -6877,8 +6950,8 @@ msgstr ""
msgid "Failed to load accounts"
msgstr ""
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, c-format
msgid "Error loading file '%s'"
msgstr ""
@@ -6960,7 +7033,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr ""
@@ -7053,18 +7126,18 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr ""
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
msgid "File does not exist"
msgstr ""
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, c-format
msgid ""
@@ -7072,7 +7145,7 @@ msgid ""
"please check it and try again."
msgstr ""
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7080,15 +7153,15 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
msgid "Encryption plugin not found."
msgstr ""
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7097,14 +7170,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7112,7 +7185,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7121,8 +7194,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr ""
@@ -8936,12 +9009,12 @@ msgstr ""
msgid "Transfer all transactions in another sub-budgetary line"
msgstr ""
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr ""
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr ""
@@ -10398,58 +10471,78 @@ msgid "<b>Additional line</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:4
-msgid "<b>Major ticks</b>"
+msgid "<b>Grid</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:5
-msgid "<b>Options for the X axis</b>"
+msgid "<b>Major ticks</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:6
-msgid "<b>Options for the columns</b>"
+msgid "<b>Options for the X axis</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:7
-msgid "<b>Position</b>"
+msgid "<b>Options for the Y axis</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:8
-msgid "Crosses the Y axis at 0"
+msgid "<b>Options for the axis</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:9
-msgid "Display the data graph"
+msgid "<b>Options for the columns</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:10
-msgid "Display the grids above the plot"
+msgid "<b>Position</b>"
msgstr ""
#: ../src/ui/bet_graph.ui.h:11
-msgid "Gap:"
+msgid "Crosses the Y axis at 0"
msgstr ""
#: ../src/ui/bet_graph.ui.h:12
-msgid "High"
+msgid "Display the data graph"
msgstr ""
#: ../src/ui/bet_graph.ui.h:13
-msgid "Inside"
+msgid "Display the grids above the plot"
msgstr ""
#: ../src/ui/bet_graph.ui.h:14
-msgid "Low"
+msgid "Gap:"
msgstr ""
#: ../src/ui/bet_graph.ui.h:15
-msgid "Outside"
+msgid "High"
msgstr ""
#: ../src/ui/bet_graph.ui.h:16
-msgid "Select the chart type"
+msgid "Inside"
msgstr ""
#: ../src/ui/bet_graph.ui.h:17
+msgid "Low"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
+msgid "Outside"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:21
+msgid "Select the chart type"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1e0bd3e..03f9579 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_CN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 17:17+0200\n"
+"POT-Creation-Date: 2011-10-01 20:55+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"
@@ -1208,33 +1208,52 @@ msgid ""
"You need to fix it and start over."
msgstr ""
-#: ../src/bet_graph.c:287 ../src/bet_graph.c:398
+#: ../src/bet_graph.c:304 ../src/bet_graph.c:416
msgid "Graph"
msgstr ""
-#: ../src/bet_graph.c:344 ../src/tiers_onglet.c:1064
+#: ../src/bet_graph.c:361 ../src/tiers_onglet.c:1064
#, fuzzy
msgid "Options"
msgstr "æ¯åº"
-#: ../src/bet_graph.c:409
+#: ../src/bet_graph.c:429
msgid "Expenses"
msgstr ""
-#: ../src/bet_graph.c:432 ../src/etats_affiche.c:2299
+#: ../src/bet_graph.c:453 ../src/etats_affiche.c:2299
msgid "Incomes"
msgstr "æ¶å
¥"
-#: ../src/bet_graph.c:861
+#: ../src/bet_graph.c:805
+msgid "You can not exceed one year of visualization"
+msgstr ""
+
+#: ../src/bet_graph.c:805
+msgid "Overflow"
+msgstr ""
+
+#: ../src/bet_graph.c:962
#, fuzzy
msgid "Column"
msgstr "å¤æ³¨"
-#: ../src/bet_graph.c:885
+#: ../src/bet_graph.c:989
#, fuzzy
msgid "Line"
msgstr "许å¯è¯"
+#. la grille est visible
+#: ../src/bet_graph.c:1449 ../src/bet_graph.c:1483
+#, fuzzy
+msgid "Hide grid"
+msgstr "æ´»å¨"
+
+#: ../src/bet_graph.c:1451 ../src/bet_graph.c:1485 ../src/ui/bet_graph.ui.h:23
+#, fuzzy
+msgid "Show grid"
+msgstr "对账"
+
#: ../src/bet_hist.c:560 ../src/tiers_onglet.c:1151
#, fuzzy
msgid "Select"
@@ -4880,7 +4899,7 @@ msgid "Import data from online bank services or from accounting software"
msgstr ""
#: ../src/gsb_assistant_file.c:582 ../src/navigation.c:1134
-#: ../src/traitement_variables.c:227
+#: ../src/traitement_variables.c:228
#, fuzzy
msgid "My accounts"
msgstr "æ¾ç¤ºè´¦æ·"
@@ -5323,6 +5342,72 @@ msgstr "ä¸è½å¯¼å
¥æ件"
msgid "Unnamed category list"
msgstr "导å
¥ç±»å«æ¸
å"
+#: ../src/gsb_color.c:428
+#, fuzzy
+msgid "Transaction list background 1"
+msgstr "交ææ¸
ååä½"
+
+#: ../src/gsb_color.c:429
+#, fuzzy
+msgid "Transaction list background 2"
+msgstr "交ææ¸
ååä½"
+
+#: ../src/gsb_color.c:430
+msgid "Color for the operation that gives the balance today"
+msgstr ""
+
+#: ../src/gsb_color.c:431
+#, fuzzy
+msgid "Color of transaction's text"
+msgstr "å¤å¶äº¤æ"
+
+#: ../src/gsb_color.c:432
+#, fuzzy
+msgid "Text of unfinished split transaction"
+msgstr "å é¤ä¸æ¡å®æ交æ"
+
+#: ../src/gsb_color.c:433
+#, fuzzy
+msgid "Children of split transaction"
+msgstr "å·²ç»æ¸
é¢å®äº¤æ"
+
+#: ../src/gsb_color.c:434
+#, fuzzy
+msgid "Selection color"
+msgstr "éæ©ææ"
+
+#: ../src/gsb_color.c:435
+#, fuzzy
+msgid "Background of non selectable scheduled transactions"
+msgstr ""
+"å°æéæ©ç\n"
+"å®æ交æ"
+
+#: ../src/gsb_color.c:436
+#, fuzzy
+msgid "Archive color"
+msgstr "æå°æ¥è¡¨"
+
+#: ../src/gsb_color.c:437
+msgid "Background of invalid date entry"
+msgstr ""
+
+#: ../src/gsb_color.c:438
+msgid "Background of bet division"
+msgstr ""
+
+#: ../src/gsb_color.c:439
+msgid "Background of bet futur"
+msgstr ""
+
+#: ../src/gsb_color.c:440
+msgid "Background of bet solde"
+msgstr ""
+
+#: ../src/gsb_color.c:441
+msgid "Background of bet transfer"
+msgstr ""
+
#: ../src/gsb_currency.c:527
msgid "Enter exchange rate"
msgstr "è¾å
¥æ±ç"
@@ -7356,8 +7441,8 @@ msgstr "è½½å
¥è´¦æ·æ件"
msgid "Failed to load accounts"
msgstr "éæ©é¶è¡è´¦æ·"
-#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:301
-#: ../src/gsb_file_load.c:315 ../src/gsb_file_load.c:418
+#: ../src/gsb_file.c:397 ../src/gsb_file.c:414 ../src/gsb_file_load.c:304
+#: ../src/gsb_file_load.c:318 ../src/gsb_file_load.c:421
#, fuzzy, c-format
msgid "Error loading file '%s'"
msgstr "æå¼æ件 '%s'.åçé误"
@@ -7444,7 +7529,7 @@ msgid ""
"cancel and save it with another name or activate the \"%s\" option in setup."
msgstr ""
-#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:791
+#: ../src/gsb_file.c:813 ../src/gsb_file.c:824 ../src/main.c:793
msgid "unnamed"
msgstr "æªå½å"
@@ -7540,19 +7625,19 @@ msgid ""
"and press the 'OK' button."
msgstr ""
-#: ../src/gsb_file_load.c:298 ../src/gsb_file_load.c:415
+#: ../src/gsb_file_load.c:301 ../src/gsb_file_load.c:418
#: ../src/gsb_file_others.c:458 ../src/gsb_file_others.c:595
#: ../src/gsb_file_others.c:782 ../src/gsb_file_others.c:842
#, c-format
msgid "Cannot open file '%s': %s"
msgstr "ä¸è½æå¼æ件 '%s': %s"
-#: ../src/gsb_file_load.c:300
+#: ../src/gsb_file_load.c:303
#, fuzzy
msgid "File does not exist"
msgstr "æ件已ç»åå¨"
-#: ../src/gsb_file_load.c:313 ../src/gsb_file_others.c:471
+#: ../src/gsb_file_load.c:316 ../src/gsb_file_others.c:471
#: ../src/gsb_file_others.c:794
#, fuzzy, c-format
msgid ""
@@ -7562,7 +7647,7 @@ msgstr ""
"%s ä¼¼ä¹ä¸æ¶ä¸ä¸ªæææ件ï¼\n"
"请éæ°æ£æ¥ã"
-#: ../src/gsb_file_load.c:359 ../src/gsb_file_save.c:390
+#: ../src/gsb_file_load.c:362 ../src/gsb_file_save.c:408
msgid ""
"Grisbi was unable to load required plugin to handle that file.\n"
"\n"
@@ -7570,17 +7655,17 @@ msgid ""
"installed) and try again."
msgstr ""
-#: ../src/gsb_file_load.c:364 ../src/gsb_file_save.c:395
+#: ../src/gsb_file_load.c:367 ../src/gsb_file_save.c:413
#, fuzzy
msgid "Encryption plugin not found."
msgstr "è´¦æ· %s æªæ¾å°\n"
-#: ../src/gsb_file_load.c:459 ../src/gsb_file_load.c:5436
+#: ../src/gsb_file_load.c:462 ../src/gsb_file_load.c:5489
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "该æ件ä¸æ¯Grisbiæ¥è¡¨"
-#: ../src/gsb_file_load.c:696
+#: ../src/gsb_file_load.c:707
#, c-format
msgid ""
"An error occured while parsing the file :\n"
@@ -7589,14 +7674,14 @@ msgid ""
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8832
+#: ../src/gsb_file_load.c:8885
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "æå¼æ¤æ件éè¦Grisbiçæ¬ %s "
-#: ../src/gsb_file_load.c:8857
+#: ../src/gsb_file_load.c:8910
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7604,7 +7689,7 @@ msgid ""
"transactions or important information."
msgstr ""
-#: ../src/gsb_file_load.c:8861
+#: ../src/gsb_file_load.c:8914
msgid "Grisbi archive opened"
msgstr ""
@@ -7613,8 +7698,8 @@ msgid "There is no category to record. Back."
msgstr ""
#: ../src/gsb_file_others.c:159 ../src/gsb_file_others.c:249
-#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:416
-#: ../src/gsb_file_save.c:435
+#: ../src/gsb_file_others.c:341 ../src/gsb_file_save.c:434
+#: ../src/gsb_file_save.c:453
#, c-format
msgid "Cannot save file '%s': %s"
msgstr "ä¸è½ä¿åæ件 '%s': %s"
@@ -9625,12 +9710,12 @@ msgstr "没æåé¢ç®è¡"
msgid "Transfer all transactions in another sub-budgetary line"
msgstr "转移è¿äºäº¤æå°"
-#: ../src/main.c:607
+#: ../src/main.c:609
#, c-format
msgid "Error on sigaction: SIGSEGV won't be trapped\n"
msgstr "ä¿¡å·é误ï¼SIGSEGVä¸è½ææ\n"
-#: ../src/main.c:744 ../src/main.c:784 ../share/grisbi.desktop.in.h:1
+#: ../src/main.c:746 ../src/main.c:786 ../share/grisbi.desktop.in.h:1
msgid "Grisbi"
msgstr "Grisbi"
@@ -11239,63 +11324,86 @@ msgid "<b>Additional line</b>"
msgstr "åå§ä½é¢"
#: ../src/ui/bet_graph.ui.h:4
+#, fuzzy
+msgid "<b>Grid</b>"
+msgstr "è°æ´"
+
+#: ../src/ui/bet_graph.ui.h:5
msgid "<b>Major ticks</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:5
+#: ../src/ui/bet_graph.ui.h:6
msgid "<b>Options for the X axis</b>"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:6
+#: ../src/ui/bet_graph.ui.h:7
+#, fuzzy
+msgid "<b>Options for the Y axis</b>"
+msgstr "éæ©ç°éè´¦æ·"
+
+#: ../src/ui/bet_graph.ui.h:8
+#, fuzzy
+msgid "<b>Options for the axis</b>"
+msgstr "éæ©ç°éè´¦æ·"
+
+#: ../src/ui/bet_graph.ui.h:9
#, fuzzy
msgid "<b>Options for the columns</b>"
msgstr "éæ©ç°éè´¦æ·"
-#: ../src/ui/bet_graph.ui.h:7
+#: ../src/ui/bet_graph.ui.h:10
#, fuzzy
msgid "<b>Position</b>"
msgstr "è°æ´"
-#: ../src/ui/bet_graph.ui.h:8
+#: ../src/ui/bet_graph.ui.h:11
msgid "Crosses the Y axis at 0"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:9
+#: ../src/ui/bet_graph.ui.h:12
#, fuzzy
msgid "Display the data graph"
msgstr "æ¾ç¤ºï¼åï¼ç±»å«çå称"
-#: ../src/ui/bet_graph.ui.h:10
+#: ../src/ui/bet_graph.ui.h:13
#, fuzzy
msgid "Display the grids above the plot"
msgstr "æ¾ç¤ºï¼åï¼ç±»å«çå称"
-#: ../src/ui/bet_graph.ui.h:11
+#: ../src/ui/bet_graph.ui.h:14
msgid "Gap:"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:12
+#: ../src/ui/bet_graph.ui.h:15
msgid "High"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:13
+#: ../src/ui/bet_graph.ui.h:16
msgid "Inside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:14
+#: ../src/ui/bet_graph.ui.h:17
msgid "Low"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:15
+#: ../src/ui/bet_graph.ui.h:18
+msgid "Major grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:19
+msgid "Minor grid"
+msgstr ""
+
+#: ../src/ui/bet_graph.ui.h:20
msgid "Outside"
msgstr ""
-#: ../src/ui/bet_graph.ui.h:16
+#: ../src/ui/bet_graph.ui.h:21
#, fuzzy
msgid "Select the chart type"
msgstr "éæ©èµäº§è´¦æ·"
-#: ../src/ui/bet_graph.ui.h:17
+#: ../src/ui/bet_graph.ui.h:22
msgid "Show Labels"
msgstr ""
@@ -11307,36 +11415,6 @@ msgstr ""
#~ msgid "Please select the data source for the account: \"%s\""
#~ msgstr "使ç¨éä¸äº¤æå模æ¿"
-#, fuzzy
-#~ msgid "Transaction list background 1"
-#~ msgstr "交ææ¸
ååä½"
-
-#, fuzzy
-#~ msgid "Transaction list background 2"
-#~ msgstr "交ææ¸
ååä½"
-
-#, fuzzy
-#~ msgid "Color of transaction's text"
-#~ msgstr "å¤å¶äº¤æ"
-
-#, fuzzy
-#~ msgid "Text of unfinished split transaction"
-#~ msgstr "å é¤ä¸æ¡å®æ交æ"
-
-#, fuzzy
-#~ msgid "Children of split transaction"
-#~ msgstr "å·²ç»æ¸
é¢å®äº¤æ"
-
-#, fuzzy
-#~ msgid "Selection color"
-#~ msgstr "éæ©ææ"
-
-#, fuzzy
-#~ msgid "Background of non selectable scheduled transactions"
-#~ msgstr ""
-#~ "å°æéæ©ç\n"
-#~ "å®æ交æ"
-
#~ msgid "Reconciliation ref."
#~ msgstr "è°æ´åè"
@@ -11353,10 +11431,6 @@ msgstr ""
#~ msgstr "å é¤ç¬¬ä¸æ¹"
#, fuzzy
-#~ msgid "Hide Archive"
-#~ msgstr "æ´»å¨"
-
-#, fuzzy
#~ msgid "Hide archived transactions"
#~ msgstr "æ°å¢äº¤æ"
diff --git a/share/grisbi.desktop b/share/grisbi.desktop
new file mode 100644
index 0000000..2871db6
--- /dev/null
+++ b/share/grisbi.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Name=Grisbi
+Name[cs]=Grisbi
+Name[da]=Grisbi
+Name[de]=Grisbi
+Name[el]=Grisbi
+Name[es]=Grisbi
+Name[fr]=Grisbi
+Name[he]=×ר×ס××
+Name[lv]=Grisbi
+Name[nl]=Grisbi
+Name[pl]=Grisbi
+Name[pt_BR]=Grisbi
+Name[ro]=Grisbi
+Name[ru]=Grisbi
+Name[zh_CN]=Grisbi
+Comment=Personnal finances manager
+Comment[cs]=Osobnà správce financÃ
+Comment[de]=Finanzprogramm für Privatpersonen
+Comment[fr]=Gestionnaire de finances personnelles
+Exec=grisbi
+Icon=grisbi
+Terminal=false
+Type=Application
+Categories=Office;Finance;
diff --git a/src/Makefile.am b/src/Makefile.am
index 0558329..ebde1e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
# Process this file with automake to produce Makefile.in
-AM_CPPFLAGS = -I$(top_srcdir) $(GRISBI_CFLAGS) $(IGE_MAC_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\""
+AM_CPPFLAGS = -I$(top_srcdir) $(GRISBI_CFLAGS) $(IGE_MAC_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\"" -DUI_DIR="\"$(datadir)/@PACKAGE@/ui\""
if HAVE_GOFFICE
AM_CPPFLAGS += $(GOFFICE_CFLAGS)
diff --git a/src/bet_graph.c b/src/bet_graph.c
index cddbfb8..d7efbc2 100644
--- a/src/bet_graph.c
+++ b/src/bet_graph.c
@@ -40,6 +40,7 @@
#include "gsb_data_account.h"
#include "gsb_data_fyear.h"
#include "gsb_dirs.h"
+#include "gsb_file.h"
#include "navigation.h"
#include "structures.h"
#include "utils_gtkbuilder.h"
@@ -58,29 +59,34 @@ struct _struct_bet_graph_data
{
GtkTreeView *tree_view;
GtkNotebook *notebook;
+ GtkWidget *button_show_grid;
gint account_number;
+ gint currency_number;
/* Données pour le graphique */
GtkWidget *widget;
GogChart *chart;
GogPlot *plot;
gchar *title;
- gchar *service_id; /* définit le type de graphique */
+ gchar *service_id; /* définit le type de graphique : GogPiePlot, GogLinePlot, GogBarColPlot = défaut */
gboolean is_legend;
+ gboolean valid_data; /* empêche le recalcul des données pendant la durée de vie du graph */
+ gboolean show_grid; /* FALSE par défaut */
- /* données communes */
+ /* données communes aux axes*/
gint nbre_elemnts;
- /* 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 l'axe X */
+ gdouble tab_X[MAX_POINTS_GRAPHIQUE]; /* données de type gdouble */
+ gchar tab_libelle[MAX_POINTS_GRAPHIQUE][TAILLE_MAX_LIBELLE]; /* données de type string */
+ gchar **tab_vue_libelle; /* tableau associé à celui ci-dessus */
+
+ /* données pour l'axe Y */
+ gdouble tab_Y[MAX_POINTS_GRAPHIQUE]; /* données de type gdouble */
/* données pour les camemberts */
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;
+ gdouble montant; /* montant annuel toutes catégories. sert au calcul de pourcentage */
};
@@ -100,6 +106,7 @@ struct _struct_bet_graph_button
struct _struct_bet_graph_prefs
{
+ gint type_graph; /* type de graphique : -1 secteurs, 1 ligne, 0 barres par défaut */
gboolean major_tick_out; /* TRUE par défaut */
gboolean major_tick_in; /* FALSE par défaut */
gboolean major_tick_labeled; /* affichage des libellés de l'axe X. TRUE par défaut*/
@@ -109,7 +116,8 @@ struct _struct_bet_graph_prefs
gint degrees; /* rotation des étiquettes de l'axe X en degrés. 90° par défaut */
gint gap_spinner; /* espace entre deux barres en %. 50 par défaut*/
gboolean before_grid; /* les étiquettes sont cachées par les barres par défaut */
-
+ gboolean major_grid_y; /* ajoute une grille principale sur l'axe Y */
+ gboolean minor_grid_y; /* ajoute une grille secondaire sur l'axe Y */
};
@@ -127,6 +135,10 @@ static GtkWidget *bet_graph_get_canvas ( void );
static gboolean bet_graph_initialise_builder ( void );
static void bet_graph_map_type_changed ( GtkComboBox *combo,
struct_bet_graph_data *self );
+static gboolean bet_graph_notebook_change_page ( GtkNotebook *notebook,
+ GtkNotebookPage *npage,
+ gint page,
+ struct_bet_graph_data *self );
static gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self );
static gboolean bet_graph_populate_sectors_by_hist_data ( struct_bet_graph_data *self );
static void bet_graph_popup_choix_graph_activate ( GtkMenuItem *menuitem,
@@ -137,6 +149,11 @@ static gboolean bet_graph_popup_choix_graph_menu ( GtkWidget *button,
static void bet_graph_rotation_changed ( GORotationSel *rotation,
int angle,
struct_bet_graph_data *self );
+static void bet_graph_show_grid_button_changed ( GtkToggleButton *togglebutton,
+ struct_bet_graph_data *self );
+static void bet_graph_show_grid_button_configure ( struct_bet_graph_data *self,
+ gint active,
+ gint hide );
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 );
@@ -144,7 +161,6 @@ 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*/
@@ -207,7 +223,7 @@ gboolean bet_graph_on_motion ( GtkWidget *event_box,
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 ) );
+ self->tab_Y[index], self->currency_number ) );
}
else if ( strcmp ( self->service_id, "GogLinePlot") == 0 )
@@ -232,7 +248,7 @@ gboolean bet_graph_on_motion ( GtkWidget *event_box,
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 ) );
+ self->tab_Y[index-1], self->currency_number ) );
}
else
buf = NULL;
@@ -246,7 +262,7 @@ gboolean bet_graph_on_motion ( GtkWidget *event_box,
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 ),
+ self->tab_Y[index], self->currency_number ),
( 100*self->tab_Y[index]/self->montant ) );
}
@@ -364,6 +380,7 @@ void bet_graph_sectors_graph_new ( GtkWidget *button,
gchar *title;
gint result;
gint account_number;
+ gint currency_number;
struct_bet_graph_data *self_credit;
struct_bet_graph_data *self_debit;
@@ -400,12 +417,14 @@ void bet_graph_sectors_graph_new ( GtkWidget *button,
/* initialisation des structures de données */
account_number = gsb_gui_navigation_get_current_account ( );
+ currency_number = gsb_data_account_get_currency ( account_number );
/* 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->currency_number = currency_number;
self_debit->type_infos = 1;
self_debit->title = g_strdup ( _("Expenses") );
self_debit->service_id = g_strdup ( "GogPiePlot" );
@@ -429,6 +448,7 @@ void bet_graph_sectors_graph_new ( GtkWidget *button,
self_credit->notebook = GTK_NOTEBOOK ( notebook );
self_credit->tree_view = tree_view;
self_credit->account_number = account_number;
+ self_credit->currency_number = currency_number;
self_credit->type_infos = 0;
self_credit->title = g_strdup ( _("Incomes") );
self_credit->service_id = g_strdup ( "GogPiePlot" );
@@ -583,6 +603,7 @@ void bet_graph_line_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
gchar *service_id;
gint result;
gint account_number;
+ gint currency_number;
struct_bet_graph_data *self;
devel_debug (NULL);
@@ -591,16 +612,14 @@ void bet_graph_line_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
if ( !bet_graph_initialise_builder ( ) )
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 ( );
+ currency_number = gsb_data_account_get_currency ( account_number );
service_id = g_object_get_data ( G_OBJECT ( button ), "service_id" );
self = struct_initialise_bet_graph_data ( );
self->tree_view = tree_view;
self->account_number = account_number;
+ self->currency_number = currency_number;
self->service_id = g_strdup ( service_id );
/* Création de la fenêtre de dialogue pour le graph */
@@ -612,6 +631,18 @@ void bet_graph_line_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
GTK_SIGNAL_FUNC ( gtk_widget_destroy ),
NULL);
+ /* initialise le bouton show_grid avec la préférence "Major_grid" */
+ self->button_show_grid = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "button_show_grid" ) );
+ gtk_button_set_image ( GTK_BUTTON ( self->button_show_grid ),
+ gtk_image_new_from_file ( g_build_filename ( gsb_dirs_get_pixmaps_dir ( ),
+ "grille.png", NULL ) ) );
+ if ( prefs_lines->major_grid_y )
+ bet_graph_show_grid_button_configure ( self, TRUE, -1 );
+ g_signal_connect ( self->button_show_grid,
+ "toggled",
+ G_CALLBACK ( bet_graph_show_grid_button_changed ),
+ self );
+
/* 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\"",
@@ -623,6 +654,11 @@ void bet_graph_line_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
/* initialise les pages pour les graphiques ligne et barre */
self->notebook = GTK_NOTEBOOK ( gtk_builder_get_object ( bet_graph_builder, "notebook" ) );
+ g_signal_connect_after ( self->notebook,
+ "switch-page",
+ G_CALLBACK ( bet_graph_notebook_change_page ),
+ self );
+
/* set the graphique page */
self->plot = bet_graph_create_graph_page ( self, TRUE );
@@ -648,7 +684,6 @@ void bet_graph_line_graph_new ( GtkWidget *button, GtkTreeView *tree_view )
/* free the data */
struct_free_bet_graph_data ( self );
g_object_unref ( G_OBJECT ( bet_graph_builder ) );
-
gtk_widget_destroy ( dialog );
}
@@ -679,6 +714,7 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
GDate *last_date;
GDate *date_courante;
GDateDay day_courant;
+ GDateMonth month_courant;
gint nbre_iterations;
tab_libelle_axe_x = &libelle_axe_x;
@@ -690,6 +726,7 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
GValue date_value = {0,};
GDate *date;
GDateDay day;
+ GDateMonth month;
gint diff_jours;
gint i;
@@ -718,6 +755,7 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
date_courante = gsb_date_copy ( date );
day_courant = g_date_get_day ( date );
+ month_courant = g_date_get_month ( date );
str_date = gsb_format_gdate ( date_courante );
strncpy ( &libelle_axe_x[self -> nbre_elemnts * TAILLE_MAX_LIBELLE], str_date, TAILLE_MAX_LIBELLE );
@@ -730,7 +768,8 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
else
{
day = g_date_get_day ( date );
- if ( day != day_courant )
+ month = g_date_get_month ( date );
+ if ( day != day_courant || month != month_courant )
{
/* nombre de jours manquants */
diff_jours = g_date_days_between ( date_courante, date );
@@ -754,6 +793,8 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
g_free ( str_date );
}
day_courant = day;
+ if ( g_date_is_first_of_month ( date ) )
+ month_courant = g_date_get_month ( date );
}
}
prev_montant = montant;
@@ -794,6 +835,7 @@ gboolean bet_graph_affiche_XY_line ( struct_bet_graph_data *self )
GOStyle *style;
GogObject *axis;
GogObject *axis_line = NULL;
+ GogObject *grid_line;
GError *error = NULL;
gchar *position;
@@ -805,7 +847,6 @@ gboolean bet_graph_affiche_XY_line ( struct_bet_graph_data *self )
/* 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 */
@@ -831,6 +872,7 @@ gboolean bet_graph_affiche_XY_line ( struct_bet_graph_data *self )
g_object_set ( G_OBJECT ( axis ),
"major-tick-in", prefs_lines->major_tick_in,
"major-tick-out", prefs_lines->major_tick_out,
+ "minor-tick-out", prefs_lines->major_tick_out,
"major-tick-labeled", prefs_lines->major_tick_labeled,
NULL);
@@ -846,19 +888,33 @@ gboolean bet_graph_affiche_XY_line ( struct_bet_graph_data *self )
NULL );
}
- /* affichage de la grille au dessus ou en dessous des barres */
- /* sert aussi à afficher les étiquettes au dessus des barres à cause d'un bug de goffice */
- if ( prefs_lines->before_grid )
+ if ( prefs_lines->type_graph == 0 )
{
- g_object_set ( G_OBJECT ( self->plot ),
+ /* affichage de la grille au dessus ou en dessous des barres */
+ /* sert aussi à afficher les étiquettes au dessus des barres à cause d'un bug de goffice */
+ if ( prefs_lines->before_grid )
+ g_object_set ( G_OBJECT ( self->plot ),
"before-grid", TRUE,
NULL );
- }
- /* modification du ratio de largeur des barres. 0 pas d'espace entre deux barres */
- g_object_set ( G_OBJECT ( self->plot ),
+ /* modification du ratio de largeur des barres. 0 pas d'espace entre deux barres */
+ g_object_set ( G_OBJECT ( self->plot ),
"gap-percentage", prefs_lines->gap_spinner,
NULL );
+ }
+
+ /* on ajoute une grille pour l'axe Y si necessaire */
+ if ( self->show_grid )
+ {
+ if ( prefs_lines->major_grid_y || self->show_grid )
+ {
+ axis = gog_object_get_child_by_name ( GOG_OBJECT ( self->chart ), "Y-Axis" );
+
+ grid_line = gog_object_add_by_name ( GOG_OBJECT ( axis ), "MajorGrid", NULL );
+ if ( prefs_lines->minor_grid_y )
+ grid_line = gog_object_add_by_name ( GOG_OBJECT ( axis ), "MinorGrid", NULL );
+ }
+ }
/* on met à jour les données à afficher */
series = GOG_SERIES ( gog_plot_new_series ( GOG_PLOT ( cur_plot ) ) );
@@ -909,20 +965,23 @@ GtkWidget *bet_graph_button_menu_new ( GsbButtonStyle style,
self->callback = callback;
self->box = box_button;
self->tree_view = tree_view;
- self->is_visible = TRUE;
- self->button = gsb_automem_imagefile_button_new ( style,
+ if ( prefs_lines->type_graph == 0 )
+ {
+ self->is_visible = TRUE;
+ self->button = gsb_automem_imagefile_button_new ( style,
self->name,
self->filename,
NULL,
NULL );
- g_object_set_data ( G_OBJECT ( self->button ), "service_id", self->service_id );
- g_signal_connect ( G_OBJECT ( self->button ),
+ g_object_set_data ( G_OBJECT ( self->button ), "service_id", self->service_id );
+ g_signal_connect ( G_OBJECT ( self->button ),
"clicked",
self->callback,
self->tree_view );
- gtk_box_pack_start ( GTK_BOX ( self->box ), self->button, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( self->box ), self->button, TRUE, TRUE, 0 );
+ }
liste = g_list_append ( liste, self );
self = struct_initialise_bet_graph_button ( );
@@ -933,8 +992,23 @@ GtkWidget *bet_graph_button_menu_new ( GsbButtonStyle style,
self->callback = callback;
self->box = box_button;
self->tree_view = tree_view;
- self->is_visible = FALSE;
+ if ( prefs_lines->type_graph == 1 )
+ {
+ self->is_visible = TRUE;
+ self->button = gsb_automem_imagefile_button_new ( style,
+ self->name,
+ self->filename,
+ NULL,
+ NULL );
+
+ g_object_set_data ( G_OBJECT ( self->button ), "service_id", self->service_id );
+ g_signal_connect ( G_OBJECT ( self->button ),
+ "clicked",
+ self->callback,
+ self->tree_view );
+ gtk_box_pack_start ( GTK_BOX ( self->box ), self->button, TRUE, TRUE, 0 );
+ }
liste = g_list_append ( liste, self );
}
@@ -1050,6 +1124,8 @@ void bet_graph_popup_choix_graph_activate ( GtkMenuItem *menuitem,
self->tree_view );
gtk_box_pack_start ( GTK_BOX ( self->box ), self->button, TRUE, TRUE, 0 );
+
+ gsb_file_set_modified ( TRUE );
}
@@ -1062,6 +1138,7 @@ void bet_graph_popup_choix_graph_activate ( GtkMenuItem *menuitem,
GtkWidget *bet_graph_create_line_preferences ( struct_bet_graph_data *self )
{
GtkWidget *box_prefs_line;
+ GtkWidget *box_options_col;
GtkWidget *rot_align;
GtkWidget *widget;
GtkWidget *button_1;
@@ -1070,12 +1147,22 @@ GtkWidget *bet_graph_create_line_preferences ( struct_bet_graph_data *self )
GtkWidget *rotation;
box_prefs_line = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "box_prefs_line") );
+ box_options_col = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "box_options_col") );
rot_align = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "rot_align") );
+ /* définition du type de graphique */
+ if ( strcmp ( self->service_id, "GogLinePlot" ) == 0 )
+ prefs_lines->type_graph = 1;
+ else if ( strcmp ( self->service_id, "GogPiePlot" ) == 0 )
+ prefs_lines->type_graph = -1;
+ else
+ prefs_lines->type_graph = 0;
+
+ /* configuration de l'axe X */
/* 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 );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), TRUE );
g_object_set_data ( G_OBJECT ( widget ), "rang", GINT_TO_POINTER ( 0 ) );
g_signal_connect ( widget,
@@ -1085,7 +1172,7 @@ GtkWidget *bet_graph_create_line_preferences ( struct_bet_graph_data *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 );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), TRUE );
g_object_set_data ( G_OBJECT ( widget ), "rang", GINT_TO_POINTER ( 1 ) );
g_signal_connect ( widget,
@@ -1095,7 +1182,7 @@ GtkWidget *bet_graph_create_line_preferences ( struct_bet_graph_data *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 );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), TRUE );
g_object_set_data ( G_OBJECT ( widget ), "rang", GINT_TO_POINTER ( 2 ) );
g_signal_connect ( widget,
@@ -1119,7 +1206,10 @@ GtkWidget *bet_graph_create_line_preferences ( struct_bet_graph_data *self )
widget = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "new_axis_line" ) );
g_object_set_data ( G_OBJECT ( widget ), "rang", GINT_TO_POINTER ( 6 ) );
+
+ /* on lie les deux boutons pour les retrouver plus tard */
g_object_set_data ( G_OBJECT ( widget ), "other_axis", button_3 );
+ g_object_set_data ( G_OBJECT ( button_3 ), "other_axis", widget );
if ( prefs_lines->new_axis_line )
{
@@ -1133,8 +1223,6 @@ GtkWidget *bet_graph_create_line_preferences ( struct_bet_graph_data *self )
gtk_widget_set_sensitive ( widget, FALSE );
}
- g_object_set_data ( G_OBJECT ( button_3 ), "other_axis", widget );
-
/* set the signal */
g_signal_connect ( button_1,
"toggled",
@@ -1166,24 +1254,57 @@ GtkWidget *bet_graph_create_line_preferences ( struct_bet_graph_data *self )
gtk_container_add ( GTK_CONTAINER ( rot_align ), rotation );
- /* configure la visibilité de la grille et provisoirement des étiquettes de l'axe X (bug goffice) */
- widget = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "before_grid" ) );
- g_object_set_data ( G_OBJECT ( widget ), "rang", GINT_TO_POINTER ( 7 ) );
- if ( prefs_lines->before_grid )
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), TRUE );
- g_signal_connect ( widget,
+ if ( prefs_lines->type_graph == 0 )
+ {
+ /* configure la visibilité de la grille et provisoirement des étiquettes de l'axe X (bug goffice) */
+ widget = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "before_grid" ) );
+ g_object_set_data ( G_OBJECT ( widget ), "rang", GINT_TO_POINTER ( 7 ) );
+ if ( prefs_lines->before_grid )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( widget ), TRUE );
+ g_signal_connect ( widget,
"toggled",
G_CALLBACK ( bet_graph_toggle_button_changed ),
self );
- /* configure la valeur de la largeur des colonnes du graph */
- widget = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "gap_spinner" ) );
- if ( prefs_lines->gap_spinner )
- gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( widget ), prefs_lines->gap_spinner );
- g_signal_connect ( widget,
+ /* configure la valeur de la largeur des colonnes du graph */
+ widget = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "gap_spinner" ) );
+ if ( prefs_lines->gap_spinner )
+ gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( widget ), prefs_lines->gap_spinner );
+ g_signal_connect ( widget,
"value-changed",
G_CALLBACK ( bet_graph_gap_spinner_changed ),
self );
+ }
+ else
+ gtk_widget_hide ( box_options_col );
+
+ /* configuration de l'axe Y */
+ /* onfiguration de la grille */
+ button_1 = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "major_grid_y" ) );
+ g_object_set_data ( G_OBJECT ( button_1 ), "rang", GINT_TO_POINTER ( 8 ) );
+
+ button_2 = GTK_WIDGET ( gtk_builder_get_object ( bet_graph_builder, "minor_grid_y" ) );
+ if ( prefs_lines->minor_grid_y )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON (button_2 ), TRUE );
+
+ g_object_set_data ( G_OBJECT ( button_2 ), "rang", GINT_TO_POINTER ( 9 ) );
+ /* on lie les deux boutons pour les retrouver plus tard */
+ g_object_set_data ( G_OBJECT ( button_1 ), "grid_y", button_2 );
+
+ if ( prefs_lines->major_grid_y )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button_1 ), TRUE );
+ else
+ gtk_widget_set_sensitive ( button_2, FALSE );
+
+ /* 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 );
return box_prefs_line;
}
@@ -1236,10 +1357,40 @@ void bet_graph_toggle_button_changed ( GtkToggleButton *togglebutton,
case 7:
prefs_lines->before_grid = active;
break;
+ case 8:
+ prefs_lines->major_grid_y = active;
+
+ /* on sensibilise ou désensibilise le bouton minor_grid_y */
+ button = g_object_get_data ( G_OBJECT ( togglebutton ), "grid_y" );
+ gtk_widget_set_sensitive ( button, active );
+
+ /* si le graphe est dans la bonne configuration on sort */
+ if ( prefs_lines->major_grid_y == self->show_grid )
+ {
+ gsb_file_set_modified ( TRUE );
+ return;
+ }
+ /* on positionne le bouton self->button_show_grid */
+ if ( active )
+ bet_graph_show_grid_button_configure ( self, TRUE, TRUE );
+ else
+ bet_graph_show_grid_button_configure ( self, FALSE, TRUE );
+ break;
+ case 9:
+ prefs_lines->minor_grid_y = active;
+
+ /* on positionne le bouton self->button_show_grid */
+ if ( active )
+ bet_graph_show_grid_button_configure ( self, TRUE, TRUE );
+ else
+ bet_graph_show_grid_button_configure ( self, FALSE, TRUE );
+ break;
}
/* on met à jour le graph */
bet_graph_update_graph ( self );
+
+ gsb_file_set_modified ( TRUE );
}
@@ -1257,6 +1408,8 @@ void bet_graph_rotation_changed ( GORotationSel *rotation,
/* on met à jour le graph */
bet_graph_update_graph ( self );
+
+ gsb_file_set_modified ( TRUE );
}
@@ -1273,6 +1426,97 @@ void bet_graph_gap_spinner_changed ( GtkSpinButton *spinbutton,
/* on met à jour le graph */
bet_graph_update_graph ( self );
+
+ gsb_file_set_modified ( TRUE );
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+void bet_graph_show_grid_button_changed ( GtkToggleButton *togglebutton,
+ struct_bet_graph_data *self )
+{
+ gboolean active;
+
+ active = gtk_toggle_button_get_active ( togglebutton );
+
+ self->show_grid = active;
+ if ( active )
+ gtk_button_set_label ( GTK_BUTTON ( self->button_show_grid ), _("Hide grid") );
+ else
+ gtk_button_set_label ( GTK_BUTTON ( self->button_show_grid ), _("Show grid") );
+
+ /* on met à jour le graph */
+ bet_graph_update_graph ( self );
+
+ gtk_notebook_set_current_page ( self->notebook, 0 );
+}
+
+
+/**
+ * on positionne les caractéristiques du bouton
+ *
+ *\param active : 1 = on veut montrer la grille 0 = on veut cacher la grille -1 = sans effet
+ *\param hide : 1 = on cache le bouton 0 = on montre le bouton -1 = sans effet
+ *
+ *\return
+ * */
+void bet_graph_show_grid_button_configure ( struct_bet_graph_data *self,
+ gint active,
+ gint hide )
+{
+ if ( active != -1 )
+ {
+ /* on bloque le signal */
+ g_signal_handlers_block_by_func ( G_OBJECT ( self->button_show_grid ),
+ bet_graph_show_grid_button_changed,
+ self );
+
+ self->show_grid = active;
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( self->button_show_grid ), active );
+
+ if ( active ) /* la grille est visible */
+ gtk_button_set_label ( GTK_BUTTON ( self->button_show_grid ), _("Hide grid") );
+ else
+ gtk_button_set_label ( GTK_BUTTON ( self->button_show_grid ), _("Show grid") );
+
+ /* on débloque le signal */
+ g_signal_handlers_unblock_by_func ( G_OBJECT ( self->button_show_grid ),
+ bet_graph_show_grid_button_changed,
+ self );
+ }
+
+ if ( active != -1 )
+ {
+ if ( hide )
+ gtk_widget_hide ( GTK_WIDGET ( self->button_show_grid ) );
+ else
+ gtk_widget_show ( GTK_WIDGET ( self->button_show_grid ) );
+ }
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+gboolean bet_graph_notebook_change_page ( GtkNotebook *notebook,
+ GtkNotebookPage *npage,
+ gint page,
+ struct_bet_graph_data *self )
+{
+ if ( page == 0 )
+ gtk_widget_show ( self->button_show_grid );
+ else
+ gtk_widget_hide ( self->button_show_grid );
+
+ return FALSE;
}
@@ -1296,6 +1540,71 @@ void bet_graph_update_graph ( struct_bet_graph_data *self )
/**
+ * sérialise les préférences des graphes
+ *
+ *
+ * \return a newly allocated string which must be freed when no more used.
+ * */
+gchar *bet_graph_get_configuration_string ( void )
+{
+ gchar *new_str = NULL;
+
+ if ( prefs_lines == NULL )
+ return NULL;
+
+ new_str = g_markup_printf_escaped ( "\t<Bet_graph prefs=\"%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d\" />\n",
+ prefs_lines->type_graph,
+ prefs_lines->major_tick_out,
+ prefs_lines->major_tick_in,
+ prefs_lines->major_tick_labeled,
+ prefs_lines->position,
+ prefs_lines->new_axis_line,
+ prefs_lines->cross_entry,
+ prefs_lines->degrees,
+ prefs_lines->gap_spinner,
+ prefs_lines->before_grid,
+ prefs_lines->major_grid_y,
+ prefs_lines->minor_grid_y );
+
+ return new_str;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+void bet_graph_set_configuration_variables ( const gchar *string )
+{
+ gchar **tab;
+
+ /* initialisation des préférences si nécessaire */
+ /* initialisation des préférences si nécessaire */ tring ) %d:%d:%d:%d:%d:%d:%d:%d:%d:%d\" />\n", */ E ); )/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\"" -DUI_DIR="\"$(datadir)/@PACKAGE@/ui\"" ÿ "äá+ @äá+ 0Óÿ `"äá+ oÓÿ Àïdã+ u*äá+ àdã+ Øädã+ ¨édã+ Jåá+ xô ã+ Óÿ `Óÿ k@äá+ à! à! 0Óÿ Óÿ H¾àâ+ p Óÿ "äá+ @äá+ 0Óÿ `"äá+ oÓÿ `Óÿ XÓÿ 8Kâ+ p Óÿ u*äá+ Jåá+ p Óÿ @Óÿ k@äá+ G H I J K M N O P 0Óÿ Óÿ Hu·â+ Óÿ "äá+ @äá+ 0Óÿ 0ïdã+ u*äá+ ã+ ©â+ àdã+ Øädã+ ¨édã+ Jåá+ Hu·â+ Óÿ
P Óÿ k@äá+ 8u·â+ Óÿ Óÿ k@äá+ (u·â+ Óÿ ° Óÿ k@äá+ u·â+ Óÿ à Óÿ k@äá+ ¨îdã+ u*äá+ ¨édã+ `Óÿ øâ+ e)äá+ Øädã+
Óÿ yøâ+ e)äá+ àdã+ °
Óÿ Zøâ+ e)äá+ ؤâ+ ã+ ©â+ àdã+ Øã+ Øädã+ ¨édã+ Jåá+ 8Kâ+ m`â+ Óÿ p;â+ `Óÿ 0Óÿ k@äá+ 5 6 7 8 : < = > ? @ B D 0Óÿ Óÿ àm]â+ Óÿ u*äá+ Eâ+ à
Óÿ m`â+ e)äá+ Eâ+ Õ_ at fÆS Qöl±íÁ,â+ Óÿ àm]â+ p
Óÿ @Óÿ k@äá+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv0Óÿ Óÿ H¾)â+ fâ+ àÓÿ ¦Èã+ ¦Èã+ Vcâ+ oÓÿ Óÿ XÓÿ ÀÓÿ ã+ u*äá+ Øã+ Óÿ ¢Èã+ ðÓÿ Óÿ ÿÿÿÿÿÿÿÿ¢Èã+ ¨Óÿ if ( prefs_lines == NULL )
+ prefs_lines = struct_initialise_bet_graph_prefs ( );
+
+ if ( string == NULL )
+ return;
+
+ tab = g_strsplit ( string, ":", 0 );
+
+ prefs_lines->type_graph = utils_str_atoi ( tab[0] );
+ prefs_lines->major_tick_out = utils_str_atoi ( tab[1] );
+ prefs_lines->major_tick_in = utils_str_atoi ( tab[2] );
+ prefs_lines->major_tick_labeled = utils_str_atoi ( tab[3] );
+ prefs_lines->position = utils_str_atoi ( tab[4] );
+ prefs_lines->new_axis_line = utils_str_atoi ( tab[5] );
+ prefs_lines->cross_entry = utils_str_atoi ( tab[6] );
+ prefs_lines->degrees = utils_str_atoi ( tab[7] );
+ prefs_lines->gap_spinner = utils_str_atoi ( tab[8] );
+ prefs_lines->before_grid = utils_str_atoi ( tab[9] );
+ prefs_lines->major_grid_y = utils_str_atoi ( tab[10] );
+ prefs_lines->minor_grid_y = utils_str_atoi ( tab[11] );
+}
+
+
+/**
*
*
*
@@ -1391,14 +1700,15 @@ struct_bet_graph_prefs *struct_initialise_bet_graph_prefs ( void )
*
*
* */
-void struct_free_bet_graph_prefs ( struct_bet_graph_prefs *self )
+void struct_free_bet_graph_prefs ( void )
{
- g_free ( self );
+
+ g_free ( prefs_lines );
}
/**
- *
+ * free the gtk_builder
*
*
*
diff --git a/src/bet_graph.h b/src/bet_graph.h
index 4fc1e1a..64135f2 100644
--- a/src/bet_graph.h
+++ b/src/bet_graph.h
@@ -28,11 +28,14 @@ GtkWidget *bet_graph_button_menu_new ( GsbButtonStyle style,
GCallback callback,
GtkWidget *tree_view );
void bet_graph_free_builder ( void );
+gchar *bet_graph_get_configuration_string ( void );
void bet_graph_line_graph_new ( GtkWidget *button,
GtkTreeView *tree_view );
void bet_graph_sectors_graph_new ( GtkWidget *button,
GtkTreeView *tree_view );
GtkWidget *bet_graph_sectors_graph_new_new ( void );
+void bet_graph_set_configuration_variables ( const gchar *string );
+void struct_free_bet_graph_prefs ( void );
/* END_DECLARATION */
#endif /* HAVE_GOFFICE */
diff --git a/src/bet_hist.c b/src/bet_hist.c
index c5ea6aa..589ed6c 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -1969,7 +1969,7 @@ GtkWidget *bet_historical_create_toolbar ( GtkWidget *parent,
G_CALLBACK ( bet_graph_sectors_graph_new ),
tree_view );
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 5 );
-#endif
+#endif /* HAVE_GOFFICE */
gtk_widget_show_all ( hbox );
diff --git a/src/bet_tab.c b/src/bet_tab.c
index 8a7c4b1..26e8f23 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -2915,7 +2915,7 @@ GtkWidget *bet_array_list_create_toolbar ( GtkWidget *parent, GtkWidget *tree_vi
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 5 );
bet_graph_free_builder ( );
-#endif
+#endif /* HAVE_GOFFICE */
gtk_widget_show_all ( hbox );
diff --git a/src/gsb_color.c b/src/gsb_color.c
index a054a69..d5f5548 100644
--- a/src/gsb_color.c
+++ b/src/gsb_color.c
@@ -457,7 +457,7 @@ GtkWidget *gsb_color_create_color_combobox ( void )
&iter );
gtk_list_store_set ( GTK_LIST_STORE (store),
&iter,
- 0, _(config_colors[i].name),
+ 0, gettext ( config_colors[i].name ),
1, config_colors[i].color,
2, config_colors[i].default_color,
-1);
diff --git a/src/gsb_dirs.c b/src/gsb_dirs.c
index 666ae44..f91e833 100644
--- a/src/gsb_dirs.c
+++ b/src/gsb_dirs.c
@@ -34,6 +34,7 @@
static gchar *locale_dir;
static gchar *pixmaps_dir;
static gchar *plugins_dir;
+static gchar *ui_dir;
static gchar *_C_GRISBIRC;
static gchar *_C_OLD_GRISBIRC;
static gchar *_C_PATH_CONFIG;
@@ -56,6 +57,8 @@ void gsb_dirs_init ( void )
locale_dir = g_strconcat (res_path, "/share/locale", NULL );
pixmaps_dir = g_strconcat (res_path, "/share/pixmaps/grisbi", NULL );
plugins_dir = g_strconcat (res_path, "/lib/grisbi", NULL );
+ ui_dir = g_strconcat (res_path, "/share/grisbi/ui", NULL );
+
g_free ( res_path );
}
else
@@ -64,6 +67,7 @@ void gsb_dirs_init ( void )
locale_dir = g_strdup ( LOCALEDIR );
pixmaps_dir = g_strdup ( PIXMAPS_DIR );
plugins_dir = g_strdup ( PLUGINS_DIR );
+ ui_dir = g_strdup ( UI_DIR );
}
/*
@@ -124,6 +128,7 @@ void gsb_dirs_shutdown ( void )
g_free ( locale_dir );
g_free ( pixmaps_dir );
g_free ( plugins_dir );
+ g_free ( ui_dir );
g_free ( _C_GRISBIRC );
g_free ( _C_OLD_GRISBIRC );
g_free ( _C_PATH_CONFIG );
@@ -154,6 +159,12 @@ const gchar *gsb_dirs_get_plugins_dir ( void )
}
+const gchar *gsb_dirs_get_ui_dir ( void )
+{
+ return ui_dir;
+}
+
+
const gchar *C_GRISBIRC ( void )
{
return _C_GRISBIRC;
diff --git a/src/gsb_dirs.h b/src/gsb_dirs.h
index 2ec5531..ee9b43d 100644
--- a/src/gsb_dirs.h
+++ b/src/gsb_dirs.h
@@ -8,6 +8,7 @@ void gsb_dirs_shutdown ( void );
const gchar *gsb_dirs_get_locale_dir ( void );
const gchar *gsb_dirs_get_pixmaps_dir ( void );
const gchar *gsb_dirs_get_plugins_dir ( void );
+const gchar *gsb_dirs_get_ui_dir ( void );
const gchar *C_GRISBIRC ( void );
const gchar *C_OLD_GRISBIRC ( void );
const gchar *C_PATH_CONFIG ( void );
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index 7d43174..3dbc416 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -36,6 +36,7 @@
/*START_INCLUDE*/
#include "gsb_file_load.h"
#include "bet_data.h"
+#include "bet_graph.h"
#include "custom_list.h"
#include "dialog.h"
#include "fenetre_principale.h"
@@ -101,6 +102,8 @@ static void gsb_file_load_bet_historical ( const gchar **attribute_names,
const gchar **attribute_values );
static void gsb_file_load_bet_part ( const gchar **attribute_names,
const gchar **attribute_values );
+static void gsb_file_load_bet_graph_part ( const gchar **attribute_names,
+ const gchar **attribute_values );
static void gsb_file_load_bet_transfert_part ( const gchar **attribute_names,
const gchar **attribute_values );
static gboolean gsb_file_load_check_new_structure ( gchar *file_content );
@@ -631,6 +634,14 @@ void gsb_file_load_start_element ( GMarkupParseContext *context,
return;
}
+#ifdef HAVE_GOFFICE
+ if ( !strcmp ( element_name, "Bet_graph" ) )
+ {
+ gsb_file_load_bet_graph_part ( attribute_names, attribute_values );
+ return;
+ }
+#endif /* HAVE_GOFFICE */
+
if ( !strcmp ( element_name, "Bet_historical" ) )
{
gsb_file_load_bet_historical ( attribute_names, attribute_values );
@@ -3893,6 +3904,48 @@ void gsb_file_load_bet_part ( const gchar **attribute_names,
}
+ /**
+ * load the bet_graph preferences in the grisbi file
+ *
+ * \param attribute_names
+ * \param attribute_values
+ *
+ * */
+void gsb_file_load_bet_graph_part ( const gchar **attribute_names,
+ const gchar **attribute_values )
+{
+ gint i=0;
+
+ if ( !attribute_names[i] )
+ return;
+
+ do
+ {
+ /* we test at the beginning if the attribute_value is NULL, if yes, */
+ /* go to the next */
+ if ( !strcmp ( attribute_values[i], "(null)") )
+ {
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "prefs" ) )
+ {
+#ifdef HAVE_GOFFICE
+ bet_graph_set_configuration_variables ( attribute_values[i] );
+#endif /* HAVE_GOFFICE */
+ i++;
+ continue;
+ }
+
+ /* normally, shouldn't come here */
+ i++;
+ }
+
+ while ( attribute_names[i] );
+}
+
+
/**
* load the historical balance part in the grisbi file
*
diff --git a/src/gsb_file_save.c b/src/gsb_file_save.c
index 322568d..7451870 100644
--- a/src/gsb_file_save.c
+++ b/src/gsb_file_save.c
@@ -45,6 +45,7 @@
#include "gsb_file_save.h"
#include "bet_data.h"
#include "bet_data_finance.h"
+#include "bet_graph.h"
#include "dialog.h"
#include "gsb_color.h"
#include "gsb_data_account.h"
@@ -98,6 +99,9 @@ static gulong gsb_file_save_bank_part ( gulong iterator,
static gulong gsb_file_save_bet_part ( gulong iterator,
gulong *length_calculated,
gchar **file_content );
+static gulong gsb_file_save_bet_graph_part ( gulong iterator,
+ gulong *length_calculated,
+ gchar **file_content );
static gulong gsb_file_save_color_part ( gulong iterator,
gulong *length_calculated,
gchar **file_content,
@@ -209,6 +213,9 @@ gboolean gsb_file_save_save_file ( const gchar *filename,
gint logo_part = 65536;
gint account_icon_part = 4500;
gint bet_part = 500;
+#ifdef HAVE_GOFFICE
+ gint bet_graph_part = 100;
+#endif /* HAVE_GOFFICE */
struct stat buf;
@@ -254,7 +261,12 @@ gboolean gsb_file_save_save_file ( const gchar *filename,
+ partial_balance_part * g_slist_length ( gsb_data_partial_balance_get_list ())
+ logo_part
+ account_icon_part * g_slist_length ( gsb_select_icon_list_accounts_icon () )
+#ifdef HAVE_GOFFICE
+ + bet_part
+ + bet_graph_part;
+#else
+ bet_part;
+#endif /* HAVE_GOFFICE */
iterator = 0;
file_content = g_malloc0 ( length_calculated * sizeof ( gchar ) );
@@ -349,6 +361,12 @@ gboolean gsb_file_save_save_file ( const gchar *filename,
&length_calculated,
&file_content );
+#ifdef HAVE_GOFFICE
+ iterator = gsb_file_save_bet_graph_part ( iterator,
+ &length_calculated,
+ &file_content );
+#endif /* HAVE_GOFFICE */
+
iterator = gsb_file_save_report_part ( iterator,
&length_calculated,
&file_content,
@@ -2843,6 +2861,37 @@ gulong gsb_file_save_bet_part ( gulong iterator,
}
+/**
+ * save the bet graph preferences part
+ *
+ * \param iterator the current iterator
+ * \param length_calculated a pointer to the variable lengh_calculated
+ * \param file_content a pointer to the variable file_content
+ *
+ * \return the new iterator
+ * */
+gulong gsb_file_save_bet_graph_part ( gulong iterator,
+ gulong *length_calculated,
+ gchar **file_content )
+{
+#ifdef HAVE_GOFFICE
+ gchar *new_string = NULL;
+
+ /* save the preferences */
+ new_string = bet_graph_get_configuration_string ( );
+
+ /* append the new string to the file content */
+ iterator = gsb_file_save_append_part ( iterator,
+ length_calculated,
+ file_content,
+ new_string );
+#endif /* HAVE_GOFFICE */
+
+ /* and return the new iterator */
+ return iterator;
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/main.c b/src/main.c
index 74a0d3e..3dd1b83 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,7 +36,7 @@
#ifdef HAVE_GOFFICE
#include <goffice/goffice.h>
-#endif
+#endif /* HAVE_GOFFICE */
/*START_INCLUDE*/
#include "main.h"
@@ -152,6 +152,11 @@ int main ( int argc, char **argv )
gsb_locale_shutdown ( );
gsb_dirs_shutdown ( );
+#ifdef HAVE_GOFFICE
+ /* liberation libgoffice */
+ libgoffice_shutdown ( );
+#endif /* HAVE_GOFFICE */
+
#if GSB_GMEMPROFILE
g_mem_profile();
#endif
@@ -191,9 +196,9 @@ void main_linux ( int argc, char **argv )
#ifdef HAVE_GOFFICE
/* initialisation libgoffice */
libgoffice_init ( );
- /* Initialize plugins manager */
- go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
-#endif
+ /* Initialize plugins manager */
+ go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+#endif /* HAVE_GOFFICE */
/* on commence par détourner le signal SIGSEGV */
gsb_grisbi_trappe_signal_sigsegv ( );
@@ -227,11 +232,6 @@ void main_linux ( int argc, char **argv )
/* sauvegarde les raccourcis claviers */
gtk_accel_map_save ( C_PATH_CONFIG_ACCELS ( ) );
-
-#ifdef HAVE_GOFFICE
- /* liberation libgoffice */
- libgoffice_shutdown ( );
-#endif
}
@@ -263,9 +263,9 @@ void main_mac_osx ( int argc, char **argv )
#ifdef HAVE_GOFFICE
/* initialisation libgoffice */
libgoffice_init ( );
- /* Initialize plugins manager */
- go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
-#endif
+ /* Initialize plugins manager */
+ go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+#endif /* HAVE_GOFFICE */
/* init the app */
theApp = g_object_new ( GTK_TYPE_OSX_APPLICATION, NULL );
@@ -347,11 +347,6 @@ void main_mac_osx ( int argc, char **argv )
g_object_unref ( theApp );
-#ifdef HAVE_GOFFICE
- /* liberation libgoffice */
- libgoffice_shutdown ( );
-#endif
-
#endif /* GTKOSXAPPLICATION */
}
@@ -389,6 +384,13 @@ void main_win_32 ( int argc, char **argv )
gsb_locale_init ( );
+#ifdef HAVE_GOFFICE
+ /* initialisation libgoffice */
+ libgoffice_init ( );
+ /* Initialize plugins manager */
+ go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+#endif /* HAVE_GOFFICE */
+
gtk_init ( &argc, &argv );
win32_parse_gtkrc ( "gtkrc" );
@@ -827,12 +829,12 @@ gchar *gsb_main_get_print_locale_var ( void )
locale_str = g_strdup_printf ( "LANG = %s\n\n"
"Currency\n"
- "\tcurrency_symbol = %s\n"
+ "\tcurrency_symbol = %s\n"
"\tmon_thousands_sep = \"%s\"\n"
"\tmon_decimal_point = %s\n"
- "\tpositive_sign = \"%s\"\n"
- "\tnegative_sign = \"%s\"\n"
- "\tfrac_digits = \"%d\"\n\n",
+ "\tpositive_sign = \"%s\"\n"
+ "\tnegative_sign = \"%s\"\n"
+ "\tfrac_digits = \"%d\"\n\n",
g_getenv ( "LANG"),
conv->currency_symbol,
mon_thousands_sep,
@@ -860,16 +862,17 @@ gchar *gsb_main_get_print_dir_var ( void )
gchar *path_str = NULL;
path_str = g_strdup_printf ( "Paths\n"
- "\tXDG_DATA_HOME = %s\n"
- "\tXDG_CONFIG_HOME = %s\n\n"
- "\tC_GRISBIRC = %s\n"
- "\tC_PATH_CONFIG = %s\n"
- "\tC_PATH_CONFIG_ACCELS = %s\n"
- "\tC_PATH_DATA_FILES = %s\n\n"
- "\tDATA_PATH = %s\n\n"
- "\tgsb_dirs_get_locale_dir ( ) = %s\n"
+ "\tXDG_DATA_HOME = %s\n"
+ "\tXDG_CONFIG_HOME = %s\n\n"
+ "\tC_GRISBIRC = %s\n"
+ "\tC_PATH_CONFIG = %s\n"
+ "\tC_PATH_CONFIG_ACCELS = %s\n"
+ "\tC_PATH_DATA_FILES = %s\n\n"
+ "\tDATA_PATH = %s\n\n"
+ "\tgsb_dirs_get_locale_dir ( ) = %s\n"
"\tgsb_dirs_get_plugins_dir ( ) = %s\n"
- "\tgsb_dirs_get_pixmaps_dir ( ) = %s\n\n",
+ "\tgsb_dirs_get_pixmaps_dir ( ) = %s\n"
+ "\tgsb_dirs_get_ui_dir ( ) = %s\n\n",
g_get_user_data_dir ( ),
g_get_user_config_dir ( ),
C_GRISBIRC ( ),
@@ -879,7 +882,8 @@ gchar *gsb_main_get_print_dir_var ( void )
DATA_PATH,
gsb_dirs_get_locale_dir ( ),
gsb_dirs_get_plugins_dir ( ),
- gsb_dirs_get_pixmaps_dir ( ) );
+ gsb_dirs_get_pixmaps_dir ( ),
+ gsb_dirs_get_ui_dir ( ) );
return path_str;
}
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index 1d3cc73..cbddc97 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -2,7 +2,7 @@
/* */
/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
-/* 2009-2010 Pierre Biava (grisbi at pierre.biava.name) */
+/* 2009-2011 Pierre Biava (grisbi at pierre.biava.name) */
/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
@@ -38,6 +38,7 @@
#include "bet_data.h"
#include "bet_data_finance.h"
#include "bet_future.h"
+#include "bet_graph.h"
#include "custom_list.h"
#include "fenetre_principale.h"
#include "gsb_calendar.h"
@@ -315,6 +316,10 @@ void init_variables ( void )
bet_array_col_width[i] = bet_array_col_width_init[i];
bet_data_finance_data_simulator_init ( );
+#ifdef HAVE_GOFFICE
+ bet_graph_set_configuration_variables ( NULL );
+#endif /* HAVE_GOFFICE */
+
}
/**
@@ -326,6 +331,9 @@ void free_variables ( void )
gsb_data_print_config_free ();
gsb_gui_navigation_free_pages_list ( );
gsb_regex_destroy ( );
+#ifdef HAVE_GOFFICE
+ struct_free_bet_graph_prefs ( );
+#endif /* HAVE_GOFFICE */
}
diff --git a/src/ui/bet_graph.ui b/src/ui/bet_graph.ui
index 10f5f71..66514c6 100644
--- a/src/ui/bet_graph.ui
+++ b/src/ui/bet_graph.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.18"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">500</property>
@@ -28,7 +28,25 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <placeholder/>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToggleButton" id="button_show_grid">
+ <property name="label" translatable="yes">Show grid</property>
+ <property name="width_request">130</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>
+ </object>
+ </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">
@@ -48,7 +66,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@@ -121,10 +139,10 @@
<property name="can_focus">False</property>
<property name="spacing">5</property>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label6">
<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="label" translatable="yes"><b>Options for the axis</b></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -135,7 +153,7 @@
</packing>
</child>
<child>
- <object class="GtkHSeparator" id="hseparator1">
+ <object class="GtkHSeparator" id="hseparator5">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -146,59 +164,64 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="box_options">
+ <object class="GtkHBox" id="box_options_axes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="axis_base_pref_box">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <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_x">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">24</property>
<child>
- <object class="GtkVBox" id="major_tick_box">
+ <object class="GtkVBox" id="axis_base_pref_box_x">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkHBox" id="hbox3">
<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>
+ <property name="spacing">24</property>
<child>
- <object class="GtkVBox" id="vbox13">
+ <object class="GtkVBox" id="major_tick_box">
<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>
+ <object class="GtkLabel" id="label3">
<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>
+ <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>
@@ -207,14 +230,68 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="major_tick_in">
- <property name="label" translatable="yes">Inside</property>
+ <object class="GtkAlignment" id="alignment12">
<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="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>
@@ -222,89 +299,312 @@
<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="GtkVBox" id="position_box">
+ <property name="visible">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="GtkCheckButton" id="major_tick_labeled">
- <property name="label" translatable="yes">Show Labels</property>
+ <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="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="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>
+ </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>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Additional line</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="alignment2">
+ <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="GtkCheckButton" id="new_axis_line">
+ <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="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>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</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>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVSeparator" id="vseparator2">
+ <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="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Options for the Y 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="GtkVBox" id="position_box">
+ <object class="GtkHSeparator" id="hseparator4">
+ <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_y">
<property name="visible">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">
+ <object class="GtkVBox" id="axis_base_pref_box_y">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="border_width">12</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkVBox" id="vbox19">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">24</property>
<child>
- <object class="GtkVBox" id="cross_box">
+ <object class="GtkVBox" id="grid_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>
+ <object class="GtkLabel" id="label9">
<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="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Grid</b></property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -313,130 +613,82 @@
</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">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkAlignment" id="alignment15">
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkRadioButton" id="axis_cross">
- <property name="label" translatable="yes">Crosses the Y axis at 0</property>
+ <object class="GtkCheckButton" id="major_grid_y">
+ <property name="label" translatable="yes">Major grid</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="minor_grid_y">
+ <property name="label" translatable="yes">Minor grid</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>
</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>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</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>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Additional line</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="alignment2">
- <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="GtkCheckButton" id="new_axis_line">
- <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="draw_indicator">True</property>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</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>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -444,175 +696,158 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="box_options_col">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<child>
- <object class="GtkVSeparator" id="vseparator1">
+ <object class="GtkHSeparator" id="hseparator2">
<property name="visible">True</property>
<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">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="rot_align">
+ <object class="GtkLabel" id="label2">
<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>
+ <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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator3">
+ <property name="visible">True</property>
+ <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">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHSeparator" id="hseparator2">
- <property name="visible">True</property>
- <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>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <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>
- <child>
- <object class="GtkHSeparator" id="hseparator3">
- <property name="visible">True</property>
- <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>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <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">
+ <object class="GtkAlignment" id="alignment1">
<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>
+ <property name="no_show_all">True</property>
+ <property name="xscale">0</property>
<child>
- <object class="GtkLabel" id="label61">
+ <object class="GtkTable" id="gog_barcol_prefs">
<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="yalign">0.46000000834465027</property>
- <property name="draw_indicator">True</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 >True</property> y> erty> > the plot</property> y> operty> perty> aps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\"" -DUI_DIR="\"$(datadir)/@PACKAGE@/ui\"" ÿ "äá+ @äá+ 0Óÿ `"äá+ oÓÿ Àïdã+ u*äá+ àdã+ Øädã+ ¨édã+ Jåá+ xô ã+ Óÿ `Óÿ k@äá+ à! à! 0Óÿ Óÿ H¾àâ+ p Óÿ "äá+ @äá+ 0Óÿ `"äá+ oÓÿ `Óÿ XÓÿ 8Kâ+ p Óÿ u*äá+ Jåá+ p Óÿ @Óÿ k@äá+ G H I J K M N O P 0Óÿ Óÿ Hu·â+ Óÿ "äá+ @äá+ 0Óÿ 0ïdã+ u*äá+ ã+ ©â+ àdã+ Øädã+ ¨édã+ Jåá+ Hu·â+ Óÿ
P Óÿ k@äá+ 8u·â+ Óÿ Óÿ k@äá+ (u·â+ Óÿ ° Óÿ k@äá+ u·â+ Óÿ à Óÿ k@äá+ ¨îdã+ u*äá+ ¨édã+ `Óÿ øâ+ e)äá+ Øädã+
Óÿ yøâ+ e)äá+ àdã+ °
Óÿ Zøâ+ e)äá+ ؤâ+ ã+ ©â+ àdã+ Øã+ Øädã+ ¨édã+ Jåá+ 8Kâ+ m`â+ Óÿ p;â+ `Óÿ 0Óÿ k@äá+ 5 6 7 8 : < = > ? @ B D 0Óÿ Óÿ àm]â+ Óÿ u*äá+ Eâ+ à
Óÿ m`â+ e)äá+ Eâ+ Õ_ at fÆS Qöl±íÁ,â+ Óÿ àm]â+ p
Óÿ @Óÿ k@äá+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv0Óÿ Óÿ H¾)â+ fâ+ àÓÿ ¦Èã+ ¦Èã+ Vcâ+ oÓÿ Óÿ XÓÿ ÀÓÿ ã+ u*äá+ Øã+ Óÿ ¢Èã+ ðÓÿ Óÿ ÿÿÿÿÿÿÿÿ¢Èã+ ¨Óÿ </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="yalign">0.46000000834465027</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>
- <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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
diff --git a/src/utils_gtkbuilder.c b/src/utils_gtkbuilder.c
index fe97af9..37ecec9 100644
--- a/src/utils_gtkbuilder.c
+++ b/src/utils_gtkbuilder.c
@@ -31,6 +31,7 @@
/*START_INCLUDE*/
#include "utils_gtkbuilder.h"
#include "dialog.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -50,7 +51,7 @@ gchar *utils_gtkbuilder_get_full_path ( const gchar *name )
{
gchar *filename;
- filename = g_build_filename ( DATA_PATH, "/ui", name, NULL );
+ filename = g_build_filename ( gsb_dirs_get_ui_dir ( ), name, NULL );
return filename;
}
diff --git a/src/utils_real.c b/src/utils_real.c
index 83ce770..fcc2760 100644
--- a/src/utils_real.c
+++ b/src/utils_real.c
@@ -27,7 +27,6 @@
/*START_INCLUDE*/
#include "utils_real.h"
-#include "gsb_data_account.h"
#include "gsb_data_currency.h"
#include "gsb_locale.h"
/*END_INCLUDE*/
@@ -145,12 +144,10 @@ gsb_real utils_real_get_from_string ( const gchar *string )
* \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 )
{
- 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 );
hooks/post-receive
--
grisbi
More information about the cvs
mailing list