From 83d144ca3c025821f912869a9d04d1f6e6b85611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Sun, 26 Feb 2012 14:24:04 +0100
Subject: [PATCH] Add support for translations and update translations

---
 ressources/po/french.mo         | Bin 10274 -> 10395 bytes
 ressources/po/french.po         | 619 +++++++++++++++++---------------
 ressources/po/kisscount.pot     | 467 ++++++++++++------------
 src/controller/KissCount.cpp    |   3 +-
 src/view/PreferencesPanel.cpp   |   4 +-
 src/view/SupportedLanguages.hpp |   9 +-
 src/view/wxUI.cpp               |  82 +++--
 src/view/wxUI.hpp               |   4 +-
 tools/generate_locales.sh       |  24 +-
 9 files changed, 654 insertions(+), 558 deletions(-)

diff --git a/ressources/po/french.mo b/ressources/po/french.mo
index 2f1f54b5f9f5305690bc3bdf0af8929e3878cc25..e1893d475205c0f02eefb0d19a86a2fbdef4898c 100644
GIT binary patch
delta 4221
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
I@08B}0tvOjoB#j-

delta 4153
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

diff --git a/ressources/po/french.po b/ressources/po/french.po
index d377c9e..cf72243 100644
--- a/ressources/po/french.po
+++ b/ressources/po/french.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-06 17:24+0200\n"
+"POT-Creation-Date: 2012-02-26 09:14+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Soutadé <soutade@gmail.com>\n"
 "Language-Team: \n"
@@ -19,205 +19,212 @@ msgstr ""
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/view/StatsPanel.cpp:384
-#: src/view/PreferencesPanel.cpp:832
+#: src/view/StatsPanel.cpp:415
 msgid " - "
 msgstr " - "
 
-#: src/view/UsersDialog.cpp:125
-#: src/view/PreferencesPanel.cpp:496
-#: src/view/PreferencesPanel.cpp:516
-#: src/view/PreferencesPanel.cpp:727
-#: src/view/PreferencesPanel.cpp:746
-#: src/view/PreferencesPanel.cpp:790
+#: src/view/UsersDialog.cpp:120
+#: src/view/PreferencesPanel.cpp:826
+#: src/view/PreferencesPanel.cpp:846
+#: src/view/PreferencesPanel.cpp:978
+#: src/view/PreferencesPanel.cpp:997
+#: src/view/PreferencesPanel.cpp:1038
 msgid " already exists"
 msgstr " existe déjà"
 
-#: src/view/ImportPanel.cpp:283
+#: src/view/ImportPanel.cpp:278
 msgid " and "
 msgstr " et "
 
-#: src/view/SearchPanel.cpp:114
-#: src/view/ExportPanel.cpp:106
+#: src/view/SearchPanel.cpp:104
+#: src/view/ExportPanel.cpp:98
 msgid " entries found"
 msgstr " entrées trouvées"
 
-#: src/model/Database.cpp:106
+#: src/model/Database.cpp:112
 msgid " not found, aborting"
 msgstr " non trouvé, arrêt"
 
-#: src/view/AccountPanel.cpp:879
+#: src/view/AccountPanel.cpp:979
 msgid " operations ?"
 msgstr " opérations ?"
 
-#: src/view/PreferencesPanel.cpp:839
+#: src/view/PreferencesPanel.cpp:1090
 msgid " profil ?"
 msgstr " profil ?"
 
-#: src/view/ImportPanel.cpp:289
+#: src/view/ImportPanel.cpp:284
 msgid " will be created, is it ok ?"
 msgstr " vont être créés, êtes vous d'accord ?"
 
-#: src/model/Database.cpp:92
+#: src/model/Database.cpp:102
 msgid "!! Warning !! If there was a bug, the old database will be suppressed !"
 msgstr "!! Attention !! S'il y a eu un bug, l'ancienne base de donnée va être supprimée !"
 
-#: src/view/ImportPanel.cpp:282
+#: src/view/ImportPanel.cpp:277
 #, c-format
 msgid "%d accounts"
 msgstr "%d comptes"
 
-#: src/view/ImportPanel.cpp:287
+#: src/view/ImportPanel.cpp:282
 #, c-format
 msgid "%d categories"
 msgstr "%d catégories"
 
-#: src/view/SearchPanel.cpp:116
-#: src/view/ExportPanel.cpp:108
+#: src/view/StatsPanel.cpp:355
+msgid "0 line"
+msgstr "Limite 0"
+
+#: src/view/SearchPanel.cpp:106
+#: src/view/ExportPanel.cpp:100
 msgid "1 entry found"
 msgstr "1 entrée trouvée"
 
-#: src/view/SearchBanner.cpp:83
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/SearchBanner.cpp:93
+#: src/view/grid/GridAccount.cpp:72
 msgid "Account"
 msgstr "Compte"
 
-#: src/view/PreferencesPanel.cpp:496
-#: src/view/PreferencesPanel.cpp:516
+#: src/view/PreferencesPanel.cpp:826
+#: src/view/PreferencesPanel.cpp:846
 msgid "Account "
 msgstr "Le compte "
 
-#: src/controller/KissCount.cpp:372
+#: src/controller/KissCount.cpp:345
 msgid "Account 1"
 msgstr "Compte 1"
 
-#: src/view/ImportPanel.cpp:74
-#: src/view/AccountPanel.cpp:112
+#: src/view/ImportPanel.cpp:64
+#: src/view/AccountPanel.cpp:471
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: src/view/AccountPanel.cpp:111
+#: src/view/AccountPanel.cpp:470
 msgid "Account number"
 msgstr "Numéro de compte"
 
-#: src/view/StatsPanel.cpp:336
-#: src/view/PreferencesPanel.cpp:60
+#: src/view/StatsPanel.cpp:354
+#: src/view/PreferencesPanel.cpp:47
 msgid "Accounts"
 msgstr "Comptes"
 
-#: src/view/AccountPanel.cpp:1107
+#: src/view/AccountPanel.cpp:1195
 msgid "Accounts updated until "
 msgstr "Comptes mis à jours jusqu'à "
 
-#: src/view/SearchBanner.cpp:79
+#: src/view/StatsPanel.cpp:339
+msgid "Amount"
+msgstr "Montant"
+
+#: src/view/SearchBanner.cpp:89
 msgid "Amount from"
 msgstr "Montant min"
 
-#: src/view/SearchBanner.cpp:80
+#: src/view/SearchBanner.cpp:90
 msgid "Amount to"
 msgstr "Montant max"
 
-#: src/view/AccountPanel.cpp:1114
+#: src/view/AccountPanel.cpp:1200
 msgid "Any account updated !"
 msgstr "Aucun compte mis à jour"
 
-#: src/view/ImportPanel.cpp:175
-#: src/view/ExportPanel.cpp:138
+#: src/view/ImportPanel.cpp:170
+#: src/view/ExportPanel.cpp:131
 msgid "Any engine can process this file !"
 msgstr "Format de fichier non reconnu"
 
-#: src/view/PreferencesPanel.cpp:839
-#: src/view/AccountPanel.cpp:874
+#: src/view/PreferencesPanel.cpp:1090
+#: src/view/AccountPanel.cpp:974
 msgid "Are you sure want to delete "
 msgstr "Etes vous sûr de vouloir supprimer "
 
-#: src/view/grid/GridAccount.cpp:859
+#: src/view/grid/GridAccount.cpp:757
 msgid "Are you sure want to delete : \n"
 msgstr "Etes vous sûr de vouloir supprimer : \n"
 
-#: src/view/ImportPanel.cpp:367
+#: src/view/ImportPanel.cpp:361
 msgid "Are you sure want to integrate these operations ?"
 msgstr "Etes vous sûr de vouloir intégreer ces opérations"
 
-#: src/view/PreferencesPanel.cpp:369
+#: src/view/PreferencesPanel.cpp:470
 msgid "Ascending"
 msgstr "Croissant"
 
-#: src/view/PreferencesPanel.cpp:293
+#: src/view/PreferencesPanel.cpp:356
 msgid "Background color"
 msgstr "Couleur d'arrière plan"
 
-#: src/view/AccountPanel.cpp:236
+#: src/view/AccountPanel.cpp:272
 msgid "Balance"
 msgstr "Solde"
 
-#: src/view/PreferencesPanel.cpp:200
+#: src/view/PreferencesPanel.cpp:223
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: src/view/UsersDialog.cpp:52
-#: src/view/GenerateDialog.cpp:61
-#: src/view/PasswordDialog.cpp:56
+#: src/view/UsersDialog.cpp:50
+#: src/view/GenerateDialog.cpp:49
+#: src/view/PasswordDialog.cpp:50
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/view/grid/GridAccount.cpp:1294
-#: src/view/grid/GridAccount.cpp:1301
+#: src/view/grid/GridAccount.cpp:1247
+#: src/view/grid/GridAccount.cpp:1260
 msgid "Cannot group these operations"
 msgstr "Impossible de grouper ces opérations"
 
-#: src/view/grid/GridAccount.cpp:1420
-#: src/view/grid/GridAccount.cpp:1426
+#: src/view/grid/GridAccount.cpp:1391
+#: src/view/grid/GridAccount.cpp:1397
 msgid "Cannot ungroup these operations"
 msgstr "Impossible de dégrouper ces opérations"
 
-#: src/controller/KissCount.cpp:363
+#: src/controller/KissCount.cpp:336
 msgid "Car"
 msgstr "Voiture"
 
-#: src/view/PreferencesPanel.cpp:61
+#: src/view/PreferencesPanel.cpp:48
 msgid "Categories"
 msgstr "Catégories"
 
-#: src/view/SearchBanner.cpp:81
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/SearchBanner.cpp:91
+#: src/view/grid/GridAccount.cpp:72
 msgid "Category"
 msgstr "Catégorie"
 
-#: src/view/PreferencesPanel.cpp:727
-#: src/view/PreferencesPanel.cpp:746
+#: src/view/PreferencesPanel.cpp:978
+#: src/view/PreferencesPanel.cpp:997
 msgid "Category "
 msgstr "La catégorie "
 
