diff --git a/ChangeLog b/ChangeLog
index 763239a..45ff72d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-v0.2 (25/04/2011)
+v0.2 (26/04/2011)
 
 ** User **
 	Better use of sizers (so better interface!)
@@ -14,7 +14,7 @@ v0.2 (25/04/2011)
 	Add Real mode
 	Database is now at ~/.kisscount/kc.bdd
 	Add Debian's packages !!
-	Add Import Panel and OFX imports
+	Add Import Panel, OFX and Grisbi imports
 
 ** Dev **
 	Use a factory to create panels (prepare for plug-in)
diff --git a/ressources/po/french.mo b/ressources/po/french.mo
index c828549..3b52d83 100644
Binary files a/ressources/po/french.mo and b/ressources/po/french.mo differ
diff --git a/ressources/po/french.po b/ressources/po/french.po
index ce4436f..62b6dc4 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-03-24 19:19+0100\n"
+"POT-Creation-Date: 2011-04-26 21:01+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Soutadé <soutade@gmail.com>\n"
 "Language-Team: \n"
@@ -19,25 +19,25 @@ msgstr ""
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/view/StatsPanel.cpp:358
-#: src/view/PreferencesPanel.cpp:831
+#: src/view/StatsPanel.cpp:361
+#: src/view/PreferencesPanel.cpp:832
 msgid " - "
 msgstr " - "
 
-#: src/view/ImportPanel.cpp:222
-msgid " account(s) will be created, is it ok ?"
-msgstr " comptes vont être créés, êtes vous d'accord ?"
-
-#: src/view/UsersDialog.cpp:120
-#: src/view/PreferencesPanel.cpp:495
-#: src/view/PreferencesPanel.cpp:515
-#: src/view/PreferencesPanel.cpp:726
-#: src/view/PreferencesPanel.cpp:745
-#: src/view/PreferencesPanel.cpp:789
+#: 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
 msgid " already exists"
 msgstr " existe déjà"
 
-#: src/view/SearchPanel.cpp:269
+#: src/view/ImportPanel.cpp:284
+msgid " and "
+msgstr " et "
+
+#: src/view/SearchPanel.cpp:276
 msgid " entries found"
 msgstr " entrées trouvées"
 
@@ -45,29 +45,43 @@ msgstr " entrées trouvées"
 msgid " not found, aborting"
 msgstr " non trouvé, arrêt"
 
-#: src/view/AccountPanel.cpp:852
+#: src/view/AccountPanel.cpp:855
 msgid " operations ?"
 msgstr " opérations ?"
 
-#: src/view/PreferencesPanel.cpp:838
+#: src/view/PreferencesPanel.cpp:839
 msgid " profil ?"
 msgstr " profil ?"
 
+#: src/view/ImportPanel.cpp:290
+msgid " will be created, is it ok ?"
+msgstr " vont être créés, êtes vous d'accord ?"
+
 #: src/model/Database.cpp:92
 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/SearchPanel.cpp:271
+#: src/view/ImportPanel.cpp:283
+#, c-format
+msgid "%d accounts"
+msgstr "%d comptes"
+
+#: src/view/ImportPanel.cpp:288
+#, c-format
+msgid "%d categories"
+msgstr "%d catégories"
+
+#: src/view/SearchPanel.cpp:278
 msgid "1 entry found"
 msgstr "1 entrée trouvée"
 
-#: src/view/SearchPanel.cpp:99
+#: src/view/SearchPanel.cpp:101
 #: src/view/grid/GridAccount.cpp:68
 msgid "Account"
 msgstr "Compte"
 
-#: src/view/PreferencesPanel.cpp:495
-#: src/view/PreferencesPanel.cpp:515
+#: src/view/PreferencesPanel.cpp:496
+#: src/view/PreferencesPanel.cpp:516
 msgid "Account "
 msgstr "Le compte "
 
@@ -75,49 +89,50 @@ msgstr "Le compte "
 msgid "Account 1"
 msgstr "Compte 1"
 
-#: src/view/AccountPanel.cpp:108
+#: src/view/ImportPanel.cpp:74
+#: src/view/AccountPanel.cpp:111
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: src/view/AccountPanel.cpp:107
+#: src/view/AccountPanel.cpp:110
 msgid "Account number"
 msgstr "Numéro de compte"
 
-#: src/view/StatsPanel.cpp:323
+#: src/view/StatsPanel.cpp:326
 #: src/view/PreferencesPanel.cpp:60
 msgid "Accounts"
 msgstr "Comptes"
 
-#: src/view/SearchPanel.cpp:95
+#: src/view/SearchPanel.cpp:97
 msgid "Amount from"
 msgstr "Montant min"
 
-#: src/view/SearchPanel.cpp:96
+#: src/view/SearchPanel.cpp:98
 msgid "Amount to"
 msgstr "Montant max"
 
-#: src/view/ImportPanel.cpp:156
+#: src/view/ImportPanel.cpp:177
 msgid "Any engine can process this file !"
 msgstr "Format de fichier non reconnu"
 
-#: src/view/PreferencesPanel.cpp:838
-#: src/view/AccountPanel.cpp:847
+#: src/view/PreferencesPanel.cpp:839
+#: src/view/AccountPanel.cpp:850
 msgid "Are you sure want to delete "
 msgstr "Etes vous sûr de vouloir supprimer "
 
-#: src/view/grid/GridAccount.cpp:853
+#: src/view/grid/GridAccount.cpp:854
 msgid "Are you sure want to delete : \n"
 msgstr "Etes vous sûr de vouloir supprimer : \n"
 
-#: src/view/ImportPanel.cpp:277
+#: src/view/ImportPanel.cpp:367
 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:368
+#: src/view/PreferencesPanel.cpp:369
 msgid "Ascending"
 msgstr "Croissant"
 
-#: src/view/PreferencesPanel.cpp:292
+#: src/view/PreferencesPanel.cpp:293
 msgid "Background color"
 msgstr "Couleur d'arrière plan"
 
