diff --git a/ressources/po/french.mo b/ressources/po/french.mo
index 5227c4a..79005d5 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 8269964..eceb25f 100644
--- a/ressources/po/french.po
+++ b/ressources/po/french.po
@@ -1,12 +1,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-08 19:24+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Soutadé <soutade@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
@@ -17,28 +18,28 @@ msgstr ""
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/view/PreferencesPanel.cpp:448
+#: src/view/PreferencesPanel.cpp:493
 msgid " - "
 msgstr " - "
 
-#: src/view/PreferencesPanel.cpp:284
-#: src/view/PreferencesPanel.cpp:384
-#: src/view/PreferencesPanel.cpp:429
+#: src/view/PreferencesPanel.cpp:315
+#: src/view/PreferencesPanel.cpp:415
+#: src/view/PreferencesPanel.cpp:460
 #: src/view/UsersDialog.cpp:95
 msgid " already exists"
-msgstr "existe déjà "
+msgstr " existe déjà "
 
 #: src/model/Database.cpp:83
 msgid " not found, aborting"
-msgstr "non trouvé, arrêt"
+msgstr " non trouvé, arrêt"
 
 #: src/view/AccountPanel.cpp:979
 msgid " operations ?"
-msgstr "opérations ?"
+msgstr " opérations ?"
 
-#: src/view/PreferencesPanel.cpp:455
+#: src/view/PreferencesPanel.cpp:500
 msgid " profil ?"
-msgstr "profil ?"
+msgstr " profil ?"
 
 #: src/view/ButtonPanel.cpp:31
 msgid "About"
@@ -48,7 +49,7 @@ msgstr "A propos"
 msgid "Account"
 msgstr "Compte"
 
-#: src/view/PreferencesPanel.cpp:284
+#: src/view/PreferencesPanel.cpp:315
 msgid "Account "
 msgstr "Compte"
 
@@ -58,19 +59,19 @@ msgstr "Nom du compte"
 
 #: src/view/AccountPanel.cpp:119
 msgid "Account number"
-msgstr "numéro de compte"
+msgstr "Numéro de compte"
 
-#: src/view/PreferencesPanel.cpp:31
+#: src/view/PreferencesPanel.cpp:32
 msgid "Accounts"
 msgstr "Comptes"
 
-#: src/view/PreferencesPanel.cpp:255
-#: src/view/PreferencesPanel.cpp:455
+#: src/view/PreferencesPanel.cpp:286
+#: src/view/PreferencesPanel.cpp:500
 #: src/view/AccountPanel.cpp:974
 msgid "Are you sure want to delete "
-msgstr "Etes vous sûr de vouloir supprimer"
+msgstr "Etes vous sûr de vouloir supprimer "
 
-#: src/view/PreferencesPanel.cpp:355
+#: src/view/PreferencesPanel.cpp:386
 #: src/view/AccountPanel.cpp:684
 msgid "Are you sure want to delete : \n"
 msgstr "Etes vous sûr de vouloir supprimer : \n"
@@ -81,7 +82,7 @@ msgstr "Etes vous sûr de vouloir supprimer : \n"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/view/PreferencesPanel.cpp:32
+#: src/view/PreferencesPanel.cpp:33
 msgid "Categories"
 msgstr "Catégories"
 
@@ -89,15 +90,15 @@ msgstr "Catégories"
 msgid "Category"
 msgstr "Catégorie"
 
-#: src/view/PreferencesPanel.cpp:384
+#: src/view/PreferencesPanel.cpp:415
 msgid "Category "
 msgstr "Catégorie"
 
-#: src/view/PreferencesPanel.cpp:46
+#: src/view/PreferencesPanel.cpp:48
 msgid "Change Name"
 msgstr "Changer de nom"
 
-#: src/view/PreferencesPanel.cpp:47
+#: src/view/PreferencesPanel.cpp:49
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -109,7 +110,7 @@ msgstr "Changer le mot de passe"
 msgid "Change user"
 msgstr "Changer d'utilisateur"
 
-#: src/view/PreferencesPanel.cpp:147
+#: src/view/PreferencesPanel.cpp:164
 msgid "Color"
 msgstr "Couleur"
 
@@ -145,12 +146,12 @@ msgstr "Date"
 msgid "Debit"
 msgstr "Débit"
 
