From 47b3f914e399f9cdb9dd8f2b51784dda0eac9ada Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Mon, 28 Apr 2008 11:56:26 -0400
Subject: [PATCH] Locale - French translation of the configuration assistant

Ready for spanish translation
---
 po/es.po                           | 150 ++++++++++++++-----
 po/fr.po                           | 153 +++++++++++++++----
 po/{languages.pot => sflphone.pot} | 157 ++++++++++++++++----
 sflphone-gtk/src/accountwindow.c   |  12 +-
 sflphone-gtk/src/assistant.c       | 231 ++++++++++++++---------------
 sflphone-gtk/src/assistant.h       |  38 ++++-
 sflphone-gtk/src/calllist.c        |   2 -
 sflphone-gtk/src/calltree.c        |   5 +-
 sflphone-gtk/src/configwindow.c    |  12 +-
 sflphone-gtk/src/mainwindow.c      |  19 +--
 10 files changed, 520 insertions(+), 259 deletions(-)
 rename po/{languages.pot => sflphone.pot} (62%)

diff --git a/po/es.po b/po/es.po
index 742e7f1dea..0dd48be080 100644
--- a/po/es.po
+++ b/po/es.po
@@ -83,27 +83,27 @@ msgstr "_Herramientas"
 msgid "_View"
 msgstr "_Ver"
 
-#: sflphone-gtk/src/calltree.c: 286 calltree.c: 287
+#: sflphone-gtk/src/calltree.c: 336 sflphone-gtk/src/calltree.c: 337
 msgid "Place a call"
 msgstr "Llamar"
 
-#: sflphone-gtk/src/calltree.c: 293 calltree.c: 294
+#: sflphone-gtk/src/calltree.c: 343 sflphone-gtk/src/calltree.c: 344
 msgid "Pick up" 
 msgstr "Colgar"
 
-#: sflphone-gtk/src/calltree.c: 301 calltree.c: 302
+#: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
 msgid "Hang up"
 msgstr "Descolgar"
 
-#: sflphone-gtk/src/calltree.c: 309 calltree.c: 310
+#: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
 msgid "Off Hold"
 msgstr "Seguir"
 
-#: sflphone-gtk/src/calltree.c: 317 calltree.c: 318
+#: sflphone-gtk/src/calltree.c: 367 sflphone-gtk/src/calltree.c: 368
 msgid "On Hold"
 msgstr "Sostener"
 
-#: sflphone-gtk/src/calltree.c: 327 calltree.c: 328
+#: sflphone-gtk/src/calltree.c: 375 sflphone-gtk/src/calltree.c: 376
 msgid "Transfer"
 msgstr "Transferir"
 
@@ -187,63 +187,99 @@ msgstr "Cuentas"
 msgid "Accounts previously setup"
 msgstr "Cuentas existentes"
 
-#: sflphone-gtk/src/accountwindow.c: 150
+#: sflphone-gtk/src/configwindow.c: 1254
+msgid "Desktop Notification"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1263
+msgid "_Enable"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1268
+msgid "_Notify Voice Mails"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1274
+msgid "System Tray Icon"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1283
+msgid "_Popup Main Window On Incoming Call"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1288
+msgid "Ne_ver Popup Main Window"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1292
+msgid "_Start Hidden"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1297
+msgid "Calls History"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1307
+msgid "_Maximum number of calls"
+msgstr ""
+
+#: sflphone-gtk/src/accountwindow.c: 139
 msgid "Account settings"
 msgstr "Configuración de cuentas"
 
-#: sflphone-gtk/src/accountwindow.c: 177
+#: sflphone-gtk/src/accountwindow.c: 151
+msgid "Account parameters"
+msgstr ""
+
+#: sflphone-gtk/src/accountwindow.c: 174
 msgid "_Enabled"
 msgstr "_Activado"
 
-#: sflphone-gtk/src/accountwindow.c: 187
+#: sflphone-gtk/src/accountwindow.c: 180 sflphone-gtk/src/assistant.c: 161  sflphone-gtk/src/assistant.c: 210
 msgid "_Alias"
 msgstr "_Alias"
 
-#: sflphone-gtk/src/accountwindow.c: 195
+#: sflphone-gtk/src/accountwindow.c: 188
 msgid "_Protocol"
 msgstr "_Protocolo"
 
-#: sflphone-gtk/src/accountwindow.c: 214
+#: sflphone-gtk/src/accountwindow.c: 206
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: sflphone-gtk/src/accountwindow.c: 224
-msgid "_Full Name"
-msgstr "_Nombre completo"
-
-#: sflphone-gtk/src/accountwindow.c: 232
-msgid "_User part"
-msgstr "_Parte del usuario"
-
-#: sflphone-gtk/src/accountwindow.c: 240
-msgid "_Host part"
+#: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
+msgid "_Host name"
 msgstr "_Parte del servidor"
 
-#: sflphone-gtk/src/accountwindow.c: 248
-msgid "U_sername"
+#: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
+msgid "_User name"
 msgstr "_Usuario"
 
-#: sflphone-gtk/src/accountwindow.c: 256
+#: sflphone-gtk/src/accountwindow.c: 232 sflphone-gtk/src/assistant.c: 185 sflphone-gtk/src/assistant.c: 234
 msgid "_Password"
 msgstr "_Contraseña"
 
-#: sflphone-gtk/src/accountwindow.c: 267
-msgid "<b>NAT Detection</b>"
-msgstr "<b>Detección del NAT</b>"
+#: sflphone-gtk/src/accountwindow.c: 241
+msgid "_Voicemail box #"
+msgstr ""
+
+#: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
+msgid "Network Address Translation"
+msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 270
+#: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
 msgid "E_nable STUN"
 msgstr "A_ctivar STUN"
 
-#: sflphone-gtk/src/accountwindow.c: 275
+#: sflphone-gtk/src/accountwindow.c: 267
 msgid "Enable it if you are behind a firewall, then restart SFLphone"
 msgstr "Activar si esta atras un cortafuego, despues reiniciar SFLphone"
 
-#: sflphone-gtk/src/accountwindow.c: 277
-msgid "S_TUN Server"
-msgstr "Servidor STUN"
+#: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
+msgid "_STUN Server"
+msgstr "_Servidor STUN"
 
-#: sflphone-gtk/src/accountwindow.c: 283
+#: sflphone-gtk/src/accountwindow.c: 276
 msgid "Format: name.server:port"
 msgstr "Formato: nombre.servidor:puerto"
 
