diff --git a/po/de.po b/po/de.po
index 73e426a76f03330b8d4488a2fb7e0f5a6f8583f1..c815b378745ec1045af85a0e3909f91957d045ed 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
-"Report-Msgid-Bugs-To: sflphoneteam@savoirfairelinux.com\n"
-"POT-Creation-Date: 2008-11-05 16:41-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-10 15:24-0500\n"
 "PO-Revision-Date: 2009-01-08 10:46-0500\n"
 "Last-Translator: Sven Werlen <sven.werlen@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -58,72 +58,50 @@ msgstr "Ungültiger Stun Server"
 msgid "Invalid"
 msgstr "Ungültig"
 
-#: ../sflphone-gtk/src/accountwindow.c:143
+#: ../sflphone-gtk/src/accountwindow.c:109
 msgid "Account settings"
 msgstr "Kontoeinstellungen"
 
-#: ../sflphone-gtk/src/accountwindow.c:155
+#: ../sflphone-gtk/src/accountwindow.c:121
 msgid "Account parameters"
 msgstr "Kontoparameter"
 
-#: ../sflphone-gtk/src/accountwindow.c:177
+#: ../sflphone-gtk/src/accountwindow.c:143
 msgid "_Enabled"
 msgstr "_Aktiv"
 
-#: ../sflphone-gtk/src/accountwindow.c:183 ../sflphone-gtk/src/assistant.c:210
-#: ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/accountwindow.c:149 ../sflphone-gtk/src/assistant.c:238
+#: ../sflphone-gtk/src/assistant.c:292
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../sflphone-gtk/src/accountwindow.c:191
+#: ../sflphone-gtk/src/accountwindow.c:157
 msgid "_Protocol"
 msgstr "_Protokoll"
 
-#: ../sflphone-gtk/src/accountwindow.c:209
+#: ../sflphone-gtk/src/accountwindow.c:175
 msgid "Unknown"
 msgstr "unbekannt"
 
-#: ../sflphone-gtk/src/accountwindow.c:219 ../sflphone-gtk/src/assistant.c:218
-#: ../sflphone-gtk/src/assistant.c:272
+#: ../sflphone-gtk/src/accountwindow.c:185 ../sflphone-gtk/src/assistant.c:246
+#: ../sflphone-gtk/src/assistant.c:300
 msgid "_Host name"
 msgstr "_Hostname"
 
-#: ../sflphone-gtk/src/accountwindow.c:227 ../sflphone-gtk/src/assistant.c:226
-#: ../sflphone-gtk/src/assistant.c:280
+#: ../sflphone-gtk/src/accountwindow.c:193 ../sflphone-gtk/src/assistant.c:254
+#: ../sflphone-gtk/src/assistant.c:308
 msgid "_User name"
 msgstr "_Benutzername"
 
-#: ../sflphone-gtk/src/accountwindow.c:238 ../sflphone-gtk/src/assistant.c:236
-#: ../sflphone-gtk/src/assistant.c:290
+#: ../sflphone-gtk/src/accountwindow.c:204 ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/assistant.c:318
 msgid "_Password"
 msgstr "_Passwort"
 
-#: ../sflphone-gtk/src/accountwindow.c:249
+#: ../sflphone-gtk/src/accountwindow.c:215
 msgid "_Voicemail box #"
 msgstr "_Voicemail Boxnummer"
 
-#: ../sflphone-gtk/src/accountwindow.c:260 ../sflphone-gtk/src/assistant.c:313
-msgid "Network Address Translation"
-msgstr "Network Address Translation (NAT)"
-
-#: ../sflphone-gtk/src/accountwindow.c:271 ../sflphone-gtk/src/assistant.c:322
-msgid "E_nable STUN"
-msgstr "STUN Ei_nschalten"
-
-#: ../sflphone-gtk/src/accountwindow.c:275
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
-msgstr ""
-"Einschalten falls Sie hinter einer Firewall sind (SFLphone muss neu "
-"gestartet werden)"
-
-#: ../sflphone-gtk/src/accountwindow.c:279
-msgid "_STUN Server"
-msgstr "_STUN Server"
-
-#: ../sflphone-gtk/src/accountwindow.c:286
-msgid "Format: name.server:port"
-msgstr "Format: Name.Server:Port"
-
 #: ../sflphone-gtk/src/actions.c:57 ../sflphone-gtk/src/sflnotify.c:103
 #, c-format
 msgid "%d voice mails"
@@ -139,7 +117,7 @@ msgstr "%d Voice Nachricht"
 msgid "%s account- %s"
 msgstr "%s Konto- %s"
 
-#: ../sflphone-gtk/src/actions.c:229
+#: ../sflphone-gtk/src/actions.c:224
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -147,7 +125,7 @@ msgstr ""
 "SFLphone Server kann nicht verbunden werden. Stellen Sie sicher, dass der "
 "Dämon läuft."
 
-#: ../sflphone-gtk/src/actions.c:756
+#: ../sflphone-gtk/src/actions.c:798
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -160,61 +138,84 @@ msgstr ""
 "</b> SFL Audio-Codecs müssen in <i>%s</i> oder <b>.sflphone</b> Ihres HOME-"
 "Verzeichniss ( <i>%s</i> ) gespeichert werden."
 
-#: ../sflphone-gtk/src/assistant.c:138
+#: ../sflphone-gtk/src/assistant.c:148
 msgid "SFLphone account configuration wizard"
 msgstr "SFLphone Konto (Konfigurationsassistent)"
 
-#: ../sflphone-gtk/src/assistant.c:165
-#, fuzzy
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "SFLphone 0.9.2"
-msgstr "SFLphone 0.8"
+msgstr "SFLphone 0.9.2"
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "Welcome to SFLphone!"
 msgstr "Wilkommen zu SFLphone!"
 
-#: ../sflphone-gtk/src/assistant.c:167
+#: ../sflphone-gtk/src/assistant.c:178
 msgid "This installation wizard will help you configure an account."
 msgstr ""
 "The Installationsassistent wird Ihnen helfen, ein Konto zu konfigurieren."
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "VoIP Protocols"
 msgstr "VoIP Protokoll"
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "Select an account type:"
 msgstr "Kontotyp auswählen:"
 
-#: ../sflphone-gtk/src/assistant.c:202
+#: ../sflphone-gtk/src/assistant.c:211
+msgid "Account"
+msgstr "Konto"
+
+#: ../sflphone-gtk/src/assistant.c:211
+msgid "Please select one of the following option:"
+msgstr "Bitte eine Option auswählen:"
+
+#: ../sflphone-gtk/src/assistant.c:213
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:215
+msgid "Register an existing SIP or IAX2 account"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:230
 msgid "SIP account configuration"
 msgstr "Konfiguration des SIP-Konto"
 
-#: ../sflphone-gtk/src/assistant.c:202 ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:230 ../sflphone-gtk/src/assistant.c:284
 msgid "Please fill the following information:"
 msgstr "Folgende Informationen bitte ausfühlen:"
 
-#: ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:284
 msgid "IAX2 account configuration"
 msgstr "Konfiguration des IAX2 Konto"
 
-#: ../sflphone-gtk/src/assistant.c:313
+#: ../sflphone-gtk/src/assistant.c:341 ../sflphone-gtk/src/configwindow.c:821
+msgid "Network Address Translation"
+msgstr "Network Address Translation (NAT)"
+
+#: ../sflphone-gtk/src/assistant.c:341
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
 
-#: ../sflphone-gtk/src/assistant.c:329
+#: ../sflphone-gtk/src/assistant.c:350 ../sflphone-gtk/src/configwindow.c:496
+msgid "E_nable STUN"
+msgstr "STUN Ei_nschalten"
+
+#: ../sflphone-gtk/src/assistant.c:357
 msgid "_STUN server"
 msgstr "_STUN Server"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Account Registration"
 msgstr "Konto Registrierung"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Congratulations!"
 msgstr "Gratulation!"
 
-#: ../sflphone-gtk/src/assistant.c:348
+#: ../sflphone-gtk/src/assistant.c:376
 msgid ""
 "This assistant is now finished.\n"
 "\n"
@@ -226,193 +227,229 @@ msgstr ""
 "Sie können jederzeit Ihres Registrierungsstatus überprüfen oder Ihre "
 "Kontoparameter ändern (Optionen/Konten)."
 
-#: ../sflphone-gtk/src/audioconf.c:150
+#: ../sflphone-gtk/src/audioconf.c:154
 #, c-format
 msgid "audio device index for output = %d\n"
 msgstr "\"Audio device index\" für Ausgabe = %d\n"
 
-#: ../sflphone-gtk/src/audioconf.c:558
+#: ../sflphone-gtk/src/audioconf.c:562
 msgid "Name"
 msgstr "Name"
 
-#: ../sflphone-gtk/src/audioconf.c:563
+#: ../sflphone-gtk/src/audioconf.c:567
 msgid "Frequency"
 msgstr "Frequenz"
 
-#: ../sflphone-gtk/src/audioconf.c:568
+#: ../sflphone-gtk/src/audioconf.c:572
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../sflphone-gtk/src/audioconf.c:573
+#: ../sflphone-gtk/src/audioconf.c:577
 msgid "Bandwidth"
 msgstr "Bandbreite"
 
-#: ../sflphone-gtk/src/audioconf.c:633
+#: ../sflphone-gtk/src/audioconf.c:637
 msgid "Pulseaudio"
 msgstr "Pulseaudio"
 
-#: ../sflphone-gtk/src/audioconf.c:636
+#: ../sflphone-gtk/src/audioconf.c:640
 msgid "ALSA"
 msgstr "ALSA"
 
-#: ../sflphone-gtk/src/audioconf.c:662
+#: ../sflphone-gtk/src/audioconf.c:666
 msgid "ALSA plugin"
 msgstr "ALSA Plugin"
 
-#: ../sflphone-gtk/src/audioconf.c:684
+#: ../sflphone-gtk/src/audioconf.c:688
 msgid "Output"
 msgstr "Ausgabe"
 
-#: ../sflphone-gtk/src/audioconf.c:706
+#: ../sflphone-gtk/src/audioconf.c:710
 msgid "Input"
 msgstr "Eingabe"
 
-#: ../sflphone-gtk/src/audioconf.c:739
+#: ../sflphone-gtk/src/audioconf.c:743
 msgid "_Enable ringtones"
 msgstr "Klingeltöne _einschalten"
 
-#: ../sflphone-gtk/src/audioconf.c:744
+#: ../sflphone-gtk/src/audioconf.c:748
 msgid "Choose a ringtone"
 msgstr "Klingelton auswählen"
 
-#: ../sflphone-gtk/src/audioconf.c:749
+#: ../sflphone-gtk/src/audioconf.c:753
 msgid "Audio Files"
 msgstr "Audio Dateien"
 
-#: ../sflphone-gtk/src/audioconf.c:774
+#: ../sflphone-gtk/src/audioconf.c:770
+msgid "_Activate silence detection"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:798
 msgid "Sound Manager"
 msgstr "Sound Manager"
 
-#: ../sflphone-gtk/src/audioconf.c:781
+#: ../sflphone-gtk/src/audioconf.c:805
 msgid "ALSA configuration"
 msgstr "ALSA Konfiguration"
 
-#: ../sflphone-gtk/src/audioconf.c:791
+#: ../sflphone-gtk/src/audioconf.c:815
 msgid "Codecs"
 msgstr "Codecs"
 
-#: ../sflphone-gtk/src/audioconf.c:799
+#: ../sflphone-gtk/src/audioconf.c:823
+msgid "Noise reduction"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:830
 msgid "Ringtones"
 msgstr "Klingeltöne"
 
-#: ../sflphone-gtk/src/calltree.c:208
+#: ../sflphone-gtk/src/calltree.c:209
 #, c-format
 msgid "\"Voicemail\" <%s>"
 msgstr "\"Voicemail\" <%s>"
 
-#: ../sflphone-gtk/src/calltree.c:405 ../sflphone-gtk/src/calltree.c:407
+#: ../sflphone-gtk/src/calltree.c:431 ../sflphone-gtk/src/calltree.c:433
 msgid "Place a call"
 msgstr "Anrufen"
 
-#: ../sflphone-gtk/src/calltree.c:414 ../sflphone-gtk/src/calltree.c:416
+#: ../sflphone-gtk/src/calltree.c:440 ../sflphone-gtk/src/calltree.c:442
 msgid "Pick up"
 msgstr "Abnehmen"
 
-#: ../sflphone-gtk/src/calltree.c:424 ../sflphone-gtk/src/calltree.c:426
+#: ../sflphone-gtk/src/calltree.c:450 ../sflphone-gtk/src/calltree.c:452
 msgid "Hang up"
 msgstr "Auflegen"
 
-#: ../sflphone-gtk/src/calltree.c:434 ../sflphone-gtk/src/calltree.c:436
+#: ../sflphone-gtk/src/calltree.c:460 ../sflphone-gtk/src/calltree.c:462
 msgid "Off Hold"
 msgstr "Aus Warteschleife"
 
-#: ../sflphone-gtk/src/calltree.c:445 ../sflphone-gtk/src/calltree.c:447
+#: ../sflphone-gtk/src/calltree.c:471 ../sflphone-gtk/src/calltree.c:473
 msgid "On Hold"
 msgstr "In Warteschleife"
 
-#: ../sflphone-gtk/src/calltree.c:458 ../sflphone-gtk/src/calltree.c:460
+#: ../sflphone-gtk/src/calltree.c:484 ../sflphone-gtk/src/calltree.c:486
 msgid "Transfer"
 msgstr "Weiterleiten"
 
-#: ../sflphone-gtk/src/calltree.c:470 ../sflphone-gtk/src/calltree.c:472
+#: ../sflphone-gtk/src/calltree.c:496 ../sflphone-gtk/src/calltree.c:498
 msgid "History"
 msgstr "Vorherige Anrufe"
 
-#: ../sflphone-gtk/src/calltree.c:480 ../sflphone-gtk/src/calltree.c:484
+#: ../sflphone-gtk/src/calltree.c:506 ../sflphone-gtk/src/calltree.c:510
 msgid "Voicemail"
 msgstr "Voicemail"
 
-#: ../sflphone-gtk/src/configwindow.c:371
+#: ../sflphone-gtk/src/calltree.c:521
+msgid "Record a call"
+msgstr "Gespräch aufzeichnen"
+
+#: ../sflphone-gtk/src/configwindow.c:382
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../sflphone-gtk/src/configwindow.c:378
+#: ../sflphone-gtk/src/configwindow.c:389
 msgid "Status"
 msgstr "Status"
 
-#: ../sflphone-gtk/src/configwindow.c:470
+#: ../sflphone-gtk/src/configwindow.c:492
+msgid "Stun parameters will apply to each SIP account created."
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:500
+msgid "Enable it if you are behind a firewall"
+msgstr "Einschalten falls Sie hinter einer Firewall sind"
+
+#: ../sflphone-gtk/src/configwindow.c:508
+msgid "Format: name.server:port"
+msgstr "Format: Name.Server:Port"
+
+#: ../sflphone-gtk/src/configwindow.c:558
 msgid "Desktop Notification"
 msgstr "Desktopbenachrichtigung"
 
-#: ../sflphone-gtk/src/configwindow.c:478
+#: ../sflphone-gtk/src/configwindow.c:566
 msgid "_Enable"
 msgstr "_Einschalten"
 
-#: ../sflphone-gtk/src/configwindow.c:483
+#: ../sflphone-gtk/src/configwindow.c:571
 msgid "_Notify voice mails"
 msgstr "_Benachrichtigung für Voice Nachrichten"
 
-#: ../sflphone-gtk/src/configwindow.c:489
+#: ../sflphone-gtk/src/configwindow.c:577
 msgid "System Tray Icon"
 msgstr "Benachrichtigungsfeld (\"System Tray\") Icon"
 
-#: ../sflphone-gtk/src/configwindow.c:497
+#: ../sflphone-gtk/src/configwindow.c:585
 msgid "_Popup main window on incoming call"
 msgstr "Hauptfenster anzeigen wenn eingehendes Gespräch"
 
-#: ../sflphone-gtk/src/configwindow.c:502
+#: ../sflphone-gtk/src/configwindow.c:590
 msgid "Ne_ver popup main window"
 msgstr "_Hauptfenster nie anzeigen"
 
-#: ../sflphone-gtk/src/configwindow.c:506
+#: ../sflphone-gtk/src/configwindow.c:594
 msgid "_Start hidden"
 msgstr "_Unsichtbar beim Start"
 
-#: ../sflphone-gtk/src/configwindow.c:512
+#: ../sflphone-gtk/src/configwindow.c:600
 msgid "Calls History"
 msgstr "Liste der vorherigen Anrufen"
 
-#: ../sflphone-gtk/src/configwindow.c:520
+#: ../sflphone-gtk/src/configwindow.c:608
 msgid "_Maximum number of calls"
 msgstr "_maximale Anzahl von Anrufen"
 
-#: ../sflphone-gtk/src/configwindow.c:536
+#: ../sflphone-gtk/src/configwindow.c:624
 msgid "PulseAudio sound server"
 msgstr "PulseAudio Sound Server"
 
-#: ../sflphone-gtk/src/configwindow.c:544
+#: ../sflphone-gtk/src/configwindow.c:632
 msgid "_Control running applications volume"
 msgstr "Lautstärke für laufende Anwendungen _einstellen"
 
-#: ../sflphone-gtk/src/configwindow.c:557
+#: ../sflphone-gtk/src/configwindow.c:645
 msgid "SIP Port"
 msgstr "SIP Port"
 
-#: ../sflphone-gtk/src/configwindow.c:566
-msgid "Apply"
-msgstr "übernehmen"
-
-#: ../sflphone-gtk/src/configwindow.c:570
+#: ../sflphone-gtk/src/configwindow.c:658
 msgid "Port:"
 msgstr "Port:"
 
-#: ../sflphone-gtk/src/configwindow.c:600
+#: ../sflphone-gtk/src/configwindow.c:703
+msgid "General"
+msgstr "Allgemein"
+
+#: ../sflphone-gtk/src/configwindow.c:714
+msgid "_Destination folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:719
+msgid "Select a folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:744
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../sflphone-gtk/src/configwindow.c:620
+#: ../sflphone-gtk/src/configwindow.c:764
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: ../sflphone-gtk/src/configwindow.c:625
+#: ../sflphone-gtk/src/configwindow.c:769
 msgid "Audio Settings"
 msgstr "Audio Einstellungen"
 
-#: ../sflphone-gtk/src/configwindow.c:649
+#: ../sflphone-gtk/src/configwindow.c:774
+msgid "Record"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:798
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../sflphone-gtk/src/configwindow.c:661
+#: ../sflphone-gtk/src/configwindow.c:810
 msgid "Accounts previously setup"
 msgstr "Zuvor eingestellte Konten"
 
@@ -446,97 +483,89 @@ msgstr ""
 "\n"
 "Pulseaudio nicht gestartet"
 
-#: ../sflphone-gtk/src/historyfilter.c:45
-#: ../sflphone-gtk/src/historyfilter.c:63
-#: ../sflphone-gtk/src/historyfilter.c:78
+#: ../sflphone-gtk/src/historyfilter.c:49
+#: ../sflphone-gtk/src/historyfilter.c:68
+#: ../sflphone-gtk/src/historyfilter.c:83
 msgid "Search"
 msgstr "Suchen"
 
 #: ../sflphone-gtk/src/mainwindow.c:69
-msgid ""
-"<b>There is one call in progress.</b>\n"
-"Do you still want to quit?"
-msgstr ""
-"<b>Laufender Anruf.</b>\n"
-"Möchten Sie doch schliessen?"
+msgid "There is one call in progress."
+msgstr "Laufender Anruf."
 
 #: ../sflphone-gtk/src/mainwindow.c:73
-msgid ""
-"<b>There are calls in progress.</b>\n"
-"Do you still want to quit?"
+msgid "There are calls in progress."
+msgstr "Laufende Anrufe."
+
+#: ../sflphone-gtk/src/mainwindow.c:82
+msgid "Do you still want to quit?"
 msgstr ""
-"<b>Laufende Anrufe.</b>\n"
-"Möchten Sie doch schliessen?"
 
-#: ../sflphone-gtk/src/menus.c:130
+#: ../sflphone-gtk/src/menus.c:135
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone ist ein VoIP Client (kompatibel mit SIP und IAX2 Protokolle)"
 
-#: ../sflphone-gtk/src/menus.c:133
+#: ../sflphone-gtk/src/menus.c:138
 msgid "About SFLphone"
 msgstr "Über SFLphone"
 
-#: ../sflphone-gtk/src/menus.c:156
+#: ../sflphone-gtk/src/menus.c:161
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../sflphone-gtk/src/menus.c:273
+#: ../sflphone-gtk/src/menus.c:278
 msgid "_New call"
 msgstr "_Neuer Anruf"
 
-#: ../sflphone-gtk/src/menus.c:285 ../sflphone-gtk/src/menus.c:769
+#: ../sflphone-gtk/src/menus.c:290 ../sflphone-gtk/src/menus.c:760
 msgid "_Pick up"
 msgstr "_Abnehmen"
 
-#: ../sflphone-gtk/src/menus.c:295 ../sflphone-gtk/src/menus.c:781
+#: ../sflphone-gtk/src/menus.c:300 ../sflphone-gtk/src/menus.c:772
 msgid "_Hang up"
 msgstr "A_uflegen"
 
-#: ../sflphone-gtk/src/menus.c:305 ../sflphone-gtk/src/menus.c:793
+#: ../sflphone-gtk/src/menus.c:310 ../sflphone-gtk/src/menus.c:784
 msgid "On _Hold"
 msgstr "in _Warteschleife"
 
-#: ../sflphone-gtk/src/menus.c:321
+#: ../sflphone-gtk/src/menus.c:326
 msgid "_Account Assistant"
 msgstr "_Konto Setup Assistent"
 
-#: ../sflphone-gtk/src/menus.c:351
+#: ../sflphone-gtk/src/menus.c:356
 msgid "_Call"
 msgstr "_Anruf"
 
-#: ../sflphone-gtk/src/menus.c:497
-msgid "History empty"
-msgstr "Liste der vorherigen Anrufen is leer"
-
-#: ../sflphone-gtk/src/menus.c:538
+#: ../sflphone-gtk/src/menus.c:529
 msgid "_Clear history"
 msgstr "Liste der vorherigen Anrufen _leeren"
 
-#: ../sflphone-gtk/src/menus.c:550
+#: ../sflphone-gtk/src/menus.c:541
 msgid "_Accounts"
 msgstr "_Konten"
 
-#: ../sflphone-gtk/src/menus.c:565
+#: ../sflphone-gtk/src/menus.c:556
 msgid "_Edit"
 msgstr "_Editieren"
 
-#: ../sflphone-gtk/src/menus.c:625
+#: ../sflphone-gtk/src/menus.c:616
 msgid "_Dialpad"
 msgstr "_Wählscheibe"
 
-#: ../sflphone-gtk/src/menus.c:637
+#: ../sflphone-gtk/src/menus.c:628
 msgid "_Volume controls"
 msgstr "Lautstärke Kontrollen"
 
-#: ../sflphone-gtk/src/menus.c:646
+#: ../sflphone-gtk/src/menus.c:637
 msgid "_Search history"
 msgstr "In vorherige Anrufen _suchen"
 
-#: ../sflphone-gtk/src/menus.c:654
+#: ../sflphone-gtk/src/menus.c:645
 msgid "_View"
 msgstr "_Anzeigen"
 
-#: ../sflphone-gtk/src/menus.c:876
+#: ../sflphone-gtk/src/menus.c:867
 msgid "_Call back"
 msgstr "_zurückrufen"
 
@@ -609,3 +638,12 @@ msgstr "<small>Anruf verpasst</small>"
 #, c-format
 msgid "<small>Duration:</small> %s"
 msgstr "<small>Dauer:</small> %s"
+
+#~ msgid "_STUN Server"
+#~ msgstr "_STUN Server"
+
+#~ msgid "Apply"
+#~ msgstr "übernehmen"
+
+#~ msgid "History empty"
+#~ msgstr "Liste der vorherigen Anrufen is leer"
diff --git a/po/es.po b/po/es.po
index 847583b1031752542d1ea9bb30598153510420ad..e8211757fea3121d17237e4f7460c5dd7a96c0eb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
-"Report-Msgid-Bugs-To: sflphoneteam@savoirfairelinux.com\n"
-"POT-Creation-Date: 2008-11-05 16:41-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-10 15:24-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"
@@ -44,12 +44,10 @@ msgid "Network unreachable"
 msgstr ""
 
 #: ../sflphone-gtk/src/accountlist.c:176
-#, fuzzy
 msgid "Host unreachable"
 msgstr "_Parte del servidor"
 
 #: ../sflphone-gtk/src/accountlist.c:179
-#, fuzzy
 msgid "Stun configuration error"
 msgstr "Error de configuración Stun"
 
@@ -61,70 +59,50 @@ msgstr "Servidor stun inválido"
 msgid "Invalid"
 msgstr "Inválido"
 
-#: ../sflphone-gtk/src/accountwindow.c:143
+#: ../sflphone-gtk/src/accountwindow.c:109
 msgid "Account settings"
 msgstr "Configuración de cuentas"
 
-#: ../sflphone-gtk/src/accountwindow.c:155
+#: ../sflphone-gtk/src/accountwindow.c:121
 msgid "Account parameters"
 msgstr "Paràmetros de cuenta"
 
-#: ../sflphone-gtk/src/accountwindow.c:177
+#: ../sflphone-gtk/src/accountwindow.c:143
 msgid "_Enabled"
 msgstr "_Activado"
 
-#: ../sflphone-gtk/src/accountwindow.c:183 ../sflphone-gtk/src/assistant.c:210
-#: ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/accountwindow.c:149 ../sflphone-gtk/src/assistant.c:238
+#: ../sflphone-gtk/src/assistant.c:292
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../sflphone-gtk/src/accountwindow.c:191
+#: ../sflphone-gtk/src/accountwindow.c:157
 msgid "_Protocol"
 msgstr "_Protocolo"
 
-#: ../sflphone-gtk/src/accountwindow.c:209
+#: ../sflphone-gtk/src/accountwindow.c:175
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../sflphone-gtk/src/accountwindow.c:219 ../sflphone-gtk/src/assistant.c:218
-#: ../sflphone-gtk/src/assistant.c:272
+#: ../sflphone-gtk/src/accountwindow.c:185 ../sflphone-gtk/src/assistant.c:246
+#: ../sflphone-gtk/src/assistant.c:300
 msgid "_Host name"
 msgstr "_Nombre de equipo"
 
-#: ../sflphone-gtk/src/accountwindow.c:227 ../sflphone-gtk/src/assistant.c:226
-#: ../sflphone-gtk/src/assistant.c:280
+#: ../sflphone-gtk/src/accountwindow.c:193 ../sflphone-gtk/src/assistant.c:254
+#: ../sflphone-gtk/src/assistant.c:308
 msgid "_User name"
 msgstr "_Usuario"
 
-#: ../sflphone-gtk/src/accountwindow.c:238 ../sflphone-gtk/src/assistant.c:236
-#: ../sflphone-gtk/src/assistant.c:290
+#: ../sflphone-gtk/src/accountwindow.c:204 ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/assistant.c:318
 msgid "_Password"
 msgstr "_Contraseña"
 
-#: ../sflphone-gtk/src/accountwindow.c:249
+#: ../sflphone-gtk/src/accountwindow.c:215
 msgid "_Voicemail box #"
 msgstr "_Número de buzón de voz"
 
-#: ../sflphone-gtk/src/accountwindow.c:260 ../sflphone-gtk/src/assistant.c:313
-msgid "Network Address Translation"
-msgstr "Conversión de Dirección de Red (NAT)"
-
-#: ../sflphone-gtk/src/accountwindow.c:271 ../sflphone-gtk/src/assistant.c:322
-msgid "E_nable STUN"
-msgstr "A_ctivar STUN"
-
-#: ../sflphone-gtk/src/accountwindow.c:275
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
-msgstr "Actívelo si está detrás de un cortafuegos, después reinicie SFLphone"
-
-#: ../sflphone-gtk/src/accountwindow.c:279
-msgid "_STUN Server"
-msgstr "_Servidor STUN"
-
-#: ../sflphone-gtk/src/accountwindow.c:286
-msgid "Format: name.server:port"
-msgstr "Formato: nombre.servidor:puerto"
-
 #: ../sflphone-gtk/src/actions.c:57 ../sflphone-gtk/src/sflnotify.c:103
 #, c-format
 msgid "%d voice mails"
@@ -136,12 +114,10 @@ msgid "%d voice mail"
 msgstr "%d mensaje de voz"
 
 #: ../sflphone-gtk/src/actions.c:80
-#, fuzzy, c-format
 msgid "%s account- %s"
 msgstr "%s cuenta: %s"
 
-#: ../sflphone-gtk/src/actions.c:229
-#, fuzzy
+#: ../sflphone-gtk/src/actions.c:224
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -149,7 +125,7 @@ msgstr ""
 "Incapaz de conectar con el servidor SFLphone.\n"
 " Asegúrese de que el demonio esté funcionando."
 
