[grisbi-cvs] [SCM] grisbi branch, grisbi-0.8.x, updated. upstream_version_0_8_7-21-g68b22f7

Pierre Biava nobody at users.sourceforge.net
Sun Oct 9 19:15:16 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, grisbi-0.8.x has been updated
       via  68b22f771a765075e951e90b5f0d94eae3fa653d (commit)
       via  8b521493e3f4e4297e9ee962c1a1f5bdb1b104d5 (commit)
       via  06c0767c5f23029b43ce95c4307232c843f03667 (commit)
       via  ccbf6debd63503ba0c56423c1b7a0413409196f4 (commit)
       via  53b661fc7c4de2f875982a74e38bb1e200b4e0db (commit)
       via  71e5af194ed60f28fcd4a300bc4809a72d7ccfe4 (commit)
       via  8d0896a74aa63977a14460bf54ef09e5ac6c56e1 (commit)
       via  0b6f4bc19d037875b15e75714c4c618fab05c08e (commit)
       via  813cdf01f252b47bbd03a970600b6956f0646086 (commit)
       via  1220bb1eda8fd5ca4ee0181be5ad67a675aba91c (commit)
      from  16a785297798b01a8588feb3d5eb49804cf2f3df (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 68b22f771a765075e951e90b5f0d94eae3fa653d
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Oct 9 19:11:37 2011 +0200

    Fixed a bug in the debug function of budgetary lines. Reversal of translation of certain phrases

commit 8b521493e3f4e4297e9ee962c1a1f5bdb1b104d5
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Oct 9 19:10:17 2011 +0200

    update all strings

commit 06c0767c5f23029b43ce95c4307232c843f03667
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Oct 9 17:57:51 2011 +0200

    Fixes for version of gtk-mac-integration-1.0.1

commit ccbf6debd63503ba0c56423c1b7a0413409196f4
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Oct 9 17:31:54 2011 +0200

    Added a function for mass processing of files to export.

commit 53b661fc7c4de2f875982a74e38bb1e200b4e0db
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Oct 9 10:40:48 2011 +0200

    Added choice of format for files to export

commit 71e5af194ed60f28fcd4a300bc4809a72d7ccfe4
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Oct 9 08:14:51 2011 +0200

    Add a button "Select all" for the functionality export files (cherry picked from commit 52f702a46a4a04fea1e27e0f38ce55f3eac1b5b3)

commit 8d0896a74aa63977a14460bf54ef09e5ac6c56e1
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Oct 9 07:58:45 2011 +0200

    Fix a side effect of commit 9fa7f70ef0e8c4f9f15f9a0827ed1172c7a8579c

commit 0b6f4bc19d037875b15e75714c4c618fab05c08e
Author: pbiava <pierre.biava at nerim.net>
Date:   Fri Oct 7 15:44:22 2011 +0200

    bug 1405:  bug fix export of files and adding a scrolling window for the liste of exports

commit 813cdf01f252b47bbd03a970600b6956f0646086
Author: Gérald Niel <gerald at mbp15-gn.local>
Date:   Sat Oct 8 08:51:05 2011 +0200

    Fixes for version of gtk-mac-integration-1.

commit 1220bb1eda8fd5ca4ee0181be5ad67a675aba91c
Author: pbiava <pierre.biava at nerim.net>
Date:   Fri Oct 7 20:49:51 2011 +0200

    fix bug 1398(cherry picked from commit 7781d8c959ca364020e21a22a89224f4f5529ded)

-----------------------------------------------------------------------

Changes:
diff --git a/configure.in b/configure.in
index 362ecc4..a2701f1 100644
--- a/configure.in
+++ b/configure.in
@@ -271,10 +271,12 @@ if test "x$platform_osx" = xyes; then
         platform=darwin/quartz
         AC_MSG_RESULT(yes)
         AC_DEFINE(GDK_QUARTZ,[1],[Using GDK Quartz (not X11)])
-        PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration, [os_osx=yes], [os_osx=no])
+        PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration, [os_osx=yes], [os_osx=no])
         AC_MSG_RESULT(${os_osx})
         if test "x$os_osx" = xyes; then
 	      AC_DEFINE([GTKOSXAPPLICATION],[1],[Defined if app is GtkOSXApplication])
+	      AC_SUBST(GTK_MAC_LIBS)
+	      AC_SUBST(GTK_MAC_CFLAGS)
         fi
   else
 	AC_MSG_RESULT(no)
@@ -337,7 +339,7 @@ echo "
                 Build with OpenSSL:        $build_openssl
                 Build with OFX plugin:     $build_ofx
                 Build plugins statically:  $enable_static
-                Build ige_mac_integration: $os_osx
+                Build gtk_mac_integration: $os_osx
                 CUnit/unit tests support:  $build_cunit
 
 "
diff --git a/po/cs.po b/po/cs.po
index 23a5574..5f7af3a 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+0200\n"
 "PO-Revision-Date: 2011-02-19 01:39+0100\n"
 "Last-Translator: Markus7cz <markus7cz at gmail.com>\n"
 "Language-Team: \n"
@@ -601,7 +601,7 @@ msgstr "Kategorie"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -631,7 +631,7 @@ msgstr "Zvolte fiskální rok nebo pohyblivých 12 měsíců"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -826,13 +826,13 @@ msgstr "Zobrazit rozpis amortizace od začátku"
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 msgid "Print the array"
 msgstr "Vytisknout tabulku"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 msgid "Export the array"
 msgstr "Exportovat tabulku"
 
@@ -847,7 +847,7 @@ msgid "Loan amount: "
 msgstr "Částka půjčky: "
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -894,15 +894,15 @@ msgid "Credits"
 msgstr "Půjčky"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Tisk"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Export"
 
@@ -910,7 +910,7 @@ msgstr "Export"
 msgid "credit.csv"
 msgstr "pujcka.csv"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Nelze uložit soubor."
@@ -1030,7 +1030,7 @@ msgstr "Zvolte metodu platby"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1041,7 +1041,7 @@ msgstr "Plátce/příjemce"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1052,7 +1052,7 @@ msgstr "Debet"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1066,7 +1066,7 @@ msgid "Categories : Sub-categories"
 msgstr "Kategorie : Podkategorie"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1078,8 +1078,8 @@ msgstr "Pozn."
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1155,7 +1155,7 @@ msgid "Select"
 msgstr "Vybrat"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1222,15 +1222,15 @@ msgstr "Zaškrtněte pro automatickou změnu počátečního data"
 msgid "Description"
 msgstr "Popis"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Zůstatek"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, c-format
 msgid ""
 "Transfer between account: %s\n"
@@ -1239,81 +1239,81 @@ msgstr ""
 "Převod mezi účtem: %s\n"
 "a účtem: %s"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr "Odečíst od zůstatku"
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 msgid "Adding to the balance"
 msgstr "Připočíst k zůstatku"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr "Vložit řádek"
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 msgid "Delete selection"
 msgstr "Odstranit výběr"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 msgid "Change selection"
 msgstr "Změnit výběr"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 msgid "Delete all occurences of the selection"
 msgstr "Odstranit všechny výskyty výběru"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 msgid "Convert selection to scheduled transaction"
 msgstr "Změnit výběr na plánovanou transakci"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 msgid "Insert the balance of a cash account"
 msgstr "Vložte saldo hotovostního účtu"
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr "Vynulovat data"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr " (stále k dispozici)"
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 msgid " (budget exceeded)"
 msgstr " (rozpočet překročen)"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr " (zbývá k příjmu)"
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 msgid "No data by default"
 msgstr "Žádná výchozí data"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Žádná kategorie"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Žádný rozpočet"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 msgid "Export the array of forecast"
 msgstr "Exportovat tabulku prognózy"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 msgid "Balance at "
 msgstr "Zůstatek k "
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr "prognoza.csv"
 
@@ -2181,7 +2181,7 @@ msgstr "Celkový součet (transakcí: %d): "
 msgid "General total: "
 msgstr "Celkový součet: "
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2209,14 +2209,14 @@ msgstr "Příjmy"
 msgid "Outgoings"
 msgstr "Výdaje"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Datum pohybu"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2234,13 +2234,13 @@ msgstr "Metoda platby"
 msgid "Cheque"
 msgstr "Å ek"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Doklad"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2390,7 +2390,7 @@ msgstr "Zobrazení dat"
 msgid "Generalities"
 msgstr "Hlavní"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Transakce"
@@ -2516,16 +2516,17 @@ msgstr "Označte účty zobrazené v sestavě: "
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Označit vše"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Odznačit vše"
 
@@ -3095,7 +3096,7 @@ msgstr "Vybrat transakce podle metody platby"
 msgid "Select methods of payment to include: "
 msgstr "Označte metody platby které budou zahrnuty: "
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3422,11 +3423,11 @@ msgstr "od %s %d"
 msgid "to %s %d"
 msgstr "do %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr "Exportování účtů Grisbi"
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3440,20 +3441,39 @@ msgstr ""
 "Protože QIF ani CSV nepodporují více měn, budou všechny transakce "
 "přepočítány na měnu příslušného účtu."
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Vyberte účty pro export"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Jméno účtu"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Vyberte účty pro export"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+msgid "QIF format"
+msgstr "Formát QIF"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr "Formát CSV"
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 msgid "Export setup terminated"
 msgstr "Nastavení exportu přerušeno"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
@@ -3461,11 +3481,11 @@ msgstr ""
 "Úspěšně jste nastavil(a) export dat z Grisbi.  Klikněte na tlačítko 'Zavřít' "
 "pro zahájení exportu dat."
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 msgid "Accounts to export"
 msgstr "Účty pro export"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
@@ -3473,53 +3493,44 @@ msgstr ""
 "Budou vyexportovány následující účty. Na dalších obrazovkách zvolíte, postup "
 "exportu pro každý z nich."
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 msgid "Export format: "
 msgstr "Formát exportu: "
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-msgid "QIF format"
-msgstr "Formát QIF"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr "Formát CSV"
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Počáteční zůstatek"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "B"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Odstranit účet"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Rozdělení"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Å eky"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "C/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Podkategorie"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Podrozpočet"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Číslo odsouhlasení"
 
@@ -4811,7 +4822,7 @@ msgstr ""
 "Prosím stiskněte tlačítko Předchozí a upravte nastavení,\n"
 "nebo tlačítko Zpět pro zrušení akce."
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
@@ -7702,7 +7713,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Plugin pro šifrování nebyl nalezen."
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../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."
 
@@ -7718,7 +7729,7 @@ msgstr ""
 "%s"
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
@@ -7727,7 +7738,7 @@ msgstr ""
 "Pro otevření tohoto souboru potřebujete verzi Grisbi %s.\n"
 "Vy používáte verzi %s."
 
-#: ../src/gsb_file_load.c:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7740,7 +7751,7 @@ msgstr ""
 "důležitých informací mějte na paměti, že se jedná o již archivované "
 "transakce."
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr "Archiv Grisbi otevřen"
 
diff --git a/po/da.po b/po/da.po
index cf0fd9d..0530e5e 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+0200\n"
 "PO-Revision-Date: 2006-03-25 13:23+0100\n"
 "Last-Translator: Dmitri Popov <dmpop at openoffice.org>\n"
 "Language-Team: \n"
@@ -651,7 +651,7 @@ msgstr "Kategorier"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -681,7 +681,7 @@ msgstr "Vælg regnskabsår"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -888,14 +888,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "Printer"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "Printer"
@@ -912,7 +912,7 @@ msgid "Loan amount: "
 msgstr "Bankkonto:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -964,15 +964,15 @@ msgid "Credits"
 msgstr "Kredit"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr ""
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Eksportér"
 
@@ -981,7 +981,7 @@ msgstr "Eksportér"
 msgid "credit.csv"
 msgstr "Kredit"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr ""
@@ -1104,7 +1104,7 @@ msgstr "Væl betaligsmåde"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1116,7 +1116,7 @@ msgstr "Papir"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1127,7 +1127,7 @@ msgstr "Debit"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1141,7 +1141,7 @@ msgid "Categories : Sub-categories"
 msgstr "Kategorier: Underkategorier"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1153,8 +1153,8 @@ msgstr "Noter"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1234,7 +1234,7 @@ msgid "Select"
 msgstr "Dato"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1305,102 +1305,102 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Balance"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "Slet konto"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "Balancer"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "Lukkede planlagte transaktioner"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "Lukkede planlagte transaktioner"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "Lukkede planlagte transaktioner"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "Opret en planlagt transaktion"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 msgid "Insert the balance of a cash account"
 msgstr ""
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr ""
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 msgid " (budget exceeded)"
 msgstr ""
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 msgid "No data by default"
 msgstr ""
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Ingen kategori"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr ""
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 msgid "Export the array of forecast"
 msgstr ""
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Balance"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2265,7 +2265,7 @@ msgstr "Kategori ialt (%d transaktioner):"
 msgid "General total: "
 msgstr "Generelt:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2294,14 +2294,14 @@ msgstr ""
 msgid "Outgoings"
 msgstr ""
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Valørdato"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2319,13 +2319,13 @@ msgstr ""
 msgid "Cheque"
 msgstr "Check"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr ""
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2480,7 +2480,7 @@ msgstr ""
 msgid "Generalities"
 msgstr ""
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr ""
@@ -2601,16 +2601,17 @@ msgstr "Opret en planlagt transaktion:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr ""
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr ""
 
@@ -3216,7 +3217,7 @@ msgstr ""
 msgid "Select methods of payment to include: "
 msgstr "Væl betaligsmåde:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3530,11 +3531,11 @@ msgstr ""
 msgid "to %s %d"
 msgstr ""
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3543,89 +3544,99 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr ""
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Opret en planlagt transaktion"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+#, fuzzy
+msgid "QIF format"
+msgstr "Information"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 #, fuzzy
 msgid "Export setup terminated"
 msgstr "Eksportér kategorier"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 #, fuzzy
 msgid "Accounts to export"
 msgstr "Kontoejer"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "Eksportér:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-#, fuzzy
-msgid "QIF format"
-msgstr "Information"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr ""
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr ""
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Slet konto"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr ""
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 #, fuzzy
 msgid "Cheques"
 msgstr "Check"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr ""
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 #, fuzzy
 msgid "Sub-categories"
 msgstr "Kategorier"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 #, fuzzy
 msgid "Sub-budgetary lines"
 msgstr "Budgetlinje"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 #, fuzzy
 msgid "Reconciliation number"
 msgstr "Transaktionsnummer"
@@ -4842,7 +4853,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -7628,7 +7639,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Konto %s blev ikke fundet.\n"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 #, fuzzy
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr "Denne fil er ikke en Grisbi-rapport"
@@ -7642,14 +7653,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
 "You are using version %s."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7657,7 +7668,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 8b71a8f..1c022c3 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+0200\n"
 "PO-Revision-Date: 2011-02-20 23:28+0100\n"
 "Last-Translator: Martin Stromberger <mstromberger at aon.at>\n"
 "Language-Team: deutsch <de at li.org>\n"
@@ -606,7 +606,7 @@ msgstr "Kategorien"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -636,7 +636,7 @@ msgstr "Geschäftsjahr oder Zeitspanne von 12 Monaten"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -833,13 +833,13 @@ msgstr "Tilgungen geplant vom Anfang anzeigen"
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 msgid "Print the array"
 msgstr "Auflistung Drucken"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 msgid "Export the array"
 msgstr "Auflistung Exportieren"
 
@@ -854,7 +854,7 @@ msgid "Loan amount: "
 msgstr "Kredit Betrag: "
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -901,15 +901,15 @@ msgid "Credits"
 msgstr "Einnahmen"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Drucken"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Export"
 
@@ -917,7 +917,7 @@ msgstr "Export"
 msgid "credit.csv"
 msgstr "credit.csv"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Datei kann nicht gespeichert werden."
@@ -1035,7 +1035,7 @@ msgstr "Zahlungsweise auswählen"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1046,7 +1046,7 @@ msgstr "Empfänger"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1057,7 +1057,7 @@ msgstr "Ausgaben"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1071,7 +1071,7 @@ msgid "Categories : Sub-categories"
 msgstr "Kategorien : Unterkategorien"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1083,8 +1083,8 @@ msgstr "Notizen"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1159,7 +1159,7 @@ msgid "Select"
 msgstr "Auswählen"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1227,96 +1227,96 @@ msgstr ""
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Saldo"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "Umbuchung: %s <-> %s"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr "Vom Saldo abziehen"
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 msgid "Adding to the balance"
 msgstr "Zum Saldo hinzufügen"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr "Zeile einfügen"
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 msgid "Delete selection"
 msgstr "Auswahl löschen"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 msgid "Change selection"
 msgstr "Auswahl ändern"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 msgid "Delete all occurences of the selection"
 msgstr "Ein oder alle Vorkommen von der Auswahl löschen"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 msgid "Convert selection to scheduled transaction"
 msgstr "Buchung regelmäßig ausführen"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 msgid "Insert the balance of a cash account"
 msgstr "Den Saldo von einem Bargeldkonto eingeben"
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr "Daten zurücksetzen"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr " (weiterhin verfügbar)"
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 msgid " (budget exceeded)"
 msgstr " (Budget überschritten)"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr " (noch nicht verfügbar)"
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 msgid "No data by default"
 msgstr "Keine Daten per Voreinstellung"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Keine Kategorie"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Kein Budgeteintrag"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 msgid "Export the array of forecast"
 msgstr "Prognose exportieren - Grisbi"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 msgid "Balance at "
 msgstr "Bilanz am "
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr "forecast.csv"
 
@@ -2189,7 +2189,7 @@ msgstr "Gesamtsumme (%d Buchungen): "
 msgid "General total: "
 msgstr "Gesamtsumme: "
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2217,14 +2217,14 @@ msgstr "Einnahmen"
 msgid "Outgoings"
 msgstr "Ausgaben"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Buchungsdatum"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2242,13 +2242,13 @@ msgstr "Zahlungsweisen"
 msgid "Cheque"
 msgstr "Scheck"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Beleg"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2398,7 +2398,7 @@ msgstr "Daten Anzeige"
 msgid "Generalities"
 msgstr "Allgemein"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Buchungen"
@@ -2524,16 +2524,17 @@ msgstr "Konten für den Bericht auswählen: "
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Alle auswählen"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Alle abwählen"
 
@@ -3103,7 +3104,7 @@ msgstr "Buchungen nach Zahlungsweisen auswählen"
 msgid "Select methods of payment to include: "
 msgstr "Zahlungsweisen für den Bericht auswählen: "
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3436,11 +3437,11 @@ msgstr "von %s %d"
 msgid "to %s %d"
 msgstr "nach %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr "Konten exportieren"
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3454,20 +3455,39 @@ msgstr ""
 "Qif oder Csv Dateien unterstützen keine Währungen, alle Buchungen werden in "
 "die Währung des dazugehörigen Kontos konvertiert."
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Die Konten für den Export auswählen"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Kontoname"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Die Konten für den Export auswählen"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+msgid "QIF format"
+msgstr "Qif Format (*.qif)"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr "Csv Format (*.csv)"
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 msgid "Export setup terminated"
 msgstr "Einstellungen für Export festgelegt"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
@@ -3475,11 +3495,11 @@ msgstr ""
 "Die Einstellungen für den Export sind festgelegt.\n"
 "Bitte 'Schließen' auswählen um die Daten zu exportieren."
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 msgid "Accounts to export"
 msgstr "Konten für Export"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
@@ -3487,53 +3507,44 @@ msgstr ""
 "Die aufgelisteten Konten werden exportiert.\n"
 "In den nächsten Dialogen können Sie Detaileinstellungen vornehmen."
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 msgid "Export format: "
 msgstr "Export Format: "
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-msgid "QIF format"
-msgstr "Qif Format (*.qif)"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr "Csv Format (*.csv)"
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Saldo Anfang"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "B"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Gelöschtes Konto"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Splitten"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Schecks"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "V/A"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Unterkategorien"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Teil-Budgeteinträge"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Abstimmung Nr."
 
@@ -4841,7 +4852,7 @@ msgstr ""
 "Mit 'Zurück' kann der Vorgang wiederholt werden, mit 'Abbrechen' wird der "
 "Vorgang beendet."
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d von %d)"
@@ -7774,7 +7785,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Das Modul für die Verschlüsselung kann nicht gefunden werden."
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../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."
 
@@ -7790,7 +7801,7 @@ msgstr ""
 "%s"
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
@@ -7799,7 +7810,7 @@ msgstr ""
 "Grisbi mit Version %s ist zum Öffnen der Datei notwendig.\n"
 "Sie verwenden Version %s."
 
-#: ../src/gsb_file_load.c:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7810,7 +7821,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:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr "Grisbi Archiv geöffnet"
 