@@ -355,3 +391,51 @@ msgid_plural "SFLphone - %i accounts registered"
 msgstr[0] ""
 msgstr[1] ""
 
+#: sflphone-gtk/src/assistant.c: 91
+msgid "SFLphone account configuration wizard"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 122
+msgid "Welcome to SFLphone!"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 119
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 134
+msgid "VoIP Protocols"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 134
+msgid "Select an account type:"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 153
+msgid "SIP account configuration"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
+msgid "Please fill the following information:"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 202
+msgid "IAX2 account configuration"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 256
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 289
+msgid "Account Registration"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 289
+msgid "Congratulations!"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 291
+msgid "This assistant is now finished.\n\n You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window."
+msgstr ""
+
diff --git a/po/fr.po b/po/fr.po
index 50a4bc0b67..7ca4057100 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -83,30 +83,38 @@ msgstr "_Barre d'outils"
 msgid "_View"
 msgstr "A_ffichage"
 
-#: sflphone-gtk/src/calltree.c: 286 calltree.c: 287
+#: sflphone-gtk/src/calltree.c: 336 sflphone-gtk/src/calltree.c: 337
 msgid "Place a call"
 msgstr "Appeler"
 
-#: sflphone-gtk/src/calltree.c: 293 calltree.c: 294
+#: sflphone-gtk/src/calltree.c: 343 sflphone-gtk/src/calltree.c: 344
 msgid "Pick up" 
 msgstr "Décrocher"
 
-#: sflphone-gtk/src/calltree.c: 301 calltree.c: 302
+#: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: sflphone-gtk/src/calltree.c: 309 calltree.c: 310
+#: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
 msgid "Off Hold"
 msgstr "Reprendre"
 
-#: sflphone-gtk/src/calltree.c: 317 calltree.c: 318
+#: sflphone-gtk/src/calltree.c: 367 sflphone-gtk/src/calltree.c: 368
 msgid "On Hold"
 msgstr "Mettre en attente"
 
-#: sflphone-gtk/src/calltree.c: 327 calltree.c: 328
+#: sflphone-gtk/src/calltree.c: 377 sflphone-gtk/src/calltree.c: 378
 msgid "Transfer"
 msgstr "Transférer"
 
+#: sflphone-gtk/src/calltree.c: 385 sflphone-gtk/src/calltree.c: 386
+msgid "History"
+msgstr "Historique"
+
+#: sflphone-gtk/src/calltree.c: 394 sflphone-gtk/src/calltree.c: 397
+msgid "Voicemail box"
+msgstr "Boite vocale"
+
 #: sflphone-gtk/src/configwindow.c: 799
 msgid "Name"
 msgstr "Nom"
@@ -183,67 +191,103 @@ msgstr "Paramètres Audio"
 msgid "Accounts"
 msgstr "Comptes"
 
+#: sflphone-gtk/src/configwindow.c: 1254
+msgid "Desktop Notification"
+msgstr "Notifications du bureau"
+
+#: sflphone-gtk/src/configwindow.c: 1263
+msgid "_Enable"
+msgstr "_Activer"
+
+#: sflphone-gtk/src/configwindow.c: 1268
+msgid "_Notify voice mails"
+msgstr "_Notifier les messages vocaux"
+
+#: sflphone-gtk/src/configwindow.c: 1274
+msgid "System Tray Icon"
+msgstr "Icône dans la barre des tâches"
+
+#: sflphone-gtk/src/configwindow.c: 1283
+msgid "_Popup main window on incoming call"
+msgstr "_Faire apparaître la fenêtre principale lors d'appel entrant"
+
+#: sflphone-gtk/src/configwindow.c: 1288
+msgid "Ne_ver popup main window"
+msgstr "Ne _jamais afficher la fenêtre principale"
+
+#: sflphone-gtk/src/configwindow.c: 1292
+msgid "_Start hidden"
+msgstr "_Démarrer caché"
+
+#: sflphone-gtk/src/configwindow.c: 1297
+msgid "Calls History"
+msgstr "Historique des appels"
+
+#: sflphone-gtk/src/configwindow.c: 1307
+msgid "_Maximum number of calls"
+msgstr "N_ombre maximum d'appels"
+
 #: sflphone-gtk/src/configwindow.c: 1203
 msgid "Accounts previously setup"
 msgstr "Liste des comptes existants"
 
-#: sflphone-gtk/src/accountwindow.c: 150
+#: sflphone-gtk/src/accountwindow.c: 139
 msgid "Account settings"
 msgstr "Configuration des comptes"
 
-#: sflphone-gtk/src/accountwindow.c: 177
+#: sflphone-gtk/src/accountwindow.c: 151
+msgid "Account parameters"
+msgstr "Paramètres du compte"
+
+#: sflphone-gtk/src/accountwindow.c: 174
 msgid "_Enabled"
 msgstr "_Activé"
 
-#: sflphone-gtk/src/accountwindow.c: 187
+#: sflphone-gtk/src/accountwindow.c: 180 sflphone-gtk/src/assistant.c: 161  sflphone-gtk/src/assistant.c: 210
 msgid "_Alias"
 msgstr "A_lias"
 
-#: sflphone-gtk/src/accountwindow.c: 195
+#: sflphone-gtk/src/accountwindow.c: 188
 msgid "_Protocol"
 msgstr "_Protocole"
 
-#: sflphone-gtk/src/accountwindow.c: 214
+#: sflphone-gtk/src/accountwindow.c: 206
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: sflphone-gtk/src/accountwindow.c: 224
-msgid "_Full Name"
-msgstr "_Nom"
-
-#: sflphone-gtk/src/accountwindow.c: 232
-msgid "_User part"
-msgstr ""
-
-#: sflphone-gtk/src/accountwindow.c: 240
-msgid "_Host part"
+#: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
+msgid "_Host name"
 msgstr "_Serveur"
 
-#: sflphone-gtk/src/accountwindow.c: 248
-msgid "U_sername"
+#: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
+msgid "_User name"
 msgstr "Usa_ger"
 
-#: sflphone-gtk/src/accountwindow.c: 256
+#: sflphone-gtk/src/accountwindow.c: 232 sflphone-gtk/src/assistant.c: 185 sflphone-gtk/src/assistant.c: 234
 msgid "_Password"
 msgstr "_Mot de passe"
 