-#: ../sflphone-gtk/src/actions.c:756
+#: ../sflphone-gtk/src/actions.c:798
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -162,61 +138,83 @@ msgstr ""
 "</b> Los codecs de audio de SFLphone deben estar en <i>%s</i> o en el "
 "directorio <b>.sflphone</b> de su home( <i>%s</i> )"
 
-#: ../sflphone-gtk/src/assistant.c:138
+#: ../sflphone-gtk/src/assistant.c:148
 msgid "SFLphone account configuration wizard"
 msgstr "Asistente de configuración de cuentas de SFLphone"
 
-#: ../sflphone-gtk/src/assistant.c:165
-#, fuzzy
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "SFLphone 0.9.2"
-msgstr "Sobre SFLphone"
+msgstr "SFLphone 0.9.3"
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "Welcome to SFLphone!"
 msgstr "¡Bienvenido a SFLphone!"
 
-#: ../sflphone-gtk/src/assistant.c:167
+#: ../sflphone-gtk/src/assistant.c:178
 msgid "This installation wizard will help you configure an account."
 msgstr "Este asistente de instalación le ayudará a configurar una cuenta."
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "VoIP Protocols"
 msgstr "Protocolos VoIP"
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "Select an account type:"
 msgstr "Escoja un tipo de cuenta:"
 
-#: ../sflphone-gtk/src/assistant.c:202
+#: ../sflphone-gtk/src/assistant.c:211
+msgid "Account"
+msgstr "Cuentas"
+
+#: ../sflphone-gtk/src/assistant.c:211
+msgid "Please select one of the following option:"
+msgstr "Por favor, rellene la siguiente información:"
+
+#: ../sflphone-gtk/src/assistant.c:213
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org"
+
+#: ../sflphone-gtk/src/assistant.c:215
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Registrar una cuenta SIP o IAX@ existente"
+
+#: ../sflphone-gtk/src/assistant.c:230
 msgid "SIP account configuration"
 msgstr "Configuración de cuenta SIP"
 
-#: ../sflphone-gtk/src/assistant.c:202 ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:230 ../sflphone-gtk/src/assistant.c:284
 msgid "Please fill the following information:"
 msgstr "Por favor, rellene la siguiente información:"
 
-#: ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:284
 msgid "IAX2 account configuration"
 msgstr "Configuración de cuenta IAX2"
 
-#: ../sflphone-gtk/src/assistant.c:313
+#: ../sflphone-gtk/src/assistant.c:341 ../sflphone-gtk/src/configwindow.c:821
+msgid "Network Address Translation"
+msgstr "Conversión de Dirección de Red (NAT)"
+
+#: ../sflphone-gtk/src/assistant.c:341
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Probablemente tiene que activar esto si está detrás de un cortafuegos."
 
-#: ../sflphone-gtk/src/assistant.c:329
-#, fuzzy
+#: ../sflphone-gtk/src/assistant.c:350 ../sflphone-gtk/src/configwindow.c:496
+msgid "E_nable STUN"
+msgstr "A_ctivar STUN"
+
+#: ../sflphone-gtk/src/assistant.c:357
 msgid "_STUN server"
 msgstr "_Servidor STUN"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Account Registration"
 msgstr "Registro de cuenta"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Congratulations!"
 msgstr "¡Enhorabuena!"
 
-#: ../sflphone-gtk/src/assistant.c:348
+#: ../sflphone-gtk/src/assistant.c:376
 msgid ""
 "This assistant is now finished.\n"
 "\n"
@@ -228,202 +226,228 @@ msgstr ""
 "Puede comprobar en cualquier momento su estado de registro o modificar la "
 "configuración de sus cuentas en la ventana de Opciones/Cuentas."
 
-#: ../sflphone-gtk/src/audioconf.c:150
+#: ../sflphone-gtk/src/audioconf.c:154
 #, c-format
 msgid "audio device index for output = %d\n"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:558
+#: ../sflphone-gtk/src/audioconf.c:562
 msgid "Name"
 msgstr "Nombre"
 
-#: ../sflphone-gtk/src/audioconf.c:563
+#: ../sflphone-gtk/src/audioconf.c:567
 msgid "Frequency"
 msgstr "Frecuencia"
 
-#: ../sflphone-gtk/src/audioconf.c:568
+#: ../sflphone-gtk/src/audioconf.c:572
 msgid "Bitrate"
 msgstr "Tasa de transferencia"
 
-#: ../sflphone-gtk/src/audioconf.c:573
+#: ../sflphone-gtk/src/audioconf.c:577
 msgid "Bandwidth"
 msgstr "Ancho de banda"
 
-#: ../sflphone-gtk/src/audioconf.c:633
+#: ../sflphone-gtk/src/audioconf.c:637
 msgid "Pulseaudio"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:636
+#: ../sflphone-gtk/src/audioconf.c:640
 msgid "ALSA"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:662
+#: ../sflphone-gtk/src/audioconf.c:666
 msgid "ALSA plugin"
 msgstr "Plugin ALSA"
 
-#: ../sflphone-gtk/src/audioconf.c:684
+#: ../sflphone-gtk/src/audioconf.c:688
 msgid "Output"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:706
+#: ../sflphone-gtk/src/audioconf.c:710
 msgid "Input"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:739
+#: ../sflphone-gtk/src/audioconf.c:743
 msgid "_Enable ringtones"
 msgstr "_Habilitar tonos de llamada"
 
-#: ../sflphone-gtk/src/audioconf.c:744
+#: ../sflphone-gtk/src/audioconf.c:748
 msgid "Choose a ringtone"
 msgstr "Elija un tono de llmada"
 
-#: ../sflphone-gtk/src/audioconf.c:749
+#: ../sflphone-gtk/src/audioconf.c:753
 msgid "Audio Files"
 msgstr "Archivos de Audio"
 
-#: ../sflphone-gtk/src/audioconf.c:774
+#: ../sflphone-gtk/src/audioconf.c:770
+msgid "_Activate silence detection"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:798
 msgid "Sound Manager"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:781
-#, fuzzy
+#: ../sflphone-gtk/src/audioconf.c:805
 msgid "ALSA configuration"
 msgstr "Configuraciòn de cuenta SIP"
 
-#: ../sflphone-gtk/src/audioconf.c:791
+#: ../sflphone-gtk/src/audioconf.c:815
 msgid "Codecs"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:799
-#, fuzzy
+#: ../sflphone-gtk/src/audioconf.c:823
+msgid "Noise reduction"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:830
 msgid "Ringtones"
 msgstr "_Permitir los ringtones"
 
-#: ../sflphone-gtk/src/calltree.c:208
-#, fuzzy, c-format
+#: ../sflphone-gtk/src/calltree.c:209
 msgid "\"Voicemail\" <%s>"
 msgstr "_Numero de Caja de Voz"
 
-#: ../sflphone-gtk/src/calltree.c:405 ../sflphone-gtk/src/calltree.c:407
+#: ../sflphone-gtk/src/calltree.c:431 ../sflphone-gtk/src/calltree.c:433
 msgid "Place a call"
 msgstr "Llamar"
 
-#: ../sflphone-gtk/src/calltree.c:414 ../sflphone-gtk/src/calltree.c:416
+#: ../sflphone-gtk/src/calltree.c:440 ../sflphone-gtk/src/calltree.c:442
 msgid "Pick up"
 msgstr "Descolgar"
 
-#: ../sflphone-gtk/src/calltree.c:424 ../sflphone-gtk/src/calltree.c:426
+#: ../sflphone-gtk/src/calltree.c:450 ../sflphone-gtk/src/calltree.c:452
 msgid "Hang up"
 msgstr "Colgar"
 
-#: ../sflphone-gtk/src/calltree.c:434 ../sflphone-gtk/src/calltree.c:436
+#: ../sflphone-gtk/src/calltree.c:460 ../sflphone-gtk/src/calltree.c:462
 msgid "Off Hold"
 msgstr "Seguir"
 
-#: ../sflphone-gtk/src/calltree.c:445 ../sflphone-gtk/src/calltree.c:447
+#: ../sflphone-gtk/src/calltree.c:471 ../sflphone-gtk/src/calltree.c:473
 msgid "On Hold"
 msgstr "Retener"
 
-#: ../sflphone-gtk/src/calltree.c:458 ../sflphone-gtk/src/calltree.c:460
+#: ../sflphone-gtk/src/calltree.c:484 ../sflphone-gtk/src/calltree.c:486
 msgid "Transfer"
 msgstr "Transferir"
 
-#: ../sflphone-gtk/src/calltree.c:470 ../sflphone-gtk/src/calltree.c:472
-#, fuzzy
+#: ../sflphone-gtk/src/calltree.c:496 ../sflphone-gtk/src/calltree.c:498
 msgid "History"
 msgstr "Historia de Llamada"
 
-#: ../sflphone-gtk/src/calltree.c:480 ../sflphone-gtk/src/calltree.c:484
-#, fuzzy
+#: ../sflphone-gtk/src/calltree.c:506 ../sflphone-gtk/src/calltree.c:510
 msgid "Voicemail"
 msgstr "%d mensaje"
 
-#: ../sflphone-gtk/src/configwindow.c:371
+#: ../sflphone-gtk/src/calltree.c:521
+msgid "Record a call"
+msgstr "Registrar una llamada"
+
+#: ../sflphone-gtk/src/configwindow.c:382
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../sflphone-gtk/src/configwindow.c:378
+#: ../sflphone-gtk/src/configwindow.c:389
 msgid "Status"
 msgstr "Estado"
 
-#: ../sflphone-gtk/src/configwindow.c:470
+#: ../sflphone-gtk/src/configwindow.c:492
+msgid "Stun parameters will apply to each SIP account created."
+msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada."
+
+#: ../sflphone-gtk/src/configwindow.c:500
+msgid "Enable it if you are behind a firewall"
+msgstr "Actívelo si está detrás de un cortafuegos, después reinicie SFLphone"
+
+#: ../sflphone-gtk/src/configwindow.c:508
+msgid "Format: name.server:port"
+msgstr "Formato: nombre.servidor:puerto"
+
+#: ../sflphone-gtk/src/configwindow.c:558
 msgid "Desktop Notification"
 msgstr "Notificación de escritorio"
 
-#: ../sflphone-gtk/src/configwindow.c:478
+#: ../sflphone-gtk/src/configwindow.c:566
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../sflphone-gtk/src/configwindow.c:483
-#, fuzzy
+#: ../sflphone-gtk/src/configwindow.c:571
 msgid "_Notify voice mails"
 msgstr "_Notificar mensajes de voz"
 
-#: ../sflphone-gtk/src/configwindow.c:489
+#: ../sflphone-gtk/src/configwindow.c:577
 msgid "System Tray Icon"
 msgstr "Icono de bandeja del sistema"
 
-#: ../sflphone-gtk/src/configwindow.c:497
-#, fuzzy
+#: ../sflphone-gtk/src/configwindow.c:585
 msgid "_Popup main window on incoming call"
 msgstr "_Popup ventana principal al recibir llamadas"
 
-#: ../sflphone-gtk/src/configwindow.c:502
-#, fuzzy
+#: ../sflphone-gtk/src/configwindow.c:590
 msgid "Ne_ver popup main window"
 msgstr "_Nunca mostrar ventana principal"
 
-#: ../sflphone-gtk/src/configwindow.c:506
-#, fuzzy
+#: ../sflphone-gtk/src/configwindow.c:594
 msgid "_Start hidden"
 msgstr "_Iniciar oculto"
 
-#: ../sflphone-gtk/src/configwindow.c:512
+#: ../sflphone-gtk/src/configwindow.c:600
 msgid "Calls History"
 msgstr "Historial de llamadas"
 
-#: ../sflphone-gtk/src/configwindow.c:520
+#: ../sflphone-gtk/src/configwindow.c:608
 msgid "_Maximum number of calls"
 msgstr "_Numero maximo de llamadas"
 
-#: ../sflphone-gtk/src/configwindow.c:536
+#: ../sflphone-gtk/src/configwindow.c:624
 msgid "PulseAudio sound server"
-msgstr ""
+msgstr "Servidor de sonido Pulseaudio"
 
-#: ../sflphone-gtk/src/configwindow.c:544
+#: ../sflphone-gtk/src/configwindow.c:632
 msgid "_Control running applications volume"
-msgstr ""
+msgstr "_Control del volumen de las applicaciones en curso"
 
-#: ../sflphone-gtk/src/configwindow.c:557
+#: ../sflphone-gtk/src/configwindow.c:645
 msgid "SIP Port"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:566
-msgid "Apply"
+#: ../sflphone-gtk/src/configwindow.c:658
+msgid "Port:"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:570
-msgid "Port:"
+#: ../sflphone-gtk/src/configwindow.c:703
+msgid "General"
+msgstr "Configuración"
+
+#: ../sflphone-gtk/src/configwindow.c:714
+msgid "_Destination folder"
+msgstr "_Carpeta de destinación"
+
+#: ../sflphone-gtk/src/configwindow.c:719
+msgid "Select a folder"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:600
+#: ../sflphone-gtk/src/configwindow.c:744
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../sflphone-gtk/src/configwindow.c:620
-#, fuzzy
+#: ../sflphone-gtk/src/configwindow.c:764
 msgid "General Settings"
-msgstr "Configuración Audio"
+msgstr "Configuración"
 
-#: ../sflphone-gtk/src/configwindow.c:625
+#: ../sflphone-gtk/src/configwindow.c:769
 msgid "Audio Settings"
 msgstr "Configuración de audio"
 
-#: ../sflphone-gtk/src/configwindow.c:649
+#: ../sflphone-gtk/src/configwindow.c:774
+msgid "Record"
+msgstr "Registrar"
+
+#: ../sflphone-gtk/src/configwindow.c:798
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../sflphone-gtk/src/configwindow.c:661
+#: ../sflphone-gtk/src/configwindow.c:810
 msgid "Accounts previously setup"
 msgstr "Cuentas existentes"
 
@@ -453,97 +477,94 @@ msgid ""
 "\n"
 "Pulseaudio is not running"
 msgstr ""
+"<b>Notificación de Pulseaudio</b>\n"
+"\n"
+"Pulseaudio no está funcionando"
 
-#: ../sflphone-gtk/src/historyfilter.c:45
-#: ../sflphone-gtk/src/historyfilter.c:63
-#: ../sflphone-gtk/src/historyfilter.c:78
+#: ../sflphone-gtk/src/historyfilter.c:49
+#: ../sflphone-gtk/src/historyfilter.c:68
+#: ../sflphone-gtk/src/historyfilter.c:83
 msgid "Search"
-msgstr ""
+msgstr "Buscar"
 
 #: ../sflphone-gtk/src/mainwindow.c:69
-msgid ""
-"<b>There is one call in progress.</b>\n"
-"Do you still want to quit?"
-msgstr ""
+msgid "There is one call in progress."
+msgstr "No hay llamada en curso"
 
 #: ../sflphone-gtk/src/mainwindow.c:73
-msgid ""
-"<b>There are calls in progress.</b>\n"
-"Do you still want to quit?"
-msgstr ""
+msgid "There are calls in progress."
+msgstr "Hay llamadas en curso."
 
-#: ../sflphone-gtk/src/menus.c:130
+#: ../sflphone-gtk/src/mainwindow.c:82
+msgid "Do you still want to quit?"
+msgstr "Sin embargo quiere parar ?"
+
+#: ../sflphone-gtk/src/menus.c:135
 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"
 
-#: ../sflphone-gtk/src/menus.c:133
+#: ../sflphone-gtk/src/menus.c:138
 msgid "About SFLphone"
 msgstr "Sobre SFLphone"
 
-#: ../sflphone-gtk/src/menus.c:156
+#: ../sflphone-gtk/src/menus.c:161
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../sflphone-gtk/src/menus.c:273
+#: ../sflphone-gtk/src/menus.c:278
 msgid "_New call"
 msgstr "_Nueva llamada"
 
-#: ../sflphone-gtk/src/menus.c:285 ../sflphone-gtk/src/menus.c:769
+#: ../sflphone-gtk/src/menus.c:290 ../sflphone-gtk/src/menus.c:760
 msgid "_Pick up"
 msgstr "_Descolgar"
 
-#: ../sflphone-gtk/src/menus.c:295 ../sflphone-gtk/src/menus.c:781
+#: ../sflphone-gtk/src/menus.c:300 ../sflphone-gtk/src/menus.c:772
 msgid "_Hang up"
 msgstr "_Colgar"
 
-#: ../sflphone-gtk/src/menus.c:305 ../sflphone-gtk/src/menus.c:793
+#: ../sflphone-gtk/src/menus.c:310 ../sflphone-gtk/src/menus.c:784
 msgid "On _Hold"
 msgstr "En _Espera"
 
-#: ../sflphone-gtk/src/menus.c:321
+#: ../sflphone-gtk/src/menus.c:326
 msgid "_Account Assistant"
 msgstr "_Asistente de Cuenta"
 
-#: ../sflphone-gtk/src/menus.c:351
+#: ../sflphone-gtk/src/menus.c:356
 msgid "_Call"
 msgstr "_Llamar"
 
-#: ../sflphone-gtk/src/menus.c:497
-msgid "History empty"
-msgstr ""
-
-#: ../sflphone-gtk/src/menus.c:538
-#, fuzzy
+#: ../sflphone-gtk/src/menus.c:529
 msgid "_Clear history"
 msgstr "Historia de Llamada"
 
-#: ../sflphone-gtk/src/menus.c:550
+#: ../sflphone-gtk/src/menus.c:541
 msgid "_Accounts"
 msgstr "_Cuentas"
 
-#: ../sflphone-gtk/src/menus.c:565
+#: ../sflphone-gtk/src/menus.c:556
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../sflphone-gtk/src/menus.c:625
+#: ../sflphone-gtk/src/menus.c:616
 msgid "_Dialpad"
 msgstr "_Teclado numérico"
 
-#: ../sflphone-gtk/src/menus.c:637
+#: ../sflphone-gtk/src/menus.c:628
 msgid "_Volume controls"
 msgstr "_Controles de volumen"
 
-#: ../sflphone-gtk/src/menus.c:646
+#: ../sflphone-gtk/src/menus.c:637
 msgid "_Search history"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:654
+#: ../sflphone-gtk/src/menus.c:645
 msgid "_View"
 msgstr "_Ver"
 
-#: ../sflphone-gtk/src/menus.c:876
-#, fuzzy
+#: ../sflphone-gtk/src/menus.c:867
 msgid "_Call back"
 msgstr "_Llamar"
 
@@ -573,24 +594,23 @@ msgstr "Ignorar"
 #: ../sflphone-gtk/src/sflnotify.c:136
 #, c-format
 msgid "Calling with %s account <i>%s</i>"
-msgstr ""
+msgstr "Llamando con la cuenta %s <i>%s</i>"
 
 #: ../sflphone-gtk/src/sflnotify.c:140
 msgid "Current account"
-msgstr ""
+msgstr "Cuenta"
 
 #: ../sflphone-gtk/src/sflnotify.c:169
 msgid "You haven't setup any accounts"
-msgstr ""
+msgstr "No ha configurado cuentas"
 
 #: ../sflphone-gtk/src/sflnotify.c:185 ../sflphone-gtk/src/sflnotify.c:224
-#, fuzzy
 msgid "Setup Accounts"
 msgstr "Cuentas"
 
 #: ../sflphone-gtk/src/sflnotify.c:208
 msgid "You have no registered accounts"
-msgstr ""
+msgstr "No tiene ninguna cuenta registrada"
 
 #: ../sflphone-gtk/src/sliders.c:161
 msgid "Speakers volume"
@@ -601,20 +621,21 @@ msgid "Mic volume"
 msgstr "Volumen del micrófono"
 
 #: ../sflphone-gtk/src/statusicon.c:91
-#, fuzzy
 msgid "_Show main window"
 msgstr "Mostrar ventana principal"
 
 #: ../sflphone-gtk/src/statusicon.c:124
-#, fuzzy, c-format
 msgid "SFLphone - %i accounts registered"
 msgstr "SFLphone - %i cuenta registrada"
 
 #: ../sflphone-gtk/src/timestamp.c:46
 msgid "<small>Missed call</small>"
-msgstr ""
+msgstr "<small>Llamada faltada</small>"
 
 #: ../sflphone-gtk/src/timestamp.c:64
 #, c-format
 msgid "<small>Duration:</small> %s"
-msgstr ""
+msgstr "<small>Duración:</small> %s"
+
+#~ msgid "_STUN Server"
+#~ msgstr "_Servidor STUN"
diff --git a/po/fr.po b/po/fr.po
index 65ae5c83b326704515107354cb3286518f6eeb33..95c7c9f0c8cc68fe42ac5ecc15363a152692c706 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
-"Report-Msgid-Bugs-To: sflphoneteam@savoirfairelinux.com\n"
-"POT-Creation-Date: 2008-11-05 16:41-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-10 15:24-0500\n"
 "PO-Revision-Date: 2008-03-31 14:15\n"
-"Last-Translator: Emmanuel Milou <emmnauel.milou@savoirfairelinux.com>\n"
+"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,12 +44,10 @@ msgid "Network unreachable"
 msgstr "Réseau non trouvé"
 
 #: ../sflphone-gtk/src/accountlist.c:176
-#, fuzzy
 msgid "Host unreachable"
-msgstr "_Serveur"
+msgstr "_Serveur introuvable"
 
 #: ../sflphone-gtk/src/accountlist.c:179
-#, fuzzy
 msgid "Stun configuration error"
 msgstr "Erreur de configuration Stun"
 
@@ -61,70 +59,50 @@ msgstr "Serveur Stun invalide"
 msgid "Invalid"
 msgstr "Non valide"
 
-#: ../sflphone-gtk/src/accountwindow.c:143
+#: ../sflphone-gtk/src/accountwindow.c:109
 msgid "Account settings"
 msgstr "Configuration des comptes"
 
-#: ../sflphone-gtk/src/accountwindow.c:155
+#: ../sflphone-gtk/src/accountwindow.c:121
 msgid "Account parameters"
 msgstr "Paramètres du compte"
 
-#: ../sflphone-gtk/src/accountwindow.c:177
+#: ../sflphone-gtk/src/accountwindow.c:143
 msgid "_Enabled"
 msgstr "_Activé"
 
-#: ../sflphone-gtk/src/accountwindow.c:183 ../sflphone-gtk/src/assistant.c:210
-#: ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/accountwindow.c:149 ../sflphone-gtk/src/assistant.c:238
+#: ../sflphone-gtk/src/assistant.c:292
 msgid "_Alias"
 msgstr "A_lias"
 
-#: ../sflphone-gtk/src/accountwindow.c:191
+#: ../sflphone-gtk/src/accountwindow.c:157
 msgid "_Protocol"
 msgstr "_Protocole"
 
-#: ../sflphone-gtk/src/accountwindow.c:209
+#: ../sflphone-gtk/src/accountwindow.c:175
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../sflphone-gtk/src/accountwindow.c:219 ../sflphone-gtk/src/assistant.c:218
-#: ../sflphone-gtk/src/assistant.c:272
+#: ../sflphone-gtk/src/accountwindow.c:185 ../sflphone-gtk/src/assistant.c:246
+#: ../sflphone-gtk/src/assistant.c:300
 msgid "_Host name"
 msgstr "_Serveur"
 
-#: ../sflphone-gtk/src/accountwindow.c:227 ../sflphone-gtk/src/assistant.c:226
-#: ../sflphone-gtk/src/assistant.c:280
+#: ../sflphone-gtk/src/accountwindow.c:193 ../sflphone-gtk/src/assistant.c:254
+#: ../sflphone-gtk/src/assistant.c:308
 msgid "_User name"
 msgstr "Usa_ger"
 
-#: ../sflphone-gtk/src/accountwindow.c:238 ../sflphone-gtk/src/assistant.c:236
-#: ../sflphone-gtk/src/assistant.c:290
+#: ../sflphone-gtk/src/accountwindow.c:204 ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/assistant.c:318
 msgid "_Password"
 msgstr "_Mot de passe"
 
-#: ../sflphone-gtk/src/accountwindow.c:249
+#: ../sflphone-gtk/src/accountwindow.c:215
 msgid "_Voicemail box #"
 msgstr "_Boite vocale #"
 
-#: ../sflphone-gtk/src/accountwindow.c:260 ../sflphone-gtk/src/assistant.c:313
-msgid "Network Address Translation"
-msgstr "Traduction d'adresse réseau (NAT)"
-
-#: ../sflphone-gtk/src/accountwindow.c:271 ../sflphone-gtk/src/assistant.c:322
-msgid "E_nable STUN"
-msgstr "A_ctiver STUN"
-
-#: ../sflphone-gtk/src/accountwindow.c:275
-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:279
-msgid "_STUN Server"
-msgstr "S_erveur STUN"
-
-#: ../sflphone-gtk/src/accountwindow.c:286
-msgid "Format: name.server:port"
-msgstr "Format: nom.serveur:port"
-
 #: ../sflphone-gtk/src/actions.c:57 ../sflphone-gtk/src/sflnotify.c:103
 #, c-format
 msgid "%d voice mails"
@@ -140,8 +118,7 @@ msgstr "%d message vocal"
 msgid "%s account- %s"
 msgstr "compte %s- %s"
 
-#: ../sflphone-gtk/src/actions.c:229
-#, fuzzy
+#: ../sflphone-gtk/src/actions.c:224
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -149,7 +126,7 @@ msgstr ""
 "Impossible de se connecter au serveur SFLphone.\n"
 " Assurez-vous que le démon est lancé."
 
-#: ../sflphone-gtk/src/actions.c:756
+#: ../sflphone-gtk/src/actions.c:798
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -162,63 +139,85 @@ msgstr ""
 "</b> Les codecs audio SFL doivent être soit dans <i>%s</i> soit dans le "
 "répertoire <b>.sflphone</b> de votre répertoire racine( <i>%s</i> )"
 
-#: ../sflphone-gtk/src/assistant.c:138
+#: ../sflphone-gtk/src/assistant.c:148
 msgid "SFLphone account configuration wizard"
 msgstr "Assistant de configuration de compte"
 
-#: ../sflphone-gtk/src/assistant.c:165
-#, fuzzy
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "SFLphone 0.9.2"
-msgstr "A propos de SFLphone"
+msgstr "SFLphone 0.9.3"
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "Welcome to SFLphone!"
 msgstr "Bienvenue dans SFLphone"
 
-#: ../sflphone-gtk/src/assistant.c:167
+#: ../sflphone-gtk/src/assistant.c:178
 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:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "VoIP Protocols"
 msgstr "Protocoles VoIP"
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "Select an account type:"
 msgstr "Choisissez un type de compte:"
 
-#: ../sflphone-gtk/src/assistant.c:202
+#: ../sflphone-gtk/src/assistant.c:211
+msgid "Account"
+msgstr "Comptes"
+
+#: ../sflphone-gtk/src/assistant.c:211
+msgid "Please select one of the following option:"
+msgstr "Veuillez remplir les champs suivants:"
+
+#: ../sflphone-gtk/src/assistant.c:213
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Créer un compte SIP/IAX2 gratuit sur sflphone.org"
+
+#: ../sflphone-gtk/src/assistant.c:215
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Enregistrer un compte SIP ou IAX2 existant"
+
+#: ../sflphone-gtk/src/assistant.c:230
 msgid "SIP account configuration"
 msgstr "Configuration d'un compte SIP"
 
-#: ../sflphone-gtk/src/assistant.c:202 ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:230 ../sflphone-gtk/src/assistant.c:284
 msgid "Please fill the following information:"
 msgstr "Veuillez remplir les champs suivants:"
 
-#: ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:284
 msgid "IAX2 account configuration"
 msgstr "Configuration d'un compte IAX2"
 
-#: ../sflphone-gtk/src/assistant.c:313
+#: ../sflphone-gtk/src/assistant.c:341 ../sflphone-gtk/src/configwindow.c:821
+msgid "Network Address Translation"
+msgstr "Traduction d'adresse réseau (NAT)"
+
+#: ../sflphone-gtk/src/assistant.c:341
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 "Vous devriez probablement activer cette option si \n"
 "vous vous trouvez derrière un pare-feu."
 
-#: ../sflphone-gtk/src/assistant.c:329
-#, fuzzy
+#: ../sflphone-gtk/src/assistant.c:350 ../sflphone-gtk/src/configwindow.c:496
+msgid "E_nable STUN"
+msgstr "A_ctiver STUN"
+
+#: ../sflphone-gtk/src/assistant.c:357
 msgid "_STUN server"
 msgstr "S_erveur STUN"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Account Registration"
 msgstr "Enregistrement du compte"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Congratulations!"
 msgstr "Félicitations!"
 
-#: ../sflphone-gtk/src/assistant.c:348
+#: ../sflphone-gtk/src/assistant.c:376
 msgid ""
 "This assistant is now finished.\n"
 "\n"
@@ -230,195 +229,229 @@ msgstr ""
 " Vous pouvez à tout moment vérifier votre état d'enregistrement ou modifier "
 "les paramètres de vos comptes dans la fenêtre Options/Comptes."
 
-#: ../sflphone-gtk/src/audioconf.c:150
+#: ../sflphone-gtk/src/audioconf.c:154
 #, c-format
 msgid "audio device index for output = %d\n"
 msgstr "index du device audio de sortie = %d\n"
 