-#: src/view/ImportPanel.cpp:82
+#: src/view/ImportPanel.cpp:71
 msgid "Category name"
 msgstr "Catégorie"
 
-#: src/view/PreferencesPanel.cpp:78
+#: src/view/PreferencesPanel.cpp:65
 msgid "Change Name"
 msgstr "Changer de nom"
 
-#: src/view/PreferencesPanel.cpp:79
+#: src/view/PreferencesPanel.cpp:66
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: src/view/SearchPanel.cpp:59
+#: src/view/SearchPanel.cpp:47
 msgid "Change account"
 msgstr "Changer de compte"
 
-#: src/view/SearchPanel.cpp:60
+#: src/view/SearchPanel.cpp:48
 msgid "Change category"
 msgstr "Changer la catégorie"
 
-#: src/view/PasswordDialog.cpp:29
+#: src/view/PasswordDialog.cpp:30
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: src/view/AccountPanel.cpp:128
+#: src/view/AccountPanel.cpp:149
 msgid "Check"
 msgstr "Rapprochement"
 
-#: src/view/SearchBanner.cpp:70
+#: src/view/SearchBanner.cpp:74
 msgid "Checked"
 msgstr "Rapprochée"
 
@@ -225,315 +232,339 @@ msgstr "Rapprochée"
 msgid "Choose a database to open"
 msgstr "Choisissez une base de données à ouvrir"
 
-#: src/view/SearchPanel.cpp:154
+#: src/view/SearchPanel.cpp:144
 msgid "Choose a new account"
 msgstr "Nouveau compte"
 
-#: src/view/SearchPanel.cpp:196
+#: src/view/SearchPanel.cpp:184
 msgid "Choose a new category"
 msgstr "Nouvelle catégorie"
 
-#: src/view/PasswordDialog.cpp:46
-msgid "Confirm password "
-msgstr "Confirmer le mot de passe "
+#: src/view/PasswordDialog.cpp:41
+msgid "Confirm password"
+msgstr "Confirmer le mot de passe"
 
-#: src/view/StatsPanel.cpp:142
-#: src/view/AccountPanel.cpp:122
+#: src/view/StatsPanel.cpp:158
+#: src/view/AccountPanel.cpp:98
 msgid "Cost repartition"
 msgstr "Répartition des coûts"
 
-#: src/view/ImportPanel.cpp:187
-#: src/view/ImportPanel.cpp:217
-#: src/view/ImportPanel.cpp:260
-#: src/view/ImportPanel.cpp:269
-#: src/view/ImportPanel.cpp:297
-#: src/view/ImportPanel.cpp:315
+#: src/view/ImportPanel.cpp:181
+#: src/view/ImportPanel.cpp:211
+#: src/view/ImportPanel.cpp:255
+#: src/view/ImportPanel.cpp:264
+#: src/view/ImportPanel.cpp:291
+#: src/view/ImportPanel.cpp:309
 msgid "Create one"
 msgstr "En créer un"
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:72
 msgid "Credit"
 msgstr "Crédit"
 
-#: src/view/AccountPanel.cpp:234
+#: src/view/AccountPanel.cpp:268
 msgid "Cur Credit"
 msgstr "Cur Crédit"
 
-#: src/view/AccountPanel.cpp:235
+#: src/view/AccountPanel.cpp:269
 msgid "Cur Debit"
 msgstr "Cur Débit"
 
-#: src/view/AccountPanel.cpp:114
+#: src/view/AccountPanel.cpp:473
 msgid "Current value"
 msgstr "Valeur courante"
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:72
 msgid "Date"
 msgstr "Date"
 
-#: src/view/SearchBanner.cpp:41
+#: src/view/SearchBanner.cpp:30
 msgid "Date from"
 msgstr "Date min"
 
-#: src/view/SearchBanner.cpp:42
+#: src/view/SearchBanner.cpp:31
 msgid "Date to"
 msgstr "Date max"
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:72
 msgid "Debit"
 msgstr "Débit"
 
-#: src/view/PreferencesPanel.cpp:198
+#: src/view/PreferencesPanel.cpp:221
 msgid "Default"
 msgstr "Défaut"
 
-#: src/view/PreferencesPanel.cpp:201
-#: src/view/PreferencesPanel.cpp:296
-#: src/view/AccountPanel.cpp:733
+#: src/view/PreferencesPanel.cpp:224
+#: src/view/PreferencesPanel.cpp:359
+#: src/view/AccountPanel.cpp:832
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/view/PreferencesPanel.cpp:370
+#: src/view/PreferencesPanel.cpp:471
 msgid "Descending"
 msgstr "Décroissant"
 
-#: src/view/SearchBanner.cpp:78
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/SearchBanner.cpp:88
+#: src/view/grid/GridAccount.cpp:72
 msgid "Description"
 msgstr "Description"
 
-#: src/view/SearchPanel.cpp:238
+#: src/view/SearchPanel.cpp:221
 msgid "Enter a new description"
 msgstr "Nouvelle description"
 
-#: src/view/UsersDialog.cpp:95
-#: src/view/UsersDialog.cpp:125
-#: src/view/SearchBanner.cpp:140
-#: src/view/SearchBanner.cpp:150
-#: src/view/SearchBanner.cpp:163
+#: src/view/StatsPanel.cpp:430
+#: src/view/UsersDialog.cpp:90
+#: src/view/UsersDialog.cpp:120
+#: src/view/SearchBanner.cpp:149
+#: src/view/SearchBanner.cpp:159
 #: src/view/SearchBanner.cpp:172
-#: src/view/PreferencesPanel.cpp:436
-#: src/view/PreferencesPanel.cpp:496
-#: src/view/PreferencesPanel.cpp:516
-#: src/view/PreferencesPanel.cpp:727
-#: src/view/PreferencesPanel.cpp:746
-#: src/view/PreferencesPanel.cpp:784
-#: src/view/PreferencesPanel.cpp:790
-#: src/view/PasswordDialog.cpp:72
-#: src/view/PasswordDialog.cpp:78
-#: src/view/AccountPanel.cpp:870
-#: src/view/grid/GridAccount.cpp:1294
-#: src/view/grid/GridAccount.cpp:1301
-#: src/view/grid/GridAccount.cpp:1420
-#: src/view/grid/GridAccount.cpp:1426
-#: src/view/grid/wxGridCellFormulaEditor.cpp:69
-#: src/model/Database.cpp:45
-#: src/model/Database.cpp:52
-#: src/model/Database.cpp:70
-#: src/model/Database.cpp:106
+#: src/view/SearchBanner.cpp:181
+#: src/view/ImportPanel.cpp:170
+#: src/view/ExportPanel.cpp:118
+#: src/view/ExportPanel.cpp:131
+#: src/view/ExportPanel.cpp:138
+#: src/view/PreferencesPanel.cpp:585
+#: src/view/PreferencesPanel.cpp:826
+#: src/view/PreferencesPanel.cpp:846
+#: src/view/PreferencesPanel.cpp:978
+#: src/view/PreferencesPanel.cpp:997
+#: src/view/PreferencesPanel.cpp:1032
+#: src/view/PreferencesPanel.cpp:1038
+#: src/view/PreferencesPanel.cpp:1078
+#: src/view/PasswordDialog.cpp:64
+#: src/view/PasswordDialog.cpp:70
+#: src/view/AccountPanel.cpp:970
+#: src/view/grid/GridAccount.cpp:1247
+#: src/view/grid/GridAccount.cpp:1260
+#: src/view/grid/GridAccount.cpp:1391
+#: src/view/grid/GridAccount.cpp:1397
+#: src/view/grid/FormulaDelegate.cpp:59
+#: src/model/Database.cpp:57
+#: src/model/Database.cpp:65
+#: src/model/Database.cpp:84
 #: src/model/Database.cpp:112
 #: src/model/Database.cpp:118
-#: src/model/Database.cpp:126
-#: src/model/Database.cpp:147
-#: src/model/Database_Update.cpp:23
+#: src/model/Database.cpp:124
+#: src/model/Database.cpp:134
+#: src/model/Database.cpp:154
+#: src/model/Database.cpp:604
+#: src/model/Database.cpp:786
+#: src/model/Database.cpp:928
+#: src/model/DatabaseUpdate.cpp:31
 msgid "Error"
 msgstr "Erreur"
 
-#: src/model/Database.cpp:147
+#: src/model/Database.cpp:154
 msgid "Error creating original database"
 msgstr "Erreur durant la création de la base de données initiale"
 
-#: src/view/ExportPanel.cpp:55
-#: src/view/ExportPanel.cpp:89
+#: src/view/ExportPanel.cpp:47
+#: src/view/ExportPanel.cpp:81
 msgid "Export"
 msgstr "Export"
 
-#: src/view/ExportPanel.cpp:146
+#: src/view/ExportPanel.cpp:138
 msgid "Failed to save operations"
 msgstr "Erreur lors de la sauvegarde des opérations"
 
-#: src/view/ImportPanel.cpp:73
+#: src/view/ImportPanel.cpp:64
 msgid "File account"
 msgstr "Compte du fichier"
 
-#: src/view/ImportPanel.cpp:81
+#: src/view/ImportPanel.cpp:71
 msgid "File category"
 msgstr "Catégorie du fichier"
 
-#: src/view/AccountPanel.cpp:115
+#: src/view/AccountPanel.cpp:474
 msgid "Final value"
 msgstr "Valeur finale"
 
 #: src/view/SearchBanner.cpp:70
-#: src/view/grid/GridAccount.cpp:340
-#: src/controller/KissCount.cpp:363
+#: src/view/grid/GridAccount.cpp:342
+#: src/controller/KissCount.cpp:336
 msgid "Fix"
 msgstr "Fixe"
 
-#: src/view/PreferencesPanel.cpp:295
+#: src/view/PreferencesPanel.cpp:358
 msgid "Font"
 msgstr "Police"
 
-#: src/view/PreferencesPanel.cpp:294
+#: src/view/PreferencesPanel.cpp:357
 msgid "Foreground color"
 msgstr "Couleur d'avant plan"
 