-#: sflphone-gtk/src/accountwindow.c: 267
-msgid "<b>NAT Detection</b>"
-msgstr "<b>Détection NAT</b>"
+#: sflphone-gtk/src/accountwindow.c: 241
+msgid "_Voicemail box #"
+msgstr "_Boite vocale #"
 
-#: sflphone-gtk/src/accountwindow.c: 270
+#: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
+msgid "Network Address Translation"
+msgstr "Traduction d'adresse réseau (NAT)"
+
+#: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
 msgid "E_nable STUN"
 msgstr "A_ctiver STUN"
 
-#: sflphone-gtk/src/accountwindow.c: 275
+#: sflphone-gtk/src/accountwindow.c: 267
 msgid "Enable it if you are behind a firewall, then restart SFLphone"
 msgstr "À activer si vous êtes derrière un pare-feu, puis redémarrez SFLphone"
 
-#: sflphone-gtk/src/accountwindow.c: 277
-msgid "S_TUN Server"
+#: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
+msgid "_STUN Server"
 msgstr "S_erveur STUN"
 
-#: sflphone-gtk/src/accountwindow.c: 283
+#: sflphone-gtk/src/accountwindow.c: 276
 msgid "Format: name.server:port"
 msgstr "Format: nom.serveur:port"
 
@@ -355,6 +399,51 @@ msgid_plural "SFLphone - %i accounts registered"
 msgstr[0] "SFLphone - %i compte enregistré"
 msgstr[1] "SFLphone - %i comptes enregistrés"
 
+#: sflphone-gtk/src/assistant.c: 91
+msgid "SFLphone account configuration wizard"
+msgstr " Assistant de configuration de compte pour SFLphone"
+
+#: sflphone-gtk/src/assistant.c: 122
+msgid "Welcome to SFLphone!"
+msgstr "Bienvenue dans SFLphone"
+
+#: sflphone-gtk/src/assistant.c: 119
+msgid "This installation wizard will help you configure an account."
+msgstr "Cet assistant va vous guider dans la configuration d'un compte. "
+
+#: sflphone-gtk/src/assistant.c: 134
+msgid "VoIP Protocols"
+msgstr "Protocoles VoIP"
+
+#: sflphone-gtk/src/assistant.c: 134
+msgid "Select an account type:"
+msgstr "Choisissez un type de compte:"
+
+#: sflphone-gtk/src/assistant.c: 153
+msgid "SIP account configuration"
+msgstr "Configuration d'un compte SIP"
+
+#: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
+msgid "Please fill the following information:"
+msgstr "Veuillez remplir les champs suivants:"
+
+#: sflphone-gtk/src/assistant.c: 202
+msgid "IAX2 account configuration"
+msgstr "Configuration d'un compte IAX2"
+
+#: sflphone-gtk/src/assistant.c: 256
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Vous devriez probablement activer cette option si vous vous trouvez derrière un pare-feu."
+
+#: sflphone-gtk/src/assistant.c: 289
+msgid "Account Registration"
+msgstr "Enregistrement du compte"
 
+#: sflphone-gtk/src/assistant.c: 289
+msgid "Congratulations!"
+msgstr "Félicitations!"
 
+#: sflphone-gtk/src/assistant.c: 291
+msgid "This assistant is now finished.\n\n You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window."
+msgstr "Cet assistant est maintenant terminé.\n\n Vous pouvez à tout moment vérifier votre état d'enregistrement ou modifier les paramètres de vos comptes dans la fenêtre Options/Comptes."
 
diff --git a/po/languages.pot b/po/sflphone.pot
similarity index 62%
rename from po/languages.pot
rename to po/sflphone.pot
index 785f6542ca..5412029b89 100644
--- a/po/languages.pot
+++ b/po/sflphone.pot
@@ -59,7 +59,7 @@ msgstr ""
 
 #: sflphone-gtk/src/menus.c: 423
 msgid "_Accounts"
-msgstr "_Konten"
+msgstr ""
 
 #: sflphone-gtk/src/menus.c: 438
 msgid "_Edit"
@@ -81,30 +81,38 @@ msgstr ""
 msgid "_View"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 286 calltree.c: 287
+#: sflphone-gtk/src/calltree.c: 336 sflphone-gtk/src/calltree.c: 337
 msgid "Place a call"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 293 calltree.c: 294
+#: sflphone-gtk/src/calltree.c: 344 sflphone-gtk/src/calltree.c: 345
 msgid "Pick up"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 301 calltree.c: 302
+#: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
 msgid "Hang up"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 309 calltree.c: 310
+#: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
 msgid "Off Hold"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 317 calltree.c: 318
+#: sflphone-gtk/src/calltree.c: 367 sflphone-gtk/src/calltree.c: 368
 msgid "On Hold"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 327 calltree.c: 328
+#: sflphone-gtk/src/calltree.c: 375 sflphone-gtk/src/calltree.c: 376
 msgid "Transfer"
 msgstr ""
 
+#: sflphone-gtk/src/calltree.c: 385 sflphone-gtk/src/calltree.c: 386
+msgid "History"
+msgstr ""
+
+#: sflphone-gtk/src/calltree.c: 394 sflphone-gtk/src/calltree.c: 397
+msgid "Voicemail box"
+msgstr ""
+
 #: sflphone-gtk/src/configwindow.c: 799
 msgid "Name"
 msgstr ""
@@ -179,69 +187,105 @@ msgstr ""
 
 #: sflphone-gtk/src/configwindow.c: 1191
 msgid "Accounts"
-msgstr "Konten"
+msgstr ""
 
 #: sflphone-gtk/src/configwindow.c: 1203
 msgid "Accounts previously setup"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 150
+#: sflphone-gtk/src/accountwindow.c: 139
 msgid "Account settings"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 177
+#: sflphone-gtk/src/configwindow.c: 1254
+msgid "Desktop Notification"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1263
+msgid "_Enable"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1268
+msgid "_Notify voice mails"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1274
+msgid "System Tray Icon"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1283
+msgid "_Popup main window on incoming call"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1288
+msgid "Ne_ver popup main window"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1292
+msgid "_Start hidden"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1297
+msgid "Calls History"
+msgstr ""
+
+#: sflphone-gtk/src/configwindow.c: 1307
+msgid "_Maximum number of calls"
+msgstr ""
+
+#: sflphone-gtk/src/accountwindow.c: 151
+msgid "Account parameters"
+msgstr ""
+
+#: sflphone-gtk/src/accountwindow.c: 174
 msgid "_Enabled"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 187