-#: src/view/PreferencesPanel.cpp:98
+#: src/view/PreferencesPanel.cpp:115
 msgid "Default"
 msgstr "Défaut"
 
-#: src/view/PreferencesPanel.cpp:99
-#: src/view/PreferencesPanel.cpp:149
+#: src/view/PreferencesPanel.cpp:116
+#: src/view/PreferencesPanel.cpp:166
 #: src/view/AccountPanel.cpp:833
 msgid "Delete"
 msgstr "Supprimer"
@@ -163,11 +164,11 @@ msgstr "Description"
 #: src/model/Database.cpp:106
 #: src/view/PasswordDialog.cpp:53
 #: src/view/PasswordDialog.cpp:59
-#: src/view/PreferencesPanel.cpp:251
-#: src/view/PreferencesPanel.cpp:284
-#: src/view/PreferencesPanel.cpp:384
-#: src/view/PreferencesPanel.cpp:423
-#: src/view/PreferencesPanel.cpp:429
+#: src/view/PreferencesPanel.cpp:282
+#: src/view/PreferencesPanel.cpp:315
+#: src/view/PreferencesPanel.cpp:415
+#: src/view/PreferencesPanel.cpp:454
+#: src/view/PreferencesPanel.cpp:460
 #: src/view/AccountPanel.cpp:970
 #: src/view/UsersDialog.cpp:67
 #: src/view/UsersDialog.cpp:95
@@ -182,11 +183,16 @@ msgstr "Erreur durant la création de la base de données initiale"
 msgid "Final value"
 msgstr "Valeur finale"
 
+#: src/controller/KissCount.cpp:239
+msgid "Fix"
+msgstr "Fixe"
+
+#: src/model/Database.cpp:239
 #: src/view/AccountPanel.cpp:406
 msgid "Fixe"
 msgstr "Fixe"
 
-#: src/view/PreferencesPanel.cpp:148
+#: src/view/PreferencesPanel.cpp:165
 msgid "Font"
 msgstr "Police"
 
@@ -199,11 +205,19 @@ msgstr "De"
 msgid "Generate month"
 msgstr "Générer mois"
 
+#: src/controller/KissCount.cpp:241
+msgid "Groceries"
+msgstr "Courses"
+
+#: src/controller/KissCount.cpp:243
+msgid "Hobbies"
+msgstr "Loisirs"
+
 #: src/view/AccountPanel.cpp:121
 msgid "Initial value"
 msgstr "Valeur initiale"
 
-#: src/view/PreferencesPanel.cpp:423
+#: src/view/PreferencesPanel.cpp:454
 msgid "Invalid name"
 msgstr "Nom invalide"
 
@@ -215,7 +229,7 @@ msgstr "Ancien mot de passe invalide"
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: src/view/PreferencesPanel.cpp:251
+#: src/view/PreferencesPanel.cpp:282
 msgid "It must be at least one account !"
 msgstr "Il doit y avoir au moins un compte !"
 
@@ -223,17 +237,22 @@ msgstr "Il doit y avoir au moins un compte !"
 msgid "It must be at least one month !"
 msgstr "Il doit rester au mois un mois"
 
-#: src/view/PreferencesPanel.cpp:48
+#: src/view/PreferencesPanel.cpp:50
 msgid "Kill me"
 msgstr "Kill me"
 
+#: src/view/PreferencesPanel.cpp:484
+#: src/view/PreferencesPanel.cpp:487
+msgid "KissCount"
+msgstr "KissCount"
+
 #: src/view/ButtonPanel.cpp:71
 msgid ""
 "KissCount v0.1\n"
 "\n"
 "Personal accounting software\n"
 "\n"
-"Copyright (C) 2010 Grégory Soutadé"
+"Copyright (C) 2010 Grégory Soutadé"
 msgstr ""
 "KissCount v0.1\n"
 "\n"
@@ -241,13 +260,25 @@ msgstr ""
 "\n"
 "Copyright (C) 2010 Grégory Soutadé"
 
-#: src/view/PreferencesPanel.cpp:40
-#: src/view/PreferencesPanel.cpp:95
-#: src/view/PreferencesPanel.cpp:146
+#: src/view/PreferencesPanel.cpp:34
+msgid "Language"
+msgstr "Langue"
+
+#: src/view/PreferencesPanel.cpp:487
+msgid "Language not changed"
+msgstr "Langue non changée"
+
+#: src/view/PreferencesPanel.cpp:484
+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/PreferencesPanel.cpp:42
+#: src/view/PreferencesPanel.cpp:112
+#: src/view/PreferencesPanel.cpp:163
 msgid "Name"
 msgstr "Nom"
 