-#: ../sflphone-gtk/src/audioconf.c:558
+#: ../sflphone-gtk/src/audioconf.c:562
 msgid "Name"
 msgstr "Nom"
 
-#: ../sflphone-gtk/src/audioconf.c:563
+#: ../sflphone-gtk/src/audioconf.c:567
 msgid "Frequency"
 msgstr "Fréquence"
 
-#: ../sflphone-gtk/src/audioconf.c:568
+#: ../sflphone-gtk/src/audioconf.c:572
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../sflphone-gtk/src/audioconf.c:573
+#: ../sflphone-gtk/src/audioconf.c:577
 msgid "Bandwidth"
 msgstr "Bande passante"
 
-#: ../sflphone-gtk/src/audioconf.c:633
+#: ../sflphone-gtk/src/audioconf.c:637
 msgid "Pulseaudio"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:636
+#: ../sflphone-gtk/src/audioconf.c:640
 msgid "ALSA"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:662
+#: ../sflphone-gtk/src/audioconf.c:666
 msgid "ALSA plugin"
 msgstr "Greffon ALSA"
 
-#: ../sflphone-gtk/src/audioconf.c:684
+#: ../sflphone-gtk/src/audioconf.c:688
 msgid "Output"
 msgstr "Sortie"
 
-#: ../sflphone-gtk/src/audioconf.c:706
+#: ../sflphone-gtk/src/audioconf.c:710
 msgid "Input"
 msgstr "Entrée"
 
-#: ../sflphone-gtk/src/audioconf.c:739
+#: ../sflphone-gtk/src/audioconf.c:743
 msgid "_Enable ringtones"
 msgstr "_Activer les sonneries"
 
-#: ../sflphone-gtk/src/audioconf.c:744
+#: ../sflphone-gtk/src/audioconf.c:748
 msgid "Choose a ringtone"
 msgstr "Sélectionner une sonnerie"
 
-#: ../sflphone-gtk/src/audioconf.c:749
+#: ../sflphone-gtk/src/audioconf.c:753
 msgid "Audio Files"
 msgstr "Fichier Audio"
 
-#: ../sflphone-gtk/src/audioconf.c:774
+#: ../sflphone-gtk/src/audioconf.c:770
+msgid "_Activate silence detection"
+msgstr "Activer la détection de silence"
+
+#: ../sflphone-gtk/src/audioconf.c:798
 msgid "Sound Manager"
 msgstr "Interface Audio"
 
-#: ../sflphone-gtk/src/audioconf.c:781
-#, fuzzy
+#: ../sflphone-gtk/src/audioconf.c:805
 msgid "ALSA configuration"
-msgstr "Configuration d'un compte SIP"
+msgstr "Configuration ALSA"
 
-#: ../sflphone-gtk/src/audioconf.c:791
+#: ../sflphone-gtk/src/audioconf.c:815
 msgid "Codecs"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:799
-#, fuzzy
+#: ../sflphone-gtk/src/audioconf.c:823
+msgid "Noise reduction"
+msgstr "Réduction du bruit"
+
+#: ../sflphone-gtk/src/audioconf.c:830
 msgid "Ringtones"
 msgstr "_Activer les sonneries"
 
-#: ../sflphone-gtk/src/calltree.c:208
+#: ../sflphone-gtk/src/calltree.c:209
 #, c-format
 msgid "\"Voicemail\" <%s>"
 msgstr "\"Boite vocale\" <%s>"
 
-#: ../sflphone-gtk/src/calltree.c:405 ../sflphone-gtk/src/calltree.c:407
+#: ../sflphone-gtk/src/calltree.c:431 ../sflphone-gtk/src/calltree.c:433
 msgid "Place a call"
 msgstr "Appeler"
 
-#: ../sflphone-gtk/src/calltree.c:414 ../sflphone-gtk/src/calltree.c:416
+#: ../sflphone-gtk/src/calltree.c:440 ../sflphone-gtk/src/calltree.c:442
 msgid "Pick up"
 msgstr "Décrocher"
 
-#: ../sflphone-gtk/src/calltree.c:424 ../sflphone-gtk/src/calltree.c:426
+#: ../sflphone-gtk/src/calltree.c:450 ../sflphone-gtk/src/calltree.c:452
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: ../sflphone-gtk/src/calltree.c:434 ../sflphone-gtk/src/calltree.c:436
+#: ../sflphone-gtk/src/calltree.c:460 ../sflphone-gtk/src/calltree.c:462
 msgid "Off Hold"
 msgstr "Reprendre"
 
-#: ../sflphone-gtk/src/calltree.c:445 ../sflphone-gtk/src/calltree.c:447
+#: ../sflphone-gtk/src/calltree.c:471 ../sflphone-gtk/src/calltree.c:473
 msgid "On Hold"
 msgstr "Mettre en attente"
 
-#: ../sflphone-gtk/src/calltree.c:458 ../sflphone-gtk/src/calltree.c:460
+#: ../sflphone-gtk/src/calltree.c:484 ../sflphone-gtk/src/calltree.c:486
 msgid "Transfer"
 msgstr "Transférer"
 
-#: ../sflphone-gtk/src/calltree.c:470 ../sflphone-gtk/src/calltree.c:472
+#: ../sflphone-gtk/src/calltree.c:496 ../sflphone-gtk/src/calltree.c:498
 msgid "History"
 msgstr "Historique"
 
-#: ../sflphone-gtk/src/calltree.c:480 ../sflphone-gtk/src/calltree.c:484
+#: ../sflphone-gtk/src/calltree.c:506 ../sflphone-gtk/src/calltree.c:510
 msgid "Voicemail"
 msgstr "Boite vocale"
 
-#: ../sflphone-gtk/src/configwindow.c:371
+#: ../sflphone-gtk/src/calltree.c:521
+msgid "Record a call"
+msgstr "Enregistrer un appel"
+
+#: ../sflphone-gtk/src/configwindow.c:382
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../sflphone-gtk/src/configwindow.c:378
+#: ../sflphone-gtk/src/configwindow.c:389
 msgid "Status"
 msgstr "Statut"
 
-#: ../sflphone-gtk/src/configwindow.c:470
+#: ../sflphone-gtk/src/configwindow.c:492
+msgid "Stun parameters will apply to each SIP account created."
+msgstr "Les paramètres STUN sont appliqués à tous les comptes SIP créés"
+
+#: ../sflphone-gtk/src/configwindow.c:500
+msgid "Enable it if you are behind a firewall"
+msgstr "À activer si vous êtes derrière un pare-feu, puis redémarrez SFLphone"
+
+#: ../sflphone-gtk/src/configwindow.c:508
+msgid "Format: name.server:port"
+msgstr "Format: nom.serveur:port"
+
+#: ../sflphone-gtk/src/configwindow.c:558
 msgid "Desktop Notification"
 msgstr "Notifications du bureau"
 
-#: ../sflphone-gtk/src/configwindow.c:478
+#: ../sflphone-gtk/src/configwindow.c:566
 msgid "_Enable"
 msgstr "_Activer"
 
-#: ../sflphone-gtk/src/configwindow.c:483
+#: ../sflphone-gtk/src/configwindow.c:571
 msgid "_Notify voice mails"
 msgstr "_Notifier les messages vocaux"
 
-#: ../sflphone-gtk/src/configwindow.c:489
+#: ../sflphone-gtk/src/configwindow.c:577
 msgid "System Tray Icon"
 msgstr "Icône dans la barre des tâches"
 
-#: ../sflphone-gtk/src/configwindow.c:497
+#: ../sflphone-gtk/src/configwindow.c:585
 msgid "_Popup main window on incoming call"
 msgstr "_Faire apparaître la fenêtre principale lors d'appel entrant"
 
-#: ../sflphone-gtk/src/configwindow.c:502
+#: ../sflphone-gtk/src/configwindow.c:590
 msgid "Ne_ver popup main window"
 msgstr "Ne _jamais afficher la fenêtre principale"
 
-#: ../sflphone-gtk/src/configwindow.c:506
+#: ../sflphone-gtk/src/configwindow.c:594
 msgid "_Start hidden"
 msgstr "_Démarrer caché"
 
-#: ../sflphone-gtk/src/configwindow.c:512
+#: ../sflphone-gtk/src/configwindow.c:600
 msgid "Calls History"
 msgstr "Historique des appels"
 
-#: ../sflphone-gtk/src/configwindow.c:520
+#: ../sflphone-gtk/src/configwindow.c:608
 msgid "_Maximum number of calls"
 msgstr "N_ombre maximum d'appels"
 
-#: ../sflphone-gtk/src/configwindow.c:536
+#: ../sflphone-gtk/src/configwindow.c:624
 msgid "PulseAudio sound server"
 msgstr "Serveur de son PulseAudio"
 
-#: ../sflphone-gtk/src/configwindow.c:544
+#: ../sflphone-gtk/src/configwindow.c:632
 msgid "_Control running applications volume"
 msgstr "_Autoriser à modifier le volume des autres applications"
 
-#: ../sflphone-gtk/src/configwindow.c:557
+#: ../sflphone-gtk/src/configwindow.c:645
 msgid "SIP Port"
 msgstr "Port SIP"
 
-#: ../sflphone-gtk/src/configwindow.c:566
-msgid "Apply"
-msgstr "Appliquer"
-
-#: ../sflphone-gtk/src/configwindow.c:570
+#: ../sflphone-gtk/src/configwindow.c:658
 msgid "Port:"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:600
+#: ../sflphone-gtk/src/configwindow.c:703
+msgid "General"
+msgstr "Général"
+
+#: ../sflphone-gtk/src/configwindow.c:714
+msgid "_Destination folder"
+msgstr "_Dossier de destination"
+
+#: ../sflphone-gtk/src/configwindow.c:719
+msgid "Select a folder"
+msgstr "Choisissez un dossier"
+
+#: ../sflphone-gtk/src/configwindow.c:744
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../sflphone-gtk/src/configwindow.c:620
+#: ../sflphone-gtk/src/configwindow.c:764
 msgid "General Settings"
 msgstr "Préférences"
 
-#: ../sflphone-gtk/src/configwindow.c:625
+#: ../sflphone-gtk/src/configwindow.c:769
 msgid "Audio Settings"
 msgstr "Paramètres Audio"
 
-#: ../sflphone-gtk/src/configwindow.c:649
+#: ../sflphone-gtk/src/configwindow.c:774
+msgid "Record"
+msgstr "Enregistrement"
+
+#: ../sflphone-gtk/src/configwindow.c:798
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../sflphone-gtk/src/configwindow.c:661
+#: ../sflphone-gtk/src/configwindow.c:810
 msgid "Accounts previously setup"
 msgstr "Liste des comptes existants"
 
@@ -448,102 +481,96 @@ msgid ""
 "\n"
 "Pulseaudio is not running"
 msgstr ""
+"<b>Notification Pulseaudio</b>\n"
+"\n"
+"Pulseaudio n'est pas lancé"
 
-#: ../sflphone-gtk/src/historyfilter.c:45
-#: ../sflphone-gtk/src/historyfilter.c:63
-#: ../sflphone-gtk/src/historyfilter.c:78
+#: ../sflphone-gtk/src/historyfilter.c:49
+#: ../sflphone-gtk/src/historyfilter.c:68
+#: ../sflphone-gtk/src/historyfilter.c:83
 msgid "Search"
 msgstr "Recherche"
 
 #: ../sflphone-gtk/src/mainwindow.c:69
-msgid ""
-"<b>There is one call in progress.</b>\n"
-"Do you still want to quit?"
-msgstr ""
-"<b>Vous avez un appel en cours.</b>\n"
-"Voulez-vous quitter?"
+msgid "There is one call in progress."
+msgstr "Vous avez un appel en cours."
 
 #: ../sflphone-gtk/src/mainwindow.c:73
-msgid ""
-"<b>There are calls in progress.</b>\n"
-"Do you still want to quit?"
-msgstr ""
-"<b>Vous avez des appels en cours.</b>\n"
-"Voulez-vous quitter?"
+msgid "There are calls in progress."
+msgstr "Vous avez des appels en cours."
+
+#: ../sflphone-gtk/src/mainwindow.c:82
+msgid "Do you still want to quit?"
+msgstr "Voulez-vous quitter?"
 
-#: ../sflphone-gtk/src/menus.c:130
+#: ../sflphone-gtk/src/menus.c:135
 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."
 
-#: ../sflphone-gtk/src/menus.c:133
+#: ../sflphone-gtk/src/menus.c:138
 msgid "About SFLphone"
 msgstr "A propos de SFLphone"
 
-#: ../sflphone-gtk/src/menus.c:156
+#: ../sflphone-gtk/src/menus.c:161
 msgid "_Help"
 msgstr "A_ide"
 
-#: ../sflphone-gtk/src/menus.c:273
+#: ../sflphone-gtk/src/menus.c:278
 msgid "_New call"
 msgstr "_Nouvel appel"
 
-#: ../sflphone-gtk/src/menus.c:285 ../sflphone-gtk/src/menus.c:769
+#: ../sflphone-gtk/src/menus.c:290 ../sflphone-gtk/src/menus.c:760
 msgid "_Pick up"
 msgstr "_Décrocher"
 
-#: ../sflphone-gtk/src/menus.c:295 ../sflphone-gtk/src/menus.c:781
+#: ../sflphone-gtk/src/menus.c:300 ../sflphone-gtk/src/menus.c:772
 msgid "_Hang up"
 msgstr "_Raccrocher"
 
-#: ../sflphone-gtk/src/menus.c:305 ../sflphone-gtk/src/menus.c:793
+#: ../sflphone-gtk/src/menus.c:310 ../sflphone-gtk/src/menus.c:784
 msgid "On _Hold"
 msgstr "_Mettre en attente"
 
-#: ../sflphone-gtk/src/menus.c:321
+#: ../sflphone-gtk/src/menus.c:326
 msgid "_Account Assistant"
 msgstr "_Assistant SFLphone"
 
-#: ../sflphone-gtk/src/menus.c:351
+#: ../sflphone-gtk/src/menus.c:356
 msgid "_Call"
 msgstr "_Actions"
 
-#: ../sflphone-gtk/src/menus.c:497
-msgid "History empty"
-msgstr "L'historique est vide"
-
-#: ../sflphone-gtk/src/menus.c:538
+#: ../sflphone-gtk/src/menus.c:529
 msgid "_Clear history"
 msgstr "Effacer l'historique"
 
-#: ../sflphone-gtk/src/menus.c:550
+#: ../sflphone-gtk/src/menus.c:541
 msgid "_Accounts"
 msgstr "Co_mptes"
 
-#: ../sflphone-gtk/src/menus.c:565
+#: ../sflphone-gtk/src/menus.c:556
 msgid "_Edit"
 msgstr "_Options"
 
-#: ../sflphone-gtk/src/menus.c:625
+#: ../sflphone-gtk/src/menus.c:616
 msgid "_Dialpad"
 msgstr "_Clavier"
 
-#: ../sflphone-gtk/src/menus.c:637
+#: ../sflphone-gtk/src/menus.c:628
 msgid "_Volume controls"
 msgstr "_Contrôle du volume"
 
-#: ../sflphone-gtk/src/menus.c:646
+#: ../sflphone-gtk/src/menus.c:637
 msgid "_Search history"
 msgstr "Recherche dans l'historique"
 
-#: ../sflphone-gtk/src/menus.c:654
+#: ../sflphone-gtk/src/menus.c:645
 msgid "_View"
 msgstr "A_ffichage"
 
-#: ../sflphone-gtk/src/menus.c:876
-#, fuzzy
+#: ../sflphone-gtk/src/menus.c:867
 msgid "_Call back"
-msgstr "_Actions"
+msgstr "_Rappeler"
 
 #: ../sflphone-gtk/src/sflnotify.c:34 ../sflphone-gtk/src/sflnotify.c:100
 #, c-format
@@ -582,9 +609,8 @@ msgid "You haven't setup any accounts"
 msgstr "Vous n'avez aucun compte configuré"
 
 #: ../sflphone-gtk/src/sflnotify.c:185 ../sflphone-gtk/src/sflnotify.c:224
-#, fuzzy
 msgid "Setup Accounts"
-msgstr "Comptes"
+msgstr "Configurer les comptes"
 
 #: ../sflphone-gtk/src/sflnotify.c:208
 msgid "You have no registered accounts"
@@ -603,7 +629,7 @@ msgid "_Show main window"
 msgstr "_Afficher la fenêtre principale"
 
 #: ../sflphone-gtk/src/statusicon.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "SFLphone - %i accounts registered"
 msgstr "SFLphone - %i compte enregistré"
 
@@ -615,3 +641,12 @@ msgstr "<small>Appel manqué</small>"
 #, c-format
 msgid "<small>Duration:</small> %s"
 msgstr "<small>Durée:</small> %s"
+
+#~ msgid "_STUN Server"
+#~ msgstr "S_erveur STUN"
+
+#~ msgid "Apply"
+#~ msgstr "Appliquer"
+
+#~ msgid "History empty"
+#~ msgstr "L'historique est vide"
diff --git a/po/ru.po b/po/ru.po
index 658ae7c1c4d145b3bf50e2d004e91524649d4f48..c9a083afc201bdb7096ef6b5dac0529d0adf90c9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: sflphoneteam@savoirfairelinux.com\n"
-"POT-Creation-Date: 2008-11-05 16:41-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-10 15:24-0500\n"
 "PO-Revision-Date: 2009-01-08 15:19 GMT-5\n"
 "Last-Translator: HUSSEIN ABDALLAH <hussein.abdallah@savoirfairelinux.com>\n"
 "Language-Team:  RUSSIAN <LL@li.org>\n"
@@ -58,72 +58,50 @@ msgstr "Недействительный Stun-сервер"
 msgid "Invalid"
 msgstr "Недействительный"
 
-#: ../sflphone-gtk/src/accountwindow.c:143
+#: ../sflphone-gtk/src/accountwindow.c:109
 msgid "Account settings"
 msgstr "Настройки аккаунта"
 
-#: ../sflphone-gtk/src/accountwindow.c:155
+#: ../sflphone-gtk/src/accountwindow.c:121
 msgid "Account parameters"
 msgstr "Параметры аккаунта"
 
-#: ../sflphone-gtk/src/accountwindow.c:177
+#: ../sflphone-gtk/src/accountwindow.c:143
 msgid "_Enabled"
 msgstr "_Включен"
 
-#: ../sflphone-gtk/src/accountwindow.c:183 ../sflphone-gtk/src/assistant.c:210
-#: ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/accountwindow.c:149 ../sflphone-gtk/src/assistant.c:238
+#: ../sflphone-gtk/src/assistant.c:292
 msgid "_Alias"
 msgstr "_Псевдоним"
 
-#: ../sflphone-gtk/src/accountwindow.c:191
+#: ../sflphone-gtk/src/accountwindow.c:157
 msgid "_Protocol"
 msgstr "Пр_отокол"
 
-#: ../sflphone-gtk/src/accountwindow.c:209
+#: ../sflphone-gtk/src/accountwindow.c:175
 msgid "Unknown"
 msgstr "Неизвестный"
 
-#: ../sflphone-gtk/src/accountwindow.c:219 ../sflphone-gtk/src/assistant.c:218
-#: ../sflphone-gtk/src/assistant.c:272
+#: ../sflphone-gtk/src/accountwindow.c:185 ../sflphone-gtk/src/assistant.c:246
+#: ../sflphone-gtk/src/assistant.c:300
 msgid "_Host name"
 msgstr "Имя или IP-адрес _сервера"
 
-#: ../sflphone-gtk/src/accountwindow.c:227 ../sflphone-gtk/src/assistant.c:226
-#: ../sflphone-gtk/src/assistant.c:280
+#: ../sflphone-gtk/src/accountwindow.c:193 ../sflphone-gtk/src/assistant.c:254
+#: ../sflphone-gtk/src/assistant.c:308
 msgid "_User name"
 msgstr "Имя или _номер пользователя"
 
-#: ../sflphone-gtk/src/accountwindow.c:238 ../sflphone-gtk/src/assistant.c:236
-#: ../sflphone-gtk/src/assistant.c:290
+#: ../sflphone-gtk/src/accountwindow.c:204 ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/assistant.c:318
 msgid "_Password"
 msgstr "Па_роль"
 
-#: ../sflphone-gtk/src/accountwindow.c:249
+#: ../sflphone-gtk/src/accountwindow.c:215
 msgid "_Voicemail box #"
 msgstr "Номер _автоответчика #"
 
-#: ../sflphone-gtk/src/accountwindow.c:260 ../sflphone-gtk/src/assistant.c:313
-msgid "Network Address Translation"
-msgstr "Network Address Translation"
-
-#: ../sflphone-gtk/src/accountwindow.c:271 ../sflphone-gtk/src/assistant.c:322
-msgid "E_nable STUN"
-msgstr "Включить STUN"
-
-#: ../sflphone-gtk/src/accountwindow.c:275
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
-msgstr ""
-"Включите это если вы находитесь за сетевым экраном и потом перезагрузите "
-"SFLphone"
-
-#: ../sflphone-gtk/src/accountwindow.c:279
-msgid "_STUN Server"
-msgstr "_STUN-сервер"
-
-#: ../sflphone-gtk/src/accountwindow.c:286
-msgid "Format: name.server:port"
-msgstr "Формат: имя.сервер:порт"
-
 #: ../sflphone-gtk/src/actions.c:57 ../sflphone-gtk/src/sflnotify.c:103
 #, c-format
 msgid "%d voice mails"
@@ -139,7 +117,7 @@ msgstr "%d речевое сообщение"
 msgid "%s account- %s"
 msgstr "%s аккаунт- %s"
 
-#: ../sflphone-gtk/src/actions.c:229
+#: ../sflphone-gtk/src/actions.c:224
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -147,7 +125,7 @@ msgstr ""
 "Невозможно подключиться к SFLphone-серверу.\n"
 "Проверьте если демон работает."
 
-#: ../sflphone-gtk/src/actions.c:756
+#: ../sflphone-gtk/src/actions.c:798
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -160,60 +138,86 @@ msgstr ""
 "</b> Звуковые кодеки SFL должны находиться в <i>%s</i> или в <b>.sflphone</"
 "b> каталоге в вашем домашнем каталоге( <i>%s</i> )"
 
-#: ../sflphone-gtk/src/assistant.c:138
+#: ../sflphone-gtk/src/assistant.c:148
 msgid "SFLphone account configuration wizard"
 msgstr "Мастер настройки SFLphone"
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 #, fuzzy
 msgid "SFLphone 0.9.2"
 msgstr "SFLphone 0.8"
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "Welcome to SFLphone!"
 msgstr "Добро пожаловать в SFLphone!"
 
-#: ../sflphone-gtk/src/assistant.c:167
+#: ../sflphone-gtk/src/assistant.c:178
 msgid "This installation wizard will help you configure an account."
 msgstr "Этот мастер установки поможет вам настроить ваш аккаунт."
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "VoIP Protocols"
 msgstr "VoIP-протоколы"
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "Select an account type:"
 msgstr "Выберите тип аккаунта:"
 
-#: ../sflphone-gtk/src/assistant.c:202
+#: ../sflphone-gtk/src/assistant.c:211
+#, fuzzy
+msgid "Account"
+msgstr "Аккаунты"
+
+#: ../sflphone-gtk/src/assistant.c:211
+#, fuzzy
+msgid "Please select one of the following option:"
+msgstr "Введите пожалуйста следующие данные"
+
+#: ../sflphone-gtk/src/assistant.c:213
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:215
+msgid "Register an existing SIP or IAX2 account"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:230
 msgid "SIP account configuration"
 msgstr "Настройка SIP-аккаунта"
 
-#: ../sflphone-gtk/src/assistant.c:202 ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:230 ../sflphone-gtk/src/assistant.c:284
 msgid "Please fill the following information:"
 msgstr "Введите пожалуйста следующие данные"
 
-#: ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:284
 msgid "IAX2 account configuration"
 msgstr "Настройка IAX2-аккаунта"
 
-#: ../sflphone-gtk/src/assistant.c:313
+#: ../sflphone-gtk/src/assistant.c:341 ../sflphone-gtk/src/configwindow.c:821
+msgid "Network Address Translation"
+msgstr "Network Address Translation"
+
+#: ../sflphone-gtk/src/assistant.c:341
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Вы наверное должны это включить если вы находитесь за сетевым экраном."
 
-#: ../sflphone-gtk/src/assistant.c:329
+#: ../sflphone-gtk/src/assistant.c:350 ../sflphone-gtk/src/configwindow.c:496
+msgid "E_nable STUN"
+msgstr "Включить STUN"
+
+#: ../sflphone-gtk/src/assistant.c:357
 msgid "_STUN server"
 msgstr "_STUN-сервер"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Account Registration"
 msgstr "Регистрация аккаунта"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Congratulations!"
 msgstr "Поздравляем!"
 
-#: ../sflphone-gtk/src/assistant.c:348
+#: ../sflphone-gtk/src/assistant.c:376
 msgid ""
 "This assistant is now finished.\n"
 "\n"
@@ -225,193 +229,234 @@ msgstr ""
 " Вы можете в любое время проверить статус регистрации или изменить "
 "параметры  ваших аккаунтов в меню Правка / Аккаунты."
 
-#: ../sflphone-gtk/src/audioconf.c:150
+#: ../sflphone-gtk/src/audioconf.c:154
 #, c-format
 msgid "audio device index for output = %d\n"
 msgstr "Индекс звукового устройства = %d\n"
 
-#: ../sflphone-gtk/src/audioconf.c:558
+#: ../sflphone-gtk/src/audioconf.c:562
 msgid "Name"
 msgstr "Имя"
 
-#: ../sflphone-gtk/src/audioconf.c:563
+#: ../sflphone-gtk/src/audioconf.c:567
 msgid "Frequency"
 msgstr "Частота"
 
-#: ../sflphone-gtk/src/audioconf.c:568
+#: ../sflphone-gtk/src/audioconf.c:572
 msgid "Bitrate"
 msgstr "Битрейт"
 
-#: ../sflphone-gtk/src/audioconf.c:573
+#: ../sflphone-gtk/src/audioconf.c:577
 msgid "Bandwidth"
 msgstr "Пропускная способность"
 
-#: ../sflphone-gtk/src/audioconf.c:633
+#: ../sflphone-gtk/src/audioconf.c:637
 msgid "Pulseaudio"
 msgstr "Pulseaudio"
 
-#: ../sflphone-gtk/src/audioconf.c:636
+#: ../sflphone-gtk/src/audioconf.c:640
 msgid "ALSA"
 msgstr "ALSA"
 
-#: ../sflphone-gtk/src/audioconf.c:662
+#: ../sflphone-gtk/src/audioconf.c:666
 msgid "ALSA plugin"
 msgstr "ALSA-плагин"
 
-#: ../sflphone-gtk/src/audioconf.c:684
+#: ../sflphone-gtk/src/audioconf.c:688
 msgid "Output"
 msgstr "Выход"
 
-#: ../sflphone-gtk/src/audioconf.c:706
+#: ../sflphone-gtk/src/audioconf.c:710
 msgid "Input"
 msgstr "Вход"
 
-#: ../sflphone-gtk/src/audioconf.c:739
+#: ../sflphone-gtk/src/audioconf.c:743
 msgid "_Enable ringtones"
 msgstr "Включить звонок"
 
-#: ../sflphone-gtk/src/audioconf.c:744
+#: ../sflphone-gtk/src/audioconf.c:748
 msgid "Choose a ringtone"
 msgstr "Выберите звонок"
 
-#: ../sflphone-gtk/src/audioconf.c:749
+#: ../sflphone-gtk/src/audioconf.c:753
 msgid "Audio Files"
 msgstr "Звуковые файлы"
 
-#: ../sflphone-gtk/src/audioconf.c:774
+#: ../sflphone-gtk/src/audioconf.c:770
+msgid "_Activate silence detection"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:798
 msgid "Sound Manager"
 msgstr "Менеджер звука"
 
-#: ../sflphone-gtk/src/audioconf.c:781
+#: ../sflphone-gtk/src/audioconf.c:805
 msgid "ALSA configuration"
 msgstr "Настройка ALSA"
 
-#: ../sflphone-gtk/src/audioconf.c:791
+#: ../sflphone-gtk/src/audioconf.c:815
 msgid "Codecs"
 msgstr "Кодеки"
 
-#: ../sflphone-gtk/src/audioconf.c:799
+#: ../sflphone-gtk/src/audioconf.c:823
+msgid "Noise reduction"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:830
 msgid "Ringtones"
 msgstr "Звонки"
 
-#: ../sflphone-gtk/src/calltree.c:208
+#: ../sflphone-gtk/src/calltree.c:209
 #, c-format
 msgid "\"Voicemail\" <%s>"
 msgstr "\"Автоответчик\" <%s>"
 
-#: ../sflphone-gtk/src/calltree.c:405 ../sflphone-gtk/src/calltree.c:407
+#: ../sflphone-gtk/src/calltree.c:431 ../sflphone-gtk/src/calltree.c:433
 msgid "Place a call"
 msgstr "Позвонить"
 
-#: ../sflphone-gtk/src/calltree.c:414 ../sflphone-gtk/src/calltree.c:416
+#: ../sflphone-gtk/src/calltree.c:440 ../sflphone-gtk/src/calltree.c:442
 msgid "Pick up"
 msgstr "Взять трубку"
 