+#: sflphone-gtk/src/accountwindow.c: 180 sflphone-gtk/src/assistant.c: 161  sflphone-gtk/src/assistant.c: 210
 msgid "_Alias"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 195
+#: sflphone-gtk/src/accountwindow.c: 188
 msgid "_Protocol"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 214
+#: sflphone-gtk/src/accountwindow.c: 206
 msgid "Unknown"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 224
-msgid "_Full Name"
+#: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
+msgid "_Host name"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 232
-msgid "_User part"
+#: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
+msgid "_User name"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 240
-msgid "_Host part"
+#: sflphone-gtk/src/accountwindow.c: 232 sflphone-gtk/src/assistant.c: 185 sflphone-gtk/src/assistant.c: 234
+msgid "_Password"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 248
-msgid "U_sername"
+#: sflphone-gtk/src/accountwindow.c: 241
+msgid "_Voicemail box #"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 256
-msgid "_Password"
+#: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
+msgid "Network Address Translation"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 267
-msgid "<b>NAT Detection</b>"
-msgstr ""
-
-#: sflphone-gtk/src/accountwindow.c: 270
+#: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
 msgid "E_nable STUN"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 275
+#: sflphone-gtk/src/accountwindow.c: 267
 msgid "Enable it if you are behind a firewall, then restart SFLphone"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 277
-msgid "S_TUN Server"
+#: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
+msgid "_STUN Server"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 283
+#: sflphone-gtk/src/accountwindow.c: 276
 msgid "Format: name.server:port"
 msgstr ""
 
@@ -350,3 +394,52 @@ msgid "SFLphone - %i account registered"
 msgid_plural "SFLphone - %i accounts registered"
 msgstr[0] ""
 msgstr[1] ""
+
+#: sflphone-gtk/src/assistant.c: 91
+msgid "SFLphone account configuration wizard"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 122
+msgid "Welcome to SFLphone!"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 119
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 134
+msgid "VoIP Protocols"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 134
+msgid "Select an account type:"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 153
+msgid "SIP account configuration"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
+msgid "Please fill the following information:"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 202
+msgid "IAX2 account configuration"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 256
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 289
+msgid "Account Registration"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 289
+msgid "Congratulations!"
+msgstr ""
+
+#: sflphone-gtk/src/assistant.c: 291
+msgid "This assistant is now finished.\n\n You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window."
+msgstr ""
+
diff --git a/sflphone-gtk/src/accountwindow.c b/sflphone-gtk/src/accountwindow.c
index 115fd8c006..32160fa836 100644
--- a/sflphone-gtk/src/accountwindow.c
+++ b/sflphone-gtk/src/accountwindow.c
@@ -148,7 +148,7 @@ show_account_window (account_t * a)
   gtk_dialog_set_has_separator(dialog, TRUE);
   gtk_container_set_border_width (GTK_CONTAINER(dialog), 0);
 
-  frame = gtk_frame_new( "Account parameters" );
+  frame = gtk_frame_new(_("Account parameters"));
   gtk_box_pack_start(GTK_BOX(dialog->vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show(frame);
 
@@ -213,7 +213,7 @@ show_account_window (account_t * a)
       G_CALLBACK (change_protocol),
       currentAccount);
 
-  label = gtk_label_new_with_mnemonic (_("_Hostname "));
+  label = gtk_label_new_with_mnemonic (_("_Host name"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   entryHostname = gtk_entry_new();
@@ -221,7 +221,7 @@ show_account_window (account_t * a)
   gtk_entry_set_text(GTK_ENTRY(entryHostname), curHostname);
   gtk_table_attach ( GTK_TABLE( table ), entryHostname, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-  label = gtk_label_new_with_mnemonic (_("U_sername"));
+  label = gtk_label_new_with_mnemonic (_("_User name"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   entryUsername = gtk_entry_new();
@@ -238,7 +238,7 @@ show_account_window (account_t * a)
   gtk_entry_set_text(GTK_ENTRY(entryPassword), curPassword);
   gtk_table_attach ( GTK_TABLE( table ), entryPassword, 1, 2, 7, 8, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-  label = gtk_label_new_with_mnemonic (_("_Mailbox"));
+  label = gtk_label_new_with_mnemonic (_("_Voicemail box #"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 8, 9, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   entryMailbox = gtk_entry_new();
@@ -249,7 +249,7 @@ show_account_window (account_t * a)
   gtk_widget_show_all( table );
   gtk_container_set_border_width (GTK_CONTAINER(table), 10);
 
-  frameNat = gtk_frame_new( _("NAT detection") );
+  frameNat = gtk_frame_new( _("Network Address Translation") );
   gtk_box_pack_start(GTK_BOX(dialog->vbox), frameNat, FALSE, FALSE, 0);
   gtk_widget_show(frameNat);
 
@@ -267,7 +267,7 @@ show_account_window (account_t * a)
   gtk_widget_set_tooltip_text( GTK_WIDGET( stunEnable ) , _("Enable it if you are behind a firewall, then restart SFLphone"));
   gtk_table_attach ( GTK_TABLE( tableNat ), stunEnable, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-  label = gtk_label_new_with_mnemonic(_("S_TUN Server"));
+  label = gtk_label_new_with_mnemonic(_("_STUN Server"));
   gtk_table_attach( GTK_TABLE( tableNat ), label, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   stunServer = gtk_entry_new();
diff --git a/sflphone-gtk/src/assistant.c b/sflphone-gtk/src/assistant.c
index bfd4f99488..36cb96a521 100644
--- a/sflphone-gtk/src/assistant.c
+++ b/sflphone-gtk/src/assistant.c
@@ -23,10 +23,10 @@ struct _wizard *wiz;
 static int account_type;
 account_t* current;
 
-void
+  void
 set_account_type( GtkWidget* widget , gpointer data )
 {
-  
+
   if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget )) ){
     account_type = _SIP;
   }else{ 
@@ -34,18 +34,18 @@ set_account_type( GtkWidget* widget , gpointer data )
   }
 }
 
-static void close_callback(gpointer data)
+static void close_callback( void )
 {
   gtk_widget_destroy(wiz->assistant);
 }
 
-static void cancel_callback(gpointer data)
+static void cancel_callback( void )
 {
   gtk_widget_destroy(wiz->assistant);
 }
 
-static void 
-apply_callback( gpointer data ) 
+  static void 
+apply_callback( void ) 
 {
   if( account_type == _SIP )
   {
@@ -56,30 +56,30 @@ apply_callback( gpointer data )
     g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_HOST), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->sip_server))));
     g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_PASSWORD), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->sip_password))));
     g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_USER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->sip_username))));