-#: src/view/StatsPanel.cpp:65
+#: src/view/StatsPanel.cpp:71
 msgid "From"
 msgstr "De"
 
-#: src/view/GenerateDialog.cpp:46
+#: src/view/GenerateDialog.cpp:36
 msgid "From "
 msgstr "A partir de "
 
-#: src/view/GenerateDialog.cpp:31
-#: src/view/AccountPanel.cpp:730
+#: src/view/GenerateDialog.cpp:33
+#: src/view/AccountPanel.cpp:829
 msgid "Generate month"
 msgstr "Générer mois"
 
-#: src/model/import/GrisbiImportEngine.cpp:201
-msgid "Grisbi files (*.gsb)|*.gsb"
-msgstr "Fichiers Grisbi (*.gsb)|*.gsb"
+#: src/model/import/GrisbiImportEngine.cpp:166
+msgid "Grisbi files (*.gsb)"
+msgstr "Fichiers Grisbi (*.gsb)"
 
-#: src/controller/KissCount.cpp:363
+#: src/controller/KissCount.cpp:336
 msgid "Groceries"
 msgstr "Courses"
 
-#: src/view/AccountPanel.cpp:134
+#: src/view/AccountPanel.cpp:167
 msgid "Group"
 msgstr "Grouper"
 
-#: src/controller/KissCount.cpp:363
+#: src/view/PreferencesPanel.cpp:225
+msgid "Hidden"
+msgstr "Caché"
+
+#: src/controller/KissCount.cpp:336
 msgid "Hobbies"
 msgstr "Loisirs"
 
-#: src/view/ImportPanel.cpp:123
+#: src/view/ImportPanel.cpp:121
 msgid "Import"
 msgstr "Import"
 
-#: src/view/AccountPanel.cpp:113
+#: src/view/AccountPanel.cpp:472
 msgid "Initial value"
 msgstr "Valeur initiale"
 
-#: src/view/ImportPanel.cpp:57
+#: src/view/ImportPanel.cpp:47
 msgid "Integrate operations"
 msgstr "Intégrer les opérations"
 
-#: src/view/ImportPanel.cpp:75
+#: src/view/ImportPanel.cpp:64
 msgid "Internal account"
 msgstr "Compte interne"
 
-#: src/view/ImportPanel.cpp:83
+#: src/view/ImportPanel.cpp:71
 msgid "Internal category"
 msgstr "Catégorie interne"
 
-#: src/view/SearchBanner.cpp:150
+#: src/view/SearchBanner.cpp:159
 msgid "Invalid amount from"
 msgstr "Montant min invalide"
 
-#: src/view/SearchBanner.cpp:172
+#: src/view/SearchBanner.cpp:181
 msgid "Invalid amount range"
 msgstr "Intervalle des montants invalide"
 
-#: src/view/SearchBanner.cpp:163
+#: src/view/SearchBanner.cpp:172
 msgid "Invalid amount to"
 msgstr "Montant max invalide"
 
-#: src/view/SearchBanner.cpp:140
+#: src/view/SearchBanner.cpp:149
 msgid "Invalid date range"
 msgstr "Intervalle de temps invalide"
 
-#: src/view/grid/wxGridCellFormulaEditor.cpp:69
+#: src/view/grid/FormulaDelegate.cpp:59
 msgid "Invalid formula !"
 msgstr "Formule invalide !"
 
-#: src/view/PreferencesPanel.cpp:784
-msgid "Invalid name"
-msgstr "Nom invalide"
+#: src/view/PreferencesPanel.cpp:1032
+msgid "Invalid name !"
+msgstr "Nom invalide !"
 
-#: src/view/PasswordDialog.cpp:72
+#: src/view/PasswordDialog.cpp:64
 msgid "Invalid old password"
 msgstr "Ancien mot de passe invalide"
 
-#: src/view/UsersDialog.cpp:95
+#: src/view/UsersDialog.cpp:90
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: src/view/StatsPanel.cpp:403
+#: src/view/StatsPanel.cpp:430
 msgid "Invalide date range"
 msgstr "Intervalle de temps invalide"
 
-#: src/view/PreferencesPanel.cpp:436
+#: src/view/PreferencesPanel.cpp:585
 msgid "It must be at least one account !"
 msgstr "Il doit y avoir au moins un compte !"
 
-#: src/view/AccountPanel.cpp:870
+#: src/view/AccountPanel.cpp:970
 msgid "It must be at least one month !"
 msgstr "Il doit rester au moins un mois"
 
-#: src/view/PreferencesPanel.cpp:80
+#: src/view/PreferencesPanel.cpp:67
 msgid "Kill me"
 msgstr "Kill me"
 
-#: src/view/StatsPanel.cpp:403
-#: src/view/PreferencesPanel.cpp:824
-#: src/view/PreferencesPanel.cpp:827
-#: src/model/Database_Update.cpp:140
+#: src/view/SearchPanel.cpp:104
+#: src/view/SearchPanel.cpp:106
+#: src/view/SearchPanel.cpp:109
+#: src/view/ExportPanel.cpp:98
+#: src/view/ExportPanel.cpp:100
+#: src/view/ExportPanel.cpp:103
+#: src/view/ExportPanel.cpp:136
 msgid "KissCount"
 msgstr "KissCount"
 
-#: src/view/ExportPanel.cpp:152
+#: src/view/ExportPanel.cpp:144
 msgid "KissCount - Export"
 msgstr "KissCount - Export"
 
-#: src/view/ImportPanel.cpp:128
+#: src/view/ImportPanel.cpp:126
 msgid "KissCount - Import"
 msgstr "KissCount - Import"
 
-#: src/model/import/XMLImportEngine.cpp:268
-msgid "KissCount xml files (*.xml)|*.xml"
-msgstr "Fichiers KissCount xml (*.xml)|*.xml"
+#: src/model/export/XMLExportEngine.cpp:34
+msgid "KissCount XML files (*.xml)"
+msgstr "Fichiers KissCount xml (*.xml)"
 
-#: src/view/PreferencesPanel.cpp:62
+#: src/model/import/XMLImportEngine.cpp:32
+msgid "KissCount xml files (*.xml)"
+msgstr "Fichiers KissCount xml (*.xml)"
+
+#: src/view/PreferencesPanel.cpp:49
 msgid "Language"
 msgstr "Langue"
 
-#: src/view/PreferencesPanel.cpp:827
+#: src/view/PreferencesPanel.cpp:1078
 msgid "Language not changed"
 msgstr "Langue non changée"
 
-#: src/view/PreferencesPanel.cpp:824
+#: src/view/PreferencesPanel.cpp:1075
 msgid "Language successfully changed, please go to another panel"
 msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif"
 
-#: src/view/ImportPanel.cpp:54
+#: src/view/ImportPanel.cpp:43
 msgid "Load operations"
 msgstr "Charger les opérations"
 
-#: src/view/AccountPanel.cpp:129
+#: src/view/AccountPanel.cpp:145
 msgid "Mode"
 msgstr "Mode"
 
-#: src/view/PreferencesPanel.cpp:72
-#: src/view/PreferencesPanel.cpp:196
-#: src/view/PreferencesPanel.cpp:292
+#: src/view/StatsPanel.cpp:338
+msgid "Months"
+msgstr "Mois"
+
+#: src/view/PreferencesPanel.cpp:59
+#: src/view/PreferencesPanel.cpp:219
+#: src/view/PreferencesPanel.cpp:355
 msgid "Name"
 msgstr "Nom"
 
-#: src/view/PreferencesPanel.cpp:796
+#: src/view/PreferencesPanel.cpp:1044
 msgid "Name changed"
 msgstr "Nom changé"
 
-#: src/view/UsersDialog.cpp:53
-#: src/view/UsersDialog.cpp:114
+#: src/view/UsersDialog.cpp:51
+#: src/view/UsersDialog.cpp:111
 msgid "New User"
 msgstr "Nouvel utilisateur"
 
-#: src/view/PasswordDialog.cpp:41
-msgid "New password "
-msgstr "Nouveau mot de passe "
+#: src/view/PasswordDialog.cpp:37
+msgid "New password"
+msgstr "Nouveau mot de passe"
 
-#: src/model/Database.cpp:91
+#: src/model/Database.cpp:101
 msgid ""
 "No database found, would you like to create a new one ?\n"
 "\n"
@@ -541,84 +572,84 @@ msgstr ""
 "Aucune base de données trouvée, voulez vous en créer une nouvelle ?\n"
 "\n"
 
-#: src/view/SearchPanel.cpp:119
-#: src/view/ExportPanel.cpp:111
+#: src/view/SearchPanel.cpp:109
+#: src/view/ExportPanel.cpp:103
 msgid "No entry found"
 msgstr "Pas d'entrée trouvée"
 
-#: src/view/ImportPanel.cpp:351
+#: src/view/ImportPanel.cpp:345
 msgid "No operation found into this file"
 msgstr "Aucun opération trouvée dans ce fichier"
 
-#: src/view/ExportPanel.cpp:124
+#: src/view/ExportPanel.cpp:118
 msgid "No operation to save"
 msgstr "Aucun opération à sauvegarder"
 
-#: src/view/StatsPanel.cpp:117
-#: src/view/SearchBanner.cpp:70
-#: src/view/AccountPanel.cpp:237
+#: src/view/StatsPanel.cpp:134
+#: src/view/SearchBanner.cpp:72
+#: src/view/AccountPanel.cpp:273
 msgid "Non fix"
 msgstr "Courantes"
 
-#: src/view/SearchPanel.cpp:149
-#: src/view/SearchPanel.cpp:191
-#: src/view/PreferencesPanel.cpp:441
-#: src/view/PreferencesPanel.cpp:702
+#: src/view/SearchPanel.cpp:140
+#: src/view/SearchPanel.cpp:180
+#: src/view/PreferencesPanel.cpp:601
+#: src/view/PreferencesPanel.cpp:676
 msgid "None"
 msgstr "Aucun"
 
-#: src/view/SearchBanner.cpp:70
+#: src/view/SearchBanner.cpp:76
 msgid "Not checked"
 msgstr "Non rapprochée"
 