-#: ../sflphone-gtk/src/calltree.c:424 ../sflphone-gtk/src/calltree.c:426
+#: ../sflphone-gtk/src/calltree.c:450 ../sflphone-gtk/src/calltree.c:452
 msgid "Hang up"
 msgstr "Положить трубку"
 
-#: ../sflphone-gtk/src/calltree.c:434 ../sflphone-gtk/src/calltree.c:436
+#: ../sflphone-gtk/src/calltree.c:460 ../sflphone-gtk/src/calltree.c:462
 msgid "Off Hold"
 msgstr "Снова взять"
 
-#: ../sflphone-gtk/src/calltree.c:445 ../sflphone-gtk/src/calltree.c:447
+#: ../sflphone-gtk/src/calltree.c:471 ../sflphone-gtk/src/calltree.c:473
 msgid "On Hold"
 msgstr "Удержать звонок"
 
-#: ../sflphone-gtk/src/calltree.c:458 ../sflphone-gtk/src/calltree.c:460
+#: ../sflphone-gtk/src/calltree.c:484 ../sflphone-gtk/src/calltree.c:486
 msgid "Transfer"
 msgstr "Переслать звонок на другой номер"
 
-#: ../sflphone-gtk/src/calltree.c:470 ../sflphone-gtk/src/calltree.c:472
+#: ../sflphone-gtk/src/calltree.c:496 ../sflphone-gtk/src/calltree.c:498
 msgid "History"
 msgstr "Журнал"
 
-#: ../sflphone-gtk/src/calltree.c:480 ../sflphone-gtk/src/calltree.c:484
+#: ../sflphone-gtk/src/calltree.c:506 ../sflphone-gtk/src/calltree.c:510
 msgid "Voicemail"
 msgstr "Автоответчик"
 
-#: ../sflphone-gtk/src/configwindow.c:371
+#: ../sflphone-gtk/src/calltree.c:521
+#, fuzzy
+msgid "Record a call"
+msgstr "Позвонить"
+
+#: ../sflphone-gtk/src/configwindow.c:382
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../sflphone-gtk/src/configwindow.c:378
+#: ../sflphone-gtk/src/configwindow.c:389
 msgid "Status"
 msgstr "Статус"
 
-#: ../sflphone-gtk/src/configwindow.c:470
+#: ../sflphone-gtk/src/configwindow.c:492
+msgid "Stun parameters will apply to each SIP account created."
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:500
+#, fuzzy
+msgid "Enable it if you are behind a firewall"
+msgstr ""
+"Включите это если вы находитесь за сетевым экраном и потом перезагрузите "
+"SFLphone"
+
+#: ../sflphone-gtk/src/configwindow.c:508
+msgid "Format: name.server:port"
+msgstr "Формат: имя.сервер:порт"
+
+#: ../sflphone-gtk/src/configwindow.c:558
 msgid "Desktop Notification"
 msgstr "Извещения на рабочем столе"
 
-#: ../sflphone-gtk/src/configwindow.c:478
+#: ../sflphone-gtk/src/configwindow.c:566
 msgid "_Enable"
 msgstr "_Включить"
 
-#: ../sflphone-gtk/src/configwindow.c:483
+#: ../sflphone-gtk/src/configwindow.c:571
 msgid "_Notify voice mails"
 msgstr "_Предупредить о новых речевых сообщениях"
 
-#: ../sflphone-gtk/src/configwindow.c:489
+#: ../sflphone-gtk/src/configwindow.c:577
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
-#: ../sflphone-gtk/src/configwindow.c:497
+#: ../sflphone-gtk/src/configwindow.c:585
 msgid "_Popup main window on incoming call"
 msgstr "_Показать главное окно при входящем звонке"
 
-#: ../sflphone-gtk/src/configwindow.c:502
+#: ../sflphone-gtk/src/configwindow.c:590
 msgid "Ne_ver popup main window"
 msgstr "Никогда не показывать главное окно"
 
-#: ../sflphone-gtk/src/configwindow.c:506
+#: ../sflphone-gtk/src/configwindow.c:594
 msgid "_Start hidden"
 msgstr "_Начать спрятанным"
 
-#: ../sflphone-gtk/src/configwindow.c:512
+#: ../sflphone-gtk/src/configwindow.c:600
 msgid "Calls History"
 msgstr "Журнал звонков"
 
-#: ../sflphone-gtk/src/configwindow.c:520
+#: ../sflphone-gtk/src/configwindow.c:608
 msgid "_Maximum number of calls"
 msgstr "_Максимальное количество звонков"
 
-#: ../sflphone-gtk/src/configwindow.c:536
+#: ../sflphone-gtk/src/configwindow.c:624
 msgid "PulseAudio sound server"
 msgstr "Сервер звука PulseAudio"
 
-#: ../sflphone-gtk/src/configwindow.c:544
+#: ../sflphone-gtk/src/configwindow.c:632
 msgid "_Control running applications volume"
 msgstr "_Начать спрятанным "
 
-#: ../sflphone-gtk/src/configwindow.c:557
+#: ../sflphone-gtk/src/configwindow.c:645
 msgid "SIP Port"
 msgstr "SIP-порт"
 
-#: ../sflphone-gtk/src/configwindow.c:566
-msgid "Apply"
-msgstr "Применить"
-
-#: ../sflphone-gtk/src/configwindow.c:570
+#: ../sflphone-gtk/src/configwindow.c:658
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../sflphone-gtk/src/configwindow.c:600
+#: ../sflphone-gtk/src/configwindow.c:703
+#, fuzzy
+msgid "General"
+msgstr "Общие настройки"
+
+#: ../sflphone-gtk/src/configwindow.c:714
+msgid "_Destination folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:719
+msgid "Select a folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:744
 msgid "Preferences"
 msgstr "Предпочтения"
 
-#: ../sflphone-gtk/src/configwindow.c:620
+#: ../sflphone-gtk/src/configwindow.c:764
 msgid "General Settings"
 msgstr "Общие настройки"
 
-#: ../sflphone-gtk/src/configwindow.c:625
+#: ../sflphone-gtk/src/configwindow.c:769
 msgid "Audio Settings"
 msgstr "Настройки звука"
 
-#: ../sflphone-gtk/src/configwindow.c:649
+#: ../sflphone-gtk/src/configwindow.c:774
+msgid "Record"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:798
 msgid "Accounts"
 msgstr "Аккаунты"
 
-#: ../sflphone-gtk/src/configwindow.c:661
+#: ../sflphone-gtk/src/configwindow.c:810
 msgid "Accounts previously setup"
 msgstr "Существующие аккаунты"
 
@@ -445,97 +490,95 @@ msgstr ""
 "\n"
 "Pulseaudio не работает"
 
-#: ../sflphone-gtk/src/historyfilter.c:45
-#: ../sflphone-gtk/src/historyfilter.c:63
-#: ../sflphone-gtk/src/historyfilter.c:78
+#: ../sflphone-gtk/src/historyfilter.c:49
+#: ../sflphone-gtk/src/historyfilter.c:68
+#: ../sflphone-gtk/src/historyfilter.c:83
 msgid "Search"
 msgstr "Поиск"
 
 #: ../sflphone-gtk/src/mainwindow.c:69
-msgid ""
-"<b>There is one call in progress.</b>\n"
-"Do you still want to quit?"
+#, fuzzy
+msgid "There is one call in progress."
 msgstr ""
 "<b>Звонок ещё не окончен</b>\n"
 "Вы уверенны что хотите выйти?"
 
 #: ../sflphone-gtk/src/mainwindow.c:73
-msgid ""
-"<b>There are calls in progress.</b>\n"
-"Do you still want to quit?"
+#, fuzzy
+msgid "There are calls in progress."
 msgstr ""
 "<b>Несколько звонков ещё не окончены</b>\n"
 "Вы уверенны что хотите выйти?"
 
-#: ../sflphone-gtk/src/menus.c:130
+#: ../sflphone-gtk/src/mainwindow.c:82
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../sflphone-gtk/src/menus.c:135
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone - SIP и IAX2-совместимый VoIP-клиент "
 
-#: ../sflphone-gtk/src/menus.c:133
+#: ../sflphone-gtk/src/menus.c:138
 msgid "About SFLphone"
 msgstr "О SFLphone"
 
-#: ../sflphone-gtk/src/menus.c:156
+#: ../sflphone-gtk/src/menus.c:161
 msgid "_Help"
 msgstr "_Помощь"
 
-#: ../sflphone-gtk/src/menus.c:273
+#: ../sflphone-gtk/src/menus.c:278
 msgid "_New call"
 msgstr "_Новый звонок"
 
-#: ../sflphone-gtk/src/menus.c:285 ../sflphone-gtk/src/menus.c:769
+#: ../sflphone-gtk/src/menus.c:290 ../sflphone-gtk/src/menus.c:760
 msgid "_Pick up"
 msgstr "_Взять трубку"
 
-#: ../sflphone-gtk/src/menus.c:295 ../sflphone-gtk/src/menus.c:781
+#: ../sflphone-gtk/src/menus.c:300 ../sflphone-gtk/src/menus.c:772
 msgid "_Hang up"
 msgstr "_Положить трубку"
 
-#: ../sflphone-gtk/src/menus.c:305 ../sflphone-gtk/src/menus.c:793
+#: ../sflphone-gtk/src/menus.c:310 ../sflphone-gtk/src/menus.c:784
 msgid "On _Hold"
 msgstr "_Удержать звонок"
 
-#: ../sflphone-gtk/src/menus.c:321
+#: ../sflphone-gtk/src/menus.c:326
 msgid "_Account Assistant"
 msgstr "_Мастер настройки аккаунтов"
 
-#: ../sflphone-gtk/src/menus.c:351
+#: ../sflphone-gtk/src/menus.c:356
 msgid "_Call"
 msgstr "_Звонок"
 
-#: ../sflphone-gtk/src/menus.c:497
-msgid "History empty"
-msgstr "Журнал пуст"
-
-#: ../sflphone-gtk/src/menus.c:538
+#: ../sflphone-gtk/src/menus.c:529
 msgid "_Clear history"
 msgstr "_Стереть журнал"
 
-#: ../sflphone-gtk/src/menus.c:550
+#: ../sflphone-gtk/src/menus.c:541
 msgid "_Accounts"
 msgstr "_Аккаунты"
 
-#: ../sflphone-gtk/src/menus.c:565
+#: ../sflphone-gtk/src/menus.c:556
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../sflphone-gtk/src/menus.c:625
+#: ../sflphone-gtk/src/menus.c:616
 msgid "_Dialpad"
 msgstr "_Клавиатура"
 
-#: ../sflphone-gtk/src/menus.c:637
+#: ../sflphone-gtk/src/menus.c:628
 msgid "_Volume controls"
 msgstr "_Настройки громкости"
 
-#: ../sflphone-gtk/src/menus.c:646
+#: ../sflphone-gtk/src/menus.c:637
 msgid "_Search history"
 msgstr "_Искать в журнале"
 
-#: ../sflphone-gtk/src/menus.c:654
+#: ../sflphone-gtk/src/menus.c:645
 msgid "_View"
 msgstr "_Вид"
 
-#: ../sflphone-gtk/src/menus.c:876
+#: ../sflphone-gtk/src/menus.c:867
 msgid "_Call back"
 msgstr "_Перезвонить"
 
@@ -609,5 +652,14 @@ msgstr "<small>Пропущенный звонок</small>"
 msgid "<small>Duration:</small> %s"
 msgstr "<small>Время:</small> %s"
 
+#~ msgid "_STUN Server"
+#~ msgstr "_STUN-сервер"
+
+#~ msgid "Apply"
+#~ msgstr "Применить"
+
+#~ msgid "History empty"
+#~ msgstr "Журнал пуст"
+
 #~ msgid "Enabled"
 #~ msgstr "Включен"
diff --git a/po/sflphone.pot b/po/sflphone.pot
index 9effffca22c79e315de445cb7b7b192963642121..d95d68f1994f50f349f4a78c886d904ad744a323 100644
--- a/po/sflphone.pot
+++ b/po/sflphone.pot
@@ -1,17 +1,17 @@
-# SFLphone translation template file.
+# SFLphone translation template.
 # Copyright (C) 2008 2009 Savoir-Faire Linux Inc
-# This file is distributed under the GNU General Public License Version 3.
-
-# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008 2009.
+# This file is distributed under the same license as the sflphone package.
+# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>.
+#
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.9.2\n"
-"Report-Msgid-Bugs-To: sflphoneteam@savoirfairelinux.com\n"
-"POT-Creation-Date: 2008-11-05 16:41-0500\n"
-"PO-Revision-Date: 2009-01-06 10:15-0500\n"
-"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
-"Language-Team: sflphoneteam@savoirfairelinux.com\n"
+"Project-Id-Version: 0.9.3-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-10 15:24-0500\n"
+"PO-Revision-Date: 2009-02-10 15:24-0500\n"
+"Last-Translator: Hussein Abdallah <hussein.abdallah@savoirfairelinux.com>\n"
+"Language-Team: Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,70 +57,50 @@ msgstr ""
 msgid "Invalid"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:143
+#: ../sflphone-gtk/src/accountwindow.c:109
 msgid "Account settings"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:155
+#: ../sflphone-gtk/src/accountwindow.c:121
 msgid "Account parameters"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:177
+#: ../sflphone-gtk/src/accountwindow.c:143
 msgid "_Enabled"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:183 ../sflphone-gtk/src/assistant.c:210
-#: ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/accountwindow.c:149 ../sflphone-gtk/src/assistant.c:238
+#: ../sflphone-gtk/src/assistant.c:292
 msgid "_Alias"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:191
+#: ../sflphone-gtk/src/accountwindow.c:157
 msgid "_Protocol"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:209
+#: ../sflphone-gtk/src/accountwindow.c:175
 msgid "Unknown"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:219 ../sflphone-gtk/src/assistant.c:218
-#: ../sflphone-gtk/src/assistant.c:272
+#: ../sflphone-gtk/src/accountwindow.c:185 ../sflphone-gtk/src/assistant.c:246
+#: ../sflphone-gtk/src/assistant.c:300
 msgid "_Host name"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:227 ../sflphone-gtk/src/assistant.c:226
-#: ../sflphone-gtk/src/assistant.c:280
+#: ../sflphone-gtk/src/accountwindow.c:193 ../sflphone-gtk/src/assistant.c:254
+#: ../sflphone-gtk/src/assistant.c:308
 msgid "_User name"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:238 ../sflphone-gtk/src/assistant.c:236
-#: ../sflphone-gtk/src/assistant.c:290
+#: ../sflphone-gtk/src/accountwindow.c:204 ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/assistant.c:318
 msgid "_Password"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:249
+#: ../sflphone-gtk/src/accountwindow.c:215
 msgid "_Voicemail box #"
 msgstr ""
 
-#: ../sflphone-gtk/src/accountwindow.c:260 ../sflphone-gtk/src/assistant.c:313
-msgid "Network Address Translation"
-msgstr ""
-
-#: ../sflphone-gtk/src/accountwindow.c:271 ../sflphone-gtk/src/assistant.c:322
-msgid "E_nable STUN"
-msgstr ""
-
-#: ../sflphone-gtk/src/accountwindow.c:275
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
-msgstr ""
-
-#: ../sflphone-gtk/src/accountwindow.c:279
-msgid "_STUN Server"
-msgstr ""
-
-#: ../sflphone-gtk/src/accountwindow.c:286
-msgid "Format: name.server:port"
-msgstr ""
-
 #: ../sflphone-gtk/src/actions.c:57 ../sflphone-gtk/src/sflnotify.c:103
 #, c-format
 msgid "%d voice mails"
@@ -136,13 +116,13 @@ msgstr ""
 msgid "%s account- %s"
 msgstr ""
 
-#: ../sflphone-gtk/src/actions.c:229
+#: ../sflphone-gtk/src/actions.c:224
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
 msgstr ""
 
-#: ../sflphone-gtk/src/actions.c:756
+#: ../sflphone-gtk/src/actions.c:798
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -151,59 +131,83 @@ msgid ""
 "b> directory in your home( <i>%s</i> )"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:138
+#: ../sflphone-gtk/src/assistant.c:148
 msgid "SFLphone account configuration wizard"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "SFLphone 0.9.2"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "Welcome to SFLphone!"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:167
+#: ../sflphone-gtk/src/assistant.c:178
 msgid "This installation wizard will help you configure an account."
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "VoIP Protocols"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "Select an account type:"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:202
+#: ../sflphone-gtk/src/assistant.c:211
+msgid "Account"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:211
+msgid "Please select one of the following option:"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:213
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:215
+msgid "Register an existing SIP or IAX2 account"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:230
 msgid "SIP account configuration"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:202 ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:230 ../sflphone-gtk/src/assistant.c:284
 msgid "Please fill the following information:"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:284
 msgid "IAX2 account configuration"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:313
+#: ../sflphone-gtk/src/assistant.c:341 ../sflphone-gtk/src/configwindow.c:821
+msgid "Network Address Translation"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:341
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:329
+#: ../sflphone-gtk/src/assistant.c:350 ../sflphone-gtk/src/configwindow.c:496
+msgid "E_nable STUN"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:357
 msgid "_STUN server"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Account Registration"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Congratulations!"
 msgstr ""
 
-#: ../sflphone-gtk/src/assistant.c:348
+#: ../sflphone-gtk/src/assistant.c:376
 msgid ""
 "This assistant is now finished.\n"
 "\n"
@@ -211,193 +215,229 @@ msgid ""
 "parameters in the Options/Accounts window."
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:150
+#: ../sflphone-gtk/src/audioconf.c:154
 #, c-format
 msgid "audio device index for output = %d\n"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:558
+#: ../sflphone-gtk/src/audioconf.c:562
 msgid "Name"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:563
+#: ../sflphone-gtk/src/audioconf.c:567
 msgid "Frequency"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:568
+#: ../sflphone-gtk/src/audioconf.c:572
 msgid "Bitrate"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:573
+#: ../sflphone-gtk/src/audioconf.c:577
 msgid "Bandwidth"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:633
+#: ../sflphone-gtk/src/audioconf.c:637
 msgid "Pulseaudio"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:636
+#: ../sflphone-gtk/src/audioconf.c:640
 msgid "ALSA"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:662
+#: ../sflphone-gtk/src/audioconf.c:666
 msgid "ALSA plugin"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:684
+#: ../sflphone-gtk/src/audioconf.c:688
 msgid "Output"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:706
+#: ../sflphone-gtk/src/audioconf.c:710
 msgid "Input"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:739
+#: ../sflphone-gtk/src/audioconf.c:743
 msgid "_Enable ringtones"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:744
+#: ../sflphone-gtk/src/audioconf.c:748
 msgid "Choose a ringtone"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:749
+#: ../sflphone-gtk/src/audioconf.c:753
 msgid "Audio Files"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:774
+#: ../sflphone-gtk/src/audioconf.c:770
+msgid "_Activate silence detection"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:798
 msgid "Sound Manager"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:781
+#: ../sflphone-gtk/src/audioconf.c:805
 msgid "ALSA configuration"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:791
+#: ../sflphone-gtk/src/audioconf.c:815
 msgid "Codecs"
 msgstr ""
 
-#: ../sflphone-gtk/src/audioconf.c:799
+#: ../sflphone-gtk/src/audioconf.c:823
+msgid "Noise reduction"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:830
 msgid "Ringtones"
 msgstr ""
 
-#: ../sflphone-gtk/src/calltree.c:208
+#: ../sflphone-gtk/src/calltree.c:209
 #, c-format
 msgid "\"Voicemail\" <%s>"
 msgstr ""
 
-#: ../sflphone-gtk/src/calltree.c:405 ../sflphone-gtk/src/calltree.c:407
+#: ../sflphone-gtk/src/calltree.c:431 ../sflphone-gtk/src/calltree.c:433
 msgid "Place a call"
 msgstr ""
 
-#: ../sflphone-gtk/src/calltree.c:414 ../sflphone-gtk/src/calltree.c:416
+#: ../sflphone-gtk/src/calltree.c:440 ../sflphone-gtk/src/calltree.c:442
 msgid "Pick up"
 msgstr ""
 
-#: ../sflphone-gtk/src/calltree.c:424 ../sflphone-gtk/src/calltree.c:426
+#: ../sflphone-gtk/src/calltree.c:450 ../sflphone-gtk/src/calltree.c:452
 msgid "Hang up"
 msgstr ""
 
-#: ../sflphone-gtk/src/calltree.c:434 ../sflphone-gtk/src/calltree.c:436
+#: ../sflphone-gtk/src/calltree.c:460 ../sflphone-gtk/src/calltree.c:462
 msgid "Off Hold"
 msgstr ""
 
-#: ../sflphone-gtk/src/calltree.c:445 ../sflphone-gtk/src/calltree.c:447
+#: ../sflphone-gtk/src/calltree.c:471 ../sflphone-gtk/src/calltree.c:473
 msgid "On Hold"
 msgstr ""
 
-#: ../sflphone-gtk/src/calltree.c:458 ../sflphone-gtk/src/calltree.c:460
+#: ../sflphone-gtk/src/calltree.c:484 ../sflphone-gtk/src/calltree.c:486
 msgid "Transfer"
 msgstr ""
 
-#: ../sflphone-gtk/src/calltree.c:470 ../sflphone-gtk/src/calltree.c:472
+#: ../sflphone-gtk/src/calltree.c:496 ../sflphone-gtk/src/calltree.c:498
 msgid "History"
 msgstr ""
 
-#: ../sflphone-gtk/src/calltree.c:480 ../sflphone-gtk/src/calltree.c:484
+#: ../sflphone-gtk/src/calltree.c:506 ../sflphone-gtk/src/calltree.c:510
 msgid "Voicemail"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:371
+#: ../sflphone-gtk/src/calltree.c:521
+msgid "Record a call"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:382
 msgid "Protocol"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:378
+#: ../sflphone-gtk/src/configwindow.c:389
 msgid "Status"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:470
+#: ../sflphone-gtk/src/configwindow.c:492
+msgid "Stun parameters will apply to each SIP account created."
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:500
+msgid "Enable it if you are behind a firewall"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:508
+msgid "Format: name.server:port"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:558
 msgid "Desktop Notification"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:478
+#: ../sflphone-gtk/src/configwindow.c:566
 msgid "_Enable"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:483
+#: ../sflphone-gtk/src/configwindow.c:571
 msgid "_Notify voice mails"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:489
+#: ../sflphone-gtk/src/configwindow.c:577
 msgid "System Tray Icon"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:497
+#: ../sflphone-gtk/src/configwindow.c:585
 msgid "_Popup main window on incoming call"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:502
+#: ../sflphone-gtk/src/configwindow.c:590
 msgid "Ne_ver popup main window"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:506
+#: ../sflphone-gtk/src/configwindow.c:594
 msgid "_Start hidden"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:512
+#: ../sflphone-gtk/src/configwindow.c:600
 msgid "Calls History"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:520
+#: ../sflphone-gtk/src/configwindow.c:608
 msgid "_Maximum number of calls"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:536
+#: ../sflphone-gtk/src/configwindow.c:624
 msgid "PulseAudio sound server"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:544
+#: ../sflphone-gtk/src/configwindow.c:632
 msgid "_Control running applications volume"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:557
+#: ../sflphone-gtk/src/configwindow.c:645
 msgid "SIP Port"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:566
-msgid "Apply"
+#: ../sflphone-gtk/src/configwindow.c:658
+msgid "Port:"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:570
-msgid "Port:"
+#: ../sflphone-gtk/src/configwindow.c:703
+msgid "General"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:600
+#: ../sflphone-gtk/src/configwindow.c:714
+msgid "_Destination folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:719
+msgid "Select a folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:744
 msgid "Preferences"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:620
+#: ../sflphone-gtk/src/configwindow.c:764
 msgid "General Settings"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:625
+#: ../sflphone-gtk/src/configwindow.c:769
 msgid "Audio Settings"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:649
+#: ../sflphone-gtk/src/configwindow.c:774
+msgid "Record"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:798
 msgid "Accounts"
 msgstr ""
 
-#: ../sflphone-gtk/src/configwindow.c:661
+#: ../sflphone-gtk/src/configwindow.c:810
 msgid "Accounts previously setup"
 msgstr ""
 
@@ -422,93 +462,89 @@ msgid ""
 "Pulseaudio is not running"
 msgstr ""
 
-#: ../sflphone-gtk/src/historyfilter.c:45
-#: ../sflphone-gtk/src/historyfilter.c:63
-#: ../sflphone-gtk/src/historyfilter.c:78
+#: ../sflphone-gtk/src/historyfilter.c:49
+#: ../sflphone-gtk/src/historyfilter.c:68
+#: ../sflphone-gtk/src/historyfilter.c:83
 msgid "Search"
 msgstr ""
 
 #: ../sflphone-gtk/src/mainwindow.c:69
-msgid ""
-"<b>There is one call in progress.</b>\n"
-"Do you still want to quit?"
+msgid "There is one call in progress."
 msgstr ""
 
 #: ../sflphone-gtk/src/mainwindow.c:73
-msgid ""
-"<b>There are calls in progress.</b>\n"
-"Do you still want to quit?"
+msgid "There are calls in progress."
+msgstr ""
+
+#: ../sflphone-gtk/src/mainwindow.c:82
+msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:130
+#: ../sflphone-gtk/src/menus.c:135
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:133
+#: ../sflphone-gtk/src/menus.c:138
 msgid "About SFLphone"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:156
+#: ../sflphone-gtk/src/menus.c:161
 msgid "_Help"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:273
+#: ../sflphone-gtk/src/menus.c:278
 msgid "_New call"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:285 ../sflphone-gtk/src/menus.c:769
+#: ../sflphone-gtk/src/menus.c:290 ../sflphone-gtk/src/menus.c:760
 msgid "_Pick up"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:295 ../sflphone-gtk/src/menus.c:781
+#: ../sflphone-gtk/src/menus.c:300 ../sflphone-gtk/src/menus.c:772
 msgid "_Hang up"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:305 ../sflphone-gtk/src/menus.c:793
+#: ../sflphone-gtk/src/menus.c:310 ../sflphone-gtk/src/menus.c:784
 msgid "On _Hold"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:321
+#: ../sflphone-gtk/src/menus.c:326
 msgid "_Account Assistant"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:351
+#: ../sflphone-gtk/src/menus.c:356
 msgid "_Call"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:497
-msgid "History empty"
-msgstr ""
-
-#: ../sflphone-gtk/src/menus.c:538
+#: ../sflphone-gtk/src/menus.c:529
 msgid "_Clear history"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:550
+#: ../sflphone-gtk/src/menus.c:541
 msgid "_Accounts"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:565
+#: ../sflphone-gtk/src/menus.c:556
 msgid "_Edit"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:625
+#: ../sflphone-gtk/src/menus.c:616
 msgid "_Dialpad"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:637
+#: ../sflphone-gtk/src/menus.c:628
 msgid "_Volume controls"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:646
+#: ../sflphone-gtk/src/menus.c:637
 msgid "_Search history"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:654
+#: ../sflphone-gtk/src/menus.c:645
 msgid "_View"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:876
+#: ../sflphone-gtk/src/menus.c:867
 msgid "_Call back"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 83994831f201dc95ca2bd16db118e3ac214b4bcd..085283ae4c639b755fa4a606a9a5aad836f51b7d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
-"Report-Msgid-Bugs-To: sflphoneteam@savoirfairelinux.com\n"
-"POT-Creation-Date: 2008-11-05 16:41-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-10 15:24-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"
@@ -59,70 +59,50 @@ msgstr "Stun服务器无效"
 msgid "Invalid"
 msgstr "无效"
 
-#: ../sflphone-gtk/src/accountwindow.c:143
+#: ../sflphone-gtk/src/accountwindow.c:109
 msgid "Account settings"
 msgstr "帐户设置"
 
-#: ../sflphone-gtk/src/accountwindow.c:155
+#: ../sflphone-gtk/src/accountwindow.c:121
 msgid "Account parameters"
 msgstr "帐户相关参数"
 
-#: ../sflphone-gtk/src/accountwindow.c:177
+#: ../sflphone-gtk/src/accountwindow.c:143
 msgid "_Enabled"
 msgstr "启用(E)"
 
-#: ../sflphone-gtk/src/accountwindow.c:183 ../sflphone-gtk/src/assistant.c:210
-#: ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/accountwindow.c:149 ../sflphone-gtk/src/assistant.c:238
+#: ../sflphone-gtk/src/assistant.c:292
 msgid "_Alias"
 msgstr "别名(A)"
 
-#: ../sflphone-gtk/src/accountwindow.c:191
+#: ../sflphone-gtk/src/accountwindow.c:157
 msgid "_Protocol"
 msgstr "协议(P)"
 
-#: ../sflphone-gtk/src/accountwindow.c:209
+#: ../sflphone-gtk/src/accountwindow.c:175
 msgid "Unknown"
 msgstr "未知"
 
-#: ../sflphone-gtk/src/accountwindow.c:219 ../sflphone-gtk/src/assistant.c:218
-#: ../sflphone-gtk/src/assistant.c:272
+#: ../sflphone-gtk/src/accountwindow.c:185 ../sflphone-gtk/src/assistant.c:246
+#: ../sflphone-gtk/src/assistant.c:300
 msgid "_Host name"
 msgstr "主机名(H)"
 