-  g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_STUN_ENABLED), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->enable))));
-  g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->addr))));
+    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_STUN_ENABLED), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->enable))));
+    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->addr))));
   }
   else
   {  
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_ALIAS), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_alias))));
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_ENABLED), g_strdup("TRUE"));
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_MAILBOX), g_strdup("888"));
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_TYPE), g_strdup("IAX"));
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_USER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_username))));
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_HOST), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_server))));
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_PASSWORD), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_password))));
+    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ALIAS), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_alias))));
+    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ENABLED), g_strdup("TRUE"));
+    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_MAILBOX), g_strdup("888"));
+    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_TYPE), g_strdup("IAX"));
+    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_IAX_USER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_username))));
+    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_IAX_HOST), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_server))));
+    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_IAX_PASSWORD), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_password))));
   }
 
   dbus_add_account( current );
 }
 
-void
+  void
 enable_stun( GtkWidget* widget )
 {
   gtk_widget_set_sensitive( GTK_WIDGET( wiz->addr ), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
 }
 
-void
+  void
 build_wizard( void )
 {
   wiz = ( struct _wizard* )g_malloc( sizeof( struct _wizard));
@@ -88,15 +88,16 @@ build_wizard( void )
   current ->accountID = "test";
 
   wiz->assistant = gtk_assistant_new( );
-  gtk_window_set_title( GTK_WINDOW(wiz->assistant), "SFLphone configuration wizard" );
+  gtk_window_set_title( GTK_WINDOW(wiz->assistant), _("SFLphone account configuration wizard") );
   gtk_window_set_position(GTK_WINDOW(wiz->assistant), GTK_WIN_POS_CENTER);
   gtk_assistant_set_forward_page_func( GTK_ASSISTANT( wiz->assistant ), (GtkAssistantPageFunc) forward_page_func , NULL , NULL );
-  
+
   build_intro();
   build_select_account();
   build_sip_account_configuration();
   build_nat_settings();
   build_iax_account_configuration();
+  build_registration_error();
   build_summary();
 
   g_signal_connect(G_OBJECT(wiz->assistant), "close" , G_CALLBACK(close_callback), NULL);
@@ -108,14 +109,14 @@ build_wizard( void )
 
 }
 
-GtkWidget*
+  GtkWidget*
 build_intro()
 {
   GtkWidget *label;
-  
-  wiz->intro = create_vbox( GTK_ASSISTANT_PAGE_INTRO  , "SFLphone 0.8" , "Welcome");
-   
-  label = gtk_label_new(" This installation wizard will help you configure an account.") ;
+
+  wiz->intro = create_vbox( GTK_ASSISTANT_PAGE_INTRO  , _("SFLphone 0.8") , _("Welcome to SFLphone!"));
+
+  label = gtk_label_new(_("This installation wizard will help you configure an account.")) ;
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
   gtk_widget_set_size_request(GTK_WIDGET(label), 380, -1);
@@ -124,32 +125,32 @@ build_intro()
   return wiz->intro;
 }
 
-GtkWidget*
+  GtkWidget*
 build_select_account()
 {
   GtkWidget* sip;
   GtkWidget* iax;
 
-  wiz->protocols = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , "VoIP Protocols" , "Select an account type:");
-  
+  wiz->protocols = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("VoIP Protocols") , _("Select an account type:"));
+
   sip = gtk_radio_button_new_with_label(NULL,"SIP (Session Initiation Protocol)");
   gtk_box_pack_start( GTK_BOX(wiz->protocols) , sip , TRUE, TRUE, 0);
   iax = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(sip), "IAX2 (InterAsterix Exchange)");
   gtk_box_pack_start( GTK_BOX(wiz->protocols) , iax , TRUE, TRUE, 0);
-  
+
   g_signal_connect(G_OBJECT( sip ) , "clicked" , G_CALLBACK( set_account_type ) , NULL );
-  
+
   return wiz->protocols;
 }
 
 
-GtkWidget*
+  GtkWidget*
 build_sip_account_configuration( void )
 {
   GtkWidget* table;
   GtkWidget* label;
 
-  wiz->sip_account = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , "SIP account configuration" , "Fill the following information:"); 
+  wiz->sip_account = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("SIP account configuration") , _("Please fill the following information:")); 
   // table
   table = gtk_table_new ( 4, 2  ,  FALSE/* homogeneous */);
   gtk_table_set_row_spacings( GTK_TABLE(table), 10);
@@ -157,7 +158,7 @@ build_sip_account_configuration( void )
   gtk_box_pack_start( GTK_BOX(wiz->sip_account) , table , TRUE, TRUE, 0);
 
   // alias field