-#: src/view/PreferencesPanel.cpp:197
+#: src/view/PreferencesPanel.cpp:220
 msgid "Number"
 msgstr "Numéro de compte"
 
-#: src/model/import/OFXImportEngine.cpp:135
-msgid "OFX files (*.ofx)|*.ofx"
-msgstr "Fichiers OFX (*.ofx)|*.ofx"
+#: src/model/import/OFXImportEngine.cpp:140
+msgid "OFX files (*.ofx)"
+msgstr "Fichiers OFX (*.ofx)"
 
-#: src/view/UsersDialog.cpp:51
-#: src/view/GenerateDialog.cpp:60
-#: src/view/PasswordDialog.cpp:55
+#: src/view/UsersDialog.cpp:49
+#: src/view/GenerateDialog.cpp:48
+#: src/view/PasswordDialog.cpp:49
 msgid "OK"
 msgstr "OK"
 
-#: src/view/PasswordDialog.cpp:36
-msgid "Old password "
-msgstr "Ancien mot de passe "
+#: src/view/PasswordDialog.cpp:33
+msgid "Old password"
+msgstr "Ancien mot de passe"
 
-#: src/view/PreferencesPanel.cpp:63
+#: src/view/PreferencesPanel.cpp:50
 msgid "Operation order"
 msgstr "Ordre des opérations"
 
-#: src/view/SearchBanner.cpp:82
-#: src/view/AccountPanel.cpp:186
+#: src/view/SearchBanner.cpp:92
+#: src/view/AccountPanel.cpp:227
 msgid "Operations"
 msgstr "Opérations"
 
-#: src/view/ImportPanel.cpp:421
+#: src/view/ImportPanel.cpp:414
 msgid "Operations successfully imported"
 msgstr "les opérations ont été importées avec succès"
 
-#: src/view/ExportPanel.cpp:144
+#: src/view/ExportPanel.cpp:136
 msgid "Operations successfuly saved"
 msgstr "Opérations sauvegardées avec succès"
 
-#: src/controller/KissCount.cpp:364
+#: src/controller/KissCount.cpp:337
 msgid "Other"
 msgstr "Autres"
 
-#: src/view/UsersDialog.cpp:45
+#: src/view/UsersDialog.cpp:44
 msgid "Password "
 msgstr "Mot de passe "
 
-#: src/view/PasswordDialog.cpp:84
+#: src/view/PasswordDialog.cpp:76
 msgid "Password changed"
 msgstr "Mot de passe changé"
 
-#: src/view/wxUI.cpp:249
+#: src/view/wxUI.cpp:265
 msgid ""
 "Personal accounting software\n"
 "\n"
@@ -626,7 +657,7 @@ msgid ""
 "\n"
 "Licenced under GNU GPL v3\n"
 "\n"
-"Copyright (C) 2010-2011 Grégory Soutadé"
+"Copyright (C) 2010-2012 Grégory Soutadé"
 msgstr ""
 "Logiciel de comptabilité personnelle\n"
 "\n"
@@ -634,205 +665,208 @@ msgstr ""
 "\n"
 "Licence GNU GPL v3\n"
 "\n"
-"Copyright (C) 2010-2011 Grégory Soutadé"
+"Copyright (C) 2010-2012 Grégory Soutadé"
 
-#: src/view/PasswordDialog.cpp:78
+#: src/view/PasswordDialog.cpp:70
 msgid "Please retype new password"
 msgstr "Re entrez le mot de passe"
 
-#: src/view/PreferencesPanel.cpp:184
-#: src/view/PreferencesPanel.cpp:798
-#: src/view/PreferencesPanel.cpp:832
+#: src/view/PreferencesPanel.cpp:205
+#: src/view/PreferencesPanel.cpp:1083
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/view/wxUI.cpp:256
+#: src/view/wxUI.cpp:270
 msgid "Quit KissCount ?"
 msgstr "Quitter KissCount ?"
 
-#: src/view/AccountPanel.cpp:128
+#: src/view/AccountPanel.cpp:148
 msgid "Real"
 msgstr "Réel"
 
-#: src/view/SearchPanel.cpp:61
+#: src/view/SearchPanel.cpp:49
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/view/ExportPanel.cpp:128
+#: src/view/ExportPanel.cpp:122
 msgid "Save as"
 msgstr "Sauvegarder sous"
 
-#: src/view/ImportPanel.cpp:60
+#: src/view/ImportPanel.cpp:51
 msgid "Save import patterns"
 msgstr "Sauvegarder les motifs d'import"
 
-#: src/view/SearchPanel.cpp:48
-#: src/view/SearchPanel.cpp:97
-#: src/view/SearchPanel.cpp:254
-#: src/view/ExportPanel.cpp:44
+#: src/view/SearchPanel.cpp:34
+#: src/view/SearchPanel.cpp:87
+#: src/view/SearchPanel.cpp:231
+#: src/view/ExportPanel.cpp:34
 msgid "Search"
 msgstr "Chercher"
 
-#: src/view/StatsPanel.cpp:134
-#: src/view/AccountPanel.cpp:95
-msgid "Serie 1"
-msgstr "Série 1"
-
-#: src/view/PreferencesPanel.cpp:64
+#: src/view/PreferencesPanel.cpp:51
 msgid "Shared with"
 msgstr "Partagé avec"
 
-#: src/view/StatsPanel.cpp:172
-#: src/view/StatsPanel.cpp:384
+#: src/view/StatsPanel.cpp:212
+#: src/view/StatsPanel.cpp:415
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: src/view/StatsPanel.cpp:70
+#: src/view/StatsPanel.cpp:76
 msgid "To"
 msgstr "A"
 
-#: src/view/GenerateDialog.cpp:53
-msgid "To "
-msgstr "Vers "
-
-#: src/view/AccountPanel.cpp:210
+#: src/view/AccountPanel.cpp:247
+#: src/view/AccountPanel.cpp:270
 msgid "Total Credit"
 msgstr "Total Crédit"
 
-#: src/view/AccountPanel.cpp:211
+#: src/view/AccountPanel.cpp:248
+#: src/view/AccountPanel.cpp:271
 msgid "Total Debit"
 msgstr "Total Débit"
 
-#: src/view/AccountPanel.cpp:135
+#: src/view/AccountPanel.cpp:168
 msgid "UnGroup"
 msgstr "Dégrouper"
 
-#: src/model/Database.cpp:112
 #: src/model/Database.cpp:118
+#: src/model/Database.cpp:124
 msgid "Unable to Create "
 msgstr "Impossible de créer "
 
-#: src/model/Database.cpp:45
-#: src/model/Database.cpp:52
-#: src/model/Database.cpp:70
-#: src/model/Database.cpp:126
+#: src/model/Database.cpp:57
+#: src/model/Database.cpp:65
+#: src/model/Database.cpp:84
+#: src/model/Database.cpp:134
 msgid "Unable to open Database"
 msgstr "Impossible d'ouvrir la base de données"
 
-#: src/controller/KissCount.cpp:364
+#: src/controller/KissCount.cpp:337
 msgid "Unexpected"
 msgstr "Exceptionnel"
 
-#: src/view/SearchBanner.cpp:66
-#: src/view/SearchBanner.cpp:74
-#: src/view/AccountPanel.cpp:529
-#: src/view/AccountPanel.cpp:565
-#: src/view/AccountPanel.cpp:603
-#: src/model/User.cpp:59
-#: src/model/User.cpp:79
-#: src/model/User.cpp:127
+#: src/view/SearchBanner.cpp:61
+#: src/view/SearchBanner.cpp:80
+#: src/view/AccountPanel.cpp:619
+#: src/view/AccountPanel.cpp:655
+#: src/view/AccountPanel.cpp:693
+#: src/model/User.cpp:62
+#: src/model/User.cpp:80
+#: src/model/User.cpp:158
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/view/ImportPanel.cpp:42
+#: src/view/ImportPanel.cpp:32
 msgid "Unresolved accounts"
 msgstr "Comptes non résolus"
 
-#: src/view/ImportPanel.cpp:43
+#: src/view/ImportPanel.cpp:33
 msgid "Unresolved categories"
 msgstr "Catégories non résolues"
 
-#: src/view/AccountPanel.cpp:136
+#: src/model/Database.cpp:604
+#: src/model/Database.cpp:786
+#: src/model/Database.cpp:928
+msgid "Update failed !\n"
+msgstr "La mise à jour à échouée !\n"
+
+#: src/view/AccountPanel.cpp:169
 msgid "Update next months"
 msgstr "Mettre à jour mois suivants"
 
-#: src/view/PreferencesPanel.cpp:59
+#: src/view/PreferencesPanel.cpp:46
 msgid "User"
 msgstr "Utilisateur"
 
 #: src/view/UsersDialog.cpp:40
-#: src/view/UsersDialog.cpp:125
-#: src/view/PreferencesPanel.cpp:790
+#: src/view/UsersDialog.cpp:120
+#: src/view/PreferencesPanel.cpp:1038
 msgid "User "
 msgstr "Utilisateur "
 
-#: src/view/UsersDialog.cpp:31
+#: src/view/UsersDialog.cpp:35
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: src/view/PreferencesPanel.cpp:199
-#: src/view/AccountPanel.cpp:128
+#: src/view/PreferencesPanel.cpp:222
+#: src/view/AccountPanel.cpp:147
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: src/view/grid/GridAccount.cpp:1071
+#: src/view/grid/GridAccount.cpp:1053
 msgid "Warning"
 msgstr "Attention"
 
-#: src/view/PreferencesPanel.cpp:446
+#: src/view/PreferencesPanel.cpp:606
 msgid "Wich account will replace this one ?"
 msgstr "Quel compte va remplacer celui-ci ?"
 
-#: src/view/PreferencesPanel.cpp:707
+#: src/view/PreferencesPanel.cpp:682
 msgid "Wich category will replace this one ?"
 msgstr "Quelle catégorie va remplacer celle-ci"
 