@@ -131,30 +146,38 @@ msgstr "Bloqué"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/view/grid/GridAccount.cpp:1288
-#: src/view/grid/GridAccount.cpp:1295
+#: src/view/grid/GridAccount.cpp:1289
+#: src/view/grid/GridAccount.cpp:1296
 msgid "Cannot group these operations"
 msgstr "Impossible de grouper ces opérations"
 
-#: src/view/grid/GridAccount.cpp:1414
-#: src/view/grid/GridAccount.cpp:1420
+#: src/view/grid/GridAccount.cpp:1415
+#: src/view/grid/GridAccount.cpp:1421
 msgid "Cannot ungroup these operations"
 msgstr "Impossible de dégrouper ces opérations"
 
+#: src/controller/KissCount.cpp:355
+msgid "Car"
+msgstr "Voiture"
+
 #: src/view/PreferencesPanel.cpp:61
 msgid "Categories"
 msgstr "Catégories"
 
-#: src/view/SearchPanel.cpp:97
+#: src/view/SearchPanel.cpp:99
 #: src/view/grid/GridAccount.cpp:68
 msgid "Category"
 msgstr "Catégorie"
 
-#: src/view/PreferencesPanel.cpp:726
-#: src/view/PreferencesPanel.cpp:745
+#: src/view/PreferencesPanel.cpp:727
+#: src/view/PreferencesPanel.cpp:746
 msgid "Category "
 msgstr "La catégorie "
 
+#: src/view/ImportPanel.cpp:82
+msgid "Category name"
+msgstr "Catégorie"
+
 #: src/view/PreferencesPanel.cpp:78
 msgid "Change Name"
 msgstr "Changer de nom"
@@ -163,11 +186,11 @@ msgstr "Changer de nom"
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: src/view/SearchPanel.cpp:125
+#: src/view/SearchPanel.cpp:127
 msgid "Change account"
 msgstr "Changer de compte"
 
-#: src/view/SearchPanel.cpp:126
+#: src/view/SearchPanel.cpp:128
 msgid "Change category"
 msgstr "Changer la catégorie"
 
@@ -175,23 +198,23 @@ msgstr "Changer la catégorie"
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: src/view/AccountPanel.cpp:124
+#: src/view/AccountPanel.cpp:127
 msgid "Check"
 msgstr "Rapprochement"
 
-#: src/view/SearchPanel.cpp:84
+#: src/view/SearchPanel.cpp:86
 msgid "Checked"
 msgstr "Rapprochée"
 
-#: src/view/ImportPanel.cpp:117
+#: src/view/ImportPanel.cpp:133
 msgid "Choose a database to open"
 msgstr "Choisissez une base de données à ouvrir"
 
-#: src/view/SearchPanel.cpp:309
+#: src/view/SearchPanel.cpp:316
 msgid "Choose a new account"
 msgstr "Nouveau compte"
 
-#: src/view/SearchPanel.cpp:351
+#: src/view/SearchPanel.cpp:358
 msgid "Choose a new category"
 msgstr "Nouvelle catégorie"
 
@@ -199,14 +222,17 @@ msgstr "Nouvelle catégorie"
 msgid "Confirm password "
 msgstr "Confirmer le mot de passe "
 
-#: src/view/StatsPanel.cpp:128
-#: src/view/AccountPanel.cpp:118
+#: src/view/StatsPanel.cpp:131
+#: src/view/AccountPanel.cpp:121
 msgid "Cost repartition"
 msgstr "Répartition des coûts"
 
-#: src/view/ImportPanel.cpp:168
-#: src/view/ImportPanel.cpp:215
-#: src/view/ImportPanel.cpp:230
+#: src/view/ImportPanel.cpp:189
+#: src/view/ImportPanel.cpp:219
+#: src/view/ImportPanel.cpp:261
+#: src/view/ImportPanel.cpp:270
+#: src/view/ImportPanel.cpp:298
+#: src/view/ImportPanel.cpp:319
 msgid "Create one"
 msgstr "En créer un"
 
@@ -214,15 +240,15 @@ msgstr "En créer un"
 msgid "Credit"
 msgstr "Crédit"
 
-#: src/view/AccountPanel.cpp:219
+#: src/view/AccountPanel.cpp:222
 msgid "Cur Credit"
 msgstr "Cur Crédit"
 
-#: src/view/AccountPanel.cpp:220
+#: src/view/AccountPanel.cpp:223
 msgid "Cur Debit"
 msgstr "Cur Débit"
 
-#: src/view/AccountPanel.cpp:110
+#: src/view/AccountPanel.cpp:113
 msgid "Current value"
 msgstr "Valeur courante"
 
@@ -230,11 +256,11 @@ msgstr "Valeur courante"
 msgid "Date"
 msgstr "Date"
 
-#: src/view/SearchPanel.cpp:56
+#: src/view/SearchPanel.cpp:57
 msgid "Date from"
 msgstr "Date min"
 
-#: src/view/SearchPanel.cpp:57
+#: src/view/SearchPanel.cpp:58
 msgid "Date to"
 msgstr "Date max"
 
@@ -247,44 +273,44 @@ msgid "Default"
 msgstr "Défaut"
 
 #: src/view/PreferencesPanel.cpp:201
-#: src/view/PreferencesPanel.cpp:295
-#: src/view/AccountPanel.cpp:706
+#: src/view/PreferencesPanel.cpp:296
+#: src/view/AccountPanel.cpp:709
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/view/PreferencesPanel.cpp:369
+#: src/view/PreferencesPanel.cpp:370
 msgid "Descending"
 msgstr "Décroissant"
 
-#: src/view/SearchPanel.cpp:94
+#: src/view/SearchPanel.cpp:96
 #: src/view/grid/GridAccount.cpp:68
 msgid "Description"
 msgstr "Description"
 
-#: src/view/SearchPanel.cpp:393
+#: src/view/SearchPanel.cpp:400
 msgid "Enter a new description"
 msgstr "Nouvelle description"
 