-  label = gtk_label_new_with_mnemonic ("_Alias");
+  label = gtk_label_new_with_mnemonic (_("_Alias"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   wiz->sip_alias = gtk_entry_new();
@@ -165,23 +166,23 @@ build_sip_account_configuration( void )
   gtk_table_attach ( GTK_TABLE( table ), wiz->sip_alias, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
   // server field
-  label = gtk_label_new_with_mnemonic ("_Host name");
+  label = gtk_label_new_with_mnemonic (_("_Host name"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   wiz->sip_server = gtk_entry_new();
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), wiz->sip_server);
   gtk_table_attach ( GTK_TABLE( table ), wiz->sip_server, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-  
+
   // username field
-  label = gtk_label_new_with_mnemonic ("_User name");
+  label = gtk_label_new_with_mnemonic (_("_User name"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   wiz->sip_username = gtk_entry_new();
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), wiz->sip_username);
   gtk_table_attach ( GTK_TABLE( table ), wiz->sip_username, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-  
+
   // password field
-  label = gtk_label_new_with_mnemonic ("_Password");
+  label = gtk_label_new_with_mnemonic (_("_Password"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   wiz->sip_password = gtk_entry_new();
@@ -189,28 +190,24 @@ build_sip_account_configuration( void )
   gtk_entry_set_visibility(GTK_ENTRY(wiz->sip_password), FALSE);
   gtk_table_attach ( GTK_TABLE( table ), wiz->sip_password, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-
-
-  current -> state = ACCOUNT_STATE_UNREGISTERED;
-
   return wiz->sip_account;
 }
 
-GtkWidget*
+  GtkWidget*
 build_iax_account_configuration( void )
 {
   GtkWidget* label;
   GtkWidget*  table;
 
-  wiz->iax_account = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , "IAX2 account configuration" , "Fill the following information:"); 
-  
+  wiz->iax_account = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , _("IAX2 account configuration") , _("Please fill the following information:")); 
+
   table = gtk_table_new ( 4, 2  ,  FALSE/* homogeneous */);
   gtk_table_set_row_spacings( GTK_TABLE(table), 10);
   gtk_table_set_col_spacings( GTK_TABLE(table), 10);
   gtk_box_pack_start( GTK_BOX(wiz->iax_account) , table , TRUE, TRUE, 0);
 
   // alias field
-  label = gtk_label_new_with_mnemonic ("_Alias");
+  label = gtk_label_new_with_mnemonic (_("_Alias"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   wiz->iax_alias = gtk_entry_new();
@@ -218,23 +215,23 @@ build_iax_account_configuration( void )
   gtk_table_attach ( GTK_TABLE( table ), wiz->iax_alias, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
   // server field
-  label = gtk_label_new_with_mnemonic ("_Host name");
+  label = gtk_label_new_with_mnemonic (_("_Host name"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   wiz->iax_server = gtk_entry_new();
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), wiz->iax_server);
   gtk_table_attach ( GTK_TABLE( table ), wiz->iax_server, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-  
+
   // username field
-  label = gtk_label_new_with_mnemonic ("_User name");
+  label = gtk_label_new_with_mnemonic (_("_User name"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   wiz->iax_username = gtk_entry_new();
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), wiz->iax_username);
   gtk_table_attach ( GTK_TABLE( table ), wiz->iax_username, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-  
+
   // password field
-  label = gtk_label_new_with_mnemonic ("_Password");
+  label = gtk_label_new_with_mnemonic (_("_Password"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   wiz->iax_password = gtk_entry_new();
@@ -244,19 +241,19 @@ build_iax_account_configuration( void )
 
 
   current -> state = ACCOUNT_STATE_UNREGISTERED;
- 
+
   g_signal_connect( G_OBJECT( wiz->assistant ) , "apply" , G_CALLBACK( apply_callback ), NULL);
- 
+
   return wiz->iax_account;
 }
 
-GtkWidget*
+  GtkWidget*
 build_nat_settings( void )
 {
   GtkWidget* label;
   GtkWidget* table;
 
-  wiz->nat = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , "Network Address Translation" , "You should probably enable this if you are behind a firewall."); 
+  wiz->nat = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , _("Network Address Translation") , _("You should probably enable this if you are behind a firewall.")); 
 
   // table
   table = gtk_table_new ( 2, 2  ,  FALSE/* homogeneous */);
@@ -265,14 +262,14 @@ build_nat_settings( void )
   gtk_box_pack_start( GTK_BOX(wiz->nat), table , TRUE, TRUE, 0);
 
   // enable
-  wiz->enable = gtk_check_button_new_with_mnemonic("_Enabled");
+  wiz->enable = gtk_check_button_new_with_mnemonic(_("E_nable STUN"));
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wiz->enable), FALSE); 
   gtk_table_attach ( GTK_TABLE( table ), wiz->enable, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_widget_set_sensitive( GTK_WIDGET( wiz->enable ) , TRUE );
   g_signal_connect( G_OBJECT( GTK_TOGGLE_BUTTON(wiz->enable)) , "toggled" , G_CALLBACK( enable_stun ), NULL);
 
   // server address
-  label = gtk_label_new_with_mnemonic ("_Server address");
+  label = gtk_label_new_with_mnemonic (_("_STUN server"));
   gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
   wiz->addr = gtk_entry_new();
@@ -280,19 +277,18 @@ build_nat_settings( void )
   gtk_table_attach ( GTK_TABLE( table ), wiz->addr, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_widget_set_sensitive( GTK_WIDGET( wiz->addr ), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wiz->enable)));
 
- 
   g_signal_connect( G_OBJECT( wiz->assistant ) , "apply" , G_CALLBACK( apply_callback ), NULL);
-  
+
   return wiz->nat;
 }
 
-GtkWidget*
+  GtkWidget*
 build_summary()
 {
   GtkWidget *label;
-  wiz->summary = create_vbox( GTK_ASSISTANT_PAGE_SUMMARY  , "Congratulations" , "You have been successfully registered");
-   
-  label = gtk_label_new(" Answer the call!") ;
+  wiz->summary = create_vbox( GTK_ASSISTANT_PAGE_SUMMARY  , _("Account Registration") , _("Congratulations!"));
+
+  label = gtk_label_new(_("This assistant is now finished.\n\n You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window.")) ;
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
   gtk_widget_set_size_request(GTK_WIDGET(label), 380, -1);
@@ -301,82 +297,75 @@ build_summary()
   return wiz->summary;
 }
 
-void
-update_account_parameters( int type )
-{ 
-  g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ALIAS), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_alias))));
-  g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ENABLED), g_strdup("TRUE"));
-  g_hash_table_insert(current->properties, g_strdup(ACCOUNT_MAILBOX), g_strdup("888"));
+  GtkWidget*
+build_registration_error()
+{
+  GtkWidget *label;
+  wiz->reg_failed = create_vbox( GTK_ASSISTANT_PAGE_SUMMARY  , "Account Registration" , "Registration error");
+
+  label = gtk_label_new(" Please correct the information.") ;
+  gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+  gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+  gtk_widget_set_size_request(GTK_WIDGET(label), 380, -1);
+  gtk_box_pack_start(GTK_BOX(wiz->reg_failed), label, FALSE, TRUE, 0);
+
+  return wiz->reg_failed;
 
-  if( type == _SIP ){
-    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_TYPE), g_strdup("SIP"));
-    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_HOST), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_server))));
-    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_PASSWORD), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_password))));
-    g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SIP_USER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_username))));
-    //g_hash_table_replace(current->properties, g_strdup(ACCOUNT_SIP_STUN_ENABLED), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_enable))));
-    //g_hash_table_replace(current->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_addr))));
-  
-  }
-  else if( type == _IAX ){
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_TYPE), g_strdup("IAX"));
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_USER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_username))));
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_HOST), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_server))));
-    g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_PASSWORD), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->iax_password))));
-  }
-  current -> state = ACCOUNT_STATE_UNREGISTERED;
 }
 