-#: src/model/export/XMLExportEngine.cpp:29
-msgid "XML files (*.xml)|*.xml"
-msgstr "Fichiers XML (*.xml)|*.xml"
-
-#: src/view/grid/GridAccount.cpp:1071
+#: src/view/grid/GridAccount.cpp:1053
 msgid "You made a debit on a blocked account"
 msgstr "Vous avez effectué une opération de débit sur un compte bloqué"
 
-#: src/view/wxUI.cpp:125
+#: src/view/wxUI.cpp:135
 msgid "april"
 msgstr "avril"
 
-#: src/view/wxUI.cpp:129
+#: src/view/wxUI.cpp:139
 msgid "august"
 msgstr "août"
 
-#: src/view/wxUI.cpp:133
+#: src/view/wxUI.cpp:143
 msgid "december"
 msgstr "décembre"
 
-#: src/view/wxUI.cpp:123
+#: src/view/wxUI.cpp:133
 msgid "february"
 msgstr "février"
 
-#: src/view/wxUI.cpp:122
+#: src/view/wxUI.cpp:132
 msgid "january"
 msgstr "janvier"
 
-#: src/view/wxUI.cpp:128
+#: src/view/wxUI.cpp:138
 msgid "july"
 msgstr "juillet"
 
-#: src/view/wxUI.cpp:127
+#: src/view/wxUI.cpp:137
 msgid "june"
 msgstr "juin"
 
-#: src/view/wxUI.cpp:124
+#: src/view/wxUI.cpp:134
 msgid "march"
 msgstr "mars"
 
-#: src/view/wxUI.cpp:126
+#: src/view/wxUI.cpp:136
 msgid "may"
 msgstr "mai"
 
-#: src/view/wxUI.cpp:132
+#: src/view/wxUI.cpp:142
 msgid "november"
 msgstr "novembre"
 
-#: src/view/wxUI.cpp:131
+#: src/view/wxUI.cpp:141
 msgid "october"
 msgstr "octobre"
 
-#: src/view/wxUI.cpp:130
+#: src/view/wxUI.cpp:140
 msgid "september"
 msgstr "septembre"
 
+#~ msgid "Serie 1"
+#~ msgstr "Série 1"
+
+#~ msgid "To "
+#~ msgstr "Vers "
+
+#~ msgid "XML files (*.xml)|*.xml"
+#~ msgstr "Fichiers XML (*.xml)|*.xml"
+
 #~ msgid "Remains"
 #~ msgstr "Restant"
 
@@ -845,9 +879,6 @@ msgstr "septembre"
 #~ msgid "Query failed !\n"
 #~ msgstr "La requête a échouée !\n"
 
-#~ msgid "Update failed !\n"
-#~ msgstr "La mise à jour à échouée !\n"
-
 #~ msgid "About"
 #~ msgstr "A propos"
 
diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot
index 14a60ca..dcce74d 100644
--- a/ressources/po/kisscount.pot
+++ b/ressources/po/kisscount.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-06 17:24+0200\n"
+"POT-Creation-Date: 2012-02-26 14:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,188 +17,196 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/view/StatsPanel.cpp:384 src/view/PreferencesPanel.cpp:832
+#: src/view/StatsPanel.cpp:415
 msgid " - "
 msgstr ""
 
-#: src/view/UsersDialog.cpp:125 src/view/PreferencesPanel.cpp:496
-#: src/view/PreferencesPanel.cpp:516 src/view/PreferencesPanel.cpp:727
-#: src/view/PreferencesPanel.cpp:746 src/view/PreferencesPanel.cpp:790
+#: src/view/UsersDialog.cpp:120 src/view/PreferencesPanel.cpp:826
+#: src/view/PreferencesPanel.cpp:846 src/view/PreferencesPanel.cpp:978
+#: src/view/PreferencesPanel.cpp:997 src/view/PreferencesPanel.cpp:1038
 msgid " already exists"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:283
+#: src/view/ImportPanel.cpp:278
 msgid " and "
 msgstr ""
 
-#: src/view/SearchPanel.cpp:114 src/view/ExportPanel.cpp:106
+#: src/view/SearchPanel.cpp:104 src/view/ExportPanel.cpp:98
 msgid " entries found"
 msgstr ""
 
-#: src/model/Database.cpp:106
+#: src/model/Database.cpp:112
 msgid " not found, aborting"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:879
+#: src/view/AccountPanel.cpp:979
 msgid " operations ?"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:839
+#: src/view/PreferencesPanel.cpp:1090
 msgid " profil ?"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:289
+#: src/view/ImportPanel.cpp:284
 msgid " will be created, is it ok ?"
 msgstr ""
 
-#: src/model/Database.cpp:92
+#: src/model/Database.cpp:102
 msgid "!! Warning !! If there was a bug, the old database will be suppressed !"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:282
+#: src/view/ImportPanel.cpp:277
 #, c-format
 msgid "%d accounts"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:287
+#: src/view/ImportPanel.cpp:282
 #, c-format
 msgid "%d categories"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:116 src/view/ExportPanel.cpp:108
+#: src/view/StatsPanel.cpp:355
+msgid "0 line"
+msgstr ""
+
+#: src/view/SearchPanel.cpp:106 src/view/ExportPanel.cpp:100
 msgid "1 entry found"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:83 src/view/grid/GridAccount.cpp:63
+#: src/view/SearchBanner.cpp:93 src/view/grid/GridAccount.cpp:72
 msgid "Account"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:496 src/view/PreferencesPanel.cpp:516
+#: src/view/PreferencesPanel.cpp:826 src/view/PreferencesPanel.cpp:846
 msgid "Account "
 msgstr ""
 
-#: src/controller/KissCount.cpp:372
+#: src/controller/KissCount.cpp:344
 msgid "Account 1"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:74 src/view/AccountPanel.cpp:112
+#: src/view/ImportPanel.cpp:64 src/view/AccountPanel.cpp:471
 msgid "Account name"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:111
+#: src/view/AccountPanel.cpp:470
 msgid "Account number"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:336 src/view/PreferencesPanel.cpp:60
+#: src/view/StatsPanel.cpp:354 src/view/PreferencesPanel.cpp:47
 msgid "Accounts"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:1107
+#: src/view/AccountPanel.cpp:1195
 msgid "Accounts updated until "
 msgstr ""
 
-#: src/view/SearchBanner.cpp:79
+#: src/view/StatsPanel.cpp:339
+msgid "Amount"
+msgstr ""
+
+#: src/view/SearchBanner.cpp:89
 msgid "Amount from"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:80
+#: src/view/SearchBanner.cpp:90
 msgid "Amount to"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:1114
+#: src/view/AccountPanel.cpp:1200
 msgid "Any account updated !"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:175 src/view/ExportPanel.cpp:138
+#: src/view/ImportPanel.cpp:170 src/view/ExportPanel.cpp:131
 msgid "Any engine can process this file !"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:839 src/view/AccountPanel.cpp:874
+#: src/view/PreferencesPanel.cpp:1090 src/view/AccountPanel.cpp:974
 msgid "Are you sure want to delete "
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:859
+#: src/view/grid/GridAccount.cpp:757
 msgid "Are you sure want to delete : \n"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:367
+#: src/view/ImportPanel.cpp:361
 msgid "Are you sure want to integrate these operations ?"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:369
+#: src/view/PreferencesPanel.cpp:470
 msgid "Ascending"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:293
+#: src/view/PreferencesPanel.cpp:356
 msgid "Background color"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:236
+#: src/view/AccountPanel.cpp:272
 msgid "Balance"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:200
+#: src/view/PreferencesPanel.cpp:223
 msgid "Blocked"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:52 src/view/GenerateDialog.cpp:61
-#: src/view/PasswordDialog.cpp:56
+#: src/view/UsersDialog.cpp:50 src/view/GenerateDialog.cpp:49
+#: src/view/PasswordDialog.cpp:50
 msgid "Cancel"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:1294 src/view/grid/GridAccount.cpp:1301
+#: src/view/grid/GridAccount.cpp:1247 src/view/grid/GridAccount.cpp:1260
 msgid "Cannot group these operations"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:1420 src/view/grid/GridAccount.cpp:1426
+#: src/view/grid/GridAccount.cpp:1391 src/view/grid/GridAccount.cpp:1397
 msgid "Cannot ungroup these operations"
 msgstr ""
 
-#: src/controller/KissCount.cpp:363
+#: src/controller/KissCount.cpp:335
 msgid "Car"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:61
+#: src/view/PreferencesPanel.cpp:48
 msgid "Categories"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:81 src/view/grid/GridAccount.cpp:63
+#: src/view/SearchBanner.cpp:91 src/view/grid/GridAccount.cpp:72
 msgid "Category"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:727 src/view/PreferencesPanel.cpp:746
+#: src/view/PreferencesPanel.cpp:978 src/view/PreferencesPanel.cpp:997
 msgid "Category "
 msgstr ""
 
-#: src/view/ImportPanel.cpp:82
+#: src/view/ImportPanel.cpp:71
 msgid "Category name"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:78
+#: src/view/PreferencesPanel.cpp:65
 msgid "Change Name"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:79
+#: src/view/PreferencesPanel.cpp:66
 msgid "Change Password"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:59
+#: src/view/SearchPanel.cpp:47
 msgid "Change account"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:60
+#: src/view/SearchPanel.cpp:48
 msgid "Change category"
 msgstr ""
 
-#: src/view/PasswordDialog.cpp:29
+#: src/view/PasswordDialog.cpp:30
 msgid "Change password"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:128
+#: src/view/AccountPanel.cpp:149
 msgid "Check"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:70
+#: src/view/SearchBanner.cpp:74
 msgid "Checked"
 msgstr ""
 
@@ -206,364 +214,383 @@ msgstr ""
 msgid "Choose a database to open"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:154
+#: src/view/SearchPanel.cpp:144
 msgid "Choose a new account"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:196
+#: src/view/SearchPanel.cpp:184
 msgid "Choose a new category"
 msgstr ""
 
-#: src/view/PasswordDialog.cpp:46
-msgid "Confirm password "
+#: src/view/PasswordDialog.cpp:41
+msgid "Confirm password"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:142 src/view/AccountPanel.cpp:122
+#: src/view/StatsPanel.cpp:158 src/view/AccountPanel.cpp:98
 msgid "Cost repartition"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:187 src/view/ImportPanel.cpp:217