diff --git a/po/el.po b/po/el.po
index 46eb5f7..28d9c8d 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+0200\n"
 "PO-Revision-Date: 2009-04-13 14:53+0200\n"
 "Last-Translator: \n"
 "Language-Team: KASKAS <ttnfy17 at yahoo.gr>\n"
@@ -657,7 +657,7 @@ msgstr "Κατηγορίες"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -687,7 +687,7 @@ msgstr "Επιλέξτε το οικονομικό έτος"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -894,14 +894,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "Εκτυπωτής"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "Εκτυπωτής"
@@ -918,7 +918,7 @@ msgid "Loan amount: "
 msgstr "Φόρτωση λογαριασμών:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -970,15 +970,15 @@ msgid "Credits"
 msgstr "Πίστωση"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Εξαγωγή"
 
@@ -987,7 +987,7 @@ msgstr "Εξαγωγή"
 msgid "credit.csv"
 msgstr "Πίστωση"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Αδύνατη η αποθήκευση αρχείου"
@@ -1107,7 +1107,7 @@ msgstr "Επιλέξτε τη μέθοδο πληρωμής"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1118,7 +1118,7 @@ msgstr "Δικαιούχος πληρωμής"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1129,7 +1129,7 @@ msgstr "Χρέωση"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1143,7 +1143,7 @@ msgid "Categories : Sub-categories"
 msgstr "Κατηγορίες :Υποκατηγορίες"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1155,8 +1155,8 @@ msgstr "Σημειώσεις"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1236,7 +1236,7 @@ msgid "Select"
 msgstr "Επιλέξτε"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1307,107 +1307,107 @@ msgstr ""
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Ισορροπία"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "Μεταφορά σε έναν διαγραμμένο λογαριασμό."
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "Αρχική ισορροπία"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "Επιλογή ημερομηνίας"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "Επιλογή ημερομηνίας"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "Διαγράψτε την επιλεγμένη σχεδιασμένη συναλλαγή"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "Μετατρέψτε τη συναλλαγή στη σχεδιασμένη συναλλαγή"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 #, fuzzy
 msgid "Insert the balance of a cash account"
 msgstr "Αδύνατη η εκροή της μεταφοράς σε έναν κλειστό λογαριασμό"
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr ""
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 #, fuzzy
 msgid " (still available)"
 msgstr "Καμία περιγραφή διαθέσιμη"
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 #, fuzzy
 msgid " (budget exceeded)"
 msgstr "Δεν καθορίζεται κανένας προϋπολογισμός."
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 #, fuzzy
 msgid "No data by default"
 msgstr "Πίσω στην προεπιλογή"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Καμία κατηγορία"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Καμία δημοσιονομική γραμμή"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "Εξάγετε τις δημοσιονομικές γραμμές"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Ισορροπία"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2308,7 +2308,7 @@ msgstr "Γενικό σύνολο (%d συναλλαγές):"
 msgid "General total: "
 msgstr "Γενικό σύνολο:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2336,14 +2336,14 @@ msgstr "Εισοδήματα"
 msgid "Outgoings"
 msgstr "έξοδα"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Τοκοφόρος ημερομηνία"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2361,13 +2361,13 @@ msgstr "Μέθοδοι πληρωμής"
 msgid "Cheque"
 msgstr "Επιταγή"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Απόδειξη"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2517,7 +2517,7 @@ msgstr "Επίδειξη στοιχείων"
 msgid "Generalities"
 msgstr "Γενικότητες"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Συναλλαγές"
@@ -2649,16 +2649,17 @@ msgstr "Επιλέξτε τους λογαριασμούς που περιλαμ
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Επιλογή όλων"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Αποεπιλογή όλων"
 
@@ -3251,7 +3252,7 @@ msgstr "Επιλέξτε τις συναλλαγές με τη μέθοδο πλ
 msgid "Select methods of payment to include: "
 msgstr "Επιλέξτε τις μεθόδους πληρωμής που θα περιλάβετε:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3586,11 +3587,11 @@ msgstr "από %s %d"
 msgid "to %s %d"
 msgstr "από %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr "Εξαγωγή λογαριασμών του Grisbi"
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3604,20 +3605,39 @@ msgstr ""
 "Δεδομένου ότι τα QIF και CSV δεν υποστηρίζουν τα νομίσματα, όλες οι "
 "συναλλαγές θα μετατραπούν στο νόμισμα του αντίστοιχου λογαριασμού τους."
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Επιλέξτε τους λογαριασμούς για να εξαγάγετε"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Όνομα λογαριασμού"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Επιλέξτε τους λογαριασμούς για να εξαγάγετε"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+msgid "QIF format"
+msgstr "Μορφή QIF"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr "Μορφή CSV"
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 msgid "Export setup terminated"
 msgstr "Η διαδικασία εξαγωγής τερματίζεται"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
@@ -3625,11 +3645,11 @@ msgstr ""
 "Έχετε επιτυχώς  εξαγάγει τα  στοιχεία οργάνωσης στο Grisbi.  Πιέστε το "
 "'Κλείσιμο' για να εξαγάγετε πραγματικά τα στοιχεία."
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 msgid "Accounts to export"
 msgstr "Λογαριασμοί προς εξαγωγή"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
@@ -3637,54 +3657,45 @@ msgstr ""
 "Οι ακόλουθοι λογαριασμοί πρόκειται να εξαχθούν. Στις επόμενες οθόνες, θα "
 "επιλέξετε τι θα κάνετε με κάθε έναν από αυτούς."
 
-#: ../src/ ξετε τι θα κάνετε με κάθε έναν από αυτούς."   Στις επόμενες οθόνες, θα "      p/¶áÿ  uÊêÿŠ+  €êëÿŠ+  å ‹+                          ’Ø‹+  p/¶áÿ  €ð)‹+          `$¶áÿ         0#¶áÿ  kàêÿŠ+  6                    è     è!     è!      /¶áÿ  p/¶áÿ  x”‹+          `%¶áÿ          ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ  `ÂêÿŠ+  ?/¶áÿ         Àk‹+  uÊêÿŠ+   €k‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          x”‹+          `%¶áÿ          0$¶áÿ  kàêÿŠ+  à!     à!      /¶áÿ  p/¶áÿ  H^ç ‹+          @&¶áÿ         ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ  `ÂêÿŠ+  ?/¶áÿ  0/¶áÿ  (/¶áÿ  8ë ‹+  Œp˜        p/¶áÿ  uÊêÿŠ+  €êëÿŠ+                  @&¶áÿ         %¶áÿ  kàêÿŠ+          G       H   I       J   K           M   N   O       P    /¶áÿ  p/¶áÿ  H¾ ‹+          à'¶áÿ         ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ         0k‹+  uÊêÿŠ+    ‹+   I› ‹+   €k‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          H¾ ‹+          à'¶áÿ 
          &¶áÿ  kàêÿŠ+  8¾ ‹+          à'¶áÿ         P&¶áÿ  kàêÿŠ+  (¾ ‹+          à'¶áÿ         €&¶áÿ  kàêÿŠ+  ¾ ‹+          à'¶áÿ         °&¶áÿ  kàêÿŠ+  	       ¨Žk‹+  uÊêÿŠ+         ¨‰k‹+  0!¶áÿ          Š˜› ‹+  eÉêÿŠ+         ؄k‹+  P'¶áÿ          y˜› ‹+  eÉêÿŠ+          €k‹+  €'¶áÿ          Z˜› ‹+  eÉêÿŠ+  ØD› ‹+    ‹+   I› ‹+   €k‹+  ؤ‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          8ë ‹+                        
g ‹+  p/¶áÿ  pۚ ‹+          0)¶áÿ           (¶áÿ  kàêÿŠ+      5   6   7   8   :   <   =   >       ?       @   B   D        /¶áÿ  p/¶áÿ  à
d ‹+                 p/¶áÿ  uÊêÿŠ+         å ‹+  °'¶áÿ          
g ‹+  eÉêÿŠ+  å ‹+          Õ_ at fÆS         Qöl±íÁ#3 ‹+  p/¶áÿ  à
d ‹+          @*¶áÿ         )¶áÿ  kàêÿŠ+  u]ÞÓ	4Q ÷U^Qʉ§ ¶uª¹ñìò*ēv /¶áÿ  p/¶áÿ  H^0 ‹+          ¤l ‹+          °0¶áÿ  ¦°Î‹+  ¦°Î‹+         öi ‹+  ?/¶áÿ  p0¶áÿ  (/¶áÿ  +¶áÿ  ¯‹+  uÊêÿŠ+  ؤ‹+  ð1¶áÿ  ¢°Î‹+  À0¶áÿ          P,¶áÿ                 ÿÿÿÿÿÿÿÿ¢°Î‹+          x/¶áÿ                 export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "Μορφή εξαγωγής:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-msgid "QIF format"
-msgstr "Μορφή QIF"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr "Μορφή CSV"
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Αρχική ισορροπία"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "B"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Διαγραμμένος λογαριασμός"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Διάσπαση"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Επιταγές"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "C/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Υποκατηγορίες"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Υπο--δημοσιονομικές γραμμές"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Αριθμός συμφωνίας"
 
@@ -5037,7 +5048,7 @@ msgstr ""
 "Παρακαλώ πιέστε 'Προηγούμενο'  για να διορθώσετε το πρόβλημα,\n"
 "ή 'Kλείσιμο' για να ακυρώσετε τη λειτουργία."
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d από %d)"
@@ -8033,7 +8044,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Το plugin της κρυπτογράφησης δεν βρέθηκε."
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr "Αυτό δεν είναι ένα αρχείο Grisbi… Η φόρτωση αναβάλλεται."
 
@@ -8049,7 +8060,7 @@ msgstr ""
 "%s"
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
@@ -8058,7 +8069,7 @@ msgstr ""
 "Η έκδοση Grisbi %s απαιτείται για να ανοίξει αυτό το αρχείο.\n"
 "Eσείς χρησιμοποιείται την έκδοση %s."
 
-#: ../src/gsb_file_load.c:8901
+#: ../src/gsb_file_load.c:8915
 #, fuzzy
 msgid ""
 "You have opened an archive.\n"
@@ -8071,7 +8082,7 @@ msgstr ""
 "θέλετε και σώζετε αργότερα (νέες εκθέσεις…) αλλά θυμηθείτε ότι είναι ένα "
 "αρχείο πριν τροποποιηθούν  μερικές συναλλαγές ή σημαντικές πληροφορίες."
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr "Αρχείο Grisbi που ανοίγουν"
 
diff --git a/po/eo.po b/po/eo.po
index f6277bb..a853d30 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+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"
@@ -593,7 +593,7 @@ msgstr ""
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -621,7 +621,7 @@ msgstr ""
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -810,13 +810,13 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 msgid "Print the array"
 msgstr ""
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 msgid "Export the array"
 msgstr ""
 
@@ -831,7 +831,7 @@ msgid "Loan amount: "
 msgstr ""
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -878,15 +878,15 @@ msgid "Credits"
 msgstr ""
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr ""
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr ""
 
@@ -894,7 +894,7 @@ msgstr ""
 msgid "credit.csv"
 msgstr ""
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr ""
@@ -1012,7 +1012,7 @@ msgstr ""
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1023,7 +1023,7 @@ msgstr ""
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1034,7 +1034,7 @@ msgstr ""
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1048,7 +1048,7 @@ msgid "Categories : Sub-categories"
 msgstr ""
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1060,8 +1060,8 @@ msgstr ""
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1134,7 +1134,7 @@ msgid "Select"
 msgstr ""
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1201,96 +1201,96 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr ""
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr ""
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 msgid "Adding to the balance"
 msgstr ""
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 msgid "Delete selection"
 msgstr ""
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 msgid "Change selection"
 msgstr ""
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 msgid "Delete all occurences of the selection"
 msgstr ""
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 msgid "Convert selection to scheduled transaction"
 msgstr ""
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 msgid "Insert the balance of a cash account"
 msgstr ""
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr ""
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 msgid " (budget exceeded)"
 msgstr ""
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 msgid "No data by default"
 msgstr ""
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr ""
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr ""
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 msgid "Export the array of forecast"
 msgstr ""
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 msgid "Balance at "
 msgstr ""
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2102,7 +2102,7 @@ msgstr ""
 msgid "General total: "
 msgstr ""
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2130,14 +2130,14 @@ msgstr ""
 msgid "Outgoings"
 msgstr ""
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr ""
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2155,13 +2155,13 @@ msgstr ""
 msgid "Cheque"
 msgstr ""
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr ""
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2311,7 +2311,7 @@ msgstr ""
 msgid "Generalities"
 msgstr ""
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr ""
@@ -2427,16 +2427,17 @@ msgstr ""
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr ""
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr ""
 
@@ -3002,7 +3003,7 @@ msgstr ""
 msgid "Select methods of payment to include: "
 msgstr ""
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3310,11 +3311,11 @@ msgstr ""
 msgid "to %s %d"
 msgstr ""
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3323,82 +3324,91 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr ""
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr ""
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+msgid "Select options to export"
+msgstr ""
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+msgid "QIF format"
+msgstr ""
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 msgid "Export setup terminated"
 msgstr ""
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 msgid "Accounts to export"
 msgstr ""
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 msgid "Export format: "
 msgstr ""
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-msgid "QIF format"
-msgstr ""
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr ""
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr ""
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr ""
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr ""
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr ""
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr ""
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr ""
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr ""
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr ""
 
@@ -4559,7 +4569,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -7256,7 +7266,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr ""
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr ""
 
@@ -7269,14 +7279,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
 "You are using version %s."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7284,7 +7294,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 382bd98..fc4fb01 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+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"
@@ -616,7 +616,7 @@ msgstr "Categorías"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -646,7 +646,7 @@ msgstr "Elija el año financiero o 12 meses naturales"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -851,14 +851,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "Impresora"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "Impresora"
@@ -875,7 +875,7 @@ msgid "Loan amount: "
 msgstr "Cargando cuentas: "
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -927,15 +927,15 @@ msgid "Credits"
 msgstr "Crédito"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Exportar"
 
@@ -944,7 +944,7 @@ msgstr "Exportar"
 msgid "credit.csv"
 msgstr "Crédito"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "No puedo guardar el archivo."
@@ -1064,7 +1064,7 @@ msgstr "Elegir el método de pago"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1075,7 +1075,7 @@ msgstr "Tercero"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1086,7 +1086,7 @@ msgstr "Débito"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1100,7 +1100,7 @@ msgid "Categories : Sub-categories"
 msgstr "Categorías: Subcategorías"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1112,8 +1112,8 @@ msgstr "Anotaciones"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1190,7 +1190,7 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1259,15 +1259,15 @@ msgstr "Marque la casilla para cambiar automáticamente la fecha de comienzo"
 msgid "Description"
 msgstr "Descripción"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Balance"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, c-format
 msgid ""
 "Transfer between account: %s\n"
@@ -1276,83 +1276,83 @@ msgstr ""
 "Transferencia entre la cuenta: %s\n"
 "y la cuenta: %s"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr "Restar al total"
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 msgid "Adding to the balance"
 msgstr "Añadiendo al balance"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr "Insertar una Fila"
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 msgid "Delete selection"
 msgstr "Borrar selección"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 msgid "Change selection"
 msgstr "Cambiar selección"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 msgid "Delete all occurences of the selection"
 msgstr "Borrar todas las ocurrencias de la selección"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 msgid "Convert selection to scheduled transaction"
 msgstr "Convertir la selección en un transacción programada"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 msgid "Insert the balance of a cash account"
 msgstr "Inserte el balance de una cuenta de efectivo"
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr "Reiniciar datos"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr "(aun disponible)"
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 msgid " (budget exceeded)"
 msgstr "(presupuesto excedido)"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr "(sí a recibir)"
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 msgid "No data by default"
 msgstr "Sin valores por defecto"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Sin categoría"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Sin línea presupuestaria"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "Exportar las líneas presupuestarias"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Balance "
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 #, fuzzy
 msgid "forecast.csv"
 msgstr "Predicción"
@@ -2239,7 +2239,7 @@ msgstr "Total general (%d transacciones): "
 msgid "General total: "
 msgstr "Total general: "
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2267,14 +2267,14 @@ msgstr "Ingresos"
 msgid "Outgoings"
 msgstr "Salidas"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Fecha Valor"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2292,13 +2292,13 @@ msgstr "Formas de pago"
 msgid "Cheque"
 msgstr "Cheque"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Comprobante"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2448,7 +2448,7 @@ msgstr "Forma de mostar los datos"
 msgid "Generalities"
 msgstr "Generalidades"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Transacciones"
@@ -2575,16 +2575,17 @@ msgstr "Seleccionar las cuentas incluidas en el informe:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Seleccionar todo"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Deseleccionar todo"
 
@@ -3159,7 +3160,7 @@ msgstr "Seleccionar las transacciones por la forma de pago"
 msgid "Select methods of payment to include: "
 msgstr "Seleccionar las formas de pago a incluir: "
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3491,11 +3492,11 @@ msgstr "desde %s %d"
 msgid "to %s %d"
 msgstr "hasta %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr "Exportando las cuentas de Grisbi"
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3509,20 +3510,39 @@ msgstr ""
 "Como ni QIF ni CSV soportan tipos de moneda, todas las transacciones serán "
 "convertidas en las monedas de sus respectivas cuentas."
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Seleccionar las cuentas para exportar"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Nombre de la cuenta"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Seleccionar las cuentas para exportar"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+msgid "QIF format"
+msgstr "Formato QIF"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr "Formato CSV"
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 msgid "Export setup terminated"
 msgstr "Exportación de la configuración finalizada"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
@@ -3530,11 +3550,11 @@ msgstr ""
 "Ha configurado con éxito la exportación de datos en Grisbi.  Pulse el botón "
 "'Cerrar' para exportar los datos."
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 msgid "Accounts to export"
 msgstr "Cuentas para exportar"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
@@ -3542,54 +3562,45 @@ msgstr ""
 "Las siguientes cuentas van a ser exportadas. En las próximas pantallas, "
 "usted elegirá que hacer con cada una de ellas."
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "Exportar formato:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-msgid "QIF format"
-msgstr "Formato QIF"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr "Formato CSV"
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Balance inicial"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "B"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Cuenta borrada"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Anotación"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Cheques"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "C/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Subcategorías"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Líneas subpresupuestarias"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Número reconciliación"
 
@@ -4894,7 +4905,7 @@ msgstr ""
 "Por favor pulse el botón de \"Anterior\" para corregir el problema,\n"
 "o el botón de cierre para cancelar la acción."
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
@@ -7833,7 +7844,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "No se ha"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../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."
 
@@ -7849,7 +7860,7 @@ msgstr ""
 "%s"
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
@@ -7858,7 +7869,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:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7870,7 +7881,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:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr "Archivo de Grisbi abierto"
 
diff --git a/po/fa.po b/po/fa.po
index 74f3152..0b289c6 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+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"
@@ -637,7 +637,7 @@ msgstr ""
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -666,7 +666,7 @@ msgstr ""
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -870,14 +870,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "پرینتر"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "پرینتر"
@@ -894,7 +894,7 @@ msgid "Loan amount: "
 msgstr "حساب بانک:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -946,15 +946,15 @@ msgid "Credits"
 msgstr "ماه جاری"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "پرینت"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "صادر"
 
@@ -963,7 +963,7 @@ msgstr "صادر"
 msgid "credit.csv"
 msgstr "ماه جاری"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "فایل ذخیره نشد."
@@ -1083,7 +1083,7 @@ msgstr ""
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1094,7 +1094,7 @@ msgstr ""
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1105,7 +1105,7 @@ msgstr ""
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1119,7 +1119,7 @@ msgid "Categories : Sub-categories"
 msgstr ""
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1131,8 +1131,8 @@ msgstr ""
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1210,7 +1210,7 @@ msgid "Select"
 msgstr "حذف"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1280,101 +1280,101 @@ msgstr ""
 msgid "Description"
 msgstr "توضیحات"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr ""
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "حساب حذف شده"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "جزئیات بانک"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "توضیحات"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "توضیحات"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "جستجوی تراکنش"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "جستجوی تراکنش"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 msgid "Insert the balance of a cash account"
 msgstr ""
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr ""
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 msgid " (budget exceeded)"
 msgstr ""
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 msgid "No data by default"
 msgstr ""
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr ""
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr ""
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 msgid "Export the array of forecast"
 msgstr ""
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 msgid "Balance at "
 msgstr ""
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2212,7 +2212,7 @@ msgstr "تراکنش:"
 msgid "General total: "
 msgstr "عمومی:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2240,14 +2240,14 @@ msgstr "درآمد ها"
 msgid "Outgoings"
 msgstr ""
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr ""
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2265,13 +2265,13 @@ msgstr ""
 msgid "Cheque"
 msgstr ""
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr ""
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2421,7 +2421,7 @@ msgstr ""
 msgid "Generalities"
 msgstr ""
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr ""
@@ -2542,16 +2542,17 @@ msgstr "جستجوی تراکنش:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr ""
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr ""
 