-#: src/view/UsersDialog.cpp:90
-#: src/view/UsersDialog.cpp:120
-#: src/view/SearchPanel.cpp:179
-#: src/view/SearchPanel.cpp:189
-#: src/view/SearchPanel.cpp:203
-#: src/view/SearchPanel.cpp:214
-#: src/view/PreferencesPanel.cpp:435
-#: src/view/PreferencesPanel.cpp:495
-#: src/view/PreferencesPanel.cpp:515
-#: src/view/PreferencesPanel.cpp:726
-#: src/view/PreferencesPanel.cpp:745
-#: src/view/PreferencesPanel.cpp:783
-#: src/view/PreferencesPanel.cpp:789
+#: src/view/UsersDialog.cpp:95
+#: src/view/UsersDialog.cpp:125
+#: src/view/SearchPanel.cpp:181
+#: src/view/SearchPanel.cpp:191
+#: src/view/SearchPanel.cpp:205
+#: src/view/SearchPanel.cpp:216
+#: 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:843
-#: src/view/grid/GridAccount.cpp:1288
-#: src/view/grid/GridAccount.cpp:1295
-#: src/view/grid/GridAccount.cpp:1414
-#: src/view/grid/GridAccount.cpp:1420
+#: src/view/AccountPanel.cpp:846
+#: src/view/grid/GridAccount.cpp:1289
+#: src/view/grid/GridAccount.cpp:1296
+#: src/view/grid/GridAccount.cpp:1415
+#: src/view/grid/GridAccount.cpp:1421
 #: src/view/grid/wxGridCellFormulaEditor.cpp:69
 #: src/model/Database.cpp:45
 #: src/model/Database.cpp:52
@@ -302,29 +328,33 @@ msgstr "Erreur"
 msgid "Error creating original database"
 msgstr "Erreur durant la création de la base de données initiale"
 
-#: src/view/ImportPanel.cpp:71
+#: src/view/ImportPanel.cpp:73
 msgid "File account"
 msgstr "Compte du fichier"
 
-#: src/view/AccountPanel.cpp:111
+#: src/view/ImportPanel.cpp:81
+msgid "File category"
+msgstr "Catégorie du fichier"
+
+#: src/view/AccountPanel.cpp:114
 msgid "Final value"
 msgstr "Valeur finale"
 
-#: src/view/SearchPanel.cpp:84
+#: src/view/SearchPanel.cpp:86
 #: src/view/grid/GridAccount.cpp:345
 #: src/controller/KissCount.cpp:355
 msgid "Fix"
 msgstr "Fixe"
 
-#: src/view/PreferencesPanel.cpp:294
+#: src/view/PreferencesPanel.cpp:295
 msgid "Font"
 msgstr "Police"
 
-#: src/view/PreferencesPanel.cpp:293
+#: src/view/PreferencesPanel.cpp:294
 msgid "Foreground color"
 msgstr "Couleur d'avant plan"
 
-#: src/view/StatsPanel.cpp:64
+#: src/view/StatsPanel.cpp:65
 msgid "From"
 msgstr "De"
 
@@ -333,15 +363,19 @@ msgid "From "
 msgstr "A partir de "
 
 #: src/view/GenerateDialog.cpp:31
-#: src/view/AccountPanel.cpp:703
+#: src/view/AccountPanel.cpp:706
 msgid "Generate month"
 msgstr "Générer mois"
 
+#: src/model/import/GrisbiImportEngine.cpp:185
+msgid "Grisbi files (*.gsb)|*.gsb"
+msgstr "Fichiers Grisbi (*.gsb)|*.gsb"
+
 #: src/controller/KissCount.cpp:355
 msgid "Groceries"
 msgstr "Courses"
 
-#: src/view/AccountPanel.cpp:130
+#: src/view/AccountPanel.cpp:133
 msgid "Group"
 msgstr "Grouper"
 
@@ -349,31 +383,39 @@ msgstr "Grouper"
 msgid "Hobbies"
 msgstr "Loisirs"
 
-#: src/view/ImportPanel.cpp:107
+#: src/view/ImportPanel.cpp:123
 msgid "Import"
 msgstr "Import"
 
-#: src/view/AccountPanel.cpp:109
+#: src/view/AccountPanel.cpp:112
 msgid "Initial value"
 msgstr "Valeur initiale"
 
-#: src/view/ImportPanel.cpp:72
+#: src/view/ImportPanel.cpp:57
+msgid "Integrate operations"
+msgstr "Intégrer les opérations"
+
+#: src/view/ImportPanel.cpp:75
 msgid "Internal account"
 msgstr "Compte interne"
 
-#: src/view/SearchPanel.cpp:189
+#: src/view/ImportPanel.cpp:83
+msgid "Internal category"
+msgstr "Catégorie interne"
+
+#: src/view/SearchPanel.cpp:191
 msgid "Invalid amount from"
 msgstr "Montant min invalide"
 
-#: src/view/SearchPanel.cpp:214
+#: src/view/SearchPanel.cpp:216
 msgid "Invalid amount range"
 msgstr "Intervalle des montants invalide"
 
-#: src/view/SearchPanel.cpp:203
+#: src/view/SearchPanel.cpp:205
 msgid "Invalid amount to"
 msgstr "Montant max invalide"
 
-#: src/view/SearchPanel.cpp:179
+#: src/view/SearchPanel.cpp:181
 msgid "Invalid date range"
 msgstr "Intervalle de temps invalide"
 
@@ -381,7 +423,7 @@ msgstr "Intervalle de temps invalide"
 msgid "Invalid formula !"
 msgstr "Formule invalide !"
 
-#: src/view/PreferencesPanel.cpp:783
+#: src/view/PreferencesPanel.cpp:784
 msgid "Invalid name"
 msgstr "Nom invalide"
 
@@ -389,19 +431,19 @@ msgstr "Nom invalide"
 msgid "Invalid old password"
 msgstr "Ancien mot de passe invalide"
 