-#: src/view/PreferencesPanel.cpp:435
+#: src/view/PreferencesPanel.cpp:466
 msgid "Name changed"
 msgstr "Nom changé"
 
@@ -264,9 +295,9 @@ msgstr "Nouveau mot de passe"
 msgid "No database found, creating a new one"
 msgstr "Aucune base de données trouvée, création d'une nouvelle"
 
-#: src/view/PreferencesPanel.cpp:96
+#: src/view/PreferencesPanel.cpp:113
 msgid "Number"
-msgstr "Nombre"
+msgstr "Numéro de compte"
 
 #: src/view/PasswordDialog.cpp:36
 #: src/view/GenerateDialog.cpp:40
@@ -278,10 +309,18 @@ msgstr "OK"
 msgid "Old password "
 msgstr "Ancien mot de passe"
 
+#: src/controller/KissCount.cpp:245
+msgid "Operating exepense"
+msgstr "Frais de fonctionnement"
+
 #: src/view/ButtonPanel.cpp:26
 msgid "Operations"
 msgstr "Opérations"
 
+#: src/controller/KissCount.cpp:249
+msgid "Other"
+msgstr "Autres"
+
 #: src/view/UsersDialog.cpp:24
 msgid "Password "
 msgstr "Mot de passe"
@@ -294,8 +333,8 @@ msgstr "Mot de passe changé"
 msgid "Please retype new password"
 msgstr "Re entrez le mot de passe"
 
-#: src/view/PreferencesPanel.cpp:437
-#: src/view/PreferencesPanel.cpp:448
+#: src/view/PreferencesPanel.cpp:468
+#: src/view/PreferencesPanel.cpp:493
 #: src/view/ButtonPanel.cpp:29
 msgid "Preferences"
 msgstr "Préférences"
@@ -320,7 +359,7 @@ msgstr "Chercher"
 msgid "Serie 1"
 msgstr "Série 1"
 
-#: src/view/PreferencesPanel.cpp:97
+#: src/view/PreferencesPanel.cpp:114
 msgid "Shared"
 msgstr "Partagé"
 
@@ -340,17 +379,21 @@ msgstr "Total Crédit"
 msgid "Total Debit"
 msgstr "Total Débit"
 
+#: src/controller/KissCount.cpp:247
+msgid "Unexpected"
+msgstr "Exceptionnel"
+
 #: src/model/User.cpp:27
 #: src/model/User.cpp:41
 #: src/model/User.cpp:61
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/view/PreferencesPanel.cpp:30
+#: src/view/PreferencesPanel.cpp:31
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/view/PreferencesPanel.cpp:429
+#: src/view/PreferencesPanel.cpp:460
 #: src/view/UsersDialog.cpp:19
 #: src/view/UsersDialog.cpp:95
 msgid "User "
@@ -360,51 +403,51 @@ msgstr "Utilisateur"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:77
 msgid "april"
 msgstr "avril"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:81
 msgid "august"
 msgstr "août"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:85
 msgid "december"
 msgstr "décembre"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:75
 msgid "february"
 msgstr "février"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:74
 msgid "january"
 msgstr "janvier"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:80
 msgid "july"
 msgstr "juillet"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:79
 msgid "june"
 msgstr "juin"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:76
 msgid "march"
 msgstr "mars"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:78
 msgid "may"
 msgstr "mai"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:84
 msgid "november"
 msgstr "novembre"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:83
 msgid "october"
 msgstr "octobre"
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:82
 msgid "september"
 msgstr "septembre"
 
diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot
index e80ade8..b474c94 100644
--- a/ressources/po/kisscount.pot
+++ b/ressources/po/kisscount.pot
@@ -3,28 +3,25 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-04 18:22+0200\n"
-"PO-Revision-Date: 2010-07-04 19:11+0100\n"
-"Last-Translator: Soutadé <soutade@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2010-07-08 19:24+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: UNITED KINGDOM\n"
 