@@ -3143,7 +3144,7 @@ msgstr ""
 msgid "Select methods of payment to include: "
 msgstr "حذف روش پرداخت:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3457,11 +3458,11 @@ msgstr ""
 msgid "to %s %d"
 msgstr ""
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3470,85 +3471,95 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr ""
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr ""
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "جستجوی تراکنش"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+msgid "QIF format"
+msgstr ""
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 msgid "Export setup terminated"
 msgstr ""
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 #, fuzzy
 msgid "Accounts to export"
 msgstr "نوع حساب"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "صادر:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-msgid "QIF format"
-msgstr ""
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr ""
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr ""
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "حساب حذف شده"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr ""
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr ""
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr ""
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 #, fuzzy
 msgid "Sub-categories"
 msgstr "بخش های درآمد"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr ""
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr ""
 
@@ -4749,7 +4760,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -7523,7 +7534,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr ""
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr ""
 
@@ -7536,14 +7547,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
 "You are using version %s."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7551,7 +7562,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 4335130..41fe29f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+0200\n"
 "PO-Revision-Date: 2011-04-12 22:14+0200\n"
 "Last-Translator: Pierre Biava <pierre at pierre.biava.name>\n"
 "Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
@@ -612,7 +612,7 @@ msgstr "Catégories"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -642,7 +642,7 @@ msgstr "Choix de l'exercice ou 12 mois glissants"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -839,13 +839,13 @@ msgstr "Afficher le tableau d'amortissement depuis le début"
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 msgid "Print the array"
 msgstr "Imprimer le tableau"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 msgid "Export the array"
 msgstr "Exporter le tableau"
 
@@ -860,7 +860,7 @@ msgid "Loan amount: "
 msgstr "Montant emprunté : "
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -907,15 +907,15 @@ msgid "Credits"
 msgstr "Crédits"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Imprimer"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Exporter"
 
@@ -923,7 +923,7 @@ msgstr "Exporter"
 msgid "credit.csv"
 msgstr "crédit.csv"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Impossible d'enregistrer le fichier."
@@ -1043,7 +1043,7 @@ msgstr "Choix du mode de règlement"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1054,7 +1054,7 @@ msgstr "Tiers"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1065,7 +1065,7 @@ msgstr "Débit"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1079,7 +1079,7 @@ msgid "Categories : Sub-categories"
 msgstr "Catégories : Sous-catégories"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1091,8 +1091,8 @@ msgstr "Remarques"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1169,7 +1169,7 @@ msgid "Select"
 msgstr "Sélectionner"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1236,15 +1236,15 @@ msgstr "Cochez la case pour changer automatiquement de date de début"
 msgid "Description"
 msgstr "Description"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Solde"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, c-format
 msgid ""
 "Transfer between account: %s\n"
@@ -1253,81 +1253,81 @@ msgstr ""
 "Virement entre le compte : %s\n"
 "et le compte : %s"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr "Soustraire au solde"
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 msgid "Adding to the balance"
 msgstr "Ajouter au solde"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr "Insérer une ligne"
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 msgid "Delete selection"
 msgstr "Supprimer la ligne"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 msgid "Change selection"
 msgstr "Modifier la ligne"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 msgid "Delete all occurences of the selection"
 msgstr "Supprimer toutes les occurences de la ligne"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 msgid "Convert selection to scheduled transaction"
 msgstr "Convertir la ligne en opération planifiée"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 msgid "Insert the balance of a cash account"
 msgstr "Insérer le solde d'un compte de caisse"
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr "Réinitialiser les données"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr " (reste à utiliser)"
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 msgid " (budget exceeded)"
 msgstr " (budget dépassé)"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr " (reste à recevoir)"
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 msgid "No data by default"
 msgstr "Pas de donnée disponible par défaut"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Pas de catégorie"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Pas d'imputation budgétaire"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 msgid "Export the array of forecast"
 msgstr "Exporter les prévisions"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 msgid "Balance at "
 msgstr "Solde au "
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr "prévisions.csv"
 
@@ -2206,7 +2206,7 @@ msgstr "Total général (%d opérations) : "
 msgid "General total: "
 msgstr "Total général : "
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2234,14 +2234,14 @@ msgstr "Revenus"
 msgid "Outgoings"
 msgstr "Dépenses"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Date de valeur"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2259,13 +2259,13 @@ msgstr "Modes de règlement"
 msgid "Cheque"
 msgstr "Chèque"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Pièce comptable"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2415,7 +2415,7 @@ msgstr "Affichage des données"
 msgid "Generalities"
 msgstr "Généralités"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Opérations"
@@ -2542,16 +2542,17 @@ msgstr "Sélectionner les comptes à inclure dans l'état : "
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Sélectionner tout"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Désélectionner tout"
 
@@ -3123,7 +3124,7 @@ msgstr "Sélectionner les opérations en fonction des modes de règlement"
 msgid "Select methods of payment to include: "
 msgstr "Sélectionner les modes de règlement à inclure dans l'état : "
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3461,11 +3462,11 @@ msgstr "de %s %d"
 msgid "to %s %d"
 msgstr "à %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr "Export des comptes"
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3478,20 +3479,39 @@ msgstr ""
 "devises, toutes les opérations seront converties dans la devise de leur "
 "compte respectif."
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Sélectionner les comptes à exporter"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+
+msgid "Select options to export"
+msgstr "Sélectionner les options pour l'export"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+msgid "QIF format"
+msgstr "Format QIF"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr "Format CSV"
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr "Traiter tous les fichiers comme le premier"
+
+#: ../src/export.c:324
 msgid "Export setup terminated"
 msgstr "Assistant d'export terminé"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
@@ -3499,11 +3519,11 @@ msgstr ""
 "Vous avez configuré l'export de données de Grisbi avec succès.  Appuyez sur "
 "le bouton « Fermer » pour effectivement exporter ces données."
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 msgid "Accounts to export"
 msgstr "Comptes à exporter"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
@@ -3511,53 +3531,44 @@ msgstr ""
 "Les comptes suivants vont être exportés.  Dans les écrans suivants, vous "
 "pourrez choisir ce qu'il faut faire de chacun d'entre eux."
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 msgid "Export format: "
 msgstr "Fomat d'exporter : "
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-msgid "QIF format"
-msgstr "Format QIF"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr "Format CSV"
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Solde initial"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "V"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgi /src/export_csv.c:736 ../src/gsb_form.c:1913  _export.c:307  ants, vous "  "   règlement"  zo"  ικές πληροφορίες."       p/¶áÿ  uÊêÿŠ+  €êëÿŠ+  å ‹+                          ’Ø‹+  p/¶áÿ  €ð)‹+          `$¶áÿ         0#¶áÿ  kàêÿŠ+  6                    è     è!     è!      /¶áÿ  p/¶áÿ  x”‹+          `%¶áÿ          ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ  `ÂêÿŠ+  ?/¶áÿ         Àk‹+  uÊêÿŠ+   €k‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          x”‹+          `%¶áÿ          0$¶áÿ  kàêÿŠ+  à!     à!      /¶áÿ  p/¶áÿ  H^ç ‹+          @&¶áÿ         ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ  `ÂêÿŠ+  ?/¶áÿ  0/¶áÿ  (/¶áÿ  8ë ‹+  Œp˜        p/¶áÿ  uÊêÿŠ+  €êëÿŠ+                  @&¶áÿ         %¶áÿ  kàêÿŠ+          G       H   I       J   K           M   N   O       P    /¶áÿ  p/¶áÿ  H¾ ‹+          à'¶áÿ         ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ         0k‹+  uÊêÿŠ+    ‹+   I› ‹+   €k‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          H¾ ‹+          à'¶áÿ 
          &¶áÿ  kàêÿŠ+  8¾ ‹+          à'¶áÿ         P&¶áÿ  kàêÿŠ+  (¾ ‹+          à'¶áÿ         €&¶áÿ  kàêÿŠ+  ¾ ‹+          à'¶áÿ         °&¶áÿ  kàêÿŠ+  	       ¨Žk‹+  uÊêÿŠ+         ¨‰k‹+  0!¶áÿ          Š˜› ‹+  eÉêÿŠ+         ؄k‹+  P'¶áÿ          y˜› ‹+  eÉêÿŠ+          €k‹+  €'¶áÿ          Z˜› ‹+  eÉêÿŠ+  ØD› ‹+    ‹+   I› ‹+   €k‹+  ؤ‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          8ë ‹+                        
g ‹+  p/¶áÿ  pۚ ‹+          0)¶áÿ           (¶áÿ  kàêÿŠ+      5   6   7   8   :   <   =   >       ?       @   B   D        /¶áÿ  p/¶áÿ  à
d ‹+                 p/¶áÿ  uÊêÿŠ+         å ‹+  °'¶áÿ          
g ‹+  eÉêÿŠ+  å ‹+          Õ_ at fÆS         Qöl±íÁ#3 ‹+  p/¶áÿ  à
d ‹+          @*¶áÿ         )¶áÿ  kàêÿŠ+  u]ÞÓ	4Q ÷U^Qʉ§ ¶uª¹ñìò*ēv /¶áÿ  p/¶áÿ  H^0 ‹+          ¤l ‹+          °0¶áÿ  ¦°Î‹+  ¦°Î‹+         öi ‹+  ?/¶áÿ  p0¶áÿ  (/¶áÿ  +¶áÿ  ¯‹+  uÊêÿŠ+  ؤ‹+  ð1¶áÿ  ¢°Î‹+  À0¶áÿ          P,¶áÿ                 ÿÿÿÿÿÿÿÿ¢°Î‹+          x/¶áÿ                 d "Deleted account"
 msgstr "Compte supprimé"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Ventilation"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Chèques"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "P/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Sous-catégories"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Sous-imputations budgétaires"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "N° de rapprochement"
 
@@ -4860,7 +4871,7 @@ msgstr ""
 "Veuillez cliquer sur le bouton 'Précédent' pour corriger le problème,\n"
 "ou sur 'Fermer' pour annuler l'action."
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
@@ -7479,33 +7490,32 @@ msgstr ""
 #, c-format
 msgid "Transaction %d has category %d but invalid sub-category %d.\n"
 msgstr ""
-"La sous-catégorie %d de la catégorie %d de la transaction %d est invalide.\n"
+"L'opération %d a la catégorie %d et la sous-catégorie %d qui est invalide.\n"
 
 #. category not found
 #: ../src/gsb_debug.c:623
 #, c-format
 msgid "Transaction %d has invalid category %d.\n"
-msgstr "La catégorie %d de la transaction %d est invalide.\n"
+msgstr "L'opération %d a la catégorie %d qui est invalide.\n"
 
 #. sub-budget not found
 #: ../src/gsb_debug.c:713
 #, c-format
 msgid "Transaction %d has budget %d but invalid sub-budget %d.\n"
 msgstr ""
-"La sous-imputation budgétaire %d de l'imputation budgétaire %d de la "
-"transaction %d est invalide.\n"
+"L'opération %d a l'imputation budgétaire %d et la sous-imputation %d qui est invalide.\n"
 
 #. budget not found
 #: ../src/gsb_debug.c:727
 #, c-format
 msgid "Transaction %d has invalid budget %d.\n"
-msgstr "L'imputation budgétaire %d de la transaction %d est invalide\n"
+msgstr "L'opération %d a l'imputation budgétaire %d qui est invalide\n"
 
 #. payee not found
 #: ../src/gsb_debug.c:812
 #, c-format
 msgid "Transaction %d has invalid payee %d.\n"
-msgstr "Le tiers %d de la transaction %d est invalide.\n"
+msgstr "L'opération %d a le tiers %d qui est invalide.\n"
 
 #. Create main widget.
 #: ../src/gsb_file.c:179
@@ -7790,7 +7800,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Plugin de cryptage non trouvé"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../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"
 
@@ -7806,7 +7816,7 @@ msgstr ""
 "%s"
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
@@ -7815,7 +7825,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:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7828,7 +7838,7 @@ msgstr ""
 "c'est une archive avant de modifier certaines transactions ou informations "
 "importantes."
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr "Archive grisbi ouverte"
 
diff --git a/po/he.po b/po/he.po
index 4e161de..59eff07 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+0200\n"
 "PO-Revision-Date: 2006-02-11 16:08+0200\n"
 "Last-Translator: dotan\n"
 "Language-Team: <en at li.org>\n"
@@ -940,7 +940,7 @@ msgstr "קטגוריות"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -970,7 +970,7 @@ msgstr "בחירת שנת הכספים"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -1178,14 +1178,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "מדפסת"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "מדפסת"
@@ -1202,7 +1202,7 @@ msgid "Loan amount: "
 msgstr "טעינת קובץ חשבונות:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -1254,15 +1254,15 @@ msgid "Credits"
 msgstr "זכות"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "הדפסה"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "ייצוא"
 
@@ -1271,7 +1271,7 @@ msgstr "ייצוא"
 msgid "credit.csv"
 msgstr "זכות"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "לא ניתן לשמור את הקובץ."
@@ -1395,7 +1395,7 @@ msgstr "בחירת דרך התשלום"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1407,7 +1407,7 @@ msgstr "משלם/מקבל"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1418,7 +1418,7 @@ msgstr "חיוב"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1432,7 +1432,7 @@ msgid "Categories : Sub-categories"
 msgstr "קטגוריות : תתי-קטגוריות"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1444,8 +1444,8 @@ msgstr "הערות"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1526,7 +1526,7 @@ msgid "Select"
 msgstr "לסמן הכל"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1597,107 +1597,107 @@ msgstr ""
 msgid "Description"
 msgstr "תיאור"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "מאזן"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "העברה לחשבון שנמחק"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "יתרת פתיחה"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "בחירת מידע"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "בחירת מידע"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "מחיקת עיסקה מתוכננת"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "המרת העיסקה לעיסקה מתוזמנת"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 #, fuzzy
 msgid "Insert the balance of a cash account"
 msgstr "לא ניתן לבצע העברה בחשבון סגור."
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 #, fuzzy
 msgid "Reset data"
 msgstr "תאריך אחרון"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 #, fuzzy
 msgid " (budget exceeded)"
 msgstr "אין קו תקציב"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 #, fuzzy
 msgid "No data by default"
 msgstr "חזרה אל הגדרות ברירת המחדל"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "אין קטגוריה"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "ללא קו תקציב"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "ייצוא קווי התקציב"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "מאזן"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2588,7 +2588,7 @@ msgstr "סך הכל הכללי (%d עיסקאות):"
 msgid "General total: "
 msgstr "סך הכל הכללי:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2617,14 +2617,14 @@ msgstr "הכנסות"
 msgid "Outgoings"
 msgstr "הוצאות"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "ערך תאריך"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2642,13 +2642,13 @@ msgstr "דרכי תשלום"
 msgid "Cheque"
 msgstr "המחאה"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "שובר"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2802,7 +2802,7 @@ msgstr "הצגת מידע"
 msgid "Generalities"
 msgstr "כללי"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "עיסקאות"
@@ -2935,16 +2935,17 @@ msgstr "בחירת החשבונות הכלולים בדו\"ח:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "לסמן הכל"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "לסמן כלום"
 
@@ -3563,7 +3564,7 @@ msgstr "בחירת העיסקאות על פי דרך התשלום"
 msgid "Select methods of payment to include: "
 msgstr "בחירת דרכי התשלום שיש לכלול:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3905,11 +3906,11 @@ msgstr "מ %s %d"
 msgid "to %s %d"
 msgstr "עד %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3918,86 +3919,96 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "בחירת החשבונות לייצוא"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "שם חשבון"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "בחירת החשבונות לייצוא"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+#, fuzzy
+msgid "QIF format"
+msgstr "מידע"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 #, fuzzy
 msgid "Export setup terminated"
 msgstr "ייצוא דו\"ח"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 #, fuzzy
 msgid "Accounts to export"
 msgstr "בחירת החשבונות לייצוא"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "ייצוא דו\"ח:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-#, fuzzy
-msgid "QIF format"
-msgstr "מידע"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "יתרת פתיחה"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr ""
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "מחיקת חשבון"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "שבירה"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "המחאות"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr ""
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "תתי-קטגוריות"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "תתי-קוי תקציב"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "מספר תיאום"
 
@@ -5248,7 +5259,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -8084,7 +8095,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "חשבון %s אינו נמצא.\n"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 #, fuzzy
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr "קובץ זה אינו דו\"ח של גריסבי"
@@ -8098,14 +8109,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, 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:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -8113,7 +8124,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 94f8b70..8fe3605 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+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"
@@ -661,7 +661,7 @@ msgstr "Categorie"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -691,7 +691,7 @@ msgstr "Scegli l'anno finanziario"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -899,14 +899,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "Stampante"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "Stampante"
@@ -923,7 +923,7 @@ msgid "Loan amount: "
 msgstr "Carica un documento di conto:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -975,15 +975,15 @@ msgid "Credits"
 msgstr "Credito"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Stampa"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Esporta"
 
@@ -992,7 +992,7 @@ msgstr "Esporta"
 msgid "credit.csv"
 msgstr "Credito"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Impossibile salvare il file."
@@ -1116,7 +1116,7 @@ msgstr "Scegli il metodo di pagamento"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1128,7 +1128,7 @@ msgstr "Debitore/Creditore"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1139,7 +1139,7 @@ msgstr "Debito"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1153,7 +1153,7 @@ msgid "Categories : Sub-categories"
 msgstr "Categorie : Sottocategorie"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1165,8 +1165,8 @@ msgstr "Note"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1247,7 +1247,7 @@ msgid "Select"
 msgstr "Seleziona tutto"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1318,107 +1318,107 @@ msgstr ""
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Saldo"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "Trasferimento ad un conto eliminato"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "Bilancio iniziale"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "Selezione informazioni"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "Selezione informazioni"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "Inserisci una transazione pianificata"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "Converti la transazione in una transazione schedulata"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 #, fuzzy
 msgid "Insert the balance of a cash account"
 msgstr "Impossible effettuare un trasferimento su un conto chiuso."
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 #, fuzzy
 msgid "Reset data"
 msgstr "Ultima data"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 #, fuzzy
 msgid " (budget exceeded)"
 msgstr "Nessuna linea budget"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 #, fuzzy
 msgid "No data by default"
 msgstr "Ripristina i valori predefiniti"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Nessuna categoria"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Nessuna linea budget"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "Esporta le linee budget"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Saldo"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2309,7 +2309,7 @@ msgstr "Totale generale (%d transazioni):"
 msgid "General total: "
 msgstr "Totale generale:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2339,14 +2339,14 @@ msgstr "Entrate"
 msgid "Outgoings"
 msgstr "Uscite"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Data di valuta"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2364,13 +2364,13 @@ msgstr "Metodi di pagamento"
 msgid "Cheque"
 msgstr "Assegno"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Voucher"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2524,7 +2524,7 @@ msgstr "Visualizzazione informazioni"
 msgid "Generalities"
 msgstr "Generalità"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Transazioni"
@@ -2659,16 +2659,17 @@ msgstr "Seleziona i conti da includere nel rapporto:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Seleziona tutto"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Deseleziona tutto"
 
@@ -3290,7 +3291,7 @@ msgstr "Seleziona le transazioni per metodo di pagamento"
 msgid "Select methods of payment to include: "
 msgstr "Seleziona metodi di pagamento da includere:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3642,11 +3643,11 @@ msgstr "da %s %d"
 msgid "to %s %d"
 msgstr "a %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3655,89 +3656,99 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Seleziona conti da esportare"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Nome conto"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Seleziona conti da esportare"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+#, fuzzy
+msgid "QIF format"
+msgstr "Informazioni"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 #, fuzzy
 msgid "Export setup terminated"
 msgstr "Esporta rapporto."
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 #, fuzzy
 msgid "Accounts to export"
 msgstr "Seleziona conti da esportare"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "Esporta rapporto.:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-#, fuzzy
-msgid "QIF format"
-msgstr "Informazioni"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Bilancio iniziale"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr ""
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Cancella conto"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Ripartizione"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 #, fuzzy
 msgid "Cheques"
 msgstr "Assegno"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "C/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 #, fuzzy
 msgid "Sub-categories"
 msgstr "Totale sotto-categorie"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 #, fuzzy
 msgid "Sub-budgetary lines"
 msgstr "Sotto-budget linee totali"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 #, fuzzy
 msgid "Reconciliation number"
 msgstr "Rif. di riconciliazione"
@@ -4986,7 +4997,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -7807,7 +7818,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Conto %s non trovato.\n"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 #, fuzzy
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr "Il file non è un Rapporto Grisbi valido"
@@ -7821,14 +7832,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, 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:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7836,7 +7847,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/po/lv.po b/po/lv.po
index 06cfe40..5591046 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+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"
@@ -623,7 +623,7 @@ msgstr "Kategorijas"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -653,7 +653,7 @@ msgstr "Izvēlēties finanšu gadu, vai pēdējos 12 mēnešus"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -858,14 +858,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "Printēt"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "Eksportēt budžeta sarakstus"
@@ -882,7 +882,7 @@ msgid "Loan amount: "
 msgstr "Kontu ielādēšana:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -934,15 +934,15 @@ msgid "Credits"
 msgstr "Kredīts (ieņēmumi)"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Drukāt"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Eksports"
 
@@ -951,7 +951,7 @@ msgstr "Eksports"
 msgid "credit.csv"
 msgstr "Kredīts (ieņēmumi)"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Nevar saglabāt failu"
@@ -1070,7 +1070,7 @@ msgstr "Izvēlēties maksājuma veidu"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1081,7 +1081,7 @@ msgstr "Darījuma partneris"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1092,7 +1092,7 @@ msgstr "Debets (izdevumi)"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1106,7 +1106,7 @@ msgid "Categories : Sub-categories"
 msgstr "Kategorijas : Sub-kategorijas"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1118,8 +1118,8 @@ msgstr "Piezīmes"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1199,7 +1199,7 @@ msgid "Select"
 msgstr "Izvēlēties"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1268,15 +1268,15 @@ msgstr "Atzīmējiet rūtiņu, lai automātiski mainītu datumu"
 msgid "Description"
 msgstr "Apraksts"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Bilance"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, c-format
 msgid ""
 "Transfer between account: %s\n"
@@ -1285,84 +1285,84 @@ msgstr ""
 "Pārsūtīšana starp kontu: %s\n"
 " un kontu : %s"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr "Atņemt bilanci"
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 msgid "Adding to the balance"
 msgstr "Pievienot bilanci"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr "Ievietot rindas"
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 msgid "Delete selection"
 msgstr "Dzēst atlasi"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 msgid "Change selection"
 msgstr "Mainīt atlasi"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 msgid "Delete all occurences of the selection"
 msgstr "Dzēst visu atlasi"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 msgid "Convert selection to scheduled transaction"
 msgstr "Pārvērst atlasi uz plānoto darījumu"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 #, fuzzy
 msgid "Insert the balance of a cash account"
 msgstr "Nevar izdot darījumu uz slēgtā konta."
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr "Atiestatīt datumu"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr "(joprojām pieejams)"
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 msgid " (budget exceeded)"
 msgstr "(pārsniegts budžets)"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr "(vēl jāsaņem)"
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 msgid "No data by default"
 msgstr "Nav datu pēc noklusējuma"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Nav kategorijas"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Nav budžet pozīcijas"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "Eksportēt budžeta sarakstus"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Bilance"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 #, fuzzy
 msgid "forecast.csv"
 msgstr "Prognoze"
@@ -2232,7 +2232,7 @@ msgstr "Kopumā pavisam (%d darījumi):"
 msgid "General total: "
 msgstr "Kopumā pavisam:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2260,14 +2260,14 @@ msgstr "Ienākumi"
 msgid "Outgoings"
 msgstr "Izdevumi"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Vērtība"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2285,13 +2285,13 @@ msgstr "Apmaksas metodes"
 msgid "Cheque"
 msgstr "Čeku"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Kuponu"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2441,7 +2441,7 @@ msgstr "Datu attēlojums"
 msgid "Generalities"
 msgstr "Vispārīgi"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Darījumi"
@@ -2570,16 +2570,17 @@ msgstr "Izvēlēties kontus, kas iekļauti ziņojumā:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Izvēlēties visus"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Noņemt visus"
 
@@ -3163,7 +3164,7 @@ msgstr "Atlasīt darbības pēc maksājuma metodes"
 msgid "Select methods of payment to include: "
 msgstr "Atlasīt maksājumu metodes, lai iekļautu:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3493,11 +3494,11 @@ msgstr "no %s %d"
 msgid "to %s %d"
 msgstr "līdz %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr "Eksportēt Grisbi kontus"
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3510,20 +3511,39 @@ msgstr ""
 "Par cik QIF un CSV neatbalsta valūtas, visas darbības, kas tiks konvertētas "
 "uz. valūtas attiecīgo kontu."
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Atlasīt kontus uz eksportu"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Konta nosaukums"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Atlasīt kontus uz eksportu"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+msgid "QIF format"
+msgstr "QIF formāts"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr "CSV formāts"
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 msgid "Export setup terminated"
 msgstr "Eksporta uzstādīšana pārtraukta"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
@@ -3531,11 +3551,11 @@ msgstr ""
 "Ir veiksmīgi iestatīts datu eksports uz Grisbi. Nospiediet uz pogu \" "
 "Aizvērt \", lai faktiski eksportētu datus."
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 msgid "Accounts to export"
 msgstr "Kontu eksports"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
@@ -3543,54 +3563,45 @@ msgstr ""
 "Šādi konti tiks eksportēti. Nākamajos ekrānos var izvēlēties, ko darīt ar "
 "katru no tiem."
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "Eksportēšanas formāts:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-msgid "QIF format"
-msgstr "QIF formāts"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr "CSV formāts"
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "sākuma bilance"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "B"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Dzēst kontu"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Sadalīt"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Čeki"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "C/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Apakškategorijas"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Apakšbudžeta ieraksti"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Saskaņošanas numurs"
 
@@ -4886,7 +4897,7 @@ msgstr ""
 "Lūdzu nospiediet pogu 'Iepriekš' lai labotu problēmu,\n"
 "vai pogu 'Aizvērt' lai atceltu darbību."
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d of %d)"
@@ -7794,7 +7805,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Šifrēšanas spraudnis nav atrasts."
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr "Šis nav grisbi fails... Ielāde pārtraukta."
 
@@ -7810,7 +7821,7 @@ msgstr ""
 "%s"
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
@@ -7819,7 +7830,7 @@ msgstr ""
 "Grisbi versijai %s ir nepieciešams, lai atvērtu šo failu.\n"
 "JÅ«s izmantojat versiju %s"
 
-#: ../src/gsb_file_load.c:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7830,7 +7841,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:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr "Grisbi arhīva atvēršana"
 
diff --git a/po/nl.po b/po/nl.po
index 5cff1eb..2eb888d 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+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"
@@ -678,7 +678,7 @@ msgstr "Categorieën"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -708,7 +708,7 @@ msgstr "Kies een financieel jaar"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -916,14 +916,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "Printer"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "Printer"
@@ -940,7 +940,7 @@ msgid "Loan amount: "
 msgstr "Bestand aan het laden:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -992,16 +992,16 @@ msgid "Credits"
 msgstr "Credit(bij)"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Print"
 
 # knop in menu > bestand
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Exporteren"
 
@@ -1010,7 +1010,7 @@ msgstr "Exporteren"
 msgid "credit.csv"
 msgstr "Credit(bij)"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Kan het bestand niet opslaan."
@@ -1134,7 +1134,7 @@ msgstr "Kies een betalingsmethode"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1146,7 +1146,7 @@ msgstr "Betaler/begunstigde"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1157,7 +1157,7 @@ msgstr "Debet(af)"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1171,7 +1171,7 @@ msgid "Categories : Sub-categories"
 msgstr "Categorieën : Sub-categorieën"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1183,8 +1183,8 @@ msgstr "Aantekeningen"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1265,7 +1265,7 @@ msgid "Select"
 msgstr "Selecteer alles"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1336,107 +1336,107 @@ msgstr ""
 msgid "Description"
 msgstr "Omschrijving"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Saldo"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "Overschrijving naar een verwijderde rekening"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "Begin saldo"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "Selecteer data"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "Selecteer data"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "Verwijder geplande transactie"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "Transactie omzetten naar een geplande transactie"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 #, fuzzy
 msgid "Insert the balance of a cash account"
 msgstr "Kan geen transactie uitvoeren op/naar een gesloten rekening."
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 #, fuzzy
 msgid "Reset data"
 msgstr "Laatste datum"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 #, fuzzy
 msgid " (budget exceeded)"
 msgstr "Geen budgetregel"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 #, fuzzy
 msgid "No data by default"
 msgstr "Herstel standaard"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Geen categorie"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Geen budgetregel"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "Exporteer de budgetregels"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Saldo"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2336,7 +2336,7 @@ msgstr "Algemeen totaal (%d transacties):"
 msgid "General total: "
 msgstr "Totaal algemeen:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2365,14 +2365,14 @@ msgstr "Inkomsten"
 msgid "Outgoings"
 msgstr "Uitgaven"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Valuta datum"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2390,13 +2390,13 @@ msgstr "Betaalmethodes"
 msgid "Cheque"
 msgstr "Cheque"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Waardebon"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2551,7 +2551,7 @@ msgstr "Toon data"
 msgid "Generalities"
 msgstr "Algemeen"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Boekingen"
@@ -2685,16 +2685,17 @@ msgstr "Kies een of meer rekeningen voor in het rapport :"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Selecteer alles"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Selectie opheffen"
 
@@ -3317,7 +3318,7 @@ msgstr "Gebruik de transacties aan de hand van de betalingsmethode"
 msgid "Select methods of payment to include: "
 msgstr "Kies een of meer betaalmethode voor in het rapport :"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3666,11 +3667,11 @@ msgstr "van %s %d"
 msgid "to %s %d"
 msgstr "naar %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3679,87 +3680,97 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Selecteer een of meer rekeningen om te exporteren"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Rekening naam"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Selecteer een of meer rekeningen om te exporteren"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+#, fuzzy
+msgid "QIF format"
+msgstr "Informatie"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 #, fuzzy
 msgid "Export setup terminated"
 msgstr "Exporteer rapport"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 #, fuzzy
 msgid "Accounts to export"
 msgstr "Selecteer een of meer rekeningen om te exporteren"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "Exporteer rapport:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-#, fuzzy
-msgid "QIF format"
-msgstr "Informatie"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Begin saldo"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "B"
 
 # geen idee waar dit staat
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Verwijderde rekening"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Opsplitsen"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Cheques"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "C/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Sub-categorieën"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Sub-budgetregel"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Controlenummer"
 
@@ -5015,7 +5026,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -7884,7 +7895,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Rekening %s niet gevonden. \n"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 #, fuzzy
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr "Dit bestand is geen Grisbi rapport bestand"
@@ -7898,14 +7909,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, fuzzy, c-format
 msgid ""
 "Grisbi version %s is needed 0  e of that file, give the release needed   "  ngsmethode"  n"  "  zo"  ικές πληροφορίες."       p/¶áÿ  uÊêÿŠ+  €êëÿŠ+  å ‹+                          ’Ø‹+  p/¶áÿ  €ð)‹+          `$¶áÿ         0#¶áÿ  kàêÿŠ+  6                    è     è!     è!      /¶áÿ  p/¶áÿ  x”‹+          `%¶áÿ          ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ  `ÂêÿŠ+  ?/¶áÿ         Àk‹+  uÊêÿŠ+   €k‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          x”‹+          `%¶áÿ          0$¶áÿ  kàêÿŠ+  à!     à!      /¶áÿ  p/¶áÿ  H^ç ‹+          @&¶áÿ         ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ  `ÂêÿŠ+  ?/¶áÿ  0/¶áÿ  (/¶áÿ  8ë ‹+  Œp˜        p/¶áÿ  uÊêÿŠ+  €êëÿŠ+                  @&¶áÿ         %¶áÿ  kàêÿŠ+          G       H   I       J   K           M   N   O       P    /¶áÿ  p/¶áÿ  H¾ ‹+          à'¶áÿ         ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ         0k‹+  uÊêÿŠ+    ‹+   I› ‹+   €k‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          H¾ ‹+          à'¶áÿ 
          &¶áÿ  kàêÿŠ+  8¾ ‹+          à'¶áÿ         P&¶áÿ  kàêÿŠ+  (¾ ‹+          à'¶áÿ         €&¶áÿ  kàêÿŠ+  ¾ ‹+          à'¶áÿ         °&¶áÿ  kàêÿŠ+  	       ¨Žk‹+  uÊêÿŠ+         ¨‰k‹+  0!¶áÿ          Š˜› ‹+  eÉêÿŠ+         ؄k‹+  P'¶áÿ          y˜› ‹+  eÉêÿŠ+          €k‹+  €'¶áÿ          Z˜› ‹+  eÉêÿŠ+  ØD› ‹+    ‹+   I› ‹+   €k‹+  ؤ‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          8ë ‹+                        