-#: src/view/ImportPanel.cpp:260 src/view/ImportPanel.cpp:269
-#: src/view/ImportPanel.cpp:297 src/view/ImportPanel.cpp:315
+#: src/view/ImportPanel.cpp:181 src/view/ImportPanel.cpp:211
+#: src/view/ImportPanel.cpp:255 src/view/ImportPanel.cpp:264
+#: src/view/ImportPanel.cpp:291 src/view/ImportPanel.cpp:309
 msgid "Create one"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:72
 msgid "Credit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:234
+#: src/view/AccountPanel.cpp:268
 msgid "Cur Credit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:235
+#: src/view/AccountPanel.cpp:269
 msgid "Cur Debit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:114
+#: src/view/AccountPanel.cpp:473
 msgid "Current value"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:72
 msgid "Date"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:41
+#: src/view/SearchBanner.cpp:30
 msgid "Date from"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:42
+#: src/view/SearchBanner.cpp:31
 msgid "Date to"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:72
 msgid "Debit"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:198
+#: src/view/PreferencesPanel.cpp:221
 msgid "Default"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:201 src/view/PreferencesPanel.cpp:296
-#: src/view/AccountPanel.cpp:733
+#: src/view/PreferencesPanel.cpp:224 src/view/PreferencesPanel.cpp:359
+#: src/view/AccountPanel.cpp:832
 msgid "Delete"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:370
+#: src/view/PreferencesPanel.cpp:471
 msgid "Descending"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:78 src/view/grid/GridAccount.cpp:63
+#: src/view/SearchBanner.cpp:88 src/view/grid/GridAccount.cpp:72
 msgid "Description"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:238
+#: src/view/SearchPanel.cpp:221
 msgid "Enter a new description"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:95 src/view/UsersDialog.cpp:125
-#: src/view/SearchBanner.cpp:140 src/view/SearchBanner.cpp:150
-#: src/view/SearchBanner.cpp:163 src/view/SearchBanner.cpp:172
-#: src/view/PreferencesPanel.cpp:436 src/view/PreferencesPanel.cpp:496
-#: src/view/PreferencesPanel.cpp:516 src/view/PreferencesPanel.cpp:727
-#: src/view/PreferencesPanel.cpp:746 src/view/PreferencesPanel.cpp:784
-#: src/view/PreferencesPanel.cpp:790 src/view/PasswordDialog.cpp:72
-#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:870
-#: src/view/grid/GridAccount.cpp:1294 src/view/grid/GridAccount.cpp:1301
-#: src/view/grid/GridAccount.cpp:1420 src/view/grid/GridAccount.cpp:1426
-#: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:45
-#: src/model/Database.cpp:52 src/model/Database.cpp:70
-#: src/model/Database.cpp:106 src/model/Database.cpp:112
-#: src/model/Database.cpp:118 src/model/Database.cpp:126
-#: src/model/Database.cpp:147 src/model/Database_Update.cpp:23
+#: src/view/StatsPanel.cpp:430 src/view/UsersDialog.cpp:90
+#: src/view/UsersDialog.cpp:120 src/view/SearchBanner.cpp:149
+#: src/view/SearchBanner.cpp:159 src/view/SearchBanner.cpp:172
+#: src/view/SearchBanner.cpp:181 src/view/ImportPanel.cpp:170
+#: src/view/ExportPanel.cpp:118 src/view/ExportPanel.cpp:131
+#: src/view/ExportPanel.cpp:138 src/view/PreferencesPanel.cpp:585
+#: src/view/PreferencesPanel.cpp:826 src/view/PreferencesPanel.cpp:846
+#: src/view/PreferencesPanel.cpp:978 src/view/PreferencesPanel.cpp:997
+#: src/view/PreferencesPanel.cpp:1032 src/view/PreferencesPanel.cpp:1038
+#: src/view/PreferencesPanel.cpp:1078 src/view/PasswordDialog.cpp:64
+#: src/view/PasswordDialog.cpp:70 src/view/AccountPanel.cpp:970
+#: src/view/grid/GridAccount.cpp:1247 src/view/grid/GridAccount.cpp:1260
+#: src/view/grid/GridAccount.cpp:1391 src/view/grid/GridAccount.cpp:1397
+#: src/view/grid/FormulaDelegate.cpp:59 src/model/Database.cpp:57
+#: src/model/Database.cpp:65 src/model/Database.cpp:84
+#: src/model/Database.cpp:112 src/model/Database.cpp:118
+#: src/model/Database.cpp:124 src/model/Database.cpp:134
+#: src/model/Database.cpp:154 src/model/Database.cpp:604
+#: src/model/Database.cpp:786 src/model/Database.cpp:928
+#: src/model/DatabaseUpdate.cpp:31
 msgid "Error"
 msgstr ""
 
-#: src/model/Database.cpp:147
+#: src/model/Database.cpp:154
 msgid "Error creating original database"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:55 src/view/ExportPanel.cpp:89
+#: src/view/ExportPanel.cpp:47 src/view/ExportPanel.cpp:81
 msgid "Export"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:146
+#: src/view/ExportPanel.cpp:138
 msgid "Failed to save operations"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:73
+#: src/view/ImportPanel.cpp:64
 msgid "File account"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:81
+#: src/view/ImportPanel.cpp:71
 msgid "File category"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:115
+#: src/view/AccountPanel.cpp:474
 msgid "Final value"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:70 src/view/grid/GridAccount.cpp:340
-#: src/controller/KissCount.cpp:363
+#: src/view/SearchBanner.cpp:70 src/view/grid/GridAccount.cpp:342
+#: src/controller/KissCount.cpp:335
 msgid "Fix"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:295
+#: src/view/PreferencesPanel.cpp:358
 msgid "Font"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:294
+#: src/view/PreferencesPanel.cpp:357
 msgid "Foreground color"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:65
+#: src/view/StatsPanel.cpp:71
 msgid "From"
 msgstr ""
 
-#: src/view/GenerateDialog.cpp:46
+#: src/view/GenerateDialog.cpp:36
 msgid "From "
 msgstr ""
 
-#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:730
+#: src/view/GenerateDialog.cpp:33 src/view/AccountPanel.cpp:829
 msgid "Generate month"
 msgstr ""
 
-#: src/model/import/GrisbiImportEngine.cpp:201
-msgid "Grisbi files (*.gsb)|*.gsb"
+#: src/model/import/GrisbiImportEngine.cpp:166
+msgid "Grisbi files (*.gsb)"
 msgstr ""
 
-#: src/controller/KissCount.cpp:363
+#: src/controller/KissCount.cpp:335
 msgid "Groceries"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:134
+#: src/view/AccountPanel.cpp:167
 msgid "Group"
 msgstr ""
 
-#: src/controller/KissCount.cpp:363
+#: src/view/PreferencesPanel.cpp:225
+msgid "Hidden"
+msgstr ""
+
+#: src/controller/KissCount.cpp:335
 msgid "Hobbies"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:123
+#: src/view/ImportPanel.cpp:121
 msgid "Import"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:113
+#: src/view/AccountPanel.cpp:472
 msgid "Initial value"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:57
+#: src/view/ImportPanel.cpp:47
 msgid "Integrate operations"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:75
+#: src/view/ImportPanel.cpp:64
 msgid "Internal account"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:83
+#: src/view/ImportPanel.cpp:71
 msgid "Internal category"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:150
+#: src/view/SearchBanner.cpp:159
 msgid "Invalid amount from"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:172
+#: src/view/SearchBanner.cpp:181
 msgid "Invalid amount range"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:163
+#: src/view/SearchBanner.cpp:172
 msgid "Invalid amount to"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:140
+#: src/view/SearchBanner.cpp:149
 msgid "Invalid date range"
 msgstr ""
 
-#: src/view/grid/wxGridCellFormulaEditor.cpp:69
+#: src/view/grid/FormulaDelegate.cpp:59
 msgid "Invalid formula !"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:784
-msgid "Invalid name"
+#: src/view/PreferencesPanel.cpp:1032
+msgid "Invalid name !"
 msgstr ""
 
-#: src/view/PasswordDialog.cpp:72
+#: src/view/PasswordDialog.cpp:64
 msgid "Invalid old password"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:95
+#: src/view/UsersDialog.cpp:90
 msgid "Invalid password"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:403
+#: src/view/StatsPanel.cpp:430
 msgid "Invalide date range"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:436
+#: src/view/PreferencesPanel.cpp:585
 msgid "It must be at least one account !"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:870
+#: src/view/AccountPanel.cpp:970
 msgid "It must be at least one month !"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:80
+#: src/view/PreferencesPanel.cpp:67
 msgid "Kill me"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:403 src/view/PreferencesPanel.cpp:824
-#: src/view/PreferencesPanel.cpp:827 src/model/Database_Update.cpp:140
+#: src/view/SearchPanel.cpp:104 src/view/SearchPanel.cpp:106
+#: src/view/SearchPanel.cpp:109 src/view/ExportPanel.cpp:98
+#: src/view/ExportPanel.cpp:100 src/view/ExportPanel.cpp:103
+#: src/view/ExportPanel.cpp:136
 msgid "KissCount"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:152
+#: src/view/ExportPanel.cpp:144
 msgid "KissCount - Export"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:128
+#: src/view/ImportPanel.cpp:126
 msgid "KissCount - Import"
 msgstr ""
 
-#: src/model/import/XMLImportEngine.cpp:268
-msgid "KissCount xml files (*.xml)|*.xml"
+#: src/model/export/XMLExportEngine.cpp:34
+msgid "KissCount XML files (*.xml)"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:62
+#: src/model/import/XMLImportEngine.cpp:32
+msgid "KissCount xml files (*.xml)"
+msgstr ""
+
+#: src/view/PreferencesPanel.cpp:49
 msgid "Language"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:827
+#: src/view/PreferencesPanel.cpp:1078
 msgid "Language not changed"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:824
+#: src/view/PreferencesPanel.cpp:1075
 msgid "Language successfully changed, please go to another panel"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:54