-#: src/view/PreferencesPanel.cpp:448
+#: src/view/PreferencesPanel.cpp:493
 msgid " - "
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:284
-#: src/view/PreferencesPanel.cpp:384
-#: src/view/PreferencesPanel.cpp:429
-#: src/view/UsersDialog.cpp:95
+#: src/view/PreferencesPanel.cpp:315 src/view/PreferencesPanel.cpp:415
+#: src/view/PreferencesPanel.cpp:460 src/view/UsersDialog.cpp:95
 msgid " already exists"
 msgstr ""
 
@@ -36,7 +33,7 @@ msgstr ""
 msgid " operations ?"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:455
+#: src/view/PreferencesPanel.cpp:500
 msgid " profil ?"
 msgstr ""
 
@@ -48,7 +45,7 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:284
+#: src/view/PreferencesPanel.cpp:315
 msgid "Account "
 msgstr ""
 
@@ -60,28 +57,25 @@ msgstr ""
 msgid "Account number"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:31
+#: src/view/PreferencesPanel.cpp:32
 msgid "Accounts"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:255
-#: src/view/PreferencesPanel.cpp:455
+#: src/view/PreferencesPanel.cpp:286 src/view/PreferencesPanel.cpp:500
 #: src/view/AccountPanel.cpp:974
 msgid "Are you sure want to delete "
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:355
-#: src/view/AccountPanel.cpp:684
+#: src/view/PreferencesPanel.cpp:386 src/view/AccountPanel.cpp:684
 msgid "Are you sure want to delete : \n"
 msgstr ""
 
-#: src/view/PasswordDialog.cpp:37
-#: src/view/GenerateDialog.cpp:41
+#: src/view/PasswordDialog.cpp:37 src/view/GenerateDialog.cpp:41
 #: src/view/UsersDialog.cpp:32
 msgid "Cancel"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:32
+#: src/view/PreferencesPanel.cpp:33
 msgid "Categories"
 msgstr ""
 
@@ -89,15 +83,15 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:384
+#: src/view/PreferencesPanel.cpp:415
 msgid "Category "
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:46
+#: src/view/PreferencesPanel.cpp:48
 msgid "Change Name"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:47
+#: src/view/PreferencesPanel.cpp:49
 msgid "Change Password"
 msgstr ""
 
@@ -109,7 +103,7 @@ msgstr ""
 msgid "Change user"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:147
+#: src/view/PreferencesPanel.cpp:164
 msgid "Color"
 msgstr ""
 
@@ -145,12 +139,11 @@ msgstr ""
 msgid "Debit"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:98
+#: src/view/PreferencesPanel.cpp:115
 msgid "Default"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:99
-#: src/view/PreferencesPanel.cpp:149
+#: src/view/PreferencesPanel.cpp:116 src/view/PreferencesPanel.cpp:166
 #: src/view/AccountPanel.cpp:833
 msgid "Delete"
 msgstr ""
@@ -159,18 +152,12 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: src/model/Database.cpp:83
-#: src/model/Database.cpp:106
-#: src/view/PasswordDialog.cpp:53
-#: src/view/PasswordDialog.cpp:59
-#: src/view/PreferencesPanel.cpp:251
-#: src/view/PreferencesPanel.cpp:284
-#: src/view/PreferencesPanel.cpp:384
-#: src/view/PreferencesPanel.cpp:423
-#: src/view/PreferencesPanel.cpp:429
-#: src/view/AccountPanel.cpp:970
-#: src/view/UsersDialog.cpp:67
-#: src/view/UsersDialog.cpp:95
+#: src/model/Database.cpp:83 src/model/Database.cpp:106
+#: src/view/PasswordDialog.cpp:53 src/view/PasswordDialog.cpp:59
+#: src/view/PreferencesPanel.cpp:282 src/view/PreferencesPanel.cpp:315
+#: src/view/PreferencesPanel.cpp:415 src/view/PreferencesPanel.cpp:454
+#: src/view/PreferencesPanel.cpp:460 src/view/AccountPanel.cpp:970
+#: src/view/UsersDialog.cpp:67 src/view/UsersDialog.cpp:95
 msgid "Error"
 msgstr ""
 
@@ -182,11 +169,15 @@ msgstr ""
 msgid "Final value"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:406
+#: src/controller/KissCount.cpp:239
+msgid "Fix"
+msgstr ""
+
+#: src/model/Database.cpp:239 src/view/AccountPanel.cpp:406
 msgid "Fixe"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:148
+#: src/view/PreferencesPanel.cpp:165
 msgid "Font"
 msgstr ""
 