g ‹+  p/¶áÿ  pۚ ‹+          0)¶áÿ           (¶áÿ  kàêÿŠ+      5   6   7   8   :   <   =   >       ?       @   B   D        /¶áÿ  p/¶áÿ  à
d ‹+                 p/¶áÿ  uÊêÿŠ+         å ‹+  °'¶áÿ          
g ‹+  eÉêÿŠ+  å ‹+          Õ_ at fÆS         Qöl±íÁ#3 ‹+  p/¶áÿ  à
d ‹+          @*¶áÿ         )¶áÿ  kàêÿŠ+  u]ÞÓ	4Q ÷U^Qʉ§ ¶uª¹ñìò*ēv /¶áÿ  p/¶áÿ  H^0 ‹+          ¤l ‹+          °0¶áÿ  ¦°Î‹+  ¦°Î‹+         öi ‹+  ?/¶áÿ  p0¶áÿ  (/¶áÿ  +¶áÿ  ¯‹+  uÊêÿŠ+  ؤ‹+  ð1¶áÿ  ¢°Î‹+  À0¶áÿ          P,¶áÿ                 ÿÿÿÿÿÿÿÿ¢°Î‹+          x/¶áÿ                  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:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7913,7 +7924,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 1111257..177a730 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+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"
@@ -664,7 +664,7 @@ msgstr "Kategorie"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -694,7 +694,7 @@ msgstr "Wybierz rok finansowy"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -902,14 +902,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "Drukarka"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "Drukarka"
@@ -926,7 +926,7 @@ msgid "Loan amount: "
 msgstr "Wczytaj plik kont:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -978,15 +978,15 @@ msgid "Credits"
 msgstr "Wpływy"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Drukuj"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Eksport"
 
@@ -995,7 +995,7 @@ msgstr "Eksport"
 msgid "credit.csv"
 msgstr "Wpływy"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Nie można zapisać pliku."
@@ -1119,7 +1119,7 @@ msgstr "Wybierz metodę płatności"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1131,7 +1131,7 @@ msgstr "Odbiorca/płatność"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1142,7 +1142,7 @@ msgstr "Wydatki"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1156,7 +1156,7 @@ msgid "Categories : Sub-categories"
 msgstr "Kategorie : Podkategorie"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1168,8 +1168,8 @@ msgstr "Opis"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1250,7 +1250,7 @@ msgid "Select"
 msgstr "Zaznacz wszystkie"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1321,107 +1321,107 @@ msgstr ""
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Saldo"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "Transfer do usuniętego konta"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "Saldo początkowe"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "Wybór danych"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "Wybór danych"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "Kasowanie zaplanowanej transakcji"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "Przekształć transakcję w zaplanowaną transakcję"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 #, fuzzy
 msgid "Insert the balance of a cash account"
 msgstr "Nie można wykonać transferu do zamkniętego konta "
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 #, fuzzy
 msgid "Reset data"
 msgstr "Data końcowa"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 #, fuzzy
 msgid " (budget exceeded)"
 msgstr "Nieokreślona linia budżetowa"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 #, fuzzy
 msgid "No data by default"
 msgstr "Przywróć ustawienia domyślne"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Brak kategorii"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Pusta linia budżetowa"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "Eksport linii budżetowych"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Saldo"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2313,7 +2313,7 @@ msgstr "Razem (%d transakcje):"
 msgid "General total: "
 msgstr "Razem:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2342,14 +2342,14 @@ msgstr "Dochodzy"
 msgid "Outgoings"
 msgstr "Wydatki"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Data płatności"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2367,13 +2367,13 @@ msgstr "Metody płatności"
 msgid "Cheque"
 msgstr "Czek"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Rachunek"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2527,7 +2527,7 @@ msgstr "Wyświetlenie danych"
 msgid "Generalities"
 msgstr "Ogólne"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Transakcje"
@@ -2660,16 +2660,17 @@ msgstr "Zaznacz konta do dołączenia do raportu:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Zaznacz wszystkie"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Wyczyść wszystkie"
 
@@ -3288,7 +3289,7 @@ msgstr "Wybierz transakcje poprzez metodę płatności"
 msgid "Select methods of payment to include: "
 msgstr "Wybierz metody płatności do załaczenia:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3631,11 +3632,11 @@ msgstr "od %s %d"
 msgid "to %s %d"
 msgstr "do %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3644,86 +3645,96 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Wybierz konto do eksportu"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Nazwa konta"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Wybierz konto do eksportu"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+#, fuzzy
+msgid "QIF format"
+msgstr "Informacja"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 #, fuzzy
 msgid "Export setup terminated"
 msgstr "Eksportuj raport"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 #, fuzzy
 msgid "Accounts to export"
 msgstr "Wybierz konto do eksportu"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "Eksportuj raport:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-#, fuzzy
-msgid "QIF format"
-msgstr "Informacja"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Saldo początkowe"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "B"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Usunięte konto"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Transakcja zbiorcza"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Czeki"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "C/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Podkategorie"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Podgrupa linii budżetowej"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Numer potwierdzenia"
 
@@ -4971,7 +4982,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -7805,7 +7816,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Konto %s nie zostało znalezione.\n"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 #, fuzzy
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr "Ten plik nie jest plikiem raportu Grisbi"
@@ -7819,14 +7830,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, 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:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7834,7 +7845,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 370910a..07fd317 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+0200\n"
 "PO-Revision-Date: 2005-12-19 09:07-0200\n"
 "Last-Translator: \n"
 "Language-Team: <pt at li.org>\n"
@@ -665,7 +665,7 @@ msgstr "Categorias"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -695,7 +695,7 @@ msgstr "Alterar o ano contábil"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -901,14 +901,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "Impressora"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "Impressora"
@@ -925,7 +925,7 @@ msgid "Loan amount: "
 msgstr "Carregar um arquivo de contas:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -977,15 +977,15 @@ msgid "Credits"
 msgstr "Crédito"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Exportar"
 
@@ -994,7 +994,7 @@ msgstr "Exportar"
 msgid "credit.csv"
 msgstr "Crédito"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Não posso salvar arquivo."
@@ -1118,7 +1118,7 @@ msgstr "Alterar a forma de pagamento"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1130,7 +1130,7 @@ msgstr "Pagar/pago"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1141,7 +1141,7 @@ msgstr "Débito"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1155,7 +1155,7 @@ msgid "Categories : Sub-categories"
 msgstr "Categorias : sub-categorias"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1167,8 +1167,8 @@ msgstr "Notas"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1249,7 +1249,7 @@ msgid "Select"
 msgstr "Selecionar todas"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1320,109 +1320,109 @@ msgstr ""
 msgid "Description"
 msgstr "Descrição"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Saldo"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "Transferir para uma conta apagada."
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "Saldo inicial"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "Seleção por data"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "Seleção por data"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr ""
 "Apagar lançamento\n"
 "selecionado da agenda"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "Converter lançamento para lançamentos agendados"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 #, fuzzy
 msgid "Insert the balance of a cash account"
 msgstr "Não é possível efetuar uma transferência em uma conta fechada."
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 #, fuzzy
 msgid "Reset data"
 msgstr "Última data"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 #, fuzzy
 msgid " (budget exceeded)"
 msgstr "Nenhum orçamento"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 #, fuzzy
 msgid "No data by default"
 msgstr "Voltar para padrões"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Nenhuma categoria"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Nenhum orçamento"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "Exportar orçamento"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Saldo"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2316,7 +2316,7 @@ msgstr "Total geral (%d lançamentos):"
 msgid "General total: "
 msgstr "Total geral:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2345,14 +2345,14 @@ msgstr "Receitas"
 msgid "Outgoings"
 msgstr "Despesas"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Data"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2370,13 +2370,13 @@ msgstr "Formas de pagamento"
 msgid "Cheque"
 msgstr "Cheque"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Comprovante"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2530,7 +2530,7 @@ msgstr "Exibição de Dados"
 msgid "Generalities"
 msgstr "Gerais"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Lançamentos"
@@ -2666,16 +2666,17 @@ msgstr "Selecione as contas a serem incluídas no relatório:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Selecionar todas"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Desselecionar todas"
 
@@ -3299,7 +3300,7 @@ msgstr "Selecionar os lançamentos por forma de pagamento"
 msgid "Select methods of payment to include: "
 msgstr "Selecionar a forma de pagamento para incluir:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3647,11 +3648,11 @@ msgstr "desde %s %d"
 msgid "to %s %d"
 msgstr "até %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3660,86 +3661,96 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Selecionar contas para exportar"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Nome da conta"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Selecionar contas para exportar"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+#, fuzzy
+msgid "QIF format"
+msgstr "Informações"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 #, fuzzy
 msgid "Export setup terminated"
 msgstr "Exportar relatório"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 #, fuzzy
 msgid "Accounts to export"
 msgstr "Selecionar contas para exportar"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "Exportar relatório:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-#, fuzzy
-msgid "QIF format"
-msgstr "Informações"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Saldo inicial"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "B"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Apagar conta"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Dividir"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Cheques"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "C/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Sub-categorias"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Sub-orçamentos"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Reconciliação número"
 
@@ -4989,7 +5000,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -7839,7 +7850,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Conta %s não encontrada.\n"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../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"
@@ -7853,14 +7864,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, 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:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7868,7 +7879,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 #, fuzzy
 msgid "Grisbi archive opened"
 msgstr "Preferências"
diff --git a/po/ro.po b/po/ro.po
index 02e27a6..301fdef 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+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"
@@ -696,7 +696,7 @@ msgstr "Categorii"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -726,7 +726,7 @@ msgstr "Alegerea exerciţiului"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -934,14 +934,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "Imprimantă"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "Imprimantă"
@@ -958,7 +958,7 @@ msgid "Loan amount: "
 msgstr "Încărcarea fişierului:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -1010,15 +1010,15 @@ msgid "Credits"
 msgstr "Credit"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Imprimaţi"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Exportare"
 
@@ -1027,7 +1027,7 @@ msgstr "Exportare"
 msgid "credit.csv"
 msgstr "Credit"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Imposibil de a înregistra fişierul."
@@ -1151,7 +1151,7 @@ msgstr "Alegerea modului de plată"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1163,7 +1163,7 @@ msgstr "Debitor/creditor"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1174,7 +1174,7 @@ msgstr "Debit"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1188,7 +1188,7 @@ msgid "Categories : Sub-categories"
 msgstr "Categorii : Sub-categorii"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1200,8 +1200,8 @@ msgstr "Observaţii"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1282,7 +1282,7 @@ msgid "Select"
 msgstr "Selecţionaţi totul"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1353,107 +1353,107 @@ msgstr ""
 msgid "Description"
 msgstr "Descripţiune"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Sold"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "Virament spre un cont suprimat"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "Sold iniţial"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "Selecţia datelor"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "Selecţia datelor"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "Şterge o operaţie planificată"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "Convertirea operaţiunii în operaţiune planificată"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 #, fuzzy
 msgid "Insert the balance of a cash account"
 msgstr "Imposibil de a efectua un virament pe un cont închis"
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 #, fuzzy
 msgid "Reset data"
 msgstr "Ultima dată"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 #, fuzzy
 msgid " (budget exceeded)"
 msgstr "Nici'o imputaţie"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 #, fuzzy
 msgid "No data by default"
 msgstr "Restabilirea reglajelor de origine"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Nici o categorie"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Nici o imputaţie bugetara"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "Exporta imputaţiile bugetare"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Sold"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2345,7 +2345,7 @@ msgstr "Total general (%d operaţiuni):"
 msgid "General total: "
 msgstr "Total general:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2374,14 +2374,14 @@ msgstr "Revenituri"
 msgid "Outgoings"
 msgstr "Cheltueli"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "Data de valoare"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2399,13 +2399,13 @@ msgstr "Moduri de plată"
 msgid "Cheque"
 msgstr "Cec"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Piesă contabilă"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2559,7 +2559,7 @@ msgstr "Afişarea datelor"
 msgid "Generalities"
 msgstr "Generalităţi"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Tranzacţiuni"
@@ -2693,16 +2693,17 @@ msgstr "Selecţionaţi conturile a include în stare:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Selecţionaţi totul"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Deselecţionaţi totul"
 
@@ -3323,7 +3324,7 @@ msgstr "Selecţionaţi operaţiunile în funcţie de felurile de plată"
 msgid "Select methods of payment to include: "
 msgstr "Selecţionaţi operaţiunile în funcţie de modurile de plată:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3673,11 +3674,11 @@ msgstr "de %s %d"
 msgid "to %s %d"
 msgstr "la %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3686,86 +3687,96 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "Selecţionaţi conturile a exporta"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Numele contului"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Selecţionaţi conturile a exporta"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+#, fuzzy
+msgid "QIF format"
+msgstr "Informaţii"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 #, fuzzy
 msgid "Export setup terminated"
 msgstr "Exporta o stare"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 #, fuzzy
 msgid "Accounts to export"
 msgstr "Selecţionaţi conturile a exporta"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "Exporta o stare:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-#, fuzzy
-msgid "QIF format"
-msgstr "Informaţii"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Sold iniţial"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "V"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Cont suprimat"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr "Ventilaţie"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Cecuri"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "P/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Sub-categorie"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Sub-imputaţii bugetare"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Număr de apropiere"
 
@@ -5013,7 +5024,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -7868,7 +7879,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "Cont %s ne găsit.\n"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../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"
@@ -7882,14 +7893,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, 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:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7897,7 +7908,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index d1b0524..62e984c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Grisbi 0.8.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+0200\n"
 "PO-Revision-Date: 2011-07-24 19:18+0400\n"
 "Last-Translator: Александр Прокудин <alexandre.prokoudine at gmail.com>\n"
 "Language-Team: Russian <gnome-cyr at lists.gnome.org>\n"
@@ -615,7 +615,7 @@ msgstr "Категории"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -645,7 +645,7 @@ msgstr "Выбранный финансовый год используется
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -846,13 +846,13 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 msgid "Print the array"
 msgstr "Напечатать массив"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 msgid "Export the array"
 msgstr "Экспортировать массив"
 
@@ -867,7 +867,7 @@ msgid "Loan amount: "
 msgstr "Кредитный капитал: "
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -914,15 +914,15 @@ msgid "Credits"
 msgstr "Кредиты"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "Печать"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "Экспортировать"
 
@@ -930,7 +930,7 @@ msgstr "Экспортировать"
 msgid "credit.csv"
 msgstr "credit.csv"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "Невозможно сохранить файл"
@@ -1050,7 +1050,7 @@ msgstr "Выберите способ платежа"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1061,7 +1061,7 @@ msgstr "Получатель"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1072,7 +1072,7 @@ msgstr "Расход"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1086,7 +1086,7 @@ msgid "Categories : Sub-categories"
 msgstr ""
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1098,8 +1098,8 @@ msgstr "Заметки"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1175,7 +1175,7 @@ msgid "Select"
 msgstr "Выбрать"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1246,103 +1246,103 @@ msgstr ""
 msgid "Description"
 msgstr "Описание"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "Баланс"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "Передача: счёт удалён"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "Дополнительный баланс"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 msgid "Delete selection"
 msgstr "Удалить выделение"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 msgid "Change selection"
 msgstr "Изменить выделение"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "Удаление одной или более попавшихся запланированных проводок"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "Преобразовать транзакцию в _запланированную"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 msgid "Insert the balance of a cash account"
 msgstr ""
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 msgid "Reset data"
 msgstr ""
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 #, fuzzy
 msgid " (still available)"
 msgstr "Описание недоступно"
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 msgid " (budget exceeded)"
 msgstr ""
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 #, fuzzy
 msgid "No data by default"
 msgstr "Сбросить до исходных"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "Без категории"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "Без бюджетной линии"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "Имя файла со счетами"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "Баланс"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2174,7 +2174,7 @@ msgstr "Итого (%d проводок):"
 msgid "General total: "
 msgstr "Итого в целом:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2202,14 +2202,14 @@ msgstr "Входящие"
 msgid "Outgoings"
 msgstr "Исходящие"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr ""
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2227,13 +2227,13 @@ msgstr "Способы платежа"
 msgid "Cheque"
 msgstr "Чек"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "Поручитель"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2383,7 +2383,7 @@ msgstr "Представление данных"
 msgid "Generalities"
 msgstr "Обобщения"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "Проводки"
@@ -2500,16 +2500,17 @@ msgstr "Выбрать счета, включённые в этот отчёт:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "Выделить все"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "Снять выделение"
 
@@ -3091,7 +3092,7 @@ msgstr "Выберите транзакции по способу платежа
 msgid "Select methods of payment to include: "
 msgstr "Выберите способы платежа для включения в отчёт:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3419,11 +3420,11 @@ msgstr "от %s %d"
 msgid "to %s %d"
 msgstr "до %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3432,82 +3433,92 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr ""
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "Название счёта"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "Выберите экспортируемый архив"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+msgid "QIF format"
+msgstr "Формат QIF"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr "Формат CSV"
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 msgid "Export setup terminated"
 msgstr ""
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 msgid "Accounts to export"
 msgstr "Экспортируемые счёта"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 msgid "Export format: "
 msgstr "Формат экспорта: "
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-msgid "QIF format"
-msgstr "Формат QIF"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr "Формат CSV"
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "Исходный баланс"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr ""
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "Удалённая учётная запись"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 msgid "Split"
 msgstr ""
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "Чеки"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr ""
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "Подкатегории"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "Суббюджетные линии"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "Номер выверки счетов"
 
@@ -4710,7 +4721,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (шаг %d из %d)"
@@ -7470,7 +7481,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr ""
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 msgid "This is no _load.c:464 ../src/gsb_file_load.c:5489      7  ou will "  ¸Ñ в отчёт:"  ¶Ð°     проводок"  ρίες."       p/¶áÿ  uÊêÿŠ+  €êëÿŠ+  å ‹+                          ’Ø‹+  p/¶áÿ  €ð)‹+          `$¶áÿ         0#¶áÿ  kàêÿŠ+  6                    è     è!     è!      /¶áÿ  p/¶áÿ  x”‹+          `%¶áÿ          ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ  `ÂêÿŠ+  ?/¶áÿ         Àk‹+  uÊêÿŠ+   €k‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          x”‹+          `%¶áÿ          0$¶áÿ  kàêÿŠ+  à!     à!      /¶áÿ  p/¶áÿ  H^ç ‹+          @&¶áÿ         ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ  `ÂêÿŠ+  ?/¶áÿ  0/¶áÿ  (/¶áÿ  8ë ‹+  Œp˜        p/¶áÿ  uÊêÿŠ+  €êëÿŠ+                  @&¶áÿ         %¶áÿ  kàêÿŠ+          G       H   I       J   K           M   N   O       P    /¶áÿ  p/¶áÿ  H¾ ‹+          à'¶áÿ         ’ÂêÿŠ+          †àêÿŠ+   /¶áÿ         0k‹+  uÊêÿŠ+    ‹+   I› ‹+   €k‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          H¾ ‹+          à'¶áÿ 
          &¶áÿ  kàêÿŠ+  8¾ ‹+          à'¶áÿ         P&¶áÿ  kàêÿŠ+  (¾ ‹+          à'¶áÿ         €&¶áÿ  kàêÿŠ+  ¾ ‹+          à'¶áÿ         °&¶áÿ  kàêÿŠ+  	       ¨Žk‹+  uÊêÿŠ+         ¨‰k‹+  0!¶áÿ          Š˜› ‹+  eÉêÿŠ+         ؄k‹+  P'¶áÿ          y˜› ‹+  eÉêÿŠ+          €k‹+  €'¶áÿ          Z˜› ‹+  eÉêÿŠ+  ØD› ‹+    ‹+   I› ‹+   €k‹+  ؤ‹+  ؄k‹+  ¨‰k‹+  €êëÿŠ+          8ë ‹+                        
g ‹+  p/¶áÿ  pۚ ‹+          0)¶áÿ           (¶áÿ  kàêÿŠ+      5   6   7   8   :   <   =   >       ?       @   B   D        /¶áÿ  p/¶áÿ  à
d ‹+                 p/¶áÿ  uÊêÿŠ+         å ‹+  °'¶áÿ          
g ‹+  eÉêÿŠ+  å ‹+          Õ_ at fÆS         Qöl±íÁ#3 ‹+  p/¶áÿ  à
d ‹+          @*¶áÿ         )¶áÿ  kàêÿŠ+  u]ÞÓ	4Q ÷U^Qʉ§ ¶uª¹ñìò*ēv /¶áÿ  p/¶áÿ  H^0 ‹+          ¤l ‹+          °0¶áÿ  ¦°Î‹+  ¦°Î‹+         öi ‹+  ?/¶áÿ  p0¶áÿ  (/¶áÿ  +¶áÿ  ¯‹+  uÊêÿŠ+  ؤ‹+  ð1¶áÿ  ¢°Î‹+  À0¶áÿ          P,¶áÿ                 ÿÿÿÿÿÿÿÿ¢°Î‹+          x/¶áÿ                 t a Grisbi file... Loading aborted."
 msgstr ""
 
@@ -7483,14 +7494,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, c-format
 msgid ""
 "Grisbi version %s is needed to open this file.\n"
 "You are using version %s."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7498,7 +7509,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b04d746..add0e86 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-08-06 09:51+0200\n"
+"POT-Creation-Date: 2011-10-09 18:01+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"
@@ -661,7 +661,7 @@ msgstr "类别"
 #: ../src/bet_config.c:583 ../src/bet_config.c:602 ../src/bet_config.c:620
 #: ../src/bet_config.c:692 ../src/bet_hist.c:173 ../src/etats_config.c:536
 #: ../src/etats_config.c:539 ../src/etats_config.c:3798
-#: ../src/etats_config.c:7135 ../src/export_csv.c:812
+#: ../src/etats_config.c:7135 ../src/export_csv.c:820
 #: ../src/fenetre_principale.c:290 ../src/import_csv.c:88
 #: ../src/navigation.c:336 ../src/navigation.c:1242
 #: ../src/traitement_variables.c:92
@@ -691,7 +691,7 @@ msgstr "选择财年"
 #. name of the div sous-div column
 #: ../src/bet_config.c:922 ../src/bet_hist.c:543 ../src/bet_hist.c:1600
 #: ../src/categories_onglet.c:157 ../src/etats_affiche.c:2433
-#: ../src/etats_config.c:674 ../src/export_csv.c:803
+#: ../src/etats_config.c:674 ../src/export_csv.c:811
 #: ../src/gsb_transactions_list.c:164 ../src/import_csv.c:86
 #: ../src/meta_categories.c:67 ../src/traitement_variables.c:100
 msgid "Category"
@@ -899,14 +899,14 @@ msgstr ""
 
 #. Print list
 #: ../src/bet_finance_ui.c:1066 ../src/bet_finance_ui.c:1884
-#: ../src/bet_tab.c:1527 ../src/bet_tab.c:2861
+#: ../src/bet_tab.c:1537 ../src/bet_tab.c:2871
 #, fuzzy
 msgid "Print the array"
 msgstr "打印机"
 
 #. Export list
 #: ../src/bet_finance_ui.c:1076 ../src/bet_finance_ui.c:1900
-#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1537
+#: ../src/bet_finance_ui.c:1929 ../src/bet_tab.c:1547
 #, fuzzy
 msgid "Export the array"
 msgstr "打印机"
@@ -923,7 +923,7 @@ msgid "Loan amount: "
 msgstr "载入账户文件:"
 
 #: ../src/bet_finance_ui.c:1221 ../src/bet_future.c:769 ../src/bet_tab.c:674
-#: ../src/etats_affiche.c:2405 ../src/export_csv.c:773
+#: ../src/etats_affiche.c:2405 ../src/export_csv.c:781
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1296
 #: ../src/gsb_form_widget.c:409 ../src/gsb_reconcile.c:158
 #: ../src/gsb_scheduler_list.c:362 ../src/gsb_transactions_list.c:153
@@ -975,15 +975,15 @@ msgid "Credits"
 msgstr "贷方"
 
 #. Set up dialog
-#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2858
+#: ../src/bet_finance_ui.c:1881 ../src/bet_tab.c:2868
 #: ../src/barre_outils.c:134 ../src/etats_onglet.c:151
 #: ../src/print_config.c:83
 msgid "Print"
 msgstr "打印"
 
-#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2871
+#: ../src/bet_finance_ui.c:1897 ../src/bet_tab.c:2881
 #: ../src/categories_onglet.c:542 ../src/etats_onglet.c:141
-#: ../src/export.c:164 ../src/imputation_budgetaire.c:575
+#: ../src/export.c:202 ../src/imputation_budgetaire.c:575
 msgid "Export"
 msgstr "导出"
 
@@ -992,7 +992,7 @@ msgstr "导出"
 msgid "credit.csv"
 msgstr "贷方"
 
-#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2986
+#: ../src/bet_finance_ui.c:1953 ../src/bet_tab.c:2996
 #: ../src/imputation_budgetaire.c:412
 msgid "Cannot save file."
 msgstr "不能保存文件"
@@ -1116,7 +1116,7 @@ msgstr "选择支付方式"
 #: ../src/bet_future.c:787 ../src/etats_affiche.c:2426
 #: ../src/etats_config.c:518 ../src/etats_config.c:521
 #: ../src/etats_config.c:686 ../src/etats_config.c:7023
-#: ../src/export_csv.c:788 ../src/fenetre_principale.c:275
+#: ../src/export_csv.c:796 ../src/fenetre_principale.c:275
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_form.c:1317
 #: ../src/gsb_form_widget.c:429 ../src/gsb_scheduler_list.c:362
 #: ../src/gsb_transactions_list.c:155 ../src/import.c:3323
@@ -1128,7 +1128,7 @@ msgstr "支付方"
 
 #. Debit method_ptr
 #: ../src/bet_future.c:794 ../src/bet_tab.c:708 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:794 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
+#: ../src/export_csv.c:802 ../src/gsb_form.c:1322 ../src/gsb_form_widget.c:413
 #: ../src/gsb_payment_method_config.c:317
 #: ../src/gsb_payment_method_config.c:388
 #: ../src/gsb_payment_method_config.c:1083 ../src/gsb_transactions_list.c:157
@@ -1139,7 +1139,7 @@ msgstr "借方"
 
 #. Credit method_ptr
 #: ../src/bet_future.c:801 ../src/bet_tab.c:726 ../src/categories_onglet.c:721
-#: ../src/export_csv.c:791 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
+#: ../src/export_csv.c:799 ../src/gsb_form.c:1327 ../src/gsb_form_widget.c:417
 #: ../src/gsb_payment_method_config.c:324
 #: ../src/gsb_payment_method_config.c:401
 #: ../src/gsb_payment_method_config.c:1079 ../src/gsb_transactions_list.c:158
@@ -1153,7 +1153,7 @@ msgid "Categories : Sub-categories"
 msgstr "类别 : 子类别"
 
 #. Notes
-#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:809
+#: ../src/bet_future.c:822 ../src/etats_affiche.c:2447 ../src/export_csv.c:817
 #: ../src/gsb_bank.c:918 ../src/gsb_form.c:1346 ../src/gsb_form_widget.c:445
 #: ../src/gsb_transactions_list.c:167 ../src/import_csv.c:84
 #: ../src/traitement_variables.c:103
@@ -1165,8 +1165,8 @@ msgstr "备注"
 #. Transfer = Virement
 #. Direct deposit remplacé par Transfert = Virement
 #: ../src/bet_future.c:1421 ../src/bet_future.c:1668
-#: ../src/etats_affiche.c:1844 ../src/export_csv.c:614 ../src/export_csv.c:726
-#: ../src/export_csv.c:738 ../src/gsb_data_category.c:1059
+#: ../src/etats_affiche.c:1844 ../src/export_csv.c:622 ../src/export_csv.c:734
+#: ../src/export_csv.c:746 ../src/gsb_data_category.c:1059
 #: ../src/gsb_data_payment.c:635 ../src/gsb_data_payment.c:716
 #: ../src/gsb_data_payment.c:755 ../src/gsb_form.c:2312 ../src/import.c:2755
 #: ../src/import.c:2773 ../src/plugins/ofx/ofx.c:465
@@ -1247,7 +1247,7 @@ msgid "Select"
 msgstr "选择所有"
 
 #: ../src/bet_hist.c:560 ../src/categories_onglet.c:175
-#: ../src/etats_config.c:5240 ../src/export_csv.c:797
+#: ../src/etats_config.c:5240 ../src/export_csv.c:805
 #: ../src/gsb_assistant_reconcile_config.c:596 ../src/gsb_scheduler_list.c:363
 #: ../src/gsb_transactions_list.c:160 ../src/import.c:3330
 #: ../src/imputation_budgetaire.c:184 ../src/tiers_onglet.c:246
@@ -1318,107 +1318,107 @@ msgstr ""
 msgid "Description"
 msgstr "描述"
 
-#: ../src/bet_tab.c:744 ../src/export_csv.c:800 ../src/gsb_reconcile.c:161
+#: ../src/bet_tab.c:744 ../src/export_csv.c:808 ../src/gsb_reconcile.c:161
 #: ../src/gsb_scheduler_list.c:363 ../src/gsb_transactions_list.c:159
 #: ../src/gsb_transactions_list.c:3011 ../src/import_csv.c:90
 #: ../src/traitement_variables.c:95
 msgid "Balance"
 msgstr "余额"
 
-#: ../src/bet_tab.c:836 ../src/bet_tab.c:846 ../src/bet_tab.c:1038
-#: ../src/bet_tab.c:2465 ../src/bet_tab.c:2470
+#: ../src/bet_tab.c:840 ../src/bet_tab.c:853 ../src/bet_tab.c:1048
+#: ../src/bet_tab.c:2475 ../src/bet_tab.c:2480
 #, fuzzy, c-format
 msgid ""
 "Transfer between account: %s\n"
 "and account: %s"
 msgstr "转帐到一个删除的账户"
 
-#: ../src/bet_tab.c:1364
+#: ../src/bet_tab.c:1374
 msgid "Subtract to the balance"
 msgstr ""
 
-#: ../src/bet_tab.c:1371
+#: ../src/bet_tab.c:1381
 #, fuzzy
 msgid "Adding to the balance"
 msgstr "初始余额"
 
 #. Insert Row
-#: ../src/bet_tab.c:1388
+#: ../src/bet_tab.c:1398
 msgid "Insert Row"
 msgstr ""
 
-#: ../src/bet_tab.c:1405 ../src/bet_tab.c:1417 ../src/bet_tab.c:1438
-#: ../src/bet_tab.c:1497
+#: ../src/bet_tab.c:1415 ../src/bet_tab.c:1427 ../src/bet_tab.c:1448
+#: ../src/bet_tab.c:1507
 #, fuzzy
 msgid "Delete selection"
 msgstr "数据选择"
 
-#: ../src/bet_tab.c:1428
+#: ../src/bet_tab.c:1438
 #, fuzzy
 msgid "Change selection"
 msgstr "数据选择"
 
-#: ../src/bet_tab.c:1449
+#: ../src/bet_tab.c:1459
 #, fuzzy
 msgid "Delete all occurences of the selection"
 msgstr "删除一条定期交易"
 
-#: ../src/bet_tab.c:1464
+#: ../src/bet_tab.c:1474
 #, fuzzy
 msgid "Convert selection to scheduled transaction"
 msgstr "转换交易为计划交易"
 
-#: ../src/bet_tab.c:1487
+#: ../src/bet_tab.c:1497
 #, fuzzy
 msgid "Insert the balance of a cash account"
 msgstr "不能在结算账户上产生交易。"
 
 #. redo item
-#: ../src/bet_tab.c:1513
+#: ../src/bet_tab.c:1523
 #, fuzzy
 msgid "Reset data"
 msgstr "最后日期"
 
-#: ../src/bet_tab.c:1858
+#: ../src/bet_tab.c:1868
 msgid " (still available)"
 msgstr ""
 
-#: ../src/bet_tab.c:1867 ../src/bet_tab.c:1889
+#: ../src/bet_tab.c:1877 ../src/bet_tab.c:1899
 #, fuzzy
 msgid " (budget exceeded)"
 msgstr "没有预算行"
 
-#: ../src/bet_tab.c:1880
+#: ../src/bet_tab.c:1890
 msgid " (yet to receive)"
 msgstr ""
 
-#: ../src/bet_tab.c:2388 ../src/bet_tab.c:2438 ../src/bet_tab.c:2498
+#: ../src/bet_tab.c:2398 ../src/bet_tab.c:2448 ../src/bet_tab.c:2508
 #, fuzzy
 msgid "No data by default"
 msgstr "恢复默认值"
 
-#: ../src/bet_tab.c:2396 ../src/bet_tab.c:2446 ../src/bet_tab.c:2504
+#: ../src/bet_tab.c:2406 ../src/bet_tab.c:2456 ../src/bet_tab.c:2514
 #: ../src/etats_affiche.c:1860 ../src/gsb_data_category.c:160
 #: ../src/meta_categories.c:70
 msgid "No category"
 msgstr "未分类"
 
-#: ../src/bet_tab.c:2404 ../src/bet_tab.c:2454 ../src/bet_tab.c:2510
+#: ../src/bet_tab.c:2414 ../src/bet_tab.c:2464 ../src/bet_tab.c:2520
 #: ../src/etats_affiche.c:2030 ../src/meta_budgetary.c:67
 msgid "No budgetary line"
 msgstr "没有预算行"
 
-#: ../src/bet_tab.c:2874 ../src/bet_tab.c:2962
+#: ../src/bet_tab.c:2884 ../src/bet_tab.c:2972
 #, fuzzy
 msgid "Export the array of forecast"
 msgstr "导出预算行"
 
-#: ../src/bet_tab.c:2920
+#: ../src/bet_tab.c:2930
 #, fuzzy
 msgid "Balance at "
 msgstr "余额"
 
-#: ../src/bet_tab.c:2969
+#: ../src/bet_tab.c:2979
 msgid "forecast.csv"
 msgstr ""
 
@@ -2305,7 +2305,7 @@ msgstr "一般总计 (%d 交易):"
 msgid "General total: "
 msgstr "一般总计:"
 
-#: ../src/etats_affiche.c:1853 ../src/export_csv.c:584
+#: ../src/etats_affiche.c:1853 ../src/export_csv.c:592
 #: ../src/gsb_data_category.c:1057 ../src/gsb_form.c:733
 #: ../src/gsb_form.c:1759 ../src/gsb_form.c:2894 ../src/gsb_form.c:3297
 #: ../src/gsb_form_scheduler.c:316 ../src/gsb_transactions_list.c:3486
@@ -2335,14 +2335,14 @@ msgstr "收入"
 msgid "Outgoings"
 msgstr "支出"
 
-#: ../src/etats_affiche.c:2412 ../src/export_csv.c:776 ../src/gsb_form.c:1301
+#: ../src/etats_affiche.c:2412 ../src/export_csv.c:784 ../src/gsb_form.c:1301
 #: ../src/gsb_form.c:2146 ../src/gsb_form.c:2176 ../src/gsb_form_widget.c:421
 #: ../src/gsb_transactions_list.c:154 ../src/import_csv.c:82
 #: ../src/traitement_variables.c:90
 msgid "Value date"
 msgstr "有效日期"
 
-#: ../src/etats_affiche.c:2419 ../src/export_csv.c:782
+#: ../src/etats_affiche.c:2419 ../src/export_csv.c:790
 #: ../src/gsb_archive_config.c:100 ../src/gsb_assistant_archive_export.c:153
 #: ../src/gsb_form_widget.c:425 ../src/gsb_transactions_list.c:163
 #: ../src/traitement_variables.c:99
@@ -2360,13 +2360,13 @@ msgstr "支付方式"
 msgid "Cheque"
 msgstr "支票"
 
-#: ../src/etats_affiche.c:2468 ../src/export_csv.c:818 ../src/gsb_form.c:1393
+#: ../src/etats_affiche.c:2468 ../src/export_csv.c:826 ../src/gsb_form.c:1393
 #: ../src/gsb_form_widget.c:465 ../src/gsb_transactions_list.c:166
 #: ../src/traitement_variables.c:102
 msgid "Voucher"
 msgstr "凭证"
 
-#: ../src/etats_affiche.c:2475 ../src/export_csv.c:824 ../src/gsb_form.c:1388
+#: ../src/etats_affiche.c:2475 ../src/export_csv.c:832 ../src/gsb_form.c:1388
 #: ../src/gsb_form_widget.c:469 ../src/gsb_transactions_list.c:168
 #: ../src/traitement_variables.c:104
 msgid "Bank references"
@@ -2520,7 +2520,7 @@ msgstr "数据显示"
 msgid "Generalities"
 msgstr "普遍性"
 
-#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:764
+#: ../src/etats_config.c:634 ../src/etats_config.c:637 ../src/export_csv.c:772
 #: ../src/fenetre_principale.c:242 ../src/parametres.c:432
 msgid "Transactions"
 msgstr "交易"
@@ -2653,16 +2653,17 @@ msgstr "选择报表包含的账户:"
 
 #: ../src/etats_config.c:2548 ../src/etats_config.c:2803
 #: ../src/etats_config.c:3085 ../src/etats_config.c:3892
-#: ../src/etats_config.c:4082 ../src/etats_config.c:7313
-#: ../src/tiers_onglet.c:1404 ../src/tiers_onglet.c:1424
+#: ../src/etats_config.c:4082 ../src/etats_config.c:7313 ../src/export.c:611
+#: ../src/gsb_assistant.c:91 ../src/tiers_onglet.c:1404
+#: ../src/tiers_onglet.c:1424
 msgid "Select all"
 msgstr "选择所有"
 
 #. ajoute le bouton (dé)sélectionne tout
 #: ../src/etats_config.c:2563 ../src/etats_config.c:2818
 #: ../src/etats_config.c:3100 ../src/etats_config.c:3907
-#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/import.c:2267
-#: ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
+#: ../src/etats_config.c:4097 ../src/etats_config.c:7328 ../src/export.c:606
+#: ../src/import.c:2267 ../src/tiers_onglet.c:1195 ../src/tiers_onglet.c:1406
 msgid "Unselect all"
 msgstr "取消选择所有"
 
@@ -3280,7 +3281,7 @@ msgstr "根据支付方式选择交易"
 msgid "Select methods of payment to include: "
 msgstr "选择包含的支付方式:"
 
-#: ../src/etats_csv.c:172 ../src/export_csv.c:407
+#: ../src/etats_csv.c:172 ../src/export_csv.c:415
 #, fuzzy, c-format
 msgid ""
 "Unable to create file \"%s\" :\n"
@@ -3615,11 +3616,11 @@ msgstr "从 %s %d"
 msgid "to %s %d"
 msgstr "到 %s %d"
 
-#: ../src/export.c:79
+#: ../src/export.c:89
 msgid "Exporting Grisbi accounts"
 msgstr ""
 
-#: ../src/export.c:80
+#: ../src/export.c:90
 msgid ""
 "This assistant will guide you through the process of exporting Grisbi "
 "accounts into QIF or CSV files.\n"
@@ -3628,87 +3629,97 @@ msgid ""
 "into currency of their respective account."
 msgstr ""
 
-#: ../src/export.c:136
+#: ../src/export.c:174
 msgid "Select accounts to export"
 msgstr "选择要导出的账户"
 
-#: ../src/export.c:173 ../src/export_csv.c:767
+#: ../src/export.c:211 ../src/export_csv.c:775
 #: ../src/gsb_data_partial_balance.c:1498
 msgid "Account name"
 msgstr "账户名称"
 
-#: ../src/export.c:256
+#: ../src/export.c:240
+#, fuzzy
+msgid "Select options to export"
+msgstr "选择要导出的账户"
+
+#: ../src/export.c:241 ../src/export.c:460
+#: ../src/gsb_assistant_archive_export.c:306
+#, fuzzy
+msgid "QIF format"
+msgstr "信息"
+
+#: ../src/export.c:241 ../src/export.c:461
+#: ../src/gsb_assistant_archive_export.c:307
+msgid "CSV format"
+msgstr ""
+
+#: ../src/export.c:247
+msgid "Treat all files as the first"
+msgstr ""
+
+#: ../src/export.c:324
 #, fuzzy
 msgid "Export setup terminated"
 msgstr "导出报表"
 
-#: ../src/export.c:260
+#: ../src/export.c:328
 msgid ""
 "You have successfully set up data export into Grisbi.  Press the 'Close' "
 "button to actually export data."
 msgstr ""
 
-#: ../src/export.c:288
+#: ../src/export.c:361
 #, fuzzy
 msgid "Accounts to export"
 msgstr "选择要导出的账户"
 
-#: ../src/export.c:293
+#: ../src/export.c:366
 msgid ""
 "The following accounts are to be exported. In the next screens, you will "
 "choose what to do with each of them."
 msgstr ""
 
-#: ../src/export.c:368 ../src/gsb_assistant_archive_export.c:300
+#: ../src/export.c:455 ../src/gsb_assistant_archive_export.c:300
 #, fuzzy
 msgid "Export format: "
 msgstr "导出报表:"
 
-#: ../src/export.c:373 ../src/gsb_assistant_archive_export.c:306
-#, fuzzy
-msgid "QIF format"
-msgstr "信息"
-
-#: ../src/export.c:374 ../src/gsb_assistant_archive_export.c:307
-msgid "CSV format"
-msgstr ""
-
-#. set the initial balance
-#: ../src/export_csv.c:288
+#: ../src/export_csv.c:291
 msgid "Initial balance"
 msgstr "初始余额"
 
-#: ../src/export_csv.c:605
+#: ../src/export_csv.c:613
 msgid "B"
 msgstr "B"
 
-#: ../src/export_csv.c:728 ../src/gsb_form.c:1913
+#: ../src/export_csv.c:736 ../src/gsb_form.c:1913
 msgid "Deleted account"
 msgstr "已删除账户"
 
-#: ../src/export_csv.c:770 ../src/import_csv.c:95
+#: ../src/export_csv.c:778 ../src/import_csv.c:95
 #, fuzzy
 msgid "Split"
 msgstr "Spain"
 
-#: ../src/export_csv.c:779
+#: ../src/export_csv.c:787
 msgid "Cheques"
 msgstr "支票"
 
-#: ../src/export_csv.c:785 ../src/gsb_transactions_list.c:165
+#: ../src/export_csv.c:793 ../src/gsb_transactions_list.c:165
 #: ../src/import_csv.c:94 ../src/traitement_variables.c:101
 msgid "C/R"
 msgstr "C/R"
 
-#: ../src/export_csv.c:806 ../src/import_csv.c:87
+#: ../src/export_csv.c:814 ../src/import_csv.c:87
 msgid "Sub-categories"
 msgstr "子类别"
 
-#: ../src/export_csv.c:815 ../src/import_csv.c:89
+#: ../src/export_csv.c:823 ../src/import_csv.c:89
 msgid "Sub-budgetary lines"
 msgstr "子类别行"
 
-#: ../src/export_csv.c:821
+#: ../src/export_csv.c:829
 msgid "Reconciliation number"
 msgstr "调整数量"
 
@@ -4951,7 +4962,7 @@ msgid ""
 "or the close button to cancel the action."
 msgstr ""
 
-#: ../src/gsb_assistant.c:229
+#: ../src/gsb_assistant.c:243
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -7774,7 +7785,7 @@ msgstr ""
 msgid "Encryption plugin not found."
 msgstr "账户 %s 未找到\n"
 
-#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5479
+#: ../src/gsb_file_load.c:464 ../src/gsb_file_load.c:5489
 #, fuzzy
 msgid "This is not a Grisbi file... Loading aborted."
 msgstr "该文件不是Grisbi报表"
@@ -7788,14 +7799,14 @@ msgid ""
 msgstr ""
 
 #. we don't know here the release of that file, give the release needed
-#: ../src/gsb_file_load.c:8876
+#: ../src/gsb_file_load.c:8890
 #, 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:8901
+#: ../src/gsb_file_load.c:8915
 msgid ""
 "You have opened an archive.\n"
 "There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7803,7 +7814,7 @@ msgid ""
 "transactions or important information."
 msgstr ""
 
-#: ../src/gsb_file_load.c:8905
+#: ../src/gsb_file_load.c:8919
 msgid "Grisbi archive opened"
 msgstr ""
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8e823b1..4303d78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -I$(top_srcdir) $(GRISBI_CFLAGS) $(IGE_MAC_CFLAGS) -DLOCALEDIR=\"$
 bin_PROGRAMS = grisbi
 noinst_LTLIBRARIES = libgrisbi.la
 
-grisbi_LDADD = $(GRISBI_LIBS) $(IGE_MAC_LIBS) libgrisbi.la
+grisbi_LDADD = $(GRISBI_LIBS) $(GTK_MAC_LIBS) libgrisbi.la
 
 libgrisbi_la_LIBADD =
 if ENABLE_STATIC
@@ -16,7 +16,7 @@ libgrisbi_la_LIBADD += \
 else
 libgrisbi_la_LDFLAGS = -export_dynamic
 endif
-libgrisbi_la_LIBADD += $(LIBM) $(GRISBI_LIBS) $(IGE_MAC_LIBS)
+libgrisbi_la_LIBADD += $(LIBM) $(GRISBI_LIBS) $(GTK_MAC_LIBS)
 
 libgrisbi_la_SOURCES = \
 	accueil.c		\
diff --git a/src/export.c b/src/export.c
index 3ad40c3..a725a27 100644
--- a/src/export.c
+++ b/src/export.c
@@ -30,26 +30,36 @@
 
 /*START_INCLUDE*/
 #include "export.h"
-#include "gsb_assistant.h"
+#include "dialog.h"
 #include "export_csv.h"
+#include "gsb_assistant.h"
+#include "gsb_automem.h"
 #include "gsb_data_account.h"
 #include "gsb_file.h"
-#include "dialog.h"
-#include "utils.h"
 #include "qif.h"
 #include "structures.h"
+#include "traitement_variables.h"
+#include "utils.h"
+#include "erreur.h"
 /*END_INCLUDE*/
 
 
 /*START_STATIC*/
 static GtkWidget * create_export_account_resume_page ( struct exported_account * account );
+static void export_account_all_toggled ( GtkToggleButton *button,
+                        GtkTreeView *tree_view );
 static gboolean export_account_change_format ( GtkWidget * combo,
 					struct exported_account * account );
+static gboolean export_account_radiobutton_format_changed ( GtkWidget *checkbutton,
+                        GdkEventButton *event,
+                        gint *pointeur );
+static void expert_account_free_account_structure ( struct exported_account *account );
 static void export_account_toggled ( GtkCellRendererToggle *cell, gchar *path_str,
 			      GtkTreeModel * model );
 static GtkWidget * export_create_final_page ( GtkWidget * assistant );
 static GtkWidget * export_create_resume_page ( GtkWidget * assistant );
 static GtkWidget * export_create_selection_page ( GtkWidget * assistant );
+static gboolean export_enter_final_page ( GtkWidget *assistant );
 static gboolean export_enter_resume_page ( GtkWidget * assistant );
 static void export_resume_maybe_sensitive_next ( GtkWidget * assistant );
 /*END_STATIC*/
@@ -63,7 +73,6 @@ static GSList *selected_accounts = NULL;
 static GSList *exported_accounts = NULL;
 
 
-
 /**
  *
  *
@@ -72,53 +81,79 @@ static GSList *exported_accounts = NULL;
 void export_accounts ( void )
 {
     GtkWidget *dialog;
+    gchar *extension = NULL;
 
     selected_accounts = NULL;
     exported_accounts = NULL;
 
     dialog = gsb_assistant_new ( _("Exporting Grisbi accounts"),
-				 _("This assistant will guide you through the process of "
-				   "exporting Grisbi accounts into QIF or CSV files.\n\n"
-				   "As QIF and CSV do not support currencies, all "
-				   "transactions will be converted into currency of their "
-				   "respective account."),
-				 "impexp.png",
-				 NULL );
+                        _("This assistant will guide you through the process of "
+                        "exporting Grisbi accounts into QIF or CSV files.\n\n"
+                        "As QIF and CSV do not support currencies, all "
+                        "transactions will be converted into currency of their "
+                        "respective account."),
+                        "impexp.png",
+                        NULL );
 
-    gsb_assistant_add_page ( dialog, export_create_selection_page(dialog), 1, 0, 2,
-			     G_CALLBACK ( export_resume_maybe_sensitive_next ) );
-    gsb_assistant_add_page ( dialog, export_create_resume_page(dialog), 2, 1, 3,
-			     G_CALLBACK ( export_enter_resume_page ) );
+    gsb_assistant_add_page ( dialog, export_create_selection_page ( dialog ), 1, 0, 2,
+                        G_CALLBACK ( export_resume_maybe_sensitive_next ) );
+    gsb_assistant_add_page ( dialog, export_create_resume_page ( dialog ), 2, 1, 3,
+                        G_CALLBACK ( export_enter_resume_page ) );
 
 
     if ( gsb_assistant_run ( dialog ) == GTK_RESPONSE_APPLY )
     {
-	while ( exported_accounts )
-	{
-	    struct exported_account * account;
-
-	    account = (struct exported_account *) exported_accounts -> data;
-
-	    account -> filename = gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER(account -> chooser) );
-
-	    if ( account -> format == EXPORT_QIF )
-	    {
-		qif_export ( account -> filename, account -> account_nb, 0 );
-	    }
-	    else
-	    {
-		gsb_csv_export_account ( account -> filename, account -> account_nb );
-	    }
-
-	    exported_accounts = exported_accounts -> next;
-	}
+        while ( exported_accounts )
+        {
+            struct exported_account *account;
+
+            account = (struct exported_account *) exported_accounts->data;
+
+            if ( etat.export_files_traitement )
+            {
+                const gchar *title;
+                gchar *tmp_str;
+
+                if ( titre_fichier && strlen ( titre_fichier ) )
+                    title = titre_fichier;
+                else
+                    title = g_get_user_name ( );
+
+                if ( extension == NULL )
+                    extension = g_strdup ( account->extension );
+
+                tmp_str = g_strconcat ( title, "-",
+                                gsb_data_account_get_name ( account -> account_nb ),
+                                ".",
+                                extension,
+                                NULL );
+
+                account -> filename = g_build_filename ( gsb_file_get_last_path (), tmp_str, NULL );
+
+                g_free ( tmp_str );
+            }
+            else
+            {
+                account->filename = gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER ( account -> chooser ) );
+                extension = g_strdup ( account->extension );
+            }
+
+            if ( strcmp ( extension, "qif" ) == 0 )
+                qif_export ( account->filename, account->account_nb, 0 );
+            else    /* extension = csv */
+                gsb_csv_export_account ( account->filename, account->account_nb );
+
+            exported_accounts = exported_accounts->next;
+        }
     }
 