-#: ../sflphone-gtk/src/accountwindow.c:227 ../sflphone-gtk/src/assistant.c:226
-#: ../sflphone-gtk/src/assistant.c:280
+#: ../sflphone-gtk/src/accountwindow.c:193 ../sflphone-gtk/src/assistant.c:254
+#: ../sflphone-gtk/src/assistant.c:308
 msgid "_User name"
 msgstr "用户名(U)"
 
-#: ../sflphone-gtk/src/accountwindow.c:238 ../sflphone-gtk/src/assistant.c:236
-#: ../sflphone-gtk/src/assistant.c:290
+#: ../sflphone-gtk/src/accountwindow.c:204 ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/assistant.c:318
 msgid "_Password"
 msgstr "密码(P)"
 
-#: ../sflphone-gtk/src/accountwindow.c:249
+#: ../sflphone-gtk/src/accountwindow.c:215
 msgid "_Voicemail box #"
 msgstr "语音信箱(V)"
 
-#: ../sflphone-gtk/src/accountwindow.c:260 ../sflphone-gtk/src/assistant.c:313
-msgid "Network Address Translation"
-msgstr "网络地址解析"
-
-#: ../sflphone-gtk/src/accountwindow.c:271 ../sflphone-gtk/src/assistant.c:322
-msgid "E_nable STUN"
-msgstr "使用STUN(n)"
-
-#: ../sflphone-gtk/src/accountwindow.c:275
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
-msgstr "当使用防火墙时,需设定STUN. 设置完毕后,请重新启动SFLphone"
-
-#: ../sflphone-gtk/src/accountwindow.c:279
-msgid "_STUN Server"
-msgstr "STUN服务器(S)"
-
-#: ../sflphone-gtk/src/accountwindow.c:286
-msgid "Format: name.server:port"
-msgstr "格式:name.server:port"
-
 #: ../sflphone-gtk/src/actions.c:57 ../sflphone-gtk/src/sflnotify.c:103
 #, c-format
 msgid "%d voice mails"
@@ -138,7 +118,7 @@ msgstr "%d 个语音信息"
 msgid "%s account- %s"
 msgstr "%s 帐户- %s"
 
-#: ../sflphone-gtk/src/actions.c:229
+#: ../sflphone-gtk/src/actions.c:224
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -146,7 +126,7 @@ msgstr ""
 "连接SFLphone服务器失败.\n"
 "请检查daemon是否还在运行."
 
-#: ../sflphone-gtk/src/actions.c:756
+#: ../sflphone-gtk/src/actions.c:798
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -159,60 +139,86 @@ msgstr ""
 "</b> SFL声音codecs文件应位于<i>%s</i> 或 位于主目录( <i>%s</i> )的<b>."
 "sflphone</b>目录下"
 
-#: ../sflphone-gtk/src/assistant.c:138
+#: ../sflphone-gtk/src/assistant.c:148
 msgid "SFLphone account configuration wizard"
 msgstr "SFLphone 帐户设置向导"
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 #, fuzzy
 msgid "SFLphone 0.9.2"
 msgstr "SFLphone 0.8"
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "Welcome to SFLphone!"
 msgstr "欢迎使用SFLphone!"
 
-#: ../sflphone-gtk/src/assistant.c:167
+#: ../sflphone-gtk/src/assistant.c:178
 msgid "This installation wizard will help you configure an account."
 msgstr "安装向导将帮助您配置帐户"
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "VoIP Protocols"
 msgstr "VoIP协议"
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "Select an account type:"
 msgstr "选择帐户类型:"
 
-#: ../sflphone-gtk/src/assistant.c:202
+#: ../sflphone-gtk/src/assistant.c:211
+#, fuzzy
+msgid "Account"
+msgstr "帐户"
+
+#: ../sflphone-gtk/src/assistant.c:211
+#, fuzzy
+msgid "Please select one of the following option:"
+msgstr "请填写以下信息:"
+
+#: ../sflphone-gtk/src/assistant.c:213
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:215
+msgid "Register an existing SIP or IAX2 account"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:230
 msgid "SIP account configuration"
 msgstr "SIP帐户配置"
 
-#: ../sflphone-gtk/src/assistant.c:202 ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:230 ../sflphone-gtk/src/assistant.c:284
 msgid "Please fill the following information:"
 msgstr "请填写以下信息:"
 
-#: ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:284
 msgid "IAX2 account configuration"
 msgstr "IAX2帐户配置"
 
-#: ../sflphone-gtk/src/assistant.c:313
+#: ../sflphone-gtk/src/assistant.c:341 ../sflphone-gtk/src/configwindow.c:821
+msgid "Network Address Translation"
+msgstr "网络地址解析"
+
+#: ../sflphone-gtk/src/assistant.c:341
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "如果你的网络使用防火墙,你很有可能需要设定此项."
 
-#: ../sflphone-gtk/src/assistant.c:329
+#: ../sflphone-gtk/src/assistant.c:350 ../sflphone-gtk/src/configwindow.c:496
+msgid "E_nable STUN"
+msgstr "使用STUN(n)"
+
+#: ../sflphone-gtk/src/assistant.c:357
 msgid "_STUN server"
 msgstr "STUN服务器(S)"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Account Registration"
 msgstr "帐户注册"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Congratulations!"
 msgstr "恭喜!"
 
-#: ../sflphone-gtk/src/assistant.c:348
+#: ../sflphone-gtk/src/assistant.c:376
 msgid ""
 "This assistant is now finished.\n"
 "\n"
@@ -223,193 +229,232 @@ msgstr ""
 "\n"
 "你可以随时在 选项/帐户 窗口中查看注册状态或者修改帐户参数"
 
-#: ../sflphone-gtk/src/audioconf.c:150
+#: ../sflphone-gtk/src/audioconf.c:154
 #, c-format
 msgid "audio device index for output = %d\n"
 msgstr "音频设备索引输出 = %d\n"
 
-#: ../sflphone-gtk/src/audioconf.c:558
+#: ../sflphone-gtk/src/audioconf.c:562
 msgid "Name"
 msgstr "名称"
 
-#: ../sflphone-gtk/src/audioconf.c:563
+#: ../sflphone-gtk/src/audioconf.c:567
 msgid "Frequency"
 msgstr "频率"
 
-#: ../sflphone-gtk/src/audioconf.c:568
+#: ../sflphone-gtk/src/audioconf.c:572
 msgid "Bitrate"
 msgstr "比率"
 
-#: ../sflphone-gtk/src/audioconf.c:573
+#: ../sflphone-gtk/src/audioconf.c:577
 msgid "Bandwidth"
 msgstr "带宽"
 
-#: ../sflphone-gtk/src/audioconf.c:633
+#: ../sflphone-gtk/src/audioconf.c:637
 msgid "Pulseaudio"
 msgstr "Pulseaudio"
 
-#: ../sflphone-gtk/src/audioconf.c:636
+#: ../sflphone-gtk/src/audioconf.c:640
 msgid "ALSA"
 msgstr "ALSA"
 
-#: ../sflphone-gtk/src/audioconf.c:662
+#: ../sflphone-gtk/src/audioconf.c:666
 msgid "ALSA plugin"
 msgstr "ALSA插件"
 
-#: ../sflphone-gtk/src/audioconf.c:684
+#: ../sflphone-gtk/src/audioconf.c:688
 msgid "Output"
 msgstr "输出"
 
-#: ../sflphone-gtk/src/audioconf.c:706
+#: ../sflphone-gtk/src/audioconf.c:710
 msgid "Input"
 msgstr "输入"
 
-#: ../sflphone-gtk/src/audioconf.c:739
+#: ../sflphone-gtk/src/audioconf.c:743
 msgid "_Enable ringtones"
 msgstr "启用铃声(E)"
 
-#: ../sflphone-gtk/src/audioconf.c:744
+#: ../sflphone-gtk/src/audioconf.c:748
 msgid "Choose a ringtone"
 msgstr "选择铃声"
 
-#: ../sflphone-gtk/src/audioconf.c:749
+#: ../sflphone-gtk/src/audioconf.c:753
 msgid "Audio Files"
 msgstr "音频文件"
 
-#: ../sflphone-gtk/src/audioconf.c:774
+#: ../sflphone-gtk/src/audioconf.c:770
+msgid "_Activate silence detection"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:798
 msgid "Sound Manager"
 msgstr "音频管理器"
 
-#: ../sflphone-gtk/src/audioconf.c:781
+#: ../sflphone-gtk/src/audioconf.c:805
 msgid "ALSA configuration"
 msgstr "ALSA 配置"
 
-#: ../sflphone-gtk/src/audioconf.c:791
+#: ../sflphone-gtk/src/audioconf.c:815
 msgid "Codecs"
 msgstr "Codecs编码"
 
-#: ../sflphone-gtk/src/audioconf.c:799
+#: ../sflphone-gtk/src/audioconf.c:823
+msgid "Noise reduction"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:830
 msgid "Ringtones"
 msgstr "铃声"
 
-#: ../sflphone-gtk/src/calltree.c:208
+#: ../sflphone-gtk/src/calltree.c:209
 #, c-format
 msgid "\"Voicemail\" <%s>"
 msgstr "\"语音邮件\" <%s>"
 
-#: ../sflphone-gtk/src/calltree.c:405 ../sflphone-gtk/src/calltree.c:407
+#: ../sflphone-gtk/src/calltree.c:431 ../sflphone-gtk/src/calltree.c:433
 msgid "Place a call"
 msgstr "拨号"
 
-#: ../sflphone-gtk/src/calltree.c:414 ../sflphone-gtk/src/calltree.c:416
+#: ../sflphone-gtk/src/calltree.c:440 ../sflphone-gtk/src/calltree.c:442
 msgid "Pick up"
 msgstr "接电话"
 
-#: ../sflphone-gtk/src/calltree.c:424 ../sflphone-gtk/src/calltree.c:426
+#: ../sflphone-gtk/src/calltree.c:450 ../sflphone-gtk/src/calltree.c:452
 msgid "Hang up"
 msgstr "放电话"
 
-#: ../sflphone-gtk/src/calltree.c:434 ../sflphone-gtk/src/calltree.c:436
+#: ../sflphone-gtk/src/calltree.c:460 ../sflphone-gtk/src/calltree.c:462
 msgid "Off Hold"
 msgstr "恢复通话"
 
-#: ../sflphone-gtk/src/calltree.c:445 ../sflphone-gtk/src/calltree.c:447
+#: ../sflphone-gtk/src/calltree.c:471 ../sflphone-gtk/src/calltree.c:473
 msgid "On Hold"
 msgstr "待机"
 
-#: ../sflphone-gtk/src/calltree.c:458 ../sflphone-gtk/src/calltree.c:460
+#: ../sflphone-gtk/src/calltree.c:484 ../sflphone-gtk/src/calltree.c:486
 msgid "Transfer"
 msgstr "转接"
 
-#: ../sflphone-gtk/src/calltree.c:470 ../sflphone-gtk/src/calltree.c:472
+#: ../sflphone-gtk/src/calltree.c:496 ../sflphone-gtk/src/calltree.c:498
 msgid "History"
 msgstr "历史"
 
-#: ../sflphone-gtk/src/calltree.c:480 ../sflphone-gtk/src/calltree.c:484
+#: ../sflphone-gtk/src/calltree.c:506 ../sflphone-gtk/src/calltree.c:510
 msgid "Voicemail"
 msgstr "语音信箱"
 
-#: ../sflphone-gtk/src/configwindow.c:371
+#: ../sflphone-gtk/src/calltree.c:521
+#, fuzzy
+msgid "Record a call"
+msgstr "拨号"
+
+#: ../sflphone-gtk/src/configwindow.c:382
 msgid "Protocol"
 msgstr "协议"
 
-#: ../sflphone-gtk/src/configwindow.c:378
+#: ../sflphone-gtk/src/configwindow.c:389
 msgid "Status"
 msgstr "状态"
 
-#: ../sflphone-gtk/src/configwindow.c:470
+#: ../sflphone-gtk/src/configwindow.c:492
+msgid "Stun parameters will apply to each SIP account created."
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:500
+#, fuzzy
+msgid "Enable it if you are behind a firewall"
+msgstr "当使用防火墙时,需设定STUN. 设置完毕后,请重新启动SFLphone"
+
+#: ../sflphone-gtk/src/configwindow.c:508
+msgid "Format: name.server:port"
+msgstr "格式:name.server:port"
+
+#: ../sflphone-gtk/src/configwindow.c:558
 msgid "Desktop Notification"
 msgstr "桌面提示"
 
-#: ../sflphone-gtk/src/configwindow.c:478
+#: ../sflphone-gtk/src/configwindow.c:566
 msgid "_Enable"
 msgstr "启用(E)"
 
-#: ../sflphone-gtk/src/configwindow.c:483
+#: ../sflphone-gtk/src/configwindow.c:571
 msgid "_Notify voice mails"
 msgstr "通知语音邮件(N)"
 
-#: ../sflphone-gtk/src/configwindow.c:489
+#: ../sflphone-gtk/src/configwindow.c:577
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
-#: ../sflphone-gtk/src/configwindow.c:497
+#: ../sflphone-gtk/src/configwindow.c:585
 msgid "_Popup main window on incoming call"
 msgstr "来电时弹出主窗口(P)"
 
-#: ../sflphone-gtk/src/configwindow.c:502
+#: ../sflphone-gtk/src/configwindow.c:590
 msgid "Ne_ver popup main window"
 msgstr "从不弹出主窗口(v)"
 
-#: ../sflphone-gtk/src/configwindow.c:506
+#: ../sflphone-gtk/src/configwindow.c:594
 msgid "_Start hidden"
 msgstr "启动时隐藏(S)"
 
-#: ../sflphone-gtk/src/configwindow.c:512
+#: ../sflphone-gtk/src/configwindow.c:600
 msgid "Calls History"
 msgstr "拨号历史"
 
-#: ../sflphone-gtk/src/configwindow.c:520
+#: ../sflphone-gtk/src/configwindow.c:608
 msgid "_Maximum number of calls"
 msgstr "最大拨号数(M)"
 
-#: ../sflphone-gtk/src/configwindow.c:536
+#: ../sflphone-gtk/src/configwindow.c:624
 msgid "PulseAudio sound server"
 msgstr "PulseAudio服务器"
 
-#: ../sflphone-gtk/src/configwindow.c:544
+#: ../sflphone-gtk/src/configwindow.c:632
 msgid "_Control running applications volume"
 msgstr "控制正在运行的应用程序的音量(C)"
 
-#: ../sflphone-gtk/src/configwindow.c:557
+#: ../sflphone-gtk/src/configwindow.c:645
 msgid "SIP Port"
 msgstr "SIP端口号"
 
-#: ../sflphone-gtk/src/configwindow.c:566
-msgid "Apply"
-msgstr "应用"
-
-#: ../sflphone-gtk/src/configwindow.c:570
+#: ../sflphone-gtk/src/configwindow.c:658
 msgid "Port:"
 msgstr "端口:"
 
-#: ../sflphone-gtk/src/configwindow.c:600
+#: ../sflphone-gtk/src/configwindow.c:703
+#, fuzzy
+msgid "General"
+msgstr "常用配置"
+
+#: ../sflphone-gtk/src/configwindow.c:714
+msgid "_Destination folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:719
+msgid "Select a folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:744
 msgid "Preferences"
 msgstr "属性"
 
-#: ../sflphone-gtk/src/configwindow.c:620
+#: ../sflphone-gtk/src/configwindow.c:764
 msgid "General Settings"
 msgstr "常用配置"
 
-#: ../sflphone-gtk/src/configwindow.c:625
+#: ../sflphone-gtk/src/configwindow.c:769
 msgid "Audio Settings"
 msgstr "音频配置"
 
-#: ../sflphone-gtk/src/configwindow.c:649
+#: ../sflphone-gtk/src/configwindow.c:774
+msgid "Record"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:798
 msgid "Accounts"
 msgstr "帐户"
 
-#: ../sflphone-gtk/src/configwindow.c:661
+#: ../sflphone-gtk/src/configwindow.c:810
 msgid "Accounts previously setup"
 msgstr "以前帐户设置"
 
@@ -440,97 +485,95 @@ msgid ""
 "Pulseaudio is not running"
 msgstr ""
 
-#: ../sflphone-gtk/src/historyfilter.c:45
-#: ../sflphone-gtk/src/historyfilter.c:63
-#: ../sflphone-gtk/src/historyfilter.c:78
+#: ../sflphone-gtk/src/historyfilter.c:49
+#: ../sflphone-gtk/src/historyfilter.c:68
+#: ../sflphone-gtk/src/historyfilter.c:83
 msgid "Search"
 msgstr "查找"
 
 #: ../sflphone-gtk/src/mainwindow.c:69
-msgid ""
-"<b>There is one call in progress.</b>\n"
-"Do you still want to quit?"
+#, fuzzy
+msgid "There is one call in progress."
 msgstr ""
 "<b>有一个电话正在处理</b>\n"
 "确定要退出?"
 
 #: ../sflphone-gtk/src/mainwindow.c:73
-msgid ""
-"<b>There are calls in progress.</b>\n"
-"Do you still want to quit?"
+#, fuzzy
+msgid "There are calls in progress."
 msgstr ""
 "<b>有电话正在处理中</b>\n"
 "确定要退出?"
 
-#: ../sflphone-gtk/src/menus.c:130
+#: ../sflphone-gtk/src/mainwindow.c:82
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../sflphone-gtk/src/menus.c:135
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone是一个VoIP客户端,它兼容SIP和IAX2协议."
 
-#: ../sflphone-gtk/src/menus.c:133
+#: ../sflphone-gtk/src/menus.c:138
 msgid "About SFLphone"
 msgstr "关于SFLphone"
 
-#: ../sflphone-gtk/src/menus.c:156
+#: ../sflphone-gtk/src/menus.c:161
 msgid "_Help"
 msgstr "帮助(H)"
 
-#: ../sflphone-gtk/src/menus.c:273
+#: ../sflphone-gtk/src/menus.c:278
 msgid "_New call"
 msgstr "新电话(N)"
 
-#: ../sflphone-gtk/src/menus.c:285 ../sflphone-gtk/src/menus.c:769
+#: ../sflphone-gtk/src/menus.c:290 ../sflphone-gtk/src/menus.c:760
 msgid "_Pick up"
 msgstr "拨出(P)"
 
-#: ../sflphone-gtk/src/menus.c:295 ../sflphone-gtk/src/menus.c:781
+#: ../sflphone-gtk/src/menus.c:300 ../sflphone-gtk/src/menus.c:772
 msgid "_Hang up"
 msgstr "放下(H)"
 
-#: ../sflphone-gtk/src/menus.c:305 ../sflphone-gtk/src/menus.c:793
+#: ../sflphone-gtk/src/menus.c:310 ../sflphone-gtk/src/menus.c:784
 msgid "On _Hold"
 msgstr ""
 
-#: ../sflphone-gtk/src/menus.c:321
+#: ../sflphone-gtk/src/menus.c:326
 msgid "_Account Assistant"
 msgstr "帐户向导(A)"
 
-#: ../sflphone-gtk/src/menus.c:351
+#: ../sflphone-gtk/src/menus.c:356
 msgid "_Call"
 msgstr "电话"
 
-#: ../sflphone-gtk/src/menus.c:497
-msgid "History empty"
-msgstr "无历史记录"
-
-#: ../sflphone-gtk/src/menus.c:538
+#: ../sflphone-gtk/src/menus.c:529
 msgid "_Clear history"
 msgstr "清空历史记录(C)"
 
-#: ../sflphone-gtk/src/menus.c:550
+#: ../sflphone-gtk/src/menus.c:541
 msgid "_Accounts"
 msgstr "帐户(A)"
 
-#: ../sflphone-gtk/src/menus.c:565
+#: ../sflphone-gtk/src/menus.c:556
 msgid "_Edit"
 msgstr "编辑(E)"
 
-#: ../sflphone-gtk/src/menus.c:625
+#: ../sflphone-gtk/src/menus.c:616
 msgid "_Dialpad"
 msgstr "拨号面板"
 
-#: ../sflphone-gtk/src/menus.c:637
+#: ../sflphone-gtk/src/menus.c:628
 msgid "_Volume controls"
 msgstr "音量控制(V)"
 
-#: ../sflphone-gtk/src/menus.c:646
+#: ../sflphone-gtk/src/menus.c:637
 msgid "_Search history"
 msgstr "查找历史(S)"
 
-#: ../sflphone-gtk/src/menus.c:654
+#: ../sflphone-gtk/src/menus.c:645
 msgid "_View"
 msgstr "查看(V)"
 
-#: ../sflphone-gtk/src/menus.c:876
+#: ../sflphone-gtk/src/menus.c:867
 msgid "_Call back"
 msgstr "回叫(C)"
 
@@ -603,3 +646,12 @@ msgstr "<small>未接电话</small>"
 #, c-format
 msgid "<small>Duration:</small> %s"
 msgstr "<small>时长:</small> %s"
+
+#~ msgid "_STUN Server"
+#~ msgstr "STUN服务器(S)"
+
+#~ msgid "Apply"
+#~ msgstr "应用"
+
+#~ msgid "History empty"
+#~ msgstr "无历史记录"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4fc50eff51e928da7b98b64a1e9aaab0c70a739c..311f9d3b340a3eeb513bfba7092a5680cd24245c 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
-"Report-Msgid-Bugs-To: sflphoneteam@savoirfairelinux.com\n"
-"POT-Creation-Date: 2008-11-05 16:41-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-10 15:24-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"
@@ -59,70 +59,50 @@ msgstr "Stun伺服器無效"
 msgid "Invalid"
 msgstr "無效"
 
-#: ../sflphone-gtk/src/accountwindow.c:143
+#: ../sflphone-gtk/src/accountwindow.c:109
 msgid "Account settings"
 msgstr "帳戶設置"
 
-#: ../sflphone-gtk/src/accountwindow.c:155
+#: ../sflphone-gtk/src/accountwindow.c:121
 msgid "Account parameters"
 msgstr "帳戶相關參數"
 
-#: ../sflphone-gtk/src/accountwindow.c:177
+#: ../sflphone-gtk/src/accountwindow.c:143
 msgid "_Enabled"
 msgstr "啟用(E)"
 
-#: ../sflphone-gtk/src/accountwindow.c:183 ../sflphone-gtk/src/assistant.c:210
-#: ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/accountwindow.c:149 ../sflphone-gtk/src/assistant.c:238
+#: ../sflphone-gtk/src/assistant.c:292
 msgid "_Alias"
 msgstr "別稱(A)"
 
-#: ../sflphone-gtk/src/accountwindow.c:191
+#: ../sflphone-gtk/src/accountwindow.c:157
 msgid "_Protocol"
 msgstr "協議(P)"
 
-#: ../sflphone-gtk/src/accountwindow.c:209
+#: ../sflphone-gtk/src/accountwindow.c:175
 msgid "Unknown"
 msgstr "未知"
 
-#: ../sflphone-gtk/src/accountwindow.c:219 ../sflphone-gtk/src/assistant.c:218
-#: ../sflphone-gtk/src/assistant.c:272
+#: ../sflphone-gtk/src/accountwindow.c:185 ../sflphone-gtk/src/assistant.c:246
+#: ../sflphone-gtk/src/assistant.c:300
 msgid "_Host name"
 msgstr "主机名稱(H)"
 
-#: ../sflphone-gtk/src/accountwindow.c:227 ../sflphone-gtk/src/assistant.c:226
-#: ../sflphone-gtk/src/assistant.c:280
+#: ../sflphone-gtk/src/accountwindow.c:193 ../sflphone-gtk/src/assistant.c:254
+#: ../sflphone-gtk/src/assistant.c:308
 msgid "_User name"
 msgstr "使用者名稱(U)"
 
-#: ../sflphone-gtk/src/accountwindow.c:238 ../sflphone-gtk/src/assistant.c:236
-#: ../sflphone-gtk/src/assistant.c:290
+#: ../sflphone-gtk/src/accountwindow.c:204 ../sflphone-gtk/src/assistant.c:264
+#: ../sflphone-gtk/src/assistant.c:318
 msgid "_Password"
 msgstr "密碼(P)"
 
-#: ../sflphone-gtk/src/accountwindow.c:249
+#: ../sflphone-gtk/src/accountwindow.c:215
 msgid "_Voicemail box #"
 msgstr "語音郵箱(V)"
 
-#: ../sflphone-gtk/src/accountwindow.c:260 ../sflphone-gtk/src/assistant.c:313
-msgid "Network Address Translation"
-msgstr "網路地址分析"
-
-#: ../sflphone-gtk/src/accountwindow.c:271 ../sflphone-gtk/src/assistant.c:322
-msgid "E_nable STUN"
-msgstr "使用STUN(n)"
-
-#: ../sflphone-gtk/src/accountwindow.c:275
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
-msgstr "當使用防火牆時,需要設定STUN. 完成設定后,請重新啟動SFLphone"
-
-#: ../sflphone-gtk/src/accountwindow.c:279
-msgid "_STUN Server"
-msgstr "STUN伺服器(S)"
-
-#: ../sflphone-gtk/src/accountwindow.c:286
-msgid "Format: name.server:port"
-msgstr "格式:name.server:port"
-
 #: ../sflphone-gtk/src/actions.c:57 ../sflphone-gtk/src/sflnotify.c:103
 #, c-format
 msgid "%d voice mails"
@@ -138,7 +118,7 @@ msgstr "%d 個語音郵件"
 msgid "%s account- %s"
 msgstr "%s 帳戶- %s"
 
-#: ../sflphone-gtk/src/actions.c:229
+#: ../sflphone-gtk/src/actions.c:224
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -146,7 +126,7 @@ msgstr ""
 "連接SFLphone伺服器失敗.\n"
 "請核查daemon是否正在運行."
 
-#: ../sflphone-gtk/src/actions.c:756
+#: ../sflphone-gtk/src/actions.c:798
 #, c-format
 msgid ""
 "<b>Error: No audio codecs found.\n"
@@ -159,60 +139,86 @@ msgstr ""
 "</b> SFL聲音編碼檔案應該位于<i>%s</i> 或者位于主目錄( <i>%s</i> )的<b>."
 "sflphone</b>目錄下"
 
-#: ../sflphone-gtk/src/assistant.c:138
+#: ../sflphone-gtk/src/assistant.c:148
 msgid "SFLphone account configuration wizard"
 msgstr "SFLphone 帳戶設置向導"
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 #, fuzzy
 msgid "SFLphone 0.9.2"
 msgstr "SFLphone 0.8"
 
-#: ../sflphone-gtk/src/assistant.c:165
+#: ../sflphone-gtk/src/assistant.c:176
 msgid "Welcome to SFLphone!"
 msgstr "歡迎使用SFLphone!"
 
-#: ../sflphone-gtk/src/assistant.c:167
+#: ../sflphone-gtk/src/assistant.c:178
 msgid "This installation wizard will help you configure an account."
 msgstr "安裝向導將幫助您配置帳戶"
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "VoIP Protocols"
 msgstr "VoIP協議"
 
-#: ../sflphone-gtk/src/assistant.c:182
+#: ../sflphone-gtk/src/assistant.c:193
 msgid "Select an account type:"
 msgstr "選擇帳戶類型:"
 
-#: ../sflphone-gtk/src/assistant.c:202
+#: ../sflphone-gtk/src/assistant.c:211
+#, fuzzy
+msgid "Account"
+msgstr "帳戶"
+
+#: ../sflphone-gtk/src/assistant.c:211
+#, fuzzy
+msgid "Please select one of the following option:"
+msgstr "請填寫如下信息:"
+
+#: ../sflphone-gtk/src/assistant.c:213
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:215
+msgid "Register an existing SIP or IAX2 account"
+msgstr ""
+
+#: ../sflphone-gtk/src/assistant.c:230
 msgid "SIP account configuration"
 msgstr "SIP帳戶配置"
 
-#: ../sflphone-gtk/src/assistant.c:202 ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:230 ../sflphone-gtk/src/assistant.c:284
 msgid "Please fill the following information:"
 msgstr "請填寫如下信息:"
 
-#: ../sflphone-gtk/src/assistant.c:256
+#: ../sflphone-gtk/src/assistant.c:284
 msgid "IAX2 account configuration"
 msgstr "IAX2帳戶配置"
 
-#: ../sflphone-gtk/src/assistant.c:313
+#: ../sflphone-gtk/src/assistant.c:341 ../sflphone-gtk/src/configwindow.c:821
+msgid "Network Address Translation"
+msgstr "網路地址分析"
+
+#: ../sflphone-gtk/src/assistant.c:341
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "如果你的網路防火牆,你很有可能需要設定該項."
 
-#: ../sflphone-gtk/src/assistant.c:329
+#: ../sflphone-gtk/src/assistant.c:350 ../sflphone-gtk/src/configwindow.c:496
+msgid "E_nable STUN"
+msgstr "使用STUN(n)"
+
+#: ../sflphone-gtk/src/assistant.c:357
 msgid "_STUN server"
 msgstr "STUN伺服器(S)"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Account Registration"
 msgstr "帳戶註冊"
 
-#: ../sflphone-gtk/src/assistant.c:346
+#: ../sflphone-gtk/src/assistant.c:374
 msgid "Congratulations!"
 msgstr "恭喜!"
 