-#: src/view/UsersDialog.cpp:90
+#: src/view/UsersDialog.cpp:95
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: src/view/StatsPanel.cpp:377
+#: src/view/StatsPanel.cpp:380
 msgid "Invalide date range"
 msgstr "Intervalle de temps invalide"
 
-#: src/view/PreferencesPanel.cpp:435
+#: src/view/PreferencesPanel.cpp:436
 msgid "It must be at least one account !"
 msgstr "Il doit y avoir au moins un compte !"
 
-#: src/view/AccountPanel.cpp:843
+#: src/view/AccountPanel.cpp:846
 msgid "It must be at least one month !"
 msgstr "Il doit rester au moins un mois"
 
@@ -409,14 +451,14 @@ msgstr "Il doit rester au moins un mois"
 msgid "Kill me"
 msgstr "Kill me"
 
-#: src/view/StatsPanel.cpp:377
-#: src/view/PreferencesPanel.cpp:823
-#: src/view/PreferencesPanel.cpp:826
+#: src/view/StatsPanel.cpp:380
+#: src/view/PreferencesPanel.cpp:824
+#: src/view/PreferencesPanel.cpp:827
 #: src/model/Database_Update.cpp:140
 msgid "KissCount"
 msgstr "KissCount"
 
-#: src/view/ImportPanel.cpp:112
+#: src/view/ImportPanel.cpp:128
 msgid "KissCount - Import"
 msgstr "KissCount - Import"
 
@@ -424,30 +466,34 @@ msgstr "KissCount - Import"
 msgid "Language"
 msgstr "Langue"
 
-#: src/view/PreferencesPanel.cpp:826
+#: src/view/PreferencesPanel.cpp:827
 msgid "Language not changed"
 msgstr "Langue non changée"
 
-#: src/view/PreferencesPanel.cpp:823
+#: src/view/PreferencesPanel.cpp:824
 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/AccountPanel.cpp:125
+#: src/view/ImportPanel.cpp:54
+msgid "Load operations"
+msgstr "Charger les opérations"
+
+#: src/view/AccountPanel.cpp:128
 msgid "Mode"
 msgstr "Mode"
 
 #: src/view/PreferencesPanel.cpp:72
 #: src/view/PreferencesPanel.cpp:196
-#: src/view/PreferencesPanel.cpp:291
+#: src/view/PreferencesPanel.cpp:292
 msgid "Name"
 msgstr "Nom"
 
-#: src/view/PreferencesPanel.cpp:795
+#: src/view/PreferencesPanel.cpp:796
 msgid "Name changed"
 msgstr "Nom changé"
 
 #: src/view/UsersDialog.cpp:53
-#: src/view/UsersDialog.cpp:109
+#: src/view/UsersDialog.cpp:114
 msgid "New User"
 msgstr "Nouvel utilisateur"
 
@@ -463,26 +509,26 @@ msgstr ""
 "Aucune base de données trouvée, voulez vous en créer une nouvelle ?\n"
 "\n"
 
-#: src/view/SearchPanel.cpp:274
+#: src/view/SearchPanel.cpp:281
 msgid "No entry found"
 msgstr "Pas d'entrée trouvée"
 
-#: src/view/ImportPanel.cpp:267
+#: src/view/ImportPanel.cpp:357
 msgid "No operation found into this file"
 msgstr "Aucun opération trouvée dans ce fichier"
 
-#: src/view/SearchPanel.cpp:84
+#: src/view/SearchPanel.cpp:86
 msgid "Non fix"
 msgstr "Courantes"
 
-#: src/view/SearchPanel.cpp:304
-#: src/view/SearchPanel.cpp:346
-#: src/view/PreferencesPanel.cpp:440
-#: src/view/PreferencesPanel.cpp:701
+#: src/view/SearchPanel.cpp:311
+#: src/view/SearchPanel.cpp:353
+#: src/view/PreferencesPanel.cpp:441
+#: src/view/PreferencesPanel.cpp:702
 msgid "None"
 msgstr "Aucun"
 
-#: src/view/SearchPanel.cpp:84
+#: src/view/SearchPanel.cpp:86
 msgid "Not checked"
 msgstr "Non rapprochée"
 
@@ -490,7 +536,7 @@ msgstr "Non rapprochée"
 msgid "Number"
 msgstr "Numéro de compte"
 
-#: src/model/import/OFXImportEngine.cpp:124
+#: src/model/import/OFXImportEngine.cpp:126
 msgid "OFX files (*.ofx)|*.ofx"
 msgstr "Fichiers OFX (*.ofx)|*.ofx"
 
@@ -504,20 +550,16 @@ msgstr "OK"
 msgid "Old password "
 msgstr "Ancien mot de passe "
 
-#: src/controller/KissCount.cpp:355
-msgid "Operating expense"
-msgstr "Fonctionnement"
-
 #: src/view/PreferencesPanel.cpp:63
 msgid "Operation order"
 msgstr "Ordre des opérations"
 
-#: src/view/SearchPanel.cpp:98
-#: src/view/AccountPanel.cpp:179
+#: src/view/SearchPanel.cpp:100
+#: src/view/AccountPanel.cpp:182
 msgid "Operations"
 msgstr "Opérations"
 
-#: src/view/ImportPanel.cpp:292
+#: src/view/ImportPanel.cpp:382
 msgid "Operations successfully imported"
 msgstr "les opérations ont été importées avec succès"
 
@@ -525,7 +567,7 @@ msgstr "les opérations ont été importées avec succès"
 msgid "Other"
 msgstr "Autres"
 
-#: src/view/UsersDialog.cpp:44
+#: src/view/UsersDialog.cpp:45
 msgid "Password "
 msgstr "Mot de passe "
 
@@ -556,8 +598,8 @@ msgid "Please retype new password"
 msgstr "Re entrez le mot de passe"
 
 #: src/view/PreferencesPanel.cpp:184