+#: src/view/ImportPanel.cpp:43
 msgid "Load operations"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:129
+#: src/view/AccountPanel.cpp:145
 msgid "Mode"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:72 src/view/PreferencesPanel.cpp:196
-#: src/view/PreferencesPanel.cpp:292
+#: src/view/StatsPanel.cpp:338
+msgid "Months"
+msgstr ""
+
+#: src/view/PreferencesPanel.cpp:59 src/view/PreferencesPanel.cpp:219
+#: src/view/PreferencesPanel.cpp:355
 msgid "Name"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:796
+#: src/view/PreferencesPanel.cpp:1044
 msgid "Name changed"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:53 src/view/UsersDialog.cpp:114
+#: src/view/UsersDialog.cpp:51 src/view/UsersDialog.cpp:111
 msgid "New User"
 msgstr ""
 
-#: src/view/PasswordDialog.cpp:41
-msgid "New password "
+#: src/view/PasswordDialog.cpp:37
+msgid "New password"
 msgstr ""
 
-#: src/model/Database.cpp:91
+#: src/model/Database.cpp:101
 msgid ""
 "No database found, would you like to create a new one ?\n"
 "\n"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:119 src/view/ExportPanel.cpp:111
+#: src/view/SearchPanel.cpp:109 src/view/ExportPanel.cpp:103
 msgid "No entry found"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:351
+#: src/view/ImportPanel.cpp:345
 msgid "No operation found into this file"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:124
+#: src/view/ExportPanel.cpp:118
 msgid "No operation to save"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:117 src/view/SearchBanner.cpp:70
-#: src/view/AccountPanel.cpp:237
+#: src/view/StatsPanel.cpp:134 src/view/SearchBanner.cpp:72
+#: src/view/AccountPanel.cpp:273
 msgid "Non fix"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:149 src/view/SearchPanel.cpp:191
-#: src/view/PreferencesPanel.cpp:441 src/view/PreferencesPanel.cpp:702
+#: src/view/SearchPanel.cpp:140 src/view/SearchPanel.cpp:180
+#: src/view/PreferencesPanel.cpp:601 src/view/PreferencesPanel.cpp:676
 msgid "None"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:70
+#: src/view/SearchBanner.cpp:76
 msgid "Not checked"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:197
+#: src/view/PreferencesPanel.cpp:220
 msgid "Number"
 msgstr ""
 
-#: src/model/import/OFXImportEngine.cpp:135
-msgid "OFX files (*.ofx)|*.ofx"
+#: src/model/import/OFXImportEngine.cpp:140
+msgid "OFX files (*.ofx)"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:51 src/view/GenerateDialog.cpp:60
-#: src/view/PasswordDialog.cpp:55
+#: src/view/UsersDialog.cpp:49 src/view/GenerateDialog.cpp:48
+#: src/view/PasswordDialog.cpp:49
 msgid "OK"
 msgstr ""
 
-#: src/view/PasswordDialog.cpp:36
-msgid "Old password "
+#: src/view/PasswordDialog.cpp:33
+msgid "Old password"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:63
+#: src/view/PreferencesPanel.cpp:50
 msgid "Operation order"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:82 src/view/AccountPanel.cpp:186
+#: src/view/SearchBanner.cpp:92 src/view/AccountPanel.cpp:227
 msgid "Operations"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:421
+#: src/view/ImportPanel.cpp:414
 msgid "Operations successfully imported"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:144
+#: src/view/ExportPanel.cpp:136
 msgid "Operations successfuly saved"
 msgstr ""
 
-#: src/controller/KissCount.cpp:364
+#: src/controller/KissCount.cpp:336
 msgid "Other"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:45
+#: src/view/UsersDialog.cpp:44
 msgid "Password "
 msgstr ""
 
-#: src/view/PasswordDialog.cpp:84
+#: src/view/PasswordDialog.cpp:76
 msgid "Password changed"
 msgstr ""
 
-#: src/view/wxUI.cpp:249
+#: src/view/wxUI.cpp:287
 msgid ""
 "Personal accounting software\n"
 "\n"
@@ -571,188 +598,180 @@ msgid ""
 "\n"
 "Licenced under GNU GPL v3\n"
 "\n"
-"Copyright (C) 2010-2011 Grégory Soutadé"
+"Copyright (C) 2010-2012 Grégory Soutadé"
 msgstr ""
 
-#: src/view/PasswordDialog.cpp:78
+#: src/view/PasswordDialog.cpp:70
 msgid "Please retype new password"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:184 src/view/PreferencesPanel.cpp:798
-#: src/view/PreferencesPanel.cpp:832
+#: src/view/PreferencesPanel.cpp:205 src/view/PreferencesPanel.cpp:1083
 msgid "Preferences"
 msgstr ""
 
-#: src/view/wxUI.cpp:256
+#: src/view/wxUI.cpp:292
 msgid "Quit KissCount ?"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:128
+#: src/view/AccountPanel.cpp:148
 msgid "Real"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:61
+#: src/view/SearchPanel.cpp:49
 msgid "Rename"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:128
+#: src/view/ExportPanel.cpp:122
 msgid "Save as"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:60
+#: src/view/ImportPanel.cpp:51
 msgid "Save import patterns"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:48 src/view/SearchPanel.cpp:97
-#: src/view/SearchPanel.cpp:254 src/view/ExportPanel.cpp:44
+#: src/view/SearchPanel.cpp:34 src/view/SearchPanel.cpp:87
+#: src/view/SearchPanel.cpp:231 src/view/ExportPanel.cpp:34
 msgid "Search"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:134 src/view/AccountPanel.cpp:95
-msgid "Serie 1"
-msgstr ""
-
-#: src/view/PreferencesPanel.cpp:64
+#: src/view/PreferencesPanel.cpp:51
 msgid "Shared with"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:172 src/view/StatsPanel.cpp:384
+#: src/view/StatsPanel.cpp:212 src/view/StatsPanel.cpp:415
 msgid "Statistics"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:70
+#: src/view/StatsPanel.cpp:76
 msgid "To"
 msgstr ""
 
-#: src/view/GenerateDialog.cpp:53
-msgid "To "
-msgstr ""
-
-#: src/view/AccountPanel.cpp:210
+#: src/view/AccountPanel.cpp:247 src/view/AccountPanel.cpp:270
 msgid "Total Credit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:211
+#: src/view/AccountPanel.cpp:248 src/view/AccountPanel.cpp:271
 msgid "Total Debit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:135
+#: src/view/AccountPanel.cpp:168
 msgid "UnGroup"
 msgstr ""
 
-#: src/model/Database.cpp:112 src/model/Database.cpp:118
+#: src/model/Database.cpp:118 src/model/Database.cpp:124
 msgid "Unable to Create "
 msgstr ""
 
-#: src/model/Database.cpp:45 src/model/Database.cpp:52
-#: src/model/Database.cpp:70 src/model/Database.cpp:126
+#: src/model/Database.cpp:57 src/model/Database.cpp:65
+#: src/model/Database.cpp:84 src/model/Database.cpp:134
 msgid "Unable to open Database"
 msgstr ""
 
-#: src/controller/KissCount.cpp:364
+#: src/controller/KissCount.cpp:336
 msgid "Unexpected"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:66 src/view/SearchBanner.cpp:74
-#: src/view/AccountPanel.cpp:529 src/view/AccountPanel.cpp:565
-#: src/view/AccountPanel.cpp:603 src/model/User.cpp:59 src/model/User.cpp:79
-#: src/model/User.cpp:127
+#: src/view/SearchBanner.cpp:61 src/view/SearchBanner.cpp:80
+#: src/view/AccountPanel.cpp:619 src/view/AccountPanel.cpp:655
+#: src/view/AccountPanel.cpp:693 src/model/User.cpp:62 src/model/User.cpp:80
+#: src/model/User.cpp:158
 msgid "Unknown"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:42
+#: src/view/ImportPanel.cpp:32
 msgid "Unresolved accounts"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:43
+#: src/view/ImportPanel.cpp:33
 msgid "Unresolved categories"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:136
+#: src/model/Database.cpp:604 src/model/Database.cpp:786
+#: src/model/Database.cpp:928
+msgid "Update failed !\n"
+msgstr ""
+
+#: src/view/AccountPanel.cpp:169
 msgid "Update next months"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:59
+#: src/view/PreferencesPanel.cpp:46
 msgid "User"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:40 src/view/UsersDialog.cpp:125
-#: src/view/PreferencesPanel.cpp:790
+#: src/view/UsersDialog.cpp:40 src/view/UsersDialog.cpp:120
+#: src/view/PreferencesPanel.cpp:1038
 msgid "User "
 msgstr ""
 
-#: src/view/UsersDialog.cpp:31
+#: src/view/UsersDialog.cpp:35
 msgid "Users"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:199 src/view/AccountPanel.cpp:128
+#: src/view/PreferencesPanel.cpp:222 src/view/AccountPanel.cpp:147
 msgid "Virtual"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:1071
+#: src/view/grid/GridAccount.cpp:1053
 msgid "Warning"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:446
+#: src/view/PreferencesPanel.cpp:606
 msgid "Wich account will replace this one ?"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:707
+#: src/view/PreferencesPanel.cpp:682
 msgid "Wich category will replace this one ?"
 msgstr ""
 
-#: src/model/export/XMLExportEngine.cpp:29
-msgid "XML files (*.xml)|*.xml"
-msgstr ""
-
-#: src/view/grid/GridAccount.cpp:1071
+#: src/view/grid/GridAccount.cpp:1053
 msgid "You made a debit on a blocked account"
 msgstr ""
 
-#: src/view/wxUI.cpp:125
+#: src/view/wxUI.cpp:157
 msgid "april"
 msgstr ""
 
-#: src/view/wxUI.cpp:129
+#: src/view/wxUI.cpp:161
 msgid "august"
 msgstr ""
 
-#: src/view/wxUI.cpp:133
+#: src/view/wxUI.cpp:165
 msgid "december"
 msgstr ""
 