@@ -194,16 +185,23 @@ msgstr ""
 msgid "From "
 msgstr ""
 
-#: src/view/GenerateDialog.cpp:12
-#: src/view/AccountPanel.cpp:830
+#: src/view/GenerateDialog.cpp:12 src/view/AccountPanel.cpp:830
 msgid "Generate month"
 msgstr ""
 
+#: src/controller/KissCount.cpp:241
+msgid "Groceries"
+msgstr ""
+
+#: src/controller/KissCount.cpp:243
+msgid "Hobbies"
+msgstr ""
+
 #: src/view/AccountPanel.cpp:121
 msgid "Initial value"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:423
+#: src/view/PreferencesPanel.cpp:454
 msgid "Invalid name"
 msgstr ""
 
@@ -215,7 +213,7 @@ msgstr ""
 msgid "Invalid password"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:251
+#: src/view/PreferencesPanel.cpp:282
 msgid "It must be at least one account !"
 msgstr ""
 
@@ -223,10 +221,14 @@ msgstr ""
 msgid "It must be at least one month !"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:48
+#: src/view/PreferencesPanel.cpp:50
 msgid "Kill me"
 msgstr ""
 
+#: src/view/PreferencesPanel.cpp:484 src/view/PreferencesPanel.cpp:487
+msgid "KissCount"
+msgstr ""
+
 #: src/view/ButtonPanel.cpp:71
 msgid ""
 "KissCount v0.1\n"
@@ -236,18 +238,28 @@ msgid ""
 "Copyright (C) 2010 Grégory Soutadé"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:40
-#: src/view/PreferencesPanel.cpp:95
-#: src/view/PreferencesPanel.cpp:146
+#: src/view/PreferencesPanel.cpp:34
+msgid "Language"
+msgstr ""
+
+#: src/view/PreferencesPanel.cpp:487
+msgid "Language not changed"
+msgstr ""
+
+#: src/view/PreferencesPanel.cpp:484
+msgid "Language successfully changed, please go to another panel"
+msgstr ""
+
+#: src/view/PreferencesPanel.cpp:42 src/view/PreferencesPanel.cpp:112
+#: src/view/PreferencesPanel.cpp:163
 msgid "Name"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:435
+#: src/view/PreferencesPanel.cpp:466
 msgid "Name changed"
 msgstr ""
 
-#: src/view/UsersDialog.cpp:33
-#: src/view/UsersDialog.cpp:84
+#: src/view/UsersDialog.cpp:33 src/view/UsersDialog.cpp:84
 msgid "New User"
 msgstr ""
 
@@ -259,12 +271,11 @@ msgstr ""
 msgid "No database found, creating a new one"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:96
+#: src/view/PreferencesPanel.cpp:113
 msgid "Number"
 msgstr ""
 
-#: src/view/PasswordDialog.cpp:36
-#: src/view/GenerateDialog.cpp:40
+#: src/view/PasswordDialog.cpp:36 src/view/GenerateDialog.cpp:40
 #: src/view/UsersDialog.cpp:31
 msgid "OK"
 msgstr ""
@@ -273,10 +284,18 @@ msgstr ""
 msgid "Old password "
 msgstr ""
 
+#: src/controller/KissCount.cpp:245
+msgid "Operating exepense"
+msgstr ""
+
 #: src/view/ButtonPanel.cpp:26
 msgid "Operations"
 msgstr ""
 
+#: src/controller/KissCount.cpp:249
+msgid "Other"
+msgstr ""
+
 #: src/view/UsersDialog.cpp:24
 msgid "Password "
 msgstr ""
@@ -289,8 +308,7 @@ msgstr ""
 msgid "Please retype new password"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:437
-#: src/view/PreferencesPanel.cpp:448
+#: src/view/PreferencesPanel.cpp:468 src/view/PreferencesPanel.cpp:493
 #: src/view/ButtonPanel.cpp:29
 msgid "Preferences"
 msgstr ""
@@ -315,7 +333,7 @@ msgstr ""
 msgid "Serie 1"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:97
+#: src/view/PreferencesPanel.cpp:114
 msgid "Shared"
 msgstr ""
 