-#: src/view/PreferencesPanel.cpp:797
-#: src/view/PreferencesPanel.cpp:831
+#: src/view/PreferencesPanel.cpp:798
+#: src/view/PreferencesPanel.cpp:832
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -565,26 +607,30 @@ msgstr "Préférences"
 msgid "Quit KissCount ?"
 msgstr "Quitter KissCount ?"
 
-#: src/view/AccountPanel.cpp:124
+#: src/view/AccountPanel.cpp:127
 msgid "Real"
 msgstr "Réel"
 
-#: src/view/AccountPanel.cpp:221
+#: src/view/AccountPanel.cpp:224
 msgid "Remains"
 msgstr "Restant"
 
-#: src/view/SearchPanel.cpp:127
+#: src/view/SearchPanel.cpp:129
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/view/SearchPanel.cpp:92
-#: src/view/SearchPanel.cpp:164
-#: src/view/SearchPanel.cpp:409
+#: src/view/ImportPanel.cpp:60
+msgid "Save import patterns"
+msgstr "Sauvegarder les motifs d'import"
+
+#: src/view/SearchPanel.cpp:94
+#: src/view/SearchPanel.cpp:166
+#: src/view/SearchPanel.cpp:416
 msgid "Search"
 msgstr "Chercher"
 
-#: src/view/StatsPanel.cpp:120
-#: src/view/AccountPanel.cpp:92
+#: src/view/StatsPanel.cpp:123
+#: src/view/AccountPanel.cpp:94
 msgid "Serie 1"
 msgstr "Série 1"
 
@@ -592,12 +638,12 @@ msgstr "Série 1"
 msgid "Shared with"
 msgstr "Partagé avec"
 
-#: src/view/StatsPanel.cpp:160
-#: src/view/StatsPanel.cpp:358
+#: src/view/StatsPanel.cpp:163
+#: src/view/StatsPanel.cpp:361
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: src/view/StatsPanel.cpp:69
+#: src/view/StatsPanel.cpp:70
 msgid "To"
 msgstr "A"
 
@@ -605,15 +651,15 @@ msgstr "A"
 msgid "To "
 msgstr "Vers "
 
-#: src/view/AccountPanel.cpp:203
+#: src/view/AccountPanel.cpp:206
 msgid "Total Credit"
 msgstr "Total Crédit"
 
-#: src/view/AccountPanel.cpp:204
+#: src/view/AccountPanel.cpp:207
 msgid "Total Debit"
 msgstr "Total Débit"
 
-#: src/view/AccountPanel.cpp:131
+#: src/view/AccountPanel.cpp:134
 msgid "UnGroup"
 msgstr "Dégrouper"
 
@@ -633,50 +679,57 @@ msgstr "Impossible d'ouvrir la base de données"
 msgid "Unexpected"
 msgstr "Exceptionnel"
 
-#: src/view/SearchPanel.cpp:80
-#: src/view/SearchPanel.cpp:88
+#: src/view/SearchPanel.cpp:82
+#: src/view/SearchPanel.cpp:90
+#: src/view/AccountPanel.cpp:515
+#: src/view/AccountPanel.cpp:551
+#: src/view/AccountPanel.cpp:589
 #: src/model/User.cpp:59
 #: src/model/User.cpp:79
 #: src/model/User.cpp:127
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/view/ImportPanel.cpp:41
+#: src/view/ImportPanel.cpp:42
 msgid "Unresolved accounts"
 msgstr "Comptes non résolus"
 
+#: src/view/ImportPanel.cpp:43
+msgid "Unresolved categories"
+msgstr "Catégories non résolues"
+
 #: src/view/PreferencesPanel.cpp:59
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/view/UsersDialog.cpp:39
-#: src/view/UsersDialog.cpp:120
-#: src/view/PreferencesPanel.cpp:789
+#: src/view/UsersDialog.cpp:40
+#: src/view/UsersDialog.cpp:125
+#: src/view/PreferencesPanel.cpp:790
 msgid "User "
 msgstr "Utilisateur "
 
-#: src/view/UsersDialog.cpp:30
+#: src/view/UsersDialog.cpp:31
 msgid "Users"
 msgstr "Utilisateurs"
 
 #: src/view/PreferencesPanel.cpp:199
-#: src/view/AccountPanel.cpp:124
+#: src/view/AccountPanel.cpp:127
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: src/view/grid/GridAccount.cpp:1065
+#: src/view/grid/GridAccount.cpp:1066
 msgid "Warning"
 msgstr "Attention"
 
-#: src/view/PreferencesPanel.cpp:445
+#: src/view/PreferencesPanel.cpp:446
 msgid "Wich account will replace this one ?"
 msgstr "Quel compte va remplacer celui-ci ?"
 
-#: src/view/PreferencesPanel.cpp:706
+#: src/view/PreferencesPanel.cpp:707
 msgid "Wich category will replace this one ?"
 msgstr "Quelle catégorie va remplacer celle-ci"
 
-#: src/view/grid/GridAccount.cpp:1065
+#: src/view/grid/GridAccount.cpp:1066
 msgid "You made a debit on a blocked account"
 msgstr "Vous avez effectué une opération de débit sur un compte bloqué"
 
@@ -728,22 +781,32 @@ msgstr "octobre"
 msgid "september"
 msgstr "septembre"
 
+#~ msgid "Operating expense"
+#~ msgstr "Fonctionnement"
+
 #~ msgid "Check mode"
 #~ msgstr "Mode rapprochement"
+
 #~ 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"
+
 #~ msgid "Change user"
 #~ msgstr "Changer d'utilisateur"
+
 #~ msgid "Quit"
 #~ msgstr "Quitter"
+
 #~ msgid "Both"
 #~ msgstr "Les deux"
+
 #~ msgid "Color"
 #~ msgstr "Couleur"
+
 #~ msgid "Fixe"
 #~ msgstr "Fixe"
-
diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot
index b945f85..48b9dc6 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-04-03 19:13+0200\n"
+"POT-Creation-Date: 2011-04-26 21:01+0200\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,21 +17,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/view/StatsPanel.cpp:358 src/view/PreferencesPanel.cpp:832
+#: src/view/StatsPanel.cpp:361 src/view/PreferencesPanel.cpp:832
 msgid " - "
 msgstr ""
 