-static gint 
-forward_page_func( gint current , gpointer data )
+  static gint 
+forward_page_func( gint current_page , gpointer data )
 {
-  switch( current ){
+  switch( current_page ){
     case 0:
       return 1;
     case 1:
-      if( account_type == _SIP)
+      if( account_type == _SIP )
 	return 2;
       return 4;
     case 2:  
       return 3;
     case 3:
-      return 5;
+	return 6;
     case 4:
-      return 5;
+	return 6;
+    default:
+      return -1;
   }
 }
 
-static GtkWidget*
+  static GtkWidget*
 create_vbox(GtkAssistantPageType type, const gchar *title, const gchar *section)
 {
-	GtkWidget *vbox;
-	GtkWidget *label;
-	GdkPixbuf *pixbuf;
-	gchar *str;
-
-	vbox = gtk_vbox_new(FALSE, 6);
-	gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
-
-	gtk_assistant_append_page(GTK_ASSISTANT(wiz->assistant), vbox);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(wiz->assistant), vbox, type);
-	str = g_strdup_printf(" %s", title);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(wiz->assistant), vbox, str);
-
-	g_free(str);
-
-	gtk_assistant_set_page_complete(GTK_ASSISTANT(wiz->assistant), vbox, TRUE);
-
-  	wiz->logo = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL);
-	gtk_assistant_set_page_header_image(GTK_ASSISTANT(wiz->assistant),vbox, wiz->logo);
-	g_object_unref(wiz->logo);
-
-	if (section) {
-		label = gtk_label_new(NULL);
-		str = g_strdup_printf("<b>%s</b>\n", section);
-		gtk_label_set_markup(GTK_LABEL(label), str);
-		g_free(str);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-	}
-	return vbox;
+  GtkWidget *vbox;
+  GtkWidget *label;
+  GdkPixbuf *pixbuf;
+  gchar *str;
+
+  vbox = gtk_vbox_new(FALSE, 6);
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
+
+  gtk_assistant_append_page(GTK_ASSISTANT(wiz->assistant), vbox);
+  gtk_assistant_set_page_type(GTK_ASSISTANT(wiz->assistant), vbox, type);
+  str = g_strdup_printf(" %s", title);
+  gtk_assistant_set_page_title(GTK_ASSISTANT(wiz->assistant), vbox, str);
+
+  g_free(str);
+
+  gtk_assistant_set_page_complete(GTK_ASSISTANT(wiz->assistant), vbox, TRUE);
+
+  wiz->logo = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL);
+  gtk_assistant_set_page_header_image(GTK_ASSISTANT(wiz->assistant),vbox, wiz->logo);
+  g_object_unref(wiz->logo);
+
+  if (section) {
+    label = gtk_label_new(NULL);
+    str = g_strdup_printf("<b>%s</b>\n", section);
+    gtk_label_set_markup(GTK_LABEL(label), str);
+    g_free(str);
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+    gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+  }
+  return vbox;
 }
 
diff --git a/sflphone-gtk/src/assistant.h b/sflphone-gtk/src/assistant.h
index 7cf3520592..f18a71910e 100644
--- a/sflphone-gtk/src/assistant.h
+++ b/sflphone-gtk/src/assistant.h
@@ -21,6 +21,7 @@
 #define __ASSISTANT_H
 
 #include <accountlist.h>
+#include <actions.h>
 #include <sflphone_const.h>
 
 #define _SIP  0
@@ -56,8 +57,10 @@ struct _wizard
   GtkWidget *nat;
   GtkWidget *enable;
   GtkWidget *addr;
-  /** Page 5 - Test registration */
+  /** Page 5 - Registration successful*/
   GtkWidget *summary;
+  /** Page 6 - Registration failed*/
+  GtkWidget *reg_failed;
   
 }; 
 
@@ -66,11 +69,29 @@ struct _wizard
  * @brief Implement the configuration wizard
  */
 
-void set_account_state( account_state_t state );
+/**
+ * Callbacks functions
+ */
 void set_account_type( GtkWidget* widget , gpointer data );
-static void cancel_callback(gpointer data);
-static void close_callback(gpointer data);
-static void apply_callback( gpointer data );
+
+/**
+ * Callback when the cancel button of the dialog is clicked
+ * Action : close the assistant widget and get back to sflphone main window
+ */
+static void cancel_callback( void );
+
+/**
+ * Callback when the close button of the dialog is clicked
+ * Action : close the assistant widget and get back to sflphone main window
+ */
+static void close_callback( void );
+
+/**
+ * Callback when the button apply is clicked
+ * Action : Set the account parameters with the entries values and called dbus_add_account
+ */
+static void apply_callback( void );
+
 void enable_stun( GtkWidget *widget );
 
 /**
@@ -83,11 +104,16 @@ GtkWidget* build_sip_account_configuration( void );
 GtkWidget* build_nat_settings( void );
 GtkWidget* build_iax_account_configuration( void );
 GtkWidget* build_summary( void );
+GtkWidget* build_registration_error( void );
 
 /**
  * Forward function
  */
-static gint forward_page_func( gint current , gpointer data );
+static gint forward_page_func( gint current_page , gpointer data );
 
+/**
+ * Page template
+ */
 static GtkWidget* create_vbox(GtkAssistantPageType type, const gchar *title, const gchar *section);
+
 #endif