@@ -335,18 +353,19 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#: src/model/User.cpp:27
-#: src/model/User.cpp:41
-#: src/model/User.cpp:61
+#: src/controller/KissCount.cpp:247
+msgid "Unexpected"
+msgstr ""
+
+#: src/model/User.cpp:27 src/model/User.cpp:41 src/model/User.cpp:61
 msgid "Unknown"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:30
+#: src/view/PreferencesPanel.cpp:31
 msgid "User"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:429
-#: src/view/UsersDialog.cpp:19
+#: src/view/PreferencesPanel.cpp:460 src/view/UsersDialog.cpp:19
 #: src/view/UsersDialog.cpp:95
 msgid "User "
 msgstr ""
@@ -355,51 +374,50 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:77
 msgid "april"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:81
 msgid "august"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:85
 msgid "december"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:75
 msgid "february"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:74
 msgid "january"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:80
 msgid "july"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:79
 msgid "june"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:76
 msgid "march"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:78
 msgid "may"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:84
 msgid "november"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:83
 msgid "october"
 msgstr ""
 
-#: src/view/wxUI.cpp:3
+#: src/view/wxUI.cpp:82
 msgid "september"
 msgstr ""
-
diff --git a/src/controller/KissCount.cpp b/src/controller/KissCount.cpp
index a885401..8527925 100644
--- a/src/controller/KissCount.cpp
+++ b/src/controller/KissCount.cpp
@@ -240,9 +240,9 @@ void KissCount::NewUser(const wxString& name)
   AddCategory(cat);
   cat.parent = wxT("0") ; cat.name = _("Groceries") ; cat.color = OWN_GREEN; 
   AddCategory(cat);
-  cat.parent = wxT("0") ; cat.name = _("Loisirs") ; cat.color = OWN_GREEN; 
+  cat.parent = wxT("0") ; cat.name = _("Hobbies") ; cat.color = OWN_GREEN; 
   AddCategory(cat);
-  cat.parent = wxT("0") ; cat.name = _("Normal life") ; cat.color = OWN_GREEN; 
+  cat.parent = wxT("0") ; cat.name = _("Operating exepense") ; cat.color = OWN_GREEN; 
   AddCategory(cat);
   cat.parent = wxT("0") ; cat.name = _("Unexpected") ; cat.color = OWN_GREEN; 
   AddCategory(cat);
diff --git a/src/model/Database.cpp b/src/model/Database.cpp
index 0372267..98597b1 100644
--- a/src/model/Database.cpp
+++ b/src/model/Database.cpp
@@ -236,7 +236,7 @@ User* Database::LoadUser(const wxString& name)
       category.name = set.GetAsString(wxT("name"));
       category.color = wxColour(set.GetAsString(wxT("color")));
       category.font = set.GetAsString(wxT("font"));
-      if (category.name != _("Fixe"))
+      if (category.name != _("Fix"))
 	user->_categories.push_back(category);
       else
 	user->_categories.insert(user->_categories.begin(), category);
@@ -429,7 +429,7 @@ void Database::DeleteOperations(User* user, int month, int year)
       req += wxT("', '") + it->id ;
     }
   req += wxT("')");
-  req += wxT(" OR user='") + user->_id + wxT("')"); 
+  req += wxT(" OR user='") + user->_id + wxT("'"); 
   req += wxT(" AND year='") + wxString::Format(wxT("%d"), year) + wxT("'");
   if (month != -1)
     req += wxT(" AND month='") + wxString::Format(wxT("%d"), month) + wxT("'");
@@ -849,7 +849,7 @@ void Database::KillMe(User* user)
 	  req += wxT("', '") + it->id ;
 	}
       req += wxT("')");
-      req += wxT(" OR user='") + user->_id + wxT("')"); 
+      req += wxT(" OR user='") + user->_id + wxT("'"); 
 
       EXECUTE_SQL_UPDATE(req, );
     }
diff --git a/src/view/AccountPanel.cpp b/src/view/AccountPanel.cpp
index ecd09ee..e8d9571 100644
--- a/src/view/AccountPanel.cpp
+++ b/src/view/AccountPanel.cpp
@@ -403,7 +403,7 @@ void AccountPanel::InsertOperation(User* user, Operation* op, int line, bool fix
   if (fix)
     {
       _fixCosts++;
-      _grid->SetCellValue(line, CATEGORY, _("Fixe"));
+      _grid->SetCellValue(line, CATEGORY, _("Fix"));
       _grid->SetReadOnly(line, CATEGORY);
     }