-#: src/view/ImportPanel.cpp:222
-msgid " account(s) will be created, is it ok ?"
-msgstr ""
-
-#: src/view/UsersDialog.cpp:120 src/view/PreferencesPanel.cpp:496
+#: 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
 msgid " already exists"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:269
+#: src/view/ImportPanel.cpp:284
+msgid " and "
+msgstr ""
+
+#: src/view/SearchPanel.cpp:276
 msgid " entries found"
 msgstr ""
 
@@ -39,7 +39,7 @@ msgstr ""
 msgid " not found, aborting"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:852
+#: src/view/AccountPanel.cpp:855
 msgid " operations ?"
 msgstr ""
 
@@ -47,15 +47,29 @@ msgstr ""
 msgid " profil ?"
 msgstr ""
 
+#: src/view/ImportPanel.cpp:290
+msgid " will be created, is it ok ?"
+msgstr ""
+
 #: src/model/Database.cpp:92
 msgid "!! Warning !! If there was a bug, the old database will be suppressed !"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:271
+#: src/view/ImportPanel.cpp:283
+#, c-format
+msgid "%d accounts"
+msgstr ""
+
+#: src/view/ImportPanel.cpp:288
+#, c-format
+msgid "%d categories"
+msgstr ""
+
+#: src/view/SearchPanel.cpp:278
 msgid "1 entry found"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:99 src/view/grid/GridAccount.cpp:68
+#: src/view/SearchPanel.cpp:101 src/view/grid/GridAccount.cpp:68
 msgid "Account"
 msgstr ""
 
@@ -67,31 +81,31 @@ msgstr ""
 msgid "Account 1"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:108
+#: src/view/ImportPanel.cpp:74 src/view/AccountPanel.cpp:111
 msgid "Account name"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:107
+#: src/view/AccountPanel.cpp:110
 msgid "Account number"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:323 src/view/PreferencesPanel.cpp:60
+#: src/view/StatsPanel.cpp:326 src/view/PreferencesPanel.cpp:60
 msgid "Accounts"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:95
+#: src/view/SearchPanel.cpp:97
 msgid "Amount from"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:96
+#: src/view/SearchPanel.cpp:98
 msgid "Amount to"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:156
+#: src/view/ImportPanel.cpp:177
 msgid "Any engine can process this file !"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:839 src/view/AccountPanel.cpp:847
+#: src/view/PreferencesPanel.cpp:839 src/view/AccountPanel.cpp:850
 msgid "Are you sure want to delete "
 msgstr ""
 
@@ -99,7 +113,7 @@ msgstr ""
 msgid "Are you sure want to delete : \n"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:277
+#: src/view/ImportPanel.cpp:367
 msgid "Are you sure want to integrate these operations ?"
 msgstr ""
 
@@ -128,11 +142,15 @@ msgstr ""
 msgid "Cannot ungroup these operations"
 msgstr ""
 
+#: src/controller/KissCount.cpp:355
+msgid "Car"
+msgstr ""
+
 #: src/view/PreferencesPanel.cpp:61
 msgid "Categories"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:97 src/view/grid/GridAccount.cpp:68
+#: src/view/SearchPanel.cpp:99 src/view/grid/GridAccount.cpp:68
 msgid "Category"
 msgstr ""
 
@@ -140,6 +158,10 @@ msgstr ""
 msgid "Category "
 msgstr ""
 
+#: src/view/ImportPanel.cpp:82
+msgid "Category name"
+msgstr ""
+
 #: src/view/PreferencesPanel.cpp:78
 msgid "Change Name"
 msgstr ""
@@ -148,11 +170,11 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:125
+#: src/view/SearchPanel.cpp:127
 msgid "Change account"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:126
+#: src/view/SearchPanel.cpp:128
 msgid "Change category"
 msgstr ""
 
@@ -160,23 +182,23 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:124
+#: src/view/AccountPanel.cpp:127
 msgid "Check"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:84
+#: src/view/SearchPanel.cpp:86
 msgid "Checked"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:117
+#: src/view/ImportPanel.cpp:133
 msgid "Choose a database to open"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:309
+#: src/view/SearchPanel.cpp:316
 msgid "Choose a new account"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:351
+#: src/view/SearchPanel.cpp:358
 msgid "Choose a new category"
 msgstr ""
 
@@ -184,12 +206,13 @@ msgstr ""
 msgid "Confirm password "
 msgstr ""
 
-#: src/view/StatsPanel.cpp:128 src/view/AccountPanel.cpp:118
+#: src/view/StatsPanel.cpp:131 src/view/AccountPanel.cpp:121
 msgid "Cost repartition"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:168 src/view/ImportPanel.cpp:215
-#: src/view/ImportPanel.cpp:230
+#: src/view/ImportPanel.cpp:189 src/view/ImportPanel.cpp:219
+#: src/view/ImportPanel.cpp:261 src/view/ImportPanel.cpp:270
+#: src/view/ImportPanel.cpp:298 src/view/ImportPanel.cpp:319
 msgid "Create one"
 msgstr ""
 
@@ -197,15 +220,15 @@ msgstr ""
 msgid "Credit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:219
+#: src/view/AccountPanel.cpp:222
 msgid "Cur Credit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:220
+#: src/view/AccountPanel.cpp:223
 msgid "Cur Debit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:110
+#: src/view/AccountPanel.cpp:113
 msgid "Current value"
 msgstr ""
 
@@ -213,11 +236,11 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:56
+#: src/view/SearchPanel.cpp:57
 msgid "Date from"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:57
+#: src/view/SearchPanel.cpp:58
 msgid "Date to"
 msgstr ""
 
@@ -230,7 +253,7 @@ msgid "Default"
 msgstr ""
 
 #: src/view/PreferencesPanel.cpp:201 src/view/PreferencesPanel.cpp:296