+    g_free ( extension );
+    g_slist_free ( selected_accounts );
+    g_slist_free_full ( exported_accounts, ( GDestroyNotify ) expert_account_free_account_structure );
     gtk_widget_destroy ( dialog );
 }
 
 
-
 /**
  *
  *
@@ -126,6 +161,9 @@ void export_accounts ( void )
 GtkWidget * export_create_selection_page ( GtkWidget * assistant )
 {
     GtkWidget * view, * vbox, * padding_box, * sw;
+    GtkWidget *combo;
+    GtkWidget *button;
+    GtkWidget *button_select;
     GtkTreeViewColumn *column;
     GtkCellRenderer *cell;
     GtkListStore * model;
@@ -191,17 +229,39 @@ GtkWidget * export_create_selection_page ( GtkWidget * assistant )
 	tmp_list = tmp_list -> next;
     }
 
+    button_select = g_object_get_data ( G_OBJECT ( assistant ), "button_select" );
+    g_object_set_data ( G_OBJECT ( button_select ), "tree_view", view );
+    g_signal_connect ( G_OBJECT ( button_select ),
+                        "toggled",
+                        G_CALLBACK ( export_account_all_toggled ),
+                        view );
+
+    combo = gsb_automem_radiobutton3_new_with_title ( vbox,
+					    _("Select options to export" ),
+					    _("QIF format" ), _("CSV format" ), NULL,
+					    &etat.export_file_format,
+					    G_CALLBACK ( export_account_radiobutton_format_changed ),
+                        &etat.export_file_format,
+                        GTK_ORIENTATION_HORIZONTAL );
+
+    button = gsb_automem_checkbutton_new ( _("Treat all files as the first" ),
+                        &etat.export_files_traitement,
+                        NULL,
+                        NULL );
+    gtk_box_pack_start ( GTK_BOX ( vbox ), button, FALSE, FALSE, 0 );
+
+    /* return */
     return vbox;
 }
 
 