-#: src/view/wxUI.cpp:123
+#: src/view/wxUI.cpp:155
 msgid "february"
 msgstr ""
 
-#: src/view/wxUI.cpp:122
+#: src/view/wxUI.cpp:154
 msgid "january"
 msgstr ""
 
-#: src/view/wxUI.cpp:128
+#: src/view/wxUI.cpp:160
 msgid "july"
 msgstr ""
 
-#: src/view/wxUI.cpp:127
+#: src/view/wxUI.cpp:159
 msgid "june"
 msgstr ""
 
-#: src/view/wxUI.cpp:124
+#: src/view/wxUI.cpp:156
 msgid "march"
 msgstr ""
 
-#: src/view/wxUI.cpp:126
+#: src/view/wxUI.cpp:158
 msgid "may"
 msgstr ""
 
-#: src/view/wxUI.cpp:132
+#: src/view/wxUI.cpp:164
 msgid "november"
 msgstr ""
 
-#: src/view/wxUI.cpp:131
+#: src/view/wxUI.cpp:163
 msgid "october"
 msgstr ""
 
-#: src/view/wxUI.cpp:130
+#: src/view/wxUI.cpp:162
 msgid "september"
 msgstr ""
diff --git a/src/controller/KissCount.cpp b/src/controller/KissCount.cpp
index 1ac9433..42268a3 100644
--- a/src/controller/KissCount.cpp
+++ b/src/controller/KissCount.cpp
@@ -31,11 +31,10 @@ std::vector<ExportEngine*> * KissCount::_exportEngines;
 KissCount::KissCount(int argc, char** argv) : QApplication(argc, argv), _user(0)
 {
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf8"));
+    QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
 
     _wxUI = new wxUI(this, "KissCount");
 
-    //_wxUI->SetLanguage(wxLocale::GetSystemLanguage());
-
     _wxUI->showMaximized();
     _wxUI->setDisabled(true);
 
diff --git a/src/view/PreferencesPanel.cpp b/src/view/PreferencesPanel.cpp
index 6a7cee7..6618986 100644
--- a/src/view/PreferencesPanel.cpp
+++ b/src/view/PreferencesPanel.cpp
@@ -1065,10 +1065,10 @@ void PreferencesPanel::OnOperationOrderChange(int index)
 
 void PreferencesPanel::OnLanguageChange(int index)
 {
-    SupportedLanguages::wxLanguage language = SupportedLanguages::languages[index].language;
+    int language = SupportedLanguages::languages[index].language;
     QString name_lang = SupportedLanguages::languages[index].name;
 
-    if (_wxUI->SetLanguage(name_lang) || language == SupportedLanguages::wxLANGUAGE_ENGLISH)
+    if (_wxUI->SetLanguage(name_lang) || language == SupportedLanguages::English)
     {
         _wxUI->NeedReload();
         _kiss->SetLanguage(name_lang);
diff --git a/src/view/SupportedLanguages.hpp b/src/view/SupportedLanguages.hpp
index 39ad9ce..9315304 100644
--- a/src/view/SupportedLanguages.hpp
+++ b/src/view/SupportedLanguages.hpp
@@ -23,17 +23,18 @@
 namespace SupportedLanguages {
 #define ICONS_PATH RESSOURCES_ROOT "icons/"
 
-    enum wxLanguage {wxLANGUAGE_ENGLISH, wxLANGUAGE_FRENCH, NB_SUPPORTED_LANGUAGES} ;
+    enum Language {English, French, NB_SUPPORTED_LANGUAGES} ;
 
     typedef struct {
         QString name;
         QString icon;
-        wxLanguage language;
+	QLocale::Language language;
+	QString filename;
     } language ;
 
     static const language languages[NB_SUPPORTED_LANGUAGES] = {
-        { "English", ICONS_PATH "/United Kingdom.png", wxLANGUAGE_ENGLISH},
-        { "Français",ICONS_PATH "/France.png", wxLANGUAGE_FRENCH}
+        { "English", ICONS_PATH "/United Kingdom.png", QLocale::English, "english"},
+        { "Français",ICONS_PATH "/France.png", QLocale::French, "french"}
     };
 }
 
diff --git a/src/view/wxUI.cpp b/src/view/wxUI.cpp
index c7bd32a..52974cc 100644
--- a/src/view/wxUI.cpp
+++ b/src/view/wxUI.cpp
@@ -46,11 +46,14 @@ QColor wxUI::categoryColors[MAX_CATEGORY] = {QColor(0x00, 0x45, 0x86),
                               QColor(0x00, 0x84, 0xD1)};
 
 wxUI::wxUI(KissCount* kiss, const QString& title)
-    : QFrame(0), _kiss(kiss), _signalMapper(this),
-      _curPanel(0), _locale(0), _needReload(false)
+    : QFrame(0), _language(SupportedLanguages::languages[SupportedLanguages::English].name),
+      _kiss(kiss), _signalMapper(this), _curPanel(0), _locale(0),
+      _needReload(false)
 {
     QPushButton* button;
 
+    SetLanguage("");
+
     setWindowTitle(title);
     
     connect(&_signalMapper, SIGNAL(mapped(int)), this, SLOT(OnButtonClicked(int)));
@@ -93,41 +96,60 @@ wxUI::~wxUI()
 bool wxUI::SetLanguage(QString language)
 {
     bool res = true;
+    int i;
 
-//     if (_locale) delete _locale;
-//     _locale = 0;
+    if (_locale) 
+    {
+	if (language == _language) return true;
+    }
 
-//     // load language if possible, fall back to english otherwise
-//     if(wxLocale::IsAvailable(language))
-//     {
-// 	_locale = new wxLocale( language, wxLOCALE_CONV_ENCODING );
- 
-// #ifdef __WXGTK__
-// 	_locale->AddCatalogLookupPathPrefix(wxT(LANG_ROOT));
-// #endif
- 
-// 	_locale->AddCatalog(wxT("frenchpp"));
-// 	_locale->AddCatalog(wxT("kisscount"));
+    if (language == "")
+    {
+	QLocale default_locale = QLocale::system();
 
-// 	_language = (wxLanguage) language;
-//     }
+	for(i=0; i<SupportedLanguages::NB_SUPPORTED_LANGUAGES; i++)
+	{
+	    if (default_locale.language() == SupportedLanguages::languages[i].language)
+		break;
+	}
+	if (i == SupportedLanguages::NB_SUPPORTED_LANGUAGES)
+	    i = SupportedLanguages::English;
+	language = SupportedLanguages::languages[i].name;
+    }
+    else
+    {
+	for(i=0; i<SupportedLanguages::NB_SUPPORTED_LANGUAGES; i++)
+	{
+	    if (language == SupportedLanguages::languages[i].name)
+		break;
+	}
+	if (i == SupportedLanguages::NB_SUPPORTED_LANGUAGES)
+	    return false;
+    }
 
-//     if (_locale == 0 || !_locale->IsOk())
-//     {
-// 	if (_locale) delete _locale;
-// 	_locale = new wxLocale();
+    if (_locale)
+    {
+	delete _locale;
+	_kiss->removeTranslator(&_translator);
+    }
+    
+    if (i != SupportedLanguages::English)
+    {
+	if (!_translator.load(SupportedLanguages::languages[i].filename, RESSOURCES_ROOT "po"))
+	{
+	    i = SupportedLanguages::English;
+	    _translator.load(SupportedLanguages::languages[i].filename, RESSOURCES_ROOT "po");
+	    _language = SupportedLanguages::languages[i].name;
+	    res = false;
+	}
 
-// #ifdef __WXGTK__
-// 	_locale->AddCatalogLookupPathPrefix(wxT(LANG_ROOT));
-// #endif
+	_kiss->installTranslator(&_translator);
+    }
 
-// 	_locale->AddCatalog(wxT("kisscount"));
-      
-// 	_language = wxLANGUAGE_ENGLISH;
-// 	res = false;
-//     }
+    _language = SupportedLanguages::languages[i].language;
 
-    _language = language;
+    _locale = new QLocale(SupportedLanguages::languages[i].language);
+    QLocale::setDefault(*_locale);
 
     months[0] = _("january");
     months[1] = _("february");
diff --git a/src/view/wxUI.hpp b/src/view/wxUI.hpp
index 3576baf..7062e60 100644
--- a/src/view/wxUI.hpp
+++ b/src/view/wxUI.hpp
@@ -37,7 +37,8 @@ class ImportEngine;
 #include <qtranslator.h>
 #include <qtextcodec.h>
 
-#define _(s) QObject::trUtf8(s)
+#define _(s) QApplication::translate("", s)
+// #define _(s) QObject::trUtf8(s)
 
 class KissCount;
 class KissPanel;
@@ -89,6 +90,7 @@ private:
     std::vector<KissPanel*> _panels;
     std::vector<QPushButton*> _buttons;
     QLocale     *_locale;
+    QTranslator _translator;
     bool         _needReload;
 
     void InitPanels();
diff --git a/tools/generate_locales.sh b/tools/generate_locales.sh
index f259b1d..2a393b8 100755
--- a/tools/generate_locales.sh
+++ b/tools/generate_locales.sh
@@ -1,3 +1,25 @@
 #!/bin/bash
+
+function check_tool()
+{
+    which $1 > /dev/null
+    if [ $? == 1 ] ; then
+	echo "$1 is missing" ; 
+	exit 1
+    fi
+}
+
+for p in find xgettext poeditor lconvert lrelease ; do
+    check_tool $p
+done
+
 CPP_FILE_LIST=`find src -name '*.cpp' -print`
-xgettext --from-code utf-8 -d kisscount -s --keyword=_ -p ./ressources/po -o kisscount.pot $CPP_FILE_LIST
\ No newline at end of file
+xgettext --from-code utf-8 -d kisscount -s --keyword=_ -p ./ressources/po -o kisscount.pot $CPP_FILE_LIST
+for po in ./ressources/po/*.po ; do
+    ts=`echo $po | sed s/po$/ts/`
+    poeditor $po
+    echo lconvert -locations relative $po -o $ts
+    lconvert -locations relative $po -o $ts
+    lrelease $ts
+    rm -f $ts
+done