-#: src/view/AccountPanel.cpp:706
+#: src/view/AccountPanel.cpp:709
 msgid "Delete"
 msgstr ""
 
@@ -238,22 +261,22 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:94 src/view/grid/GridAccount.cpp:68
+#: src/view/SearchPanel.cpp:96 src/view/grid/GridAccount.cpp:68
 msgid "Description"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:393
+#: src/view/SearchPanel.cpp:400
 msgid "Enter a new description"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:90 src/view/UsersDialog.cpp:120
-#: src/view/SearchPanel.cpp:179 src/view/SearchPanel.cpp:189
-#: src/view/SearchPanel.cpp:203 src/view/SearchPanel.cpp:214
+#: src/view/UsersDialog.cpp:95 src/view/UsersDialog.cpp:125
+#: src/view/SearchPanel.cpp:181 src/view/SearchPanel.cpp:191
+#: src/view/SearchPanel.cpp:205 src/view/SearchPanel.cpp:216
 #: 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:843
+#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:846
 #: src/view/grid/GridAccount.cpp:1289 src/view/grid/GridAccount.cpp:1296
 #: src/view/grid/GridAccount.cpp:1415 src/view/grid/GridAccount.cpp:1421
 #: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:45
@@ -268,15 +291,19 @@ msgstr ""
 msgid "Error creating original database"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:71
+#: src/view/ImportPanel.cpp:73
 msgid "File account"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:111
+#: src/view/ImportPanel.cpp:81
+msgid "File category"
+msgstr ""
+
+#: src/view/AccountPanel.cpp:114
 msgid "Final value"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:84 src/view/grid/GridAccount.cpp:345
+#: src/view/SearchPanel.cpp:86 src/view/grid/GridAccount.cpp:345
 #: src/controller/KissCount.cpp:355
 msgid "Fix"
 msgstr ""
@@ -289,7 +316,7 @@ msgstr ""
 msgid "Foreground color"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:64
+#: src/view/StatsPanel.cpp:65
 msgid "From"
 msgstr ""
 
@@ -297,15 +324,19 @@ msgstr ""
 msgid "From "
 msgstr ""
 
-#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:703
+#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:706
 msgid "Generate month"
 msgstr ""
 
+#: src/model/import/GrisbiImportEngine.cpp:185
+msgid "Grisbi files (*.gsb)|*.gsb"
+msgstr ""
+
 #: src/controller/KissCount.cpp:355
 msgid "Groceries"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:130
+#: src/view/AccountPanel.cpp:133
 msgid "Group"
 msgstr ""
 
@@ -313,31 +344,39 @@ msgstr ""
 msgid "Hobbies"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:107
+#: src/view/ImportPanel.cpp:123
 msgid "Import"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:109
+#: src/view/AccountPanel.cpp:112
 msgid "Initial value"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:72
+#: src/view/ImportPanel.cpp:57
+msgid "Integrate operations"
+msgstr ""
+
+#: src/view/ImportPanel.cpp:75
 msgid "Internal account"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:189
+#: src/view/ImportPanel.cpp:83
+msgid "Internal category"
+msgstr ""
+
+#: src/view/SearchPanel.cpp:191
 msgid "Invalid amount from"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:214
+#: src/view/SearchPanel.cpp:216
 msgid "Invalid amount range"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:203
+#: src/view/SearchPanel.cpp:205
 msgid "Invalid amount to"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:179
+#: src/view/SearchPanel.cpp:181
 msgid "Invalid date range"
 msgstr ""
 
@@ -353,11 +392,11 @@ msgstr ""
 msgid "Invalid old password"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:90
+#: src/view/UsersDialog.cpp:95
 msgid "Invalid password"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:377
+#: src/view/StatsPanel.cpp:380
 msgid "Invalide date range"
 msgstr ""
 
@@ -365,7 +404,7 @@ msgstr ""
 msgid "It must be at least one account !"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:843
+#: src/view/AccountPanel.cpp:846
 msgid "It must be at least one month !"
 msgstr ""
 
@@ -373,12 +412,12 @@ msgstr ""
 msgid "Kill me"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:377 src/view/PreferencesPanel.cpp:824
+#: src/view/StatsPanel.cpp:380 src/view/PreferencesPanel.cpp:824
 #: src/view/PreferencesPanel.cpp:827 src/model/Database_Update.cpp:140
 msgid "KissCount"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:112
+#: src/view/ImportPanel.cpp:128
 msgid "KissCount - Import"
 msgstr ""
 
@@ -394,7 +433,11 @@ msgstr ""
 msgid "Language successfully changed, please go to another panel"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:125
+#: src/view/ImportPanel.cpp:54
+msgid "Load operations"
+msgstr ""
+
+#: src/view/AccountPanel.cpp:128
 msgid "Mode"
 msgstr ""
 
@@ -407,7 +450,7 @@ msgstr ""
 msgid "Name changed"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:53 src/view/UsersDialog.cpp:109
+#: src/view/UsersDialog.cpp:53 src/view/UsersDialog.cpp:114
 msgid "New User"
 msgstr ""
 
@@ -421,24 +464,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:274
+#: src/view/SearchPanel.cpp:281
 msgid "No entry found"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:267
+#: src/view/ImportPanel.cpp:357
 msgid "No operation found into this file"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:84
+#: src/view/SearchPanel.cpp:86
 msgid "Non fix"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:304 src/view/SearchPanel.cpp:346
+#: src/view/SearchPanel.cpp:311 src/view/SearchPanel.cpp:353
 #: src/view/PreferencesPanel.cpp:441 src/view/PreferencesPanel.cpp:702
 msgid "None"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:84
+#: src/view/SearchPanel.cpp:86
 msgid "Not checked"
 msgstr ""
 
@@ -446,7 +489,7 @@ msgstr ""
 msgid "Number"
 msgstr ""
 
-#: src/model/import/OFXImportEngine.cpp:124
+#: src/model/import/OFXImportEngine.cpp:126
 msgid "OFX files (*.ofx)|*.ofx"
 msgstr ""
 