diff --git a/sflphone-gtk/src/calllist.c b/sflphone-gtk/src/calllist.c
index 874bca0f67..c2aabae7b1 100644
--- a/sflphone-gtk/src/calllist.c
+++ b/sflphone-gtk/src/calllist.c
@@ -81,11 +81,9 @@ call_list_add (calltab_t* tab, call_t * c)
 {
   if( tab == history )	
   {
-      g_print("ADD THE  FUCKING CALL call list size = %i - max calls = %i\n", call_list_get_size(tab) , dbus_get_max_calls());
     // First case: can still add calls to the list
     if( call_list_get_size(tab) < dbus_get_max_calls() )
     {
-      g_print("ADD THE  FUCKING CALL\n");
       g_queue_push_tail (tab->callQueue, (gpointer *) c);
       update_call_tree_add( history , c );
     }
diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c
index b60dd81f61..6704db7d17 100644
--- a/sflphone-gtk/src/calltree.c
+++ b/sflphone-gtk/src/calltree.c
@@ -391,10 +391,10 @@ create_toolbar ()
 	active_calltree = current_calls;
 
 	image = gtk_image_new_from_file( ICONS_DIR "/mailbox.svg");
-	mailboxButton = gtk_tool_button_new( image , _("Mailbox"));
+	mailboxButton = gtk_tool_button_new( image , _("Voicemail box"));
 	gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(mailboxButton), image);
 	if( account_list_get_size() ==0 ) gtk_widget_set_state( GTK_WIDGET(mailboxButton), GTK_STATE_INSENSITIVE );
-        gtk_widget_set_tooltip_text(GTK_WIDGET(mailboxButton), _("Mailbox"));
+        gtk_widget_set_tooltip_text(GTK_WIDGET(mailboxButton), _("Voicemail box"));
         g_signal_connect (G_OBJECT (mailboxButton), "clicked",
                         G_CALLBACK (call_mailbox), NULL);
         gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(mailboxButton), -1);
@@ -619,7 +619,6 @@ update_call_tree (calltab_t* tab, call_t * c)
 void 
 update_call_tree_add (calltab_t* tab, call_t * c)
 {
-      g_print("ADD THE  FUCKING CALL call list size = %i - max calls = %i\n", call_list_get_size(tab) , dbus_get_max_calls());
 	if( tab == history && ( call_list_get_size( tab ) > dbus_get_max_calls() ) )
 	  return;
 
diff --git a/sflphone-gtk/src/configwindow.c b/sflphone-gtk/src/configwindow.c
index b1c162216c..c6c07458e6 100644
--- a/sflphone-gtk/src/configwindow.c
+++ b/sflphone-gtk/src/configwindow.c
@@ -1260,12 +1260,12 @@ create_general_settings ()
   gtk_widget_show( notifBox );
   gtk_container_add( GTK_CONTAINER(notifFrame) , notifBox);
   
-  notifAll = gtk_check_button_new_with_label( _("Enable"));
+  notifAll = gtk_check_button_new_with_mnemonic( _("_Enable"));
   gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(notifAll), dbus_get_notify() );
   gtk_box_pack_start( GTK_BOX(notifBox) , notifAll , TRUE , TRUE , 1);
   g_signal_connect(G_OBJECT( notifAll ) , "clicked" , G_CALLBACK( set_notif_level ) , NULL );
 
-  notifMails = gtk_check_button_new_with_label(  _("Notify Voice Mails"));
+  notifMails = gtk_check_button_new_with_mnemonic(  _("_Notify voice mails"));
   gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(notifMails), dbus_get_mail_notify() );
   gtk_box_pack_start( GTK_BOX(notifBox) , notifMails , TRUE , TRUE , 1);
   g_signal_connect(G_OBJECT( notifMails ) , "clicked" , G_CALLBACK( set_mail_notif ) , NULL);
@@ -1280,16 +1280,16 @@ create_general_settings ()
   gtk_widget_show( trayBox );
   gtk_container_add( GTK_CONTAINER(trayFrame) , trayBox);
   
-  GtkWidget* trayItem1 = gtk_radio_button_new_with_label(NULL,  _("Popup Main Window On Incoming Call"));
+  GtkWidget* trayItem1 = gtk_radio_button_new_with_mnemonic(NULL,  _("_Popup main window on incoming call"));
   gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(trayItem1), dbus_popup_mode() );
   gtk_box_pack_start( GTK_BOX(trayBox) , trayItem1 , TRUE , TRUE , 1);
   g_signal_connect(G_OBJECT( trayItem1 ) , "clicked" , G_CALLBACK( set_popup_mode ) , NULL);
 
-  trayItem = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(trayItem1), _("Never Popup Main Window"));
+  trayItem = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(trayItem1), _("Ne_ver popup main window"));
   gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(trayItem), !dbus_popup_mode() );
   gtk_box_pack_start( GTK_BOX(trayBox) , trayItem , TRUE , TRUE , 1);
   
-  trayItem = gtk_check_button_new_with_label(_("Start Hidden"));
+  trayItem = gtk_check_button_new_with_mnemonic(_("_Start hidden"));
   gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(trayItem), dbus_is_start_hidden() );
   gtk_box_pack_start( GTK_BOX(trayBox) , trayItem , TRUE , TRUE , 1);
   g_signal_connect(G_OBJECT( trayItem ) , "clicked" , G_CALLBACK( start_hidden ) , NULL);
@@ -1303,7 +1303,7 @@ create_general_settings ()
   gtk_widget_show( historyBox );
   gtk_container_add( GTK_CONTAINER(historyFrame) , historyBox);
   
-  label = gtk_label_new_with_mnemonic(_("Maximum number of calls"));
+  label = gtk_label_new_with_mnemonic(_("_Maximum number of calls"));
   gtk_box_pack_start( GTK_BOX(historyBox) , label , TRUE , TRUE , 0);
   
   value = gtk_hscale_new_with_range(0.0 , 50.0 , 5.0);
diff --git a/sflphone-gtk/src/mainwindow.c b/sflphone-gtk/src/mainwindow.c
index e7a9d25d77..59184257fd 100644
--- a/sflphone-gtk/src/mainwindow.c
+++ b/sflphone-gtk/src/mainwindow.c
@@ -165,28 +165,11 @@ create_main_window ()
   gtk_widget_hide(history->tree);
   //gtk_widget_show(current_calls->tree);
   
-  // Welcome screen
+  // Configuration wizard 
   if (account_list_get_size() == 0)
   {
-    /*GtkWidget * dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(window),
-                                  GTK_DIALOG_DESTROY_WITH_PARENT,
-                                  GTK_MESSAGE_INFO,
-                                  GTK_BUTTONS_YES_NO,
-                                  _("<b><big>Welcome to SFLphone!</big></b>\n\nThere is no VoIP account configured.\n Would you like to create one now?"));
-
-    int response = gtk_dialog_run (GTK_DIALOG(dialog));
-   
-    gtk_widget_destroy (GTK_WIDGET(dialog));
-
-    if (response == GTK_RESPONSE_YES)
-    {
-      show_accounts_window();
-    }*/
     build_wizard();
   }
-
-  
-
 }
 
 GtkAccelGroup * 
-- 
GitLab