-
 /**
  *
  *
  */
 GtkWidget * export_create_resume_page ( GtkWidget * assistant )
 {
+    GtkWidget *sw;
     GtkWidget * view;
     GtkTextBuffer * buffer;
 
@@ -223,7 +283,15 @@ GtkWidget * export_create_resume_page ( GtkWidget * assistant )
 
     g_object_set_data ( G_OBJECT ( assistant ), "text-buffer", buffer );
 
-    return view;
+    /* Scroll for view. */
+    sw = gtk_scrolled_window_new ( NULL, NULL );
+    gtk_widget_set_size_request ( sw, 480, 200 );
+    gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW ( sw ), GTK_SHADOW_ETCHED_IN );
+    gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( sw ), GTK_POLICY_AUTOMATIC,
+                        GTK_POLICY_AUTOMATIC );
+    gtk_container_add ( GTK_CONTAINER ( sw ), view );
+
+    return sw;
 }
 
 
@@ -273,15 +341,20 @@ GtkWidget * export_create_final_page ( GtkWidget * assistant )
  */
 gboolean export_enter_resume_page ( GtkWidget * assistant )
 {
-    GtkTextBuffer * buffer;
+    GtkWidget *button_select;
+    GtkTextBuffer *buffer;
     GtkTextIter iter;
-    GSList * list;
+    GSList *list;
     gint page = 3;
+    gint index = 0;
 
     buffer = g_object_get_data ( G_OBJECT ( assistant ), "text-buffer" );
     gtk_text_buffer_set_text (buffer, "\n", -1 );
     gtk_text_buffer_get_iter_at_offset (buffer, &iter, 1);
 
+    button_select = g_object_get_data ( G_OBJECT ( assistant ), "button_select" );
+    gtk_widget_hide ( button_select );
+
     if ( selected_accounts && g_slist_length ( selected_accounts ) )
     {
 	gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
@@ -296,8 +369,7 @@ gboolean export_enter_resume_page ( GtkWidget * assistant )
 				-1 );
 	gtk_text_buffer_insert (buffer, &iter, "\n\n", -1 );
 
-	while ( gtk_notebook_get_n_pages ( g_object_get_data ( G_OBJECT (assistant), "notebook" ) ) >
-		3 )
+	while ( gtk_notebook_get_n_pages ( g_object_get_data ( G_OBJECT (assistant), "notebook" ) ) > 3 )
 	{
 	    gtk_notebook_remove_page ( g_object_get_data ( G_OBJECT (assistant), "notebook" ), -1 );
 	}
@@ -305,24 +377,40 @@ gboolean export_enter_resume_page ( GtkWidget * assistant )
 	list = selected_accounts;
 	while ( list )
 	{
-	    struct exported_account * account;
-	    gint i = GPOINTER_TO_INT(list -> data);
+	    struct exported_account *account;
+	    gint i = GPOINTER_TO_INT ( list -> data );
 
 	    gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-						      g_strconcat ( "• ",
-								    gsb_data_account_get_name ( i ),
-								    "\n\n",
-								    NULL ),
-						      -1, "indented", NULL );
+                                g_strconcat ( "• ",
+                                gsb_data_account_get_name ( i ),
+                                "\n\n",
+                                NULL ),
+                                -1, "indented", NULL );
 
 	    account = g_malloc0 ( sizeof ( struct exported_account ) );
 	    account -> account_nb = i;