-#: ../sflphone-gtk/src/assistant.c:348
+#: ../sflphone-gtk/src/assistant.c:376
 msgid ""
 "This assistant is now finished.\n"
 "\n"
@@ -223,193 +229,232 @@ msgstr ""
 "\n"
 "你可以隨時在 選項/帳戶 中查看註冊狀態或者修改帳戶信息"
 
-#: ../sflphone-gtk/src/audioconf.c:150
+#: ../sflphone-gtk/src/audioconf.c:154
 #, c-format
 msgid "audio device index for output = %d\n"
 msgstr "音訊設備索引輸出 = %d\n"
 
-#: ../sflphone-gtk/src/audioconf.c:558
+#: ../sflphone-gtk/src/audioconf.c:562
 msgid "Name"
 msgstr "名稱"
 
-#: ../sflphone-gtk/src/audioconf.c:563
+#: ../sflphone-gtk/src/audioconf.c:567
 msgid "Frequency"
 msgstr "顰律"
 
-#: ../sflphone-gtk/src/audioconf.c:568
+#: ../sflphone-gtk/src/audioconf.c:572
 msgid "Bitrate"
 msgstr "比率"
 
-#: ../sflphone-gtk/src/audioconf.c:573
+#: ../sflphone-gtk/src/audioconf.c:577
 msgid "Bandwidth"
 msgstr "顰寬"
 
-#: ../sflphone-gtk/src/audioconf.c:633
+#: ../sflphone-gtk/src/audioconf.c:637
 msgid "Pulseaudio"
 msgstr "Pulseaudio"
 
-#: ../sflphone-gtk/src/audioconf.c:636
+#: ../sflphone-gtk/src/audioconf.c:640
 msgid "ALSA"
 msgstr "ALSA"
 
-#: ../sflphone-gtk/src/audioconf.c:662
+#: ../sflphone-gtk/src/audioconf.c:666
 msgid "ALSA plugin"
 msgstr "ALSA插件"
 
-#: ../sflphone-gtk/src/audioconf.c:684
+#: ../sflphone-gtk/src/audioconf.c:688
 msgid "Output"
 msgstr "輸出"
 
-#: ../sflphone-gtk/src/audioconf.c:706
+#: ../sflphone-gtk/src/audioconf.c:710
 msgid "Input"
 msgstr "輸入"
 
-#: ../sflphone-gtk/src/audioconf.c:739
+#: ../sflphone-gtk/src/audioconf.c:743
 msgid "_Enable ringtones"
 msgstr "啟動鈴聲(E)"
 
-#: ../sflphone-gtk/src/audioconf.c:744
+#: ../sflphone-gtk/src/audioconf.c:748
 msgid "Choose a ringtone"
 msgstr "鈴聲選擇"
 
-#: ../sflphone-gtk/src/audioconf.c:749
+#: ../sflphone-gtk/src/audioconf.c:753
 msgid "Audio Files"
 msgstr "音訊檔案"
 
-#: ../sflphone-gtk/src/audioconf.c:774
+#: ../sflphone-gtk/src/audioconf.c:770
+msgid "_Activate silence detection"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:798
 msgid "Sound Manager"
 msgstr "聲音管理器"
 
-#: ../sflphone-gtk/src/audioconf.c:781
+#: ../sflphone-gtk/src/audioconf.c:805
 msgid "ALSA configuration"
 msgstr "ALSA 配置"
 
-#: ../sflphone-gtk/src/audioconf.c:791
+#: ../sflphone-gtk/src/audioconf.c:815
 msgid "Codecs"
 msgstr "編碼"
 
-#: ../sflphone-gtk/src/audioconf.c:799
+#: ../sflphone-gtk/src/audioconf.c:823
+msgid "Noise reduction"
+msgstr ""
+
+#: ../sflphone-gtk/src/audioconf.c:830
 msgid "Ringtones"
 msgstr "鈴聲"
 
-#: ../sflphone-gtk/src/calltree.c:208
+#: ../sflphone-gtk/src/calltree.c:209
 #, c-format
 msgid "\"Voicemail\" <%s>"
 msgstr "\"語音郵件\" <%s>"
 
-#: ../sflphone-gtk/src/calltree.c:405 ../sflphone-gtk/src/calltree.c:407
+#: ../sflphone-gtk/src/calltree.c:431 ../sflphone-gtk/src/calltree.c:433
 msgid "Place a call"
 msgstr "打電話"
 
-#: ../sflphone-gtk/src/calltree.c:414 ../sflphone-gtk/src/calltree.c:416
+#: ../sflphone-gtk/src/calltree.c:440 ../sflphone-gtk/src/calltree.c:442
 msgid "Pick up"
 msgstr "接電話"
 
-#: ../sflphone-gtk/src/calltree.c:424 ../sflphone-gtk/src/calltree.c:426
+#: ../sflphone-gtk/src/calltree.c:450 ../sflphone-gtk/src/calltree.c:452
 msgid "Hang up"
 msgstr "放電話"
 
-#: ../sflphone-gtk/src/calltree.c:434 ../sflphone-gtk/src/calltree.c:436
+#: ../sflphone-gtk/src/calltree.c:460 ../sflphone-gtk/src/calltree.c:462
 msgid "Off Hold"
 msgstr "恢复通話"
 
-#: ../sflphone-gtk/src/calltree.c:445 ../sflphone-gtk/src/calltree.c:447
+#: ../sflphone-gtk/src/calltree.c:471 ../sflphone-gtk/src/calltree.c:473
 msgid "On Hold"
 msgstr "待机"
 
-#: ../sflphone-gtk/src/calltree.c:458 ../sflphone-gtk/src/calltree.c:460
+#: ../sflphone-gtk/src/calltree.c:484 ../sflphone-gtk/src/calltree.c:486
 msgid "Transfer"
 msgstr "轉接"
 
-#: ../sflphone-gtk/src/calltree.c:470 ../sflphone-gtk/src/calltree.c:472
+#: ../sflphone-gtk/src/calltree.c:496 ../sflphone-gtk/src/calltree.c:498
 msgid "History"
 msgstr "歷史"
 
-#: ../sflphone-gtk/src/calltree.c:480 ../sflphone-gtk/src/calltree.c:484
+#: ../sflphone-gtk/src/calltree.c:506 ../sflphone-gtk/src/calltree.c:510
 msgid "Voicemail"
 msgstr "語音郵件"
 
-#: ../sflphone-gtk/src/configwindow.c:371
+#: ../sflphone-gtk/src/calltree.c:521
+#, fuzzy
+msgid "Record a call"
+msgstr "打電話"
+
+#: ../sflphone-gtk/src/configwindow.c:382
 msgid "Protocol"
 msgstr "協議"
 
-#: ../sflphone-gtk/src/configwindow.c:378
+#: ../sflphone-gtk/src/configwindow.c:389
 msgid "Status"
 msgstr "狀態"
 
-#: ../sflphone-gtk/src/configwindow.c:470
+#: ../sflphone-gtk/src/configwindow.c:492
+msgid "Stun parameters will apply to each SIP account created."
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:500
+#, fuzzy
+msgid "Enable it if you are behind a firewall"
+msgstr "當使用防火牆時,需要設定STUN. 完成設定后,請重新啟動SFLphone"
+
+#: ../sflphone-gtk/src/configwindow.c:508
+msgid "Format: name.server:port"
+msgstr "格式:name.server:port"
+
+#: ../sflphone-gtk/src/configwindow.c:558
 msgid "Desktop Notification"
 msgstr "桌面提示"
 
-#: ../sflphone-gtk/src/configwindow.c:478
+#: ../sflphone-gtk/src/configwindow.c:566
 msgid "_Enable"
 msgstr "啟用(E)"
 
-#: ../sflphone-gtk/src/configwindow.c:483
+#: ../sflphone-gtk/src/configwindow.c:571
 msgid "_Notify voice mails"
 msgstr "語音郵件通知(N)"
 
-#: ../sflphone-gtk/src/configwindow.c:489
+#: ../sflphone-gtk/src/configwindow.c:577
 msgid "System Tray Icon"
 msgstr "系統托盤圖標"
 
-#: ../sflphone-gtk/src/configwindow.c:497
+#: ../sflphone-gtk/src/configwindow.c:585
 msgid "_Popup main window on incoming call"
 msgstr "來電話時彈出主視窗(P)"
 
-#: ../sflphone-gtk/src/configwindow.c:502
+#: ../sflphone-gtk/src/configwindow.c:590
 msgid "Ne_ver popup main window"
 msgstr "從不彈出主視窗(v)"
 
-#: ../sflphone-gtk/src/configwindow.c:506
+#: ../sflphone-gtk/src/configwindow.c:594
 msgid "_Start hidden"
 msgstr "啟動時隱藏(S)"
 
-#: ../sflphone-gtk/src/configwindow.c:512
+#: ../sflphone-gtk/src/configwindow.c:600
 msgid "Calls History"
 msgstr "打電話歷史"
 
-#: ../sflphone-gtk/src/configwindow.c:520
+#: ../sflphone-gtk/src/configwindow.c:608
 msgid "_Maximum number of calls"
 msgstr "最大打出電話數目(M)"
 
-#: ../sflphone-gtk/src/configwindow.c:536
+#: ../sflphone-gtk/src/configwindow.c:624
 msgid "PulseAudio sound server"
 msgstr "PulseAudio聲音伺服器"
 
-#: ../sflphone-gtk/src/configwindow.c:544
+#: ../sflphone-gtk/src/configwindow.c:632
 msgid "_Control running applications volume"
 msgstr "控制正在運行中的應用程式的音量(C)"
 
-#: ../sflphone-gtk/src/configwindow.c:557
+#: ../sflphone-gtk/src/configwindow.c:645
 msgid "SIP Port"
 msgstr "SIP端口"
 
-#: ../sflphone-gtk/src/configwindow.c:566
-msgid "Apply"
-msgstr "套用"
-
-#: ../sflphone-gtk/src/configwindow.c:570
+#: ../sflphone-gtk/src/configwindow.c:658
 msgid "Port:"
 msgstr "端口:"
 
-#: ../sflphone-gtk/src/configwindow.c:600
+#: ../sflphone-gtk/src/configwindow.c:703
+#, fuzzy
+msgid "General"
+msgstr "常用配置"
+
+#: ../sflphone-gtk/src/configwindow.c:714
+msgid "_Destination folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:719
+msgid "Select a folder"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:744
 msgid "Preferences"
 msgstr "屬性"
 
-#: ../sflphone-gtk/src/configwindow.c:620
+#: ../sflphone-gtk/src/configwindow.c:764
 msgid "General Settings"
 msgstr "常用配置"
 
-#: ../sflphone-gtk/src/configwindow.c:625
+#: ../sflphone-gtk/src/configwindow.c:769
 msgid "Audio Settings"
 msgstr "音訊配置"
 
-#: ../sflphone-gtk/src/configwindow.c:649
+#: ../sflphone-gtk/src/configwindow.c:774
+msgid "Record"
+msgstr ""
+
+#: ../sflphone-gtk/src/configwindow.c:798
 msgid "Accounts"
 msgstr "帳戶"
 
-#: ../sflphone-gtk/src/configwindow.c:661
+#: ../sflphone-gtk/src/configwindow.c:810
 msgid "Accounts previously setup"
 msgstr "以前帳戶設定"
 
@@ -440,97 +485,95 @@ msgid ""
 "Pulseaudio is not running"
 msgstr ""
 
-#: ../sflphone-gtk/src/historyfilter.c:45
-#: ../sflphone-gtk/src/historyfilter.c:63
-#: ../sflphone-gtk/src/historyfilter.c:78
+#: ../sflphone-gtk/src/historyfilter.c:49
+#: ../sflphone-gtk/src/historyfilter.c:68
+#: ../sflphone-gtk/src/historyfilter.c:83
 msgid "Search"
 msgstr "搜尋"
 
 #: ../sflphone-gtk/src/mainwindow.c:69
-msgid ""
-"<b>There is one call in progress.</b>\n"
-"Do you still want to quit?"
+#, fuzzy
+msgid "There is one call in progress."
 msgstr ""
 "<b>有一個電話正在處理中</b>\n"
 "确定要退出?"
 
 #: ../sflphone-gtk/src/mainwindow.c:73
-msgid ""
-"<b>There are calls in progress.</b>\n"
-"Do you still want to quit?"
+#, fuzzy
+msgid "There are calls in progress."
 msgstr ""
 "<b>有電話正在處理中</b>\n"
 "确定要退出?"
 
-#: ../sflphone-gtk/src/menus.c:130
+#: ../sflphone-gtk/src/mainwindow.c:82
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../sflphone-gtk/src/menus.c:135
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone是一個VoIP客戶端,它兼容SIP和IAX2协议."
 
-#: ../sflphone-gtk/src/menus.c:133
+#: ../sflphone-gtk/src/menus.c:138
 msgid "About SFLphone"
 msgstr "有關SFLphone"
 
-#: ../sflphone-gtk/src/menus.c:156
+#: ../sflphone-gtk/src/menus.c:161
 msgid "_Help"
 msgstr "幫助(H)"
 
-#: ../sflphone-gtk/src/menus.c:273
+#: ../sflphone-gtk/src/menus.c:278
 msgid "_New call"
 msgstr "新電話(N)"
 
-#: ../sflphone-gtk/src/menus.c:285 ../sflphone-gtk/src/menus.c:769
+#: ../sflphone-gtk/src/menus.c:290 ../sflphone-gtk/src/menus.c:760
 msgid "_Pick up"
 msgstr "撥出(P)"
 
-#: ../sflphone-gtk/src/menus.c:295 ../sflphone-gtk/src/menus.c:781
+#: ../sflphone-gtk/src/menus.c:300 ../sflphone-gtk/src/menus.c:772
 msgid "_Hang up"
 msgstr "放下(H)"
 
-#: ../sflphone-gtk/src/menus.c:305 ../sflphone-gtk/src/menus.c:793
+#: ../sflphone-gtk/src/menus.c:310 ../sflphone-gtk/src/menus.c:784
 msgid "On _Hold"
 msgstr "待机"
 
-#: ../sflphone-gtk/src/menus.c:321
+#: ../sflphone-gtk/src/menus.c:326
 msgid "_Account Assistant"
 msgstr "帳戶向導(A)"
 
-#: ../sflphone-gtk/src/menus.c:351
+#: ../sflphone-gtk/src/menus.c:356
 msgid "_Call"
 msgstr "電話"
 
-#: ../sflphone-gtk/src/menus.c:497
-msgid "History empty"
-msgstr "無曆史記錄"
-
-#: ../sflphone-gtk/src/menus.c:538
+#: ../sflphone-gtk/src/menus.c:529
 msgid "_Clear history"
 msgstr "清空曆史記錄(C)"
 
-#: ../sflphone-gtk/src/menus.c:550
+#: ../sflphone-gtk/src/menus.c:541
 msgid "_Accounts"
 msgstr "帳戶(A)"
 
-#: ../sflphone-gtk/src/menus.c:565
+#: ../sflphone-gtk/src/menus.c:556
 msgid "_Edit"
 msgstr "編輯(E)"
 
-#: ../sflphone-gtk/src/menus.c:625
+#: ../sflphone-gtk/src/menus.c:616
 msgid "_Dialpad"
 msgstr "撥號面板"
 
-#: ../sflphone-gtk/src/menus.c:637
+#: ../sflphone-gtk/src/menus.c:628
 msgid "_Volume controls"
 msgstr "音量控制(V)"
 
-#: ../sflphone-gtk/src/menus.c:646
+#: ../sflphone-gtk/src/menus.c:637
 msgid "_Search history"
 msgstr "查找歷史(S)"
 
-#: ../sflphone-gtk/src/menus.c:654
+#: ../sflphone-gtk/src/menus.c:645
 msgid "_View"
 msgstr "查看(V)"
 
-#: ../sflphone-gtk/src/menus.c:876
+#: ../sflphone-gtk/src/menus.c:867
 msgid "_Call back"
 msgstr "回叫(C)"
 
@@ -603,3 +646,12 @@ msgstr "<small>未接電話</small>"
 #, c-format
 msgid "<small>Duration:</small> %s"
 msgstr "<small>時長:</small> %s"
+
+#~ msgid "_STUN Server"
+#~ msgstr "STUN伺服器(S)"
+
+#~ msgid "Apply"
+#~ msgstr "套用"
+
+#~ msgid "History empty"
+#~ msgstr "無曆史記錄"
diff --git a/sflphone-gtk/src/assistant.c b/sflphone-gtk/src/assistant.c
index 09751ddb3af593c2bf1dfd130cf364af2a576038..79d937da194ece9c17f7aeb83ae883056e12bae0 100644
--- a/sflphone-gtk/src/assistant.c
+++ b/sflphone-gtk/src/assistant.c
@@ -210,9 +210,9 @@ GtkWidget* build_sfl_or_account()
 
   wiz->sflphone_org = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("Account") , _("Please select one of the following option:"));
 
-  sfl = gtk_radio_button_new_with_label(NULL, "Create a free SIP/IAX2 account on sflphone.org");
+  sfl = gtk_radio_button_new_with_label(NULL, _("Create a free SIP/IAX2 account on sflphone.org"));
   gtk_box_pack_start( GTK_BOX(wiz->sflphone_org) , sfl , TRUE, TRUE, 0);
-  cus = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(sfl), "Register an existing SIP or IAX2 account");
+  cus = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(sfl), _("Register an existing SIP or IAX2 account"));
   gtk_box_pack_start( GTK_BOX(wiz->sflphone_org) , cus , TRUE, TRUE, 0);
   g_signal_connect(G_OBJECT( sfl ) , "clicked" , G_CALLBACK( set_sflphone_org ) , NULL );
 
diff --git a/sflphone-gtk/src/audioconf.c b/sflphone-gtk/src/audioconf.c
index e8d0a71ac10c2f142f1f1a3a5573eef8161ff17f..44fc4451188daa2cc0402c7c9bc0ad679f45a8ff 100644
--- a/sflphone-gtk/src/audioconf.c
+++ b/sflphone-gtk/src/audioconf.c
@@ -32,780 +32,808 @@ GtkWidget *codecTreeView;		// View used instead of store to get access to select
 GtkWidget *pulse;
 GtkWidget *alsabox;
 GtkWidget *alsa_conf;
+GtkWidget *noise_conf;
 
 // Codec properties ID
 enum {
-  COLUMN_CODEC_ACTIVE,
-  COLUMN_CODEC_NAME,
-  COLUMN_CODEC_FREQUENCY,
-  COLUMN_CODEC_BITRATE,
-  COLUMN_CODEC_BANDWIDTH,
-  CODEC_COLUMN_COUNT
+    COLUMN_CODEC_ACTIVE,
+    COLUMN_CODEC_NAME,
+    COLUMN_CODEC_FREQUENCY,
+    COLUMN_CODEC_BITRATE,
+    COLUMN_CODEC_BANDWIDTH,
+    CODEC_COLUMN_COUNT
 };
 
 /**
  * Fills the tree list with supported codecs
  */
-  void
+    void
 config_window_fill_codec_list()
 {
-  GtkListStore *codecStore;
-  GtkTreeIter iter;
-
-  // Get model of view and clear it
-  codecStore = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(codecTreeView)));
-  gtk_list_store_clear(codecStore);
-
-  // Insert codecs
-  unsigned int i;
-  for(i = 0; i < codec_list_get_size(); i++)
-  {
-    codec_t *c = codec_list_get_nth(i);
-    printf("%s\n", c->name);
-    if(c)
+    GtkListStore *codecStore;
+    GtkTreeIter iter;
+
+    // Get model of view and clear it
+    codecStore = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(codecTreeView)));
+    gtk_list_store_clear(codecStore);
+
+    // Insert codecs
+    unsigned int i;
+    for(i = 0; i < codec_list_get_size(); i++)
     {
-      gtk_list_store_append(codecStore, &iter);
-      gtk_list_store_set(codecStore, &iter,
-	  COLUMN_CODEC_ACTIVE,	c->is_active,									// Active
-	  COLUMN_CODEC_NAME,		c->name,										// Name
-	  COLUMN_CODEC_FREQUENCY,	g_strdup_printf("%d kHz", c->sample_rate/1000),	// Frequency (kHz)
-	  COLUMN_CODEC_BITRATE,	g_strdup_printf("%.1f kbps", c->_bitrate),		// Bitrate (kbps)
-	  COLUMN_CODEC_BANDWIDTH,	g_strdup_printf("%.1f kbps", c->_bandwidth),	// Bandwidth (kpbs)
-	  -1);
+        codec_t *c = codec_list_get_nth(i);
+        printf("%s\n", c->name);
+        if(c)
+        {
+            gtk_list_store_append(codecStore, &iter);
+            gtk_list_store_set(codecStore, &iter,
+                    COLUMN_CODEC_ACTIVE,	c->is_active,									// Active
+                    COLUMN_CODEC_NAME,		c->name,										// Name
+                    COLUMN_CODEC_FREQUENCY,	g_strdup_printf("%d kHz", c->sample_rate/1000),	// Frequency (kHz)
+                    COLUMN_CODEC_BITRATE,	g_strdup_printf("%.1f kbps", c->_bitrate),		// Bitrate (kbps)
+                    COLUMN_CODEC_BANDWIDTH,	g_strdup_printf("%.1f kbps", c->_bandwidth),	// Bandwidth (kpbs)
+                    -1);
+        }
     }
-  }
 }
 
 /**
  * Fill store with output audio plugins
  */
-  void
+    void
 config_window_fill_output_audio_plugin_list()
 {
-  GtkTreeIter iter;
-  gchar** list;
-  gchar* managerName;
-
-  gtk_list_store_clear(pluginlist);
-
-  // Call dbus to retreive list
-  list = dbus_get_output_audio_plugin_list();
-  // For each API name included in list
-  int c = 0;
-  
-	if (list != NULL){
-  		for(managerName = list[c]; managerName != NULL; managerName = list[c])
-  		{
-    			c++;
-    			gtk_list_store_append(pluginlist, &iter);
-    			gtk_list_store_set(pluginlist, &iter, 0 , managerName, -1);
-  		}
-  	}
-  list = NULL;
+    GtkTreeIter iter;
+    gchar** list;
+    gchar* managerName;
+
+    gtk_list_store_clear(pluginlist);
+
+    // Call dbus to retreive list
+    list = dbus_get_output_audio_plugin_list();
+    // For each API name included in list
+    int c = 0;
+
+    if (list != NULL){
+        for(managerName = list[c]; managerName != NULL; managerName = list[c])
+        {
+            c++;
+            gtk_list_store_append(pluginlist, &iter);
+            gtk_list_store_set(pluginlist, &iter, 0 , managerName, -1);
+        }
+    }
+    list = NULL;
 }
 
 /**
  * Fill output audio device store
  */
-  void
+    void
 config_window_fill_output_audio_device_list()
 {
 
-  GtkTreeIter iter;
-  gchar** list;
-  gchar** audioDevice;
-  int index;
-
-  gtk_list_store_clear(outputlist);
-
-  // Call dbus to retreive list
-  list = dbus_get_audio_output_device_list();
-
-  // For each device name included in list
-  int c = 0;
-  for(audioDevice = list; *list ; list++)
-  {
-    index = dbus_get_audio_device_index( *list );
-    gtk_list_store_append(outputlist, &iter);
-    gtk_list_store_set(outputlist, &iter, 0, *list, 1, index, -1);
-    c++;
-  }
+    GtkTreeIter iter;
+    gchar** list;
+    gchar** audioDevice;
+    int index;
+
+    gtk_list_store_clear(outputlist);
+
+    // Call dbus to retreive list
+    list = dbus_get_audio_output_device_list();
+
+    // For each device name included in list
+    int c = 0;
+    for(audioDevice = list; *list ; list++)
+    {
+        index = dbus_get_audio_device_index( *list );
+        gtk_list_store_append(outputlist, &iter);
+        gtk_list_store_set(outputlist, &iter, 0, *list, 1, index, -1);
+        c++;
+    }
 }
 
 /**
  * Select active output audio device
  */
-  void
+    void
 select_active_output_audio_device()
 {
-  if( SHOW_ALSA_CONF )
-  {
-
-    GtkTreeModel* model;
-    GtkTreeIter iter;
-    gchar** devices;
-    int currentDeviceIndex;
-    int deviceIndex;
-
-    // Select active output device on server
-    devices = dbus_get_current_audio_devices_index();
-    currentDeviceIndex = atoi(devices[0]);
-    printf(_("audio device index for output = %d\n"), currentDeviceIndex);
-    model = gtk_combo_box_get_model(GTK_COMBO_BOX(output));
-
-    // Find the currently set output device
-    gtk_tree_model_get_iter_first(model, &iter);
-    do {
-      gtk_tree_model_get(model, &iter, 1, &deviceIndex, -1);
-      if(deviceIndex == currentDeviceIndex)
-      {
-	// Set current iteration the active one
-	gtk_combo_box_set_active_iter(GTK_COMBO_BOX(output), &iter);
-	return;
-      }
-    } while(gtk_tree_model_iter_next(model, &iter));
+    if( SHOW_ALSA_CONF )
+    {
 
-    // No index was found, select first one
-    g_print("Warning : No active output device found");
-    gtk_combo_box_set_active(GTK_COMBO_BOX(output), 0);
-  }
+        GtkTreeModel* model;
+        GtkTreeIter iter;
+        gchar** devices;
+        int currentDeviceIndex;
+        int deviceIndex;
+
+        // Select active output device on server
+        devices = dbus_get_current_audio_devices_index();
+        currentDeviceIndex = atoi(devices[0]);
+        printf(_("audio device index for output = %d\n"), currentDeviceIndex);
+        model = gtk_combo_box_get_model(GTK_COMBO_BOX(output));
+
+        // Find the currently set output device
+        gtk_tree_model_get_iter_first(model, &iter);
+        do {
+            gtk_tree_model_get(model, &iter, 1, &deviceIndex, -1);
+            if(deviceIndex == currentDeviceIndex)
+            {
+                // Set current iteration the active one
+                gtk_combo_box_set_active_iter(GTK_COMBO_BOX(output), &iter);
+                return;
+            }
+        } while(gtk_tree_model_iter_next(model, &iter));
+
+        // No index was found, select first one
+        g_print("Warning : No active output device found");
+        gtk_combo_box_set_active(GTK_COMBO_BOX(output), 0);
+    }
 }
 
 /**
  * Fill input audio device store
  */
-  void
+    void
 config_window_fill_input_audio_device_list()
 {
 
-  GtkTreeIter iter;
-  gchar** list;
-  gchar** audioDevice;
-  int index ;
-  gtk_list_store_clear(inputlist);
-
-  // Call dbus to retreive list
-  list = dbus_get_audio_input_device_list();
-
-  // For each device name included in list
-  //int c = 0;
-  for(audioDevice = list; *list; list++)
-  {
-    index = dbus_get_audio_device_index( *list );
-    gtk_list_store_append(inputlist, &iter);
-    gtk_list_store_set(inputlist, &iter, 0, *list, 1, index, -1);
-    //c++;
-  }
+    GtkTreeIter iter;
+    gchar** list;
+    gchar** audioDevice;
+    int index ;
+    gtk_list_store_clear(inputlist);
+
+    // Call dbus to retreive list
+    list = dbus_get_audio_input_device_list();
+
+    // For each device name included in list
+    //int c = 0;
+    for(audioDevice = list; *list; list++)
+    {
+        index = dbus_get_audio_device_index( *list );
+        gtk_list_store_append(inputlist, &iter);
+        gtk_list_store_set(inputlist, &iter, 0, *list, 1, index, -1);
+        //c++;
+    }
 
 }
 
 /**
  * Select active input audio device
  */
-  void
+    void
 select_active_input_audio_device()
 {
-  if( SHOW_ALSA_CONF)
-  {
-
-    GtkTreeModel* model;
-    GtkTreeIter iter;
-    gchar** devices;
-    int currentDeviceIndex;
-    int deviceIndex;
-
-    // Select active input device on server
-    devices = dbus_get_current_audio_devices_index();
-    currentDeviceIndex = atoi(devices[1]);
-    model = gtk_combo_box_get_model(GTK_COMBO_BOX(input));
-
-    // Find the currently set input device
-    gtk_tree_model_get_iter_first(model, &iter);
-    do {
-      gtk_tree_model_get(model, &iter, 1, &deviceIndex, -1);
-      if(deviceIndex == currentDeviceIndex)
-      {
-	// Set current iteration the active one
-	gtk_combo_box_set_active_iter(GTK_COMBO_BOX(input), &iter);
-	return;
-      }
-    } while(gtk_tree_model_iter_next(model, &iter));
+    if( SHOW_ALSA_CONF)
+    {
 
-    // No index was found, select first one
-    g_print("Warning : No active input device found");
-    gtk_combo_box_set_active(GTK_COMBO_BOX(input), 0);
-  }
+        GtkTreeModel* model;
+        GtkTreeIter iter;
+        gchar** devices;
+        int currentDeviceIndex;
+        int deviceIndex;
+
+        // Select active input device on server
+        devices = dbus_get_current_audio_devices_index();
+        currentDeviceIndex = atoi(devices[1]);
+        model = gtk_combo_box_get_model(GTK_COMBO_BOX(input));
+
+        // Find the currently set input device
+        gtk_tree_model_get_iter_first(model, &iter);
+        do {
+            gtk_tree_model_get(model, &iter, 1, &deviceIndex, -1);
+            if(deviceIndex == currentDeviceIndex)
+            {
+                // Set current iteration the active one
+                gtk_combo_box_set_active_iter(GTK_COMBO_BOX(input), &iter);
+                return;
+            }
+        } while(gtk_tree_model_iter_next(model, &iter));
+
+        // No index was found, select first one
+        g_print("Warning : No active input device found");
+        gtk_combo_box_set_active(GTK_COMBO_BOX(input), 0);
+    }
 }
 
 /**
  * Select the output audio plugin by calling the server
  */