@@ -459,19 +502,15 @@ msgstr ""
 msgid "Old password "
 msgstr ""
 
-#: src/controller/KissCount.cpp:355
-msgid "Operating expense"
-msgstr ""
-
 #: src/view/PreferencesPanel.cpp:63
 msgid "Operation order"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:98 src/view/AccountPanel.cpp:179
+#: src/view/SearchPanel.cpp:100 src/view/AccountPanel.cpp:182
 msgid "Operations"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:292
+#: src/view/ImportPanel.cpp:382
 msgid "Operations successfully imported"
 msgstr ""
 
@@ -479,7 +518,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:44
+#: src/view/UsersDialog.cpp:45
 msgid "Password "
 msgstr ""
 
@@ -511,24 +550,28 @@ msgstr ""
 msgid "Quit KissCount ?"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:124
+#: src/view/AccountPanel.cpp:127
 msgid "Real"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:221
+#: src/view/AccountPanel.cpp:224
 msgid "Remains"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:127
+#: src/view/SearchPanel.cpp:129
 msgid "Rename"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:92 src/view/SearchPanel.cpp:164
-#: src/view/SearchPanel.cpp:409
+#: src/view/ImportPanel.cpp:60
+msgid "Save import patterns"
+msgstr ""
+
+#: src/view/SearchPanel.cpp:94 src/view/SearchPanel.cpp:166
+#: src/view/SearchPanel.cpp:416
 msgid "Search"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:120 src/view/AccountPanel.cpp:92
+#: src/view/StatsPanel.cpp:123 src/view/AccountPanel.cpp:94
 msgid "Serie 1"
 msgstr ""
 
@@ -536,11 +579,11 @@ msgstr ""
 msgid "Shared with"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:160 src/view/StatsPanel.cpp:358
+#: src/view/StatsPanel.cpp:163 src/view/StatsPanel.cpp:361
 msgid "Statistics"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:69
+#: src/view/StatsPanel.cpp:70
 msgid "To"
 msgstr ""
 
@@ -548,15 +591,15 @@ msgstr ""
 msgid "To "
 msgstr ""
 
-#: src/view/AccountPanel.cpp:203
+#: src/view/AccountPanel.cpp:206
 msgid "Total Credit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:204
+#: src/view/AccountPanel.cpp:207
 msgid "Total Debit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:131
+#: src/view/AccountPanel.cpp:134
 msgid "UnGroup"
 msgstr ""
 
@@ -573,29 +616,35 @@ msgstr ""
 msgid "Unexpected"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:80 src/view/SearchPanel.cpp:88
-#: src/model/User.cpp:59 src/model/User.cpp:79 src/model/User.cpp:127
+#: src/view/SearchPanel.cpp:82 src/view/SearchPanel.cpp:90
+#: src/view/AccountPanel.cpp:515 src/view/AccountPanel.cpp:551
+#: src/view/AccountPanel.cpp:589 src/model/User.cpp:59 src/model/User.cpp:79
+#: src/model/User.cpp:127
 msgid "Unknown"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:41
+#: src/view/ImportPanel.cpp:42
 msgid "Unresolved accounts"
 msgstr ""
 
+#: src/view/ImportPanel.cpp:43
+msgid "Unresolved categories"
+msgstr ""
+
 #: src/view/PreferencesPanel.cpp:59
 msgid "User"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:39 src/view/UsersDialog.cpp:120
+#: src/view/UsersDialog.cpp:40 src/view/UsersDialog.cpp:125
 #: src/view/PreferencesPanel.cpp:790
 msgid "User "
 msgstr ""
 
-#: src/view/UsersDialog.cpp:30
+#: src/view/UsersDialog.cpp:31
 msgid "Users"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:199 src/view/AccountPanel.cpp:124
+#: src/view/PreferencesPanel.cpp:199 src/view/AccountPanel.cpp:127
 msgid "Virtual"
 msgstr ""
 
diff --git a/src/view/ImportPanel.cpp b/src/view/ImportPanel.cpp
index d00a9d0..9b4b9e0 100644
--- a/src/view/ImportPanel.cpp
+++ b/src/view/ImportPanel.cpp
@@ -51,13 +51,13 @@ ImportPanel::ImportPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, parent
     _fileTxt->SetMinSize(size);
     buttonOpen = new wxButton(this, BUTTON_OPEN_ID, wxT("..."));
 
-    _buttonLoadOperations = new wxButton(this, BUTTON_LOAD_ID, wxT("Load operations"));
+    _buttonLoadOperations = new wxButton(this, BUTTON_LOAD_ID, _("Load operations"));
     _buttonLoadOperations->Disable();
 
-    _buttonIntegrate = new wxButton(this, BUTTON_INTEGRATE_ID, wxT("Integrate operations"));
+    _buttonIntegrate = new wxButton(this, BUTTON_INTEGRATE_ID, _("Integrate operations"));
     _buttonIntegrate->Disable();
 
-    _checkSaveImportPatterns = new wxCheckBox(this, CHECK_SAVE_ID, wxT("Save import patterns"));
+    _checkSaveImportPatterns = new wxCheckBox(this, CHECK_SAVE_ID, _("Save import patterns"));
 
     hbox->Add(_fileTxt, 0, wxGROW|wxALL, 5);
     hbox->Add(buttonOpen, 0, wxALL, 5);
@@ -280,12 +280,12 @@ void ImportPanel::OnLoadOperations(wxCommandEvent& WXUNUSED(event))
 	
 	if (nbAccounts)
 	{
-	    message += wxString::Format(wxT("%d accounts"), nbAccounts);
-	    if (nbCategories) message += wxT(" and ");
+	    message += wxString::Format(_("%d accounts"), nbAccounts);
+	    if (nbCategories) message += _(" and ");
 	}
 
 	if (nbCategories)
-	    message += wxString::Format(wxT("%d categories"), nbCategories);
+	    message += wxString::Format(_("%d categories"), nbCategories);
 
 	message += _(" will be created, is it ok ?");