+        account->extension = "";
 	    exported_accounts = g_slist_append ( exported_accounts, account );
-	    gsb_assistant_add_page ( assistant,
-				     create_export_account_resume_page ( account ),
-				     page, page - 1, page + 1, G_CALLBACK ( NULL ) );
-	    page ++;
 
+        if ( etat.export_files_traitement )
+        {
+            if ( index == 0 )
+            {
+                gsb_assistant_add_page ( assistant,
+                         create_export_account_resume_page ( account ),
+                         page, page - 1, page + 1, G_CALLBACK ( NULL ) );
+                page ++;
+            }
+        }
+        else
+        {
+            gsb_assistant_add_page ( assistant,
+                         create_export_account_resume_page ( account ),
+                         page, page - 1, page + 1, G_CALLBACK ( NULL ) );
+            page ++;
+        }
+
+        index++;
 	    list = list -> next;
 	}
 
@@ -339,7 +427,6 @@ gboolean export_enter_resume_page ( GtkWidget * assistant )
 }
 
 
-
 /**
  *
  *
@@ -381,7 +468,7 @@ GtkWidget * create_export_account_resume_page ( struct exported_account * accoun
     gtk_file_chooser_set_extra_widget ( GTK_FILE_CHOOSER(account -> chooser), hbox );
     gtk_box_pack_start ( GTK_BOX ( vbox ), account -> chooser, TRUE, TRUE, 0 );
 
-    gtk_combo_box_set_active ( GTK_COMBO_BOX(combo), 0 );
+    gtk_combo_box_set_active ( GTK_COMBO_BOX(combo), etat.export_file_format );
 
     return vbox;
 }
@@ -400,36 +487,38 @@ GtkWidget * create_export_account_resume_page ( struct exported_account * accoun
  *
  * \return FALSE
  */
-gboolean export_account_change_format ( GtkWidget * combo,
-					struct exported_account * account )
+gboolean export_account_change_format ( GtkWidget *combo,
+                        struct exported_account *account )
 {
-    gchar * extension = "", * title;
+    gchar *title;
 
-    switch ( gtk_combo_box_get_active ( GTK_COMBO_BOX(combo) ) )
+    switch ( gtk_combo_box_get_active ( GTK_COMBO_BOX ( combo ) ) )
     {
-	    case EXPORT_QIF:
-		extension = "qif";
-		account -> format = EXPORT_QIF;
-		break;
-
-	    case EXPORT_CSV:
-		extension = "csv";
-		account -> format = EXPORT_CSV;
-		break;
+        case EXPORT_QIF:
+        account->extension = "qif";
+        account->format = EXPORT_QIF;
+        break;
+
+        case EXPORT_CSV:
+        account->extension = "csv";
+        account -> format = EXPORT_CSV;
+        break;
     }
 
     if ( titre_fichier && strlen ( titre_fichier ) )
     {
-	title = titre_fichier;
+        title = titre_fichier;
     }
     else
     {
-	title = (gchar *) g_get_user_name ();
+        title = (gchar *) g_get_user_name ( );
     }
 
-    gtk_file_chooser_set_current_name ( GTK_FILE_CHOOSER(account -> chooser),
-		       g_strconcat ( title, "-", gsb_data_account_get_name ( account -> account_nb ), ".", extension, NULL ) );
-    gtk_file_chooser_set_current_folder ( GTK_FILE_CHOOSER(account -> chooser), gsb_file_get_last_path () );
+    gtk_file_chooser_set_current_name ( GTK_FILE_CHOOSER ( account->chooser ),
+                        g_strconcat ( title, "-",
+                        gsb_data_account_get_name ( account->account_nb ), ".", account->extension,
+                        NULL ) );
+    gtk_file_chooser_set_current_folder ( GTK_FILE_CHOOSER ( account->chooser ), gsb_file_get_last_path () );
 
     return FALSE;
 }
@@ -485,20 +574,108 @@ void export_account_toggled ( GtkCellRendererToggle *cell, gchar *path_str,
  */
 void export_resume_maybe_sensitive_next ( GtkWidget * assistant )
 {
+    GtkWidget *button_select;
+
+    button_select = g_object_get_data ( G_OBJECT ( assistant ), "button_select" );
+    gtk_widget_show ( button_select );
+
     if ( selected_accounts && g_slist_length ( selected_accounts ) )
     {
-	gtk_widget_set_sensitive ( g_object_get_data ( G_OBJECT (assistant), "button_next" ),
-				   TRUE );
+        gtk_widget_set_sensitive ( g_object_get_data ( G_OBJECT (assistant), "button_next" ), TRUE );
     }
     else
     {
-	gtk_widget_set_sensitive ( g_object_get_data ( G_OBJECT (assistant), "button_next" ),
-				   FALSE );
+        gtk_widget_set_sensitive ( g_object_get_data ( G_OBJECT (assistant), "button_next" ), FALSE );
     }
 }
 
 
+void export_account_all_toggled ( GtkToggleButton *button,
+                        GtkTreeView *tree_view )
+{
+    GtkWidget *assistant;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    gint toggle_value;
 
+    model = gtk_tree_view_get_model ( tree_view );
+    assistant = g_object_get_data ( G_OBJECT ( model ), "assistant" );
+    toggle_value = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( button ) );
+    if ( toggle_value )
+    {
+      gtk_button_set_label ( GTK_BUTTON ( button ), _("Unselect all") );
+      gtk_widget_set_sensitive ( g_object_get_data ( G_OBJECT (assistant), "button_next" ), TRUE );
+    }
+    else
+    {
+      gtk_button_set_label ( GTK_BUTTON ( button ), _("Select all") );
+      gtk_widget_set_sensitive ( g_object_get_data ( G_OBJECT (assistant), "button_next" ), FALSE );
+    }
+
+    /* get first iter */
+    gtk_tree_model_get_iter_first ( GTK_TREE_MODEL ( model ), &iter );
+    do
+    {
+        gboolean toggle_item;
+        gint account_toggled;
+
+        gtk_tree_model_get (GTK_TREE_MODEL(model), &iter,
+                0, &toggle_item,
+                2, &account_toggled,
+                -1);
+
+        if ( toggle_value && !toggle_item )
+        {
+            selected_accounts = g_slist_append ( selected_accounts, GINT_TO_POINTER ( account_toggled ) );
+            gtk_list_store_set ( GTK_LIST_STORE(model), &iter, 0, !toggle_item, -1);
+        }
+        else if ( !toggle_value && toggle_item )
+        {
+            selected_accounts = g_slist_remove ( selected_accounts, GINT_TO_POINTER ( account_toggled ) );
+            gtk_list_store_set ( GTK_LIST_STORE(model), &iter, 0, !toggle_item, -1);
+        }
+    }
+    while ( gtk_tree_model_iter_next ( GTK_TREE_MODEL ( model ), &iter ) );
+
+    /* clean up */
+    export_resume_maybe_sensitive_next ( assistant );
+}
+
+
+/**
+ * Set a boolean integer to the value of a checkbutton.  Normally called
+ * via a GTK "toggled" signal handler.
+ *
+ * \param checkbutton a pointer to a checkbutton widget.
+ * \param event
+ * \param pointeur vers la donnée à modifier
+ */
+gboolean export_account_radiobutton_format_changed ( GtkWidget *checkbutton,
+                        GdkEventButton *event,
+                        gint *pointeur )
+{
+    if ( pointeur )
+    {
+        gint value = 0;
+
+        value = GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( checkbutton ), "pointer" ) );
+        *pointeur = value;
+
+        if ( etat.modification_fichier == 0 )
+            modification_fichier ( TRUE );
+    }
+
+    return FALSE;
+}
+
+
+void expert_account_free_account_structure ( struct exported_account *account )
+{
+    g_free ( account->extension );
+    g_free ( account->filename );
+
+    g_free ( account );
+}
 /* Local Variables: */
 /* c-basic-offset: 4 */
 /* End: */
diff --git a/src/export.h b/src/export.h
index 57ed933..317daa3 100644
--- a/src/export.h
+++ b/src/export.h
@@ -6,17 +6,17 @@
 
 
 /** Structure used to hold exported account information.  */