-  static void
+    static void
 select_output_audio_plugin(GtkComboBox* widget, gpointer data UNUSED)
 {
-  GtkTreeModel* model;
-  GtkTreeIter iter;
-  int comboBoxIndex;
-  gchar* pluginName;
-
-  comboBoxIndex = gtk_combo_box_get_active(widget);
-
-  if(comboBoxIndex >= 0)
-  {
-    model = gtk_combo_box_get_model(widget);
-    gtk_combo_box_get_active_iter(widget, &iter);
-    gtk_tree_model_get(model, &iter, 0, &pluginName, -1);	
-    dbus_set_output_audio_plugin(pluginName);
-    //update_combo_box( pluginName);
-  }
+    GtkTreeModel* model;
+    GtkTreeIter iter;
+    int comboBoxIndex;
+    gchar* pluginName;
+
+    comboBoxIndex = gtk_combo_box_get_active(widget);
+
+    if(comboBoxIndex >= 0)
+    {
+        model = gtk_combo_box_get_model(widget);
+        gtk_combo_box_get_active_iter(widget, &iter);
+        gtk_tree_model_get(model, &iter, 0, &pluginName, -1);	
+        dbus_set_output_audio_plugin(pluginName);
+        //update_combo_box( pluginName);
+    }
 }
 
 /**
  * Select active output audio plugin
  */
-  void
+    void
 select_active_output_audio_plugin()
 {
-  GtkTreeModel* model;
-  GtkTreeIter iter;
-  gchar* pluginname;
-  gchar* tmp;
-
-  // Select active output device on server
-  pluginname = dbus_get_current_audio_output_plugin();
-  tmp = pluginname;
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(plugin));
-
-  // Find the currently alsa plugin
-  gtk_tree_model_get_iter_first(model, &iter);
-  do {
-    gtk_tree_model_get(model, &iter, 0, &pluginname , -1);
-    if( g_strcasecmp( tmp , pluginname ) == 0 )
-    {
-      // Set current iteration the active one
-      gtk_combo_box_set_active_iter(GTK_COMBO_BOX(plugin), &iter);
-      //update_combo_box( plugin );
-      return;
-    }
-  } while(gtk_tree_model_iter_next(model, &iter));
+    GtkTreeModel* model;
+    GtkTreeIter iter;
+    gchar* pluginname;
+    gchar* tmp;
+
+    // Select active output device on server
+    pluginname = dbus_get_current_audio_output_plugin();
+    tmp = pluginname;
+    model = gtk_combo_box_get_model(GTK_COMBO_BOX(plugin));
+
+    // Find the currently alsa plugin
+    gtk_tree_model_get_iter_first(model, &iter);
+    do {
+        gtk_tree_model_get(model, &iter, 0, &pluginname , -1);
+        if( g_strcasecmp( tmp , pluginname ) == 0 )
+        {
+            // Set current iteration the active one
+            gtk_combo_box_set_active_iter(GTK_COMBO_BOX(plugin), &iter);
+            //update_combo_box( plugin );
+            return;
+        }
+    } while(gtk_tree_model_iter_next(model, &iter));
 
-  // No index was found, select first one
-  g_print("Warning : No active output device found\n");
-  gtk_combo_box_set_active(GTK_COMBO_BOX(plugin), 0);
+    // No index was found, select first one
+    g_print("Warning : No active output device found\n");
+    gtk_combo_box_set_active(GTK_COMBO_BOX(plugin), 0);
 }
 
 
 /**
  * Set the audio output device on the server with its index
  */
-  static void
+    static void
 select_audio_output_device(GtkComboBox* comboBox, gpointer data UNUSED)
 {
-  GtkTreeModel* model;
-  GtkTreeIter iter;
-  int comboBoxIndex;
-  int deviceIndex;
+    GtkTreeModel* model;
+    GtkTreeIter iter;
+    int comboBoxIndex;
+    int deviceIndex;
 
-  comboBoxIndex = gtk_combo_box_get_active(comboBox);
+    comboBoxIndex = gtk_combo_box_get_active(comboBox);
 
-  if(comboBoxIndex >= 0)
-  {
-    model = gtk_combo_box_get_model(comboBox);
-    gtk_combo_box_get_active_iter(comboBox, &iter);
-    gtk_tree_model_get(model, &iter, 1, &deviceIndex, -1);
+    if(comboBoxIndex >= 0)
+    {
+        model = gtk_combo_box_get_model(comboBox);
+        gtk_combo_box_get_active_iter(comboBox, &iter);
+        gtk_tree_model_get(model, &iter, 1, &deviceIndex, -1);
 
-    dbus_set_audio_output_device(deviceIndex);
-  }
+        dbus_set_audio_output_device(deviceIndex);
+    }
 }
 
 /**
  * Set the audio input device on the server with its index
  */
-  static void
+    static void
 select_audio_input_device(GtkComboBox* comboBox, gpointer data UNUSED)
 {
-  GtkTreeModel* model;
-  GtkTreeIter iter;
-  int comboBoxIndex;
-  int deviceIndex;
+    GtkTreeModel* model;
+    GtkTreeIter iter;
+    int comboBoxIndex;
+    int deviceIndex;
 
-  comboBoxIndex = gtk_combo_box_get_active(comboBox);
+    comboBoxIndex = gtk_combo_box_get_active(comboBox);
 
-  if(comboBoxIndex >= 0)
-  {
-    model = gtk_combo_box_get_model(comboBox);
-    gtk_combo_box_get_active_iter(comboBox, &iter);
-    gtk_tree_model_get(model, &iter, 1, &deviceIndex, -1);
+    if(comboBoxIndex >= 0)
+    {
+        model = gtk_combo_box_get_model(comboBox);
+        gtk_combo_box_get_active_iter(comboBox, &iter);
+        gtk_tree_model_get(model, &iter, 1, &deviceIndex, -1);
 
-    dbus_set_audio_input_device(deviceIndex);
-  }
+        dbus_set_audio_input_device(deviceIndex);
+    }
 }
 
 /**
  * Toggle move buttons on if a codec is selected, off elsewise
  */
-  static void
+    static void
 select_codec(GtkTreeSelection *selection, GtkTreeModel *model)
 {
-  GtkTreeIter iter;
+    GtkTreeIter iter;
 
-  if(!gtk_tree_selection_get_selected(selection, &model, &iter))
-  {
-    gtk_widget_set_sensitive(GTK_WIDGET(codecMoveUpButton), FALSE);
-    gtk_widget_set_sensitive(GTK_WIDGET(codecMoveDownButton), FALSE);
-  }
-  else
-  {
-    gtk_widget_set_sensitive(GTK_WIDGET(codecMoveUpButton), TRUE);
-    gtk_widget_set_sensitive(GTK_WIDGET(codecMoveDownButton), TRUE);
-  }
+    if(!gtk_tree_selection_get_selected(selection, &model, &iter))
+    {
+        gtk_widget_set_sensitive(GTK_WIDGET(codecMoveUpButton), FALSE);
+        gtk_widget_set_sensitive(GTK_WIDGET(codecMoveDownButton), FALSE);
+    }
+    else
+    {
+        gtk_widget_set_sensitive(GTK_WIDGET(codecMoveUpButton), TRUE);
+        gtk_widget_set_sensitive(GTK_WIDGET(codecMoveDownButton), TRUE);
+    }
 }
 
 /**
  * Toggle active value of codec on click and update changes to the deamon
  * and in configuration files
  */
-  static void
+    static void
 codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path, gpointer data )
 {
-  GtkTreeIter iter;
-  GtkTreePath *treePath;
-  GtkTreeModel *model;
-  gboolean active;
-  char* name;
-
-  // Get path of clicked codec active toggle box
-  treePath = gtk_tree_path_new_from_string(path);
-  model = gtk_tree_view_get_model(GTK_TREE_VIEW(data));
-  gtk_tree_model_get_iter(model, &iter, treePath);
-
-  // Get active value and name at iteration
-  gtk_tree_model_get(model, &iter,
-      COLUMN_CODEC_ACTIVE, &active,
-      COLUMN_CODEC_NAME, &name,
-      -1);
-
-  printf("%s\n", name);
-
-  // Toggle active value
-  active = !active;
-
-  // Store value
-  gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-      COLUMN_CODEC_ACTIVE, active,
-      -1);
-
-  gtk_tree_path_free(treePath);
-
-  // Modify codec queue to represent change	
-  if(active)
-    codec_set_active(name);
-  else
-    codec_set_inactive(name);
-
-  // Perpetuate changes to the deamon
-  codec_list_update_to_daemon();
+    GtkTreeIter iter;
+    GtkTreePath *treePath;
+    GtkTreeModel *model;
+    gboolean active;
+    char* name;
+
+    // Get path of clicked codec active toggle box
+    treePath = gtk_tree_path_new_from_string(path);
+    model = gtk_tree_view_get_model(GTK_TREE_VIEW(data));
+    gtk_tree_model_get_iter(model, &iter, treePath);
+
+    // Get active value and name at iteration
+    gtk_tree_model_get(model, &iter,
+            COLUMN_CODEC_ACTIVE, &active,
+            COLUMN_CODEC_NAME, &name,
+            -1);
+
+    printf("%s\n", name);
+
+    // Toggle active value
+    active = !active;
+
+    // Store value
+    gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+            COLUMN_CODEC_ACTIVE, active,
+            -1);
+
+    gtk_tree_path_free(treePath);
+
+    // Modify codec queue to represent change	
+    if(active)
+        codec_set_active(name);
+    else
+        codec_set_inactive(name);
+
+    // Perpetuate changes to the deamon
+    codec_list_update_to_daemon();
 }
 
 /**
  * Move codec in list depending on direction and selected codec and
  * update changes in the daemon list and the configuration files
  */
-  static void
+    static void
 codec_move(gboolean moveUp, gpointer data)
 {
-  GtkTreeIter iter;
-  GtkTreeIter *iter2;
-  GtkTreeView *treeView;
-  GtkTreeModel *model;
-  GtkTreeSelection *selection;
-  GtkTreePath *treePath;
-  gchar *path;
-
-  // Get view, model and selection of codec store
-  treeView = GTK_TREE_VIEW(data);
-  model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeView));
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeView));
-
-  // Find selected iteration and create a copy
-  gtk_tree_selection_get_selected(GTK_TREE_SELECTION(selection), &model, &iter);
-  iter2 = gtk_tree_iter_copy(&iter);
-
-  // Find path of iteration
-  path = gtk_tree_model_get_string_from_iter(GTK_TREE_MODEL(model), &iter);
-  treePath = gtk_tree_path_new_from_string(path);
-  gint *indices = gtk_tree_path_get_indices(treePath);
-  gint indice = indices[0];
-
-  // Depending on button direction get new path
-  if(moveUp)
-    gtk_tree_path_prev(treePath);
-  else
-    gtk_tree_path_next(treePath);
-  gtk_tree_model_get_iter(model, &iter, treePath);
-
-  // Swap iterations if valid
-  if(gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter))
-    gtk_list_store_swap(GTK_LIST_STORE(model), &iter, iter2);
-
-  // Scroll to new position
-  gtk_tree_view_scroll_to_cell(treeView, treePath, NULL, FALSE, 0, 0);
-
-  // Free resources
-  gtk_tree_path_free(treePath);
-  gtk_tree_iter_free(iter2);
-  g_free(path);
-
-  // Perpetuate changes in codec queue
-  if(moveUp)
-    codec_list_move_codec_up(indice);
-  else
-    codec_list_move_codec_down(indice);
-
-  // Perpetuate changes to the deamon
-  codec_list_update_to_daemon();
+    GtkTreeIter iter;
+    GtkTreeIter *iter2;
+    GtkTreeView *treeView;
+    GtkTreeModel *model;
+    GtkTreeSelection *selection;
+    GtkTreePath *treePath;
+    gchar *path;
+
+    // Get view, model and selection of codec store
+    treeView = GTK_TREE_VIEW(data);
+    model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeView));
+    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeView));
+
+    // Find selected iteration and create a copy
+    gtk_tree_selection_get_selected(GTK_TREE_SELECTION(selection), &model, &iter);
+    iter2 = gtk_tree_iter_copy(&iter);
+
+    // Find path of iteration
+    path = gtk_tree_model_get_string_from_iter(GTK_TREE_MODEL(model), &iter);
+    treePath = gtk_tree_path_new_from_string(path);
+    gint *indices = gtk_tree_path_get_indices(treePath);
+    gint indice = indices[0];
+
+    // Depending on button direction get new path
+    if(moveUp)
+        gtk_tree_path_prev(treePath);
+    else
+        gtk_tree_path_next(treePath);
+    gtk_tree_model_get_iter(model, &iter, treePath);
+
+    // Swap iterations if valid
+    if(gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter))
+        gtk_list_store_swap(GTK_LIST_STORE(model), &iter, iter2);
+
+    // Scroll to new position
+    gtk_tree_view_scroll_to_cell(treeView, treePath, NULL, FALSE, 0, 0);
+
+    // Free resources
+    gtk_tree_path_free(treePath);
+    gtk_tree_iter_free(iter2);
+    g_free(path);
+
+    // Perpetuate changes in codec queue
+    if(moveUp)
+        codec_list_move_codec_up(indice);
+    else
+        codec_list_move_codec_down(indice);
+
+    // Perpetuate changes to the deamon
+    codec_list_update_to_daemon();
 }
 
 /**
  * Called from move up codec button signal
  */
-  static void
+    static void
 codec_move_up(GtkButton *button UNUSED, gpointer data)
 {
-  // Change tree view ordering and get indice changed
-  codec_move(TRUE, data);
+    // Change tree view ordering and get indice changed
+    codec_move(TRUE, data);
 }
 
 /**
  * Called from move down codec button signal
  */
-  static void
+    static void
 codec_move_down(GtkButton *button UNUSED, gpointer data)
 {
-  // Change tree view ordering and get indice changed
-  codec_move(FALSE, data);
+    // Change tree view ordering and get indice changed
+    codec_move(FALSE, data);
 }
 
-  int 
+    int 
 is_ringtone_enabled( void )
 {
-  return dbus_is_ringtone_enabled();  
+    return dbus_is_ringtone_enabled();  
 }
 
-  void 
+    void 
 ringtone_enabled( void )
 {
-  dbus_ringtone_enabled();  
+    dbus_ringtone_enabled();  
 }
 
-  void
+    void
 ringtone_changed( GtkFileChooser *chooser , GtkLabel *label UNUSED)
 {
-  gchar* tone = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( chooser ));
-  dbus_set_ringtone_choice( tone );
+    gchar* tone = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( chooser ));
+    dbus_set_ringtone_choice( tone );
 }
 
-  gchar*
+    gchar*
 get_ringtone_choice( void )
 {
-  return dbus_get_ringtone_choice();
+    return dbus_get_ringtone_choice();
 }
 
 
 GtkWidget* codecs_box()
 {
-  GtkWidget *ret;
-  GtkWidget *scrolledWindow;
-  GtkWidget *buttonBox;
-
-  GtkListStore *codecStore;
-  GtkCellRenderer *renderer;
-  GtkTreeSelection *treeSelection;
-  GtkTreeViewColumn *treeViewColumn;
-
-  ret = gtk_hbox_new(FALSE, 10);
-  gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
-
-  scrolledWindow = gtk_scrolled_window_new(NULL, NULL);
-  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_SHADOW_IN);
-
-  gtk_box_pack_start(GTK_BOX(ret), scrolledWindow, TRUE, TRUE, 0);
-  codecStore = gtk_list_store_new(CODEC_COLUMN_COUNT,
-      G_TYPE_BOOLEAN,		// Active
-      G_TYPE_STRING,		// Name
-      G_TYPE_STRING,		// Frequency
-      G_TYPE_STRING,		// Bit rate
-      G_TYPE_STRING		// Bandwith
-      );
-
-  // Create codec tree view with list store
-  codecTreeView = gtk_tree_view_new_with_model(GTK_TREE_MODEL(codecStore));
-
-  // Get tree selection manager
-  treeSelection = gtk_tree_view_get_selection(GTK_TREE_VIEW(codecTreeView));
-  g_signal_connect(G_OBJECT(treeSelection), "changed",
-      G_CALLBACK (select_codec),
-      codecStore);
-
-  // Active column
-  renderer = gtk_cell_renderer_toggle_new();
-  treeViewColumn = gtk_tree_view_column_new_with_attributes("", renderer, "active", COLUMN_CODEC_ACTIVE, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
-
-  // Toggle codec active property on clicked
-  g_signal_connect(G_OBJECT(renderer), "toggled", G_CALLBACK(codec_active_toggled), (gpointer)codecTreeView);
-
-  // Name column
-  renderer = gtk_cell_renderer_text_new();
-  treeViewColumn = gtk_tree_view_column_new_with_attributes(_("Name"), renderer, "markup", COLUMN_CODEC_NAME, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
-
-  // Bit rate column
-  renderer = gtk_cell_renderer_text_new();
-  treeViewColumn = gtk_tree_view_column_new_with_attributes(_("Frequency"), renderer, "text", COLUMN_CODEC_FREQUENCY, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
-
-  // Bandwith column
-  renderer = gtk_cell_renderer_text_new();
-  treeViewColumn = gtk_tree_view_column_new_with_attributes(_("Bitrate"), renderer, "text", COLUMN_CODEC_BITRATE, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
-
-  // Frequency column
-  renderer = gtk_cell_renderer_text_new();
-  treeViewColumn = gtk_tree_view_column_new_with_attributes(_("Bandwidth"), renderer, "text", COLUMN_CODEC_BANDWIDTH, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
-
-  g_object_unref(G_OBJECT(codecStore));
-  gtk_container_add(GTK_CONTAINER(scrolledWindow), codecTreeView);
-
-  // Create button box
-  buttonBox = gtk_vbox_new(FALSE, 0);
-  gtk_container_set_border_width(GTK_CONTAINER(buttonBox), 10);
-  gtk_box_pack_start(GTK_BOX(ret), buttonBox, FALSE, FALSE, 0);
-
-  codecMoveUpButton = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
-  gtk_widget_set_sensitive(GTK_WIDGET(codecMoveUpButton), FALSE);
-  gtk_box_pack_start(GTK_BOX(buttonBox), codecMoveUpButton, FALSE, FALSE, 0);
-  g_signal_connect(G_OBJECT(codecMoveUpButton), "clicked", G_CALLBACK(codec_move_up), codecTreeView);
-
-  codecMoveDownButton = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
-  gtk_widget_set_sensitive(GTK_WIDGET(codecMoveDownButton), FALSE);
-  gtk_box_pack_start(GTK_BOX(buttonBox), codecMoveDownButton, FALSE, FALSE, 0);
-  g_signal_connect(G_OBJECT(codecMoveDownButton), "clicked", G_CALLBACK(codec_move_down), codecTreeView);
-
-  config_window_fill_codec_list();
-
-  return ret;
+    GtkWidget *ret;
+    GtkWidget *scrolledWindow;
+    GtkWidget *buttonBox;
+
+    GtkListStore *codecStore;
+    GtkCellRenderer *renderer;
+    GtkTreeSelection *treeSelection;
+    GtkTreeViewColumn *treeViewColumn;
+
+    ret = gtk_hbox_new(FALSE, 10);
+    gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
+
+    scrolledWindow = gtk_scrolled_window_new(NULL, NULL);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_SHADOW_IN);
+
+    gtk_box_pack_start(GTK_BOX(ret), scrolledWindow, TRUE, TRUE, 0);
+    codecStore = gtk_list_store_new(CODEC_COLUMN_COUNT,
+            G_TYPE_BOOLEAN,		// Active
+            G_TYPE_STRING,		// Name
+            G_TYPE_STRING,		// Frequency
+            G_TYPE_STRING,		// Bit rate
+            G_TYPE_STRING		// Bandwith
+            );
+
+    // Create codec tree view with list store
+    codecTreeView = gtk_tree_view_new_with_model(GTK_TREE_MODEL(codecStore));
+
+    // Get tree selection manager
+    treeSelection = gtk_tree_view_get_selection(GTK_TREE_VIEW(codecTreeView));
+    g_signal_connect(G_OBJECT(treeSelection), "changed",
+            G_CALLBACK (select_codec),
+            codecStore);
+
+    // Active column
+    renderer = gtk_cell_renderer_toggle_new();
+    treeViewColumn = gtk_tree_view_column_new_with_attributes("", renderer, "active", COLUMN_CODEC_ACTIVE, NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
+
+    // Toggle codec active property on clicked
+    g_signal_connect(G_OBJECT(renderer), "toggled", G_CALLBACK(codec_active_toggled), (gpointer)codecTreeView);
+
+    // Name column
+    renderer = gtk_cell_renderer_text_new();
+    treeViewColumn = gtk_tree_view_column_new_with_attributes(_("Name"), renderer, "markup", COLUMN_CODEC_NAME, NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
+
+    // Bit rate column
+    renderer = gtk_cell_renderer_text_new();
+    treeViewColumn = gtk_tree_view_column_new_with_attributes(_("Frequency"), renderer, "text", COLUMN_CODEC_FREQUENCY, NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
+
+    // Bandwith column
+    renderer = gtk_cell_renderer_text_new();
+    treeViewColumn = gtk_tree_view_column_new_with_attributes(_("Bitrate"), renderer, "text", COLUMN_CODEC_BITRATE, NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
+
+    // Frequency column
+    renderer = gtk_cell_renderer_text_new();
+    treeViewColumn = gtk_tree_view_column_new_with_attributes(_("Bandwidth"), renderer, "text", COLUMN_CODEC_BANDWIDTH, NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(codecTreeView), treeViewColumn);
+
+    g_object_unref(G_OBJECT(codecStore));
+    gtk_container_add(GTK_CONTAINER(scrolledWindow), codecTreeView);
+
+    // Create button box
+    buttonBox = gtk_vbox_new(FALSE, 0);
+    gtk_container_set_border_width(GTK_CONTAINER(buttonBox), 10);
+    gtk_box_pack_start(GTK_BOX(ret), buttonBox, FALSE, FALSE, 0);
+
+    codecMoveUpButton = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+    gtk_widget_set_sensitive(GTK_WIDGET(codecMoveUpButton), FALSE);
+    gtk_box_pack_start(GTK_BOX(buttonBox), codecMoveUpButton, FALSE, FALSE, 0);
+    g_signal_connect(G_OBJECT(codecMoveUpButton), "clicked", G_CALLBACK(codec_move_up), codecTreeView);
+
+    codecMoveDownButton = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+    gtk_widget_set_sensitive(GTK_WIDGET(codecMoveDownButton), FALSE);
+    gtk_box_pack_start(GTK_BOX(buttonBox), codecMoveDownButton, FALSE, FALSE, 0);
+    g_signal_connect(G_OBJECT(codecMoveDownButton), "clicked", G_CALLBACK(codec_move_down), codecTreeView);
+
+    config_window_fill_codec_list();
+
+    return ret;
 }
 
-  void
+    void
 select_audio_manager( void )
 {
 
-  g_print("audio manager selected\n");
-  
-  if( !SHOW_ALSA_CONF && !gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(pulse) ) )
-  {
-    dbus_set_audio_manager( ALSA );
-    g_print(" display alsa conf panel\n");
-    alsabox = alsa_box();
-    gtk_container_add( GTK_CONTAINER(alsa_conf ) , alsabox);
-    gtk_widget_show( alsa_conf );    
-  }
-  else if( SHOW_ALSA_CONF && gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(pulse) ))
-  {
-    dbus_set_audio_manager( PULSEAUDIO );
-    g_print(" remove alsa conf panel\n");
-    gtk_container_remove( GTK_CONTAINER(alsa_conf) , alsabox );
-  }
-  else
-    g_print("alsa conf panel...nothing\n");
-
-  //gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(pulse) )? dbus_set_audio_manager( PULSEAUDIO ):dbus_set_audio_manager( ALSA );
+    g_print("audio manager selected\n");
+
+    if( !SHOW_ALSA_CONF && !gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(pulse) ) )
+    {
+        dbus_set_audio_manager( ALSA );
+        g_print(" display alsa conf panel\n");
+        alsabox = alsa_box();
+        gtk_container_add( GTK_CONTAINER(alsa_conf ) , alsabox);
+        gtk_widget_show( alsa_conf );    
+    }
+    else if( SHOW_ALSA_CONF && gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(pulse) ))
+    {
+        dbus_set_audio_manager( PULSEAUDIO );
+        g_print(" remove alsa conf panel\n");
+        gtk_container_remove( GTK_CONTAINER(alsa_conf) , alsabox );
+    }
+    else
+        g_print("alsa conf panel...nothing\n");
+
+    //gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(pulse) )? dbus_set_audio_manager( PULSEAUDIO ):dbus_set_audio_manager( ALSA );
 }
 
 GtkWidget* api_box()
 {
-  GtkWidget *ret;
-  GtkWidget *alsa;
+    GtkWidget *ret;
+    GtkWidget *alsa;
 
-  ret = gtk_hbox_new(FALSE, 10);
-  gtk_widget_show( ret );
+    ret = gtk_hbox_new(FALSE, 10);
+    gtk_widget_show( ret );
 
-  pulse = gtk_radio_button_new_with_mnemonic( NULL , _("Pulseaudio"));
-  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(pulse), !SHOW_ALSA_CONF  );
-  gtk_box_pack_start( GTK_BOX(ret) , pulse , TRUE , TRUE , 1);
-  alsa = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(pulse),  _("ALSA"));
-  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(alsa), SHOW_ALSA_CONF );
-  gtk_box_pack_end( GTK_BOX(ret) , alsa , TRUE , TRUE , 1);
-  g_signal_connect(G_OBJECT(alsa), "clicked", G_CALLBACK(select_audio_manager), NULL);
+    pulse = gtk_radio_button_new_with_mnemonic( NULL , _("Pulseaudio"));
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(pulse), !SHOW_ALSA_CONF  );
+    gtk_box_pack_start( GTK_BOX(ret) , pulse , TRUE , TRUE , 1);
+    alsa = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(pulse),  _("ALSA"));
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(alsa), SHOW_ALSA_CONF );
+    gtk_box_pack_end( GTK_BOX(ret) , alsa , TRUE , TRUE , 1);
+    g_signal_connect(G_OBJECT(alsa), "clicked", G_CALLBACK(select_audio_manager), NULL);
 
-  gtk_widget_show_all(ret);
+    gtk_widget_show_all(ret);
 
