diff --git a/po/Makefile.am b/po/Makefile.am
index c5e67123b756d1464b2a3e9097770cc757d6b805..bcb563c6681ba931b6e0d67e4c40928c047bc9a4 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -2,19 +2,22 @@
 locale_installdir=$(datadir)/locale
 DOMAIN=sflphone
 
+POTFILE=sflphone.pot
+
 POFILES=\
 	 fr.po \
 	 es.po \
 	 de.po \
-         zh_CN.po
+     zh_CN.po
 
 MOFILES=\
 	 fr.mo \
 	 es.mo \
 	 de.mo \
-         zh_CN.mo
+     zh_CN.mo
 
 MSGFMT=msgfmt
+MSGMERGE=msgmerge
 
 # necessary files
 EXTRA_DIST= $(POFILES)
@@ -25,6 +28,7 @@ all:	$(MOFILES)
 SUFFIXES=.po .mo
 
 .po.mo:
+	$(MSGMERGE) --update $< $(POTFILE) 
 	$(MSGFMT) -o $@ $<
 
 install-data-local:
diff --git a/po/README b/po/README
index 381b4d9c8e79fe26919451b9aed180acd2c17f15..fd7b8b023f6686fd97a055ea9751b34e1b396719 100644
--- a/po/README
+++ b/po/README
@@ -1,13 +1,6 @@
 If we need to update sflphone.pot file, do the following steps:
 