-struct exported_account {
-    gint account_nb;		/** Account number, to use with
-				 * gsb_data_account_get...() functions */
-    enum exported_format {	/** Export format. */
-	EXPORT_QIF,
-	EXPORT_CSV,
+struct exported_account
+{
+    gint account_nb;        /** Account number, to use with gsb_data_account_get...() functions */
+    enum exported_format    /** Export format. */
+    {
+        EXPORT_QIF,
+        EXPORT_CSV,
     } format;
-    gchar * filename;		/** Filename to export into. */
-    GtkWidget * chooser;	/** GtkFileChooser responsible of
-				 * choosing file to export account
-				 * into.  */
+    gchar *extension;       /** qif ou csv */
+    gchar *filename;        /** Filename to export into. */
+    GtkWidget * chooser;    /** GtkFileChooser responsible of choosing file to export account into. */
 };
 
 /* START_DECLARATION */
diff --git a/src/export_csv.c b/src/export_csv.c
index ee68400..c40a4de 100644
--- a/src/export_csv.c
+++ b/src/export_csv.c
@@ -51,6 +51,7 @@
 #include "main.h"
 #include "utils_str.h"
 #include "utils_files.h"
+#include "erreur.h"
 /*END_INCLUDE*/
 
 /*START_STATIC*/
@@ -269,81 +270,88 @@ static void csv_add_record(FILE* file,
  *
  * \return TRUE if ok, FALSE if problem
  * */
-gboolean gsb_csv_export_account ( const gchar *filename, gint account_nb )
+gboolean gsb_csv_export_account ( const gchar *filename, gint account_number )
 {
     FILE *csv_file;
     GSList *pTransactionList;
     GSList *tmp_list;
-	gchar* tmpstr;
 
-    csv_file = gsb_csv_export_open_file (filename);
+    csv_file = gsb_csv_export_open_file ( filename );
 
-    if (!csv_file)
-	return FALSE;
+    if ( !csv_file )
+        return FALSE;
 
-    if (g_csv_with_title_line)
-	gsb_csv_export_title_line (csv_file, TRUE);
+    if ( g_csv_with_title_line )
+        gsb_csv_export_title_line ( csv_file, TRUE );
 
     /* set the initial balance */
-    tmpstr = g_strconcat (_("Initial balance") , " [", 
-						     gsb_data_account_get_name(account_nb),
-						     "]", NULL );
     if ( csv_field_tiers )
         g_free ( csv_field_tiers );
-    /* TODO dOm : is it necessary to duplicate memory with g_strdup_printf since it was already newly allocated memory ? */
-    csv_field_tiers = g_strdup_printf ( "%s", tmpstr );
-    g_free ( tmpstr );
+
+    csv_field_tiers = g_strconcat (_("Initial balance") , " [",
+                        gsb_data_account_get_name ( account_number ),
+                        "]", NULL );
 
     /* set the initial current_balance,
      * as we will write all the non archived transactions,
      * we need to get the initial balance of the account, without the archived transactions */
-    current_balance = gsb_data_account_get_init_balance ( account_nb, -1);
-    tmp_list = gsb_data_archive_store_get_archives_list ();
-    while (tmp_list)
+    current_balance = gsb_data_account_get_init_balance ( account_number, -1);
+
+    tmp_list = gsb_data_archive_store_get_archives_list ( );
+    while ( tmp_list )
     {
-	gint archive_store_number;
+        gint archive_store_number;
 
-	archive_store_number = gsb_data_archive_store_get_number ( tmp_list -> data );
+        archive_store_number = gsb_data_archive_store_get_number ( tmp_list -> data );
 
-	if (gsb_data_archive_store_get_account_number (archive_store_number) == account_nb)
-	    current_balance = gsb_real_add ( current_balance,
-					     gsb_data_archive_store_get_balance (archive_store_number));
-	tmp_list = tmp_list -> next;
+        if ( gsb_data_archive_store_get_account_number ( archive_store_number ) == account_number )
+            current_balance = gsb_real_add ( current_balance,
+                                gsb_data_archive_store_get_balance ( archive_store_number ) );
+
+        tmp_list = tmp_list -> next;
     }
 
     /* ok the balance is now good, can write it */
-    CSV_CLEAR_FIELD (csv_field_solde);
-    csv_field_solde = gsb_real_get_string (current_balance);
+    CSV_CLEAR_FIELD ( csv_field_solde );
+    csv_field_solde = gsb_real_get_string ( current_balance );
     if ( current_balance.mantissa >= 0 )
     {
-	CSV_CLEAR_FIELD (csv_field_credit);
-	csv_field_credit = gsb_real_get_string (current_balance);
+        CSV_CLEAR_FIELD ( csv_field_credit );
+        csv_field_credit = gsb_real_get_string ( current_balance );
     }
     else
     {
-	CSV_CLEAR_FIELD (csv_field_debit);
-	csv_field_debit = gsb_real_get_string (gsb_real_abs (current_balance));
+        CSV_CLEAR_FIELD ( csv_field_debit );
+        csv_field_debit = gsb_real_get_string ( gsb_real_abs ( current_balance ) );
     }
 
-    csv_add_record(csv_file,TRUE, TRUE);
+    csv_add_record ( csv_file, TRUE, TRUE );
 
     /* export the transactions */
-    pTransactionList = gsb_data_transaction_get_transactions_list ();
-    pTransactionList = g_slist_sort ( pTransactionList,
+    pTransactionList = gsb_data_transaction_get_transactions_list ( );
+    tmp_list = g_slist_sort ( g_slist_copy ( pTransactionList ),
                         (GCompareFunc) gsb_csv_export_sort_by_value_date_or_date );
-    while ( pTransactionList )
+
+    while ( tmp_list )
     {
-	gint pTransaction = gsb_data_transaction_get_transaction_number (pTransactionList -> data);
+        gint pTransaction;
 
-	if ( gsb_data_transaction_get_account_number ( pTransaction ) == account_nb )
-	    /* export the transaction */
-	    /* for now, print the balance. is this usefull ? */
-	    gsb_csv_export_transaction ( pTransaction, csv_file, TRUE);
+        pTransaction = gsb_data_transaction_get_transaction_number ( tmp_list -> data );
 
-	pTransactionList = pTransactionList -> next;
+        if ( gsb_data_transaction_get_account_number ( pTransaction ) == account_number )
+        {
+            /* export the transaction */
+            /* for now, print the balance. is this usefull ? */
+            gsb_csv_export_transaction ( pTransaction, csv_file, TRUE);
+        }
+
+        tmp_list = tmp_list -> next;
     }
+
     fclose ( csv_file );
+    g_slist_free ( tmp_list );
 
+    /* return */
     return TRUE;
 }
 
@@ -973,7 +981,6 @@ gint gsb_csv_export_sort_by_value_date_or_date ( gpointer transaction_pointer_1,
     const GDate *value_date_1;
     const GDate *value_date_2;
 
-
     transaction_number_1 = gsb_data_transaction_get_transaction_number (
                         transaction_pointer_1 );
     transaction_number_2 = gsb_data_transaction_get_transaction_number (
diff --git a/src/export_csv.h b/src/export_csv.h
index 62a1060..fe6ff86 100644
--- a/src/export_csv.h
+++ b/src/export_csv.h
@@ -6,7 +6,7 @@
 
 
 /*START_DECLARATION*/
-gboolean gsb_csv_export_account ( const gchar *filename, gint account_nb );
+gboolean gsb_csv_export_account ( const gchar *filename, gint account_number );
 gboolean gsb_csv_export_archive ( const gchar *filename, gint archive_number );
 gboolean gsb_csv_export_tree_view_list ( const gchar *filename, GtkTreeView *tree_view );
 /*END_DECLARATION*/
diff --git a/src/grisbi_osx.c b/src/grisbi_osx.c
index 095089b..ecba90a 100644
--- a/src/grisbi_osx.c
+++ b/src/grisbi_osx.c
@@ -304,8 +304,8 @@ gchar *grisbi_osx_get_locale_dir ( void )
 {
     gchar *dir;
 
-    if ( gtk_osxapplication_get_bundle_id ( ) )
-        dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/share/locale", NULL );
+    if ( quartz_application_get_bundle_id ( ) )
+        dir = g_strconcat ( quartz_application_get_resource_path (), "/share/locale", NULL );
     else
         dir = g_strdup ( LOCALEDIR );
 
@@ -323,8 +323,8 @@ gchar *grisbi_osx_get_pixmaps_dir ( void )
 {
     gchar *dir;
 
-    if ( gtk_osxapplication_get_bundle_id ( ) )
-        dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/share/pixmaps/grisbi", NULL );
+    if ( quartz_application_get_bundle_id ( ) )
+        dir = g_strconcat ( quartz_application_get_resource_path (), "/share/pixmaps/grisbi", NULL );
     else
         dir = g_strdup ( PIXMAPS_DIR );
 
@@ -342,8 +342,8 @@ gchar *grisbi_osx_get_plugins_dir ( void )
 {
     gchar *dir;
 
-    if ( gtk_osxapplication_get_bundle_id ( ) )
-        dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/lib/grisbi", NULL );
+    if ( quartz_application_get_bundle_id ( ) )
+        dir = g_strconcat ( quartz_application_get_resource_path (), "/lib/grisbi", NULL );
     else
         dir = g_strdup ( PLUGINS_DIR );
 
diff --git a/src/gsb_assistant.c b/src/gsb_assistant.c
index 1af16fe..2106955 100644
--- a/src/gsb_assistant.c
+++ b/src/gsb_assistant.c
@@ -37,6 +37,8 @@
 #include "structures.h"
 #include "utils.h"
 #include "utils_str.h"
+#include "erreur.h"
+
 /*END_INCLUDE*/
 
 /*START_STATIC*/
@@ -65,36 +67,47 @@ extern GtkWidget *window;
  *
  */
 GtkWidget * gsb_assistant_new ( const gchar * title, const gchar * explanation,
-				gchar * image_filename,
-				GCallback enter_callback )
+                        gchar * image_filename,
+                        GCallback enter_callback )
 {
     GtkWidget * assistant, *notebook, *hbox, *label, *image, *view, *eb;
     GtkWidget * button_cancel, * button_prev, * button_next;
+    GtkWidget *button_select;
     GtkStyle * style;
     GtkTextBuffer * buffer;
-	gchar* tmpstr;
+    gchar *tmpstr;
+    gint width = 140;
 
     assistant = gtk_dialog_new_with_buttons ( title,
-					   GTK_WINDOW ( window ),
-					   GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
-					   NULL );
+                        GTK_WINDOW ( window ),
+                        GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
+                        NULL );
 
     gtk_window_set_default_size ( GTK_WINDOW ( assistant ), 800, 500 );
     gtk_window_set_position ( GTK_WINDOW ( assistant ), GTK_WIN_POS_CENTER_ON_PARENT );
     gtk_window_set_resizable ( GTK_WINDOW ( assistant ), TRUE );
     g_object_set_data ( G_OBJECT ( window ), "assistant", assistant );
 
+    button_select = gtk_toggle_button_new_with_label ( _("Select all") );
+    gtk_widget_set_size_request ( button_select, width, -1 );
+    gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( assistant )->action_area ),
+                        button_select, FALSE, FALSE, 0 );
+    g_object_set_data ( G_OBJECT(assistant), "button_select", button_select );
+
     button_cancel = gtk_dialog_add_button ( GTK_DIALOG(assistant),
-					    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL );
+                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL );
+    gtk_widget_set_size_request ( button_cancel, width, -1 );
     g_object_set_data ( G_OBJECT(assistant), "button_cancel", button_cancel );
 
     button_prev = gtk_dialog_add_button ( GTK_DIALOG(assistant),
-					  GTK_STOCK_GO_BACK, GTK_RESPONSE_NO );
+                        GTK_STOCK_GO_BACK, GTK_RESPONSE_NO );
+    gtk_widget_set_size_request ( button_prev, width, -1 );
     g_object_set_data ( G_OBJECT(assistant), "button_prev", button_prev );
     gtk_widget_set_sensitive ( button_prev, FALSE );
 
     button_next = gtk_dialog_add_button ( GTK_DIALOG(assistant),
-					  GTK_STOCK_GO_FORWARD, GTK_RESPONSE_YES );
+                        GTK_STOCK_GO_FORWARD, GTK_RESPONSE_YES );
+    gtk_widget_set_size_request ( button_next, width, -1 );
     g_object_set_data ( G_OBJECT(assistant), "button_next", button_next );
 
     eb = gtk_event_box_new ();
@@ -120,14 +133,12 @@ GtkWidget * gsb_assistant_new ( const gchar * title, const gchar * explanation,
     g_free ( tmpstr );
     gtk_box_pack_start ( GTK_BOX(hbox), image, FALSE, FALSE, 0 );
 
-    gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(assistant) -> vbox ), eb,
-			 FALSE, FALSE, 0 );
+    gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(assistant) -> vbox ), eb, FALSE, FALSE, 0 );
 
     notebook = gtk_notebook_new ();
     gtk_notebook_set_show_tabs ( GTK_NOTEBOOK(notebook), FALSE );
     gtk_notebook_set_show_border ( GTK_NOTEBOOK(notebook), FALSE );
-    gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(assistant) -> vbox ), notebook,
-			 TRUE, TRUE, 0 );
+    gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(assistant) -> vbox ), notebook, TRUE, TRUE, 0 );
 
     view = gtk_text_view_new ();
     gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
@@ -148,7 +159,7 @@ GtkWidget * gsb_assistant_new ( const gchar * title, const gchar * explanation,
     gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), view, gtk_label_new(NULL) );
 
     g_signal_connect_after ( notebook, "switch-page",
-			     G_CALLBACK ( gsb_assistant_change_page ), assistant );
+                        G_CALLBACK ( gsb_assistant_change_page ), assistant );
 
     gsb_assistant_set_next ( assistant, 0, 1 );
     g_object_set_data ( G_OBJECT(assistant), "notebook", notebook );
@@ -210,10 +221,13 @@ void gsb_assistant_add_page ( GtkWidget * assistant, GtkWidget * widget, gint po
 GtkResponseType gsb_assistant_run ( GtkWidget * assistant )
 {
     GtkWidget * notebook, * button_prev;
+    GtkWidget *button_select;
 
     button_prev = g_object_get_data ( G_OBJECT(assistant), "button_prev" );
+    button_select = g_object_get_data ( G_OBJECT ( assistant ), "button_select" );
 
     gtk_widget_show_all ( assistant );
+    gtk_widget_hide ( button_select );
 
     notebook = g_object_get_data ( G_OBJECT(assistant), "notebook" );
     gtk_notebook_set_current_page ( GTK_NOTEBOOK (notebook),
@@ -402,24 +416,6 @@ void gsb_assistant_next_page ( GtkWidget *assistant )
     gtk_button_clicked ( GTK_BUTTON (button_next));
 }
 
-/**
- * force the assistant to go to the previous page
- *
- * \param assistant
- *
- * \return
- * */
-/* dOm TODO : this function seems not to be used. Is it possible to remove it ?
-void gsb_assistant_prev_page ( GtkWidget *assistant )
-{
-    GtkWidget * button_prev;
-
-    button_prev = g_object_get_data ( G_OBJECT (assistant), "button_prev" );
-    gtk_button_clicked ( GTK_BUTTON (button_prev));
-}
-*/
-
-
 
 /**
  *
@@ -437,30 +433,6 @@ void gsb_assistant_change_button_next ( GtkWidget * assistant, gchar * title,
 }
 
 
-/**
- *
- *
- */
-/* dOm TODO : this function seems not to be used. Is it possible to remove it ?
-void gsb_assistant_set_additional_button ( GtkWidget * assistant, gchar * title )
-{
-    GtkWidget * additional_button;
-
-    additional_button = gtk_button_new_with_label ( title );
-    g_return_if_fail ( additional_button );
-    gtk_widget_show_all ( additional_button );
-
-
-    gtk_box_pack_start ( GTK_BOX (GTK_DIALOG(assistant)->action_area), additional_button, TRUE, TRUE, 0 );
-
-    additional_button = gtk_button_new_with_label ( title );
-    gtk_widget_show_all ( additional_button );
-    gtk_box_pack_end ( GTK_BOX (GTK_DIALOG(assistant)->action_area), additional_button, TRUE, TRUE, 0 );
-}
-*/
-
-
-
 /* Local Variables: */
 /* c-basic-offset: 4 */
 /* End: */
diff --git a/src/gsb_debug.c b/src/gsb_debug.c
index b29f7b7..5cb8048 100644
--- a/src/gsb_debug.c
+++ b/src/gsb_debug.c
@@ -697,53 +697,58 @@ gchar *gsb_debug_budget_test  ( void )
     gboolean invalid = FALSE;
 
     tmp_list = gsb_data_transaction_get_complete_transactions_list ();
-    while (tmp_list)
+    while ( tmp_list )
     {
-	gint transaction_number = gsb_data_transaction_get_transaction_number (tmp_list -> data);
-	gint budget_number = gsb_data_transaction_get_budgetary_number (transaction_number);
+        gint transaction_number;
+        gint budget_number;
 
-	if ( gsb_data_budget_get_structure (budget_number))
-	{
-	    /* budget found, check sub-budget */
-	    gint sub_budget_number = gsb_data_transaction_get_sub_budgetary_number (transaction_number);
-	    if (sub_budget_number &&
-		!gsb_data_budget_get_sub_budget_structure (budget_number, sub_budget_number))
-	    {
-		/* sub-budget not found */
-		tmpstr = g_strdup_printf ( _("Transaction %d has budget %d but invalid sub-budget %d.\n"),
-					   transaction_number, budget_number, sub_budget_number );
-		tmpstr1 = g_strconcat ( returned_text,
-					tmpstr,
-					NULL );
-		g_free (returned_text);
-		g_free (tmpstr);
-		returned_text = tmpstr1;
-		invalid = TRUE;
-	    }
-	}
-	else
-	{
-	    /* budget not found */
-	    tmpstr = g_strdup_printf ( _("Transaction %d has invalid budget %d.\n"),
-				       transaction_number, budget_number );
-	    tmpstr1 = g_strconcat ( returned_text,
-				    tmpstr,
-				    NULL );
-	    g_free (returned_text);
-	    g_free (tmpstr);
-	    returned_text = tmpstr1;
-	    invalid = TRUE;
-	}
-	tmp_list = tmp_list -> next;
+        transaction_number = gsb_data_transaction_get_transaction_number ( tmp_list -> data );
+        budget_number = gsb_data_transaction_get_budgetary_number ( transaction_number );
+
+        if ( gsb_data_budget_get_structure ( budget_number ) )
+        {
+            gint sub_budget_number;
+
+            sub_budget_number = gsb_data_transaction_get_sub_budgetary_number (transaction_number);
+            /* budget found, check sub-budget */
+            if ( sub_budget_number
+             &&
+             !gsb_data_budget_get_sub_budget_structure ( budget_number, sub_budget_number ) )
+            {
+            /* sub-budget not found */
+                tmpstr = g_strdup_printf ( _("Transaction %d has budget %d but invalid sub-budget %d.\n"),
+                               transaction_number, budget_number, sub_budget_number );
+                tmpstr1 = g_strconcat ( returned_text, tmpstr, NULL );
+                g_free (returned_text);
+                g_free (tmpstr);
+                returned_text = tmpstr1;
+                invalid = TRUE;
+            }
+        }
+        else
+        {
+            /* budget not found */
+            tmpstr = g_strdup_printf ( _("Transaction %d has invalid budget %d.\n"),
+                           transaction_number, budget_number );
+            tmpstr1 = g_strconcat ( returned_text,
+                        tmpstr,
+                        NULL );
+            g_free (returned_text);
+            g_free (tmpstr);
+            returned_text = tmpstr1;
+            invalid = TRUE;
+        }
+        tmp_list = tmp_list -> next;
     }
 
     if (invalid)
-	return returned_text;
+        return returned_text;
     else
     {
-	g_free (returned_text);
-	return NULL;
+        g_free (returned_text);
+        return NULL;
     }
+
     return NULL;
 }
 
@@ -762,25 +767,30 @@ gboolean gsb_debug_budget_test_fix ()
     tmp_list = gsb_data_transaction_get_complete_transactions_list ();
     while (tmp_list)
     {
-	gint transaction_number = gsb_data_transaction_get_transaction_number (tmp_list -> data);
-	gint budget_number = gsb_data_transaction_get_budgetary_number (transaction_number);
+        gint transaction_number;
+        gint budget_number;
 
-	if ( gsb_data_budget_get_structure (budget_number))
-	{
-	    /* budget found, check sub-budget */
-	    gint sub_budget_number = gsb_data_transaction_get_sub_budgetary_number (transaction_number);
-	    if (sub_budget_number &&
-		!gsb_data_budget_get_sub_budget_structure (budget_number, sub_budget_number))
-		/* sub-budget not found */
-		gsb_data_transaction_set_budgetary_number (transaction_number, 0);
-	}
-	else
-	{
-	    /* budget not found */
-	    gsb_data_transaction_set_sub_budgetary_number (transaction_number, 0);
-	    gsb_data_transaction_set_budgetary_number (transaction_number, 0);
-	}
-	tmp_list = tmp_list -> next;
+        transaction_number = gsb_data_transaction_get_transaction_number (tmp_list -> data);
+        budget_number = gsb_data_transaction_get_budgetary_number (transaction_number);
+
+        if ( gsb_data_budget_get_structure ( budget_number ) )
+        {
+            gint sub_budget_number;
+
+            /* budget found, check sub-budget */
+            sub_budget_number = gsb_data_transaction_get_sub_budgetary_number ( transaction_number );
+            if (sub_budget_number &&
+            !gsb_data_budget_get_sub_budget_structure ( budget_number, sub_budget_number ) )
+            /* sub-budget not found */
+                gsb_data_transaction_set_sub_budgetary_number ( transaction_number, 0 );
+        }
+        else
+        {
+            /* budget not found */
+            gsb_data_transaction_set_sub_budgetary_number (transaction_number, 0);
+            gsb_data_transaction_set_budgetary_number (transaction_number, 0);
+        }
+        tmp_list = tmp_list -> next;
     }
     return TRUE;
 }
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index f94fc81..046ad14 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -867,6 +867,16 @@ void gsb_file_load_general_part ( const gchar **attribute_names,
         etat.get_fyear_by_value_date = utils_str_atoi ( attribute_values[i]);
     }
 
+    else if ( !strcmp ( attribute_names[i], "Export_file_format" ) )
+    {
+        etat.export_file_format = utils_str_atoi ( attribute_values[i] );
+    }
+
+    else if ( !strcmp ( attribute_names[i], "Export_files_traitement" ) )
+    {
+        etat.export_files_traitement = utils_str_atoi ( attribute_values[i] );
+    }
+
     else if ( !strcmp ( attribute_names[i], "Reconcile_end_date" ) )
     {
         etat.reconcile_end_date = utils_str_atoi ( attribute_values[i] );
@@ -8731,10 +8741,14 @@ gboolean gsb_file_load_update_previous_version ( void )
                 /* add the amount of the transaction to the init balance of that reconcile,
                  * used later to find the initials and finals balances */
                 if (!gsb_data_transaction_get_mother_transaction_number (transaction_number))
+                {
                     gsb_data_reconcile_set_init_balance ( reconcile_number,
                             gsb_real_add ( gsb_data_reconcile_get_init_balance (
                             reconcile_number),
-                            gsb_data_transaction_get_amount (transaction_number)));
+                            gsb_data_transaction_get_adjusted_amount ( transaction_number,
+                            gsb_data_account_get_currency_floating_point ( account_number ) ) ) );
+
+                }
             }
             list_tmp_transactions = list_tmp_transactions -> next;
         }
diff --git a/src/gsb_file_save.c b/src/gsb_file_save.c
index 853d8e7..4d73f64 100644
--- a/src/gsb_file_save.c
+++ b/src/gsb_file_save.c
@@ -713,6 +713,8 @@ gulong gsb_file_save_general_part ( gulong iterator,
 					   "\t\tImport_fusion_transactions=\"%d\"\n"
                        "\t\tImport_categorie_for_payee=\"%d\"\n"
 					   "\t\tImport_fyear_by_value_date=\"%d\"\n"
+					   "\t\tExport_file_format=\"%d\"\n"
+                       "\t\tExport_files_traitement=\"%d\"\n"
 					   "\t\tReconcile_end_date=\"%d\"\n"
 					   "\t\tUse_logo=\"%d\"\n"
                        "\t\tName_logo=\"%s\"\n"
@@ -764,6 +766,8 @@ gulong gsb_file_save_general_part ( gulong iterator,
 	etat.get_fusion_import_transactions,
 	etat.get_categorie_for_payee,
 	etat.get_fyear_by_value_date,
+    etat.export_file_format,
+    etat.export_files_traitement,
     etat.reconcile_end_date,
 	etat.utilise_logo,
     my_safe_null_str( etat.name_logo ),
diff --git a/src/structures.h b/src/structures.h
index 26c8685..44ae645 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -116,12 +116,19 @@ struct gsb_etat_t
     gint display_message_qif_export_currency;
     gint display_message_ofx_security;
 
-    /* import rules */
+    /* import files */
     gint get_extract_number_for_check;      /* TRUE if Extracting a number and save it in the field No Cheque/Virement */
     gint get_fusion_import_transactions;    /* TRUE if merge transactions imported with transactions found*/
     gint get_categorie_for_payee;           /* TRUE to automatically retrieve the category of the payee if it exists */
     gint get_fyear_by_value_date;           /* TRUE to get the fyear by value date, FALSE by date */
 
+    gchar * csv_separator;                              /** CSV separator to use while parsing a CSV file. */
+    gboolean csv_skipped_lines [ CSV_MAX_TOP_LINES ];   /* Contains a pointer to skipped lines in CSV preview. */
+
+    /* export files */
+    gint export_file_format;                /* EXPORT_QIF or EXPORT_CSV */
+    gboolean export_files_traitement;       /* 0 = traitement individuel, 1 = traitement automatique */
+
     /* combofix configuration */
     gint combofix_mixed_sort;               /* TRUE for no separation between the categories */
     gint combofix_max_item;                 /* maximum number of items we want before showing the popup */
@@ -145,9 +152,6 @@ struct gsb_etat_t
     gint last_tip; 
     gint show_tip; 
 
-    gchar * csv_separator;                              /** CSV separator to use while parsing a CSV file. */
-    gboolean csv_skipped_lines [ CSV_MAX_TOP_LINES ];   /* Contains a pointer to skipped lines in CSV preview. */
-
     /* variables pour les metatree */
     gint metatree_sort_transactions;        /* 1 = sorting by increasing date 2 = Sort by date descending */
     gint add_archive_in_total_balance;      /* Add transactions archived in the totals */


hooks/post-receive
-- 
grisbi


More information about the cvs mailing list