-  return ret;
+    return ret;
 }
 
 GtkWidget* alsa_box()
 {
-  GtkWidget *ret;
-  GtkWidget *table;
-  GtkWidget *item;
-  GtkCellRenderer *renderer;
-
-  ret = gtk_hbox_new(FALSE, 10);
-  gtk_widget_show( ret );
-
-  table = gtk_table_new(4, 3, FALSE);
-  gtk_table_set_col_spacing(GTK_TABLE(table), 0, 40);
-  gtk_box_pack_start( GTK_BOX(ret) , table , TRUE , TRUE , 1);
-  gtk_widget_show(table);
-
-  g_print("plugin\n");
-  item = gtk_label_new(_("ALSA plugin"));
-  gtk_misc_set_alignment(GTK_MISC(item), 0, 0.5);
-  gtk_table_attach(GTK_TABLE(table), item, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
-  gtk_widget_show( item );
-  // Set choices of audio managers
-  pluginlist = gtk_list_store_new(1, G_TYPE_STRING);
-  config_window_fill_output_audio_plugin_list();
-  plugin = gtk_combo_box_new_with_model(GTK_TREE_MODEL(pluginlist));
-  select_active_output_audio_plugin();
-  gtk_label_set_mnemonic_widget(GTK_LABEL(item), plugin);
-  g_signal_connect(G_OBJECT(plugin), "changed", G_CALLBACK(select_output_audio_plugin), plugin);
-
-  // Set rendering
-  renderer = gtk_cell_renderer_text_new();
-  gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(plugin), renderer, TRUE);
-  gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(plugin), renderer, "text", 0, NULL);
-  gtk_table_attach(GTK_TABLE(table), plugin, 2, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
-  gtk_widget_show(plugin);
-
-  // Device : Output device
-  // Create title label
-  g_print("output\n");
-  item = gtk_label_new(_("Output"));
-  gtk_misc_set_alignment(GTK_MISC(item), 0, 0.5);
-  gtk_table_attach(GTK_TABLE(table), item, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
-  gtk_widget_show(item);
-  // Set choices of output devices
-  outputlist = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
-  config_window_fill_output_audio_device_list();
-  output = gtk_combo_box_new_with_model(GTK_TREE_MODEL(outputlist));
-  select_active_output_audio_device();
-  gtk_label_set_mnemonic_widget(GTK_LABEL(item), output);
-  g_signal_connect(G_OBJECT(output), "changed", G_CALLBACK(select_audio_output_device), output);
-
-  // Set rendering
-  renderer = gtk_cell_renderer_text_new();
-  gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(output), renderer, TRUE);
-  gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(output), renderer, "text", 0, NULL);
-  gtk_table_attach(GTK_TABLE(table), output, 2, 3, 2, 3, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
-  gtk_widget_show(output);
-
-  // Device : Input device
-  // Create title label
-  g_print("input\n");
-  item = gtk_label_new(_("Input"));
-  gtk_misc_set_alignment(GTK_MISC(item), 0, 0.5);
-  gtk_table_attach(GTK_TABLE(table), item, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
-  gtk_widget_show(item);
-  // Set choices of output devices
-  inputlist = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
-  config_window_fill_input_audio_device_list();
-  input = gtk_combo_box_new_with_model(GTK_TREE_MODEL(inputlist));
-  select_active_input_audio_device();
-  gtk_label_set_mnemonic_widget(GTK_LABEL(item), input);
-  g_signal_connect(G_OBJECT(input), "changed", G_CALLBACK(select_audio_input_device), input);
-
-  // Set rendering
-  renderer = gtk_cell_renderer_text_new();
-  gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(input), renderer, TRUE);
-  gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(input), renderer, "text", 0, NULL);
-  gtk_table_attach(GTK_TABLE(table), input, 2, 3, 3, 4, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
-  gtk_widget_show(input);
-
-  gtk_widget_show_all(ret);
-
-  g_print("done\n");
-  return ret;
+    GtkWidget *ret;
+    GtkWidget *table;
+    GtkWidget *item;
+    GtkCellRenderer *renderer;
+
+    ret = gtk_hbox_new(FALSE, 10);
+    gtk_widget_show( ret );
+
+    table = gtk_table_new(4, 3, FALSE);
+    gtk_table_set_col_spacing(GTK_TABLE(table), 0, 40);
+    gtk_box_pack_start( GTK_BOX(ret) , table , TRUE , TRUE , 1);
+    gtk_widget_show(table);
+
+    g_print("plugin\n");
+    item = gtk_label_new(_("ALSA plugin"));
+    gtk_misc_set_alignment(GTK_MISC(item), 0, 0.5);
+    gtk_table_attach(GTK_TABLE(table), item, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
+    gtk_widget_show( item );
+    // Set choices of audio managers
+    pluginlist = gtk_list_store_new(1, G_TYPE_STRING);
+    config_window_fill_output_audio_plugin_list();
+    plugin = gtk_combo_box_new_with_model(GTK_TREE_MODEL(pluginlist));
+    select_active_output_audio_plugin();
+    gtk_label_set_mnemonic_widget(GTK_LABEL(item), plugin);
+    g_signal_connect(G_OBJECT(plugin), "changed", G_CALLBACK(select_output_audio_plugin), plugin);
+
+    // Set rendering
+    renderer = gtk_cell_renderer_text_new();
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(plugin), renderer, TRUE);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(plugin), renderer, "text", 0, NULL);
+    gtk_table_attach(GTK_TABLE(table), plugin, 2, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
+    gtk_widget_show(plugin);
+
+    // Device : Output device
+    // Create title label
+    g_print("output\n");
+    item = gtk_label_new(_("Output"));
+    gtk_misc_set_alignment(GTK_MISC(item), 0, 0.5);
+    gtk_table_attach(GTK_TABLE(table), item, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
+    gtk_widget_show(item);
+    // Set choices of output devices
+    outputlist = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
+    config_window_fill_output_audio_device_list();
+    output = gtk_combo_box_new_with_model(GTK_TREE_MODEL(outputlist));
+    select_active_output_audio_device();
+    gtk_label_set_mnemonic_widget(GTK_LABEL(item), output);
+    g_signal_connect(G_OBJECT(output), "changed", G_CALLBACK(select_audio_output_device), output);
+
+    // Set rendering
+    renderer = gtk_cell_renderer_text_new();
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(output), renderer, TRUE);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(output), renderer, "text", 0, NULL);
+    gtk_table_attach(GTK_TABLE(table), output, 2, 3, 2, 3, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
+    gtk_widget_show(output);
+
+    // Device : Input device
+    // Create title label
+    g_print("input\n");
+    item = gtk_label_new(_("Input"));
+    gtk_misc_set_alignment(GTK_MISC(item), 0, 0.5);
+    gtk_table_attach(GTK_TABLE(table), item, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
+    gtk_widget_show(item);
+    // Set choices of output devices
+    inputlist = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
+    config_window_fill_input_audio_device_list();
+    input = gtk_combo_box_new_with_model(GTK_TREE_MODEL(inputlist));
+    select_active_input_audio_device();
+    gtk_label_set_mnemonic_widget(GTK_LABEL(item), input);
+    g_signal_connect(G_OBJECT(input), "changed", G_CALLBACK(select_audio_input_device), input);
+
+    // Set rendering
+    renderer = gtk_cell_renderer_text_new();
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(input), renderer, TRUE);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(input), renderer, "text", 0, NULL);
+    gtk_table_attach(GTK_TABLE(table), input, 2, 3, 3, 4, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
+    gtk_widget_show(input);
+
+    gtk_widget_show_all(ret);
+
+    g_print("done\n");
+    return ret;
 }
 
 GtkWidget* ringtones_box()
 {
-  GtkWidget *ret;
-  GtkWidget *enableTone;
-  GtkWidget *fileChooser;
-
-  // check button to enable ringtones
-  ret = gtk_hbox_new( TRUE , 1);
-  enableTone = gtk_check_button_new_with_mnemonic( _("_Enable ringtones"));
-  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(enableTone), dbus_is_ringtone_enabled() );
-  gtk_box_pack_start( GTK_BOX(ret) , enableTone , TRUE , TRUE , 1);
-  g_signal_connect(G_OBJECT( enableTone) , "clicked" , G_CALLBACK( ringtone_enabled ) , NULL);
-  // file chooser button
-  fileChooser = gtk_file_chooser_button_new(_("Choose a ringtone"), GTK_FILE_CHOOSER_ACTION_OPEN);
-  gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER( fileChooser) , g_get_home_dir());	
-  gtk_file_chooser_set_filename(GTK_FILE_CHOOSER( fileChooser) , get_ringtone_choice());	
-  g_signal_connect( G_OBJECT( fileChooser ) , "selection_changed" , G_CALLBACK( ringtone_changed ) , NULL );
-  GtkFileFilter *filter = gtk_file_filter_new();
-  gtk_file_filter_set_name( filter , _("Audio Files") );
-  gtk_file_filter_add_pattern(filter , "*.wav" );
-  gtk_file_filter_add_pattern(filter , "*.ul" );
-  gtk_file_filter_add_pattern(filter , "*.au" );
-  gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( fileChooser ) , filter);
-  gtk_box_pack_start( GTK_BOX(ret) , fileChooser , TRUE , TRUE , 1);
-
-  return ret;
+    GtkWidget *ret;
+    GtkWidget *enableTone;
+    GtkWidget *fileChooser;
+
+    // check button to enable ringtones
+    ret = gtk_hbox_new( TRUE , 1);
+    enableTone = gtk_check_button_new_with_mnemonic( _("_Enable ringtones"));
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(enableTone), dbus_is_ringtone_enabled() );
+    gtk_box_pack_start( GTK_BOX(ret) , enableTone , TRUE , TRUE , 1);
+    g_signal_connect(G_OBJECT( enableTone) , "clicked" , G_CALLBACK( ringtone_enabled ) , NULL);
+    // file chooser button
+    fileChooser = gtk_file_chooser_button_new(_("Choose a ringtone"), GTK_FILE_CHOOSER_ACTION_OPEN);
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER( fileChooser) , g_get_home_dir());	
+    gtk_file_chooser_set_filename(GTK_FILE_CHOOSER( fileChooser) , get_ringtone_choice());	
+    g_signal_connect( G_OBJECT( fileChooser ) , "selection_changed" , G_CALLBACK( ringtone_changed ) , NULL );
+    GtkFileFilter *filter = gtk_file_filter_new();
+    gtk_file_filter_set_name( filter , _("Audio Files") );
+    gtk_file_filter_add_pattern(filter , "*.wav" );
+    gtk_file_filter_add_pattern(filter , "*.ul" );
+    gtk_file_filter_add_pattern(filter , "*.au" );
+    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( fileChooser ) , filter);
+    gtk_box_pack_start( GTK_BOX(ret) , fileChooser , TRUE , TRUE , 1);
+
+    return ret;
 }
 
+GtkWidget* noise_box()
+{
+    GtkWidget *ret;
+    GtkWidget *enableNoiseReduction;
+
+    // check button to enable ringtones
+    ret = gtk_hbox_new( TRUE , 1);
+    enableNoiseReduction = gtk_check_button_new_with_mnemonic( _("_Activate silence detection"));
+    //TODO Use the value from D-BUS
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(enableNoiseReduction), FALSE );
+    gtk_box_pack_start( GTK_BOX(ret) , enableNoiseReduction , TRUE , TRUE , 1);
+    //TODO Enable it
+    gtk_widget_set_sensitive(GTK_WIDGET(noise_conf), FALSE);
+    //TODO Add a callback function
+    g_signal_connect(G_OBJECT( enableNoiseReduction) , "clicked" , NULL , NULL);
+        
+    return ret;
+}
+
+
 GtkWidget* create_audio_configuration()
 {
-  // Main widget
-  GtkWidget *ret;
-  // Main frames
-  GtkWidget *sound_conf;
-  GtkWidget *codecs_conf;
-  GtkWidget *ringtones_conf;
-  // Sub boxes
-  GtkWidget *box;
-
-  ret = gtk_vbox_new(FALSE, 10);
-  gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
-
-  // Box for the audio manager selection
-  sound_conf = gtk_frame_new(_("Sound Manager"));
-  gtk_box_pack_start(GTK_BOX(ret), sound_conf, FALSE, FALSE, 0);
-  gtk_widget_show( sound_conf );
-  box = api_box();
-  gtk_container_add( GTK_CONTAINER(sound_conf) , box );
-
-  // Box for the ALSA configuration
-  alsa_conf = gtk_frame_new(_("ALSA configuration"));
-  gtk_box_pack_start(GTK_BOX(ret), alsa_conf, FALSE, FALSE, 0);
-  gtk_widget_show( alsa_conf );
-  if( SHOW_ALSA_CONF )
-  {
-    alsabox = alsa_box();
-    gtk_container_add( GTK_CONTAINER(alsa_conf) , alsabox );
-  }
-  
-  // Box for the codecs
-  codecs_conf = gtk_frame_new(_("Codecs"));
-  gtk_box_pack_start(GTK_BOX(ret), codecs_conf, FALSE, FALSE, 0);
-  gtk_widget_set_size_request(GTK_WIDGET(codecs_conf), -1, 200);
-  gtk_widget_show( codecs_conf );
-  box = codecs_box();
-  gtk_container_add( GTK_CONTAINER(codecs_conf) , box );
-
-  // Box for the codecs
-  ringtones_conf = gtk_frame_new(_("Ringtones"));
-  gtk_box_pack_start(GTK_BOX(ret), ringtones_conf, FALSE, FALSE, 0);
-  gtk_widget_show( ringtones_conf );
-  box = ringtones_box();
-  gtk_container_add( GTK_CONTAINER(ringtones_conf) , box );
-
-  gtk_widget_show_all(ret);
-
-  return ret;
+    // Main widget
+    GtkWidget *ret;
+    // Main frames
+    GtkWidget *sound_conf;
+    GtkWidget *codecs_conf;
+    GtkWidget *ringtones_conf;
+    // Sub boxes
+    GtkWidget *box;
+
+    ret = gtk_vbox_new(FALSE, 10);
+    gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
+
+    // Box for the audio manager selection
+    sound_conf = gtk_frame_new(_("Sound Manager"));
+    gtk_box_pack_start(GTK_BOX(ret), sound_conf, FALSE, FALSE, 0);
+    gtk_widget_show( sound_conf );
+    box = api_box();
+    gtk_container_add( GTK_CONTAINER(sound_conf) , box );
+
+    // Box for the ALSA configuration
+    alsa_conf = gtk_frame_new(_("ALSA configuration"));
+    gtk_box_pack_start(GTK_BOX(ret), alsa_conf, FALSE, FALSE, 0);
+    gtk_widget_show( alsa_conf );
+    if( SHOW_ALSA_CONF )
+    {
+        alsabox = alsa_box();
+        gtk_container_add( GTK_CONTAINER(alsa_conf) , alsabox );
+    }
+
+    // Box for the codecs
+    codecs_conf = gtk_frame_new(_("Codecs"));
+    gtk_box_pack_start(GTK_BOX(ret), codecs_conf, FALSE, FALSE, 0);
+    gtk_widget_set_size_request(GTK_WIDGET(codecs_conf), -1, 200);
+    gtk_widget_show( codecs_conf );
+    box = codecs_box();
+    gtk_container_add( GTK_CONTAINER(codecs_conf) , box );
+
+    // Box for noise reduction
+    noise_conf = gtk_frame_new(_("Noise reduction"));
+    gtk_box_pack_start(GTK_BOX(ret), noise_conf, FALSE, FALSE, 0);
+    gtk_widget_show( noise_conf );
+    box = noise_box();
+    gtk_container_add( GTK_CONTAINER(noise_conf) , box );
+
+    // Box for the ringtones
+    ringtones_conf = gtk_frame_new(_("Ringtones"));
+    gtk_box_pack_start(GTK_BOX(ret), ringtones_conf, FALSE, FALSE, 0);
+    gtk_widget_show( ringtones_conf );
+    box = ringtones_box();
+    gtk_container_add( GTK_CONTAINER(ringtones_conf) , box );
+
+    gtk_widget_show_all(ret);
+
+    return ret;
 }
diff --git a/sflphone-gtk/src/configwindow.c b/sflphone-gtk/src/configwindow.c
index 900cc282ad77c373e8a2b2dd6a393590476ee89c..d71e79ed1016fed5112f025c7e89a63d4281711a 100644
--- a/sflphone-gtk/src/configwindow.c
+++ b/sflphone-gtk/src/configwindow.c
@@ -672,37 +672,36 @@ create_general_settings ()
     return ret;
 }
 
-
 void
 record_path_changed( GtkFileChooser *chooser , GtkLabel *label UNUSED)
 {
-  // gchar* tone = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( chooser ));
-  // dbus_set_ringtone_choice( tone );
+    gchar* path;
+
+    path = gtk_file_chooser_get_uri( GTK_FILE_CHOOSER( chooser ));
+    dbus_set_record_path( path );
 }
 
 GtkWidget*
 create_recording_settings ()
 {
 
-    int curPort;
-    int n;
-
-    gchar *defaultSavePath = "/home/alexandresavard/";
-
     GtkWidget *ret;
     GtkWidget *label;
     GtkWidget *table;
     GtkWidget *savePathFrame;
-    GtkWidget *savePathText;
     GtkWidget *folderChooser;
+    gchar *dftPath;
+    
+    /* Get the path where to save audio files */
+    dftPath = dbus_get_record_path ();
 
     // Main widget
     ret = gtk_vbox_new(FALSE, 10);
     gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
 
     // Recorded file saving path
-    savePathFrame = gtk_frame_new(_("Recorded File Saving Path"));
-    gtk_box_pack_start(GTK_BOX(ret), savePathFrame, FALSE, FALSE, 0);
+    savePathFrame = gtk_frame_new(_("General"));
+    gtk_box_pack_start(GTK_BOX(ret), savePathFrame, FALSE, FALSE, 5);
     gtk_widget_show(savePathFrame);
    
     table = gtk_table_new(1, 2, FALSE);
@@ -712,20 +711,17 @@ create_recording_settings ()
     gtk_container_add(GTK_CONTAINER(savePathFrame), table);
 
     // label 
-    label = gtk_label_new_with_mnemonic(_("_Save Path"));
-    gtk_table_attach( GTK_TABLE(table), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+    label = gtk_label_new_with_mnemonic(_("_Destination folder"));
+    gtk_table_attach( GTK_TABLE(table), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-    savePathText = gtk_entry_new();
-    gtk_label_set_mnemonic_widget(GTK_LABEL(label), savePathText);
-    gtk_entry_set_text(GTK_ENTRY(savePathText),defaultSavePath);
-    gtk_table_attach(GTK_TABLE(table), savePathText, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
     
     // folder chooser button
-    folderChooser = gtk_file_chooser_button_new(_("Choose a path"), GTK_FILE_CHOOSER_ACTION_OPEN);
-    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER( folderChooser) , g_get_home_dir());
-    g_signal_connect( G_OBJECT( folderChooser ) , "recordPath_changed" , G_CALLBACK( record_path_changed ) , NULL );
-    gtk_box_pack_start( GTK_BOX(ret) , folderChooser , TRUE , TRUE , 1);
-    // gtk_container_add(GTK_CONTAINER(savePathFrame), folder);
+    folderChooser = gtk_file_chooser_button_new(_("Select a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER( folderChooser) , 
+                        (strcmp(dftPath,"")==0)?g_get_home_dir():dftPath);
+    gtk_table_attach(GTK_TABLE(table), folderChooser, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
+    g_signal_connect( G_OBJECT( folderChooser ) , "selection_changed" , G_CALLBACK( record_path_changed ) , NULL );
 
     gtk_widget_show_all(ret);
 
@@ -776,7 +772,7 @@ show_config_window ()
 
     // Recording tab
     tab = create_recording_settings();	
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Recording Settings")));
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Record")));
     gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
 
     gtk_notebook_set_current_page( GTK_NOTEBOOK( notebook) ,  1);
diff --git a/sflphone-gtk/src/dbus.c b/sflphone-gtk/src/dbus.c
index 62d6220bc5f0573dd1087a03eb5156b294263b94..305a20bd91f27eae16fa6da8d3efbc1fd820c082 100644
--- a/sflphone-gtk/src/dbus.c
+++ b/sflphone-gtk/src/dbus.c
@@ -178,7 +178,7 @@ error_alert(DBusGProxy *proxy UNUSED,
 }
 
 
-static void nameOwnerChanged(DBusGProxy *proxy UNUSED, char *name , char *old_owner, char *new_owner, gpointer data UNUSED)
+static void nameOwnerChanged(DBusGProxy *proxy UNUSED, char *name , char *old_owner UNUSED, char *new_owner UNUSED, gpointer data UNUSED)
 {
     #if 0
     g_print("******************************************************************\n");
@@ -1301,6 +1301,35 @@ dbus_set_record(const call_t * c)
         g_print("called dbus_set_record on CallManager\n");
 }
 
+void
+dbus_set_record_path(const gchar* path)
+{
+       GError* error = NULL;
+       org_sflphone_SFLphone_ConfigurationManager_set_record_path (
+                       configurationManagerProxy,
+                       path,
+                       &error);
+	    if(error)
+	    {
+		    g_error_free(error);
+	    }
+}
+
+    gchar*
+dbus_get_record_path(void)
+{
+       GError* error = NULL;
+       gchar *path;
+       org_sflphone_SFLphone_ConfigurationManager_get_record_path (
+                       configurationManagerProxy,
+                       &path,
+                       &error);
+	    if(error)
+	    {
+		    g_error_free(error);
+	    }
+        return path;
+}
 
 void
 dbus_set_max_calls( const guint calls  )
diff --git a/sflphone-gtk/src/dbus.h b/sflphone-gtk/src/dbus.h
index b743612b315dcbcb27f8566a16806a861b089e2b..b6c1ebddfd468a6baba24276a02d9aa19ce2d198 100644
--- a/sflphone-gtk/src/dbus.h
+++ b/sflphone-gtk/src/dbus.h
@@ -436,4 +436,8 @@ gint dbus_stun_is_enabled (void);
 void dbus_enable_stun (void);
 
 void dbus_set_record (const call_t * c);
+
+void dbus_set_record_path (const gchar *path);
+gchar* dbus_get_record_path (void);
+
 #endif
diff --git a/sflphone-gtk/src/mainwindow.c b/sflphone-gtk/src/mainwindow.c
index 9d186fb6b431873cdfd91270faef4997a4abc296..9eb1a34fcc1d2b93831e84f630c6579fa0ffe5f3 100644
--- a/sflphone-gtk/src/mainwindow.c
+++ b/sflphone-gtk/src/mainwindow.c
@@ -77,7 +77,7 @@ main_window_ask_quit(){
                                   GTK_DIALOG_MODAL,
                                   GTK_MESSAGE_QUESTION,
                                   GTK_BUTTONS_YES_NO,
-                                  "<b>%s<b>\n%s",
+                                  "%s\n%s",
                                   question,
                                    _("Do you still want to quit?") );
 
diff --git a/src/call.cpp b/src/call.cpp
index 3130959e940def62a4958340987ffa4b36bec851..558ee81b8840d5ca7672ae9e45cee1c8d8f8ed0b 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -18,6 +18,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include "call.h"
+#include "manager.h"
 
 Call::Call(const CallID& id, Call::CallType type)
            : _callMutex()
@@ -40,7 +41,7 @@ Call::Call(const CallID& id, Call::CallType type)
     FILE_TYPE fileType = FILE_WAV;
     SOUND_FORMAT soundFormat = INT16;
 
-    recAudio.setRecordingOption(fileType,soundFormat,44100);
+    recAudio.setRecordingOption(fileType,soundFormat,44100, Manager::instance().getConfigString (AUDIO, RECORD_PATH));
     _debug("CALL::Constructor for this clss is called \n");    
 }
 
diff --git a/src/call.h b/src/call.h
index b30bf0f63e4d7879fa160846333a8a294a9cdf9f..f0ad6b02eff1439155d710f9a99b709a5c997348 100644
--- a/src/call.h
+++ b/src/call.h
@@ -33,6 +33,8 @@
 
 typedef std::string CallID;
 
+class AudioRecord;
+
 class Call{
   public:
     /**
diff --git a/src/dbus/configurationmanager.cpp b/src/dbus/configurationmanager.cpp
index 290a8187d1aee30a8ee288dd5a718d1081e6e702..e2caf05e47f3633afbea0e167579ee5b4cbf4ebd 100644
--- a/src/dbus/configurationmanager.cpp
+++ b/src/dbus/configurationmanager.cpp
@@ -36,7 +36,6 @@ const char* ConfigurationManager::SERVER_PATH = "/org/sflphone/SFLphone/Configur
 	std::map< std::string, std::string > 
 ConfigurationManager::getAccountDetails( const std::string& accountID )
 {
-	_debug("ConfigurationManager::getAccountDetails received\n");
 	return Manager::instance().getAccountDetails(accountID);
 }
 
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 7149082b2d1a1a16522ff6d0f9a2a72ff16eff4a..5a7a73e1ee1b9c06af22f59ce1a3144cb42567ba 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -1410,7 +1410,7 @@ ManagerImpl::getRecordPath( void )
 void 
 ManagerImpl::setRecordPath( const std::string& recPath)
 {
-  setConfig( AUDIO, RECORD_PATH, recPath );
+  setConfig( AUDIO, RECORD_PATH, recPath.substr(7));
 }
 
 int
@@ -1975,13 +1975,6 @@ std::map< std::string, std::string > ManagerImpl::getAccountDetails(const Accoun
   a.insert( std::pair<std::string, std::string>( HOSTNAME, getConfigString(accountID, HOSTNAME) ) );
   a.insert( std::pair<std::string, std::string>( CONFIG_ACCOUNT_MAILBOX, getConfigString(accountID, CONFIG_ACCOUNT_MAILBOX)) );
   
-  // SIP SPECIFIC
-  if( accountType == "SIP")
-  {
-    a.insert( std::pair<std::string, std::string>( SIP_STUN_SERVER, getConfigString(accountID, SIP_STUN_SERVER) ) );
-    a.insert( std::pair<std::string, std::string>( SIP_USE_STUN, getConfigString(accountID, SIP_USE_STUN) == "1" ? "TRUE": "FALSE"));
-  }
-
   return a;
 }
 
diff --git a/src/plug-in/audiorecorder/audiorecord.cpp b/src/plug-in/audiorecorder/audiorecord.cpp
index d96da5831f89fb0fff769505708f44f5e4ed32fe..40c624278f6b6b4bc29ad76dc2ea809a8e21f1cd 100644
--- a/src/plug-in/audiorecorder/audiorecord.cpp
+++ b/src/plug-in/audiorecorder/audiorecord.cpp
@@ -19,6 +19,22 @@
 
 #include "audiorecord.h"
 
+// structure for the wave header
+struct wavhdr {
+  char riff[4];           // "RIFF"
+  SINT32 file_size;       // in bytes
+  char wave[4];           // "WAVE"
+  char fmt[4];            // "fmt "
+  SINT32 chunk_size;      // in bytes (16 for PCM)
+  SINT16 format_tag;      // 1=PCM, 2=ADPCM, 3=IEEE float, 6=A-Law, 7=Mu-Law
+  SINT16 num_chans;       // 1=mono, 2=stereo
+  SINT32 sample_rate;
+  SINT32 bytes_per_sec;
+  SINT16 bytes_per_samp;  // 2=16-bit mono, 4=16-bit stereo
+  SINT16 bits_per_samp;
+  char data[4];           // "data"
+  SINT32 data_length;     // in bytes
+};
 
 
 AudioRecord::AudioRecord(){
@@ -38,9 +54,11 @@ void AudioRecord::setSndSamplingRate(int smplRate){
   sndSmplRate_ = smplRate;  
 }
 
-void AudioRecord::setRecordingOption(FILE_TYPE type, SOUND_FORMAT format, int sndSmplRate){
+void AudioRecord::setRecordingOption(FILE_TYPE type, SOUND_FORMAT format, int sndSmplRate, std::string path){
  
-  fileType_ = type;
+    std::string fName;
+
+    fileType_ = type;
   sndFormat_ = format;
   channels_ = 1;
   sndSmplRate_ = sndSmplRate;
@@ -57,6 +75,11 @@ void AudioRecord::setRecordingOption(FILE_TYPE type, SOUND_FORMAT format, int sn
        strcat(fileName_, ".wav");
      }
    }
+
+   fName = fileName_;
+   savePath_ = path + "/";
+   savePath_.append(fName);
+
 }
 
 void AudioRecord::openFile(){
@@ -64,16 +87,6 @@ void AudioRecord::openFile(){
    
    _debug("AudioRecord::openFile()\n");  
   
-   savePath_ = getenv("HOME");
-  
-   std::string fName(fileName_);
- 
-   savePath_ += "/";
-   
-   
-   savePath_.append(fName);
-  
-
    bool result = false;
    
    _debug("AudioRecord::openFile()\n");
diff --git a/src/plug-in/audiorecorder/audiorecord.h b/src/plug-in/audiorecorder/audiorecord.h
index f39e21b90a7700d380684f5d9f3d635af50d9b27..68b5436afb77b5646d0b98a5c1028c306003cfa9 100644
--- a/src/plug-in/audiorecorder/audiorecord.h
+++ b/src/plug-in/audiorecorder/audiorecord.h
@@ -17,34 +17,17 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifndef _AUDIO_RECORD_H
+#define _AUDIO_RECORD_H
 
 #include <iostream>
 #include <string.h>
 #include <stdlib.h>
 #include <sstream>
 
-#include "global.h"
 #include "plug-in/plugin.h"
 using namespace std;
 
-
-// structure for the wave header
-struct wavhdr {
-  char riff[4];           // "RIFF"
-  SINT32 file_size;       // in bytes
-  char wave[4];           // "WAVE"
-  char fmt[4];            // "fmt "
-  SINT32 chunk_size;      // in bytes (16 for PCM)
-  SINT16 format_tag;      // 1=PCM, 2=ADPCM, 3=IEEE float, 6=A-Law, 7=Mu-Law
-  SINT16 num_chans;       // 1=mono, 2=stereo
-  SINT32 sample_rate;
-  SINT32 bytes_per_sec;
-  SINT16 bytes_per_samp;  // 2=16-bit mono, 4=16-bit stereo
-  SINT16 bits_per_samp;
-  char data[4];           // "data"
-  SINT32 data_length;     // in bytes
-};
-
 typedef std::string CallID;
 
 class AudioRecord
@@ -56,7 +39,7 @@ public:
 
   void setSndSamplingRate(int smplRate);
 
-  void setRecordingOption(FILE_TYPE type, SOUND_FORMAT format, int sndSmplRate);
+  void setRecordingOption(FILE_TYPE type, SOUND_FORMAT format, int sndSmplRate, std::string path);
 
   /** 
    * Check if no otehr file is opened, then create a new one
@@ -201,3 +184,5 @@ protected:
 
 
 };
+
+#endif // _AUDIO_RECORD_H
diff --git a/src/voiplink.h b/src/voiplink.h
index b8ee4bd6a0acf49055d5879ae27efb0f6eca3d26..92b7795eb479a987674e71cc9d75a88fcd181565 100644
--- a/src/voiplink.h
+++ b/src/voiplink.h
@@ -23,8 +23,8 @@
 #ifndef __VOIP_LINK_H__
 #define __VOIP_LINK_H__
 
-#include "call.h"
 #include "account.h"
+#include "call.h"
 
 class AudioCodec;
 class Account;