->cd sflphone-gtk/src
->xgettext -k_ -o sflphone.pot *.c
+xgettext -k_ -o sflphone.pot ../sflphone-gtk/src/*.c
 
->msgmerge zh_CN.po sflphone.pot
->msgmerge fr.po sflphone.pot
->msgmerge es.po sflphone.pot
->msgmerge de.po sflphone.pot
-
-Modify all the new po files, and then
-make && sudo make install
+Then make && sudo make install
 
diff --git a/po/de.po b/po/de.po
index d4cbac567cd1609c3f8ad1073af27be1070734ff..5f8b5cbccc28b514c29b4e099a605d163c0a138e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-29 10:56-0400\n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\n"
 "PO-Revision-Date: 2008-03-27 11:15\n"
 "Last-Translator: Emmanuel Milou <emmnauel.milou@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -405,6 +405,13 @@ msgid ""
 "Error while opening capture device"
 msgstr ""
 
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+
 #: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
 msgid "Search"
 msgstr ""
@@ -421,76 +428,76 @@ msgid ""
 "Do you still want to quit?"
 msgstr ""
 
-#: menus.c:129
+#: menus.c:130
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: menus.c:132
+#: menus.c:133
 msgid "About SFLphone"
 msgstr ""
 
-#: menus.c:155
+#: menus.c:156
 msgid "_Help"
 msgstr ""
 
-#: menus.c:272
+#: menus.c:273
 msgid "_New call"
 msgstr ""
 
-#: menus.c:284 menus.c:768
+#: menus.c:285 menus.c:769
 msgid "_Pick up"
 msgstr ""
 
-#: menus.c:294 menus.c:780
+#: menus.c:295 menus.c:781
 msgid "_Hang up"
 msgstr ""
 
-#: menus.c:304 menus.c:792
+#: menus.c:305 menus.c:793
 msgid "On _Hold"
 msgstr ""
 
-#: menus.c:320
+#: menus.c:321
 #, fuzzy
 msgid "_Account Assistant"
 msgstr "_Konten"
 
-#: menus.c:350
+#: menus.c:351
 msgid "_Call"
 msgstr ""
 
-#: menus.c:496
+#: menus.c:497
 msgid "History empty"
 msgstr ""
 
-#: menus.c:537
+#: menus.c:538
 msgid "_Clear history"
 msgstr ""
 
-#: menus.c:549
+#: menus.c:550
 msgid "_Accounts"
 msgstr "_Konten"
 
-#: menus.c:564
+#: menus.c:565
 msgid "_Edit"
 msgstr ""
 
-#: menus.c:624
+#: menus.c:625
 msgid "_Dialpad"
 msgstr ""
 
-#: menus.c:636
+#: menus.c:637
 msgid "_Volume controls"
 msgstr ""
 
-#: menus.c:645
+#: menus.c:646
 msgid "_Search history"
 msgstr ""
 
-#: menus.c:653
+#: menus.c:654
 msgid "_View"
 msgstr ""
 
-#: menus.c:875
+#: menus.c:876
 msgid "_Call back"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 51c88e4c386b986fa90757c5c4e736bcc6a90581..85319280625cfa27d10c20aef46b255a759c67c1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-29 10:56-0400\n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\n"
 "PO-Revision-Date: 2008-08-11 11:53+0200\n"
 "Last-Translator: Carlos Galisteo <cgalisteo AT k-rolus.net>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -135,7 +135,6 @@ msgstr ""
 "Incapaz de conectar con el servidor SFLphone.\n"
 " Asegúrese de que el demonio esté funcionando."
 
-#: sflphone-gtk/src/actions.c: 632
 #: actions.c:741
 #, c-format
 msgid ""
@@ -212,8 +211,8 @@ msgid ""
 msgstr ""
 "Ese asistante ha finalizado.\n"
 "\n"
-"Puede comprobar en cualquier momento su estado de registro o modificar la configuración"
-" de sus cuentas en la ventana de Opciones/Cuentas."
+"Puede comprobar en cualquier momento su estado de registro o modificar la "
+"configuración de sus cuentas en la ventana de Opciones/Cuentas."
 
 #: audioconf.c:150
 #, c-format
@@ -434,6 +433,13 @@ msgstr ""
 "\n"
 "Error al abrir el dispositivo de captura"
 
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+
 #: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
 msgid "Search"
 msgstr ""
@@ -450,77 +456,77 @@ msgid ""
 "Do you still want to quit?"
 msgstr ""
 
-#: menus.c:129
+#: menus.c:130
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 "SFLphone es un telefono por Internet compatible con los protocolos SIP y IAX2"
 
-#: menus.c:132
+#: menus.c:133
 msgid "About SFLphone"
 msgstr "Sobre SFLphone"
 
-#: menus.c:155
+#: menus.c:156
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: menus.c:272
+#: menus.c:273
 msgid "_New call"
 msgstr "_Nueva llamada"
 
-#: menus.c:284 menus.c:768
+#: menus.c:285 menus.c:769
 msgid "_Pick up"
 msgstr "_Descolgar"
 
-#: menus.c:294 menus.c:780
+#: menus.c:295 menus.c:781
 msgid "_Hang up"
 msgstr "_Colgar"
 
-#: menus.c:304 menus.c:792
+#: menus.c:305 menus.c:793
 msgid "On _Hold"
 msgstr "En _Espera"
 
-#: menus.c:320
+#: menus.c:321
 msgid "_Account Assistant"
 msgstr "_Asistente de Cuenta"
 
-#: menus.c:350
+#: menus.c:351
 msgid "_Call"
 msgstr "_Llamar"
 
-#: menus.c:496
+#: menus.c:497
 msgid "History empty"
 msgstr ""
 
-#: menus.c:537
+#: menus.c:538
 #, fuzzy
 msgid "_Clear history"
 msgstr "Historia de Llamada"
 
-#: menus.c:549
+#: menus.c:550
 msgid "_Accounts"
 msgstr "_Cuentas"
 
-#: menus.c:564
+#: menus.c:565
 msgid "_Edit"
 msgstr "_Editar"
 
-#: menus.c:624
+#: menus.c:625
 msgid "_Dialpad"
 msgstr "_Teclado numérico"
 
-#: menus.c:636
+#: menus.c:637
 msgid "_Volume controls"
 msgstr "_Controles de volumen"
 
-#: menus.c:645
+#: menus.c:646
 msgid "_Search history"
 msgstr ""
 
-#: menus.c:653
+#: menus.c:654
 msgid "_View"
 msgstr "_Ver"
 
-#: menus.c:875
+#: menus.c:876
 #, fuzzy
 msgid "_Call back"
 msgstr "_Llamar"
@@ -595,4 +601,3 @@ msgstr ""
 #, c-format
 msgid "<small>Duration:</small> %s"
 msgstr ""
-
diff --git a/po/fr.po b/po/fr.po
index acc52600bb584f4f38a8256b035bb980f231e8e2..25ba4ff41601ece4a3e7d63f488f2d93843dbd3d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-29 10:56-0400\n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\n"
 "PO-Revision-Date: 2008-03-31 14:15\n"
 "Last-Translator: Emmanuel Milou <emmnauel.milou@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -428,6 +428,13 @@ msgstr ""
 "\n"
 "Erreur lors de l'ouverture du périphérique d'entrée"
 
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+
 #: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
 msgid "Search"
 msgstr "Recherche"
@@ -448,76 +455,76 @@ msgstr ""
 "<b>Vous avez des appels en cours.</b>\n"
 "Voulez-vous quitter?"
 
-#: menus.c:129
+#: menus.c:130
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 "SFLphone est un client VoIP compatible avec les protocoles SIP et IAX2."
 
-#: menus.c:132
+#: menus.c:133
 msgid "About SFLphone"
 msgstr "A propos de SFLphone"
 
-#: menus.c:155
+#: menus.c:156
 msgid "_Help"
 msgstr "A_ide"
 
-#: menus.c:272
+#: menus.c:273
 msgid "_New call"
 msgstr "_Nouvel appel"
 
-#: menus.c:284 menus.c:768
+#: menus.c:285 menus.c:769
 msgid "_Pick up"
 msgstr "_Décrocher"
 
-#: menus.c:294 menus.c:780
+#: menus.c:295 menus.c:781
 msgid "_Hang up"
 msgstr "_Raccrocher"
 
-#: menus.c:304 menus.c:792
+#: menus.c:305 menus.c:793
 msgid "On _Hold"
 msgstr "_Mettre en attente"
 
-#: menus.c:320
+#: menus.c:321
 msgid "_Account Assistant"
 msgstr "_Assistant SFLphone"
 
-#: menus.c:350
+#: menus.c:351
 msgid "_Call"
 msgstr "_Actions"
 
-#: menus.c:496
+#: menus.c:497
 msgid "History empty"
 msgstr "L'historique est vide"
 
-#: menus.c:537
+#: menus.c:538
 msgid "_Clear history"
 msgstr "Effacer l'historique"
 
-#: menus.c:549
+#: menus.c:550
 msgid "_Accounts"
 msgstr "Co_mptes"
 
-#: menus.c:564
+#: menus.c:565
 msgid "_Edit"
 msgstr "_Options"
 
-#: menus.c:624
+#: menus.c:625
 msgid "_Dialpad"
 msgstr "_Clavier"
 
-#: menus.c:636
+#: menus.c:637
 msgid "_Volume controls"
 msgstr "_Contrôle du volume"
 
-#: menus.c:645
+#: menus.c:646
 msgid "_Search history"
 msgstr "Recherche dans l'historique"
 
-#: menus.c:653
+#: menus.c:654
 msgid "_View"
 msgstr "A_ffichage"
 
-#: menus.c:875
+#: menus.c:876
 #, fuzzy
 msgid "_Call back"
 msgstr "_Actions"
@@ -591,4 +598,3 @@ msgstr "<small>Appel manqué</small>"
 #, c-format
 msgid "<small>Duration:</small> %s"
 msgstr "<small>Durée:</small> %s"
-
diff --git a/po/sflphone.pot b/po/sflphone.pot
index f19b29aef80cbdb1365c58db281f8bf4e81e04ee..595319e11506a0587675c8c851313d120b6c7249 100644
--- a/po/sflphone.pot
+++ b/po/sflphone.pot
@@ -1,457 +1,567 @@
-# Copyright (C) 2008 The Free Software Foundation, Inc.
-# This file is distributed under the GNU General Public License Version 3.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
-#
-
-
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: SFLphone 0.8.2\n"
-"Report-Msgid-Bugs-To: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com >\n"
-"POT-Creation-Date: 2007-03-31 01:39+0600\n"
-"PO-Revision-Date: 2008-03-31 11:15+0600\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
-"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\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-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/audio/audiolayer.cpp: 318
-msgid "Error while opening capture device "
+#: accountlist.c:158
+msgid "Registered"
 msgstr ""
 
-#: src/audio/audiolayer.cpp: 349
-msgid "Error while opening playback device "
+#: accountlist.c:161
+msgid "Not Registered"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 119
-msgid "About SFLphone"
+#: accountlist.c:164
+msgid "Trying..."
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 124
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+#: accountlist.c:167 sflnotify.c:171 sflnotify.c:210
+msgid "Error"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 150
-msgid "_Help"
+#: accountlist.c:170
+msgid "Bad authentification"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 207
-msgid "_New call"
+#: accountlist.c:173
+msgid "Network unreachable"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 217 menus.c: 605
-msgid "_Pick up"
+#: accountlist.c:175
+msgid "Host unreachable"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 225 menus.c: 617
-msgid "_Hang up"
+#: accountlist.c:178
+msgid "Invalid"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 233 menus.c: 629
-msgid "On _Hold"
+#: accountwindow.c:143
+msgid "Account settings"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 254
-msgid "_Call"
+#: accountwindow.c:155
+msgid "Account parameters"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 270
-msgid "_Account Assistant"
+#: accountwindow.c:177
+msgid "_Enabled"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 423
-msgid "_Accounts"
+#: accountwindow.c:183 assistant.c:210 assistant.c:264
+msgid "_Alias"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 523
-msgid "_Clear history"
+#: accountwindow.c:191
+msgid "_Protocol"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 438
-msgid "_Edit"
+#: accountwindow.c:209
+msgid "Unknown"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 462
-msgid "_Dialpad"
+#: accountwindow.c:219 assistant.c:218 assistant.c:272
+msgid "_Host name"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 471
-msgid "_Volume controls"
+#: accountwindow.c:227 assistant.c:226 assistant.c:280
+msgid "_User name"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 610
-msgid "_Search history"
+#: accountwindow.c:238 assistant.c:236 assistant.c:290
+msgid "_Password"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 479
-msgid "_Toolbar"
+#: accountwindow.c:249
+msgid "_Voicemail box #"
 msgstr ""
 
-#: sflphone-gtk/src/menus.c: 492
-msgid "_View"
+#: accountwindow.c:260 assistant.c:313
+msgid "Network Address Translation"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 336 sflphone-gtk/src/calltree.c: 337
-msgid "Place a call"
+#: accountwindow.c:271 assistant.c:322
+msgid "E_nable STUN"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 344 sflphone-gtk/src/calltree.c: 345
-msgid "Pick up"
+#: accountwindow.c:275
+msgid "Enable it if you are behind a firewall, then restart SFLphone"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
-msgid "Hang up"
+#: accountwindow.c:279
+msgid "_STUN Server"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
-msgid "Off Hold"
+#: accountwindow.c:286
+msgid "Format: name.server:port"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 367 sflphone-gtk/src/calltree.c: 368
-msgid "On Hold"
+#: actions.c:57 sflnotify.c:103
+#, c-format
+msgid "%d voice mails"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 375 sflphone-gtk/src/calltree.c: 376
-msgid "Transfer"
+#: actions.c:59
+#, c-format
+msgid "%d voice mail"
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 385 sflphone-gtk/src/calltree.c: 386
-msgid "History"
+#: actions.c:80
+#, c-format
+msgid "%s account- %s"
+msgstr ""
+
+#: actions.c:214
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
 msgstr ""
 
-#: sflphone-gtk/src/calltree.c: 394 sflphone-gtk/src/calltree.c: 397
-msgid "Voicemail box"
+#: actions.c:741
+#, c-format
+msgid ""
+"<b>Error: No audio codecs found.\n"
+"\n"
+"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
+"b> directory in your home( <i>%s</i> )"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 799
+#: assistant.c:138
+msgid "SFLphone account configuration wizard"
+msgstr ""
+
+#: assistant.c:165
+msgid "SFLphone 0.8"
+msgstr ""
+
+#: assistant.c:165
+msgid "Welcome to SFLphone!"
+msgstr ""
+
+#: assistant.c:167
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+
+#: assistant.c:182
+msgid "VoIP Protocols"
+msgstr ""
+
+#: assistant.c:182
+msgid "Select an account type:"
+msgstr ""
+
+#: assistant.c:202
+msgid "SIP account configuration"
+msgstr ""
+
+#: assistant.c:202 assistant.c:256
+msgid "Please fill the following information:"
+msgstr ""
+
+#: assistant.c:256
+msgid "IAX2 account configuration"
+msgstr ""
+
+#: assistant.c:313
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+
+#: assistant.c:329
+msgid "_STUN server"
+msgstr ""
+
+#: assistant.c:346
+msgid "Account Registration"
+msgstr ""
+
+#: assistant.c:346
+msgid "Congratulations!"
+msgstr ""
+
+#: assistant.c:348
+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 ""
+
+#: audioconf.c:150
+#, c-format
+msgid "audio device index for output = %d\n"
+msgstr ""
+
+#: audioconf.c:558
 msgid "Name"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 804
+#: audioconf.c:563
 msgid "Frequency"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 809
+#: audioconf.c:568
 msgid "Bitrate"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 814
+#: audioconf.c:573
 msgid "Bandwidth"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 892
-msgid "Protocol"
+#: audioconf.c:633
+msgid "Pulseaudio"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 900
-msgid "Status"
+#: audioconf.c:636
+msgid "ALSA"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 934
-msgid "Default"
+#: audioconf.c:662
+msgid "ALSA plugin"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 935
-msgid "Set the selected account as the default one to make calls"
+#: audioconf.c:684
+msgid "Output"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 976
-msgid "Devices"
+#: audioconf.c:706
+msgid "Input"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1018
-msgid "ALSA plugin"
+#: audioconf.c:739
+msgid "_Enable ringtones"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1039
-msgid "Output peripheral"
+#: audioconf.c:744
+msgid "Choose a ringtone"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1060
-msgid "Input peripheral"
+#: audioconf.c:749
+msgid "Audio Files"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1080
-msgid "Detect all"
+#: audioconf.c:774
+msgid "Sound Manager"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1107
-msgid "_Enable ringtones"
+#: audioconf.c:781
+msgid "ALSA configuration"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1112
-msgid "Choose a ringtone"
+#: audioconf.c:791
+msgid "Codecs"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1117
-msgid "Audio Files"
+#: audioconf.c:799
+msgid "Ringtones"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1142
-msgid "Preferences"
+#: calltree.c:208
+#, c-format
+msgid "\"Voicemail\" <%s>"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1167
-msgid "Audio Settings"
+#: calltree.c:405 calltree.c:407
+msgid "Place a call"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1191
-msgid "Accounts"
+#: calltree.c:414 calltree.c:416
+msgid "Pick up"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1203
-msgid "Accounts previously setup"
+#: calltree.c:424 calltree.c:426
+msgid "Hang up"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 139
-msgid "Account settings"
+#: calltree.c:434 calltree.c:436
+msgid "Off Hold"
+msgstr ""
+
+#: calltree.c:445 calltree.c:447
+msgid "On Hold"
+msgstr ""
+
+#: calltree.c:458 calltree.c:460
+msgid "Transfer"
+msgstr ""
+
+#: calltree.c:470 calltree.c:472
+msgid "History"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1254
+#: calltree.c:480 calltree.c:484
+msgid "Voicemail"
+msgstr ""
+
+#: configwindow.c:371
+msgid "Protocol"
+msgstr ""
+
+#: configwindow.c:378
+msgid "Status"
+msgstr ""
+
+#: configwindow.c:470
 msgid "Desktop Notification"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1263
+#: configwindow.c:478
 msgid "_Enable"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1268
+#: configwindow.c:483
 msgid "_Notify voice mails"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1274
+#: configwindow.c:489
 msgid "System Tray Icon"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1283
+#: configwindow.c:497
 msgid "_Popup main window on incoming call"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1288
+#: configwindow.c:502
 msgid "Ne_ver popup main window"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1292
+#: configwindow.c:506
 msgid "_Start hidden"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1297
+#: configwindow.c:512
 msgid "Calls History"
 msgstr ""
 
-#: sflphone-gtk/src/configwindow.c: 1307
+#: configwindow.c:520
 msgid "_Maximum number of calls"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 151
-msgid "Account parameters"
+#: configwindow.c:536
+msgid "PulseAudio sound server"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 174
-msgid "_Enabled"
+#: configwindow.c:544
+msgid "_Control running applications volume"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 180 sflphone-gtk/src/assistant.c: 161  sflphone-gtk/src/assistant.c: 210
-msgid "_Alias"
+#: configwindow.c:557
+msgid "SIP Port"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 188
-msgid "_Protocol"
+#: configwindow.c:566
+msgid "Apply"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 206
-msgid "Unknown"
+#: configwindow.c:570
+msgid "Port:"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
-msgid "_Host name"
+#: configwindow.c:600
+msgid "Preferences"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
-msgid "_User name"
+#: configwindow.c:620
+msgid "General Settings"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 232 sflphone-gtk/src/assistant.c: 185 sflphone-gtk/src/assistant.c: 234
-msgid "_Password"
+#: configwindow.c:625
+msgid "Audio Settings"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 241
-msgid "_Voicemail box #"
+#: configwindow.c:649
+msgid "Accounts"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
-msgid "Network Address Translation"
+#: configwindow.c:661
+msgid "Accounts previously setup"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
-msgid "E_nable STUN"
+#: errors.c:28
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
+"Error while opening playback device"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 267
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
+#: errors.c:31
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
+"Error while opening capture device"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
-msgid "_STUN Server"
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
 msgstr ""
 
-#: sflphone-gtk/src/accountwindow.c: 276
-msgid "Format: name.server:port"
+#: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
+msgid "Search"
 msgstr ""
 
-#: sflphone-gtk/src/actions.c: 45
-msgid "%d voice mails"
+#: mainwindow.c:69
+msgid ""
+"<b>There is one call in progress.</b>\n"
+"Do you still want to quit?"
 msgstr ""
 
-#: sflphone-gtk/src/actions.c: 47
-msgid "%d voice mail"
+#: mainwindow.c:73
+msgid ""
+"<b>There are calls in progress.</b>\n"
+"Do you still want to quit?"
 msgstr ""
 
-#: sflphone-gtk/src/actions.c: 162
-msgid "Unable to connect to the SFLphone server.\n"
-" Make sure the daemon is running."
+#: menus.c:130
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
-""
 
-#: sflphone-gtk/src/actions.c: 544
-msgid "The account selected as default is not registered."
+#: menus.c:133
+msgid "About SFLphone"
 msgstr ""
 
-#: sflphone-gtk/src/actions.c: 557
-msgid "There is no registered account to make this call with."
+#: menus.c:156
+msgid "_Help"
 msgstr ""
 
-#: sflphone-gtk/src/actions.c: 591
-msgid "<b>ALSA notification</b>\n\n"
-"Error while opening playback device"
+#: menus.c:273
+msgid "_New call"
 msgstr ""
 
-#: sflphone-gtk/src/actions.c: 594
-msgid "<b>ALSA notification</b>\n\n"
-"Error while opening capture device"
+#: menus.c:285 menus.c:769
+msgid "_Pick up"
 msgstr ""
 
-#: sflphone-gtk/src/actions.c: 632
-msgid "<b>Error: No audio codecs found.\n\n</b>"
-" SFL audio codecs have to be placed in <i>%s</i>"
-" or in the <b>.sflphone</b> directory in your home( <i>%s</i> )"
+#: menus.c:295 menus.c:781
+msgid "_Hang up"
 msgstr ""
-""
-""
 
-#: sflphone-gtk/src/accountlist.c: 148 
-msgid "Registered"
+#: menus.c:305 menus.c:793
+msgid "On _Hold"
 msgstr ""
 
-#: sflphone-gtk/src/accountlist.c: 151
-msgid "Not Registered"
+#: menus.c:321
+msgid "_Account Assistant"
 msgstr ""
 
-#: sflphone-gtk/src/accountlist.c: 154
-msgid "Trying..."
+#: menus.c:351
+msgid "_Call"
 msgstr ""
 
-#: sflphone-gtk/src/accountlist.c: 157
-msgid "Error"
+#: menus.c:497
+msgid "History empty"
 msgstr ""
 
-#: sflphone-gtk/src/accountlist.c: 160
-msgid "Invalid"
+#: menus.c:538
+msgid "_Clear history"
 msgstr ""
 
-#: sflphone-gtk/src/sliders.c: 166
-msgid "Speakers volume"
+#: menus.c:550
+msgid "_Accounts"
 msgstr ""
 
-#: sflphone-gtk/src/sliders.c: 168
-msgid "Mic volume"
+#: menus.c:565
+msgid "_Edit"
 msgstr ""
 
-#: sflphone-gtk/src/mainwindow.c: 179
-msgid "<b><big>Welcome to SFLphone!</big></b>\n\n"
-"There is no VoIP account configured.\n"
-" Would you like to create one now?"
+#: menus.c:625
+msgid "_Dialpad"
 msgstr ""
-""
-""
 
-#: sflphone-gtk/src/SFLnotify.c: 32
-msgid "%s account: %s"
+#: menus.c:637
+msgid "_Volume controls"
 msgstr ""
 
-#: sflphone-gtk/src/SFLnotify.c: 35
-msgid "<i>From:</i> %s"
+#: menus.c:646
+msgid "_Search history"
 msgstr ""
 
-#: sflphone-gtk/src/SFLnotify.c: 50
-msgid "Accept"
+#: menus.c:654
+msgid "_View"
 msgstr ""
 
-#: sflphone-gtk/src/SFLnotify.c: 51
-msgid "Refuse"
+#: menus.c:876
+msgid "_Call back"
 msgstr ""
 
-#: sflphone-gtk/src/SFLnotify.c: 52
-msgid "Ignore"
+#: sflnotify.c:34 sflnotify.c:100
+#, c-format
+msgid "%s account: %s"
 msgstr ""
 
-#: sflphone-gtk/src/statusicon.c: 80 
-msgid "_Show main window"
+#: sflnotify.c:37
+#, c-format
+msgid "<i>From:</i> %s"
 msgstr ""
 
-#: sflphone-gtk/src/statusicon.c: 113
-msgid "SFLphone - %i account registered"
-msgid_plural "SFLphone - %i accounts registered"
-msgstr[0] ""
-msgstr[1] ""
+#: sflnotify.c:52
+msgid "Accept"
+msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 91
-msgid "SFLphone account configuration wizard"
+#: sflnotify.c:53
+msgid "Refuse"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 122
-msgid "Welcome to SFLphone!"
+#: sflnotify.c:54 sflnotify.c:117 sflnotify.c:154
+msgid "Ignore"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 119
-msgid "This installation wizard will help you configure an account."
+#: sflnotify.c:136
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 134
-msgid "VoIP Protocols"
+#: sflnotify.c:140
+msgid "Current account"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 134
-msgid "Select an account type:"
+#: sflnotify.c:169
+msgid "You haven't setup any accounts"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 153
-msgid "SIP account configuration"
+#: sflnotify.c:185 sflnotify.c:224
+msgid "Setup Accounts"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
-msgid "Please fill the following information:"
+#: sflnotify.c:208
+msgid "You have no registered accounts"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 202
-msgid "IAX2 account configuration"
+#: sliders.c:161
+msgid "Speakers volume"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 256
-msgid "You should probably enable this if you are behind a firewall."
+#: sliders.c:163
+msgid "Mic volume"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 289
-msgid "Account Registration"
+#: statusicon.c:91
+msgid "_Show main window"
 msgstr ""
 
-#: sflphone-gtk/src/assistant.c: 289
-msgid "Congratulations!"
+#: statusicon.c:124
+#, c-format
+msgid "SFLphone - %i accounts registered"
 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."
+#: timestamp.c:45
+msgid "<small>Missed call</small>"
 msgstr ""
 
+#: timestamp.c:63
+#, c-format
+msgid "<small>Duration:</small> %s"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 48e22d35743e6a10bb4d235f6c35b403dca5d930..bcc23599a5de759b204f02d4a36ecc365310fdf4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,11 +4,11 @@
 #
 # Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
 #
-
 msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
-"Report-Msgid-Bugs-To: Yun Liu <yun.liu@savoirfairelinux.com >\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\n"
 "PO-Revision-Date: 2008-10-28 14:15\n"
 "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -142,7 +142,8 @@ msgid ""
 msgstr ""
 "<b>错误：无法找到codecs编码文件.\n"
 "\n"
-"</b> SFL声音codecs文件应位于<i>%s</i> 或 位于主目录( <i>%s</i> )的<b>.sflphone</b>目录下"
+"</b> SFL声音codecs文件应位于<i>%s</i> 或 位于主目录( <i>%s</i> )的<b>."
+"sflphone</b>目录下"
 
 #: assistant.c:138
 msgid "SFLphone account configuration wizard"
@@ -417,6 +418,13 @@ msgstr ""
 "\n"
 "打开采集设备时出错"
 
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+
 #: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
 msgid "Search"
 msgstr "查找"
@@ -437,75 +445,75 @@ msgstr ""
 "<b>有电话正在处理中</b>\n"
 "确定要退出？"
 
-#: menus.c:129
+#: menus.c:130
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone是一个VoIP客户端，它兼容SIP和IAX2协议."
 
-#: menus.c:132
+#: menus.c:133
 msgid "About SFLphone"
 msgstr "关于SFLphone"
 
-#: menus.c:155
+#: menus.c:156
 msgid "_Help"
 msgstr "帮助(H)"
 
-#: menus.c:272
+#: menus.c:273
 msgid "_New call"
 msgstr "新电话(N)"
 
-#: menus.c:284 menus.c:768
+#: menus.c:285 menus.c:769
 msgid "_Pick up"
 msgstr "拨出(P)"
 
-#: menus.c:294 menus.c:780
+#: menus.c:295 menus.c:781
 msgid "_Hang up"
 msgstr "放下(H)"
 
-#: menus.c:304 menus.c:792
+#: menus.c:305 menus.c:793
 msgid "On _Hold"
 msgstr ""
 
-#: menus.c:320
+#: menus.c:321
 msgid "_Account Assistant"
 msgstr "帐户向导(A)"
 
-#: menus.c:350
+#: menus.c:351
 msgid "_Call"
 msgstr "电话"
 
-#: menus.c:496
+#: menus.c:497
 msgid "History empty"
 msgstr "无历史记录"
 
-#: menus.c:537
+#: menus.c:538
 msgid "_Clear history"
 msgstr "清空历史记录(C)"
 
-#: menus.c:549
+#: menus.c:550
 msgid "_Accounts"
 msgstr "帐户(A)"
 
-#: menus.c:564
+#: menus.c:565
 msgid "_Edit"
 msgstr "编辑(E)"
 
-#: menus.c:624
+#: menus.c:625
 msgid "_Dialpad"
 msgstr "拨号面板"
 
-#: menus.c:636
+#: menus.c:637
 msgid "_Volume controls"
 msgstr "音量控制(V)"
 
-#: menus.c:645
+#: menus.c:646
 msgid "_Search history"
 msgstr "查找历史(S)"
 
-#: menus.c:653
+#: menus.c:654
 msgid "_View"
 msgstr "查看(V)"
 
-#: menus.c:875
+#: menus.c:876
 msgid "_Call back"
 msgstr "回叫(C)"