diff --git a/lang/ast/ast.po b/lang/ast/ast.po
new file mode 100644
index 0000000000000000000000000000000000000000..e4e2ccba97825368db314c3789a4c89c43cc7cbb
--- /dev/null
+++ b/lang/ast/ast.po
@@ -0,0 +1,1223 @@
+# Asturian translation for sflphone
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the sflphone package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2009-12-17 01:18+0000\n"
+"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
+"Language-Team: Asturian <ast@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../sflphone-client-gnome/src/accountlist.c:170
+msgid "Registered"
+msgstr "RexistrÃ¡u"
+
+#: ../sflphone-client-gnome/src/accountlist.c:173
+msgid "Not Registered"
+msgstr "Non rexistrÃ¡u"
+
+#: ../sflphone-client-gnome/src/accountlist.c:176
+msgid "Trying..."
+msgstr "Probando..."
+
+#: ../sflphone-client-gnome/src/accountlist.c:179
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Fallu"
+
+#: ../sflphone-client-gnome/src/accountlist.c:182
+msgid "Authentication Failed"
+msgstr "FallÃ³ n'autenticaciÃ³n"
+
+#: ../sflphone-client-gnome/src/accountlist.c:185
+msgid "Network unreachable"
+msgstr "Rede nun alcanzable"
+
+#: ../sflphone-client-gnome/src/accountlist.c:188
+msgid "Host unreachable"
+msgstr "Host nun alcanzable"
+
+#: ../sflphone-client-gnome/src/accountlist.c:191
+msgid "Stun configuration error"
+msgstr "Error na configuraciÃ³n STUN"
+
+#: ../sflphone-client-gnome/src/accountlist.c:194
+msgid "Stun server invalid"
+msgstr "Sirvidor STUN invÃ¡lidu"
+
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
+msgid "Invalid"
+msgstr "InvÃ¡lidu"
+
+#: ../sflphone-client-gnome/src/actions.c:114
+msgid "Using account"
+msgstr "Usando la cuenta"
+
+#: ../sflphone-client-gnome/src/actions.c:121
+msgid "No registered accounts"
+msgstr "Nun hai cuentes rexistrÃ¡es"
+
+#: ../sflphone-client-gnome/src/actions.c:306
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"Nun se puede coneutar col sirvidor SFLphone.\n"
+"Compruebe qu'el daemon tea funcionando."
+
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
+msgid "Direct SIP call"
+msgstr "Llamada SIP direuta"
+
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"<b>Avisu ALSA</b>\n"
+"\n"
+"Error al abrir el presÃ©u de reproducciÃ³n"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"<b>Avisu ALSA</b>\n"
+"\n"
+"Error al abrir el presÃ©u de captura"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"<b>Avisu de Pulseaudio</b>\n"
+"\n"
+"Pulseaudio nun ta funcionando"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:94
+msgid "There is one call in progress."
+msgstr "Hai una llamada en cursu."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:98
+msgid "There are calls in progress."
+msgstr "Hai llamaes en cursu."
+
+#: ../sflphone-client-gnome/src/mainwindow.c:103
+msgid "Do you still want to quit?"
+msgstr "Â¿EntÃ¡ quier salir?"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:331
+msgid "SFLphone Error"
+msgstr "Error SFLphone"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:450
+#, c-format
+msgid "ZRTP is not supported by peer %s\n"
+msgstr "El par %s nun sofita ZRTP\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:452
+msgid "Secure Communication Unavailable"
+msgstr "La comunicaciÃ³n segura nun ta disponible"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
+msgid "Continue"
+msgstr "Siguir"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
+msgid "Stop Call"
+msgstr "Terminar llamada"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:480
+#, c-format
+msgid ""
+"A %s error forced the call with %s to fall under unencrypted mode.\n"
+"Exact reason: %s\n"
+msgstr ""
+"Un error de %s fizo que la llamada con %s pasara a mou ensin encriptar.\n"
+"RazÃ³n esauta: %s\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:482
+msgid "ZRTP negotiation failed"
+msgstr "FallÃ³ la negociaciÃ³n ZRTP"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:500
+#, c-format
+msgid ""
+"%s wants to stop using secure communication. Confirm will resume "
+"conversation without SRTP.\n"
+msgstr ""
+"%s quier dexar d'usar comunicaciÃ³n segura. Confirmar reaniciarÃ¡ la "
+"conversaciÃ³n ensin SRTP.\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:502
+msgid "Confirm Go Clear"
+msgstr "Confirmar mou en claro"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:504
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s cuenta : %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>De</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d mensaxe de voz"
+msgstr[1] "%d mensaxes de voz"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Llamando cola cuenta %s <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Cuenta actual"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Nun hai cuentes configuraes"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Nun tien denguna cuenta rexistrada"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:190
+#, c-format
+msgid ""
+"<i>With:</i> %s \n"
+"using %s"
+msgstr ""
+"<i>Con:</i> %s\n"
+"usando %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:205
+#, c-format
+msgid "%s does not support ZRTP."
+msgstr "%s nun tien sofitu pa ZRTP."
+
+#: ../sflphone-client-gnome/src/sflnotify.c:220
+#, c-format
+msgid "ZRTP negotiation failed with %s"
+msgstr "FallÃ³ la negociaciÃ³n ZRTP con %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:235
+#, c-format
+msgid "<i>With:</i> %s"
+msgstr "<i>Con:</i> %s"
+
+#: ../sflphone-client-gnome/src/sliders.c:162
+msgid "Speakers volume"
+msgstr "Volume d'altavoces"
+
+#: ../sflphone-client-gnome/src/sliders.c:164
+msgid "Mic volume"
+msgstr "Volume del micrÃ³fonu"
+
+#: ../sflphone-client-gnome/src/statusicon.c:128
+msgid "_Show main window"
+msgstr "Amo_sar ventana principal"
+
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "_Colgar"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "Hai %d cuenta activa"
+msgstr[1] "Hai %d cuentes actives"
+
+#: ../sflphone-client-gnome/src/toolbar.c:38
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
+msgid "Voicemail"
+msgstr "BuzÃ³n de voz"
+
+#: ../sflphone-client-gnome/src/uimanager.c:121
+msgid "No address book selected"
+msgstr "Nun s'escoyÃ³ una llibreta de direiciones"
+
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
+msgid "Address book"
+msgstr "Llibreta de direiciones"
+
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
+msgid "Voicemail (%i)"
+msgstr "BuzÃ³n de voz (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:396
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr ""
+"SFLphone ye un programa de VoIP compatible colos protocolos SIP ya IAX2."
+
+#: ../sflphone-client-gnome/src/uimanager.c:398
+msgid "About SFLphone"
+msgstr "Tocante a SFLphone"
+
+#: ../sflphone-client-gnome/src/uimanager.c:800
+msgid "Call"
+msgstr "Llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
+msgid "_New call"
+msgstr "Llamada _Nueva"
+
+#: ../sflphone-client-gnome/src/uimanager.c:802
+msgid "Place a new call"
+msgstr "Facer una llamada nueva"
+
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Pick up"
+msgstr "_Descolgar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:804
+msgid "Answer the call"
+msgstr "Contestar la llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:806
+msgid "Finish the call"
+msgstr "Finar la llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:807
+msgid "O_n hold"
+msgstr "_N'espera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:808
+msgid "Place the call on hold"
+msgstr "Poner la llamada n'espera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:809
+msgid "O_ff hold"
+msgstr "_Salir d'espera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:810
+msgid "Place the call off hold"
+msgstr "Sacar la llamada d'espera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:811
+msgid "Configuration _Assistant"
+msgstr "_Asistente de configuraciÃ³n"
+
+#: ../sflphone-client-gnome/src/uimanager.c:812
+msgid "Run the configuration assistant"
+msgstr "Executar l'asistente de configuraciÃ³n"
+
+#: ../sflphone-client-gnome/src/uimanager.c:815
+msgid "Call your voicemail"
+msgstr "Llamar al buzÃ³n de voz"
+
+#: ../sflphone-client-gnome/src/uimanager.c:816
+msgid "_Close"
+msgstr "_Zarrar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:817
+msgid "Minimize to system tray"
+msgstr "Minimizar na bandexa de sistema"
+
+#: ../sflphone-client-gnome/src/uimanager.c:818
+msgid "_Quit"
+msgstr "_Colar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:819
+msgid "Quit the program"
+msgstr "Colar del programa"
+
+#: ../sflphone-client-gnome/src/uimanager.c:822
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:823
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:824
+msgid "Copy the selection"
+msgstr "Copiar la seleiciÃ³n"
+
+#: ../sflphone-client-gnome/src/uimanager.c:825
+msgid "_Paste"
+msgstr "A_pegar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:826
+msgid "Paste the clipboard"
+msgstr "Pegar el contenÃu del cartafueyu"
+
+#: ../sflphone-client-gnome/src/uimanager.c:827
+msgid "Clear _history"
+msgstr "Llimpiar _hestorial"
+
+#: ../sflphone-client-gnome/src/uimanager.c:828
+msgid "Clear the call history"
+msgstr "Llimpiar l'hestorial de llamÃ¡es"
+
+#: ../sflphone-client-gnome/src/uimanager.c:829
+msgid "_Accounts"
+msgstr "_Cuentes"
+
+#: ../sflphone-client-gnome/src/uimanager.c:829
+msgid "Edit your accounts"
+msgstr "Editar les sos cuentes"
+
+#: ../sflphone-client-gnome/src/uimanager.c:831
+msgid "_Preferences"
+msgstr "_Preferencies"
+
+#: ../sflphone-client-gnome/src/uimanager.c:832
+msgid "Change your preferences"
+msgstr "Camudar les sos preferencies"
+
+#: ../sflphone-client-gnome/src/uimanager.c:835
+msgid "_View"
+msgstr "_Ver"
+
+#: ../sflphone-client-gnome/src/uimanager.c:838
+msgid "_Help"
+msgstr "_Aida"
+
+#: ../sflphone-client-gnome/src/uimanager.c:839
+msgid "Contents"
+msgstr "ContenÃu"
+
+#: ../sflphone-client-gnome/src/uimanager.c:840
+msgid "Open the manual"
+msgstr "Abrir el manual"
+
+#: ../sflphone-client-gnome/src/uimanager.c:841
+msgid "About this application"
+msgstr "Tocante a esta aplicaciÃ³n"
+
+#: ../sflphone-client-gnome/src/uimanager.c:849
+msgid "_Transfer"
+msgstr "_Tresferir"
+
+#: ../sflphone-client-gnome/src/uimanager.c:850
+msgid "Transfer the call"
+msgstr "Tresferir la llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "G_rabar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr "Grabar la conversaciÃ³n actual"
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
+msgid "_Show toolbar"
+msgstr "Amo_sar ferramientes"
+
+#: ../sflphone-client-gnome/src/uimanager.c:854
+msgid "Show the toolbar"
+msgstr "Amuesa la barra de ferramientes"
+
+#: ../sflphone-client-gnome/src/uimanager.c:855
+msgid "_Dialpad"
+msgstr "_TeclÃ¡u"
+
+#: ../sflphone-client-gnome/src/uimanager.c:856
+msgid "Show the dialpad"
+msgstr "Amosar el teclÃ¡u pa marcar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:857
+msgid "_Volume controls"
+msgstr "_Controles de volume"
+
+#: ../sflphone-client-gnome/src/uimanager.c:858
+msgid "Show the volume controls"
+msgstr "Amuesa los controles de volume"
+
+#: ../sflphone-client-gnome/src/uimanager.c:859
+msgid "_History"
+msgstr "_Hestorial"
+
+#: ../sflphone-client-gnome/src/uimanager.c:860
+msgid "Calls history"
+msgstr "Hestorial de llamÃ¡es"
+
+#: ../sflphone-client-gnome/src/uimanager.c:861
+msgid "_Address book"
+msgstr "Llibret_a de direiciones"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
+msgid "On _Hold"
+msgstr "_N'espera"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1234
+msgid "_Call back"
+msgstr "Tornar _Llamada"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1390
+msgid "Edit phone number"
+msgstr "Editar nÃºmberu de telÃ©fonu"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1402
+msgid "Edit the phone number before making a call"
+msgstr "Editar el nÃºmberu de telÃ©fonu enantes de llamar"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
+msgid "Account Parameters"
+msgstr "ParÃ¡metros de cuenta"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
+msgid "_Alias"
+msgstr "Nom_atu"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
+msgid "_Protocol"
+msgstr "_Protocolu"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
+msgid "Unknown"
+msgstr "DesconocÃu"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
+msgid "_Host name"
+msgstr "Nome del _host"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
+msgid "_User name"
+msgstr "Nome d'_usuariu"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
+msgid "_Password"
+msgstr "Cont_raseÃ±a"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
+msgid "Show password"
+msgstr "Amosar contraseÃ±a"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
+msgid "_Voicemail number"
+msgstr "NÃºmberu del buzÃ³n de _voz"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "Nome d'_usuariu"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
+msgid "Authentication"
+msgstr "AutenticaciÃ³n"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
+msgid "Secret"
+msgstr "Secretu"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
+msgid "Credential"
+msgstr "Credencial"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
+msgid "Authentication name"
+msgstr "Nome d'autenticaciÃ³n"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
+msgid "Password"
+msgstr "ContraseÃ±a"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
+msgid "Security"
+msgstr "SeguridÃ¡"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
+msgid "Use TLS transport (sips)"
+msgstr "Usar tresporte TLS (sips)"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
+msgid "SRTP key exchange"
+msgstr "IntercambÃ©u de clave SRTP"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
+msgid "Disabled"
+msgstr "DesactivÃ¡u"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
+msgid "Registration"
+msgstr "Rexistru"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
+msgid "Registration expire"
+msgstr "Fin del rexistu"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
+msgid "_Comply with RFC 3263"
+msgstr "_Cumplir con RFC 3263"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
+msgid "Network Interface"
+msgstr "Interfaz de rede"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
+msgid "Local address"
+msgstr "DireiciÃ³n llocal"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
+msgid "Local port"
+msgstr "Puertu llocal"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
+msgid "Published address"
+msgstr "DireiciÃ³n espublizada"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
+msgid "Using STUN"
+msgstr "Usando STUN"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
+msgid "STUN server URL"
+msgstr "URL del sirvidor STUN"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+msgid "Same as local parameters"
+msgstr "Igual que los parÃ¡metros llocales"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
+msgid "Set published address and port:"
+msgstr "Afitar direiciÃ³n y puertu espublizaos:"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
+msgid "Published port"
+msgstr "Puertu espublizÃ¡u"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
+msgid "Account settings"
+msgstr "Axustes de la cuenta"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
+msgid "Basic"
+msgstr "BÃ¡sicu"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "CÃ³decs"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
+msgid "Advanced"
+msgstr "AvanzÃ¡u"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+"Esti perfil va usase cuando quiera coneutar col par remotu escribiendo una "
+"URI sip  como <b>sip:parremotu</b>. Los parÃ¡metros que conseÃ±e equÃ, tamiÃ©n "
+"van usase si una llamada entrante o saliente nun concasa con cuenta dala."
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
+#, c-format
+msgid "Server returned \"%s\" (%d)"
+msgstr "El sirvidor devolviÃ³ \"%s\" (%d)"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
+msgid "Protocol"
+msgstr "Protocolu"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
+msgid "Status"
+msgstr "EstÃ¡u"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
+msgid "Accounts"
+msgstr "Cuentes"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
+msgid "Configured Accounts"
+msgstr "Cuentes Configuraes"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] "Hai %d cuenta activa"
+msgstr[1] "Hai %d cuentes actives"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
+msgid "You have no active account"
+msgstr "Nun hai denguna cuenta activada"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
+msgid "General"
+msgstr "Xeneral"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "_Usar llibreta de direiciones d'Evolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "Llende de descarga:"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "tarxetes"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "Amosar foto _del contautu, si ta disponible"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "Campos de les llibretes de direiciones d'Evolution"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Trabayu"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_Casa"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Movil"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Llibretes de direiciones"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "Esbille les llibretes de direiciones d'Evolution a usar"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
+msgid "Name"
+msgstr "Nome"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:75
+#, c-format
+msgid "This assistant is now finished."
+msgstr "Esti asistente yÃ¡ finÃ³."
+
+#: ../sflphone-client-gnome/src/config/assistant.c:77
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Puede comprobar en cualisquier momentu l'estÃ¡u del rexistru, o camudar los "
+"parÃ¡metros de les cuentes de so, na ventana Opciones/Cuentes."
+
+#: ../sflphone-client-gnome/src/config/assistant.c:80
+msgid "Alias"
+msgstr "Nomatu"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:84
+msgid "Server"
+msgstr "Sirvidor"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:88
+msgid "Username"
+msgstr "Nome d'usuariu"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:92
+msgid "Security: "
+msgstr "SeguridÃ¡: "
+
+#: ../sflphone-client-gnome/src/config/assistant.c:94
+msgid "SRTP/ZRTP draft-zimmermann"
+msgstr "SRTP/ZRTP draft-zimmermann"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:96
+msgid "None"
+msgstr "Denguna"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:230
+msgid "SFLphone account creation wizard"
+msgstr "Asistente SFLphone de creaciÃ³n de cuentes"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:256
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "Â¡BienllegÃ¡u al asistente de creaciÃ³n de cuentes de SFLphone!"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:257
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+"Esti asistente d'instalaciÃ³n echara-y un gabitu pa configurar una cuenta."
+
+#: ../sflphone-client-gnome/src/config/assistant.c:271
+msgid "VoIP Protocols"
+msgstr "Protocolos VoIP"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:271
+msgid "Select an account type"
+msgstr "Escueya una triba de cuenta"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:273
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIP (Session Initiation Protocol)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:275
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2 (InterAsterix Exchange)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:289
+msgid "Account"
+msgstr "Cuenta"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:289
+msgid "Please select one of the following options"
+msgstr "Escueya una de les siguientes opciones"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:291
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "Crear una cuenta SIP/IAX2 de baldre en sflphone.org"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:293
+msgid "Register an existing SIP or IAX2 account"
+msgstr "Rexistrar una cuenta SIP o IAX2 esistente"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+msgid "SIP account settings"
+msgstr "Axustes de cuenta SIP"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
+msgid "Please fill the following information"
+msgstr "ConseÃ±e la informaciÃ³n siguiente"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
+msgid "Secure communications with _ZRTP"
+msgstr "ComunicaciÃ³n segura con _ZRTP"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:390
+msgid "Optional email address"
+msgstr "CorrÃ©u ellectrÃ³nicu opcional"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:390
+msgid "This email address will be used to send your voicemail messages."
+msgstr ""
+"Estes seÃ±es de corrÃ©u van usase pa unviar los mensaxes del buzÃ³n de voz."
+
+#: ../sflphone-client-gnome/src/config/assistant.c:398
+msgid "_Email address"
+msgstr "_CorrÃ©u"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:420
+msgid "IAX2 account settings"
+msgstr "Axustes de cuenta IAX2"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:497
+msgid "Network Address Translation (NAT)"
+msgstr "ConversiÃ³n de DireiciÃ³n de Rede (NAT)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:497
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Seique tenga qu'activar esto si ta tres d'un torgafueos."
+
+#: ../sflphone-client-gnome/src/config/assistant.c:506
+msgid "E_nable STUN"
+msgstr "A_ctivar STUN"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:513
+msgid "_STUN server"
+msgstr "_Sirvidor STUN"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:527
+msgid "Account Registration"
+msgstr "Rexistru de cuenta"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:527
+msgid "Congratulations!"
+msgstr "Â¡Norabona!"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
+msgid "Bitrate"
+msgstr "Tasa de bits"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
+msgid "Bandwidth"
+msgstr "Anchor de banda"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
+msgid "ALSA plugin"
+msgstr "Complementu ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
+msgid "Output"
+msgstr "Salida"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
+msgid "Input"
+msgstr "Entrada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
+msgid "_Voice Activity Detection"
+msgstr "DetecciÃ³n d'actividÃ¡ de _voz"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "Ame_norgar ruÃu (Narrow-Band Companding)"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
+msgid "Sound Manager"
+msgstr "Xestor de sonÃu"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
+msgid "_Pulseaudio"
+msgstr "_Pulseaudio"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
+msgid "_ALSA"
+msgstr "_ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
+msgid "ALSA settings"
+msgstr "Axustes de ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Recordings"
+msgstr "Grabaciones"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
+msgid "Destination folder"
+msgstr "Carpeta de destÃn"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
+msgid "Select a folder"
+msgstr "Seleicione una carpeta"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
+msgid "Ringtones"
+msgstr "Tonos de llamada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
+msgid "_Enable ringtones"
+msgstr "_Activar tonos de llamada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
+msgid "Choose a ringtone"
+msgstr "Escueya un tono de llamada"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
+msgid "Audio Files"
+msgstr "Ficheros de sonÃu"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL Argumentu"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "Ordes personalizÃ¡es pa llamÃ¡es entrantes con URL"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%s va trocase pola URL pasada."
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "Disparador pa una cabecera _SIP determinada"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "Disparador pa una URL _IAX2"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "O_rde a executar"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "Reescritura de nÃºmberu telefÃ³nicu"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "_Prefixar los nÃºmberos marcaos con"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
+msgid "Desktop Notifications"
+msgstr "Notificaciones nel escritoriu"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
+msgid "_Enable notifications"
+msgstr "_Activar notificaciones"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
+msgid "System Tray Icon"
+msgstr "Iconu de la bandexa del sistema"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
+msgid "_Popup main window on incoming call"
+msgstr "_Estenderexar ventana principal al recibir llamada"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
+msgid "Ne_ver popup main window"
+msgstr "_Nunca estenderexar ventana principal"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
+msgid "Hide SFLphone window on _startup"
+msgstr "Anubrir _ventana SFLphone nel entamu"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
+msgid "Calls History"
+msgstr "HestÃ³ricu de llamaes"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
+msgid "_Keep my history for at least"
+msgstr "_Guardar el mio hestÃ³ricu polo menos"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+msgid "days"
+msgstr "dÃes"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
+msgid "Preferences"
+msgstr "Preferencies"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
+msgid "Audio"
+msgstr "SonÃu"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
+msgid "Address Book"
+msgstr "Llibreta de direiciones"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
+msgid "Hooks"
+msgstr "Enganches"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
+msgid "Advanced options for TLS"
+msgstr "Opciones avanzaes pa TLS"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
+msgid "TLS transport"
+msgstr "Tresporte TLS"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
+msgid ""
+"TLS transport can be used along with UDP for those calls that would\n"
+"require secure sip transactions (aka SIPS). You can configure a different\n"
+"TLS transport for each account. However, each of them will run on a "
+"dedicated\n"
+"port, different one from each other\n"
+msgstr ""
+"El tresporte TLS puede utilizase xunto con UDP para les llamaes que "
+"necesiten\n"
+"intercambÃ©os SIP seguros (SIPS). Puede configurar un tresporte TLS distintu\n"
+"pa cada cuenta. Por embargu, caÃºn d'ellos va executase nun puertu dedicÃ¡u,\n"
+"diferentes ente sigo.\n"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
+msgid "Certificate of Authority list"
+msgstr "Llista de Certificaos d'AutoridÃ¡"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
+msgid "Choose a CA list file (optional)"
+msgstr "Escueya un ficheru de llista de CA (opcional)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
+msgid "Public endpoint certificate file"
+msgstr "Ficheru de certificÃ¡u de par pÃºblicu"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
+msgid "Choose a public endpoint certificate (optional)"
+msgstr "Escueye un certificÃ¡u pÃºblicu de par (opcional)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
+msgid "Choose a private key file (optional)"
+msgstr "Escueye un ficheru de clave privada (opcional)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
+msgid "Password for the private key"
+msgstr "ContraseÃ±a de la clave privada"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
+msgid "TLS protocol method"
+msgstr "MÃ©todu del protocolu TLS"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
+msgid "TLS cipher list"
+msgstr "Llista de cifrÃ¡u TLS"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
+msgid "Server name instance for outgoing TLS connection"
+msgstr "Nome de sirvidor pa la conexÃ³n TLS saliente"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
+msgid "Negotiation timeout (sec:msec)"
+msgstr "Tiempu de negociaciÃ³n (seg:mseg)"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
+msgid "Verify incoming certificates, as a server"
+msgstr "Comprobar certificaos entrantes, como un sirvidor"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
+msgid "Verify certificates from answer, as a client"
+msgstr "Comprobar certificaos de la respuesta, como un cliente"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
+msgid "Require certificate for incoming tls connections"
+msgstr "Requerir certificÃ¡u pa les conexones TLS entrantes"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
+msgid "ZRTP Options"
+msgstr "Opciones ZRTP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
+msgid "Send Hello Hash in S_DP"
+msgstr "Unviar Hash de Hello en S_DP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
+msgid "Ask User to Confirm SAS"
+msgstr "Pidir al usuariu que confirme SAS"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
+msgid "_Warn if ZRTP not supported"
+msgstr "A_visar si nun hai sofitu ZRTP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
+msgid "Display SAS once for hold events"
+msgstr "Amosar SAS una vegada pa eventos n'espera"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+#, fuzzy
+msgid "SDES Options"
+msgstr "Opciones ZRTP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
+msgid "Search all"
+msgstr "Guetar todos"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
+msgid "Click here to change the search type"
+msgstr "Calque equÃ pa camudar el tipu de gueta"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
+msgid "Search by missed call"
+msgstr "Guetar por llamaes perdÃes"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
+msgid "Search by incoming call"
+msgstr "Guetar por llamaes entrantes"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
+msgid "Search by outgoing call"
+msgstr "Guetar por llamaes salientes"
+
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>Error: Nun s'alcontraron codecs de sonÃu.\n"
+#~ "\n"
+#~ "</b> Los codecs de sonÃu de SFLphone han tar en <i>%s</i> o nel "
+#~ "direutoriu <b>.sflphone</b> de la so carpeta personal ( <i>%s</i> )"
+
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "%i cuenta configurada"
+#~ msgstr[1] "%i cuentes configuraes"
+
+#~ msgid "Direct IP calls"
+#~ msgstr "Llamaes IP direutes"
diff --git a/lang/da/da.po b/lang/da/da.po
index 1c011969aca5c2afa3b9a4cc76db3e748bcd6bc2..a6ed9863b0d7e8238745a49c0dc20e235782904f 100644
--- a/lang/da/da.po
+++ b/lang/da/da.po
@@ -7,68 +7,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-11-03 03:52+0000\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2010-01-04 19:10+0000\n"
 "Last-Translator: Jonas Fonseca <fonseca@diku.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "Registreret"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "Ikke registreret"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr "ForsÃ¸ger..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "Fejl"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "Godkendelse mislykkedes"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "NetvÃ¦rk kan ikke nÃ¥s"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "VÃ¦rt kan ikke nÃ¥s"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr "Stun konfigureringsfejl"
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr "Stun server ugyldig"
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "Ugyldig"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr "Benytter konto"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr "Ingen registrerede konti"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -76,23 +80,26 @@ msgstr ""
 "Forbindelse til SFLphone serveren kan ikke oprettes.\n"
 "SÃ¸rg for at server-dÃ¦monen kÃ¸rer."
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr "Direkte IP opkald"
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
-"<b>Fejl: Ingen audio-codec fundet\n"
-"\n"
-"</b>SFL audio-codecs skal installeres i <i>%s</i> eller i mappen <b>."
-"sflphone</b> i dit hjemmekatalog (<i>%s</i>)"
 
 #: ../sflphone-client-gnome/src/errors.c:29
 msgid ""
@@ -124,43 +131,43 @@ msgstr ""
 "\n"
 "PulseAudio er tilgÃ¦ngelig"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr "Et igangvÃ¦rende opkald eksisterer"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr "IgangvÃ¦rende opkald eksisterer"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr "Ã˜nsker du stadig at afslutte"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr "SFLphone fejl"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr "ZRTP er ikke understÃ¸ttet af modtageren %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr "Sikker kommunikation ikke tilgÃ¦ngelig"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr "FortsÃ¦t"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr "Afslut opkald"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -170,11 +177,11 @@ msgstr ""
 "tilstand.\n"
 "Den prÃ¦cise Ã¥rsag: %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr "ZRTP-forhandling mislykkedes"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
@@ -183,11 +190,11 @@ msgstr ""
 "%s Ã¸nsker at afslutte brugen af sikker kommunikation. Ved at godkende vil "
 "samtalen fortÃ¦tte uden SRTP\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr "Godkend sikkerhedsÃ¦ndring"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr "Godkend"
 
@@ -258,443 +265,465 @@ msgstr "HÃ¸jtaler lydstyrke"
 msgid "Mic volume"
 msgstr "Mikrofon lydstyrke"
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr "_Vis hovedvindue"
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "_LÃ¦g pÃ¥"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] "%i konto oprettet"
-msgstr[1] "%i konti oprettet"
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "aktiv konto"
+msgstr[1] "aktiv konto"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr "Talebesked"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
-msgstr ""
+msgstr "Ingen adressebog er valgt"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "Adressebog"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
 msgid "Voicemail (%i)"
 msgstr "Talebesked"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone er en VoIP-klient kompatibel med SIP og IAX2 protokoller"
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr "Om SFLphone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr "Afslut opkald"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr "_Nyt opkald"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
-msgstr ""
+msgstr "Lav et nyt opkald"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr "_Svar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
-msgstr ""
+msgstr "Besvar opkaldet"
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "_LÃ¦g pÃ¥"
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
-msgstr ""
+msgstr "Afslut opkaldet"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr "I _venteposition"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
-msgstr ""
+msgstr "SÃ¦t opkaldet i venteposition"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
-msgstr ""
+msgstr "F_jern fra venteposition"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
-msgstr ""
+msgstr "Fjern opkaldet fra venteposition"
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "_Optag"
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr "Konfigurationsfil"
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr "Stun konfigureringsfejl"
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr "%d indtalt besked"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
-msgstr ""
+msgstr "_Luk"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
-msgstr ""
+msgstr "Minimere til systembakken"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
-msgstr ""
+msgstr "_Afslut"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
-msgstr ""
+msgstr "Afslut programmet"
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
-msgstr ""
+msgstr "_Rediger"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
-msgstr ""
+msgstr "_Kopier"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
-msgstr ""
+msgstr "Kopier det valgte"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
-msgstr ""
+msgstr "Inds_Ã¦t"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
-msgstr ""
+msgstr "IndsÃ¦t indholdet af udklipsholderen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr "Opkaldshistorik"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr "Opkaldshistorik"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr "Konti"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr "NuvÃ¦rende konto"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr "Indstillinger"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
-msgstr ""
+msgstr "Ã†ndr dine indstillinger"
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
-msgstr ""
+msgstr "_Vis"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "_Hjem"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr "FortsÃ¦t"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
-msgstr ""
+msgstr "Ã…bn manualen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr "Godkendelse"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
-msgstr ""
+msgstr "_OverfÃ¸r"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
-msgstr ""
+msgstr "OverfÃ¸r opkaldet"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "_Optag"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr "Optag den aktuelle samtale"
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
-msgstr ""
+msgstr "_Vis vÃ¦rktÃ¸jslinie"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
-msgstr ""
+msgstr "Vis vÃ¦rktÃ¸jslinien"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
-msgstr "Deaktiveret"
+msgstr "_Nummertastatur"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
-msgstr ""
+msgstr "Vis nummertastaturet"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
-msgstr ""
+msgstr "Vis _lydstyrke indstillinger"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
-msgstr ""
+msgstr "Vis lydstyrke indstillingerne"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr "Opkaldshistorik"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr "Opkaldshistorik"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "Adressebog"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr "I _venteposition"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr "_Besvar opkald"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr "Ã†ndre telefonnummer"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr "Ã†ndre telefonnummeret fÃ¸r opkald"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr "Kontoparametre"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "_Protokol"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr "_VÃ¦rtsnavn"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr "_Brugernavn"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "_Adgangskode"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr "Adgangskode"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr "_Nummer for talebesked"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "_Brugernavn"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr "Legitimationsoplysning"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr "Godkendelsesnavn"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr "Benyt TLS transport (sips)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr "SRTP-nÃ¸gleudveksling"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr "Deaktiveret"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr "Registrering"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr "ForÃ¦ldelse af registrering"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr "_Overhold RFC 3263"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "NetvÃ¦rk kan ikke nÃ¥s"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr "Lokal adresse"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr "Lokal port"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr "Offentliggjort adresse"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
-msgstr "Ved brug af STUN "
+msgstr "Ved brug af STUN"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr "STUN serveradresse"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr "Samme som lokale parametre"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr "Konfigurer offentliggjort adresse og port:"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr "Offentliggjort port"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr "Kontoindstillinger"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr "GrundlÃ¦ggende"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr "Advanceret"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr "NetvÃ¦rk"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+"Denne profil benyttes nÃ¥r du Ã¸nsker at kontakte en ekstern peer ved blot at "
+"indtaste en sip-adresse sÃ¥som <b>sip:eksternpeer</b>. De indstillinger som "
+"du definerer her vil ogsÃ¥ benyttes hvis ingen konto kan tilknyttes et "
+"indgÃ¥ende eller udgÃ¥ende opkald."
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
+#, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr "Server svarede \""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "Status"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr "Konti"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr "Oprettede konti"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
+#, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
-msgstr[0] " aktiv konto"
-msgstr[1] " aktiv konto"
+msgstr[0] "aktiv konto"
+msgstr[1] "aktiv konto"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr "Der er ingen aktive konti"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr "Generelt"
 
@@ -739,7 +768,7 @@ msgid "Select which Evolution address books to use"
 msgstr "VÃ¦lg hvilke af Evolutions adressekartoteker skal benyttes"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "Navn"
 
@@ -780,182 +809,178 @@ msgstr "SRTP/ZRTP draft-zimmermann"
 msgid "None"
 msgstr "Ingen"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr "SFLphone-guiden til oprettelse af konto"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr "Velkommen til kontooperettelsesvejledning for SFLphone"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr ""
 "Denne installeringsvejledning vil hjÃ¦lpe dig med at konfigurere en konto"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "VoIP protokoller"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr "VÃ¦lg en kontotype"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr "Konto"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr "VÃ¦lg en af fÃ¸lgende indstillinger"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr "Opret en gratis SIP/IAX2 konto hos sflphone.org"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr "Registrer en eksisterende SIP eller IAX2 konto"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr "SIP kontoindstillinger"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr "Udfyld venligst fÃ¸lgende information"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr "Sikker kommunikation med _ZRTP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr "Valgfri emailadresse"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr "Denne emailadresse vil blive brugt til at sende dig indtalte beskeder"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr "_Emailadresse"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr "IAX2 kontoindstillinger"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Du opfordres til at aktivere dette hvis du er bag en firewall"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr "_Benyt STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "_STUN server"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr "Kontoregistrering"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "Tillykke!"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "Frekvens"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "Bithastighed"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr "BÃ¥ndbredde"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr "ALSA plugin"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr "Uddata"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr "Inddata"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr "_Detektering af taleaktivitet"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr "_StÃ¸jreducering (Narrow-Band Companding)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr "LydhÃ¥ndtering"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "_PulseAudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "_ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr "ALSA indstillinger"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "Optagelser"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr "Destinationsmappe"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr "VÃ¦lg en mappe"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr "Ringetoner"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr "Aktiver _ringetoner"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr "VÃ¦lg en ringetone"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr "Lydfiler"
 
@@ -992,73 +1017,62 @@ msgstr "Omskrivning af telefonnummer"
 msgid "_Prefix dialed numbers with"
 msgstr "_PrÃ¦fiks for indtastede numre"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-"Denne profil benyttes nÃ¥r du Ã¸nsker at kontakte en ekstern peer ved blot at "
-"indtaste en sip-adresse sÃ¥som <b>sip:eksternpeer</b>. De indstillinger som "
-"du definerer her vil ogsÃ¥ benyttes hvis ingen konto kan tilknyttes et "
-"indgÃ¥ende eller udgÃ¥ende opkald."
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr "Meddelelser"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr "_Aktiver meddelelser"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr "Systembakke-ikon"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr "_Vis hovedvindue ved indgÃ¥ende opkald"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr "Aldrig _pop-op hovedvindue"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr "Skjul SFLphone vinduet ved _start"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr "Opkaldshistorik"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr "_Gem min historik i mindst"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr "dage"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr "Audio"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr "Hooks"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr "Direkte IP opkald"
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr "Advancerede indstillinger for TLS"
@@ -1080,55 +1094,59 @@ msgstr ""
 "TLS transporter for de enkelte konti. BemÃ¦rk dog at de hver vil benytte\n"
 "en dedikeret port forskellig fra hinanden.\n"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr "Autoritetscertifikatsliste"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr "VÃ¦lg en fil med en autoritetscertifikatsliste (valgfri)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr "Offentlig endpoint certifikatsfil"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "VÃ¦lg et offentligt endpoint-certifikat (valgfri)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr "VÃ¦lg en privat nÃ¸glefil (valgfri)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr "Adgangskode for den private nÃ¸gle"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr "TLS protokolmetode"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr "TLS cifferliste"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Server navneinstans for udgÃ¥ende TLS forbindelse"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr "Forhandlingstimeout"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr "UdfÃ¸r kontrol af indgÃ¥ende certifikater, som en server"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr "UdfÃ¸r kontrol af certifikater fra svar, som en klient"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr "KrÃ¦v certifikat for indgÃ¥ende TLS forbindelser"
 
@@ -1152,6 +1170,15 @@ msgstr "_Advar hvis ZRTP ikke understÃ¸ttes"
 msgid "Display SAS once for hold events"
 msgstr "_Vis SAS en enkelt gang for vente-hÃ¦ndelser"
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+#, fuzzy
+msgid "SDES Options"
+msgstr "ZRTP indstillinger"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr "SÃ¸g alle"
@@ -1175,41 +1202,57 @@ msgstr "SÃ¸g i indgÃ¥ende opkald"
 msgid "Search by outgoing call"
 msgstr "SÃ¸g i udgÃ¥ende opkald"
 
-#~ msgid "IP call - %s"
-#~ msgstr "IP opkald - %s"
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>Fejl: Ingen audio-codec fundet\n"
+#~ "\n"
+#~ "</b>SFL audio-codecs skal installeres i <i>%s</i> eller i mappen <b>."
+#~ "sflphone</b> i dit hjemmekatalog (<i>%s</i>)"
+
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "%i konto oprettet"
+#~ msgstr[1] "%i konti oprettet"
+
+#~ msgid "Direct IP calls"
+#~ msgstr "Direkte IP opkald"
+
+#~ msgid "SIP Port"
+#~ msgstr "SIP Port"
 
 #~ msgid "Codec"
 #~ msgstr "Kodning"
 
-#~ msgid "Network"
-#~ msgstr "NetvÃ¦rk"
+#~ msgid "There "
+#~ msgstr "Der "
 
 #~ msgid "Manually"
 #~ msgstr "Manuelt"
 
-#~ msgid "There "
-#~ msgstr "Der "
-
-#~ msgid "is "
-#~ msgstr "er "
+#~ msgid "s"
+#~ msgstr "s"
 
 #~ msgid "are "
 #~ msgstr "er "
 
-#~ msgid "s"
-#~ msgstr "s"
+#~ msgid "is "
+#~ msgstr "er "
 
 #~ msgid "_Mute other applications during a call"
 #~ msgstr "_DÃ¦mp andre programmer ved opkald"
 
-#~ msgid "SIP Port"
-#~ msgstr "SIP Port"
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Aktiver _talebeskedsmeddelelser"
 
 #~ msgid "UDP Transport"
 #~ msgstr "UDP transport"
 
-#~ msgid "Enable voicemail _notifications"
-#~ msgstr "Aktiver _talebeskedsmeddelelser"
+#~ msgid "IP call - %s"
+#~ msgstr "IP opkald - %s"
 
 #~ msgid "Store SIP credentials as MD5 hash"
 #~ msgstr "Gem SIP-legitimationsoplysninger som _MD5-hash-vÃ¦rdi"
diff --git a/lang/de/de.po b/lang/de/de.po
index ca1afd15a46c3577ef7821d053d5730e495373e1..be328408cb600124a5dc0ad22e3a7f905e9fb6dc 100644
--- a/lang/de/de.po
+++ b/lang/de/de.po
@@ -7,68 +7,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-10-26 20:46+0000\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2010-01-04 00:05+0000\n"
+"Last-Translator: JarosÅ‚aw Ogrodnik <nobodythere@gmail.com>\n"
 "Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "Registriert"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "Nicht registriert"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr "Am versuchen..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "Fehler"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "Kein netzwerk"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "Host unerreichbar"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr "Stun: Konfigurationsfehler"
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr "UngÃ¼ltiger Stun server"
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "UngÃ¼ltig"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr "Mit Konto"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr "Kein registriertes Konto"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -76,23 +80,26 @@ msgstr ""
 "SFLphone Server kann nicht verbunden werden. Stellen Sie sicher, dass der "
 "DÃ¤mon lÃ¤uft."
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
+msgstr "Direkter SIP-Anruf"
+
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
-"<b>Fehler: Kein Audio-Codec gefunden.\n"
-"\n"
-"</b> SFL Audio-Codecs mÃ¼ssen in <i>%s</i> oder <b>.sflphone</b> Ihres HOME-"
-"Verzeichniss ( <i>%s</i> ) gespeichert werden."
 
 #: ../sflphone-client-gnome/src/errors.c:29
 msgid ""
@@ -124,65 +131,69 @@ msgstr ""
 "\n"
 "Pulseaudio nicht gestartet"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr "Laufender Anruf."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr "Laufende Anrufe."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr "Bitte bestÃ¤tigen, dass Sie die Anwendung beenden mÃ¶chten"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr "SFLphone Fehler"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
-msgstr ""
+msgstr "ZRTP wird vom Nutzer %s nicht unterstÃ¼tzt\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr "Sichere Verbindung nicht verfÃ¼gbar"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr "Weiter"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr "Anruf beenden"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
+"Ein %s Fehler verhinderte die VerschlÃ¼sselung des Telefonats mit %s.\n"
+"Genauer Grund: %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
-msgstr ""
+msgstr "ZRTP Ãœbertragung fehlgeschlagen"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
+"%s will die sichere Kommunikation beenden. Das GesprÃ¤ch wird dann ohne SRTP "
+"fortgesetzt.\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr "BestÃ¤tigen"
 
@@ -227,16 +238,18 @@ msgid ""
 "<i>With:</i> %s \n"
 "using %s"
 msgstr ""
+"<i>Mit:</i> %s \n"
+"unter Verwendung von %s"
 
 #: ../sflphone-client-gnome/src/sflnotify.c:205
 #, c-format
 msgid "%s does not support ZRTP."
-msgstr ""
+msgstr "%s unterstÃ¼tzt ZRTP nicht."
 
 #: ../sflphone-client-gnome/src/sflnotify.c:220
 #, c-format
 msgid "ZRTP negotiation failed with %s"
-msgstr ""
+msgstr "ZRTP-Ãœbertragung mit %s schlug fehl"
 
 #: ../sflphone-client-gnome/src/sflnotify.c:235
 #, c-format
@@ -251,444 +264,461 @@ msgstr "Lautsprecher LautstÃ¤rke"
 msgid "Mic volume"
 msgstr "Mikro LautstÃ¤rke"
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr "_Hauptfenster anzeigen"
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "A_uflegen"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] "%i Konto konfiguriert"
-msgstr[1] "%i Konten konfiguriert"
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "aktive Konten"
+msgstr[1] "aktive Konten"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr "Voicemail"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr "Adressbuch"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
 msgid "Voicemail (%i)"
 msgstr "Voicemail (%i)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 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-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr "Ãœber SFLphone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr "_Anruf"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr "_Neuer Anruf"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
-msgstr ""
+msgstr "Einen neuen Anruf tÃ¤tigen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr "_Abnehmen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "A_uflegen"
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
-msgstr ""
+msgstr "Den Anruf beenden"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr "in _Warteschleife"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "_GesprÃ¤ch aufzeichnen"
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr "Einrichtungsdatei"
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr "Stun: Konfigurationsfehler"
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr "%d Voice Nachricht"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr "_Editieren"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
-msgstr ""
+msgstr "Das Programm beenden"
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr "_Editieren"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr "Entfernen Sie das ausgewÃ¤hlte Konto"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr "Liste der vorherigen Anrufen _leeren"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr "Vorherigen Anrufen leeren"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr "_Konten"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr "Aktuelles Konto"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr "Einstellungen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
-msgstr ""
+msgstr "Ihre Einstellungen Ã¤ndern"
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr "_Anzeigen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr "Weiter"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr "Authentifizierung"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr "Weiterleiten"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
-msgstr "Weiterleiten zu : "
+msgstr "Weiterleiten zu :"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "_GesprÃ¤ch aufzeichnen"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr "_WÃ¤hlscheibe"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr "LautstÃ¤rke-Regler anzeigen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr "LautstÃ¤rke-Regler anzeigen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr "Vorherige Anrufe"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr "Liste der vorherigen Anrufen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "Adressbuch"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr "in _Warteschleife"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr "_ZurÃ¼ckrufen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr "Nummer editieren"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr "Nummer vor dem Anruf editieren"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr "Konto parameter"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "_Protokoll"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr "_Hostname"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr "_Benutzername"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "_Passwort"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr "Passwort"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr "_Voicemail Nummer"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "_Benutzername"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr "Geheim"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr "Authentifizierung Name"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "Passwort"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr "Sicherheit"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr "Anmeldung"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "Kein netzwerk"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr "Adresse (lokal)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr "Port (lokal)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr "Kontoeinstellungen"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr "Allgemein"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr "Netzwerk"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "Status"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr "Konfigurierten Konten"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
+#, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
-msgstr[0] " aktive Konten"
-msgstr[1] " aktive Konten"
+msgstr[0] "aktive Konten"
+msgstr[1] "aktive Konten"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr "Sie haben kein aktives Konto"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr "Allgemein"
 
@@ -733,7 +763,7 @@ msgid "Select which Evolution address books to use"
 msgstr "AdressbÃ¼cher von Evolution zum verwenden auswÃ¤hlen"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "Name"
 
@@ -774,183 +804,179 @@ msgstr "SRTP/ZRTP draft-zimmermann"
 msgid "None"
 msgstr "Nichts"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr "SFLphone Konto (Konfigurationsassistent)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr "Wilkommen zu SFLphone!"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr ""
 "The Installationsassistent wird Ihnen helfen, ein Konto zu konfigurieren."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "VoIP Protokoll"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr "Kontotyp auswÃ¤hlen"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterisk Exchange)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr "Konto"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr "Bitte eine Option auswÃ¤hlen"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr "SIP/IAX2 Konto bei sflphone.org erstellen lassen"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr "Existierendes SIP/IAX2 Konto registrieren"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr "Konfiguration des SIP Konto"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr "Folgende Informationen bitte ausfÃ¼hlen"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr "Sichere Kommunikation mit _ZRTP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr "Fakultative E-mail-Adresse"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr ""
 "Diese E-mail-Adresse wird benutzt, um Ihnen voicemail Meldungen zu schicken."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr "_Email"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr "Konfiguration des IAX2 Konto"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr "STUN Ei_nschalten"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "_STUN Server"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr "Konto Registrierung"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "Gratulation!"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "Frequenz"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr "Bandbreite"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr "ALSA Plugin"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr "Ausgabe"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr "Eingabe"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr "\"Voice Activity\" Erkennung"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr "_GerÃ¤uschreduzierung (Narrow-Band Companding)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr "Sound Manager"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "Pulseaudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr "ALSA Konfiguration"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "Aufnahmen"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr "Zielverzeichnis"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr "Verzeichnis auswÃ¤hlen"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr "KlingeltÃ¶ne"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr "KlingeltÃ¶ne _einschalten"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr "Klingelton auswÃ¤hlen"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr "Audio Dateien"
 
@@ -987,69 +1013,62 @@ msgstr "Telefonnummer umformen"
 msgid "_Prefix dialed numbers with"
 msgstr "_PrÃ¤fix vor Nummern einfÃ¼gen"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr "Desktopbenachrichtigungen"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr "Benachrichtigungen _einschalten"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr "Benachrichtigungsfeld (\"System Tray\") Icon"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr "Hauptfenster anzeigen wenn eingehendes GesprÃ¤ch"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr "_Hauptfenster nie anzeigen"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr "_Unsichtbar beim Start"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr "Liste der vorherigen Anrufen"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr "Tage"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr "Audio"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr "Hooks"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr ""
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr ""
@@ -1067,55 +1086,59 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -1139,6 +1162,15 @@ msgstr "_Warnung wenn ZRTP nicht unterstÃ¼zt"
 msgid "Display SAS once for hold events"
 msgstr ""
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+#, fuzzy
+msgid "SDES Options"
+msgstr "ZRTP Optionen"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr "Suche alle"
@@ -1162,38 +1194,21 @@ msgstr "Suche nach eingehenden Anruf"
 msgid "Search by outgoing call"
 msgstr "Suche nach ausgehenden Anru"
 
-#~ msgid "IP call - %s"
-#~ msgstr "IP Anruf - %s"
-
-#~ msgid "Codec"
-#~ msgstr "Codec"
-
-#~ msgid "Network"
-#~ msgstr "Netzwerk"
-
-#~ msgid "Manually"
-#~ msgstr "Manuell"
-
-#~ msgid "There "
-#~ msgstr "Es "
-
-#~ msgid "is "
-#~ msgstr "gibt "
-
-#~ msgid "are "
-#~ msgstr "gibt "
-
-#~ msgid "_Mute other applications during a call"
-#~ msgstr "_WÃ¤hrend eines Anrufs andere Anwendungen stumm schalten"
-
-#~ msgid "SIP Port"
-#~ msgstr "SIP Port"
-
-#~ msgid "UDP Transport"
-#~ msgstr "UDP Transport"
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>Fehler: Kein Audio-Codec gefunden.\n"
+#~ "\n"
+#~ "</b> SFL Audio-Codecs mÃ¼ssen in <i>%s</i> oder <b>.sflphone</b> Ihres "
+#~ "HOME-Verzeichniss ( <i>%s</i> ) gespeichert werden."
 
-#~ msgid "Enable voicemail _notifications"
-#~ msgstr "_Benachrichtigung fÃ¼r Voice Nachrichten"
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "%i Konto konfiguriert"
+#~ msgstr[1] "%i Konten konfiguriert"
 
 #~ msgctxt "account state"
 #~ msgid "Error"
@@ -1231,6 +1246,9 @@ msgstr "Suche nach ausgehenden Anru"
 #~ msgid "Default account"
 #~ msgstr "Default Konto"
 
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
 #~ msgid "SFLphone KDE Client"
 #~ msgstr "SFLphone KDE Client"
 
@@ -1410,6 +1428,9 @@ msgstr "Suche nach ausgehenden Anru"
 #~ msgid "Connection"
 #~ msgstr "Anbindung"
 
+#~ msgid "SIP Port"
+#~ msgstr "SIP Port"
+
 #~ msgid "Trigger on specific SIP header"
 #~ msgstr "Bewirkung beim spezifischen SIP Header"
 
@@ -1435,26 +1456,53 @@ msgstr "Suche nach ausgehenden Anru"
 #~ msgid "Attention:number of results exceeds max displayed."
 #~ msgstr "Warnung: Anzahl Resultate Ã¼berschreit definiertes Maximum"
 
+#~ msgid "IP call - %s"
+#~ msgstr "IP Anruf - %s"
+
 #~ msgid "%s - %s"
 #~ msgstr "%s - %s"
 
 #~ msgid "_Enable this account"
 #~ msgstr "_Einschalten"
 
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "_Benachrichtigung fÃ¼r Voice Nachrichten"
+
 #~ msgid "PulseAudio sound server"
 #~ msgstr "PulseAudio Sound Server"
 
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "_WÃ¤hrend eines Anrufs andere Anwendungen stumm schalten"
+
 #~ msgid "Port"
 #~ msgstr "Port"
 
+#~ msgid "Manually"
+#~ msgstr "Manuell"
+
+#~ msgid "There "
+#~ msgstr "Es "
+
+#~ msgid "are "
+#~ msgstr "gibt "
+
+#~ msgid "is "
+#~ msgstr "gibt "
+
+#~ msgid "UDP Transport"
+#~ msgstr "UDP Transport"
+
 #~ msgctxt "NAME OF TRANSLATORS"
 #~ msgid "Your names"
 #~ msgstr ""
 #~ "Ihre Namen, ,Launchpad Contributions:,Maxime Chambreuil,Sven Werlen, ,"
-#~ "Launchpad Contributions:,Maxime Chambreuil,Sven Werlen,Sven Werlen"
+#~ "Launchpad Contributions:,Maxime Chambreuil,Sven Werlen,Sven Werlen, ,"
+#~ "Launchpad Contributions:,Funatiker,JarosÅ‚aw Ogrodnik,Maxime Chambreuil,"
+#~ "Michael Keppler,Sven Werlen,Sven Werlen"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
 #~ msgstr ""
 #~ "Ihre E-Mail-Adressen,,,maxime.chambreuil@gmail.com,,,,maxime."
-#~ "chambreuil@gmail.com,,sven.werlen@gmail.com"
+#~ "chambreuil@gmail.com,,sven.werlen@gmail.com,,,,nobodythere@gmail.com,"
+#~ "maxime.chambreuil@gmail.com,Bananeweizen@gmx.de,,sven.werlen@gmail.com"
diff --git a/lang/el/el.po b/lang/el/el.po
new file mode 100644
index 0000000000000000000000000000000000000000..76b3bf044534363b02ed94f2237dc87dd3dcc6ce
--- /dev/null
+++ b/lang/el/el.po
@@ -0,0 +1,1209 @@
+# Greek translation for sflphone
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the sflphone package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2010-01-13 02:45+0000\n"
+"Last-Translator: jarlaxl lamat <sztaasz@gmail.com>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../sflphone-client-gnome/src/accountlist.c:170
+msgid "Registered"
+msgstr "Î•Î³Î³ÎµÎ³ÏÎ±Î¼Î¼ÎÎ½Î¿Ï‚"
+
+#: ../sflphone-client-gnome/src/accountlist.c:173
+msgid "Not Registered"
+msgstr "ÎœÎ· ÎµÎ³Î³ÎµÎ³ÏÎ±Î¼Î¼ÎÎ½Î¿Ï‚"
+
+#: ../sflphone-client-gnome/src/accountlist.c:176
+msgid "Trying..."
+msgstr "Î ÏÎ¿ÏƒÏ€Î±Î¸ÏŽ..."
+
+#: ../sflphone-client-gnome/src/accountlist.c:179
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Î£Ï†Î¬Î»Î¼Î±"
+
+#: ../sflphone-client-gnome/src/accountlist.c:182
+msgid "Authentication Failed"
+msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚"
+
+#: ../sflphone-client-gnome/src/accountlist.c:185
+msgid "Network unreachable"
+msgstr "ÎœÎ· Ï€ÏÎ¿ÏƒÎ²Î¬ÏƒÎ¹Î¼Î¿ Î´Î¯ÎºÏ„Ï…Î¿"
+
+#: ../sflphone-client-gnome/src/accountlist.c:188
+msgid "Host unreachable"
+msgstr "ÎœÎ· Ï€ÏÎ¿ÏƒÎ²Î¬ÏƒÎ¹Î¼Î¿Ï‚ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®Ï‚"
+
+#: ../sflphone-client-gnome/src/accountlist.c:191
+msgid "Stun configuration error"
+msgstr "Î£Ï†Î¬Î»Î¼Î± ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î® STUN"
+
+#: ../sflphone-client-gnome/src/accountlist.c:194
+msgid "Stun server invalid"
+msgstr "Î‘ÎºÏ…ÏÎ¿Ï‚ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ STUN"
+
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
+msgid "Invalid"
+msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿"
+
+#: ../sflphone-client-gnome/src/actions.c:114
+msgid "Using account"
+msgstr "Î§ÏÎ®ÏƒÎ· Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï"
+
+#: ../sflphone-client-gnome/src/actions.c:121
+msgid "No registered accounts"
+msgstr "ÎœÎ· Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿Î¹ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯"
+
+#: ../sflphone-client-gnome/src/actions.c:306
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ ÏƒÏ„Î¿Î½ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î· Ï„Î¿Ï…  SFLphone\n"
+"Î£Î¹Î³Î¿Ï…ÏÎµÏ…Ï„ÎµÎ¯Ï„Îµ Î¿Ï„Î¹ Ï„ÏÎÏ‡ÎµÎ¹ Î¿ daemon"
+
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
+msgid "Direct SIP call"
+msgstr "ÎšÎ»Î®ÏƒÎ· ÎºÎ±Ï„ÎµÏ…Î¸ÎµÎ¯Î±Î½ SIP"
+
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"Î•Î¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î±Ï€Î¿ Ï„Î·Î½ ALSA:\n"
+"\n"
+"Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î± Ï„Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Ï„Î·Ï‚ ÏƒÏ…ÏƒÎºÎµÏ…Î®Ï‚ Î±Î½Î±Ï€Î±ÏÎ±Î³Ï‰Î³Î®Ï‚"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"Î•Î¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î±Ï€Î¿ Ï„Î·Î½ ALSA:\n"
+"\n"
+"Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î± Ï„Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Ï„Î·Ï‚ ÏƒÏ…ÏƒÎºÎµÏ…Î®Ï‚ Î»Î®ÏˆÎ·Ï‚ Î®Ï‡Î¿Ï…"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Î•Î¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î±Ï€Î¿ Ï„Î¿ Pulseaudio\n"
+"\n"
+"TÎ¿ Pulseaudio Î´ÎµÎ½ Ï„ÏÎÏ‡ÎµÎ¹"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:94
+msgid "There is one call in progress."
+msgstr "Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ Î¼Î¹Î± ÎºÎ»Î®ÏƒÎ· ÎµÎ½ ÎµÎ¾ÎµÎ»Î¯Î¾ÎµÎ¹"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:98
+msgid "There are calls in progress."
+msgstr "Î¥Ï€Î¬ÏÏ‡Î¿Ï…Î½ ÎºÎ»Î®ÏƒÎµÎ¹Ï‚ ÎµÎ½ ÎµÎ¾ÎµÎ»Î¯Î¾ÎµÎ¹"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:103
+msgid "Do you still want to quit?"
+msgstr "ÎÎ± ÎºÎ»ÎµÎ¯ÏƒÏ‰ ÏƒÎ¹Î³Î¿Ï…ÏÎ±;"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:331
+msgid "SFLphone Error"
+msgstr "Î£Ï†Î¬Î»Î¼Î± SFLphone"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:450
+#, c-format
+msgid "ZRTP is not supported by peer %s\n"
+msgstr "Î¤Î¿ Ï€ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿ ZRTP Î´ÎµÎ½ Ï…Ï€Î¿ÏƒÏ„Ï„Î·ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±Ï€Î¿ Ï„Î¿ peer %s\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:452
+msgid "Secure Communication Unavailable"
+msgstr "ÎšÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î· ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î¹Î± Î¼Î· Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î·"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
+msgid "Continue"
+msgstr "Î£Ï…Î½ÎÏ‡ÎµÎ¹Î±"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
+msgid "Stop Call"
+msgstr "Î¤ÎµÏÎ¼Î±Ï„Î¹ÏƒÎ¼ÏŒÏ‚ ÎºÎ»Î®ÏƒÎ·Ï‚"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:480
+#, c-format
+msgid ""
+"A %s error forced the call with %s to fall under unencrypted mode.\n"
+"Exact reason: %s\n"
+msgstr ""
+"Î•Î½Î± %s ÏƒÏ†Î¬Î»Î¼Î± Î±Î½Î¬Î³ÎºÎ±ÏƒÎµ Ï„Î·Î½ ÎºÎ»Î®ÏƒÎ· Î¼Îµ %s Î½Î± Ï„ÎµÏÎ¼Î±Ï„Î¯ÏƒÎµÎ¹ Ï…Ï€Î¿ Î¼Î· ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î· "
+"Î¼Î¿ÏÏ†Î®.\n"
+"Î‘ÎºÏÎ¹Î²Î®Ï‚ Î»ÏŒÎ³Î¿Ï‚: %s\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:482
+msgid "ZRTP negotiation failed"
+msgstr "Î— Î´Î¹Î±Ï€ÏÎ±Î³Î¼Î¬Ï„ÎµÏ…ÏƒÎ· ZRTP Î±Ï€ÎÏ„Ï…Ï‡Îµ"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:500
+#, c-format
+msgid ""
+"%s wants to stop using secure communication. Confirm will resume "
+"conversation without SRTP.\n"
+msgstr ""
+"ÎŸ/Î— %s Î¸ÎÎ»ÎµÎ¹ Î½Î± ÏƒÏ„Î±Î¼Î±Ï„Î·ÏƒÎµÎ¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î· ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î¯Î±. Î— "
+"ÎµÏ€Î¹Î²ÎµÎ²Î±Î¹Ï‰ÏƒÎ· Î¸Î± ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÎ¹ Ï„Î· ÏƒÏ…Î¶Î®Ï„Î·ÏƒÎ· Î±Î»Î»Î± Ï‡Ï‰ÏÎ¹Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:502
+msgid "Confirm Go Clear"
+msgstr "Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ· Î¦ÏÎ³Îµ ÎšÎ±Î¸Î±ÏÎ¹ÏƒÎ¼ÏŒÏ‚"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:504
+msgid "Confirm"
+msgstr "Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "<i>Î‘Ï€ÏŒ</i> %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d ÎœÎ·Î½Ï…Î¼Î± Ï„Î·Î»ÎµÏ†Ï‰Î½Î·Ï„Î®"
+msgstr[1] "%d ÎœÎ·Î½Ï…Î¼Î±Ï„Î± Ï„Î·Î»ÎµÏ†Ï‰Î½Î·Ï„Î®"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "ÎšÎ»Î®ÏƒÎ· Î¼Î %s Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ <i>%s</i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "Î¤ÏÎÏ‡Ï‰Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Î¸ÎÏƒÎµÎ¹ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿ÏÏ‚"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ ÎºÎ±Ï„Î¿Ï‡Ï…ÏÎ¿Î¼ÎÎ½Î¿Ï…Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿ÏÏ‚"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:190
+#, c-format
+msgid ""
+"<i>With:</i> %s \n"
+"using %s"
+msgstr ""
+"<i>ÎœÎµ:</i> %s \n"
+"Ï‡ÏÎ·ÏƒÎ·: %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:205
+#, c-format
+msgid "%s does not support ZRTP."
+msgstr "ÎŸ %s Î´ÎµÎ½ Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Î¶ÎµÎ¹ ZRTP"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:220
+#, c-format
+msgid "ZRTP negotiation failed with %s"
+msgstr "Î— ZRTP Î´Î¹Î±Ï€ÏÎ±Î³Î¼Î¬Ï„ÎµÏ…ÏƒÎ· Î±Ï€ÎÏ„Ï…Ï‡Îµ Î¼Îµ %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:235
+#, c-format
+msgid "<i>With:</i> %s"
+msgstr "<i>ÎœÎµ:</i> %s"
+
+#: ../sflphone-client-gnome/src/sliders.c:162
+msgid "Speakers volume"
+msgstr "ÎˆÎ½Ï„Î±ÏƒÎ· Î·Ï‡ÎµÎ¯Ï‰Î½"
+
+#: ../sflphone-client-gnome/src/sliders.c:164
+msgid "Mic volume"
+msgstr "Î•Î½Ï„Î±ÏƒÎ· Î¼Î¹ÎºÏÎ¿Ï†ÏŽÎ½Î¿Ï…"
+
+#: ../sflphone-client-gnome/src/statusicon.c:128
+msgid "_Show main window"
+msgstr "Î”ÎµÎ¯Î¾Îµ Ï„Î¿ Î²Î±_ÏƒÎ¹ÎºÏŒ Ï€Î±ÏÎ¬Î¸Ï…ÏÎ¿"
+
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "ÎšÎ»ÎµÎ¯ÏƒÏ„Î¿ _Î—"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "Î§ÏÎ®ÏƒÎ· Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï"
+msgstr[1] "Î§ÏÎ®ÏƒÎ· Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï"
+
+#: ../sflphone-client-gnome/src/toolbar.c:38
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
+msgid "Voicemail"
+msgstr "Î¤Î·Î»ÎµÏ†Ï‰Î½Î·Ï„Î®Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:121
+msgid "No address book selected"
+msgstr "ÎšÎ±Î½ÎÎ½Î± Î²Î¹Î²Î»Î¯Î¿ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÏ‰ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÎµÏ€Î¹Î»ÎµÏ‡Î¸ÎµÎ¯"
+
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
+msgid "Address book"
+msgstr "Î’Î¹Î²Î»Î¯Î¿ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÏ‰Î½"
+
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
+msgid "Voicemail (%i)"
+msgstr "Î¤Î·Î»ÎµÏ†Ï‰Î½Î·Ï„Î®Ï‚ (%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:396
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr ""
+"Î¤Î¿ SFLphone ÎµÎ¹Î½Î±Î¹ ÎÎ½Î± Ï€ÏÎ¿Î³ÏÎ±Î¼Î¼Î± Ï€ÎµÎ»Î¬Ï„Î·Ï‚ VoIP ÏƒÏ…Î¼Î²Î±Ï„ÏŒ Î¼Îµ SIP ÎºÎ±Î¹ Î™Î‘Î§2 "
+"Ï€ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î±"
+
+#: ../sflphone-client-gnome/src/uimanager.c:398
+msgid "About SFLphone"
+msgstr "Î£Ï‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Ï„Î¿ SFLphone"
+
+#: ../sflphone-client-gnome/src/uimanager.c:800
+msgid "Call"
+msgstr "ÎšÎ»Î®ÏƒÎ·"
+
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
+msgid "_New call"
+msgstr "_ÎÎÎ± ÎºÎ»Î®ÏƒÎ·"
+
+#: ../sflphone-client-gnome/src/uimanager.c:802
+msgid "Place a new call"
+msgstr "ÎšÎ¬Î½Ï„Îµ Î¼Î¹Î± Î½ÎÎ± ÎºÎ»Î®ÏƒÎ·"
+
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Pick up"
+msgstr "Î£Î®ÎºÏ‰ÏƒÏ„Î¿  _Î "
+
+#: ../sflphone-client-gnome/src/uimanager.c:804
+msgid "Answer the call"
+msgstr "Î£Î·ÎºÏŽÏƒÏ„Îµ Ï„Î¿ Ï„Î·Î»ÎÏ†Ï‰Î½Î¿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:806
+msgid "Finish the call"
+msgstr "ÎšÎ»ÎÎ¹ÏƒÏ„Îµ Ï„Î¿ Ï„Î·Î»ÎÏ†Ï‰Î½Î¿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:807
+msgid "O_n hold"
+msgstr "Î£Îµ Î±_Î½Î±Î¼Î¿Î½Î®"
+
+#: ../sflphone-client-gnome/src/uimanager.c:808
+msgid "Place the call on hold"
+msgstr "Î’Î¬Î»Ï„Îµ Ï„Î·Î½ ÎºÎ»Î®ÏƒÎ· ÏƒÎµ Î±Î½Î±Î¼Î¿Î½Î®"
+
+#: ../sflphone-client-gnome/src/uimanager.c:809
+msgid "O_ff hold"
+msgstr "Î•Ï€Î±Î½Î±_Ï†Î¿ÏÎ¬"
+
+#: ../sflphone-client-gnome/src/uimanager.c:810
+msgid "Place the call off hold"
+msgstr "Î•Ï€Î±Î½Î±Ï†ÎÏÎµÏ„Îµ Ï„Î·Î½ ÎºÎ»Î®ÏƒÎ· ÏƒÎµ Î±Î½Î±Î¼Î¿Î½Î®"
+
+#: ../sflphone-client-gnome/src/uimanager.c:811
+msgid "Configuration _Assistant"
+msgstr "ÎŸÎ´Î·Î³ÏŒÏ‚ Î¡Ï…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ _Î‘"
+
+#: ../sflphone-client-gnome/src/uimanager.c:812
+msgid "Run the configuration assistant"
+msgstr "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Ï„Î¿Ï… Î¿Î´Î·Î³Î¿Ï ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:815
+msgid "Call your voicemail"
+msgstr "ÎšÎ»Î®ÏƒÎ· Ï€ÏÎ¿Ï‚ Ï„Î¿Î½ Ï„Î·Î»ÎµÏ†Ï‰Î½Î·Ï„Î® ÏƒÎ±Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:816
+msgid "_Close"
+msgstr "_ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿"
+
+#: ../sflphone-client-gnome/src/uimanager.c:817
+msgid "Minimize to system tray"
+msgstr "Î•Î»Î±Ï‡Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÏƒÏ„Î· Ï€ÎµÏÎ¹Î¿Ï‡Î® ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½"
+
+#: ../sflphone-client-gnome/src/uimanager.c:818
+msgid "_Quit"
+msgstr "ÎˆÎ¾Î¿Î´Î¿Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:819
+msgid "Quit the program"
+msgstr "Î¤ÎµÏÎ¼Î±Ï„Î¹ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… Ï€ÏÎ¿Î³ÏÎ¬Î¼Î¼Î±Ï„Î¿Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:822
+msgid "_Edit"
+msgstr "_Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î±"
+
+#: ../sflphone-client-gnome/src/uimanager.c:823
+msgid "_Copy"
+msgstr "Î‘Î½Ï„ÎÎ³ÏÎ±_ÏˆÎµ"
+
+#: ../sflphone-client-gnome/src/uimanager.c:824
+msgid "Copy the selection"
+msgstr "Î‘Î½Ï„Î¹Î³ÏÎ±Ï†Î® Ï„Î·Ï‚ ÎµÏ€Î¹Î»Î¿Î³Î®Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:825
+msgid "_Paste"
+msgstr "Î•_Ï€Î¹ÎºÏŒÎ»Î»Î·ÏƒÎ·"
+
+#: ../sflphone-client-gnome/src/uimanager.c:826
+msgid "Paste the clipboard"
+msgstr "Î•Ï€Î¹ÎºÏŒÎ»Î»Î·ÏƒÎ· Ï„Ï‰Î½ Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Ï‰Î½ Ï„Î¿Ï… Ï€ÏÎ¿Ï‡ÎµÎ¯ÏÎ¿Ï… (clipboard)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:827
+msgid "Clear _history"
+msgstr "ÎšÎ±Î¸Î±ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÎ¿Ï ÎºÎ»_Î·ÏƒÎµÏ‰Î½"
+
+#: ../sflphone-client-gnome/src/uimanager.c:828
+msgid "Clear the call history"
+msgstr "ÎšÎ±Î¸Î±ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÎ¿Ï ÎºÎ»Î·ÏƒÎµÏ‰Î½"
+
+#: ../sflphone-client-gnome/src/uimanager.c:829
+msgid "_Accounts"
+msgstr "Î›Î¿Î³Î±ÏÎ¹_Î±ÏƒÎ¼Î¿Î¯"
+
+#: ../sflphone-client-gnome/src/uimanager.c:829
+msgid "Edit your accounts"
+msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± Ï„Ï‰Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½ ÏƒÎ±Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:831
+msgid "_Preferences"
+msgstr "_Î ÏÎ¿Ï„Î¹Î¼Î®ÏƒÎµÎ¹Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:832
+msgid "Change your preferences"
+msgstr "Î‘Î»Î»Î±Î³Î® Ï„Ï‰Î½ Ï€ÏÎ¿Ï„Î¹Î¼Î®ÏƒÎµÏ‰Î½ ÏƒÎ±Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:835
+msgid "_View"
+msgstr "_Î ÏÎ¿Î²Î¿Î»Î®"
+
+#: ../sflphone-client-gnome/src/uimanager.c:838
+msgid "_Help"
+msgstr "_Î’Î¿_Î·Î¸ÎµÎ¹Î±"
+
+#: ../sflphone-client-gnome/src/uimanager.c:839
+msgid "Contents"
+msgstr "Î ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î±"
+
+#: ../sflphone-client-gnome/src/uimanager.c:840
+msgid "Open the manual"
+msgstr "Î†Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï… ÎµÎ³Ï‡ÎµÎ¹ÏÎ¹Î´Î¯Î¿Ï…"
+
+#: ../sflphone-client-gnome/src/uimanager.c:841
+msgid "About this application"
+msgstr "Î ÎµÏÎ¯ Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³Î®Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:849
+msgid "_Transfer"
+msgstr "ÎœÎµ_Ï„Î±Ï†Î¿ÏÎ¬"
+
+#: ../sflphone-client-gnome/src/uimanager.c:850
+msgid "Transfer the call"
+msgstr "ÎœÎµÏ„Î±Ï†Î¿ÏÎ¬ Ï„Î·Ï‚ ÎºÎ»Î®ÏƒÎ·Ï‚"
+
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "ÎšÎ±Ï„Î±Î³_ÏÎ±Ï†Î®"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr "ÎšÎ±Ï„Î±Î³ÏÎ±ÏˆÏ„Îµ Ï„Î· Ï„ÏÎÏ‡Î¿Ï…ÏƒÎ± ÏƒÏ…Î½Î¿Î¼Î¹Î»Î¯Î±"
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
+msgid "_Show toolbar"
+msgstr "Î•Î¼Ï†Î¬Î½Î¹_ÏƒÎ· Î³ÏÎ±Î¼Î¼Î®Ï‚ ÎµÏÎ³Î±Î»ÎµÎ¯Ï‰Î½"
+
+#: ../sflphone-client-gnome/src/uimanager.c:854
+msgid "Show the toolbar"
+msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Î·Ï‚ Î³ÏÎ±Î¼Î¼Î®Ï‚ ÎµÏÎ³Î±Î»ÎµÎ¯Ï‰Î½"
+
+#: ../sflphone-client-gnome/src/uimanager.c:855
+msgid "_Dialpad"
+msgstr "Î Î»Î·ÎºÏ„ÏÎ¿Î»ÏŒÎ³Î¹Î¿ _Î´"
+
+#: ../sflphone-client-gnome/src/uimanager.c:856
+msgid "Show the dialpad"
+msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Î¿Ï… Ï€Î»Î·ÎºÏ„ÏÎ¿Î»Î¿Î³Î¯Î¿Ï…"
+
+#: ../sflphone-client-gnome/src/uimanager.c:857
+msgid "_Volume controls"
+msgstr "ÎˆÎ½Ï„Î±ÏƒÎ· Î®Ï‡Ï‰Î½"
+
+#: ../sflphone-client-gnome/src/uimanager.c:858
+msgid "Show the volume controls"
+msgstr "Î”ÎµÎ¯Î¾Îµ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î³Î¹Î± Ï„Î·Î½ ÎÎ½Ï„Î±ÏƒÎ· Î®Ï‡Ï‰Î½"
+
+#: ../sflphone-client-gnome/src/uimanager.c:859
+msgid "_History"
+msgstr "Î™ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ _Î—"
+
+#: ../sflphone-client-gnome/src/uimanager.c:860
+msgid "Calls history"
+msgstr "Î™ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ ÎºÎ»Î®ÏƒÎµÏ‰Î½"
+
+#: ../sflphone-client-gnome/src/uimanager.c:861
+msgid "_Address book"
+msgstr "Î’Î¹Î²Î»Î¯Î¿ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÏ‰Î½ _Î‘"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
+msgid "On _Hold"
+msgstr "ÎšÎ»_Î·ÏƒÎ· ÏƒÎµ Î±Î½Î±Î¼Î¿Î½Î®"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1234
+msgid "_Call back"
+msgstr "ÎšÎ»Î®ÏƒÎ·"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1390
+msgid "Edit phone number"
+msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³ÏƒÎ¯Î± Ï„Î·ÎµÎ»Ï†Ï‰Î½Î¹ÎºÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1402
+msgid "Edit the phone number before making a call"
+msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³ÏƒÎ¯Î± Ï„Î·ÎµÎ»Ï†Ï‰Î½Î¹ÎºÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€ÏÎ¿ Ï„Î·Ï‚ ÎºÎ»Î®ÏƒÎ·Ï‚"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
+msgid "Account Parameters"
+msgstr "Î Î±ÏÎ¬Î¼ÎµÏ„ÏÎ¿Î¹ Î»Î¿Î³Î±ÏÎ¹ÏƒÎ¼Î¿Ï"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
+msgid "_Alias"
+msgstr "Î¨ÎµÏ…Î´ÏŽÎ½Ï…Î¼Î¿"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
+msgid "_Protocol"
+msgstr "_Î ÏÏ‰Ï„Î¿ÎºÎ¿Î»Î»Î¿"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
+msgid "Unknown"
+msgstr "'Î‘Î³Î½Ï‰ÏƒÏ„Î¿"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
+msgid "_Host name"
+msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ Ï€Î±ÏÏŒÏ‡Î¿Ï…"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
+msgid "_User name"
+msgstr "ÎŸÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
+msgid "_Password"
+msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
+msgid "Show password"
+msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
+msgid "_Voicemail number"
+msgstr "Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ Ï„Î·Î»ÎµÏ†Ï‰Î½Î·Ï„Î®"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "ÎŸÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
+msgid "Authentication"
+msgstr "Î¤Î±Ï…Ï„Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
+msgid "Secret"
+msgstr "Î‘Ï€ÏŒÏÏÎ·Ï„Î¿"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
+msgid "Credential"
+msgstr "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
+msgid "Authentication name"
+msgstr "ÎŒÎ½Î¿Î¼Î± ÎµÎ¾Î±ÎºÏÎ¯Î²Ï‰ÏƒÎ·Ï‚"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
+msgid "Password"
+msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
+msgid "Security"
+msgstr "Î‘ÏƒÏ†Î¬Î»ÎµÎ¹Î±"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
+msgid "Use TLS transport (sips)"
+msgstr "Î§ÏÎ®ÏƒÎ· TLS"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
+msgid "SRTP key exchange"
+msgstr "Î‘Î½Ï„Î±Î»Î»Î±Î³Î® ÎºÎ»ÎµÎ¹Î´Î¹ÏŽÎ½ SRTP"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
+msgid "Disabled"
+msgstr "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
+msgid "Registration"
+msgstr "Î•Î³Î³ÏÎ±Ï†Î®"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
+msgid "Registration expire"
+msgstr "Î›Î®Î¾Î· ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
+msgid "_Comply with RFC 3263"
+msgstr "Î£Ï…Î¼Î²Î±Ï„ÏŒÏ„Î·Ï„Î± Î¼Îµ RFC 3263"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
+msgid "Network Interface"
+msgstr "Î£Ï…ÏƒÎºÎµÏ…Î® Î´Î¹ÎºÏ„ÏÎ¿Ï…"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
+msgid "Local address"
+msgstr "Î¤Î¿Ï€Î¹ÎºÎ® Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î´Î¹ÎºÏ„ÏÎ¿Ï…"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
+msgid "Local port"
+msgstr "Î¤Î¿Ï€Î¹ÎºÎ® Î¸ÏÏÎ± Î´Î¹ÎºÏ„ÏÎ¿Ï…"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
+msgid "Published address"
+msgstr "Î”Î·Î¼Î¿ÏƒÎ¹ÎµÏ…Î¼ÎÎ½Î· Î´Î¹ÎµÏ…Î¸Ï…Î½ÏƒÎ·"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
+msgid "Using STUN"
+msgstr "Î§ÏÎ®ÏƒÎ· STUN"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
+msgid "STUN server URL"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+msgid "Same as local parameters"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
+msgid "Set published address and port:"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
+msgid "Published port"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
+msgid "Account settings"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
+msgid "Basic"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
+msgid "Advanced"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
+#, c-format
+msgid "Server returned \"%s\" (%d)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
+msgid "Protocol"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
+msgid "Status"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
+msgid "Accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
+msgid "Configured Accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
+msgid "You have no active account"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
+msgid "General"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
+msgid "Name"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:75
+#, c-format
+msgid "This assistant is now finished."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:77
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:80
+msgid "Alias"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:84
+msgid "Server"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:88
+msgid "Username"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:92
+msgid "Security: "
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:94
+msgid "SRTP/ZRTP draft-zimmermann"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:96
+msgid "None"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:230
+msgid "SFLphone account creation wizard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:256
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:257
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:271
+msgid "VoIP Protocols"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:271
+msgid "Select an account type"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:273
+msgid "SIP (Session Initiation Protocol)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:275
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:289
+msgid "Account"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:289
+msgid "Please select one of the following options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:291
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:293
+msgid "Register an existing SIP or IAX2 account"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+msgid "SIP account settings"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
+msgid "Please fill the following information"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
+msgid "Secure communications with _ZRTP"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:390
+msgid "Optional email address"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:390
+msgid "This email address will be used to send your voicemail messages."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:398
+msgid "_Email address"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:420
+msgid "IAX2 account settings"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:497
+msgid "Network Address Translation (NAT)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:497
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:506
+msgid "E_nable STUN"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:513
+msgid "_STUN server"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:527
+msgid "Account Registration"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:527
+msgid "Congratulations!"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
+msgid "Frequency"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
+msgid "Bitrate"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
+msgid "Bandwidth"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
+msgid "ALSA plugin"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
+msgid "Output"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
+msgid "Input"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
+msgid "_Voice Activity Detection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
+msgid "Sound Manager"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
+msgid "_Pulseaudio"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
+msgid "_ALSA"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
+msgid "ALSA settings"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Recordings"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
+msgid "Destination folder"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
+msgid "Select a folder"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
+msgid "Ringtones"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
+msgid "_Enable ringtones"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
+msgid "Choose a ringtone"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
+msgid "Audio Files"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
+msgid "Desktop Notifications"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
+msgid "_Enable notifications"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
+msgid "System Tray Icon"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
+msgid "_Popup main window on incoming call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
+msgid "Ne_ver popup main window"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
+msgid "Hide SFLphone window on _startup"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
+msgid "Calls History"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+msgid "days"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
+msgid "Preferences"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
+msgid "Audio"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
+msgid "Address Book"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
+msgid "Hooks"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
+msgid "Advanced options for TLS"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
+msgid "TLS transport"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
+msgid ""
+"TLS transport can be used along with UDP for those calls that would\n"
+"require secure sip transactions (aka SIPS). You can configure a different\n"
+"TLS transport for each account. However, each of them will run on a "
+"dedicated\n"
+"port, different one from each other\n"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
+msgid "Certificate of Authority list"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
+msgid "Choose a CA list file (optional)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
+msgid "Public endpoint certificate file"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
+msgid "Choose a public endpoint certificate (optional)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
+msgid "Choose a private key file (optional)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
+msgid "Password for the private key"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
+msgid "TLS protocol method"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
+msgid "TLS cipher list"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
+msgid "Server name instance for outgoing TLS connection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
+msgid "Negotiation timeout (sec:msec)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
+msgid "Verify incoming certificates, as a server"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
+msgid "Verify certificates from answer, as a client"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
+msgid "Require certificate for incoming tls connections"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
+msgid "ZRTP Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
+msgid "Send Hello Hash in S_DP"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
+msgid "Ask User to Confirm SAS"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
+msgid "_Warn if ZRTP not supported"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
+msgid "Display SAS once for hold events"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
+msgid "Search all"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
+msgid "Click here to change the search type"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
+msgid "Search by missed call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
+msgid "Search by incoming call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
+msgid "Search by outgoing call"
+msgstr ""
+
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>Î£Ï†Î¬Î»Î¼Î±: Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎ±Î½ codecs Î®Ï‡Î¿Ï…\n"
+#~ "\n"
+#~ "</b>ÎŸÎ¹  codecs Î®Ï‡Î¿Ï… SFL Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î²ÏÎ¯ÏƒÎºÎ¿Î½Ï„Î±Î¹ ÏƒÏ„Î¿Î½ <i>%s</i> ÎµÎ¯Ï„Îµ ÏƒÏ„Î¿Î½ <b>."
+#~ "sflphone</b> Ï†Î¬ÎºÎµÎ»Î¿ ÏƒÏ„Î¿Î½ Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿ Ï†Î¬ÎºÎµÎ»Î¿  ( <i>%s</i> )"
+
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "ÎŸ %i Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚  ÏÏ…Î¸Î¼Î¯ÏƒÏ„Î·ÎºÎµ"
+#~ msgstr[1] "ÎŸÎ¹ %i Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯  ÏÏ…Î¸Î¼Î¯ÏƒÏ„Î·ÎºÎ±Î½"
diff --git a/lang/es/es.po b/lang/es/es.po
index a40c09ce90e8d1106ba4f53f66c7d832e4701a63..c390d2931ebc2be0938258d27c1bcf30c8fdbafd 100644
--- a/lang/es/es.po
+++ b/lang/es/es.po
@@ -9,68 +9,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-10-26 20:46+0000\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2009-12-17 23:18+0000\n"
+"Last-Translator: Jorge E. GÃ³mez <jorge@jorgee.net>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "Registrado"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "No registrado"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr "Intentando..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "Error"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "FallÃ³ la autenticaciÃ³n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "Red Inaccesible"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "_Parte del servidor"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr "Error de configuraciÃ³n Stun"
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr "Servidor stun invÃ¡lido"
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "InvÃ¡lido"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr "Usando la cuenta"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr "Ninguna cuenta registrada"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -78,23 +82,26 @@ msgstr ""
 "Incapaz de conectar con el servidor SFLphone.\n"
 " AsegÃºrese que el demonio estÃ© funcionando."
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr "Llamadas IP directas"
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
-"<b>Error: Codecs de audio no encontrados.\n"
-"\n"
-"</b> Los codecs de audio de SFLphone deben estar en <i>%s</i> o en el "
-"directorio <b>.sflphone</b> de su carpeta personal( <i>%s</i> )"
 
 #: ../sflphone-client-gnome/src/errors.c:29
 msgid ""
@@ -126,43 +133,43 @@ msgstr ""
 "\n"
 "Pulseaudio no estÃ¡ funcionando"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
-msgstr "No hay llamada en curso"
+msgstr "Hay una llamada en curso"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr "Hay llamadas en curso."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
-msgstr "AÃºn quiere salir ?"
+msgstr "Â¿AÃºn quiere salir?"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr "Error SFLphone"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr "ZRTP no es compatible con %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr "ComunicaciÃ³n segura no disponible"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr "Seguir"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr "Terminar llamada"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -171,11 +178,11 @@ msgstr ""
 "Un error de %s obliga la llamada con %s a caer bajo un modo decifrado.\n"
 "RazÃ³n exacta: %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr "NegociaciÃ³n ZRTP fracasada"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
@@ -184,11 +191,11 @@ msgstr ""
 "%s quiere parar la comunicaciÃ³n segura. Confirmar reanudarÃ¡ la conversaciÃ³n "
 "sin SRTP.\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr "Confirmar"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -259,443 +266,465 @@ msgstr "Volumen de altavoces"
 msgid "Mic volume"
 msgstr "Volumen del micrÃ³fono"
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr "Mostrar ventana principal"
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "_Colgar"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] "%i cuenta configurada"
-msgstr[1] "%i cuentas configuradas"
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "Hay %d cuenta activada"
+msgstr[1] "Hay %d cuentas activadas"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr "Mensaje de voz"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr "Libreta de contactos"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "Libreta de contactos"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
 msgid "Voicemail (%i)"
 msgstr "Mensaje de voz (%i)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone es un telÃ©fono VoIP compatible con los protocolos SIP y IAX2"
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr "Sobre SFLphone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr "_Llamar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr "_Nueva llamada"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
-msgstr ""
+msgstr "Realizar un nuevo llamado"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr "_Descolgar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "_Colgar"
+msgstr "Responder el llamado"
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
-msgstr ""
+msgstr "Finalizar el llamado"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr "En _Espera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
-msgstr ""
+msgstr "Poner el llamado en espera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr "Seguir"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "G_rabar"
+msgstr "Sacar el llamado de espera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr "Archivo de configuraciÃ³n"
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr "Error de configuraciÃ³n Stun"
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr "%d mensaje de voz"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
-msgstr ""
+msgstr "_Cerrar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
-msgstr ""
+msgstr "Minimizar al Ã¡rea de notificaciÃ³n"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr "_Editar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
-msgstr ""
+msgstr "Salir del programa"
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
-msgstr ""
+msgstr "_Copiar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr "Eliminar la cuenta seleccionada"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
-msgstr ""
+msgstr "_Pegar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
-msgstr ""
+msgstr "Pegar el contenido del portapapeles"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr "_Limpiar historial"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr "Limpiar historial"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr "_Cuentas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr "Cuenta actual"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr "Preferencias"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
-msgstr ""
+msgstr "Cambiar sus preferencias"
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr "_Ver"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr "Seguir"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
-msgstr ""
+msgstr "Abrir el manual"
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr "AutentificaciÃ³n"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr "Transferir"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
-msgstr "Transferir a : "
+msgstr "Transferir a :"
+
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "G_rabar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr "Grabar la conversaciÃ³n actual"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
-msgstr ""
+msgstr "_Mostrar barra de herramientas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
-msgstr ""
+msgstr "Mostrar barra de herramientas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr "Desactivado"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
-msgstr ""
+msgstr "Mostrar el teclado de marcado"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr "_Controles de volumen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr "_Controles de volumen"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr "Historia de Llamada"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr "Historia de Llamada"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "Libreta de contactos"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr "En _Espera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr "_Llamar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr "Editar nÃºmero de telÃ©fono"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr "Editar el nÃºmero de telÃ©fono antes de llamar"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr "ParÃ¡metros de cuenta"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "_Protocolo"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr "_Nombre de equipo"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr "_Usuario"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "_ContraseÃ±a"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr "ContraseÃ±a"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr "_NÃºmero de buzÃ³n de voz"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "_Usuario"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr "AutentificaciÃ³n"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr "InformaciÃ³nes"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr "Nombre de autentificaciÃ³n"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr "Seguridad"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr "Usa transporte TLS (sips)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr "IntercambiÃ³ de clave SRTP"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr "RegistraciÃ³n"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr "RegistracÃon expira"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr "_Cumplir con RFC 3263"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "Red Inaccesible"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr "DirecciÃ³n local"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr "Puerto local"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr "DirecciÃ³n publicada"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
-msgstr "Usando STUN "
+msgstr "Usando STUN"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr "URL del servidor STUN"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr "Igual que parÃ¡metros locales"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr "Publicar direcciÃ³n y puerto:"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr "Puerto publicado"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr "ConfiguraciÃ³n de cuentas"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr "BÃ¡sico"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "CÃ³decs"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr "Red"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+"Este perfil es utilizado cuando usted quiere alcanzar al par remoto "
+"escribiendo el URI sip asÃ como <b>sip:parremoto</b>. Los parÃ¡metros que "
+"usted define aqui serÃ¡n tambiÃ©n utilizados si ningunÃ¡ cuenta puede ser "
+"igualada a una llamada entrante o saliente."
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
+#, c-format
 msgid "Server returned \"%s\" (%d)"
-msgstr "Servidor contesta \""
+msgstr "El servidor contesta \"%s\" (%d)"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "Estado"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr "Cuentas Configuradas"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
+#, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
-msgstr[0] " cuenta activada"
-msgstr[1] " cuenta activada"
+msgstr[0] "Hay %d cuenta activada"
+msgstr[1] "Hay %d cuentas activadas"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr "No tienes ninguna cuenta activada"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr "General"
 
@@ -740,7 +769,7 @@ msgid "Select which Evolution address books to use"
 msgstr "Seleccione la libreta de contactos de Evolution a usar"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "Nombre"
 
@@ -781,181 +810,177 @@ msgstr "SRTP/ZRTP draft-zimmermann"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr "Asistente de creaciÃ³n de cuentas"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Â¡Bienvenido al asistente de configuraciÃ³n de cuentas de SFLphone"
+msgstr "Â¡Bienvenido al asistente de creaciÃ³n de cuentas de SFLphone!"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr "Este asistente de instalaciÃ³n le ayudarÃ¡ a configurar una cuenta."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "Protocolos VoIP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr "Escoja un tipo de cuenta"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr "Por favor, elija una de las siguientes opciones"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr "Registrar una cuenta SIP o IAX2 existente"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr "ConfiguraciÃ³n de cuenta SIP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr "Por favor, ingrese la siguiente informaciÃ³n"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
-msgstr "CommunicaciÃ²n segura con _ZRTP"
+msgstr "ComunicaciÃ³n segura con _ZRTP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr "DirecciÃ³n de correo opcional"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr "Esta direcciÃ³n de correo se usarÃ¡ para mandar sus mensajes de voz"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr "_Correo"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr "ConfiguraciÃ³n de cuenta IAX2"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "ConversiÃ³n de DirecciÃ³n de Red (NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 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-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr "A_ctivar STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "_Servidor STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr "Registro de cuenta"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "Â¡Enhorabuena!"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "Frecuencia"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "Tasa de transferencia"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr "Ancho de banda"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr "Plugin ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr "Salida"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr "Entrada"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr "_DetecciÃ³n de actividad de voz"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr "_ReducciÃ³n de ruido"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr "Gestor de audio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "_Pulseaudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "_ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr "ConfiguraciÃ³n de ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "CÃ³decs"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "Grabaciones"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr "Carpeta de destino"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr "Seleccione una carpeta"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr "Tonos de llamada"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr "_Habilitar tonos de llamada"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
-msgstr "Elija un tono de llmada"
+msgstr "Elija un tono de llamada"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr "Archivos de Audio"
 
@@ -992,76 +1017,65 @@ msgstr "Reescritura de nÃºmero de telÃ©fono"
 msgid "_Prefix dialed numbers with"
 msgstr "_Prefijar los nÃºmeros marcados con"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-"Este perfil es utilizado cuando usted quiere alcanzar al par remoto "
-"escribiendo el URI sip asÃ como <b>sip:parremoto</b>. Los parÃ¡metros que "
-"usted define aqui serÃ¡n tambiÃ©n utilizados si ningunÃ¡ cuenta puede ser "
-"igualada a una llamada entrante o saliente."
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr "NotificaciÃ³n de escritorio"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr "_Activar notificaciones"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr "Icono de bandeja del sistema"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr "_Popup ventana principal al recibir llamadas"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr "_Nunca mostrar ventana principal"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr "Esconder SFLphone al principio"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr "Historia de llamadas"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr "_Guardar mi historia por lo menos"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr "dÃas"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr "Sonido"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "Libreta de Direcciones"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr "Disparadores"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr "Llamadas IP directas"
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
-msgstr "Opciones avanzadas por TLS"
+msgstr "Opciones avanzadas para TLS"
 
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
 msgid "TLS transport"
@@ -1080,57 +1094,61 @@ msgstr ""
 "diferente transporte TLS para cada cuenta. De cualquier forma, cada uno de "
 "ellos usarÃ¡ un puerto dedicado, diferente el uno del otro.\n"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr "Lista de Certificados de Autoridad"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr "Escoge un archivo de lista de CA (opcional)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr "Archivo del certificado del par pÃºblico"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Escoge un certificado de par pÃºblico (opcional)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr "Escoge un archivo de clave privada"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr "ContraseÃ±a de clave privada"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr "MÃ©todo de protocolo TLS"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr "Lista de cifrado TLS"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
-msgstr "Nombre del servidor para conecciÃ³n TLS saliente"
+msgstr "Nombre del servidor para la conexiÃ³n TLS saliente"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
-msgstr "NegociaciÃ³n expirada"
+msgstr "NegociaciÃ³n expirada (seg:mseg)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr "Checar certificados entrantes, como un servidor"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr "Checar certificados de la respuesta, como cliente"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
-msgstr "Requiere certificado para conecciones TLS entrantes"
+msgstr "Requiere certificado para conexiones TLS entrantes"
 
 #: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
 msgid "ZRTP Options"
@@ -1152,6 +1170,15 @@ msgstr "_Prevenir si ZRTP no es compatible"
 msgid "Display SAS once for hold events"
 msgstr "Presentar SAS una vez para eventos en espera"
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+#, fuzzy
+msgid "SDES Options"
+msgstr "Opciones ZRTP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr "Buscar todos"
@@ -1161,7 +1188,7 @@ msgstr "Buscar todos"
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:84
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:96
 msgid "Click here to change the search type"
-msgstr "Haz clic aqui para cambiar el type de busqueda"
+msgstr "Pulse aqui para cambiar el tipo de busqueda"
 
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:71
 msgid "Search by missed call"
@@ -1175,44 +1202,24 @@ msgstr "Buscar en llamadas entrantes"
 msgid "Search by outgoing call"
 msgstr "Buscar en llamadas salientes"
 
-#~ msgid "IP call - %s"
-#~ msgstr "Llamada IP - %s"
-
-#~ msgid "Codec"
-#~ msgstr "CÃ³dec"
-
-#~ msgid "Network"
-#~ msgstr "Red"
-
-#~ msgid "Manually"
-#~ msgstr "Manualmente"
-
-#~ msgid "There "
-#~ msgstr "Alla "
-
-#~ msgid "is "
-#~ msgstr "es "
-
-#~ msgid "are "
-#~ msgstr "son "
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "_Mute other applications during a call"
-#~ msgstr "Silenciar otras aplicaciones durante una llamada"
-
-#~ msgid "SIP Port"
-#~ msgstr "Puerto SIP"
-
-#~ msgid "UDP Transport"
-#~ msgstr "Transporte UDP"
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>Error: Codecs de audio no encontrados.\n"
+#~ "\n"
+#~ "</b> Los codecs de audio de SFLphone deben estar en <i>%s</i> o en el "
+#~ "directorio <b>.sflphone</b> de su carpeta personal( <i>%s</i> )"
 
-#~ msgid "Enable voicemail _notifications"
-#~ msgstr "Activar _notificaciones de mensajes de voz"
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "%i cuenta configurada"
+#~ msgstr[1] "%i cuentas configuradas"
 
-#~ msgid "Store SIP credentials as MD5 hash"
-#~ msgstr "Guarda informaciÃ²n SIP como hash MD5"
+#~ msgid "Direct IP calls"
+#~ msgstr "Llamadas IP directas"
 
 #~ msgctxt "account state"
 #~ msgid "Registered"
@@ -1241,6 +1248,9 @@ msgstr "Buscar en llamadas salientes"
 #~ msgid "SFLphone KDE Client"
 #~ msgstr "Cliente KDE de SFLphone"
 
+#~ msgid "Codec"
+#~ msgstr "CÃ³dec"
+
 #~ msgid "Main screen"
 #~ msgstr "Pantalla principal"
 
@@ -1296,6 +1306,9 @@ msgstr "Buscar en llamadas salientes"
 #~ msgid "PulseAudio"
 #~ msgstr "PulseAudio"
 
+#~ msgid "SIP Port"
+#~ msgstr "Puerto SIP"
+
 #~ msgctxt "End of 'Keep my history for at least n days.'"
 #~ msgid "days"
 #~ msgstr "dÃas"
@@ -1452,12 +1465,18 @@ msgstr "Buscar en llamadas salientes"
 #~ msgid "Attention:number of results exceeds max displayed."
 #~ msgstr "Cuidado:nÃºmero de resultatos excede el maximo a mostrar."
 
+#~ msgid "IP call - %s"
+#~ msgstr "Llamada IP - %s"
+
 #~ msgid "_Account creation wizard"
 #~ msgstr "Asistente de configuraciÃ³n de cuentas"
 
 #~ msgid "_Enable this account"
 #~ msgstr "_Habilitar esta cuenta"
 
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Activar _notificaciones de mensajes de voz"
+
 #~ msgctxt "Beginning of 'Keep my history for at least n days.'"
 #~ msgid "_Keep my history for at least"
 #~ msgstr "_Guardar mi historia por lo menos"
@@ -1465,6 +1484,9 @@ msgstr "Buscar en llamadas salientes"
 #~ msgid "PulseAudio sound server"
 #~ msgstr "Servidor de sonido Pulseaudio"
 
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "Silenciar otras aplicaciones durante una llamada"
+
 #~ msgid "User"
 #~ msgstr "Usuario"
 
@@ -1770,13 +1792,36 @@ msgstr "Buscar en llamadas salientes"
 #~ "\"MÃ¡s\" o \"Menos\". Edita la cuenta seleccionada con el formulario a la "
 #~ "derecha."
 
+#~ msgid "Manually"
+#~ msgstr "Manualmente"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "There "
+#~ msgstr "Alla "
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Guarda informaciÃ²n SIP como hash MD5"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Transporte UDP"
+
+#~ msgid "are "
+#~ msgstr "son "
+
+#~ msgid "is "
+#~ msgstr "es "
+
 #~ msgctxt "NAME OF TRANSLATORS"
 #~ msgid "Your names"
 #~ msgstr ""
 #~ "Maxime Chambreuil, ,Launchpad Contributions:,Andres Mujica,Maxime "
 #~ "Chambreuil, ,Launchpad Contributions:,Andres Mujica,Maxime Chambreuil, ,"
 #~ "Launchpad Contributions:,Andres Mujica,Maxime Chambreuil, ,Launchpad "
-#~ "Contributions:,Andres Mujica,Maxime Chambreuil"
+#~ "Contributions:,Andres Mujica,Maxime Chambreuil, ,Launchpad Contributions:,"
+#~ "Andres Mujica,Jorge E. GÃ³mez,Maxime Chambreuil,NicolÃ¡s M. Zahlut,Xuacu "
+#~ "Saturio"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
@@ -1784,4 +1829,6 @@ msgstr "Buscar en llamadas salientes"
 #~ "maxime.chambreuil@savoirfairelinux.com,,,andres.mujica@seaq.com.co,maxime."
 #~ "chambreuil@gmail.com,,,andres.mujica@seaq.com.co,maxime.chambreuil@gmail."
 #~ "com,,,andres.mujica@seaq.com.co,maxime.chambreuil@gmail.com,,,andres."
-#~ "mujica@seaq.com.co,maxime.chambreuil@gmail.com"
+#~ "mujica@seaq.com.co,maxime.chambreuil@gmail.com,,,andres.mujica@seaq.com."
+#~ "co,jorge@jorgee.net,maxime.chambreuil@gmail.com,nzahlut@live.com,"
+#~ "xuacusk8@gmail.com"
diff --git a/lang/fr/fr.po b/lang/fr/fr.po
index c7ace4f55b20cd568eb48572c1eb71af406ac753..2647cf64f4c344807c6d4ef88ae2da48f74f273d 100644
--- a/lang/fr/fr.po
+++ b/lang/fr/fr.po
@@ -9,68 +9,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-10-26 20:46+0000\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2009-12-12 14:56+0000\n"
+"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-11-12 18:12+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "EnregistrÃ©"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "Non EnregistrÃ©"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr "En cours..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "Erreur"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "Erreur d'authentification"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "RÃ©seau non trouvÃ©"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "Serveur introuvable"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr "Erreur de configuration Stun"
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr "Serveur Stun invalide"
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "Non valide"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr "Utilise le compte"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr "Pas de compte enregistrÃ©"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -78,23 +82,26 @@ msgstr ""
 "Impossible de se connecter au serveur SFLphone.\n"
 " Assurez-vous que le dÃ©mon est lancÃ©."
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr "Appel direct SIP"
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
-"<b>Erreur: Aucun codec audio trouvÃ©.\n"
-"\n"
-"</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-client-gnome/src/errors.c:29
 msgid ""
@@ -126,43 +133,43 @@ msgstr ""
 "\n"
 "Pulseaudio n'est pas lancÃ©"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr "Vous avez un appel en cours."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr "Vous avez des appels en cours."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr "Voulez-vous quitter?"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr "Erreur SFLphone"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr "ZRTP n'est pas supportÃ© par %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr "Communications sÃ©curisÃ©es non disponibles"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr "Continuer"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr "ArrÃªter l'appel"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -171,11 +178,11 @@ msgstr ""
 "L'appel avec %s est passÃ© en mode non-cryptÃ© Ã  cause d'une erreur %s.\n"
 "Raison exacte: %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr "Erreur d'authentification"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
@@ -184,11 +191,11 @@ msgstr ""
 "%s ne dÃ©sire plus utiliser la communication sÃ©curisÃ©e. Confirmer que vous "
 "voulez continuer sans ZRTP.\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr "Confirmer Communication en clair"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -259,448 +266,466 @@ msgstr "Volume des hauts-parleurs"
 msgid "Mic volume"
 msgstr "Volume du micro"
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr "_Afficher la fenÃªtre principale"
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "_Raccrocher"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] "%i compte configurÃ©"
-msgstr[1] "%i comptes configurÃ©s"
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "%d compte actif"
+msgstr[1] "%d comptes actifs"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr "Boite vocale"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr "Aucun carnet d'adresses sÃ©lectionnÃ©"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
 #, c-format
 msgid "Voicemail (%i)"
 msgstr "Boite vocale (%i)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 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-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr "A propos de SFLphone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr "Actions"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr "_Nouvel appel"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
 msgstr "Appeler"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr "_DÃ©crocher"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
 msgstr "RÃ©pondre Ã  l'appel"
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "_Raccrocher"
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
 msgstr "Terminer l'appel"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr "Mettre en attente"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
 msgstr "Mettre l'appel en attente"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr "Reprendre"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr "Reprendre l'appel"
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "Enregistrer"
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr "Enregistrer la conversation courante"
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr "_Assistant de configuration"
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr "Lancer l'assistant de configuration"
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr "Appeler la boite vocale"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr "Minimiser dans la barre des tÃ¢ches"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr "Quitter le programme"
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr "_Editer"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr "_Copier"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr "Copier la sÃ©lection"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr "C_oller"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
-msgstr ""
+msgstr "Coller le contenu du presse-papiers"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr "Effacer l'_historique"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr "Effacer l'historique"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr "Co_mptes"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr "Ã‰diter les comptes"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr "PrÃ©fÃ©rences"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
 msgstr "Modifier les prÃ©fÃ©rences"
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr "A_ffichage"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "A_ide"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr "Sommaire"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr "Ouvrir le manuel"
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr "Ã€ propos de cette application"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr "TransfÃ©rer"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
-msgstr "TransfÃ©rer Ã  : "
+msgstr "TransfÃ©rer Ã  :"
+
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "Enregistrer"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr "Enregistrer la conversation courante"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr "Afficher la _barre d'outil"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr "Afficher la barre d'outil"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr "_Clavier"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr "Afficher le clavier"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr "ContrÃ´le du _volume"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr "Afficher les controles du volume"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr "Historique"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr "Historique d'appels"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "Carnet d'adresses"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr "_Mettre en attente"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr "_Rappeler"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr "Ã‰diter le numÃ©ro"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr "Ã‰diter le numÃ©ro de tÃ©lÃ©phone avant d'appeler"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr "ParamÃ¨tres du Compte"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "A_lias"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "P_rotocole"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr "_Serveur"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr "Usa_ger"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "_Mot de passe"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
-#, fuzzy
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
-msgstr "Mot de passe"
+msgstr "Afficher le mot de passe"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr "_Boite vocale #"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "Usa_ger"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr "Identification"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr "Mot de passe"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr "Informations"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr "Nom d'authentification"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr "SÃ©curitÃ©"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr "Utiliser un transport TLS (sips)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr "Ã‰change de clÃ© SRTP"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr "DÃ©sactivÃ©"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr "Expiration d'enregistrement"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr "Expiration d'enregistrement"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr "Respecter RFC 3263"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "Interface rÃ©seau"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr "Adresse locale"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr "Port local"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr "Adresse de publication"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
-msgstr "Utiliser STUN "
+msgstr "Utiliser STUN"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr "URL du serveur STUN"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr "Identique aux paramÃ¨tres locaux"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr "Configurer l'adresse et le port Ã  publier"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr "Port de publication"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr "ParamÃ¨tre des comptes"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr "GÃ©nÃ©ral"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr "AvancÃ©"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr "RÃ©seau"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+"Ce profil est utilisÃ© quand vous voulez appeler directement quelqu'un en "
+"composant une adresse SIP telle que: <b>sip:remotepeer</b>. Ces paramÃ¨tres "
+"sont aussi utilisÃ© si aucun compte ne peut Ãªtre attribuÃ© Ã  un appel entrant "
+"ou sortant."
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr "Le serveur a rÃ©pondu \"%s\" (%d)"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "Statut"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr "Comptes ConfigurÃ©s"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
 #, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
-msgstr[0] " %d compte actif"
-msgstr[1] " %d comptes actifs"
+msgstr[0] "%d compte actif"
+msgstr[1] "%d comptes actifs"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr "GÃ©nÃ©ral"
 
@@ -745,7 +770,7 @@ msgid "Select which Evolution address books to use"
 msgstr "SÃ©lectionnez les carnets d'adresses d'Evolution Ã  utiliser"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "Nom"
 
@@ -786,183 +811,179 @@ msgstr "SRTP/ZRTP draft-zimmermann"
 msgid "None"
 msgstr "Aucun"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr "Assistant de crÃ©ation de compte de SFLphone"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr "Bienvenue dans l'assistant de crÃ©ation de compte de SFLphone !"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr "Cet assistant vous guidera dans la configuration d'un compte."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "Protocoles VoIP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr "SÃ©lectionnez un type de compte"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr "Compte"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr "Veuillez sÃ©lectionner une des options suivantes"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr "CrÃ©er un compte SIP/IAX2 gratuit sur sflphone.org"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr "Enregistrer un compte SIP ou IAX2 existant"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr "ParamÃ¨tres de compte SIP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr "Veuillez remplir les champs suivants"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr "Communications sÃ©curisÃ©es avec _ZRTP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr "Adresse courriel optionnelle"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr "Vos messages vocaux seront envoyÃ©s par courriel Ã  cette adresse."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr "A_dresse courriel"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr "ParamÃ¨tres de compte IAX2"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 "Vous devriez probablement activer cette option si vous vous trouvez derriÃ¨re "
 "un pare-feu."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr "A_ctiver STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "S_erveur STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr "Enregistrement du compte"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "FÃ©licitations!"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "FrÃ©quence"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr "Bande passante"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr "Greffon ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr "Sortie"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr "EntrÃ©e"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr "DÃ©tection de l'activitÃ© de la voix"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr "RÃ©duction du bruit (Compresseur extenseur LBR)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr "Interface Audio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "_Pulseaudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "_ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr "ParamÃ¨tres ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "Enregistrements"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr "Dossier de destination"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr "Choisissez un dossier"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr "Sonneries"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr "_Activer les sonneries"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr "SÃ©lectionner une sonnerie"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr "Fichier Audio"
 
@@ -999,73 +1020,62 @@ msgstr "RÃ©Ã©criture des numÃ©ros appelÃ©s"
 msgid "_Prefix dialed numbers with"
 msgstr "_PrÃ©fixer les numÃ©ros composÃ©s par"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-"Ce profil est utilisÃ© quand vous voulez appeler directement quelqu'un en "
-"composant une adresse SIP telle que: <b>sip:remotepeer</b>. Ces paramÃ¨tres "
-"sont aussi utilisÃ© si aucun compte ne peut Ãªtre attribuÃ© Ã  un appel entrant "
-"ou sortant."
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr "Notifications de Bureau"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr "_Activer les notifications"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr "IcÃ´ne dans la barre des tÃ¢ches"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr "Faire apparaÃ®tre la fenÃªtre _principale lors d'appel entrant"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr "Ne _jamais afficher la fenÃªtre principale"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr "_Cacher la fenÃªtre de SFLphone au dÃ©marrage"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr "Historique des appels"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr "Garder mon historique au moins"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr "jours"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr "PrÃ©fÃ©rences"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr "Audio"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "Carnet d'adresse"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr "Ancrage"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr "Appels IP"
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr "Options avancÃ©es TLS"
@@ -1087,55 +1097,59 @@ msgstr ""
 "TLS diffÃ©rent pour chaque compte. Cependant, chacun Ã©coutera sur un port "
 "diffÃ©rent.\n"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr "Liste des autoritÃ©s de certification"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr "Choisir une liste d'AC (optionnel)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr "Fichier de certificats de l'extrÃ©mitÃ© public"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "SÃ©lectionner le certificat de l'extrÃ©mitÃ© public"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr "Choisir une clÃ© privÃ©e (optionnel)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr "Mot de passe pour la clÃ© privÃ©e"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr "MÃ©thode pour TLS"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr "Liste de cryptogramme TLS"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Instance du serveur pour les connections TLS sortantes"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr "Expiration de la nÃ©gociation"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr "En tant que serveur, vÃ©rifier les certificats entrants"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr "En tant que client, vÃ©rifier les certificats dans les rÃ©ponses"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr "Exiger un certificat pour les connexions TLS entrantes"
 
@@ -1159,6 +1173,15 @@ msgstr "_Avertir si ZRTP n'est pas supportÃ©"
 msgid "Display SAS once for hold events"
 msgstr "Afficher le SAS seulement une fois sur les mises en attente"
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+#, fuzzy
+msgid "SDES Options"
+msgstr "Options de ZRTP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr "Rechercher dans tous"
@@ -1182,48 +1205,24 @@ msgstr "Rechercher dans les appels entrants"
 msgid "Search by outgoing call"
 msgstr "Rechercher dans les appels sortants"
 
-#~ msgid "Configuration File"
-#~ msgstr "Fichier de configuration"
-
-#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
 #~ msgstr ""
-#~ "Stocker les informations d'authentification sour forme encryptÃ©e (MD5)"
-
-#~ msgid "IP call - %s"
-#~ msgstr "Appel IP - %s"
-
-#~ msgid "Codec"
-#~ msgstr "Codec"
-
-#~ msgid "Network"
-#~ msgstr "RÃ©seau"
-
-#~ msgid "Manually"
-#~ msgstr "Manuelle"
-
-#~ msgid "There "
-#~ msgstr "Il y "
-
-#~ msgid "is "
-#~ msgstr "a "
-
-#~ msgid "are "
-#~ msgstr "a "
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "_Mute other applications during a call"
-#~ msgstr "Ã‰teindre le _son des autres applications lors d'un appel"
-
-#~ msgid "SIP Port"
-#~ msgstr "Port SIP"
+#~ "<b>Erreur: Aucun codec audio trouvÃ©.\n"
+#~ "\n"
+#~ "</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> )"
 
-#~ msgid "UDP Transport"
-#~ msgstr "Transport UDP"
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "%i compte configurÃ©"
+#~ msgstr[1] "%i comptes configurÃ©s"
 
-#~ msgid "Enable voicemail _notifications"
-#~ msgstr "Activer les notifications de boÃ®te _vocale"
+#~ msgid "Direct IP calls"
+#~ msgstr "Appels IP"
 
 #~ msgctxt "account state"
 #~ msgid "Registered"
@@ -1286,6 +1285,9 @@ msgstr "Rechercher dans les appels sortants"
 #~ msgid "Default account"
 #~ msgstr "Compte par dÃ©faut"
 
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
 #~ msgid "SFLphone KDE Client"
 #~ msgstr "SFLphone Client KDE"
 
@@ -1475,6 +1477,9 @@ msgstr "Rechercher dans les appels sortants"
 #~ msgid "Clear history"
 #~ msgstr "Effacer l'historique"
 
+#~ msgid "SIP Port"
+#~ msgstr "Port SIP"
+
 #~ msgid "Trigger on specific SIP header"
 #~ msgstr "DÃ©clencher sur un entÃªte SIP spÃ©cifique"
 
@@ -1496,15 +1501,24 @@ msgstr "Rechercher dans les appels sortants"
 #~ msgid "Attention:number of results exceeds max displayed."
 #~ msgstr "Attention:tous les rÃ©sultats ne sont pas affichÃ©s."
 
+#~ msgid "IP call - %s"
+#~ msgstr "Appel IP - %s"
+
 #~ msgid "_Account creation wizard"
 #~ msgstr "_Assistant de crÃ©ation de compte"
 
 #~ msgid "_Enable this account"
 #~ msgstr "Activer ce compte"
 
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Activer les notifications de boÃ®te _vocale"
+
 #~ msgid "PulseAudio sound server"
 #~ msgstr "Serveur de son PulseAudio"
 
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "Ã‰teindre le _son des autres applications lors d'un appel"
+
 #~ msgid "Port"
 #~ msgstr "Port"
 
@@ -1817,12 +1831,38 @@ msgstr "Rechercher dans les appels sortants"
 #~ msgid "Registration _expire"
 #~ msgstr "Expiration d'enregistrement"
 
+#~ msgid "Manually"
+#~ msgstr "Manuelle"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Transport UDP"
+
+#~ msgid "Configuration File"
+#~ msgstr "Fichier de configuration"
+
+#~ msgid "There "
+#~ msgstr "Il y "
+
+#~ msgid "are "
+#~ msgstr "a "
+
+#~ msgid "is "
+#~ msgstr "a "
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr ""
+#~ "Stocker les informations d'authentification sour forme encryptÃ©e (MD5)"
+
 #~ msgctxt "NAME OF TRANSLATORS"
 #~ msgid "Your names"
 #~ msgstr ""
 #~ "JÃ©rÃ©my Quentin, ,Launchpad Contributions:,Emmanuel Milou,Maxime "
 #~ "Chambreuil, ,Launchpad Contributions:,Emmanuel Milou,Maxime Chambreuil, ,"
-#~ "Launchpad Contributions:,Emmanuel Milou,Maxime Chambreuil"
+#~ "Launchpad Contributions:,Emmanuel Milou,Maxime Chambreuil, ,Launchpad "
+#~ "Contributions:,Emmanuel Milou,Maxime Chambreuil,Pierre Slamich"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
@@ -1830,4 +1870,5 @@ msgstr "Rechercher dans les appels sortants"
 #~ "jeremy.quentin@savoirfairelinux.com,,,emmanuel.milou@savoirfairelinux.com,"
 #~ "maxime.chambreuil@gmail.com,,,emmanuel.milou@savoirfairelinux.com,maxime."
 #~ "chambreuil@gmail.com,,,emmanuel.milou@savoirfairelinux.com,maxime."
-#~ "chambreuil@gmail.com"
+#~ "chambreuil@gmail.com,,,emmanuel.milou@savoirfairelinux.com,maxime."
+#~ "chambreuil@gmail.com,pierre.slamich@gmail.com"
diff --git a/lang/it/it.po b/lang/it/it.po
index cf8644aea926a034434257d7637e4c5c02e5a84c..7c22d150530b413d5f736c5221c2cad11c96e0f5 100644
--- a/lang/it/it.po
+++ b/lang/it/it.po
@@ -7,68 +7,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-10-14 17:47+0000\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2009-12-09 20:05+0000\n"
+"Last-Translator: Maurizio Porrato <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "Registrato"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "Non registrato"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr "Registrazione in corso..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "Errore"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "Autenticazione fallita"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "Rete irraggiungibile"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "Host non raggiungibile"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr "Errore di configurazione STUN"
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr "Server STUN non valido"
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "Non valido"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr "Account in uso:"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr "Nessun account registrato"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -76,23 +80,26 @@ msgstr ""
 "Impossibile connettersi al server SFLphone.\n"
 "Accertarsi che il demone sia in esecuzione."
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
+msgstr "Chiamata SIP diretta"
+
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
-"<b>Errore: Non Ã¨ stato trovato alcun codec audio.</b>\n"
-"\n"
-"I codec audio SFL devono trovarsi in <i>%s</i> o nella sottocartella <b>."
-"sflphone</b> della cartella home dell'utente (</i>%s</i>)"
 
 #: ../sflphone-client-gnome/src/errors.c:29
 msgid ""
@@ -121,65 +128,65 @@ msgstr ""
 "Notifica PulseAudio\n"
 "PulseAudio non Ã¨ in esecuzione"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr "C'Ã¨ una chiamata in corso."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr "Ci sono chiamate in corso."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr "Vuoi veramente uscire?"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr "Errore SFLphone"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
-msgstr ""
+msgstr "Termina la chiamata"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
-msgstr ""
+msgstr "Negoziazione ZRTP fallita"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr ""
 
@@ -228,17 +235,17 @@ msgstr ""
 #: ../sflphone-client-gnome/src/sflnotify.c:205
 #, c-format
 msgid "%s does not support ZRTP."
-msgstr ""
+msgstr "%s non supporta ZRTP."
 
 #: ../sflphone-client-gnome/src/sflnotify.c:220
 #, c-format
 msgid "ZRTP negotiation failed with %s"
-msgstr ""
+msgstr "Negoziazione ZRTP fallita con %s"
 
 #: ../sflphone-client-gnome/src/sflnotify.c:235
 #, c-format
 msgid "<i>With:</i> %s"
-msgstr ""
+msgstr "<i>Con:</i> %s"
 
 #: ../sflphone-client-gnome/src/sliders.c:162
 msgid "Speakers volume"
@@ -248,445 +255,461 @@ msgstr "Volume altoparlante"
 msgid "Mic volume"
 msgstr "Volume microfono"
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr "Mostra la finestra principale"
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "_Chiudi"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] "%i account configurato"
-msgstr[1] "%i account configurati"
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "Account predefinito"
+msgstr[1] "Account predefinito"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr "Segreteria telefonica"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr "Rubrica"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "Rubrica"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
 msgid "Voicemail (%i)"
 msgstr "Segreteria telefonica (%i)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone Ã¨ un client VoIP compatibile con i protocolli SIP e IAX2."
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr "Informazioni su SFLphone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr "_Chiama"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr "Chiama"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
-msgstr ""
+msgstr "Effettua una nuova chiamata"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr "Rispondi"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "_Chiudi"
+msgstr "Rispondi alla chiamata"
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
-msgstr ""
+msgstr "Termina la chiamata"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr "Attesa"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
-msgstr ""
+msgstr "Metti in attesa la chiamata"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "_Registra"
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr "Errore di configurazione STUN"
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr "%d messaggio vocale"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr "_Modifica"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr "Elimina l'account selezionato"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr "Cancella la cronologia"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr "Cancella la cronologia"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr "_Account"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr "Account attivo"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr "Preferenze"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
-msgstr ""
+msgstr "Modifica le preferenze"
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr "Inoltra"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
-msgstr "Inoltra a: "
+msgstr "Inoltra a:"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "_Registra"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr "Regista la conversazione in corso"
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr "Mostra tastiera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
-msgstr ""
+msgstr "Mostra la tastiera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr "Mostra i controlli del volume"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr "Mostra i controlli del volume"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr "Cronologia"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr "Cronologia chiamate"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "Rubrica"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr "Attesa"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr "Parametri account"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "_Pseudonimo"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "_Protocollo"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr "Nome _host"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr "Nome _utente"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "_Password"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr "Password"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr "Numero segreteria telefonica"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "Nome _utente"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
-msgstr ""
+msgstr "Autenticazione"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "Password"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr "Scadenza registrazione"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "Rete irraggiungibile"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr "Impostazioni dell'account"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr "Generale"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "Codec"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr "Rete"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "Stato"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr "Account"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr "Account configurati"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
 #, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr ""
 
@@ -731,7 +754,7 @@ msgid "Select which Evolution address books to use"
 msgstr "Selezionare la rubrica di Evolution da usare"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "Nome"
 
@@ -770,184 +793,180 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr ""
 "Benvenuti alla procedura guidata per la creazione di un account SFLphone"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr "Questa procedura permetterÃ  di configurare un account."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "Protocolli VoIP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr "Selezionare un tipo di account"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr "Account"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr "Scegliere una delle seguenti opzioni"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr "Creare un account SIP/IAX2 gratuito  su sflphone.org"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr "Registrare un account SIP o IAX2 esistente"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr "Impostazioni account SIP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr "Indirizzo email opzionale"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr ""
 "L'indirizzo email sarÃ  usato per l'invio dei messaggi della segreteria "
 "telefonica."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr "Indirizzo _email"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr "Impostazioni account IAX2"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Dovrebbe essere abilitato se ci si trova dietro ad un firewall."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr "Abilita STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "Server STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr "Registrazione account"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "Congratulazioni!"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "Frequenza"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr "Banda"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr "Plugin ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr "Uscita"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr "Ingresso"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "_Pulseaudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "_ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr "Impostazioni ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "Codec"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "Registrazioni"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr "Cartella di destinazione"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr "Seleziona una cartella"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr "Suonerie"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr "Abilita suonerie"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr "Selezionare una suoneria"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr "File audio"
 
@@ -984,69 +1003,62 @@ msgstr "Riscrittura numero telefonico"
 msgid "_Prefix dialed numbers with"
 msgstr "Prefisso da aggiungere ai numeri da chiamare"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr "Notifiche"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr "Abilita notifiche"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr "Icona per area di notifica"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr "Mostra la finestra principale all'arrivo delle chiamate"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr "Non mostrare mai la finestra principale"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr "Nascondi la finestra di SFLphone all'avvio"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr "Cronologia chiamate"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr "Mantieni la cronologia per almeno"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr "giorni"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr "Audio"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr ""
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr ""
@@ -1064,55 +1076,59 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -1136,6 +1152,14 @@ msgstr ""
 msgid "Display SAS once for hold events"
 msgstr ""
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr "Cerca tra tutte le chiamate"
@@ -1159,24 +1183,25 @@ msgstr "Cerca tra le chiamate ricevute"
 msgid "Search by outgoing call"
 msgstr "Cerca tra le chiamate effettuate"
 
-#~ msgid "IP call - %s"
-#~ msgstr "Chiamata IP diretta - %s"
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>Errore: Non Ã¨ stato trovato alcun codec audio.</b>\n"
+#~ "\n"
+#~ "I codec audio SFL devono trovarsi in <i>%s</i> o nella sottocartella <b>."
+#~ "sflphone</b> della cartella home dell'utente (</i>%s</i>)"
+
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "%i account configurato"
+#~ msgstr[1] "%i account configurati"
 
 #~ msgid "Codec"
 #~ msgstr "Codec"
 
-#~ msgid "Network"
-#~ msgstr "Rete"
-
-#~ msgid "_Mute other applications during a call"
-#~ msgstr "Spegni l'audio delle altre applicazioni durante una chiamata"
-
-#~ msgid "SIP Port"
-#~ msgstr "SIP Port"
-
-#~ msgid "Enable voicemail _notifications"
-#~ msgstr "Abilita notifiche messaggi vocali"
-
 #~ msgid "(C) 2009 Savoir-faire Linux"
 #~ msgstr "(C) 2009 Savoir-faire Linux"
 
@@ -1228,15 +1253,15 @@ msgstr "Cerca tra le chiamate effettuate"
 #~ msgid "Enable notifications"
 #~ msgstr "Attiva le notifiche"
 
+#~ msgid "SIP Port"
+#~ msgstr "SIP Port"
+
 #~ msgid "Port"
 #~ msgstr "Port"
 
 #~ msgid "PulseAudio sound server"
 #~ msgstr "Server audio PulseAudio"
 
-#~ msgid "Default account"
-#~ msgstr "Account predefinito"
-
 #~ msgid "You have an incoming call from"
 #~ msgstr "Chiamata in arrivo da"
 
@@ -1255,6 +1280,9 @@ msgstr "Cerca tra le chiamate effettuate"
 #~ msgid "_Enable this account"
 #~ msgstr "Abilita questo account"
 
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Abilita notifiche messaggi vocali"
+
 #~ msgid "Voicemail number"
 #~ msgstr "Numero segreteria telefonica"
 
@@ -1297,9 +1325,15 @@ msgstr "Cerca tra le chiamate effettuate"
 #~ msgid "Prefix dialed numbers with"
 #~ msgstr "Prefisso da aggiungere al numero da chiamare"
 
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "Spegni l'audio delle altre applicazioni durante una chiamata"
+
 #~ msgid "Keep my history for at least"
 #~ msgstr "Mantieni la cronologia per almeno"
 
+#~ msgid "IP call - %s"
+#~ msgstr "Chiamata IP diretta - %s"
+
 #~ msgid "Registration _expire"
 #~ msgstr "Scadenza registrazione"
 
@@ -1321,10 +1355,11 @@ msgstr "Cerca tra le chiamate effettuate"
 #~ msgstr ""
 #~ ",Launchpad Contributions:,Maurizio Porrato,Maxime Chambreuil, ,Launchpad "
 #~ "Contributions:,Maurizio Porrato,Maxime Chambreuil, ,Launchpad "
+#~ "Contributions:,Maurizio Porrato,Maxime Chambreuil, ,Launchpad "
 #~ "Contributions:,Maurizio Porrato,Maxime Chambreuil"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
 #~ msgstr ""
 #~ ",,,maxime.chambreuil@gmail.com,,,,maxime.chambreuil@gmail.com,,,,maxime."
-#~ "chambreuil@gmail.com"
+#~ "chambreuil@gmail.com,,,,maxime.chambreuil@gmail.com"
diff --git a/lang/ja/ja.po b/lang/ja/ja.po
new file mode 100644
index 0000000000000000000000000000000000000000..88481019c372952906a2bd4ffffea50b202a3d2f
--- /dev/null
+++ b/lang/ja/ja.po
@@ -0,0 +1,1222 @@
+# Japanese translation for sflphone
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the sflphone package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2009-12-23 22:50+0000\n"
+"Last-Translator: Launchpad Translations Administrators <rosetta@launchpad."
+"net>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../sflphone-client-gnome/src/accountlist.c:170
+msgid "Registered"
+msgstr "ç™»éŒ²ã—ã¾ã—ãŸ"
+
+#: ../sflphone-client-gnome/src/accountlist.c:173
+msgid "Not Registered"
+msgstr "ç™»éŒ²ã§ãã¾ã›ã‚“"
+
+#: ../sflphone-client-gnome/src/accountlist.c:176
+msgid "Trying..."
+msgstr "æ¤œç´¢ä¸..."
+
+#: ../sflphone-client-gnome/src/accountlist.c:179
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "ã‚¨ãƒ©ãƒ¼"
+
+#: ../sflphone-client-gnome/src/accountlist.c:182
+msgid "Authentication Failed"
+msgstr "èªè¨¼ã«å¤±æ•—"
+
+#: ../sflphone-client-gnome/src/accountlist.c:185
+msgid "Network unreachable"
+msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã§ãã¾ã›ã‚“"
+
+#: ../sflphone-client-gnome/src/accountlist.c:188
+msgid "Host unreachable"
+msgstr "ãƒ›ã‚¹ãƒˆã«æŽ¥ç¶šã§ãã¾ã›ã‚“"
+
+#: ../sflphone-client-gnome/src/accountlist.c:191
+msgid "Stun configuration error"
+msgstr "æ§‹æˆã‚¨ãƒ©ãƒ¼"
+
+#: ../sflphone-client-gnome/src/accountlist.c:194
+msgid "Stun server invalid"
+msgstr "ã‚µãƒ¼ãƒãƒ¼ç„¡åŠ¹"
+
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
+msgid "Invalid"
+msgstr "ç„¡åŠ¹"
+
+#: ../sflphone-client-gnome/src/actions.c:114
+msgid "Using account"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆä½¿ç”¨ä¸"
+
+#: ../sflphone-client-gnome/src/actions.c:121
+msgid "No registered accounts"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆç™»éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#: ../sflphone-client-gnome/src/actions.c:306
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"SFLphoneã‚µãƒ¼ãƒã«æŽ¥ç¶šã§ãã¾ã›ã‚“\n"
+"ãƒ‡ãƒ¼ãƒ¢ãƒ³ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚"
+
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
+msgid "Direct SIP call"
+msgstr "ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆSIPã‚³ãƒ¼ãƒ«"
+
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"ALSAé€šçŸ¥\n"
+"\n"
+"å†ç”Ÿãƒ‡ãƒã‚¤ã‚¹ã‚¨ãƒ©ãƒ¼"
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"ALSAé€šçŸ¥\n"
+"\n"
+"å†ç”Ÿãƒ‡ã‚£ãƒã‚¤ã‚¹ã‚¨ãƒ©ãƒ¼"
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+"Pulseaudioé€šçŸ¥\n"
+"\n"
+"PulseaudioãŒå‹•ã„ã¦ã„ã¾ã›ã‚“ã€‚"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:94
+msgid "There is one call in progress."
+msgstr "å‘¼ã³å‡ºã—ä¸"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:98
+msgid "There are calls in progress."
+msgstr "å‘¼ã³å‡ºã—ä¸"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:103
+msgid "Do you still want to quit?"
+msgstr "ã‚ãƒ£ãƒ³ã‚»ãƒ«ã—ã¾ã™ã‹ï¼Ÿ"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:331
+msgid "SFLphone Error"
+msgstr "SFLphoneã‚¨ãƒ©ãƒ¼"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:450
+#, c-format
+msgid "ZRTP is not supported by peer %s\n"
+msgstr "ZRTPãŒ%sã«ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:452
+msgid "Secure Communication Unavailable"
+msgstr "å®‰å…¨ãªã‚³ãƒŸãƒ¥ãƒ‹ã‚±ãƒ¼ã‚·ãƒ§ãƒ³ãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ã€‚"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
+msgid "Continue"
+msgstr "æ¬¡ã¸"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
+msgid "Stop Call"
+msgstr "é›»è©±ã‚’ã‚„ã‚ã¦ãã ã•ã„"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:480
+#, c-format
+msgid ""
+"A %s error forced the call with %s to fall under unencrypted mode.\n"
+"Exact reason: %s\n"
+msgstr ""
+"A %s ã‚¨ãƒ©ãƒ¼ã¯éžæš—å·åŒ–ã•ã‚Œã¦ã„ã‚‹ãŸã‚%sã®å‘¼ã³å‡ºã—ã‚’å¼·åˆ¶çµ‚äº†ã—ã¾ã—ãŸã€‚\n"
+"æ£ç¢ºãªç†ç”±ï¼š%s\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:482
+msgid "ZRTP negotiation failed"
+msgstr "ZRTPäº¤æ¸‰å¤±æ•—"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:500
+#, c-format
+msgid ""
+"%s wants to stop using secure communication. Confirm will resume "
+"conversation without SRTP.\n"
+msgstr ""
+"%sã¯ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ãƒ¼ã§ä¿è·ã•ã‚ŒãŸé€šä¿¡ã‚’ä½¿ã†ã®ã‚’ã‚„ã‚ã¦ãã ã•ã„ã€‚SRTPãªã—ã§ä¼šè©±ãŒ"
+"å†é–‹ã™ã‚‹ã®ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚\n"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:502
+msgid "Confirm Go Clear"
+msgstr "ã‚¯ãƒªã‚¢ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:504
+msgid "Confirm"
+msgstr "ç¢ºèª"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr "%s ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ: %s"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr "</i> %sã‹ã‚‰ <i>"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] "%d ãƒœã‚¤ã‚¹ãƒ¡ãƒ¼ãƒ«"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "%s ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ<i>%s</i>ã‚’å‘¼ã³å‡ºã—ä¸"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr "ç¾åœ¨ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆç™»éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:190
+#, c-format
+msgid ""
+"<i>With:</i> %s \n"
+"using %s"
+msgstr ""
+"<i>ã§:</i> %s\n"
+" %sã‚’ä½¿ã£ã¦ãã ã•ã„ã€‚"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:205
+#, c-format
+msgid "%s does not support ZRTP."
+msgstr "%s ã¯ZRTPã‚’ã‚µãƒãƒ¼ãƒˆã§ãã¦ã„ã¾ã›ã‚“ã€‚"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:220
+#, c-format
+msgid "ZRTP negotiation failed with %s"
+msgstr "ZRTPäº¤æ¸‰%sã§å¤±æ•—ã—ã¾ã—ãŸ"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:235
+#, c-format
+msgid "<i>With:</i> %s"
+msgstr "<i>With:</i> %s"
+
+#: ../sflphone-client-gnome/src/sliders.c:162
+msgid "Speakers volume"
+msgstr "ã‚¹ãƒ”ãƒ¼ã‚«ãƒ¼ã®éŸ³é‡"
+
+#: ../sflphone-client-gnome/src/sliders.c:164
+msgid "Mic volume"
+msgstr "ãƒžã‚¤ã‚¯éŸ³é‡"
+
+#: ../sflphone-client-gnome/src/statusicon.c:128
+msgid "_Show main window"
+msgstr "ãƒ¡ã‚¤ãƒ³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‹ã"
+
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "é€šè©±ã‚’åˆ‡ã‚‹(_H)"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
+msgid "SFLphone"
+msgstr "SFLãƒ•ã‚©ãƒ³"
+
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "%dã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
+
+#: ../sflphone-client-gnome/src/toolbar.c:38
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
+msgid "Voicemail"
+msgstr "ãƒœã‚¤ã‚¹ãƒ¡ãƒ¼ãƒ«"
+
+#: ../sflphone-client-gnome/src/uimanager.c:121
+msgid "No address book selected"
+msgstr "ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
+msgid "Address book"
+msgstr "ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³"
+
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
+msgid "Voicemail (%i)"
+msgstr "ãƒœã‚¤ã‚¹ãƒ¡ãƒ¼ãƒ«(%i)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:396
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "SFLãƒ•ã‚©ãƒ³ã¯VoIPã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã¨SIPã€IAX2ãƒ—ãƒãƒˆã‚³ãƒ«ã¨äº’æ›æ€§ãŒã‚ã‚Šã¾ã™"
+
+#: ../sflphone-client-gnome/src/uimanager.c:398
+msgid "About SFLphone"
+msgstr "SFLãƒ•ã‚©ãƒ³ã«é–¢ã—ã¦"
+
+#: ../sflphone-client-gnome/src/uimanager.c:800
+msgid "Call"
+msgstr "å‘¼ã³å‡ºã—"
+
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
+msgid "_New call"
+msgstr "é€šè©±å…ˆ"
+
+#: ../sflphone-client-gnome/src/uimanager.c:802
+msgid "Place a new call"
+msgstr "ç™ºä¿¡ã—ã¾ã™"
+
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Pick up"
+msgstr "é¸æŠž"
+
+#: ../sflphone-client-gnome/src/uimanager.c:804
+msgid "Answer the call"
+msgstr "å¿œç”ã™ã‚‹"
+
+#: ../sflphone-client-gnome/src/uimanager.c:806
+msgid "Finish the call"
+msgstr "é€šè©±çµ‚äº†"
+
+#: ../sflphone-client-gnome/src/uimanager.c:807
+msgid "O_n hold"
+msgstr "ä¿ç•™"
+
+#: ../sflphone-client-gnome/src/uimanager.c:808
+msgid "Place the call on hold"
+msgstr "ä¿ç•™ä¸"
+
+#: ../sflphone-client-gnome/src/uimanager.c:809
+msgid "O_ff hold"
+msgstr "ä¿ç•™è§£é™¤"
+
+#: ../sflphone-client-gnome/src/uimanager.c:810
+msgid "Place the call off hold"
+msgstr "ä¿ç•™ã‚’è§£é™¤ã™ã‚‹"
+
+#: ../sflphone-client-gnome/src/uimanager.c:811
+msgid "Configuration _Assistant"
+msgstr "æ§‹æˆã‚¢ã‚·ã‚¹ã‚¿ãƒ³ãƒˆ"
+
+#: ../sflphone-client-gnome/src/uimanager.c:812
+msgid "Run the configuration assistant"
+msgstr "æ§‹æˆã‚¢ã‚·ã‚¹ã‚¿ãƒ³ãƒˆã‚’èµ·å‹•ã—ã¾ã™"
+
+#: ../sflphone-client-gnome/src/uimanager.c:815
+msgid "Call your voicemail"
+msgstr "ãƒœã‚¤ã‚¹ãƒ¡ãƒ¼ãƒ«ã«é›»è©±ã‚’ã—ã¦ãã ã•ã„"
+
+#: ../sflphone-client-gnome/src/uimanager.c:816
+msgid "_Close"
+msgstr "é–‰ã˜ã‚‹(_C)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:817
+msgid "Minimize to system tray"
+msgstr "ã‚·ã‚¹ãƒ†ãƒ ãƒˆãƒ¬ã‚¤ã‚’æœ€å°åŒ–ã™ã‚‹"
+
+#: ../sflphone-client-gnome/src/uimanager.c:818
+msgid "_Quit"
+msgstr "çµ‚äº†(_Q)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:819
+msgid "Quit the program"
+msgstr "ãƒ—ãƒã‚°ãƒ©ãƒ ã®çµ‚äº†"
+
+#: ../sflphone-client-gnome/src/uimanager.c:822
+msgid "_Edit"
+msgstr "ç·¨é›†(_E)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:823
+msgid "_Copy"
+msgstr "ã‚³ãƒ”ãƒ¼(_C)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:824
+msgid "Copy the selection"
+msgstr "é¸æŠžç¯„å›²ã‚’ã‚³ãƒ”ãƒ¼"
+
+#: ../sflphone-client-gnome/src/uimanager.c:825
+msgid "_Paste"
+msgstr "è²¼ã‚Šä»˜ã‘(_P)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:826
+msgid "Paste the clipboard"
+msgstr "ã‚¯ãƒªãƒƒãƒ—ãƒœãƒ¼ãƒ‰ã«è²¼ã‚Šä»˜ã‘"
+
+#: ../sflphone-client-gnome/src/uimanager.c:827
+msgid "Clear _history"
+msgstr "å±¥æ´æ¶ˆåŽ»"
+
+#: ../sflphone-client-gnome/src/uimanager.c:828
+msgid "Clear the call history"
+msgstr "é€šè©±å±¥æ´æ¶ˆåŽ»"
+
+#: ../sflphone-client-gnome/src/uimanager.c:829
+msgid "_Accounts"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ(_A)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:829
+msgid "Edit your accounts"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆç·¨é›†"
+
+#: ../sflphone-client-gnome/src/uimanager.c:831
+msgid "_Preferences"
+msgstr "åŸºæœ¬è¨å®š"
+
+#: ../sflphone-client-gnome/src/uimanager.c:832
+msgid "Change your preferences"
+msgstr "åŸºæœ¬è¨å®šã®å¤‰æ›´"
+
+#: ../sflphone-client-gnome/src/uimanager.c:835
+msgid "_View"
+msgstr "è¡¨ç¤º(_V)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:838
+msgid "_Help"
+msgstr "ãƒ˜ãƒ«ãƒ—(_H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:839
+msgid "Contents"
+msgstr "ç›®æ¬¡"
+
+#: ../sflphone-client-gnome/src/uimanager.c:840
+msgid "Open the manual"
+msgstr "æ‰‹å‹•ã§é–‹ã"
+
+#: ../sflphone-client-gnome/src/uimanager.c:841
+msgid "About this application"
+msgstr "ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã«ã¤ã„ã¦"
+
+#: ../sflphone-client-gnome/src/uimanager.c:849
+msgid "_Transfer"
+msgstr "è»¢é€"
+
+#: ../sflphone-client-gnome/src/uimanager.c:850
+msgid "Transfer the call"
+msgstr "é€šè©±è»¢é€"
+
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "éŒ²éŸ³(_R)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr "ç¾åœ¨ã®ä¼šè©±ã‚’éŒ²éŸ³ä¸"
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
+msgid "_Show toolbar"
+msgstr "ãƒ„ãƒ¼ãƒ«ãƒãƒ¼ã®è¡¨ç¤º"
+
+#: ../sflphone-client-gnome/src/uimanager.c:854
+msgid "Show the toolbar"
+msgstr "ãƒ„ãƒ¼ãƒ«ãƒãƒ¼ã®è¡¨ç¤º"
+
+#: ../sflphone-client-gnome/src/uimanager.c:855
+msgid "_Dialpad"
+msgstr "ãƒ€ã‚¤ã‚¢ãƒ«ãƒ‘ãƒƒãƒ‰(_D)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:856
+msgid "Show the dialpad"
+msgstr "ãƒ€ã‚¤ãƒ¤ãƒ«ãƒ‘ãƒƒãƒ‰ã®è¡¨ç¤º"
+
+#: ../sflphone-client-gnome/src/uimanager.c:857
+msgid "_Volume controls"
+msgstr "ãƒœãƒªãƒ¥ãƒ¼ãƒ ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«"
+
+#: ../sflphone-client-gnome/src/uimanager.c:858
+msgid "Show the volume controls"
+msgstr "éŸ³é‡èª¿æ•´ã®è¡¨ç¤º"
+
+#: ../sflphone-client-gnome/src/uimanager.c:859
+msgid "_History"
+msgstr "å±¥æ´(_H)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:860
+msgid "Calls history"
+msgstr "é€šè©±å±¥æ´"
+
+#: ../sflphone-client-gnome/src/uimanager.c:861
+msgid "_Address book"
+msgstr "ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
+msgid "On _Hold"
+msgstr "ä¿ç•™ä¸"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1234
+msgid "_Call back"
+msgstr "æŠ˜ã‚Šè¿”ã—é›»è©±ã‚’ã™ã‚‹"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1390
+msgid "Edit phone number"
+msgstr "é›»è©±ç•ªå·ã®ç·¨é›†"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1402
+msgid "Edit the phone number before making a call"
+msgstr "é›»è©±ã‚’ã™ã‚‹å‰ã«é›»è©±ç•ªå·ã®ç·¨é›†ã‚’ã™ã‚‹"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
+msgid "Account Parameters"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ãƒ¼"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
+msgid "_Alias"
+msgstr "åˆ¥å(_A)"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
+msgid "_Protocol"
+msgstr "ãƒ—ãƒãƒˆã‚³ãƒ«"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
+msgid "Unknown"
+msgstr "ä¸æ˜Ž"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
+msgid "_Host name"
+msgstr "ãƒ›ã‚¹ãƒˆå"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
+msgid "_User name"
+msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼å"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
+msgid "_Password"
+msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰(_P):"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
+msgid "Show password"
+msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’è¡¨ç¤º"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
+msgid "_Voicemail number"
+msgstr "ãƒœã‚¤ã‚¹ãƒ¡ãƒ¼ãƒ«ã®ç•ªå·"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼å"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
+msgid "Authentication"
+msgstr "èªè¨¼"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
+msgid "Secret"
+msgstr "ã‚·ãƒ¼ã‚¯ãƒ¬ãƒƒãƒˆ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
+msgid "Credential"
+msgstr "è³‡æ ¼æƒ…å ±"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
+msgid "Authentication name"
+msgstr "åå‰ã®èªè¨¼"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
+msgid "Password"
+msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
+msgid "Security"
+msgstr "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
+msgid "Use TLS transport (sips)"
+msgstr "TLS ãƒˆãƒ©ãƒ³ã‚¹ãƒãƒ¼ãƒˆã‚’ä½¿ç”¨"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
+msgid "SRTP key exchange"
+msgstr "SRTP ã‚ãƒ¼äº¤æ›"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
+msgid "Disabled"
+msgstr "ç„¡åŠ¹"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
+msgid "Registration"
+msgstr "ç™»éŒ²"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
+msgid "Registration expire"
+msgstr "ç™»éŒ²æœŸé–“åˆ‡ã‚Œ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
+msgid "_Comply with RFC 3263"
+msgstr "RFC 3263ã«æº–æ‹ "
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
+msgid "Network Interface"
+msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
+msgid "Local address"
+msgstr "ãƒãƒ¼ã‚«ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
+msgid "Local port"
+msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒãƒ¼ãƒˆ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
+msgid "Published address"
+msgstr "ã‚¢ãƒ‰ãƒ¬ã‚¹å…¬é–‹"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
+msgid "Using STUN"
+msgstr "STUNä½¿ç”¨"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
+msgid "STUN server URL"
+msgstr "STUNã‚µãƒ¼ãƒãƒ¼ã®URL"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+msgid "Same as local parameters"
+msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã¨åŒæ§˜"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
+msgid "Set published address and port:"
+msgstr "å…¬é–‹ã‚¢ãƒ‰ãƒ¬ã‚¹ã¨ãƒãƒ¼ãƒˆã®è¨å®š"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
+msgid "Published port"
+msgstr "å…¬é–‹ãƒãƒ¼ãƒˆ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
+msgid "Account settings"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®è¨å®š"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
+msgid "Basic"
+msgstr "åŸºæœ¬è¨å®š"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "ã‚³ãƒ¼ãƒ‡ãƒƒã‚¯"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
+msgid "Advanced"
+msgstr "è©³ç´°è¨å®š"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+"<b>sip:remotepeer</b>.ã®ã‚ˆã†ãªsip URI ã‚’å…¥åŠ›ã—å˜ã«ãƒªãƒ¢ãƒ¼ãƒˆãƒ”ã‚¢ã«é”æˆã—ãŸã„æ™‚"
+"ã«ã“ã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒä½¿ç”¨å¯èƒ½\r\n"
+"ç€ä¿¡é€šè©±ã¾ãŸã¯ç™ºä¿¡é€šè©±ã‚’ç…§åˆã§ããªã„ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã‚ã‚Œã°è¨å®šã‚‚å¯èƒ½"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
+#, c-format
+msgid "Server returned \"%s\" (%d)"
+msgstr "ã‚µãƒ¼ãƒãƒ¼ãŒ\"%s\" (%d)ã‚’è¿”ã—ã¾ã—ãŸ"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
+msgid "Protocol"
+msgstr "ãƒ—ãƒãƒˆã‚³ãƒ«"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
+msgid "Status"
+msgstr "çŠ¶æ…‹"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
+msgid "Accounts"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
+msgid "Configured Accounts"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆè¨å®šæ¸ˆã¿"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] "%dã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
+msgid "You have no active account"
+msgstr "ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå˜åœ¨ã—ã¾ã›ã‚“"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
+msgid "General"
+msgstr "å…¨èˆ¬"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr "å±•é–‹ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ã®ä½¿ç”¨"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã®åˆ¶é™"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr "ã‚«ãƒ¼ãƒ‰"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr "å¯èƒ½ã§ã‚ã‚Œã°é€£çµ¡å…ˆã®å†™çœŸã‚’è¡¨ç¤º"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr "å±•é–‹ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ã®é …ç›®"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "å‹¤å‹™å…ˆ"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "è‡ªå®…"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "æºå¸¯"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr "å±•é–‹ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ä½¿ç”¨ã®é¸æŠž"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
+msgid "Name"
+msgstr "åå‰"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:75
+#, c-format
+msgid "This assistant is now finished."
+msgstr "ã‚¢ã‚·ã‚¹ã‚¿ãƒ³ãƒˆã¯ç¾åœ¨çµ‚äº†"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:77
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"ç™»éŒ²çŠ¶æ³ã®ç¢ºèªã¾ãŸã¯ã‚ªãƒ—ã‚·ãƒ§ãƒ³/ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚’å¤‰"
+"æ›´ã§ãã¾ã™"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:80
+msgid "Alias"
+msgstr "åˆ¥å"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:84
+msgid "Server"
+msgstr "ã‚µãƒ¼ãƒãƒ¼"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:88
+msgid "Username"
+msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼å"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:92
+msgid "Security: "
+msgstr "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ãƒ¼ "
+
+#: ../sflphone-client-gnome/src/config/assistant.c:94
+msgid "SRTP/ZRTP draft-zimmermann"
+msgstr "SRTP/ZRTPè‰ç¨¿"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:96
+msgid "None"
+msgstr "ãªã—"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:230
+msgid "SFLphone account creation wizard"
+msgstr "SFLãƒ•ã‚©ãƒ³ã‚¢ã‚«ã‚¦ãƒ³ãƒˆä½œæˆã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:256
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr "SFLãƒ•ã‚©ãƒ³ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆä½œæˆã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¸ã‚ˆã†ã“ã"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:257
+msgid "This installation wizard will help you configure an account."
+msgstr "ã“ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆä½œæˆã‚’åŠ©ã‘ã¾ã™"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:271
+msgid "VoIP Protocols"
+msgstr "VoIPãƒ—ãƒãƒˆã‚³ãƒ«"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:271
+msgid "Select an account type"
+msgstr "å‹˜å®šã‚¿ã‚¤ãƒ—ã®é¸æŠž"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:273
+msgid "SIP (Session Initiation Protocol)"
+msgstr "SIPï¼ˆã‚»ãƒƒã‚·ãƒ§ãƒ³é–‹å§‹ãƒ—ãƒãƒˆã‚³ãƒ«ï¼‰"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:275
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr "IAX2ï¼ˆã‚¢ã‚¹ã‚¿ãƒªã‚¹ã‚¯å¤‰æ›ï¼‰"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:289
+msgid "Account"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:289
+msgid "Please select one of the following options"
+msgstr "ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã«å¾“ã„ï¼‘ã¤é¸æŠžã—ã¦ãã ã•ã„"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:291
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr "ç„¡æ–™SIP/IAX2ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’sflãƒ•ã‚©ãƒ³çµ„ç¹”ã«ä½œæˆ"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:293
+msgid "Register an existing SIP or IAX2 account"
+msgstr "SIPã¾ãŸã¯ IAX2ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®å˜åœ¨ã‚’ç™»éŒ²"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+msgid "SIP account settings"
+msgstr "SIPã‚¢ã‚«ã‚¦ãƒ³ãƒˆè¨å®š"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
+msgid "Please fill the following information"
+msgstr "æƒ…å ±ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
+msgid "Secure communications with _ZRTP"
+msgstr "ZRTPã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ãƒ¼ã§ä¿è·ã•ã‚ŒãŸé€šä¿¡"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:390
+msgid "Optional email address"
+msgstr "ä»»æ„ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:390
+msgid "This email address will be used to send your voicemail messages."
+msgstr "ã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯ãƒœã‚¤ã‚¹ãƒ¡ãƒ¼ãƒ«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«é€ã‚‰ã‚Œã¾ã™"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:398
+msgid "_Email address"
+msgstr "Eãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:420
+msgid "IAX2 account settings"
+msgstr "IAX2ã‚¢ã‚«ã‚¦ãƒ³ãƒˆè¨å®š"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:497
+msgid "Network Address Translation (NAT)"
+msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¢ãƒ‰ãƒ¬ã‚¹å¤‰æ›(NAT)"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:497
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "ãƒ•ã‚¡ã‚¤ã‚¢ã‚¦ã‚©ãƒ¼ãƒ«ã®å†…å´ã§ã‚ã‚Œã°æŽ¥ç¶šã§ãã¾ã™"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:506
+msgid "E_nable STUN"
+msgstr "STUNæœ‰åŠ¹ï¼ˆEï¼‰"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:513
+msgid "_STUN server"
+msgstr "STUNã‚µãƒ¼ãƒãƒ¼"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:527
+msgid "Account Registration"
+msgstr "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆç™»éŒ²"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:527
+msgid "Congratulations!"
+msgstr "è¨å®šå®Œäº†"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
+msgid "Frequency"
+msgstr "å‘¨æ³¢æ•°"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
+msgid "Bitrate"
+msgstr "ãƒ“ãƒƒãƒˆãƒ¬ãƒ¼ãƒˆ"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
+msgid "Bandwidth"
+msgstr "å¸¯åŸŸå¹…"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
+msgid "ALSA plugin"
+msgstr "ALSAãƒ—ãƒ©ã‚°ã‚¤ãƒ³"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
+msgid "Output"
+msgstr "å‡ºåŠ›"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
+msgid "Input"
+msgstr "å…¥åŠ›"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
+msgid "_Voice Activity Detection"
+msgstr "ãƒœã‚¤ã‚¹ã‚¢ã‚¯ãƒ†ã‚£ãƒ“ãƒ†ã‚£æ¤œå‡º"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr "ãƒŽã‚¤ã‚ºé™¤åŽ»"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
+msgid "Sound Manager"
+msgstr "ã‚µã‚¦ãƒ³ãƒ‰ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
+msgid "_Pulseaudio"
+msgstr "ãƒ‘ãƒ«ã‚¹ã‚ªãƒ¼ãƒ‡ã‚£ã‚ª"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
+msgid "_ALSA"
+msgstr "ALSA"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
+msgid "ALSA settings"
+msgstr "ALSAè¨å®š"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Recordings"
+msgstr "éŒ²éŸ³"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
+msgid "Destination folder"
+msgstr "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆãƒ•ã‚©ãƒ«ãƒ€"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
+msgid "Select a folder"
+msgstr "ãƒ•ã‚©ãƒ«ãƒ€ã®é¸æŠž"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
+msgid "Ringtones"
+msgstr "ç€ä¿¡éŸ³"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
+msgid "_Enable ringtones"
+msgstr "ç€ä¿¡éŸ³å¯èƒ½"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
+msgid "Choose a ringtone"
+msgstr "ç€ä¿¡éŸ³é¸æŠž"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
+msgid "Audio Files"
+msgstr "éŸ³å£°ãƒ•ã‚¡ã‚¤ãƒ«"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr "URL å¼•æ•°"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr "URLç€ä¿¡å±¥æ´ãƒ¦ãƒ¼ã‚¶ãƒ¼è¨å®šã‚³ãƒžãƒ³ãƒ‰"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr "%sã¯URLã«ç½®ãæ›ãˆ"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr "ç‰¹å®šSIPãƒ˜ãƒƒãƒ€ãƒ¼ã®ãƒˆãƒªã‚¬"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr "IAX2 URLã®ãƒˆãƒªã‚¬"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr "å®Ÿè¡Œã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr "é›»è©±ç•ªå·æ›¸ãæ›ãˆ"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr "ãƒ—ãƒ¬ãƒ•ã‚£ãƒƒã‚¯ã‚¹ç•ªå·"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
+msgid "Desktop Notifications"
+msgstr "ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—é€šçŸ¥"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
+msgid "_Enable notifications"
+msgstr "é€šçŸ¥å¯èƒ½"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
+msgid "System Tray Icon"
+msgstr "ã‚·ã‚¹ãƒ†ãƒ ãƒˆãƒ¬ã‚¤ã‚¢ã‚¤ã‚³ãƒ³"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
+msgid "_Popup main window on incoming call"
+msgstr "ç€ä¿¡é€šè©±ã®ãƒãƒƒãƒ—ã‚¢ãƒƒãƒ—ãƒ¡ã‚¤ãƒ³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
+msgid "Ne_ver popup main window"
+msgstr "ãƒãƒƒãƒ—ã‚¢ãƒƒãƒ—ãƒ¡ã‚¤ãƒ³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦éžè¡¨ç¤º"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
+msgid "Hide SFLphone window on _startup"
+msgstr "èµ·å‹•SFLphoneã‚¦ã‚£ãƒ³ãƒ‰ã‚¦éžè¡¨ç¤º"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
+msgid "Calls History"
+msgstr "ç€ä¿¡å±¥æ´"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
+msgid "_Keep my history for at least"
+msgstr "æœ€å¾Œã®ç€ä¿¡å±¥æ´ã®ä¿è·"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+msgid "days"
+msgstr "æ›œæ—¥"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
+msgid "Preferences"
+msgstr "åŸºæœ¬è¨å®š"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
+msgid "Audio"
+msgstr "éŸ³å£°"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
+msgid "Address Book"
+msgstr "ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
+msgid "Hooks"
+msgstr "ãƒ•ãƒƒã‚¯"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
+msgid "Advanced options for TLS"
+msgstr "TLSã®è©³ç´°è¨å®šã‚ªãƒ—ã‚·ãƒ§ãƒ³"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
+msgid "TLS transport"
+msgstr "TLSè»¢é€"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
+msgid ""
+"TLS transport can be used along with UDP for those calls that would\n"
+"require secure sip transactions (aka SIPS). You can configure a different\n"
+"TLS transport for each account. However, each of them will run on a "
+"dedicated\n"
+"port, different one from each other\n"
+msgstr ""
+"é€šè©±ã¯ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ãƒ¼ã§ä¿è·ã•ã‚ŒãŸSIPãƒˆãƒ©ãƒ³ã‚¶ã‚¯ã‚·ãƒ§ãƒ³ã®è¦æ±‚ã«ã‚ˆã‚ŠTLSè»¢é€ã¯UDPã‚’"
+"ä½¿ç”¨ã§ãã¾ã™ã€‚\n"
+"ãã‚Œãžã‚Œã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§TLSè»¢é€ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚ãã†ã™ã‚‹ã¨ãã‚Œãžã‚Œå°‚ç”¨ãƒãƒ¼"
+"ãƒˆã€ç•°ãªã£ãŸã‚‚ã®ã«å®Ÿè¡Œã§ãã¾ã™ã€‚\n"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
+msgid "Certificate of Authority list"
+msgstr "jè¨¼æ˜Žæ©Ÿé–¢ã®ä¸€è¦§"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
+msgid "Choose a CA list file (optional)"
+msgstr "CAãƒªã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã®é¸æŠž"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
+msgid "Public endpoint certificate file"
+msgstr "å…¬å¼ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆè¨¼æ˜Žãƒ•ã‚¡ã‚¤ãƒ«"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
+msgid "Choose a public endpoint certificate (optional)"
+msgstr "å…¬å¼ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆè¨¼æ˜Žã®é¸æŠž"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
+msgid "Choose a private key file (optional)"
+msgstr "å€‹äººã‚ãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ã®é¸æŠž"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
+msgid "Password for the private key"
+msgstr "ãƒ—ãƒ©ã‚¤ãƒ™ãƒ¼ãƒˆã‚ãƒ¼ã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
+msgid "TLS protocol method"
+msgstr "TLSãƒ—ãƒãƒˆã‚³ãƒ«ãƒ¡ã‚½ãƒƒãƒ‰"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
+msgid "TLS cipher list"
+msgstr "TLSæš—å·ä¸€è¦§"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
+msgid "Server name instance for outgoing TLS connection"
+msgstr "TLSæŽ¥ç¶šç™ºä¿¡ã‚µãƒ¼ãƒãƒ¼åã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
+msgid "Negotiation timeout (sec:msec)"
+msgstr "ãƒã‚´ã‚·ã‚¨ãƒ¼ã‚·ãƒ§ãƒ³ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆ"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
+msgid "Verify incoming certificates, as a server"
+msgstr "ã‚µãƒ¼ãƒãƒ¼ã®è¨¼æ˜Žå—ä¿¡ã®ç¢ºèª"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
+msgid "Verify certificates from answer, as a client"
+msgstr "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆå¿œç”è¨¼æ˜Žã®ç¢ºèª"
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
+msgid "Require certificate for incoming tls connections"
+msgstr "å—ä¿¡tlsæŽ¥ç¶šã®ãŸã‚ã®è¨¼æ˜Žè¦æ±‚"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
+msgid "ZRTP Options"
+msgstr "ZRTPã‚ªãƒ—ã‚·ãƒ§ãƒ³"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
+msgid "Send Hello Hash in S_DP"
+msgstr "SDPã§ãƒãƒãƒ¼ãƒãƒƒã‚·ãƒ¥é€ä¿¡"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
+msgid "Ask User to Confirm SAS"
+msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¸SASç¢ºèª"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
+msgid "_Warn if ZRTP not supported"
+msgstr "ZRTPãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹è¦å‘Š"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
+msgid "Display SAS once for hold events"
+msgstr "ã‚¤ãƒ™ãƒ³ãƒˆç®¡ç†ã®ãŸã‚SASè¡¨ç¤º"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+#, fuzzy
+msgid "SDES Options"
+msgstr "ZRTPã‚ªãƒ—ã‚·ãƒ§ãƒ³"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
+msgid "Search all"
+msgstr "ã™ã¹ã¦æ¤œç´¢"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
+msgid "Click here to change the search type"
+msgstr "æ¤œç´¢ã®ç¨®é¡žã‚’å¤‰æ›´ã™ã‚‹ã«ã¯ã“ã“ã‚’ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
+msgid "Search by missed call"
+msgstr "ä¸åœ¨ç€ä¿¡ã®æ¤œç´¢"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
+msgid "Search by incoming call"
+msgstr "å—ä¿¡é€šè©±ã®æ¤œç´¢"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
+msgid "Search by outgoing call"
+msgstr "ç™ºä¿¡é€šè©±ã®æ¤œç´¢"
+
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>ã‚¨ãƒ©ãƒ¼ï¼šéŸ³å£°ã‚³ãƒ¼ãƒ‡ãƒƒã‚¯è¦‹å½“ãŸã‚Šã¾ã›ã‚“ã€‚\n"
+#~ "\n"
+#~ "</b>SFLéŸ³å£°ã‚³ãƒ¼ãƒ‡ãƒƒã‚¯ã¯ãƒ›ãƒ¼ãƒ ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼( <i>%s</i> )ã®<i>%s</i>ã‹<b>."
+#~ "sflphone</b>ã« ç½®ã„ã¦ãã ã•ã„ã€‚"
+
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "%iã‚¢ã‚«ã‚¦ãƒ³ãƒˆæ§‹æˆæ—¥"
+
+#~ msgid "Direct IP calls"
+#~ msgstr "ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆIPã‚³ãƒ¼ãƒ«"
+
+#~ msgid "IP call - %s"
+#~ msgstr "IP é›»è©± -%s"
+
+#~ msgid "Codec"
+#~ msgstr "ã‚³ãƒ¼ãƒ‡ãƒƒã‚¯"
diff --git a/lang/ko/ko.po b/lang/ko/ko.po
index c7ebb3c80fea05d48123044557c037e1a7ef3bb9..240e28e87a82c136e2653923fc0b593f866b5b0b 100644
--- a/lang/ko/ko.po
+++ b/lang/ko/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
 "PO-Revision-Date: 2009-10-26 20:46+0000\n"
 "Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -18,74 +18,85 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "ë“±ë¡í–ˆìŠµë‹ˆë‹¤"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/errors.c:29
@@ -109,65 +120,65 @@ msgid ""
 "Pulseaudio is not running"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr ""
 
@@ -236,445 +247,458 @@ msgstr ""
 msgid "Mic volume"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
+#: ../sflphone-client-gnome/src/statusicon.c:189
 #, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
+msgid "%i active account"
+msgid_plural "%i active accounts"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
 #, c-format
 msgid "Voicemail (%i)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+msgid "_User-agent"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
 #, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
 msgstr[0] ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr ""
 
@@ -719,7 +743,7 @@ msgid "Select which Evolution address books to use"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr ""
 
@@ -758,181 +782,177 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr ""
 
@@ -969,69 +989,62 @@ msgstr ""
 msgid "_Prefix dialed numbers with"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr ""
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr ""
@@ -1049,55 +1062,59 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -1121,6 +1138,14 @@ msgstr ""
 msgid "Display SAS once for hold events"
 msgstr ""
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr ""
diff --git a/lang/pl/pl.po b/lang/pl/pl.po
index 6d2a4515bef5e5fb3cb82c6f409335a53e3f7a4e..35a0d85ed08f798f5d85b6e9397406dfbc08533d 100644
--- a/lang/pl/pl.po
+++ b/lang/pl/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
 "PO-Revision-Date: 2009-11-04 12:08+0000\n"
 "Last-Translator: Mariusz Bednarz <mbednarz@bedmar.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -19,57 +19,61 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "Zarejestrowany"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "Nie zarejestrowany"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr "PrÃ³bujÄ™ ..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "Autoryzacja nie powiodÅ‚a siÄ™"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "SieÄ‡ niedostÄ™pna"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "Wybrany host jest niedostÄ™pny"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "Niepoprawny"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr "UÅ¼ywane konto"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr "Brak zarejestrowanych kont"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -77,18 +81,25 @@ msgstr ""
 "Nie moÅ¼na poÅ‚Ä…czyÄ‡ siÄ™ z serwerem SFLphone.\n"
 "Upewnij siÄ™, Å¼e zostaÅ‚ uruchomiony daemon SFLphone"
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/errors.c:29
@@ -118,65 +129,65 @@ msgstr ""
 "Informacja Pulseaudio\n"
 "Pulseaudio nie zostaÅ‚o uruchomione"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr ""
 
@@ -245,434 +256,449 @@ msgstr ""
 msgid "Mic volume"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] ""
-msgstr[1] ""
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "UÅ¼ywane konto"
+msgstr[1] "UÅ¼ywane konto"
+msgstr[2] "UÅ¼ywane konto"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
 #, c-format
 msgid "Voicemail (%i)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr "%d gÅ‚osowa wiadomoÅ›Ä‡"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr "Brak zarejestrowanych kont"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+msgid "_User-agent"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "SieÄ‡ niedostÄ™pna"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
 #, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
@@ -680,12 +706,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr ""
 
@@ -730,7 +756,7 @@ msgid "Select which Evolution address books to use"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr ""
 
@@ -769,181 +795,177 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr ""
 
@@ -980,69 +1002,62 @@ msgstr ""
 msgid "_Prefix dialed numbers with"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr ""
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr ""
@@ -1060,55 +1075,59 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -1132,6 +1151,14 @@ msgstr ""
 msgid "Display SAS once for hold events"
 msgstr ""
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr ""
diff --git a/lang/pt/pt.po b/lang/pt/pt.po
index ef406f9445d8e15fc11370bfebd328e752863004..c76af4cb49819c27a9489ccb0eff1a32ae745847 100644
--- a/lang/pt/pt.po
+++ b/lang/pt/pt.po
@@ -7,85 +7,96 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-10-26 20:46+0000\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2009-12-03 18:09+0000\n"
 "Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "Registado"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "NÃ£o Registado"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "Erro"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "AutenticaÃ§Ã£o Falhou"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "A rede estÃ¡ inacessÃvel"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "A mÃ¡quina estÃ¡ inacessÃvel"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "InvÃ¡lido"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/errors.c:29
@@ -109,65 +120,65 @@ msgid ""
 "Pulseaudio is not running"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr ""
 
@@ -236,445 +247,461 @@ msgstr ""
 msgid "Mic volume"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "_Desligar"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] ""
-msgstr[1] ""
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "Adicionar uma nova conta"
+msgstr[1] "Adicionar uma nova conta"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr "Correio de voz"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr "Livro de endereÃ§os"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "Livro de endereÃ§os"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
 msgid "Voicemail (%i)"
 msgstr "Correio de voz (%i)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr "_Chamar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "_Desligar"
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "_Gravar"
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr "_Editar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr "Remover a conta seleccionada"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr "HistÃ³rico de chamadas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr "HistÃ³rico de chamadas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr "_Contas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr "PreferÃªncias"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr "_Ver"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr "Transferir"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
 msgstr "Transferir"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "_Gravar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr "Marca_dor"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr "HistÃ³rico"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr "HistÃ³rico de chamadas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "Livro de endereÃ§os"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "_Nomear"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "_Protocolo"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "_Senha"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr "Senha"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "Utilizador"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "Senha"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "A rede estÃ¡ inacessÃvel"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr "ConfiguraÃ§Ãµes da conta"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr "BÃ¡sico"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr "AvanÃ§ado"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr "Rede"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "Estado"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
 #, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr "Geral"
 
@@ -719,7 +746,7 @@ msgid "Select which Evolution address books to use"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "Nome"
 
@@ -758,181 +785,177 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "Protocolos VoIP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr "Conta"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr "EndereÃ§o de email opcional"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "_Servidor STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "ParabÃ©ns!"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "FrequÃªncia"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "Taxa de Dados"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr "Largura de Banda"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr "SaÃda"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr "Entrada"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "_Pulseaudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "_ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "GravaÃ§Ãµes"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr "Pasta de destino"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr "Seleccione uma pasta"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr "Ficheiros Ãudio"
 
@@ -969,69 +992,62 @@ msgstr ""
 msgid "_Prefix dialed numbers with"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr "Ãcone de NotificaÃ§Ã£o"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr "HistÃ³rico de Chamadas"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr "dias"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr "PreferÃªncias"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr "Ãudio"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "Livro de EndereÃ§os"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr ""
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr ""
@@ -1049,55 +1065,59 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -1121,6 +1141,14 @@ msgstr ""
 msgid "Display SAS once for hold events"
 msgstr ""
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr ""
@@ -1144,15 +1172,6 @@ msgstr ""
 msgid "Search by outgoing call"
 msgstr ""
 
-#~ msgid "Codec"
-#~ msgstr "Codec"
-
-#~ msgid "Network"
-#~ msgstr "Rede"
-
-#~ msgid "SIP Port"
-#~ msgstr "Porta SIP"
-
 #~ msgid "Email address"
 #~ msgstr "EndereÃ§o de correiro electrÃ³nico"
 
@@ -1162,6 +1181,9 @@ msgstr ""
 #~ msgid "JÃ©rÃ©my Quentin"
 #~ msgstr "JÃ©rÃ©my Quentin"
 
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
 #~ msgid "Incoming call"
 #~ msgstr "Chamada recebida"
 
@@ -1177,9 +1199,6 @@ msgstr ""
 #~ msgid "Remove"
 #~ msgstr "Remover"
 
-#~ msgid "Add a new account"
-#~ msgstr "Adicionar uma nova conta"
-
 #~ msgid "Add"
 #~ msgstr "Adicionar"
 
@@ -1228,6 +1247,9 @@ msgstr ""
 #~ msgid "Work"
 #~ msgstr "Trabalho"
 
+#~ msgid "SIP Port"
+#~ msgstr "Porta SIP"
+
 #~ msgid "Advanced Settings"
 #~ msgstr "ConfiguraÃ§Ãµes AvanÃ§adas"
 
@@ -1240,10 +1262,11 @@ msgstr ""
 #~ ",Launchpad Contributions:,Maxime Chambreuil, ,Launchpad Contributions:,"
 #~ "Maxime Chambreuil,Tiago Silva, ,Launchpad Contributions:,Maxime "
 #~ "Chambreuil,Tiago Silva, ,Launchpad Contributions:,Maxime Chambreuil,Tiago "
-#~ "Silva"
+#~ "Silva, ,Launchpad Contributions:,Maxime Chambreuil,Tiago Silva"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
 #~ msgstr ""
 #~ ",,maxime.chambreuil@gmail.com,,,maxime.chambreuil@gmail.com,,,,maxime."
-#~ "chambreuil@gmail.com,,,,maxime.chambreuil@gmail.com,"
+#~ "chambreuil@gmail.com,,,,maxime.chambreuil@gmail.com,,,,maxime."
+#~ "chambreuil@gmail.com,"
diff --git a/lang/pt_BR/pt_BR.po b/lang/pt_BR/pt_BR.po
index 0a5429e6c0323561c75343ee5b5b977440bb1ae2..f2ce14eb7cfd2381eeb5edda81fe07f35a8ae1f5 100644
--- a/lang/pt_BR/pt_BR.po
+++ b/lang/pt_BR/pt_BR.po
@@ -7,68 +7,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-10-26 20:46+0000\n"
-"Last-Translator: kalib <kalibslack@gmail.com>\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2010-01-22 22:19+0000\n"
+"Last-Translator: Ricardo Martins <ricardo.macedo@yahoo.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "Registrado"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "NÃ£o Registrado"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr "Tentando..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "Erro"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "A autenticaÃ§Ã£o falhou"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "A rede estÃ¡ inacessÃvel"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "A mÃ¡quina estÃ¡ inacessÃvel"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr "Erro de configuraÃ§Ã£o no stun"
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr "Servidor stun invÃ¡lido"
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "InvÃ¡lido"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr "Utilizando conta"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr "Sem contas registradas"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -76,23 +80,26 @@ msgstr ""
 "Incapaz de conectar ao servidor SFLphone.\n"
 "Tenha certeza de que o daemon estÃ¡ rodando."
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr "LigaÃ§Ãµes IP diretas"
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
-"<b>Erro: NÃ£o foram encontrados codecs de Ã¡udio.\n"
-"\n"
-"</b> Os codecs de Ã¡udio do SFL tem de ser movidos para o diretÃ³rio <i>%s</i> "
-"ou para o diretÃ³rio <b>.sflphone</b> em seu home( <i>%s</i> )"
 
 #: ../sflphone-client-gnome/src/errors.c:29
 msgid ""
@@ -124,43 +131,43 @@ msgstr ""
 "\n"
 "Pulseaudio nÃ£o estÃ¡ rodando"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr "Existe uma ligaÃ§Ã£o em progresso"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr "Existem ligaÃ§Ãµes em progresso"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr "VocÃª ainda deseja sair?"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr "Erro no SFLphone"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr "ZRTP nÃ£o Ã© suportado pelo peer %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr "ComunicaÃ§Ã£o Segura IndisponÃvel"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr "Finalizar Chamada"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
@@ -169,11 +176,11 @@ msgstr ""
 "Um erro %s forÃ§ou a ligaÃ§Ã£o com %s a mudar para um modo nÃ£o encriptado.\n"
 "Motivo exato: %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr "NegociaÃ§Ã£o ZRTP falhou"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
@@ -182,11 +189,11 @@ msgstr ""
 "%s deseja finalizar a utilizaÃ§Ã£o de comunicaÃ§Ã£o segura. A confirmaÃ§Ã£o irÃ¡ "
 "retomar sem SRTP.\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr "Confirmar VÃ¡ Limpar"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -257,443 +264,465 @@ msgstr "Volume dos auto-falantes"
 msgid "Mic volume"
 msgstr "Volume do microfone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr "_Apresentar janela principal"
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "_Desligar"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] "%i conta configurada"
-msgstr[1] "%i contas configuradas"
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "conta ativa"
+msgstr[1] "conta ativa"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr "Correio de voz"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr "CatÃ¡logo de endereÃ§os"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "CatÃ¡logo de endereÃ§os"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
 msgid "Voicemail (%i)"
 msgstr "Correio de voz (%i)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone Ã© um cliente VoIP compatÃvel com os protocolos SIP e IAX2."
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr "Sobre o SFLphone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr "_Chamar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr "_Nova ligaÃ§Ã£o"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
-msgstr ""
+msgstr "Faz uma nova chamada"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr "_Atender"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "_Desligar"
+msgstr "Responder a chamada"
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
-msgstr ""
+msgstr "Terminar a chamada"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr "Em _Espera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
-msgstr ""
+msgstr "Colocar a chamada em espera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "_Gravar"
+msgstr "Encerrar a chamada em espera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr "Arquivo de ConfiguraÃ§Ã£o"
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr "Erro de configuraÃ§Ã£o no stun"
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr "%d mensagem de voz"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
-msgstr ""
+msgstr "_Fechar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
-msgstr ""
+msgstr "Minimizar para a bandeja do sistema"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
-msgstr "_Editar"
+msgstr "_Sair"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
-msgstr ""
+msgstr "Sair do programa"
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
-msgstr ""
+msgstr "_Copiar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr "Remover a conta selecionada"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
-msgstr ""
+msgstr "_Colar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
-msgstr ""
+msgstr "Colar o conteÃºdo da Ãrea de TransferÃªncia"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr "Limpar _histÃ³rico"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr "Limpar histÃ³rico"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr "_Contas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr "Conta atual"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr "PreferÃªncias"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
-msgstr ""
+msgstr "Altera as suas preferÃªncias"
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr "_Exibir"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr "Continuar"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
-msgstr ""
+msgstr "Abrir o manual"
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr "AutenticaÃ§Ã£o"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr "Transferir"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
-msgstr "Transfirir para: "
+msgstr "Transfirir para:"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "_Gravar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr "Gravar a conversaÃ§Ã£o atual"
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
-msgstr ""
+msgstr "_Exibir barra de ferramentas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
-msgstr ""
+msgstr "Mostra a barra de ferramentas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr "Desabilitado"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr "_Controle de Volumes"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr "Exibir controles de volume"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr "HistÃ³rico"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr "HistÃ³rico de chamadas"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "CatÃ¡logo de endereÃ§os"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr "Em _Espera"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr "_Ligar de volta"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr "Editar nÃºmero de telefone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr "Edite o nÃºmero de telefone antes de fazer uma ligaÃ§Ã£o"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr "ParÃ¢metros de conta"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "_Apelido"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "_Protocolo"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr "_Nome do host"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr "_Nome do usuÃ¡rio"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "_Senha"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr "Senha"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr "_Senha da caixa postal de voz"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "_Nome do usuÃ¡rio"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr "AutenticaÃ§Ã£o"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr "Segredo"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr "Credencial"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr "Nome de autenticaÃ§Ã£o"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "Senha"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr "SeguranÃ§a"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr "Use transporte TLS (sips)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr "Troca de chave SRTP"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr "Registro"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr "Registro expira"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr "_De acordo com RFC 3263"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "A rede estÃ¡ inacessÃvel"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr "EndereÃ§o local"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr "Porta local"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr "EndereÃ§o publicado"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
-msgstr "Utilizando STUN "
+msgstr "Utilizando STUN"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr "URL do servidor STUN"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr "Igual aos parÃ¢metros locais"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr "Indique endereÃ§o e portas publicadas"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr "Porta publicada"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr "ConfiguraÃ§Ãµes da conta"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr "BÃ¡sico"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr "AvanÃ§ado"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr "Rede"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+"Este perfil Ã© utilizado quando vocÃª deseja alcanÃ§ar um ponto remoto "
+"simplesmente digitando um URI sip como <b>sip:remotepeer</b>. As "
+"configuraÃ§Ãµes que vocÃª definir aqui tambÃ©m serÃ£o utilizadas se nenhuma conta "
+"puder ser combinada a uma chamada de entrada ou de saÃda."
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
+#, c-format
 msgid "Server returned \"%s\" (%d)"
-msgstr "Servidor retornou \""
+msgstr "O Servidor retornou \"%s\" (%d)"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "Estado"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr "Contas Configuradas"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
+#, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
-msgstr[0] " conta ativa"
-msgstr[1] " conta ativa"
+msgstr[0] "conta ativa"
+msgstr[1] "conta ativa"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr "VocÃª nÃ£o possui uma conta ativa"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr "Geral"
 
@@ -738,7 +767,7 @@ msgid "Select which Evolution address books to use"
 msgstr "Selecione qual catÃ¡logo de endereÃ§os do Evolution deseja utilizar"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "Nome"
 
@@ -779,184 +808,180 @@ msgstr "SRTP/ZRTP rascunho-zimmermann"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr "Assistente de criaÃ§Ã£o de contas do SFLphone"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr "Bem vindo ao assistente de criaÃ§Ã£o de contas do SFLphone!"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr "Este assistente de instalaÃ§Ã£o irÃ¡ lhe ajudar a configurar uma conta."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "Protocolos VoIP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr "Selecione um tipo de conta"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr "Conta"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr "Por favor, selecione uma das seguintes opÃ§Ãµes"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr "Criar uma conta gratuita SIP/IAX2 em sflphone.org"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr "Registrar uma conta SIP ou IAX2 existente"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr "ConfiguraÃ§Ãµes de conta SIP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr "Por favor, preencha as informaÃ§Ãµes a seguir"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr "ComunicaÃ§Ãµes seguras com _ZRTP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr "EndereÃ§o de e-mail opcional"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr ""
 "Este endereÃ§o de email serÃ¡ utilizado para enviar as mensagens de voz em sua "
 "caixa postal."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr "_endereÃ§o de email"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr "ConfiguraÃ§Ãµes de conta IAX2"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 "VocÃª provavelmente precise habilitar isto se estiver por trÃ¡s de um firewall."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr "Ha_bilitar STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "_Servidor STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr "Registro de conta"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "ParabÃ©ns!"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "FrequÃªncia"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "Taxa de bits"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr "Largura de banda"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr "Plugin ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr "SaÃda"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr "Entrada"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr "_DetecÃ§Ã£o de atividade de voz"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr "_ReduÃ§Ã£o de ruÃdo (UtilizaÃ§Ã£o de banda-estreita)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr "Gerenciador de Som"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "_Pulseaudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "_ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr "ConfiguraÃ§Ãµes do ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "GravaÃ§Ãµes"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr "Pasta de destino"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr "Selecione uma pasta"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr "Ringtones"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr "_Habilitar ringtones"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr "Escolha um ringtone"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr "Arquivos de Ãudio"
 
@@ -993,73 +1018,62 @@ msgstr "Reescrevendo nÃºmero do telefone"
 msgid "_Prefix dialed numbers with"
 msgstr "_Prefixo de nÃºmeros discados com"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-"Este perfil Ã© utilizado quando vocÃª deseja alcanÃ§ar um ponto remoto "
-"simplesmente digitando um URI sip como <b>sip:remotepeer</b>. As "
-"configuraÃ§Ãµes que vocÃª definir aqui tambÃ©m serÃ£o utilizadas se nenhuma conta "
-"puder ser combinada a uma chamada de entrada ou de saÃda."
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr "NotificaÃ§Ãµes de Desktop"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr "_Habilitar notificaÃ§Ãµes"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr "Ãcone da bandeja do sistema"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr "_Popup na janela principal ao receber ligaÃ§Ã£o"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr "Nu_nca apresentar popup na janela principal"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr "Esconder o SFLphone na _inicializaÃ§Ã£o"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr "HistÃ³rico de Chamadas"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr "_Manter meu histÃ³rico por pelo ao menos"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr "dias"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr "PreferÃªncias"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr "Ãudio"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "CatÃ¡logo de endereÃ§os"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr "Ganchos"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr "LigaÃ§Ãµes IP diretas"
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr "OpÃ§Ãµes avanÃ§adas para o TLS"
@@ -1083,55 +1097,59 @@ msgstr ""
 "funcionar em uma\n"
 "porta dedicada, uma diferente da outra\n"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr "Certificado da lista de Autoridades"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr "Escolha um arquivo de lista CA (opcional)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr "Arquivo certificado endpoint pÃºblico"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Escolha um certificado endpoint pÃºblico (opcional)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr "Escolha um arquivo de chave privada (opcional)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr "Senha para a chave privada"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr "MÃ©todo do protocolo TLS"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr "Lista de cifras TLS"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr "InstÃ¢ncia de nome do servidor para saÃda da conexÃ£o TLS"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr "Tempo de negociaÃ§Ã£o expirado (seg:mseg)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr "Verificar os certificados de entrada, como um servidor"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr "Verificar certificados de resposta, como um cliente"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr "Requer certificado para conexÃµes tls entrantes"
 
@@ -1155,6 +1173,15 @@ msgstr "_Alerta se o ZRTP nÃ£o Ã© suportado"
 msgid "Display SAS once for hold events"
 msgstr "Apresenta o SAS uma vez para realizar eventos"
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+#, fuzzy
+msgid "SDES Options"
+msgstr "OpÃ§Ãµes ZRTP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr "Buscar todos"
@@ -1178,48 +1205,31 @@ msgstr "Buscar por ligaÃ§Ãµes recebidas"
 msgid "Search by outgoing call"
 msgstr "Buscar por ligaÃ§Ãµes feitas"
 
-#~ msgid "IP call - %s"
-#~ msgstr "LigaÃ§Ã£o IP - %s"
-
-#~ msgid "Codec"
-#~ msgstr "Codec"
-
-#~ msgid "Network"
-#~ msgstr "Rede"
-
-#~ msgid "Manually"
-#~ msgstr "Manualmente"
-
-#~ msgid "There "
-#~ msgstr "Ali "
-
-#~ msgid "is "
-#~ msgstr "estÃ¡ "
-
-#~ msgid "are "
-#~ msgstr "estÃ£o "
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "_Mute other applications during a call"
-#~ msgstr "_Silenciar outras aplicaÃ§Ãµes durante uma ligaÃ§Ã£o"
-
-#~ msgid "SIP Port"
-#~ msgstr "Porta SIP"
-
-#~ msgid "UDP Transport"
-#~ msgstr "Transporte UDP"
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>Erro: NÃ£o foram encontrados codecs de Ã¡udio.\n"
+#~ "\n"
+#~ "</b> Os codecs de Ã¡udio do SFL tem de ser movidos para o diretÃ³rio <i>%s</"
+#~ "i> ou para o diretÃ³rio <b>.sflphone</b> em seu home( <i>%s</i> )"
 
-#~ msgid "Enable voicemail _notifications"
-#~ msgstr "Habilitar _notificaÃ§Ãµes de correio de voz"
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "%i conta configurada"
+#~ msgstr[1] "%i contas configuradas"
 
-#~ msgid "Store SIP credentials as MD5 hash"
-#~ msgstr "Armazenar as credenciais SIP como hash MD5"
+#~ msgid "Direct IP calls"
+#~ msgstr "LigaÃ§Ãµes IP diretas"
 
 #~ msgid "Stun Server"
 #~ msgstr "Servidor STUN"
 
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
 #~ msgid "(C) 2009 Savoir-faire Linux"
 #~ msgstr "(C) 2009 Savoir-faire Linux"
 
@@ -1274,6 +1284,9 @@ msgstr "Buscar por ligaÃ§Ãµes feitas"
 #~ msgid "Enable notifications"
 #~ msgstr "Habilitar notificaÃ§Ãµes"
 
+#~ msgid "SIP Port"
+#~ msgstr "Porta SIP"
+
 #~ msgid "NAT Traversal"
 #~ msgstr "NAT Traversal"
 
@@ -1458,6 +1471,9 @@ msgstr "Buscar por ligaÃ§Ãµes feitas"
 #~ msgid "Prefix dialed numbers with"
 #~ msgstr "NÃºmeros discado com o prefixo"
 
+#~ msgid "IP call - %s"
+#~ msgstr "LigaÃ§Ã£o IP - %s"
+
 #~ msgid "_Account creation wizard"
 #~ msgstr "_Assistante de criaÃ§Ã£o de conta"
 
@@ -1482,19 +1498,50 @@ msgstr "Buscar por ligaÃ§Ãµes feitas"
 #~ "Pressionando \"aplicar\" a camada de rede serÃ¡ reiniciada. De outra forma "
 #~ "o SFKPhone teria que ser reiniciado."
 
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Habilitar _notificaÃ§Ãµes de correio de voz"
+
 #~ msgid "PulseAudio sound server"
 #~ msgstr "Servidor de som PulseAudio"
 
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "_Silenciar outras aplicaÃ§Ãµes durante uma ligaÃ§Ã£o"
+
+#~ msgid "Manually"
+#~ msgstr "Manualmente"
+
+#~ msgid "There "
+#~ msgstr "Ali "
+
+#~ msgid "are "
+#~ msgstr "estÃ£o "
+
+#~ msgid "is "
+#~ msgstr "estÃ¡ "
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Transporte UDP"
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Armazenar as credenciais SIP como hash MD5"
+
 #~ msgctxt "NAME OF TRANSLATORS"
 #~ msgid "Your names"
 #~ msgstr ""
 #~ ",Launchpad Contributions:,Maxime Chambreuil,kalib, ,Launchpad "
 #~ "Contributions:,Maxime Chambreuil,kalib, ,Launchpad Contributions:,Maxime "
-#~ "Chambreuil,kalib, ,Launchpad Contributions:,Maxime Chambreuil,kalib"
+#~ "Chambreuil,kalib, ,Launchpad Contributions:,Maxime Chambreuil,kalib, ,"
+#~ "Launchpad Contributions:,AndrÃ© Gondim,Maxime Chambreuil,Ricardo Martins,"
+#~ "kalib"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
 #~ msgstr ""
 #~ ",,maxime.chambreuil@gmail.com,kalibslack@gmail.com,,,maxime."
 #~ "chambreuil@gmail.com,kalibslack@gmail.com,,,maxime.chambreuil@gmail.com,"
-#~ "kalibslack@gmail.com,,,maxime.chambreuil@gmail.com,kalibslack@gmail.com"
+#~ "kalibslack@gmail.com,,,maxime.chambreuil@gmail.com,kalibslack@gmail.com,,,"
+#~ "andregondim@ubuntu.com,maxime.chambreuil@gmail.com,ricardo.macedo@yahoo."
+#~ "com.br,kalibslack@gmail.com"
diff --git a/lang/ru/ru.po b/lang/ru/ru.po
index 14b3aa5dd8b52a0d5e0d4baafc1ee6278b5fe18f..fb4c0f42bfd11b97773fd704b87e6ee5dbc3c74c 100644
--- a/lang/ru/ru.po
+++ b/lang/ru/ru.po
@@ -7,92 +7,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-12-08 20:46+0000\n"
-"Last-Translator: Hussein Abdallah <hussein.abdallah@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2010-02-12 23:19+0000\n"
+"Last-Translator: Lortonix <Unknown>\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"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: \n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "Ð—Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "ÐÐµ Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
-msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ..."
+msgstr "ÐŸÑ‹Ñ‚Ð°ÑŽÑÑŒ..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð½Ðµ ÑƒÐ´Ð°Ð»Ð°ÑÑŒ"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "Ð¡ÐµÑ‚ÑŒ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð°"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
-msgstr "Ð£Ð·ÐµÐ» ÑÐµÑ‚Ð¸ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½"
+msgstr "Ð£Ð·ÐµÐ» Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ Stun"
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€ Stun"
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
+msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
-msgstr "ÐÐµÑ‚ Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… ÑƒÑ‡Ã«Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹"
+msgstr "Ð£ Ð²Ð°Ñ Ð½ÐµÑ‚ Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
 msgstr ""
 "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº SFLphone-ÑÐµÑ€Ð²ÐµÑ€Ñƒ.\n"
-"ÐŸÑ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ ÐµÑÐ»Ð¸ Ð´ÐµÐ¼Ð¾Ð½ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚."
+"Ð£Ð±ÐµÐ´Ð¸Ñ‚ÐµÑÑŒ Ñ‡Ñ‚Ð¾ Ð¾Ð½ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚."
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr "ÐŸÑ€ÑÐ¼Ñ‹Ðµ IP-Ð·Ð²Ð¾Ð½ÐºÐ¸"
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
-"<b>ÐžÑˆÐ¸Ð±ÐºÐ°: Ð·Ð²ÑƒÐºÐ¾Ð²Ñ‹Ðµ ÐºÐ¾Ð´ÐµÐºÐ¸ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹.\n"
-"\n"
-"</b> Ð—Ð²ÑƒÐºÐ¾Ð²Ñ‹Ðµ ÐºÐ¾Ð´ÐµÐºÐ¸ SFL Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑŒÑÑ Ð² <i>%s</i> Ð¸Ð»Ð¸ Ð² <b>.sflphone</"
-"b> ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ðµ Ð² Ð²Ð°ÑˆÐµÐ¼ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¼ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ðµ( <i>%s</i> )"
 
 #: ../sflphone-client-gnome/src/errors.c:29
 msgid ""
@@ -100,9 +108,9 @@ msgid ""
 "\n"
 "Error while opening playback device"
 msgstr ""
-"<b>ALSA-nÐ¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ</b>\n"
+"<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ ALSA</b>\n"
 "\n"
-"ÐžÑˆÐ¸Ð±ÐºÐ° Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð¿Ñ€Ð¾Ð¸Ð³Ñ€Ñ‹Ð²Ð°Ð½Ð¸Ñ"
+"ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐµ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð²Ð¾ÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð²ÑƒÐºÐ°"
 
 #: ../sflphone-client-gnome/src/errors.c:32
 msgid ""
@@ -110,9 +118,9 @@ msgid ""
 "\n"
 "Error while opening capture device"
 msgstr ""
-"<b>ALSA-nÐ¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ</b>\n"
+"<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ ALSA</b>\n"
 "\n"
-"ÐžÑˆÐ¸Ð±ÐºÐ° Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð²Ñ…Ð¾Ð´Ð°"
+"ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐµ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð·Ð°Ñ…Ð²Ð°Ñ‚Ð° Ð·Ð²ÑƒÐºÐ°"
 
 #: ../sflphone-client-gnome/src/errors.c:35
 msgid ""
@@ -122,71 +130,72 @@ msgid ""
 msgstr ""
 "<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Pulseaudio</b>\n"
 "\n"
-"Pulseaudio Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚"
+"Pulseaudio Ð½Ðµ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
-msgstr "ÐžÐ´Ð¸Ð½ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€."
+msgstr "Ð—Ð²Ð¾Ð½Ð¾Ðº ÐµÑ‰Ñ‘ Ð½Ðµ Ð¾ÐºÐ¾Ð½Ñ‡ÐµÐ½."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
-msgstr "ÐÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ… Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ð²."
+msgstr "ÐÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð·Ð²Ð¾Ð½ÐºÐ¾Ð² ÐµÑ‰Ñ‘ Ð½Ðµ Ð¾ÐºÐ¾Ð½Ñ‡ÐµÐ½Ñ‹."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr "Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ð½Ñ‹ Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð²Ñ‹Ð¹Ñ‚Ð¸?"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° SFLphone."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr "ZRTP Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ÑÑ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾Ð¼ %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
-msgstr "Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ÑÐ²ÑÐ·ÑŒ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð°"
+msgstr "Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ÑÐ²ÑÐ·ÑŒ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð°."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
-msgstr "Ð—Ð°ÐºÐ¾Ð½Ñ‡Ð¸Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ Ð²Ñ‹Ð·Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
-"Ð˜Ð·-Ð·Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ¸ %s Ð¿ÐµÑ€ÐµÐ³Ð¾Ð²Ð¾Ñ€ Ñ %s Ð¿ÐµÑ€ÐµÐ¹Ð´Ã«Ñ‚ Ð² Ð½Ðµ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼.\n"
+"Ð˜Ð·-Ð·Ð° Ð²Ð¾Ð·Ð½Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¸ %s Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€ Ñ %s Ð¿ÐµÑ€ÐµÐ¹Ð´Ã«Ñ‚ Ð² Ð½Ðµ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ "
+"Ñ€ÐµÐ¶Ð¸Ð¼.\n"
 "Ð¢Ð¾Ñ‡Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°: %s\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr "ÐÐµÑƒÐ´Ð°Ñ‡Ð½Ñ‹Ð¹ Ð¾Ð±Ð¼ÐµÐ½ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ ZRTP"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
-"%s Ñ…Ð¾Ñ‡ÐµÑ‚ Ð¾ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½ÑƒÑŽ ÑÐ²ÑÐ·ÑŒ. Ð’ ÑÐ»ÑƒÑ‡Ð°Ðµ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ³Ð¾Ð²Ð¾Ñ€ "
-"Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑÑ Ð±ÐµÐ· SRTP.\n"
+"%s Ñ…Ð¾Ñ‡ÐµÑ‚ Ð¾Ñ‚ÐºÐ°Ð·Ð°Ñ‚ÑŒÑÑ Ð¾Ñ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ð¹ ÑÐ²ÑÐ·Ð¸. Ð’ ÑÐ»ÑƒÑ‡Ð°Ðµ "
+"Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑÑ Ð±ÐµÐ· SRTP.\n"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´ Ð½Ð° Ð½ÐµÐ·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½ÑƒÑŽ ÑÐ²ÑÐ·ÑŒ"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÑŒ"
 
@@ -212,19 +221,19 @@ msgstr[2] "%d Ð³Ð¾Ð»Ð¾ÑÐ¾Ð²Ñ‹Ðµ Ð¿Ð¸ÑÑŒÐ¼Ð°"
 #: ../sflphone-client-gnome/src/sflnotify.c:111
 #, c-format
 msgid "Calling with %s account <i>%s</i>"
-msgstr "Ð—Ð²Ð¾Ð½Ð¾Ðº Ñ ÑƒÑ‡Ã«Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÑŒÑŽ %s <i>%s</i>"
+msgstr "Ð’Ñ‹Ð·Ð¾Ð² %s Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° <i>%s</i>"
 
 #: ../sflphone-client-gnome/src/sflnotify.c:115
 msgid "Current account"
-msgstr "ÐÑ‹Ð½ÐµÑˆÐ½ÑÑ ÑƒÑ‡Ã«Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+msgstr "Ð¢ÐµÐºÑƒÑ‰Ð¸Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
 
 #: ../sflphone-client-gnome/src/sflnotify.c:130
 msgid "You have no accounts set up"
-msgstr "Ð’Ñ‹ Ð½Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ð»Ð¸ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð¹ ÑƒÑ‡Ã«Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+msgstr "Ð£ Ð²Ð°Ñ Ð½ÐµÑ‚ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ñ‹Ñ… Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð²"
 
 #: ../sflphone-client-gnome/src/sflnotify.c:147
 msgid "You have no registered accounts"
-msgstr "Ð£ Ð²Ð°Ñ Ð½ÐµÑ‚ Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… ÑƒÑ‡Ã«Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹"
+msgstr "Ð£ Ð²Ð°Ñ Ð½ÐµÑ‚ Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð²"
 
 #: ../sflphone-client-gnome/src/sflnotify.c:190
 #, c-format
@@ -232,7 +241,7 @@ msgid ""
 "<i>With:</i> %s \n"
 "using %s"
 msgstr ""
-"<i>Ñ</i> %s\n"
+"<i>Ñ:</i> %s\n"
 "Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ %s"
 
 #: ../sflphone-client-gnome/src/sflnotify.c:205
@@ -256,447 +265,469 @@ msgstr "Ð“Ñ€Ð¾Ð¼ÐºÐ¾ÑÑ‚ÑŒ"
 
 #: ../sflphone-client-gnome/src/sliders.c:164
 msgid "Mic volume"
-msgstr "Ð“Ñ€Ð¾Ð¼ÐºÐ¾ÑÑ‚ÑŒ Ð¼Ð¸ÐºÑ€Ð¾Ñ„Ð¾Ð½Ð°"
+msgstr "Ð§ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ Ð¼Ð¸ÐºÑ€Ð¾Ñ„Ð¾Ð½Ð°"
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr "_ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð³Ð»Ð°Ð²Ð½Ð¾Ðµ Ð¾ÐºÐ½Ð¾"
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "_ÐŸÐ¾Ð»Ð¾Ð¶Ð¸Ñ‚ÑŒ Ñ‚Ñ€ÑƒÐ±ÐºÑƒ"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] "ÐÐ°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð° Ð¾Ð´Ð½Ð° ÑƒÑ‡Ã«Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
-msgstr[1] "ÐÐ°ÑÑ‚Ñ€Ð¾ÐµÐ½Ñ‹ %i ÑƒÑ‡Ã«Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
-msgstr[2] "ÐÐ°ÑÑ‚Ñ€Ð¾ÐµÐ½Ñ‹ %i ÑƒÑ‡Ã«Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "%d Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
+msgstr[1] "%d Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ñ… Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð²"
+msgstr[2] "Ð´ÐµÐ¹ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
-msgstr "ÐÐ²Ñ‚Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ‡Ð¸Ðº"
+msgstr "Ð“Ð¾Ð»Ð¾ÑÐ¾Ð²Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð°"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
-msgstr "ÐÐµÑ‚ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… Ð°Ð´Ñ€ÐµÑÐ½Ñ‹Ñ… ÐºÐ½Ð¸Ð³"
+msgstr "ÐÐ´Ñ€ÐµÑÐ½Ð°Ñ ÐºÐ½Ð¸Ð³Ð° Ð½Ðµ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð°"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "ÐÐ´Ñ€ÐµÑÐ½Ð°Ñ ÐºÐ½Ð¸Ð³Ð°"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
 msgid "Voicemail (%i)"
-msgstr "ÐÐ²Ñ‚Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ‡Ð¸Ðº (%i)"
+msgstr "Ð“Ð¾Ð»Ð¾ÑÐ¾Ð²Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð° (%i)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone - SIP Ð¸ IAX2-ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ñ‹Ð¹ VoIP-ÐºÐ»Ð¸ÐµÐ½Ñ‚"
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
-msgstr "Ðž SFLphone"
+msgstr "Ðž Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ SFLphone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
-msgstr "_Ð—Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "_Ð’Ñ‹Ð·Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
-msgstr "_ÐÐ¾Ð²Ñ‹Ð¹ Ð·Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "_ÐÐ¾Ð²Ñ‹Ð¹ Ð²Ñ‹Ð·Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
-msgstr "ÐŸÐ¾Ð·Ð²Ð¾Ð½Ð¸Ñ‚ÑŒ"
+msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ð¹ Ð²Ñ‹Ð·Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr "_Ð’Ð·ÑÑ‚ÑŒ Ñ‚Ñ€ÑƒÐ±ÐºÑƒ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
-msgstr "ÐžÑ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ"
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "_ÐŸÐ¾Ð»Ð¾Ð¶Ð¸Ñ‚ÑŒ Ñ‚Ñ€ÑƒÐ±ÐºÑƒ"
+msgstr "ÐžÑ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ Ð½Ð° Ð²Ñ‹Ð·Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
-msgstr "Ð—Ð°ÐºÐ¾Ð½Ñ‡Ð¸Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ Ð²Ñ‹Ð·Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
-msgstr "_Ð£Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "_Ð£Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð·Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
-msgstr "Ð£Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð·Ð¾Ð² Ð½Ð° ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ðµ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
-msgstr "_Ð’Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€"
+msgstr "_Ð¡Ð½ÑÑ‚ÑŒ Ð²Ñ‹Ð·Ð¾Ð² Ñ ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
-msgstr "Ð’Ð¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€"
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "Ð—Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ"
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr "Ð—Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÐ³Ð¾Ð²Ð¾Ñ€"
+msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð·Ð¾Ð² Ð½Ð° ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ðµ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr "ÐœÐ°ÑÑ‚ÐµÑ€ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr "Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Ð¼Ð°ÑÑ‚ÐµÑ€ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
-msgstr "%d Ð³Ð¾Ð»Ð¾ÑÐ¾Ð²Ð¾Ðµ Ð¿Ð¸ÑÑŒÐ¼Ð¾"
+msgstr "ÐŸÑ€Ð¾ÑÐ»ÑƒÑˆÐ¸Ð²Ð°Ð½Ð¸Ðµ Ð³Ð¾Ð»Ð¾ÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr "_Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
-msgstr "Ð£Ð¼ÐµÐ½ÑŒÑˆÐ¸Ñ‚ÑŒ Ð² Ð·Ð½Ð°Ñ‡Ð¾Ðº"
+msgstr "Ð¡Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ð² Ñ‚Ñ€ÐµÐ¹"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
-msgstr "_ÐŸÑ€Ð°Ð²ÐºÐ°"
+msgstr "Ð’_Ñ‹Ñ…Ð¾Ð´"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr "Ð’Ñ‹Ð¹Ñ‚Ð¸ Ð¸Ð· Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr "_ÐŸÑ€Ð°Ð²ÐºÐ°"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr "_ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
-msgstr "ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ð¸Ð´Ð¸Ð¼Ð¾Ðµ"
+msgstr "ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
-msgstr "_Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ"
+msgstr "Ð’_ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr "Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸Ð· Ð±ÑƒÑ„ÐµÑ€Ð° Ð¾Ð±Ð¼ÐµÐ½Ð°"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
-msgstr "_Ð¡Ñ‚ÐµÑ€ÐµÑ‚ÑŒ Ð¶ÑƒÑ€Ð½Ð°Ð»"
+msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ Ð¶ÑƒÑ€Ð½Ð°Ð»"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
-msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ Ð¸ÑÑ‚Ð¾Ñ€Ð¸ÑŽ"
+msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ Ð¶ÑƒÑ€Ð½Ð°Ð» Ð²Ñ‹Ð·Ð¾Ð²Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
-msgstr "_Ð£Ñ‡Ã«Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+msgstr "_ÐÐºÐºÐ°ÑƒÐ½Ñ‚Ñ‹"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð²Ð°ÑˆÐ¸ ÑƒÑ‡Ã«Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+msgstr "ÐÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
-msgstr "_ÐŸÑ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
+msgstr "_ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð²Ð°ÑˆÐ¸ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ð¸"
+msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð²Ð°ÑˆÐ¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr "_Ð’Ð¸Ð´"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "_ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
-msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ"
+msgstr "Ð¡Ð¾Ð´ÐµÑ€Ð¶Ð°Ð½Ð¸Ðµ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
-msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ ÑÐ¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½Ð¸Ðº "
+msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
-msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ"
+msgstr "Ðž Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
-msgstr "ÐŸÐµÑ€ÐµÑÐ»Ð°Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº Ð½Ð° Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð½Ð¾Ð¼ÐµÑ€"
+msgstr "ÐŸÐµÑ€ÐµÐ°Ð´Ñ€ÐµÑÐ°Ñ†Ð¸Ñ Ð²Ñ‹Ð·Ð¾Ð²Ð°"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
-msgstr "ÐŸÐµÑ€ÐµÑÐ»Ð°Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº Ð½Ð° Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð½Ð¾Ð¼ÐµÑ€"
+msgstr "ÐŸÐµÑ€ÐµÐ°Ð´Ñ€ÐµÑÐ¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð·Ð¾Ð²"
+
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "_Ð—Ð°Ð¿Ð¸ÑÑŒ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr "Ð—Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€"
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð°Ð½ÐµÐ»ÑŒ Ð¸Ð½ÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð²"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ _Ð¿Ð°Ð½ÐµÐ»ÑŒ Ð¸Ð½ÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð°Ð½ÐµÐ»ÑŒ Ð¸Ð½ÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð²"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¿Ð°Ð½ÐµÐ»ÑŒ Ð¸Ð½ÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
-msgstr "ÐŸÐ°Ð½ÐµÐ»ÑŒ Ð½Ð°Ð±Ð¾Ñ€Ð° Ð½Ð¾Ð¼ÐµÑ€Ð°"
+msgstr "_ÐÐ¾Ð¼ÐµÑ€Ð¾Ð½Ð°Ð±Ð¸Ñ€Ð°Ñ‚ÐµÐ»ÑŒ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð°Ð½ÐµÐ»ÑŒ Ð½Ð°Ð±Ð¾Ñ€Ð° Ð½Ð¾Ð¼ÐµÑ€Ð°"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ _Ð½Ð¾Ð¼ÐµÑ€Ð¾Ð½Ð°Ð±Ð¸Ñ€Ð°Ñ‚ÐµÐ»ÑŒ"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
-msgstr "_ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð³Ñ€Ð¾Ð¼ÐºÐ¾ÑÑ‚Ð¸"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ _Ð³Ñ€Ð¾Ð¼ÐºÐ¾ÑÑ‚Ð¸"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
-msgstr "_ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð³Ñ€Ð¾Ð¼ÐºÐ¾ÑÑ‚Ð¸"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ _Ð³Ñ€Ð¾Ð¼ÐºÐ¾ÑÑ‚Ð¸"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
-msgstr "Ð–ÑƒÑ€Ð½Ð°Ð»"
+msgstr "Ð–ÑƒÑ€Ð½Ð°Ð» Ð²Ñ‹Ð·Ð¾Ð²Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
-msgstr "Ð–ÑƒÑ€Ð½Ð°Ð» Ð·Ð²Ð¾Ð½ÐºÐ¾Ð²"
+msgstr "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ Ð²Ñ‹Ð·Ð¾Ð²Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "ÐÐ´Ñ€ÐµÑÐ½Ð°Ñ ÐºÐ½Ð¸Ð³Ð°"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
-msgstr "_Ð£Ð´ÐµÑ€Ð¶Ð°Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "_Ð£Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
-msgstr "_ÐŸÐµÑ€ÐµÐ·Ð²Ð¾Ð½Ð¸Ñ‚ÑŒ"
+msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ñ‹Ð¹ Ð²Ñ‹Ð·Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
-msgstr "ÐœÐ¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½"
+msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð½Ð¾Ð¼ÐµÑ€ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð½Ð¾Ð¼ÐµÑ€ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð° Ð¿ÐµÑ€ÐµÐ´ Ð·Ð²Ð¾Ð½ÐºÐ¾Ð¼"
+msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð½Ð¾Ð¼ÐµÑ€ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð° Ð¿ÐµÑ€ÐµÐ´ Ð²Ñ‹Ð·Ð¾Ð²Ð¾Ð¼"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "_ÐŸÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "ÐŸÑ€_Ð¾Ñ‚Ð¾ÐºÐ¾Ð»"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr "Ð˜Ð¼Ñ Ð¸Ð»Ð¸ IP-Ð°Ð´Ñ€ÐµÑ _ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
-msgstr "Ð˜Ð¼Ñ Ð¸Ð»Ð¸ _Ð½Ð¾Ð¼ÐµÑ€ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "ÐŸÐ°_Ñ€Ð¾Ð»ÑŒ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
-msgstr "ÐÐ¾Ð¼ÐµÑ€ _Ð°Ð²Ñ‚Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ‡Ð¸ÐºÐ° #"
+msgstr "ÐÐ¾Ð¼ÐµÑ€ _Ð³Ð¾Ð»Ð¾ÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
-msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ"
+msgstr "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
-msgstr "Ð¡ÐµÐºÑ€ÐµÑ‚Ð½Ñ‹Ð¹"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr "Ð˜Ð¼Ñ Ð´Ð»Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr "Ð‘ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚ÑŒ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ TLS-Ñ‚Ñ€Ð°Ð½ÑÐ¿Ð¾Ñ€Ñ‚ (sips)"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» TLS"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
-msgstr "ÐžÐ±Ð¼ÐµÐ½Ð° ÐºÐ»ÑŽÑ‡ÐµÐ¹ SRTP"
+msgstr "ÐžÐ±Ð¼ÐµÐ½ ÐºÐ»ÑŽÑ‡Ð°Ð¼Ð¸ SRTP"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr "Ð ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
-msgstr "Ð¡Ñ€Ð¾Ðº Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸"
+msgstr "Ð˜ÑÑ‚ÐµÐº ÑÑ€Ð¾Ðº Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr "_Ð¡Ð¾Ð¾Ñ‚Ð²ÐµÑÑ‚Ð²ÑƒÐµÑ‚ RFC 3263"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
-msgstr "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+msgstr "Ð¡ÐµÑ‚ÐµÐ²Ð¾Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð¿Ð¾Ñ€Ñ‚"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
-msgstr "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð´Ð»Ñ Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð°"
+msgstr "ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ STUN "
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ STUN"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr "URL STUN-ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ Ð¸ Ð¿Ð¾Ñ€Ñ‚"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð²Ð¸Ð´Ð¸Ð¼Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ Ð¸ Ð¿Ð¾Ñ€Ñ‚ :"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ Ð¸ Ð¿Ð¾Ñ€Ñ‚:"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr "ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹ Ð¿Ð¾Ñ€Ñ‚"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑƒÑ‡Ã«Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ñ‹Ðµ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "ÐšÐ¾Ð´ÐµÐºÐ¸"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
-msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ"
+msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr "Ð¡ÐµÑ‚ÑŒ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+"ÐÑ‚Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ, ÐºÐ¾Ð³Ð´Ð° Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑÐ¾Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ Ð²Ñ‹Ð·Ð¾Ð² Ð¿Ñ€Ð¾ÑÑ‚Ð¾ Ð½Ð°Ð±Ñ€Ð°Ð² "
+"SIP URI-Ð°Ð´Ñ€ÐµÑ Ð²Ð¸Ð´Ð° <b>sip:ÑƒÐ´Ð°Ð»Ã«Ð½Ð½Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾</b>. ÐÑ‚Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ñ‚Ð°Ðº-Ð¶Ðµ "
+"Ð±ÑƒÐ´ÑƒÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ñ‹ ÐµÑÐ»Ð¸ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð´Ñ…Ð¾Ð´ÑÑ‰ÐµÐ³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´ÑÑ‰ÐµÐ³Ð¾ Ð¸Ð»Ð¸ "
+"Ð¸ÑÑ…Ð¾Ð´ÑÑ‰ÐµÐ³Ð¾ Ð²Ñ‹Ð·Ð¾Ð²Ð°."
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
+#, c-format
 msgid "Server returned \"%s\" (%d)"
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ð» \""
+msgstr "ÐžÑ‚Ð²ÐµÑ‚ ÑÐµÑ€Ð²ÐµÑ€Ð° \"%s\" (%d)"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
-msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+msgstr "ÐÐºÐºÐ°ÑƒÐ½Ñ‚Ñ‹"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ñ‹Ðµ ÑƒÑ‡Ã«Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
+#, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
-msgstr[0] "ÐžÐ´Ð½Ð° Ð´ÐµÐ¹ÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ ÑƒÑ‡Ã«Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
-msgstr[1] "%d Ð´ÐµÐ¹ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ñ… ÑƒÑ‡Ã«Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹"
-msgstr[2] "%d Ð´ÐµÐ¹ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ñ… ÑƒÑ‡Ã«Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹"
+msgstr[0] "%d Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
+msgstr[1] "%d Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ñ… Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð²"
+msgstr[2] "Ð´ÐµÐ¹ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
-msgstr "Ð£ Ð²Ð°Ñ Ð½ÐµÑ‚ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾Ð¹ ÑƒÑ‡Ã«Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+msgstr "Ð£ Ð²Ð°Ñ Ð½ÐµÑ‚ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr "ÐžÐ±Ñ‰Ð¸Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
@@ -706,7 +737,7 @@ msgstr "_Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑÐ½ÑƒÑŽ ÐºÐ½Ð¸Ð³Ñƒ Evolution"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:319
 msgid "Download limit :"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð½Ðµ Ð±Ð¾Ð»ÐµÐµ "
+msgstr "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ðµ ÑÐºÐ¾Ñ€Ð¾ÑÑ‚Ð¸ ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ:"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:327
 msgid "cards"
@@ -718,7 +749,7 @@ msgstr "_ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ„Ð¾Ñ‚Ð¾Ð³Ñ€Ð°Ñ„Ð¸ÑŽ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð° (ÐµÑÐ»Ð¸ Ð¸Ð¼Ðµ
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:341
 msgid "Fields from Evolution's address books"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»Ð¾ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð½Ð¾Ð¼ÐµÑ€Ð° Ð¸Ð· Ð°Ð´Ñ€ÐµÑÐ½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸ Evolution"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð¿Ð¾Ð»Ñ Ð¸Ð· Ð°Ð´Ñ€ÐµÑÐ½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸ Evolution:"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:345
 msgid "_Work"
@@ -741,7 +772,7 @@ msgid "Select which Evolution address books to use"
 msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑÐ½ÑƒÑŽ ÐºÐ½Ð¸Ð³Ñƒ Evolution:"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "Ð˜Ð¼Ñ"
 
@@ -756,7 +787,7 @@ msgid ""
 "parameters in the Options/Accounts window."
 msgstr ""
 "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð² Ð»ÑŽÐ±Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹  "
-"Ð²Ð°ÑˆÐ¸Ñ… ÑƒÑ‡Ã«Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ð² Ð¼ÐµÐ½ÑŽ ÐŸÑ€Ð°Ð²ÐºÐ° / Ð£Ñ‡Ã«Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+"Ð²Ð°ÑˆÐ¸Ñ… Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð² Ð² Ð¼ÐµÐ½ÑŽ ÐŸÑ€Ð°Ð²ÐºÐ° / ÐÐºÐºÐ°ÑƒÐ½Ñ‚Ñ‹."
 
 #: ../sflphone-client-gnome/src/config/assistant.c:80
 msgid "Alias"
@@ -768,11 +799,11 @@ msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
 
 #: ../sflphone-client-gnome/src/config/assistant.c:88
 msgid "Username"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ"
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
 #: ../sflphone-client-gnome/src/config/assistant.c:92
 msgid "Security: "
-msgstr "Ð‘ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚ÑŒ:"
+msgstr "Ð‘ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚ÑŒ "
 
 #: ../sflphone-client-gnome/src/config/assistant.c:94
 msgid "SRTP/ZRTP draft-zimmermann"
@@ -782,183 +813,182 @@ msgstr "SRTP/ZRTP draft-zimmermann"
 msgid "None"
 msgstr "ÐÐµÑ‚"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
-msgstr "ÐœÐ°ÑÑ‚ÐµÑ€ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ SFLphone"
+msgstr "ÐœÐ°ÑÑ‚ÐµÑ€ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° SFLphone"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ Ð² SFLphone!"
+msgstr "Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Ð¼Ð°ÑÑ‚ÐµÑ€ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° SFLphone!"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
-msgstr "ÐÑ‚Ð¾Ñ‚ Ð¼Ð°ÑÑ‚ÐµÑ€ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ‚ Ð²Ð°Ð¼ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð²Ð°ÑˆÑƒ ÑƒÑ‡Ã«Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+msgstr "ÐÑ‚Ð¾Ñ‚ Ð¼Ð°ÑÑ‚ÐµÑ€ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ‚ Ð²Ð°Ð¼ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð²Ð°Ñˆ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "VoIP-Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ñ‹"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿ ÑƒÑ‡Ã«Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
-msgstr "Ð£Ñ‡Ã«Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+msgstr "ÐÐºÐºÐ°ÑƒÐ½Ñ‚"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
-msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ"
+msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¾Ð´Ð½Ñƒ Ð¸Ð· ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ñ… Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÐµÐ¹"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð±ÐµÑÐ¿Ð»Ð°Ñ‚Ð½ÑƒÑŽ SIP/IAX2-ÑƒÑ‡Ã«Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð½Ð° sflphone.org"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð±ÐµÑÐ¿Ð»Ð°Ñ‚Ð½Ñ‹Ð¹ SIP/IAX2-Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð½Ð° sflphone.org"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
-msgstr "Ð—Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰ÐµÑŽ SIP Ð¸Ð»Ð¸ IAX2 ÑƒÑ‡Ã«Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ SIP Ð¸Ð»Ð¸ IAX2 Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑƒÑ‡Ã«Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ SIP"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° SIP-Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr "Ð—Ð°Ñ‰Ð¸Ñ‰Ã«Ð½Ð½Ð°Ñ ÑÐ²ÑÐ·ÑŒ Ñ _ZRTP"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
-msgstr "ÐÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ (Ð½ÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹)"
+msgstr "e-mail"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
-msgstr "ÐÑ‚Ð¾Ñ‚ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ñ€ÐµÑ‡ÐµÐ²Ñ‹Ñ… ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹"
+msgstr ""
+"ÐÑ‚Ð¾Ñ‚ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹ Ð³Ð¾Ð»Ð¾ÑÐ¾Ð²Ð¾Ð¹ "
+"Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr "_ÐÐ´Ñ€ÐµÑ ÑÐ». Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ÑƒÑ‡Ã«Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ IAX2"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° IAX2-Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
-msgstr "Ð’Ñ‹ Ð½Ð°Ð²ÐµÑ€Ð½Ð¾Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ ÑÑ‚Ð¾ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÐµÑÐ»Ð¸ Ð²Ñ‹ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÐµÑÑŒ Ð·Ð° ÑÐµÑ‚ÐµÐ²Ñ‹Ð¼ ÑÐºÑ€Ð°Ð½Ð¾Ð¼."
+msgstr ""
+"Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½ÑƒÐ¶Ð½Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ ÑÑ‚Ñƒ Ð¾Ð¿Ñ†Ð¸ÑŽ ÐµÑÐ»Ð¸ Ð²Ñ‹ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÐµÑÑŒ Ð·Ð° ÑÐµÑ‚ÐµÐ²Ñ‹Ð¼ ÑÐºÑ€Ð°Ð½Ð¾Ð¼."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ STUN"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "_STUN-ÑÐµÑ€Ð²ÐµÑ€"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
-msgstr "Ð ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÑ‡Ã«Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸"
+msgstr "Ð ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "ÐŸÐ¾Ð·Ð´Ñ€Ð°Ð²Ð»ÑÐµÐ¼!"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "Ð§Ð°ÑÑ‚Ð¾Ñ‚Ð°"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "Ð‘Ð¸Ñ‚Ñ€ÐµÐ¹Ñ‚"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
-msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÐºÐ½Ð°Ñ ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾ÑÑ‚ÑŒ"
+msgstr "ÐŸÐ¾Ð»Ð¾ÑÐ° Ð¿Ñ€Ð¾Ð¿ÑƒÑÐºÐ°Ð½Ð¸Ñ"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr "ALSA-Ð¿Ð»Ð°Ð³Ð¸Ð½"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
-msgstr "Ð’Ñ‹Ñ…Ð¾Ð´"
+msgstr "ÐÑƒÐ´Ð¸Ð¾Ð²Ñ‹Ñ…Ð¾Ð´"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
-msgstr "Ð’Ñ…Ð¾Ð´"
+msgstr "ÐÑƒÐ´Ð¸Ð¾Ð²Ñ…Ð¾Ð´"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð´ÐµÑ‚ÐµÐºÑ‚Ð¾Ñ€ Ñ‚Ð¸ÑˆÐ¸Ð½Ñ‹"
+msgstr "Ð”ÐµÑ‚ÐµÐºÑ‚Ð¾Ñ€ Ñ‚Ð¸ÑˆÐ¸Ð½Ñ‹ (VAD)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr "Ð¨ÑƒÐ¼Ð¾Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr "ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ð·Ð²ÑƒÐºÐ°"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "_Pulseaudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "_ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "ÐšÐ¾Ð´ÐµÐºÐ¸"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "Ð—Ð°Ð¿Ð¸ÑÐ¸"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
-msgstr "ÐŸÐ°Ð¿ÐºÐ° Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ"
+msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒ Ð²"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ"
+msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
-msgstr "Ð—Ð²Ð¾Ð½ÐºÐ¸"
+msgstr "Ð Ð¸Ð½Ð³Ñ‚Ð¾Ð½Ñ‹"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ñ€Ð¸Ð½Ð³Ñ‚Ð¾Ð½"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð·Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð°Ñ‚ÑŒ Ñ€Ð¸Ð½Ð³Ñ‚Ð¾Ð½"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
-msgstr "Ð—Ð²ÑƒÐºÐ¾Ð²Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹"
+msgstr "ÐÑƒÐ´Ð¸Ð¾ Ñ„Ð°Ð¹Ð»Ñ‹"
 
 #: ../sflphone-client-gnome/src/config/hooks-config.c:130
 msgid "URL Argument"
@@ -966,7 +996,7 @@ msgstr "ÐŸÐµÑ€ÐµÐ´Ð°Ñ‡Ð° URL"
 
 #: ../sflphone-client-gnome/src/config/hooks-config.c:135
 msgid "Custom commands on incoming calls with URL"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ð¿Ñ€Ð¸ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ… Ð²Ñ‹Ð·Ð¾Ð²Ð°Ñ… Ñ URL"
+msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¿Ñ€Ð¸ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ… Ð²Ñ‹Ð·Ð¾Ð²Ð°Ñ… Ñ URL"
 
 #: ../sflphone-client-gnome/src/config/hooks-config.c:138
 #, c-format
@@ -987,82 +1017,71 @@ msgstr "_Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ:"
 
 #: ../sflphone-client-gnome/src/config/hooks-config.c:165
 msgid "Phone number rewriting"
-msgstr "ÐŸÐµÑ€ÐµÐ¿Ð¸ÑÐºÐ° Ð½Ð¾Ð¼ÐµÑ€Ð° Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
+msgstr "ÐŸÑ€ÐµÑ„Ð¸ÐºÑ"
 
 #: ../sflphone-client-gnome/src/config/hooks-config.c:169
 msgid "_Prefix dialed numbers with"
-msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÐ´ Ð½Ð° Ð½Ð°Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð½Ð¾Ð¼ÐµÑ€Ð°Ð¼Ð¸"
+msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ Ð¿ÐµÑ€ÐµÐ´ Ð½Ð¾Ð¼ÐµÑ€Ð¾Ð¼"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-"ÐÑ‚Ð¾Ñ‚ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ ÐºÐ¾Ð³Ð´Ð° Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð´Ð¾ÑÑ‚Ð¸Ñ‡ÑŒ ÑƒÐ´Ð°Ð»Ã«Ð½Ð½Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ "
-"Ð¿Ñ€Ð¾ÑÑ‚Ð¾ Ð½Ð°Ð±Ñ€Ð°Ð² SIP URI (Ð°Ð´Ñ€ÐµÑ) Ñ‚Ð¸Ð¿Ð° <b>sip:ÑƒÐ´Ð°Ð»Ã«Ð½Ð½Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾</b>. ÐÑ‚Ð¸ "
-"Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ñ‚Ð°Ðº-Ð¶Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ñ‹ ÐµÑÐ»Ð¸ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð´Ñ…Ð¾Ð´ÑÑ‰ÐµÐ³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° Ð´Ð»Ñ "
-"Ð²Ñ…Ð¾Ð´ÑÑ‰ÐµÐ³Ð¾ Ð¸Ð»Ð¸ Ð²Ñ‹Ñ…Ð¾Ð´ÑÑ‰ÐµÐ³Ð¾ Ð·Ð²Ð¾Ð½ÐºÐ°."
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
-msgstr "Ð˜Ð·Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ð° Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¼ ÑÑ‚Ð¾Ð»Ðµ"
+msgstr "Ð’ÑÐ¿Ð»Ñ‹Ð²Ð°ÑŽÑ‰Ð¸Ðµ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð·Ð²Ð¾Ð½Ð¾Ðº"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð²ÑÐ¿Ð»Ñ‹Ð²Ð°ÑŽÑ‰Ð¸Ðµ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
-msgstr "ÐŸÐ¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ð¾ÐºÐ½Ð° SFLPhone"
+msgstr "Ð—Ð½Ð°Ñ‡Ð¾Ðº Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼ Ñ‚Ñ€ÐµÐµ"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
-msgstr "_ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð³Ð»Ð°Ð²Ð½Ð¾Ðµ Ð¾ÐºÐ½Ð¾ Ð¿Ñ€Ð¸ Ð²Ñ…Ð¾Ð´ÑÑ‰ÐµÐ¼ Ð·Ð²Ð¾Ð½ÐºÐµ"
+msgstr "_ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð³Ð»Ð°Ð²Ð½Ð¾Ðµ Ð¾ÐºÐ½Ð¾ Ð¿Ñ€Ð¸ Ð²Ñ…Ð¾Ð´ÑÑ‰ÐµÐ¼ Ð²Ñ‹Ð·Ð¾Ð²Ðµ"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
-msgstr "ÐÐ¸ÐºÐ¾Ð³Ð´Ð° Ð½Ðµ Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð³Ð»Ð°Ð²Ð½Ð¾Ðµ Ð¾ÐºÐ½Ð¾"
+msgstr "_ÐÐ¸ÐºÐ¾Ð³Ð´Ð° Ð½Ðµ Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð³Ð»Ð°Ð²Ð½Ð¾Ðµ Ð¾ÐºÐ½Ð¾"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
-msgstr "Ð¡Ð¿Ñ€ÑÑ‚Ð°Ñ‚ÑŒ Ð¾ÐºÐ½Ð¾ SFLphone Ð¿Ñ€Ð¸ Ð¿ÑƒÑÐºÐµ"
+msgstr "Ð¡ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ SFLphone Ð¿Ñ€Ð¸ Ð·Ð°Ð¿ÑƒÑÐºÐµ Ð² Ñ‚Ñ€ÐµÐ¹"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
-msgstr "Ð–ÑƒÑ€Ð½Ð°Ð» Ð·Ð²Ð¾Ð½ÐºÐ¾Ð²"
+msgstr "Ð–ÑƒÑ€Ð½Ð°Ð» Ð²Ñ‹Ð·Ð¾Ð²Ð¾Ð²"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
-msgstr "Ð¡Ð¾_Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð¼Ð¾Ð¹ Ð¶ÑƒÑ€Ð½Ð°Ð» Ð·Ð²Ð¾Ð½ÐºÐ¾Ð² ÐºÐ°Ðº Ð¼Ð¸Ð½Ð¸Ð¼ÑƒÐ¼ Ð² Ñ‚ÐµÑ‡ÐµÐ½Ð¸Ð¸"
+msgstr "_Ð¥Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð¶ÑƒÑ€Ð½Ð°Ð» Ð²Ñ‹Ð·Ð¾Ð²Ð¾Ð² Ð² Ñ‚ÐµÑ‡ÐµÐ½Ð¸Ð¸"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr "Ð´Ð½ÐµÐ¹"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
-msgstr "ÐŸÑ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ°"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
-msgstr "Ð—Ð²ÑƒÐº"
+msgstr "ÐÑƒÐ´Ð¸Ð¾"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "ÐÐ´Ñ€ÐµÑÐ½Ð°Ñ ÐºÐ½Ð¸Ð³Ð°"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
-msgstr "Ð—Ð°Ñ†ÐµÐ¿ÐºÐ¸"
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr "ÐŸÑ€ÑÐ¼Ñ‹Ðµ IP-Ð·Ð²Ð¾Ð½ÐºÐ¸"
+msgstr "ÐŸÑ€Ð¾Ñ‡ÐµÐµ"
 
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
-msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð¾Ð¿Ñ†Ð¸Ð¸ Ð´Ð»Ñ TLS"
+msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð´Ð»Ñ TLS"
 
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
 msgid "TLS transport"
@@ -1081,55 +1100,59 @@ msgstr ""
 "ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° (Ð½Ð¾ ÐºÐ°Ð¶Ð´Ñ‹Ð¹ Ð¸Ð· Ð½Ð¸Ñ… Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ²Ð¾Ð¹ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¹ "
 "Ð¿Ð¾Ñ€Ñ‚).\n"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
-msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ñ†ÐµÐ½Ñ‚Ñ€Ð° ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
+msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ñ†ÐµÐ½Ñ‚Ñ€Ð¾Ð² ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð» Ð¦ÐµÐ½Ñ‚Ñ€Ð° ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ (Ð½ÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹)"
+msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð» Ð¦ÐµÐ½Ñ‚Ñ€Ð° ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ (Ð½ÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr "Ð¤Ð°Ð¹Ð» Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¼ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ð¼"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ (Ð½ÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹)"
+msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ (Ð½ÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð» Ñ ÑÐµÐºÑ€ÐµÑ‚Ð½Ñ‹Ð¼ ÐºÐ»ÑŽÑ‡Ð¾Ð¼ (Ð½ÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)"
+msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð» Ñ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ‹Ð¼ ÐºÐ»ÑŽÑ‡Ð¾Ð¼ (Ð½ÐµÐ¾Ð±ÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ ÑÐµÐºÑ€ÐµÑ‚Ð½Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr "ÐœÐµÑ‚Ð¾Ð´ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð° TLS"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº ÑˆÐ¸Ñ„Ñ€Ð¾Ð² TLS"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
-msgstr "Ð˜Ð¼Ñ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð´Ð»Ñ Ð²Ñ‹Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ… TLS-Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹."
+msgstr "Ð˜Ð¼Ñ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð´Ð»Ñ Ð¸ÑÑ…Ð¾Ð´ÑÑ‰Ð¸Ñ… TLS-Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ (ÑÐµÐº:Ð¼ÑÐµÐº)"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÑÑ‚ÑŒ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ðµ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ (Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ ÑÐµÑ€Ð²ÐµÑ€Ð°)"
+msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÑÑ‚ÑŒ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ðµ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ ÐºÐ°Ðº ÑÐµÑ€Ð²ÐµÑ€"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÑÑ‚ÑŒ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ðµ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ (Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°)"
+msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÑÑ‚ÑŒ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ðµ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ ÐºÐ°Ðº ÐºÐ»Ð¸ÐµÐ½Ñ‚"
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr "Ð¢Ñ€ÐµÐ±Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ… TLS-Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹"
 
@@ -1153,6 +1176,15 @@ msgstr "_ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ´Ð¸Ñ‚ÑŒ ÐµÑÐ»Ð¸ ZRTP Ð½Ðµ Ð¿Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ÑÑ"
 msgid "Display SAS once for hold events"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ SAS Ð¾Ð´Ð¸Ð½ Ñ€Ð°Ð·"
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+#, fuzzy
+msgid "SDES Options"
+msgstr "ÐžÐ¿Ñ†Ð¸Ð¸ ZRTP"
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr "Ð˜ÑÐºÐ°Ñ‚ÑŒ Ð²ÑÐµ"
@@ -1162,58 +1194,39 @@ msgstr "Ð˜ÑÐºÐ°Ñ‚ÑŒ Ð²ÑÐµ"
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:84
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:96
 msgid "Click here to change the search type"
-msgstr "ÐÐ°Ð¶Ð¼Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ñ‚Ð¸Ð¿ Ð¿Ð¾Ð¸ÑÐºÐ°"
+msgstr "ÐÐ°Ð¶Ð¼Ð¸Ñ‚Ðµ ÑÑŽÐ´Ð°, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ñ‚Ð¸Ð¿ Ð¿Ð¾Ð¸ÑÐºÐ°"
 
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:71
 msgid "Search by missed call"
-msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¿Ð¾ Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð½Ñ‹Ð¼ Ð²Ñ‹Ð·Ð¾Ð²Ð°Ð¼"
+msgstr "ÐŸÐ¾Ð¸ÑÐº Ð² Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð½Ñ‹Ñ… Ð²Ñ‹Ð·Ð¾Ð²Ð°Ñ…"
 
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:83
 msgid "Search by incoming call"
-msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¿Ð¾ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ð¼ Ð²Ñ‹Ð·Ð¾Ð²Ð°Ð¼"
+msgstr "ÐŸÐ¾Ð¸ÑÐº Ð² Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ… Ð²Ñ‹Ð·Ð¾Ð²Ð°Ñ…"
 
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:95
 msgid "Search by outgoing call"
-msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¿Ð¾ Ð¸ÑÑ…Ð¾Ð´ÑÑ‰Ð¸Ð¼ Ð²Ñ‹Ð·Ð¾Ð²Ð°Ð¼"
-
-#~ msgid "IP call - %s"
-#~ msgstr "IP Ð·Ð²Ð¾Ð½Ð¾Ðº  - %s"
-
-#~ msgid "Codec"
-#~ msgstr "Codec"
-
-#~ msgid "Network"
-#~ msgstr "Ð¡ÐµÑ‚ÑŒ"
-
-#~ msgid "Manually"
-#~ msgstr "Ð’Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
+msgstr "ÐŸÐ¾Ð¸ÑÐº Ð² Ð¸ÑÑ…Ð¾Ð´ÑÑ‰Ð¸Ñ… Ð²Ñ‹Ð·Ð¾Ð²Ð°Ñ…"
 
-#~ msgid "There "
-#~ msgstr "Ð—Ð´ÐµÑÑŒ "
-
-#~ msgid "is "
-#~ msgstr "Ð—Ð°Ñ€ÐµÐ³ÐµÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½ "
-
-#~ msgid "are "
-#~ msgstr "Ð—Ð°Ñ€ÐµÐ³ÐµÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹ "
-
-#~ msgid "s"
-#~ msgstr "a"
-
-#~ msgid "_Mute other applications during a call"
-#~ msgstr "ÐŸÑ€Ð¸Ð³Ð»ÑƒÑˆÐ°Ñ‚ÑŒ Ð·Ð²ÑƒÐº Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð·Ð²Ð¾Ð½ÐºÐ°"
-
-#~ msgid "SIP Port"
-#~ msgstr "SIP-Ð¿Ð¾Ñ€Ñ‚"
-
-#~ msgid "UDP Transport"
-#~ msgstr "Ð¢Ñ€Ð°Ð½ÑÐ¿Ð¾Ñ€Ñ‚ UDP"
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>ÐžÑˆÐ¸Ð±ÐºÐ°: Ð·Ð²ÑƒÐºÐ¾Ð²Ñ‹Ðµ ÐºÐ¾Ð´ÐµÐºÐ¸ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ‹.\n"
+#~ "\n"
+#~ "</b> Ð—Ð²ÑƒÐºÐ¾Ð²Ñ‹Ðµ ÐºÐ¾Ð´ÐµÐºÐ¸ SFL Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑŒÑÑ Ð² <i>%s</i> Ð¸Ð»Ð¸ Ð² <b>."
+#~ "sflphone</b> ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ðµ Ð² Ð²Ð°ÑˆÐµÐ¼ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¼ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ðµ( <i>%s</i> )"
 
-#~ msgid "Enable voicemail _notifications"
-#~ msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾ Ñ€ÐµÑ‡ÐµÐ²Ñ‹Ñ… ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸ÑÑ…"
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "%i Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½"
+#~ msgstr[1] "%i Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð² Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¾"
+#~ msgstr[2] "%i Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð² Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ñ‹"
 
-#~ msgid "Store SIP credentials as MD5 hash"
-#~ msgstr "Ð—Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° SIP Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²ÐºÐ¾Ð¹ MD5."
+#~ msgid "Direct IP calls"
+#~ msgstr "ÐŸÑ€ÑÐ¼Ñ‹Ðµ IP-Ð²Ñ‹Ð·Ð¾Ð²Ñ‹"
 
 #~ msgid "Account creation wizard"
 #~ msgstr "ÐœÐ°ÑÑ‚ÐµÑ€ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ SFLphone"
@@ -1221,6 +1234,9 @@ msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¿Ð¾ Ð¸ÑÑ…Ð¾Ð´ÑÑ‰Ð¸Ð¼ Ð²Ñ‹Ð·Ð¾Ð²Ð°Ð¼"
 #~ msgid "Voicemail number"
 #~ msgstr "ÐÐ¾Ð¼ÐµÑ€ Ð°Ð²Ñ‚Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ‡Ð¸ÐºÐ° #"
 
+#~ msgid "Codec"
+#~ msgstr "Codec"
+
 #~ msgid "Display volume controls"
 #~ msgstr "_ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð³Ñ€Ð¾Ð¼ÐºÐ¾ÑÑ‚Ð¸"
 
@@ -1266,21 +1282,33 @@ msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¿Ð¾ Ð¸ÑÑ…Ð¾Ð´ÑÑ‰Ð¸Ð¼ Ð²Ñ‹Ð·Ð¾Ð²Ð°Ð¼"
 #~ msgid "Sound manager"
 #~ msgstr "ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ð·Ð²ÑƒÐºÐ°"
 
+#~ msgid "SIP Port"
+#~ msgstr "SIP-Ð¿Ð¾Ñ€Ñ‚"
+
 #~ msgid "Command to run"
 #~ msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ:"
 
 #~ msgid "Prefix dialed numbers with"
 #~ msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÐ´ Ð½Ð° Ð½Ð°Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð½Ð¾Ð¼ÐµÑ€Ð°Ð¼Ð¸"
 
+#~ msgid "IP call - %s"
+#~ msgstr "IP Ð·Ð²Ð¾Ð½Ð¾Ðº  - %s"
+
 #~ msgid "_Account creation wizard"
 #~ msgstr "ÐœÐ°ÑÑ‚ÐµÑ€ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ SFLphone"
 
 #~ msgid "_Enable this account"
 #~ msgstr "_Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾ Ñ€ÐµÑ‡ÐµÐ²Ñ‹Ñ… ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸ÑÑ…"
+
 #~ msgid "PulseAudio sound server"
 #~ msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð·Ð²ÑƒÐºÐ° PulseAudio"
 
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "ÐŸÑ€Ð¸Ð³Ð»ÑƒÑˆÐ°Ñ‚ÑŒ Ð·Ð²ÑƒÐº Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð·Ð²Ð¾Ð½ÐºÐ°"
+
 #~ msgid "Port"
 #~ msgstr "ÐŸÐ¾Ñ€Ñ‚"
 
@@ -1456,6 +1484,27 @@ msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¿Ð¾ Ð¸ÑÑ…Ð¾Ð´ÑÑ‰Ð¸Ð¼ Ð²Ñ‹Ð·Ð¾Ð²Ð°Ð¼"
 #~ msgid "Enable notifications"
 #~ msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ"
 
+#~ msgid "Manually"
+#~ msgstr "Ð’Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
+
+#~ msgid "UDP Transport"
+#~ msgstr "Ð¢Ñ€Ð°Ð½ÑÐ¿Ð¾Ñ€Ñ‚ UDP"
+
+#~ msgid "There "
+#~ msgstr "Ð—Ð´ÐµÑÑŒ "
+
+#~ msgid "Store SIP credentials as MD5 hash"
+#~ msgstr "Ð—Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° SIP Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²ÐºÐ¾Ð¹ MD5."
+
+#~ msgid "s"
+#~ msgstr "a"
+
+#~ msgid "are "
+#~ msgstr "Ð—Ð°Ñ€ÐµÐ³ÐµÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹ "
+
+#~ msgid "is "
+#~ msgstr "Ð—Ð°Ñ€ÐµÐ³ÐµÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½ "
+
 #~ msgctxt "NAME OF TRANSLATORS"
 #~ msgid "Your names"
 #~ msgstr ""
@@ -1464,11 +1513,14 @@ msgstr "ÐŸÐ¾Ð¸ÑÐº Ð¿Ð¾ Ð¸ÑÑ…Ð¾Ð´ÑÑ‰Ð¸Ð¼ Ð²Ñ‹Ð·Ð¾Ð²Ð°Ð¼"
 #~ "Sergei Sedov, ,Launchpad Contributions:,Emmanuel Milou,Hussein Abdallah,"
 #~ "Hussein Abdallah,Maxime Chambreuil,Pavlo Kucheriavyi,Sergei Sedov, ,"
 #~ "Launchpad Contributions:,Emmanuel Milou,Hussein Abdallah,Hussein Abdallah,"
-#~ "Maxime Chambreuil,Pavlo Kucheriavyi,Sergey Sedov"
+#~ "Maxime Chambreuil,Pavlo Kucheriavyi,Sergey Sedov, ,Launchpad "
+#~ "Contributions:,DMG,Emmanuel Milou,Hussein Abdallah,Hussein Abdallah,"
+#~ "Lortonix,Maxime Chambreuil,Pavlo Kucheriavyi,Sergey Sedov"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
 #~ msgstr ""
 #~ ",,,,,emmanuel.milou@savoirfairelinux.com,,maxime.chambreuil@gmail.com,,,,,"
 #~ "emmanuel.milou@savoirfairelinux.com,,,maxime.chambreuil@gmail.com,,,,,"
-#~ "emmanuel.milou@savoirfairelinux.com,,,maxime.chambreuil@gmail.com,,"
+#~ "emmanuel.milou@savoirfairelinux.com,,,maxime.chambreuil@gmail.com,,,,,,"
+#~ "emmanuel.milou@savoirfairelinux.com,,,,maxime.chambreuil@gmail.com,,"
diff --git a/lang/sflphone.pot b/lang/sflphone.pot
index 8fd477d58564f569288946c0cc0852a4611ef0b6..62ec100dd6c791ad700d0d468c90b27adcbbdc48 100644
--- a/lang/sflphone.pot
+++ b/lang/sflphone.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,74 +17,85 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/errors.c:29
@@ -108,65 +119,65 @@ msgid ""
 "Pulseaudio is not running"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr ""
 
@@ -235,446 +246,460 @@ msgstr ""
 msgid "Mic volume"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
+#: ../sflphone-client-gnome/src/statusicon.c:189
 #, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
+msgid "%i active account"
+msgid_plural "%i active accounts"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
 #, c-format
 msgid "Voicemail (%i)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+msgid "_User-agent"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
 #, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr ""
 
@@ -719,7 +744,7 @@ msgid "Select which Evolution address books to use"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr ""
 
@@ -758,181 +783,177 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr ""
 
@@ -969,69 +990,62 @@ msgstr ""
 msgid "_Prefix dialed numbers with"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr ""
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr ""
@@ -1049,55 +1063,59 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -1121,6 +1139,14 @@ msgstr ""
 msgid "Display SAS once for hold events"
 msgstr ""
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr ""
diff --git a/lang/tr/tr.po b/lang/tr/tr.po
new file mode 100644
index 0000000000000000000000000000000000000000..36459e4c7194e4383edb3264ca609019e055057f
--- /dev/null
+++ b/lang/tr/tr.po
@@ -0,0 +1,1172 @@
+# Turkish translation for sflphone
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the sflphone package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sflphone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2009-12-30 08:56+0000\n"
+"Last-Translator: zeugma <Unknown>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../sflphone-client-gnome/src/accountlist.c:170
+msgid "Registered"
+msgstr "KayÄ±tlÄ±"
+
+#: ../sflphone-client-gnome/src/accountlist.c:173
+msgid "Not Registered"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:176
+msgid "Trying..."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:179
+#: ../sflphone-client-gnome/src/sflnotify.c:131
+#: ../sflphone-client-gnome/src/sflnotify.c:148
+msgid "Error"
+msgstr "Hata"
+
+#: ../sflphone-client-gnome/src/accountlist.c:182
+msgid "Authentication Failed"
+msgstr "Kimlik DoÄŸrulama BaÅŸarÄ±sÄ±z"
+
+#: ../sflphone-client-gnome/src/accountlist.c:185
+msgid "Network unreachable"
+msgstr "AÄŸ eriÅŸilemez durumda"
+
+#: ../sflphone-client-gnome/src/accountlist.c:188
+msgid "Host unreachable"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:191
+msgid "Stun configuration error"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:194
+msgid "Stun server invalid"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
+msgid "Invalid"
+msgstr "GeÃ§ersiz"
+
+#: ../sflphone-client-gnome/src/actions.c:114
+msgid "Using account"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/actions.c:121
+msgid "No registered accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/actions.c:306
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
+msgid "Direct SIP call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/errors.c:29
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/errors.c:32
+msgid ""
+"ALSA notification\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/errors.c:35
+msgid ""
+"Pulseaudio notification\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:94
+msgid "There is one call in progress."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:98
+msgid "There are calls in progress."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:103
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:331
+msgid "SFLphone Error"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:450
+#, c-format
+msgid "ZRTP is not supported by peer %s\n"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:452
+msgid "Secure Communication Unavailable"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
+msgid "Continue"
+msgstr "Devam et"
+
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
+msgid "Stop Call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:480
+#, c-format
+msgid ""
+"A %s error forced the call with %s to fall under unencrypted mode.\n"
+"Exact reason: %s\n"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:482
+msgid "ZRTP negotiation failed"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:500
+#, c-format
+msgid ""
+"%s wants to stop using secure communication. Confirm will resume "
+"conversation without SRTP.\n"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:502
+msgid "Confirm Go Clear"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/mainwindow.c:504
+msgid "Confirm"
+msgstr "Onayla"
+
+#: ../sflphone-client-gnome/src/sflnotify.c:71
+#: ../sflphone-client-gnome/src/sflnotify.c:91
+#, c-format
+msgid "%s account : %s"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:75
+#, c-format
+msgid "<i>From</i> %s"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:94
+#, c-format
+msgid "%d voice mail"
+msgid_plural "%d voice mails"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:111
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:115
+msgid "Current account"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:130
+msgid "You have no accounts set up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:147
+msgid "You have no registered accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:190
+#, c-format
+msgid ""
+"<i>With:</i> %s \n"
+"using %s"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:205
+#, c-format
+msgid "%s does not support ZRTP."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:220
+#, c-format
+msgid "ZRTP negotiation failed with %s"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sflnotify.c:235
+#, c-format
+msgid "<i>With:</i> %s"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sliders.c:162
+msgid "Speakers volume"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/sliders.c:164
+msgid "Mic volume"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/statusicon.c:128
+msgid "_Show main window"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
+msgid "SFLphone"
+msgstr "SFLphone"
+
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] ""
+
+#: ../sflphone-client-gnome/src/toolbar.c:38
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
+msgid "Voicemail"
+msgstr "Sesli mesaj"
+
+#: ../sflphone-client-gnome/src/uimanager.c:121
+msgid "No address book selected"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
+msgid "Address book"
+msgstr "Adres Defteri"
+
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
+msgid "Voicemail (%i)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:396
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:398
+msgid "About SFLphone"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:800
+msgid "Call"
+msgstr "Ã‡aÄŸrÄ±"
+
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
+msgid "_New call"
+msgstr "_Yeni Ã§aÄŸrÄ±"
+
+#: ../sflphone-client-gnome/src/uimanager.c:802
+msgid "Place a new call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
+msgid "_Pick up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:804
+msgid "Answer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:806
+msgid "Finish the call"
+msgstr "AramayÄ± sonlandÄ±r"
+
+#: ../sflphone-client-gnome/src/uimanager.c:807
+msgid "O_n hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:808
+msgid "Place the call on hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:809
+msgid "O_ff hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:810
+msgid "Place the call off hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:811
+msgid "Configuration _Assistant"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:812
+msgid "Run the configuration assistant"
+msgstr "YapÄ±landÄ±rma sihirbazÄ±nÄ± Ã§alÄ±ÅŸtÄ±r"
+
+#: ../sflphone-client-gnome/src/uimanager.c:815
+msgid "Call your voicemail"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:816
+msgid "_Close"
+msgstr "_Kapat"
+
+#: ../sflphone-client-gnome/src/uimanager.c:817
+msgid "Minimize to system tray"
+msgstr "Sistem Ã§ubuÄŸuna kÃ¼Ã§Ã¼lt"
+
+#: ../sflphone-client-gnome/src/uimanager.c:818
+msgid "_Quit"
+msgstr "_Ã‡Ä±k"
+
+#: ../sflphone-client-gnome/src/uimanager.c:819
+msgid "Quit the program"
+msgstr "Programdan Ã§Ä±k"
+
+#: ../sflphone-client-gnome/src/uimanager.c:822
+msgid "_Edit"
+msgstr "_DÃ¼zenle"
+
+#: ../sflphone-client-gnome/src/uimanager.c:823
+msgid "_Copy"
+msgstr "_Kopyala"
+
+#: ../sflphone-client-gnome/src/uimanager.c:824
+msgid "Copy the selection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:825
+msgid "_Paste"
+msgstr "_YapÄ±ÅŸtÄ±r"
+
+#: ../sflphone-client-gnome/src/uimanager.c:826
+msgid "Paste the clipboard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:827
+msgid "Clear _history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:828
+msgid "Clear the call history"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:829
+msgid "_Accounts"
+msgstr "_Hesaplar"
+
+#: ../sflphone-client-gnome/src/uimanager.c:829
+msgid "Edit your accounts"
+msgstr "HesaplarÄ±nÄ±zÄ± dÃ¼zenleyin"
+
+#: ../sflphone-client-gnome/src/uimanager.c:831
+msgid "_Preferences"
+msgstr "_Tercihler"
+
+#: ../sflphone-client-gnome/src/uimanager.c:832
+msgid "Change your preferences"
+msgstr "Tercihlerinizi deÄŸiÅŸtirin"
+
+#: ../sflphone-client-gnome/src/uimanager.c:835
+msgid "_View"
+msgstr "_GÃ¶ster"
+
+#: ../sflphone-client-gnome/src/uimanager.c:838
+msgid "_Help"
+msgstr "_YardÄ±m"
+
+#: ../sflphone-client-gnome/src/uimanager.c:839
+msgid "Contents"
+msgstr "Ä°Ã§erikler"
+
+#: ../sflphone-client-gnome/src/uimanager.c:840
+msgid "Open the manual"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:841
+msgid "About this application"
+msgstr "Bu uygulama hakkÄ±nda"
+
+#: ../sflphone-client-gnome/src/uimanager.c:849
+msgid "_Transfer"
+msgstr "_Transfer"
+
+#: ../sflphone-client-gnome/src/uimanager.c:850
+msgid "Transfer the call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "_KayÄ±t"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
+msgid "_Show toolbar"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:854
+msgid "Show the toolbar"
+msgstr "AraÃ§ Ã§ubuÄŸunu gÃ¶ster"
+
+#: ../sflphone-client-gnome/src/uimanager.c:855
+msgid "_Dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:856
+msgid "Show the dialpad"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:857
+msgid "_Volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:858
+msgid "Show the volume controls"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:859
+msgid "_History"
+msgstr "_GeÃ§miÅŸ"
+
+#: ../sflphone-client-gnome/src/uimanager.c:860
+msgid "Calls history"
+msgstr "Arama geÃ§miÅŸi"
+
+#: ../sflphone-client-gnome/src/uimanager.c:861
+msgid "_Address book"
+msgstr "_Adres defteri"
+
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
+msgid "On _Hold"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1234
+msgid "_Call back"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1390
+msgid "Edit phone number"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:1402
+msgid "Edit the phone number before making a call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
+msgid "Account Parameters"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
+msgid "_Alias"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
+msgid "_Protocol"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
+msgid "Unknown"
+msgstr "Bilinmiyor"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
+msgid "_Host name"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
+msgid "_User name"
+msgstr "_KullanÄ±cÄ± adÄ±"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
+msgid "_Password"
+msgstr "_Parola"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
+msgid "Show password"
+msgstr "ParolayÄ± gÃ¶ster"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
+msgid "_Voicemail number"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "_KullanÄ±cÄ± adÄ±"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
+msgid "Authentication"
+msgstr "Kimlik DoÄŸrulama"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
+msgid "Secret"
+msgstr "Gizli"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
+msgid "Credential"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
+msgid "Authentication name"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
+msgid "Password"
+msgstr "Parola"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
+msgid "Security"
+msgstr "GÃ¼venlik"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
+msgid "Use TLS transport (sips)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
+msgid "SRTP key exchange"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
+msgid "Disabled"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
+msgid "Registration"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
+msgid "Registration expire"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
+msgid "_Comply with RFC 3263"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
+msgid "Network Interface"
+msgstr "AÄŸ ArayÃ¼zÃ¼"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
+msgid "Local address"
+msgstr "Yerel adres"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
+msgid "Local port"
+msgstr "Yerel port"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
+msgid "Published address"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
+msgid "Using STUN"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
+msgid "STUN server URL"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
+msgid "Same as local parameters"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
+msgid "Set published address and port:"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
+msgid "Published port"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
+msgid "Account settings"
+msgstr "Hesap ayarlarÄ±"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
+msgid "Basic"
+msgstr "Basit"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "Ã‡Ã¶zÃ¼cÃ¼ler"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
+msgid "Advanced"
+msgstr "GeliÅŸmiÅŸ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
+#, c-format
+msgid "Server returned \"%s\" (%d)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
+msgid "Protocol"
+msgstr "Ä°letiÅŸim KurallarÄ±"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
+msgid "Status"
+msgstr "Durum"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
+msgid "Accounts"
+msgstr "Hesaplar"
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
+msgid "Configured Accounts"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
+#, c-format
+msgid "There is %d active account"
+msgid_plural "There are %d active accounts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
+msgid "You have no active account"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:306
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
+msgid "General"
+msgstr "Genel"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:312
+msgid "_Use Evolution address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:319
+msgid "Download limit :"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:327
+msgid "cards"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:333
+msgid "_Display contact photo if available"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:341
+msgid "Fields from Evolution's address books"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:345
+msgid "_Work"
+msgstr "_Ä°ÅŸ"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:351
+msgid "_Home"
+msgstr "_BaÅŸlangÄ±Ã§"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:357
+msgid "_Mobile"
+msgstr "_Hareketli"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:364
+msgid "Address Books"
+msgstr "Adres Defterleri"
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:368
+msgid "Select which Evolution address books to use"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/addressbook-config.c:404
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
+msgid "Name"
+msgstr "Ä°sim"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:75
+#, c-format
+msgid "This assistant is now finished."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:77
+msgid ""
+"You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:80
+msgid "Alias"
+msgstr "Rumuz"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:84
+msgid "Server"
+msgstr "Sunucu"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:88
+msgid "Username"
+msgstr "KullanÄ±cÄ± adÄ±"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:92
+msgid "Security: "
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:94
+msgid "SRTP/ZRTP draft-zimmermann"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:96
+msgid "None"
+msgstr "HiÃ§biri"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:230
+msgid "SFLphone account creation wizard"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:256
+msgid "Welcome to the Account creation wizard of SFLphone!"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:257
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:271
+msgid "VoIP Protocols"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:271
+msgid "Select an account type"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:273
+msgid "SIP (Session Initiation Protocol)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:275
+msgid "IAX2 (InterAsterix Exchange)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:289
+msgid "Account"
+msgstr "Hesap"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:289
+msgid "Please select one of the following options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:291
+msgid "Create a free SIP/IAX2 account on sflphone.org"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:293
+msgid "Register an existing SIP or IAX2 account"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+msgid "SIP account settings"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
+msgid "Please fill the following information"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
+msgid "Secure communications with _ZRTP"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:390
+msgid "Optional email address"
+msgstr "isteÄŸe baÄŸlÄ± e-posta adresi"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:390
+msgid "This email address will be used to send your voicemail messages."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:398
+msgid "_Email address"
+msgstr "_E-Posta adresi"
+
+#: ../sflphone-client-gnome/src/config/assistant.c:420
+msgid "IAX2 account settings"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:497
+msgid "Network Address Translation (NAT)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:497
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:506
+msgid "E_nable STUN"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:513
+msgid "_STUN server"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:527
+msgid "Account Registration"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/assistant.c:527
+msgid "Congratulations!"
+msgstr "Tebrikler!"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
+msgid "Frequency"
+msgstr "Frekans"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
+msgid "Bitrate"
+msgstr "Veri akÄ±ÅŸ hÄ±zÄ±"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
+msgid "Bandwidth"
+msgstr "Band GeniÅŸliÄŸi"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
+msgid "ALSA plugin"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
+msgid "Output"
+msgstr "Ã‡Ä±kÄ±ÅŸ"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
+msgid "Input"
+msgstr "GiriÅŸ"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
+msgid "_Voice Activity Detection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
+msgid "_Noise Reduction (Narrow-Band Companding)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
+msgid "Sound Manager"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
+msgid "_Pulseaudio"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
+msgid "_ALSA"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
+msgid "ALSA settings"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
+msgid "Recordings"
+msgstr "KayÄ±tlar"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
+msgid "Destination folder"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
+msgid "Select a folder"
+msgstr "Bir klasÃ¶r seÃ§"
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
+msgid "Ringtones"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
+msgid "_Enable ringtones"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
+msgid "Choose a ringtone"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
+msgid "Audio Files"
+msgstr "Ses DosyalarÄ±"
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:130
+msgid "URL Argument"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:135
+msgid "Custom commands on incoming calls with URL"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:138
+#, c-format
+msgid "%s will be replaced with the passed URL."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:141
+msgid "Trigger on specific _SIP header"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:150
+msgid "Trigger on _IAX2 URL"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:155
+msgid "Command to _run"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:165
+msgid "Phone number rewriting"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/hooks-config.c:169
+msgid "_Prefix dialed numbers with"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
+msgid "Desktop Notifications"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
+msgid "_Enable notifications"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
+msgid "System Tray Icon"
+msgstr "Sistem Tepsisi Simgesi"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
+msgid "_Popup main window on incoming call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
+msgid "Ne_ver popup main window"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
+msgid "Hide SFLphone window on _startup"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
+msgid "Calls History"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
+msgid "_Keep my history for at least"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
+msgid "days"
+msgstr "gÃ¼n"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
+msgid "Audio"
+msgstr "Ses"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
+msgid "Address Book"
+msgstr "Adres Defteri"
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
+msgid "Hooks"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
+msgid "Advanced options for TLS"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:56
+msgid "TLS transport"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:60
+msgid ""
+"TLS transport can be used along with UDP for those calls that would\n"
+"require secure sip transactions (aka SIPS). You can configure a different\n"
+"TLS transport for each account. However, each of them will run on a "
+"dedicated\n"
+"port, different one from each other\n"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
+msgid "Certificate of Authority list"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
+msgid "Choose a CA list file (optional)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
+msgid "Public endpoint certificate file"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
+msgid "Choose a public endpoint certificate (optional)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
+msgid "Choose a private key file (optional)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
+msgid "Password for the private key"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
+msgid "TLS protocol method"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
+msgid "TLS cipher list"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
+msgid "Server name instance for outgoing TLS connection"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
+msgid "Negotiation timeout (sec:msec)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
+msgid "Verify incoming certificates, as a server"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
+msgid "Verify certificates from answer, as a client"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
+msgid "Require certificate for incoming tls connections"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:49
+msgid "ZRTP Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:69
+msgid "Send Hello Hash in S_DP"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:75
+msgid "Ask User to Confirm SAS"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:81
+msgid "_Warn if ZRTP not supported"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:87
+msgid "Display SAS once for hold events"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:58
+msgid "Search all"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:59
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:72
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:84
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:96
+msgid "Click here to change the search type"
+msgstr "Arama tÃ¼rÃ¼nÃ¼ deÄŸiÅŸtirmek iÃ§in buraya tÄ±klayÄ±n"
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:71
+msgid "Search by missed call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:83
+msgid "Search by incoming call"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/contacts/searchbar.c:95
+msgid "Search by outgoing call"
+msgstr ""
diff --git a/lang/zh_CN/zh_CN.po b/lang/zh_CN/zh_CN.po
index bfc3429d51dec35ea9728985f2d0967e8ad86bd1..6ebdc78a32ac65fa0f53ad456433ce766434a526 100644
--- a/lang/zh_CN/zh_CN.po
+++ b/lang/zh_CN/zh_CN.po
@@ -8,68 +8,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-10-26 20:46+0000\n"
-"Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2010-02-28 01:32+0000\n"
+"Last-Translator: wzssyqa <wzssyqa@gmail.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "å·²æ³¨å†Œ"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "æœªæ³¨å†Œ"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr "æ£åœ¨è¿žæŽ¥..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "æ³¨å†Œå¤±è´¥"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr "è®¤è¯å¤±è´¥"
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "ç½‘ç»œè¿žæŽ¥å¤±è´¥"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "æœåŠ¡å™¨è¿žæŽ¥å¤±è´¥"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr "Stuné…ç½®æœ‰è¯¯"
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr "StunæœåŠ¡å™¨æ— æ•ˆ"
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "æ— æ•ˆ"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr "ä½¿ç”¨è´¦æˆ·"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr "æ²¡æœ‰å·²æ³¨å†Œå¸æˆ·"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -77,23 +81,26 @@ msgstr ""
 "è¿žæŽ¥SFLphoneæœåŠ¡å™¨å¤±è´¥.\n"
 "è¯·æ£€æŸ¥daemonæ˜¯å¦è¿˜åœ¨è¿è¡Œ."
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
-"<b>é”™è¯¯ï¼šæ— æ³•æ‰¾åˆ°codecsç¼–ç æ–‡ä»¶.\n"
-"\n"
-"</b> SFLå£°éŸ³codecsæ–‡ä»¶åº”ä½äºŽ<i>%s</i> æˆ– ä½äºŽä¸»ç›®å½•( <i>%s</i> )çš„<b>."
-"sflphone</b>ç›®å½•ä¸‹"
 
 #: ../sflphone-client-gnome/src/errors.c:29
 msgid ""
@@ -125,65 +132,65 @@ msgstr ""
 "\n"
 "Pulseaudioæœªè¿è¡Œ"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr "æœ‰ä¸€ä¸ªç”µè¯æ£åœ¨å¤„ç†"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr "æœ‰ç”µè¯æ£åœ¨å¤„ç†ä¸"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr "ç¡®è®¤è¦é€€å‡º?"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr "SFLphoneå‡ºé”™"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr "å®‰å…¨é€šä¿¡ä¸å¯ç”¨"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr "ç»§ç»"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr "åœæ¢å‘¼å«"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr "ç¡®è®¤"
 
@@ -251,443 +258,460 @@ msgstr "æ‰¬å£°å™¨éŸ³é‡"
 msgid "Mic volume"
 msgstr "è¯ç’éŸ³é‡"
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr "æ˜¾ç¤ºä¸»çª—å£(S)"
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "æŒ‚æ–(_H)"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] "å·²é…ç½®äº†%iä¸ªè´¦æˆ·"
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "é»˜è®¤å¸æˆ·"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr "è¯éŸ³ä¿¡ç®±"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr "åœ°å€ç°¿"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "åœ°å€ç°¿"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
 msgid "Voicemail (%i)"
 msgstr "è¯éŸ³ä¿¡ç®± (%i)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphoneæ˜¯ä¸€ä¸ªVoIPå®¢æˆ·ç«¯ï¼Œå®ƒå…¼å®¹SIPå’ŒIAX2åè®®."
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr "å…³äºŽSFLphone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr "ç”µè¯(_C)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr "æ–°ç”µè¯(_N)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr "æŽ¥å¬(_P)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "æŒ‚æ–(_H)"
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr "ä¿æŒ(_H)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr "æ¢å¤é€šè¯"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "å½•éŸ³(_R)"
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr "Stuné…ç½®æœ‰è¯¯"
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr "%d ä¸ªè¯éŸ³ä¿¡æ¯"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
-msgstr "ç¼–è¾‘(_E)"
+msgstr "é€€å‡º(_Q)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr "ç¼–è¾‘(_E)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr "åˆ é™¤æ‰€é€‰è´¦æˆ·"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr "æ¸…ç©ºåŽ†å²è®°å½•(_H)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr "æ¸…ç©ºåŽ†å²è®°å½•"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr "è´¦æˆ·(_A)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr "å½“å‰å¸æˆ·"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
-msgstr "é¦–é€‰é¡¹"
+msgstr "é¦–é€‰é¡¹(_P)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
-msgstr ""
+msgstr "æ›´æ”¹æ‚¨çš„é¦–é€‰é¡¹"
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr "æŸ¥çœ‹(_V)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "å¸®åŠ©(_H)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr "ç»§ç»"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr "èº«ä»½éªŒè¯"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr "è½¬æŽ¥"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
-msgstr "è½¬ç»™: "
+msgstr "è½¬ç»™:"
+
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "å½•éŸ³(_R)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr "ç¦ç”¨"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr "éŸ³é‡æŽ§åˆ¶(V)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr "éŸ³é‡æŽ§åˆ¶(V)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr "åŽ†å²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr "å‘¼å«è®°å½•"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "åœ°å€ç°¿"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr "ä¿æŒ(_H)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr "å›žå«(_C)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr "ç¼–è¾‘ç”µè¯å·ç "
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr "æ‹¨å‡ºç”µè¯å‰ç¼–è¾‘ç”µè¯å·ç "
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr "å¸æˆ·ç›¸å…³å‚æ•°"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "åˆ«å(A)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "åè®®(P)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "æœªçŸ¥"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr "ä¸»æœºå(H)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr "ç”¨æˆ·å(U)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "å¯†ç (P)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr "å¯†ç "
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr "è¯éŸ³ä¿¡ç®±å·ç (V)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "ç”¨æˆ·å(U)"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr "èº«ä»½éªŒè¯"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "å¯†ç "
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr "å®‰å…¨"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr "ç¦ç”¨"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr "æ³¨å†Œ"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "ç½‘ç»œè¿žæŽ¥å¤±è´¥"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr "å¸æˆ·è®¾ç½®"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "Codecsç¼–ç "
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr "ç½‘ç»œ"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "åè®®"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "çŠ¶æ€"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr "å¸æˆ·"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr "å·²é…ç½®å¸æˆ·"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
 #, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
 msgstr[0] ""
+msgstr[1] ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr "å¸¸ç”¨é…ç½®"
 
@@ -732,7 +756,7 @@ msgid "Select which Evolution address books to use"
 msgstr "é€‰æ‹©ä½¿ç”¨å¦‚ä¸‹Evolutionåœ°å€è–„"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "åç§°"
 
@@ -771,181 +795,177 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr "SFLphoneè´¦æˆ·åˆ›å»ºå‘å¯¼"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr "æ¬¢è¿Žä½¿ç”¨SFLphoneå¸æˆ·åˆ›å»ºå‘å¯¼!"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr "å®‰è£…å‘å¯¼å°†å¸®åŠ©æ‚¨é…ç½®å¸æˆ·"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "VoIPåè®®"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr "é€‰æ‹©å¸æˆ·ç±»åž‹"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP(ä¼šè¯åˆå§‹åŒ–åè®®)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2(Asteriskå†…éƒ¨äº¤æ¢åè®®)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr "å¸æˆ·"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr "è¯·é€‰æ‹©ä»¥ä¸‹é€‰é¡¹ä¸çš„ä¸€ä¸ª"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr "åœ¨sflphone.orgä¸Šåˆ›å»ºå…è´¹çš„SIP/IAX2å¸æˆ·"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr "æ³¨å†Œå·²å˜åœ¨çš„SIPæˆ–IAX2å¸æˆ·"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr "SIPå¸æˆ·è®¾ç½®"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr "è¯·å¡«å†™ä»¥ä¸‹ä¿¡æ¯"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr "å¯é€‰é‚®ä»¶åœ°å€"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr "è¿™ä¸ªé‚®ä»¶åœ°å€å°†è¢«ç”¨æ¥å‘é€æ‚¨çš„è¯éŸ³é‚®ç®±æ¶ˆæ¯"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr "é‚®ä»¶åœ°å€(E)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr "IAX2å¸æˆ·è®¾ç½®"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "ç½‘ç»œåœ°å€è§£æž(NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "å¦‚æžœä½ ä½¿ç”¨ç½‘ç»œä½¿ç”¨é˜²ç«å¢™ï¼Œä½ å¾ˆæœ‰å¯èƒ½éœ€è¦è®¾å®šæ¤é¡¹."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr "ä½¿ç”¨STUN(n)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "STUNæœåŠ¡å™¨(S)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr "å¸æˆ·æ³¨å†Œ"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "æå–œï¼"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "é¢‘çŽ‡"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "æ¯”çŽ‡"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr "å¸¦å®½"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr "ALSAæ’ä»¶"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr "è¾“å‡º"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr "è¾“å…¥"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr "å£°éŸ³çŠ¶æ€æ£€æµ‹(V)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr "é™å™ªå¤„ç†-çª„é¢‘åŽ‹ç¼©(N)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr "éŸ³é¢‘ç®¡ç†å™¨"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "Pulseaudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr "ALSAè®¾ç½®"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "Codecsç¼–ç "
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "è®°å½•"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr "ç›®æ ‡æ–‡ä»¶å¤¹"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr "é€‰æ‹©æ–‡ä»¶å¤¹"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr "é“ƒå£°"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr "å¯ç”¨é“ƒå£°(E)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr "é€‰æ‹©é“ƒå£°"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr "éŸ³é¢‘æ–‡ä»¶"
 
@@ -982,69 +1002,62 @@ msgstr "é‡è®¾ç”µè¯å·ç "
 msgid "_Prefix dialed numbers with"
 msgstr "å·ç å‰ç¼€(P)"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr "æ¡Œé¢æç¤º"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr "å¯ç”¨æç¤º(E)"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr "ç³»ç»Ÿæ‰˜ç›˜å›¾æ ‡"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr "æ¥ç”µæ—¶å¼¹å‡ºä¸»çª—å£(P)"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr "ä»Žä¸å¼¹å‡ºä¸»çª—å£(v)"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr "åœ¨å¯åŠ¨æ—¶éšè—SFLphoneä¸»çª—å£"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr "æ‹¨å·åŽ†å²"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr "é¦–é€‰é¡¹"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "åœ°å€ç°¿"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr "é’©é”®"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr ""
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr ""
@@ -1062,55 +1075,59 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -1134,6 +1151,14 @@ msgstr ""
 msgid "Display SAS once for hold events"
 msgstr ""
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr "æŸ¥è¯¢æ‰€æœ‰"
@@ -1157,23 +1182,20 @@ msgstr "ä»Žæ¥ç”µä¸æŸ¥è¯¢"
 msgid "Search by outgoing call"
 msgstr "ä»Žæ‹¨å‡ºç”µè¯ä¸æŸ¥è¯¢"
 
-#~ msgid "IP call - %s"
-#~ msgstr "IP ç”µè¯ - %s"
-
-#~ msgid "Codec"
-#~ msgstr "ç¼–ç "
-
-#~ msgid "Network"
-#~ msgstr "ç½‘ç»œ"
-
-#~ msgid "_Mute other applications during a call"
-#~ msgstr "å½“æœ‰æ¥ç”µæ—¶é™éŸ³å…¶å®ƒåº”ç”¨ç¨‹åº(c)"
-
-#~ msgid "SIP Port"
-#~ msgstr "SIPç«¯å£å·"
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>é”™è¯¯ï¼šæ— æ³•æ‰¾åˆ°codecsç¼–ç æ–‡ä»¶.\n"
+#~ "\n"
+#~ "</b> SFLå£°éŸ³codecsæ–‡ä»¶åº”ä½äºŽ<i>%s</i> æˆ– ä½äºŽä¸»ç›®å½•( <i>%s</i> )çš„<b>."
+#~ "sflphone</b>ç›®å½•ä¸‹"
 
-#~ msgid "Enable voicemail _notifications"
-#~ msgstr "å¯ç”¨è¯éŸ³é‚®ç®±æç¤º(n)"
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "å·²é…ç½®äº†%iä¸ªè´¦æˆ·"
 
 #~ msgid "Account creation wizard"
 #~ msgstr "å¸æˆ·åˆ›å»ºå‘å¯¼"
@@ -1192,8 +1214,8 @@ msgstr "ä»Žæ‹¨å‡ºç”µè¯ä¸æŸ¥è¯¢"
 #~ "account."
 #~ msgstr "å½“æ‚¨æ£€æŸ¥å®Œé€‰å®šçš„è®¾ç½®, è¯·ç‚¹å‡»\"ç»“æŸ\"æ¥åˆ›å»ºå¸æˆ·"
 
-#~ msgid "Default account"
-#~ msgstr "é»˜è®¤å¸æˆ·"
+#~ msgid "Codec"
+#~ msgstr "ç¼–ç "
 
 #~ msgid "SFLphone KDE Client"
 #~ msgstr "SFLphone KDEå®¢æˆ·ç«¯"
@@ -1381,6 +1403,9 @@ msgstr "ä»Žæ‹¨å‡ºç”µè¯ä¸æŸ¥è¯¢"
 #~ msgid "On start"
 #~ msgstr "æ£åœ¨å¯åŠ¨"
 
+#~ msgid "SIP Port"
+#~ msgstr "SIPç«¯å£å·"
+
 #~ msgid "Trigger on specific SIP header"
 #~ msgstr "æ¿€æ´»æŒ‡å®šçš„SIPå¤´"
 
@@ -1396,12 +1421,21 @@ msgstr "ä»Žæ‹¨å‡ºç”µè¯ä¸æŸ¥è¯¢"
 #~ msgid "Attention:number of results exceeds max displayed."
 #~ msgstr "æ³¨æ„:ç»“æžœè¶…è¿‡å¯æ˜¾ç¤ºçš„æœ€å¤§å€¼"
 
+#~ msgid "IP call - %s"
+#~ msgstr "IP ç”µè¯ - %s"
+
 #~ msgid "_Enable this account"
 #~ msgstr "å¯ç”¨è¯¥è´¦æˆ·(E)"
 
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "å¯ç”¨è¯éŸ³é‚®ç®±æç¤º(n)"
+
 #~ msgid "PulseAudio sound server"
 #~ msgstr "PulseAudioæœåŠ¡å™¨"
 
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "å½“æœ‰æ¥ç”µæ—¶é™éŸ³å…¶å®ƒåº”ç”¨ç¨‹åº(c)"
+
 #~ msgid "Port"
 #~ msgstr "ç«¯å£"
 
@@ -1702,7 +1736,8 @@ msgstr "ä»Žæ‹¨å‡ºç”µè¯ä¸æŸ¥è¯¢"
 #~ "Yun Liu, ,Launchpad Contributions:,Aron Xu,Yun Liu, ,Launchpad "
 #~ "Contributions:,Aron Xu,Yinghua Wang,Yun Liu,rainofchaos, ,Launchpad "
 #~ "Contributions:,Aron Xu,Yinghua Wang,Yun Liu,å†¯è¶…, ,Launchpad "
-#~ "Contributions:,Aron Xu,Emmanuel Milou,Yun Liu,å†¯è¶…,çŽ‹è‹±åŽ"
+#~ "Contributions:,Aron Xu,Emmanuel Milou,Yun Liu,å†¯è¶…,çŽ‹è‹±åŽ, ,Launchpad "
+#~ "Contributions:,Aron Xu,Emmanuel Milou,Yun Liu,wzssyqa,å†¯è¶…,çŽ‹è‹±åŽ"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
@@ -1710,4 +1745,5 @@ msgstr "ä»Žæ‹¨å‡ºç”µè¯ä¸æŸ¥è¯¢"
 #~ "yunliu2000@gmail.com,,,happyaron.xu@gmail.com,,,,happyaron.xu@gmail.com,,,"
 #~ "rainofchaos@gmail.com,,,happyaron.xu@gmail.com,,,rainofchaos@gmail.com,,,,"
 #~ "emmanuel.milou@savoirfairelinux.com,,rainofchaos@gmail.com,"
-#~ "wantinghard@gmail.com"
+#~ "wantinghard@gmail.com,,,,emmanuel.milou@savoirfairelinux.com,,"
+#~ "wzssyqa@gmail.com,rainofchaos@gmail.com,wantinghard@gmail.com"
diff --git a/lang/zh_HK/zh_HK.po b/lang/zh_HK/zh_HK.po
index 0e4afca0c52ab6cb04c97d2e67f3c4fd39c9c273..4acf258abd3121087e7fcf25f2b954951b3fcff9 100644
--- a/lang/zh_HK/zh_HK.po
+++ b/lang/zh_HK/zh_HK.po
@@ -8,68 +8,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-10-26 20:46+0000\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2009-12-03 18:09+0000\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr "å·²è¨»å†Š"
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr "æœªè¨»å†Š"
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr "æ£åœ¨é€£æŽ¥..."
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr "è¨»å†Šå¤±æ•—"
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr "ç¶²è·¯é€£ç·šå¤±æ•—"
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr "ä¼ºæœå™¨é€£ç·šå¤±æ•—"
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr "Stuné…ç½®æœ‰èª¤"
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr "Stunä¼ºæœå™¨ç„¡æ•ˆ"
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr "ç„¡æ•ˆ"
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr "ä½¿ç”¨è³¬æˆ¶"
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr "æ²’æœ‰å·²è¨»å†Šå¸³æˆ¶"
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
@@ -77,23 +81,26 @@ msgstr ""
 "é€£æŽ¥SFLphoneä¼ºæœå™¨å¤±æ•—.\n"
 "è«‹æ ¸æŸ¥daemonæ˜¯å¦æ£åœ¨é‹è¡Œ."
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
-"<b>éŒ¯èª¤ï¼šç„¡æ³•æ‰¾åˆ°éŸ³è¨Šç·¨ç¢¼æª”æ¡ˆ.\n"
-"\n"
-"</b> SFLè²éŸ³ç·¨ç¢¼æª”æ¡ˆæ‡‰è©²ä½äºŽ<i>%s</i> æˆ–è€…ä½äºŽä¸»ç›®éŒ„( <i>%s</i> )çš„<b>."
-"sflphone</b>ç›®éŒ„ä¸‹"
 
 #: ../sflphone-client-gnome/src/errors.c:29
 msgid ""
@@ -125,65 +132,65 @@ msgstr ""
 "\n"
 "Pulseaudioæœªé‹è¡Œ"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr "æœ‰ä¸€å€‹é›»è©±æ£åœ¨è™•ç†ä¸."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr "æœ‰é›»è©±æ£åœ¨è™•ç†ä¸."
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr "ç¢ºèªè¦é€€å‡º?"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr "SFLphone å‡ºéŒ¯"
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr ""
 
@@ -251,443 +258,460 @@ msgstr "æšè²å™¨éŸ³é‡"
 msgid "Mic volume"
 msgstr "è©±ç’éŸ³é‡"
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr "é¡¯ç¤ºä¸»çª—å£(S)"
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr "æ”¾ä¸‹(H)"
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
-#, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
-msgstr[0] "å·²é…ç½®äº†%iå€‹è³¬æˆ¶"
+#: ../sflphone-client-gnome/src/statusicon.c:189
+#, fuzzy, c-format
+msgid "%i active account"
+msgid_plural "%i active accounts"
+msgstr[0] "é»˜èªå¸³æˆ¶"
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr "èªžéŸ³éƒµä»¶"
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr "åœ°å€ç°¿"
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr "åœ°å€ç°¿"
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
+#, c-format
 msgid "Voicemail (%i)"
 msgstr "èªžéŸ³éƒµä»¶ (%i)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphoneæ˜¯ä¸€å€‹VoIPå®¢æˆ¶ç«¯ï¼Œå®ƒå…¼å®¹SIPå’ŒIAX2åè®®."
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr "æœ‰é—œSFLphone"
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr "é›»è©±"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr "æ–°é›»è©±(N)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr "æ’¥å‡º(P)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr "æ”¾ä¸‹(H)"
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr "å¾…æœº"
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr "æ¢å¤é€šè©±"
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr "è¨˜éŒ„(R)"
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr "Stuné…ç½®æœ‰èª¤"
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr "%d å€‹èªžéŸ³éƒµä»¶"
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr "ç·¨è¼¯(E)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr "ç·¨è¼¯(E)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr "åˆªé™¤æ‰€é¸è³¬æˆ¶"
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr "æ¸…ç©ºæ›†å²è¨˜éŒ„(C)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr "æ¸…ç©ºæ›†å²è¨˜éŒ„"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr "å¸³æˆ¶(A)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr "ç•¶å‰å¸³æˆ¶"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr "å±¬æ€§"
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr "æŸ¥çœ‹(V)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr "å¹«åŠ©(H)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr "è½‰æŽ¥"
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
-msgstr "è½‰çµ¦: "
+msgstr "è½‰çµ¦:"
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr "è¨˜éŒ„(R)"
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr "é¡¯ç¤ºæ’¥è™Ÿéµç›¤"
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr "éŸ³é‡æŽ§åˆ¶(V)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr "éŸ³é‡æŽ§åˆ¶(V)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr "æ·å²"
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr "å‘¼å«è¨˜éŒ„"
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr "åœ°å€ç°¿"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr "å¾…æœº"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr "å›žå«(C)"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr "ç·¨è¼¯é›»è©±è™Ÿç¢¼"
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr "æ’¥å‡ºé›»è©±å‰ç·¨è¼¯é›»è©±è™Ÿç¢¼"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr "å¸³æˆ¶ç›¸é—œåƒæ•¸"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr "åˆ¥ç¨±(A)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr "å”è°(P)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr "æœªçŸ¥"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr "ä¸»æœºåç¨±(H)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr "ä½¿ç”¨è€…åç¨±(U)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr "å¯†ç¢¼(P)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr "å¯†ç¢¼"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr "èªžéŸ³éƒµç®±(V)"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+#, fuzzy
+msgid "_User-agent"
+msgstr "ä½¿ç”¨è€…åç¨±(U)"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr "ç¶²è·¯é€£ç·šå¤±æ•—"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr "å¸³æˆ¶è¨ç½®"
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr "ç·¨ç¢¼"
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr "å”è°"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr "ç‹€æ…‹"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr "å¸³æˆ¶"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr "å·²é…ç½®å¸³æˆ¶"
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
 #, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
 msgstr[0] ""
+msgstr[1] ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr "å¸¸ç”¨é…ç½®"
 
@@ -732,7 +756,7 @@ msgid "Select which Evolution address books to use"
 msgstr "é¸æ“‡ä½¿ç”¨å¦‚ä¸‹Evolutionåœ°å€è–„"
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr "åç¨±"
 
@@ -771,181 +795,177 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr "SFLphoneè³¬æˆ¶å‰µå»ºåš®å°Ž"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr "æ¡è¿Žä½¿ç”¨SFLphoneå¸³æˆ¶å‰µå»ºåš®å°Ž!"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr "å®‰è£å‘å°Žå°‡å¹«åŠ©æ‚¨é…ç½®å¸³æˆ¶"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr "VoIPå”è°"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr "é¸æ“‡å¸³æˆ¶é¡žåž‹"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP(æœƒè©±åˆå§‹åŒ–å”è°)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2(Asteriskå…§éƒ¨äº¤æ›å”è°)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr "å¸³æˆ¶"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr "è«‹é¸æ“‡ä»¥ä¸‹é¸é …ä¸çš„ä¸€å€‹"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr "åœ¨sflphone.orgä¸Šå‰µå»ºå…è²»çš„SIP/IAX2å¸³æˆ¶"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr "è¨»å†Šå·²å˜åœ¨çš„SIPæˆ–IAX2å¸³æˆ¶"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr "SIPå¸³æˆ¶é…ç½®"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr "è«‹å¡«å¯«å¦‚ä¸‹ä¿¡æ¯"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr "å¯é¸éƒµä»¶åœ°å€"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr "é€™å€‹éƒµä»¶åœ°å€å°‡è¢«ç”¨ä¾†ç™¼é€æ‚¨çš„èªžéŸ³"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr "éƒµä»¶åœ°å€(E)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr "IAX2å¸³æˆ¶é…ç½®"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr "ç½‘ç»œåœ°å€è§£æž(NAT)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "å¦‚æžœä½ ä½¿ç”¨ç¶²è·¯é˜²ç«ç‰†ï¼Œä½ å¾ˆæœ‰å¯èƒ½éœ€è¦è¨å®šè©²é …."
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr "å•Ÿç”¨STUN(n)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr "STUNä¼ºæœå™¨(S)"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr "å¸³æˆ¶è¨»å†Š"
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr "æå–œï¼"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr "é¡°å¾‹"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr "æ¯”çŽ‡"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr "é¡°å¯¬"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr "ALSAæ’ä»¶"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr "è¼¸å‡º"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr "è¼¸å…¥"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr "è²éŸ³ç‹€æ…‹æª¢æ¸¬(V)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr "é™å™ªè™•ç†-çª„é »å£“ç¸®(N)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr "è²éŸ³ç®¡ç†å™¨"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr "Pulseaudio"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr "ALSA"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr "ALSA é…ç½®"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr "ç·¨ç¢¼"
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr "è¨˜éŒ„"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr "ç›®æ¨™æ–‡ä»¶å¤¾"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr "é¸æ“‡æ–‡ä»¶å¤¾"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr "éˆ´è²"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr "å•Ÿå‹•éˆ´è²(E)"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr "éˆ´è²é¸æ“‡"
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr "éŸ³è¨Šæª”æ¡ˆ"
 
@@ -982,69 +1002,62 @@ msgstr "é‡è¨é›»è©±è™Ÿç¢¼"
 msgid "_Prefix dialed numbers with"
 msgstr "è™Ÿç¢¼å‰ç¶´(P)"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr "æ¡Œé¢æç¤º"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr "å•Ÿå‹•æç¤º(E)"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr "ç³»çµ±æ‰˜ç›¤åœ–æ¨™"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr "ä¾†é›»è©±æ™‚å½ˆå‡ºä¸»è¦–çª—(P)"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr "å¾žä¸å½ˆå‡ºä¸»è¦–çª—(v)"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr "åœ¨å•Ÿå‹•æ™‚éš±è—SFLphoneä¸»çª—å£"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr "æ‰“é›»è©±æ·å²"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr "å±¬æ€§"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr "åœ°å€ç°¿"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr "é‰¤éµ"
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr ""
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr ""
@@ -1062,55 +1075,59 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -1134,6 +1151,14 @@ msgstr ""
 msgid "Display SAS once for hold events"
 msgstr ""
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr "æŸ¥è©¢æ‰€æœ‰"
@@ -1157,20 +1182,20 @@ msgstr "å¾žä¾†é›»ä¸æŸ¥è©¢"
 msgid "Search by outgoing call"
 msgstr "å¾žæ’¥å‡ºé›»è©±ä¸æŸ¥è©¢"
 
-#~ msgid "IP call - %s"
-#~ msgstr "IPé›»è©±- %s"
-
-#~ msgid "Codec"
-#~ msgstr "ç·¨ç¢¼"
-
-#~ msgid "_Mute other applications during a call"
-#~ msgstr "ç•¶æœ‰ä¾†é›»æ™‚éœéŸ³å…¶å®ƒæ‡‰ç”¨ç¨‹åº(c)"
-
-#~ msgid "SIP Port"
-#~ msgstr "SIPç«¯å£"
+#~ msgid ""
+#~ "<b>Error: No audio codecs found.\n"
+#~ "\n"
+#~ "</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>."
+#~ "sflphone</b> directory in your home( <i>%s</i> )"
+#~ msgstr ""
+#~ "<b>éŒ¯èª¤ï¼šç„¡æ³•æ‰¾åˆ°éŸ³è¨Šç·¨ç¢¼æª”æ¡ˆ.\n"
+#~ "\n"
+#~ "</b> SFLè²éŸ³ç·¨ç¢¼æª”æ¡ˆæ‡‰è©²ä½äºŽ<i>%s</i> æˆ–è€…ä½äºŽä¸»ç›®éŒ„( <i>%s</i> )çš„<b>."
+#~ "sflphone</b>ç›®éŒ„ä¸‹"
 
-#~ msgid "Enable voicemail _notifications"
-#~ msgstr "å•Ÿç”¨èªžéŸ³éƒµç®±æç¤º(n)"
+#~ msgid "%i account configured"
+#~ msgid_plural "%i accounts configured"
+#~ msgstr[0] "å·²é…ç½®äº†%iå€‹è³¬æˆ¶"
 
 #~ msgid "Account creation wizard"
 #~ msgstr "å¸³æˆ¶å‰µå»ºå‘å°Ž"
@@ -1189,8 +1214,8 @@ msgstr "å¾žæ’¥å‡ºé›»è©±ä¸æŸ¥è©¢"
 #~ "account."
 #~ msgstr "ç•¶æ‚¨æª¢æŸ¥å®Œé¸å®šçš„è¨ç½®,è«‹é»žæ“Š\"çµæŸ\"ä¾†å‰µå»ºå¸³æˆ¶"
 
-#~ msgid "Default account"
-#~ msgstr "é»˜èªå¸³æˆ¶"
+#~ msgid "Codec"
+#~ msgstr "ç·¨ç¢¼"
 
 #~ msgid "SFLphone KDE Client"
 #~ msgstr "SFLphone KDEå®¢æˆ¶ç«¯"
@@ -1375,6 +1400,9 @@ msgstr "å¾žæ’¥å‡ºé›»è©±ä¸æŸ¥è©¢"
 #~ msgid "On start"
 #~ msgstr "æ£åœ¨å•Ÿå‹•"
 
+#~ msgid "SIP Port"
+#~ msgstr "SIPç«¯å£"
+
 #~ msgid "Trigger on specific SIP header"
 #~ msgstr "æ¿€æ´»æŒ‡å®šçš„SIPé "
 
@@ -1390,15 +1418,24 @@ msgstr "å¾žæ’¥å‡ºé›»è©±ä¸æŸ¥è©¢"
 #~ msgid "Attention:number of results exceeds max displayed."
 #~ msgstr "æ³¨æ„:çµæžœè¶…éŽå¯é¡¯ç¤ºçš„æœ€å¤§å€¼"
 
+#~ msgid "IP call - %s"
+#~ msgstr "IPé›»è©±- %s"
+
 #~ msgid "_Account creation wizard"
 #~ msgstr "å¸³æˆ¶å‰µå»ºå‘å°Ž(A)"
 
 #~ msgid "_Enable this account"
 #~ msgstr "å•Ÿç”¨è©²è³¬æˆ¶(E)"
 
+#~ msgid "Enable voicemail _notifications"
+#~ msgstr "å•Ÿç”¨èªžéŸ³éƒµç®±æç¤º(n)"
+
 #~ msgid "PulseAudio sound server"
 #~ msgstr "PulseAudioè²éŸ³ä¼ºæœå™¨"
 
+#~ msgid "_Mute other applications during a call"
+#~ msgstr "ç•¶æœ‰ä¾†é›»æ™‚éœéŸ³å…¶å®ƒæ‡‰ç”¨ç¨‹åº(c)"
+
 #~ msgid "Port"
 #~ msgstr "ç«¯å£"
 
@@ -1697,10 +1734,12 @@ msgstr "å¾žæ’¥å‡ºé›»è©±ä¸æŸ¥è©¢"
 #~ msgstr ""
 #~ "Yun Liu, ,Launchpad Contributions:,Yun Liu, ,Launchpad Contributions:,"
 #~ "Emmanuel Milou,Yun Liu, ,Launchpad Contributions:,Emmanuel Milou,Yun "
-#~ "Liu, ,Launchpad Contributions:,Emmanuel Milou,Yun Liu"
+#~ "Liu, ,Launchpad Contributions:,Emmanuel Milou,Yun Liu, ,Launchpad "
+#~ "Contributions:,Emmanuel Milou,Yun Liu"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
 #~ msgstr ""
 #~ "yunliu2000@gmail.com,,,,,,emmanuel.milou@savoirfairelinux.com,,,,emmanuel."
-#~ "milou@savoirfairelinux.com,,,,emmanuel.milou@savoirfairelinux.com,"
+#~ "milou@savoirfairelinux.com,,,,emmanuel.milou@savoirfairelinux.com,,,,"
+#~ "emmanuel.milou@savoirfairelinux.com,"
diff --git a/lang/zh_TW/zh_TW.po b/lang/zh_TW/zh_TW.po
index f7992fe2b8f76bbd50a4020b21be7c9adf76de4e..0e64a8ba796429f97236ee146e83a68516c78609 100644
--- a/lang/zh_TW/zh_TW.po
+++ b/lang/zh_TW/zh_TW.po
@@ -7,85 +7,96 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-03 10:22-0500\n"
-"PO-Revision-Date: 2009-10-26 20:46+0000\n"
+"POT-Creation-Date: 2010-03-02 10:23-0500\n"
+"PO-Revision-Date: 2009-12-03 18:12+0000\n"
 "Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
 "Language-Team: Traditional Chinese <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-12-03 15:32+0000\n"
+"X-Launchpad-Export-Date: 2010-03-01 23:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../sflphone-client-gnome/src/accountlist.c:175
+#: ../sflphone-client-gnome/src/accountlist.c:170
 msgid "Registered"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:178
+#: ../sflphone-client-gnome/src/accountlist.c:173
 msgid "Not Registered"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:181
+#: ../sflphone-client-gnome/src/accountlist.c:176
 msgid "Trying..."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:184
+#: ../sflphone-client-gnome/src/accountlist.c:179
 #: ../sflphone-client-gnome/src/sflnotify.c:131
 #: ../sflphone-client-gnome/src/sflnotify.c:148
 msgid "Error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:187
+#: ../sflphone-client-gnome/src/accountlist.c:182
 msgid "Authentication Failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:190
+#: ../sflphone-client-gnome/src/accountlist.c:185
 msgid "Network unreachable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:193
+#: ../sflphone-client-gnome/src/accountlist.c:188
 msgid "Host unreachable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:196
+#: ../sflphone-client-gnome/src/accountlist.c:191
 msgid "Stun configuration error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:199
+#: ../sflphone-client-gnome/src/accountlist.c:194
 msgid "Stun server invalid"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/accountlist.c:202
+#: ../sflphone-client-gnome/src/accountlist.c:197
+msgid "Ready"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/accountlist.c:200
 msgid "Invalid"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:98
+#: ../sflphone-client-gnome/src/actions.c:114
 msgid "Using account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:104
+#: ../sflphone-client-gnome/src/actions.c:121
 msgid "No registered accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:285
+#: ../sflphone-client-gnome/src/actions.c:306
 msgid ""
 "Unable to connect to the SFLphone server.\n"
 "Make sure the daemon is running."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:589
-#: ../sflphone-client-gnome/src/actions.c:911
+#: ../sflphone-client-gnome/src/actions.c:607
+#: ../sflphone-client-gnome/src/actions.c:931
 msgid "Direct SIP call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/actions.c:1103
-#, c-format
-msgid ""
-"<b>Error: No audio codecs found.\n"
-"\n"
-"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
-"b> directory in your home( <i>%s</i> )"
+#: ../sflphone-client-gnome/src/callable_obj.c:379
+msgid "today at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:382
+msgid "yesterday at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:384
+msgid "%A at %R"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/callable_obj.c:388
+msgid "%x at %R"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/errors.c:29
@@ -109,65 +120,65 @@ msgid ""
 "Pulseaudio is not running"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:73
+#: ../sflphone-client-gnome/src/mainwindow.c:94
 msgid "There is one call in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:77
+#: ../sflphone-client-gnome/src/mainwindow.c:98
 msgid "There are calls in progress."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:86
+#: ../sflphone-client-gnome/src/mainwindow.c:103
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:298
+#: ../sflphone-client-gnome/src/mainwindow.c:331
 msgid "SFLphone Error"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:392
+#: ../sflphone-client-gnome/src/mainwindow.c:450
 #, c-format
 msgid "ZRTP is not supported by peer %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:393
+#: ../sflphone-client-gnome/src/mainwindow.c:452
 msgid "Secure Communication Unavailable"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:394
-#: ../sflphone-client-gnome/src/mainwindow.c:416
+#: ../sflphone-client-gnome/src/mainwindow.c:454
+#: ../sflphone-client-gnome/src/mainwindow.c:484
 msgid "Continue"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:395
-#: ../sflphone-client-gnome/src/mainwindow.c:417
-#: ../sflphone-client-gnome/src/mainwindow.c:431
+#: ../sflphone-client-gnome/src/mainwindow.c:455
+#: ../sflphone-client-gnome/src/mainwindow.c:485
+#: ../sflphone-client-gnome/src/mainwindow.c:506
 msgid "Stop Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:414
+#: ../sflphone-client-gnome/src/mainwindow.c:480
 #, c-format
 msgid ""
 "A %s error forced the call with %s to fall under unencrypted mode.\n"
 "Exact reason: %s\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:415
+#: ../sflphone-client-gnome/src/mainwindow.c:482
 msgid "ZRTP negotiation failed"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:428
+#: ../sflphone-client-gnome/src/mainwindow.c:500
 #, c-format
 msgid ""
 "%s wants to stop using secure communication. Confirm will resume "
 "conversation without SRTP.\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:429
+#: ../sflphone-client-gnome/src/mainwindow.c:502
 msgid "Confirm Go Clear"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/mainwindow.c:430
+#: ../sflphone-client-gnome/src/mainwindow.c:504
 msgid "Confirm"
 msgstr ""
 
@@ -236,445 +247,459 @@ msgstr ""
 msgid "Mic volume"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:96
+#: ../sflphone-client-gnome/src/statusicon.c:128
 msgid "_Show main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:131
+#: ../sflphone-client-gnome/src/statusicon.c:135
+#: ../sflphone-client-gnome/src/uimanager.c:805
+#: ../sflphone-client-gnome/src/uimanager.c:1119
+#: ../sflphone-client-gnome/src/uimanager.c:1161
+msgid "_Hang up"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/statusicon.c:187
 msgid "SFLphone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/statusicon.c:132
+#: ../sflphone-client-gnome/src/statusicon.c:189
 #, c-format
-msgid "%i account configured"
-msgid_plural "%i accounts configured"
+msgid "%i active account"
+msgid_plural "%i active accounts"
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../sflphone-client-gnome/src/toolbar.c:38
-#: ../sflphone-client-gnome/src/uimanager.c:693
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:770
+#: ../sflphone-client-gnome/src/uimanager.c:814
 msgid "Voicemail"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:117
+#: ../sflphone-client-gnome/src/uimanager.c:121
 msgid "No address book selected"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:137
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:144
+#: ../sflphone-client-gnome/src/uimanager.c:862
 msgid "Address book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:279
+#: ../sflphone-client-gnome/src/uimanager.c:327
 #, c-format
 msgid "Voicemail (%i)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:342
+#: ../sflphone-client-gnome/src/uimanager.c:396
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:345
+#: ../sflphone-client-gnome/src/uimanager.c:398
 msgid "About SFLphone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:719
+#: ../sflphone-client-gnome/src/uimanager.c:800
 msgid "Call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
-#: ../sflphone-client-gnome/src/uimanager.c:1184
+#: ../sflphone-client-gnome/src/uimanager.c:801
+#: ../sflphone-client-gnome/src/uimanager.c:1311
 msgid "_New call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:720
+#: ../sflphone-client-gnome/src/uimanager.c:802
 msgid "Place a new call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
-#: ../sflphone-client-gnome/src/uimanager.c:979
+#: ../sflphone-client-gnome/src/uimanager.c:803
+#: ../sflphone-client-gnome/src/uimanager.c:1107
 msgid "_Pick up"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:721
+#: ../sflphone-client-gnome/src/uimanager.c:804
 msgid "Answer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:722
-#: ../sflphone-client-gnome/src/uimanager.c:991
-#: ../sflphone-client-gnome/src/uimanager.c:1032
-msgid "_Hang up"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:722
+#: ../sflphone-client-gnome/src/uimanager.c:806
 msgid "Finish the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:807
 msgid "O_n hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:723
+#: ../sflphone-client-gnome/src/uimanager.c:808
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:809
 msgid "O_ff hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:724
+#: ../sflphone-client-gnome/src/uimanager.c:810
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:725
-#: ../sflphone-client-gnome/src/uimanager.c:1015
-msgid "_Record"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:725
-msgid "Record the current conversation"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:811
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:726
+#: ../sflphone-client-gnome/src/uimanager.c:812
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:727
+#: ../sflphone-client-gnome/src/uimanager.c:815
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:816
 msgid "_Close"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:728
+#: ../sflphone-client-gnome/src/uimanager.c:817
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:818
 msgid "_Quit"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:729
+#: ../sflphone-client-gnome/src/uimanager.c:819
 msgid "Quit the program"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:732
+#: ../sflphone-client-gnome/src/uimanager.c:822
 msgid "_Edit"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:823
 msgid "_Copy"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:733
+#: ../sflphone-client-gnome/src/uimanager.c:824
 msgid "Copy the selection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:825
 msgid "_Paste"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:734
+#: ../sflphone-client-gnome/src/uimanager.c:826
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:827
 msgid "Clear _history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:735
+#: ../sflphone-client-gnome/src/uimanager.c:828
 msgid "Clear the call history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "_Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:736
+#: ../sflphone-client-gnome/src/uimanager.c:829
 msgid "Edit your accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:831
 msgid "_Preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:737
+#: ../sflphone-client-gnome/src/uimanager.c:832
 msgid "Change your preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:740
+#: ../sflphone-client-gnome/src/uimanager.c:835
 msgid "_View"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:743
+#: ../sflphone-client-gnome/src/uimanager.c:838
 msgid "_Help"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:839
 msgid "Contents"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:744
+#: ../sflphone-client-gnome/src/uimanager.c:840
 msgid "Open the manual"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:745
+#: ../sflphone-client-gnome/src/uimanager.c:841
 msgid "About this application"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:849
 msgid "_Transfer"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:751
+#: ../sflphone-client-gnome/src/uimanager.c:850
 msgid "Transfer the call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:851
+#: ../sflphone-client-gnome/src/uimanager.c:1143
+msgid "_Record"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:852
+msgid "Record the current conversation"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/uimanager.c:853
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:752
+#: ../sflphone-client-gnome/src/uimanager.c:854
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:855
 msgid "_Dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:753
+#: ../sflphone-client-gnome/src/uimanager.c:856
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:857
 msgid "_Volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:754
+#: ../sflphone-client-gnome/src/uimanager.c:858
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:859
 msgid "_History"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:755
+#: ../sflphone-client-gnome/src/uimanager.c:860
 msgid "Calls history"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:756
+#: ../sflphone-client-gnome/src/uimanager.c:861
 msgid "_Address book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1003
-#: ../sflphone-client-gnome/src/uimanager.c:1044
+#: ../sflphone-client-gnome/src/uimanager.c:1131
+#: ../sflphone-client-gnome/src/uimanager.c:1173
 msgid "On _Hold"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1107
+#: ../sflphone-client-gnome/src/uimanager.c:1234
 msgid "_Call back"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1258
+#: ../sflphone-client-gnome/src/uimanager.c:1390
 msgid "Edit phone number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/uimanager.c:1269
+#: ../sflphone-client-gnome/src/uimanager.c:1402
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:180
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:241
 msgid "Account Parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:189
-#: ../sflphone-client-gnome/src/config/assistant.c:314
-#: ../sflphone-client-gnome/src/config/assistant.c:427
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
+#: ../sflphone-client-gnome/src/config/assistant.c:315
+#: ../sflphone-client-gnome/src/config/assistant.c:428
 msgid "_Alias"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:197
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:258
 msgid "_Protocol"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:215
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:276
 msgid "Unknown"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:225
-#: ../sflphone-client-gnome/src/config/assistant.c:322
-#: ../sflphone-client-gnome/src/config/assistant.c:435
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:286
+#: ../sflphone-client-gnome/src/config/assistant.c:323
+#: ../sflphone-client-gnome/src/config/assistant.c:436
 msgid "_Host name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:233
-#: ../sflphone-client-gnome/src/config/assistant.c:330
-#: ../sflphone-client-gnome/src/config/assistant.c:443
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:294
+#: ../sflphone-client-gnome/src/config/assistant.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:444
 msgid "_User name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:250
-#: ../sflphone-client-gnome/src/config/assistant.c:346
-#: ../sflphone-client-gnome/src/config/assistant.c:458
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:311
+#: ../sflphone-client-gnome/src/config/assistant.c:347
+#: ../sflphone-client-gnome/src/config/assistant.c:459
 msgid "_Password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:270
-#: ../sflphone-client-gnome/src/config/assistant.c:363
-#: ../sflphone-client-gnome/src/config/assistant.c:473
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:331
+#: ../sflphone-client-gnome/src/config/assistant.c:364
+#: ../sflphone-client-gnome/src/config/assistant.c:474
 msgid "Show password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:274
-#: ../sflphone-client-gnome/src/config/assistant.c:368
-#: ../sflphone-client-gnome/src/config/assistant.c:478
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:335
+#: ../sflphone-client-gnome/src/config/assistant.c:369
+#: ../sflphone-client-gnome/src/config/assistant.c:479
 msgid "_Voicemail number"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:361
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:343
+msgid "_User-agent"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:431
 msgid "Authentication"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:362
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:432
 msgid "Secret"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:605
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:686
 msgid "Credential"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:640
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:720
 msgid "Authentication name"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:651
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:731
 msgid "Password"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:674
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:321
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:790
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1187
 msgid "Security"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:687
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:333
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:801
 msgid "Use TLS transport (sips)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:693
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:338
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:807
 msgid "SRTP key exchange"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:699
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:344
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:813
 msgid "Disabled"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:795
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:888
 msgid "Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:800
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:892
 msgid "Registration expire"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:809
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:901
 msgid "_Comply with RFC 3263"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:816
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:234
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:920
 msgid "Network Interface"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:830
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:249
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:933
 msgid "Local address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:880
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:301
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1000
 msgid "Local port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:893
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:928
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1037
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1068
 msgid "Published address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:899
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1041
 msgid "Using STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:906
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1048
 msgid "STUN server URL"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:914
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1056
 msgid "Same as local parameters"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:917
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1059
 msgid "Set published address and port:"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:936
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1077
 msgid "Published port"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1027
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1144
 msgid "Account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1046
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1166
 msgid "Basic"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1051
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1174
+#: ../sflphone-client-gnome/src/config/audioconf.c:913
+msgid "Codecs"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1182
 msgid "Advanced"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:164
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1195
+msgid "Network"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountconfigdialog.c:1360
+msgid ""
+"This profile is used when you want to reach a remote peer simply by typing a "
+"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
+"also be used if no account can be matched to an incoming or outgoing call."
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:131
 #, c-format
 msgid "Server returned \"%s\" (%d)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:389
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:421
 msgid "Protocol"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:396
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:429
 msgid "Status"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:474
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:511
 msgid "Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:484
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:521
 msgid "Configured Accounts"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:501
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:538
 #, c-format
 msgid "There is %d active account"
 msgid_plural "There are %d active accounts"
 msgstr[0] ""
+msgstr[1] ""
 
-#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:507
+#: ../sflphone-client-gnome/src/config/accountlistconfigdialog.c:544
 msgid "You have no active account"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:306
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:556
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:291
 msgid "General"
 msgstr ""
 
@@ -719,7 +744,7 @@ msgid "Select which Evolution address books to use"
 msgstr ""
 
 #: ../sflphone-client-gnome/src/config/addressbook-config.c:404
-#: ../sflphone-client-gnome/src/config/audioconf.c:577
+#: ../sflphone-client-gnome/src/config/audioconf.c:595
 msgid "Name"
 msgstr ""
 
@@ -758,181 +783,177 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:229
+#: ../sflphone-client-gnome/src/config/assistant.c:230
 msgid "SFLphone account creation wizard"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:255
+#: ../sflphone-client-gnome/src/config/assistant.c:256
 msgid "Welcome to the Account creation wizard of SFLphone!"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:256
+#: ../sflphone-client-gnome/src/config/assistant.c:257
 msgid "This installation wizard will help you configure an account."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "VoIP Protocols"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:270
+#: ../sflphone-client-gnome/src/config/assistant.c:271
 msgid "Select an account type"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:272
+#: ../sflphone-client-gnome/src/config/assistant.c:273
 msgid "SIP (Session Initiation Protocol)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:274
+#: ../sflphone-client-gnome/src/config/assistant.c:275
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:288
+#: ../sflphone-client-gnome/src/config/assistant.c:289
 msgid "Please select one of the following options"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:290
+#: ../sflphone-client-gnome/src/config/assistant.c:291
 msgid "Create a free SIP/IAX2 account on sflphone.org"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:292
+#: ../sflphone-client-gnome/src/config/assistant.c:293
 msgid "Register an existing SIP or IAX2 account"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
+#: ../sflphone-client-gnome/src/config/assistant.c:307
 msgid "SIP account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:306
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:307
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "Please fill the following information"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:376
-#: ../sflphone-client-gnome/src/config/assistant.c:405
+#: ../sflphone-client-gnome/src/config/assistant.c:377
+#: ../sflphone-client-gnome/src/config/assistant.c:406
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "Optional email address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:389
+#: ../sflphone-client-gnome/src/config/assistant.c:390
 msgid "This email address will be used to send your voicemail messages."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:397
+#: ../sflphone-client-gnome/src/config/assistant.c:398
 msgid "_Email address"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:419
+#: ../sflphone-client-gnome/src/config/assistant.c:420
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "Network Address Translation (NAT)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:496
+#: ../sflphone-client-gnome/src/config/assistant.c:497
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:505
+#: ../sflphone-client-gnome/src/config/assistant.c:506
 msgid "E_nable STUN"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:512
+#: ../sflphone-client-gnome/src/config/assistant.c:513
 msgid "_STUN server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Account Registration"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/assistant.c:526
+#: ../sflphone-client-gnome/src/config/assistant.c:527
 msgid "Congratulations!"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:582
+#: ../sflphone-client-gnome/src/config/audioconf.c:600
 msgid "Frequency"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:587
+#: ../sflphone-client-gnome/src/config/audioconf.c:605
 msgid "Bitrate"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:592
+#: ../sflphone-client-gnome/src/config/audioconf.c:610
 msgid "Bandwidth"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:670
+#: ../sflphone-client-gnome/src/config/audioconf.c:688
 msgid "ALSA plugin"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:692
+#: ../sflphone-client-gnome/src/config/audioconf.c:710
 msgid "Output"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:714
+#: ../sflphone-client-gnome/src/config/audioconf.c:732
 msgid "Input"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:749
+#: ../sflphone-client-gnome/src/config/audioconf.c:767
 msgid "_Voice Activity Detection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:759
+#: ../sflphone-client-gnome/src/config/audioconf.c:777
 msgid "_Noise Reduction (Narrow-Band Companding)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:800
+#: ../sflphone-client-gnome/src/config/audioconf.c:813
 msgid "Sound Manager"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:809
+#: ../sflphone-client-gnome/src/config/audioconf.c:822
 msgid "_Pulseaudio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:813
+#: ../sflphone-client-gnome/src/config/audioconf.c:826
 msgid "_ALSA"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:819
+#: ../sflphone-client-gnome/src/config/audioconf.c:832
 msgid "ALSA settings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:836
-msgid "Codecs"
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/audioconf.c:865
+#: ../sflphone-client-gnome/src/config/audioconf.c:853
 msgid "Recordings"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:869
+#: ../sflphone-client-gnome/src/config/audioconf.c:857
 msgid "Destination folder"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:873
+#: ../sflphone-client-gnome/src/config/audioconf.c:861
 msgid "Select a folder"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:879
+#: ../sflphone-client-gnome/src/config/audioconf.c:867
 msgid "Ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:885
+#: ../sflphone-client-gnome/src/config/audioconf.c:873
 msgid "_Enable ringtones"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:891
+#: ../sflphone-client-gnome/src/config/audioconf.c:879
 msgid "Choose a ringtone"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/audioconf.c:897
+#: ../sflphone-client-gnome/src/config/audioconf.c:885
 msgid "Audio Files"
 msgstr ""
 
@@ -969,69 +990,62 @@ msgstr ""
 msgid "_Prefix dialed numbers with"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:225
-msgid ""
-"This profile is used when you want to reach a remote peer simply by typing a "
-"sip URI such as <b>sip:remotepeer</b>. The settings you define here will "
-"also be used if no account can be matched to an incoming or outgoing call."
-msgstr ""
-
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:440
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:146
 msgid "Desktop Notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:444
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:151
 msgid "_Enable notifications"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:450
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:158
 msgid "System Tray Icon"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:453
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:168
+msgid "Show SFLphone in the system tray"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:175
 msgid "_Popup main window on incoming call"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:457
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:181
 msgid "Ne_ver popup main window"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:463
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:191
 msgid "Hide SFLphone window on _startup"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:469
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:205
 msgid "Calls History"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:472
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:209
 msgid "_Keep my history for at least"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:483
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:224
 msgid "days"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:536
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:270
 msgid "Preferences"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:561
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:297
 msgid "Audio"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:566
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:303
 msgid "Address Book"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:571
+#: ../sflphone-client-gnome/src/config/preferencesdialog.c:309
 msgid "Hooks"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/preferencesdialog.c:581
-msgid "Direct IP calls"
-msgstr ""
-
 #: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:38
 msgid "Advanced options for TLS"
 msgstr ""
@@ -1049,55 +1063,59 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:103
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+msgid "Global TLS listener (all accounts)"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:122
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:107
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:126
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:131
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:147
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:135
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:151
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:159
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:174
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:181
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:195
 msgid "Password for the private key"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:204
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:218
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:238
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:252
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:247
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:261
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:255
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:269
 msgid "Negotiation timeout (sec:msec)"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:272
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:286
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:278
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:292
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:284
+#: ../sflphone-client-gnome/src/config/tlsadvanceddialog.c:298
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -1121,6 +1139,14 @@ msgstr ""
 msgid "Display SAS once for hold events"
 msgstr ""
 
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:131
+msgid "SDES Options"
+msgstr ""
+
+#: ../sflphone-client-gnome/src/config/zrtpadvanceddialog.c:156
+msgid "Fallback on RTP on SDES failure"
+msgstr ""
+
 #: ../sflphone-client-gnome/src/contacts/searchbar.c:58
 msgid "Search all"
 msgstr ""
@@ -1149,10 +1175,11 @@ msgstr ""
 #~ msgstr ""
 #~ ",Launchpad Contributions:, ,Launchpad Contributions:,Emmanuel Milou, ,"
 #~ "Launchpad Contributions:,Emmanuel Milou, ,Launchpad Contributions:,"
-#~ "Emmanuel Milou"
+#~ "Emmanuel Milou, ,Launchpad Contributions:,Emmanuel Milou"
 
 #~ msgctxt "EMAIL OF TRANSLATORS"
 #~ msgid "Your emails"
 #~ msgstr ""
 #~ ",,,,emmanuel.milou@savoirfairelinux.com,,,emmanuel.milou@savoirfairelinux."
-#~ "com,,,emmanuel.milou@savoirfairelinux.com"
+#~ "com,,,emmanuel.milou@savoirfairelinux.com,,,emmanuel."
+#~ "milou@savoirfairelinux.com"
diff --git a/sflphone-client-gnome/VERSION b/sflphone-client-gnome/VERSION
index 06fa200552505d51e9a42251eb6ed4432c78ce90..c81aa44afbfcb4d1955b55e5276991aae023f039 100644
--- a/sflphone-client-gnome/VERSION
+++ b/sflphone-client-gnome/VERSION
@@ -1 +1 @@
-0.9.7~beta
+0.9.7
diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac
index f64a87384a524a50853ace3014dbbdf71104275d..a0e88ac300f36cc15f3bef118d9571acfb69d29d 100644
--- a/sflphone-client-gnome/configure.ac
+++ b/sflphone-client-gnome/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([SFLphone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([SFLphone],[0.9.7],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
 AM_CONFIG_HEADER(config.h)
 
 LT_INIT
diff --git a/sflphone-client-gnome/man/sflphone-client-gnome.pod b/sflphone-client-gnome/man/sflphone-client-gnome.pod
index 0880fd163409027fa38a676402c527b6ddd99ffb..471c8b7c93f4bf8ca1467c13611ce3090d53f98e 100644
--- a/sflphone-client-gnome/man/sflphone-client-gnome.pod
+++ b/sflphone-client-gnome/man/sflphone-client-gnome.pod
@@ -18,7 +18,7 @@ Please report bugs at https://projects.savoirfairelinux.com/projects/sflphone/is
 
 =head1 AUTHORS
 
-B<sflphone-client-gnome> is developed in Montreal by Savoir-Faire Linux Inc. The active developers are Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> and Yun Liu <yun.liu@savoirfairelinux.com>.
+B<sflphone-client-gnome> is developed in Montreal by Savoir-Faire Linux Inc.
 
 This manual page was written by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>.
 
diff --git a/sflphone-client-gnome/src/Makefile.am b/sflphone-client-gnome/src/Makefile.am
index 1f2eb25028fb0feb0338cbd606698395e788fb82..30e2a818e627c7026da2018fa058ffb532345f00 100644
--- a/sflphone-client-gnome/src/Makefile.am
+++ b/sflphone-client-gnome/src/Makefile.am
@@ -24,11 +24,13 @@ sflphone_client_gnome_SOURCES = \
   sliders.c \
   statusicon.c \
   codeclist.c \
-  reqaccount.c 
+  reqaccount.c \
+  shortcuts.c  
 
 noinst_HEADERS =  actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
                   reqaccount.h errors.h sflphone_const.h uimanager.h \
-                  accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h
+                  accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h \
+                  shortcuts.h
 
 sflphone_client_gnome_LDADD = $(DEPS_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(LIBSEXY_LIBS) $(LOG4C)
 
diff --git a/sflphone-client-gnome/src/config/Makefile.am b/sflphone-client-gnome/src/config/Makefile.am
index 3a4f01d7d7c5047c27768e044030ded027e5577e..e39b6dde1120a4b2c752df735a3c348c0ecbbf9c 100644
--- a/sflphone-client-gnome/src/config/Makefile.am
+++ b/sflphone-client-gnome/src/config/Makefile.am
@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libconfig.la
 
 libconfig_la_SOURCES = \
   addressbook-config.c \
+  shortcuts-config.c \
   assistant.c \
   preferencesdialog.c \
   accountlistconfigdialog.c \
diff --git a/sflphone-client-gnome/src/config/preferencesdialog.c b/sflphone-client-gnome/src/config/preferencesdialog.c
index 710ff0f640ca8f8c2ed04848c271e28e34aac9da..82570beb2f503b5db1e6b38b22188ca530983377 100644
--- a/sflphone-client-gnome/src/config/preferencesdialog.c
+++ b/sflphone-client-gnome/src/config/preferencesdialog.c
@@ -30,6 +30,7 @@
 #include <mainwindow.h>
 #include <audioconf.h>
 #include <addressbook-config.h>
+#include <shortcuts-config.h>
 #include <hooks-config.h>
 #include <utils.h>
 
@@ -309,6 +310,11 @@ show_preferences_dialog ()
       _("Hooks")));
   gtk_notebook_page_num (GTK_NOTEBOOK(notebook), tab);
 
+  // Shortcuts tab
+  tab = create_shortcuts_settings();
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tab, gtk_label_new(_("Shortcuts")));
+  gtk_notebook_page_num(GTK_NOTEBOOK(notebook), tab);
+
   gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
 
   result = gtk_dialog_run (dialog);
diff --git a/sflphone-client-gnome/src/config/shortcuts-config.c b/sflphone-client-gnome/src/config/shortcuts-config.c
new file mode 100644
index 0000000000000000000000000000000000000000..91e4d140a960e318eb9f5447ecc19110585951e8
--- /dev/null
+++ b/sflphone-client-gnome/src/config/shortcuts-config.c
@@ -0,0 +1,107 @@
+/*
+ *  Copyright (C) 2010 Savoir-Faire Linux inc.
+ *  Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "shortcuts-config.h"
+#include "shortcuts.h"
+
+#include <gdk/gdkx.h>
+
+GtkWidget*
+create_shortcuts_settings()
+{
+  GtkWidget *vbox, *result_frame, *window, *treeview, *scrolled_window, *table;
+  GtkListStore *store;
+  GtkTreeIter iter;
+  guint i = 0;
+
+  vbox = gtk_vbox_new(FALSE, 10);
+  gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+
+  gnome_main_section_new(_("General"), &result_frame);
+
+  treeview = gtk_tree_view_new();
+  setup_tree_view(treeview);
+
+  store = gtk_list_store_new(COLUMNS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_UINT);
+
+  Accelerator* list = shortcuts_get_list();
+
+  while (list[i].action != NULL)
+    {
+      gtk_list_store_append(store, &iter);
+      gtk_list_store_set(store, &iter, ACTION, list[i].action, MASK,
+          (gint) list[i].mask, VALUE, XKeycodeToKeysym(GDK_DISPLAY(),
+              list[i].value, 0), -1);
+      i++;
+    }
+
+  gtk_tree_view_set_model(GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store));
+  g_object_unref(store);
+
+  gtk_container_add(GTK_CONTAINER (result_frame), treeview);
+  gtk_box_pack_start(GTK_BOX(vbox), result_frame, FALSE, FALSE, 0);
+
+  gtk_widget_show_all(vbox);
+
+  return vbox;
+}
+
+/*
+ *  Create a tree view with two columns. The first is an action and the
+ * second is a keyboard accelerator.
+ */
+static void
+setup_tree_view(GtkWidget *treeview)
+{
+  GtkCellRenderer *renderer;
+  GtkTreeViewColumn *column;
+
+  renderer = gtk_cell_renderer_text_new();
+  column = gtk_tree_view_column_new_with_attributes("Action", renderer, "text",
+      ACTION, NULL);
+  gtk_tree_view_append_column(GTK_TREE_VIEW (treeview), column);
+
+  renderer = gtk_cell_renderer_accel_new();
+  g_object_set(renderer, "accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_GTK,
+      "editable", TRUE, NULL);
+  column = gtk_tree_view_column_new_with_attributes("Shortcut", renderer,
+      "accel-mods", MASK, "accel-key", VALUE, NULL);
+
+  gtk_tree_view_append_column(GTK_TREE_VIEW (treeview), column);
+  g_signal_connect (G_OBJECT (renderer), "accel_edited", G_CALLBACK (accel_edited), (gpointer) treeview);
+}
+
+static void
+accel_edited(GtkCellRendererAccel *renderer, gchar *path, guint accel_key,
+    GdkModifierType mask, guint hardware_keycode, GtkTreeView *treeview)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+
+  // Update treeview
+  model = gtk_tree_view_get_model(treeview);
+  if (gtk_tree_model_get_iter_from_string(model, &iter, path))
+    gtk_list_store_set(GTK_LIST_STORE (model), &iter, MASK, (gint) mask, VALUE,
+        accel_key, -1);
+
+  gint code = XKeysymToKeycode(GDK_DISPLAY(), accel_key);
+
+  // Update GDK bindings
+  shortcuts_update_bindings(atoi(path), code);
+}
diff --git a/sflphone-client-gnome/src/config/shortcuts-config.h b/sflphone-client-gnome/src/config/shortcuts-config.h
new file mode 100644
index 0000000000000000000000000000000000000000..61306699f01de1b9133df02f6ba09aeb2c90bbf3
--- /dev/null
+++ b/sflphone-client-gnome/src/config/shortcuts-config.h
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (C) 2010 Savoir-Faire Linux inc.
+ *  Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _SHORTCUTS_CONFIG
+#define _SHORTCUTS_CONFIG
+
+#include <gtk/gtk.h>
+#include <glib/gtypes.h>
+
+#include "actions.h"
+#include <utils.h>
+
+G_BEGIN_DECLS
+
+enum
+{
+  ACTION = 0, MASK, VALUE, COLUMNS
+};
+
+GtkWidget*
+create_shortcuts_settings();
+
+static void
+setup_tree_view(GtkWidget *treeview);
+
+static void
+accel_edited(GtkCellRendererAccel *renderer, gchar *path, guint accel_key,
+    GdkModifierType mask, guint hardware_keycode, GtkTreeView *treeview);
+
+G_END_DECLS
+
+#endif // _SHORTCUTS_CONFIG
diff --git a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
index 6be7c8b6d3168ecaff8727ba732214bdffa8d150..0b66386689b19c9612c175bb562cce576fad7319 100644
--- a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
@@ -557,5 +557,12 @@
       <arg type="as" name="list" direction="out"/>
     </method>
     
+    <method name="getShortcuts">
+      <arg type="a{si}" name="shortcutsMap" direction="out"/>
+    </method>
+    
+    <method name="setShortcuts">
+      <arg type="a{si}" name="shortcutsMap" direction="in"/>
+    </method>
   </interface>
 </node>
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index d0de1d908e2cef00b7c14d20918c91a4340f6395..48f047c0929ac7515dd142a25e9f6ad61e95026d 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -43,1707 +43,1621 @@ DBusGProxy * callManagerProxy;
 DBusGProxy * configurationManagerProxy;
 DBusGProxy * instanceProxy;
 
-    static void
-incoming_call_cb (DBusGProxy *proxy UNUSED,
-        const gchar* accountID,
-        const gchar* callID,
-        const gchar* from,
-        void * foo  UNUSED )
+static void
+incoming_call_cb(DBusGProxy *proxy UNUSED, const gchar* accountID,
+    const gchar* callID, const gchar* from, void * foo  UNUSED )
 {
-    DEBUG("Incoming call (%s) from %s", callID, from);
+  DEBUG("Incoming call (%s) from %s", callID, from);
 
-    callable_obj_t * c;
-    gchar *peer_name, *peer_number;
-    // We receive the from field under a formatted way. We want to extract the number and the name of the caller
-    peer_name = call_get_peer_name (from);
-    peer_number = call_get_peer_number (from);
+  callable_obj_t * c;
+  gchar *peer_name, *peer_number;
+  // We receive the from field under a formatted way. We want to extract the number and the name of the caller
+  peer_name = call_get_peer_name(from);
+  peer_number = call_get_peer_number(from);
 
-    DEBUG("    peer name: %s", peer_name);
-    DEBUG("    peer number: %s", peer_number);
+  DEBUG("    peer name: %s", peer_name);
+  DEBUG("    peer number: %s", peer_number);
 
-    create_new_call (CALL, CALL_STATE_INCOMING, g_strdup(callID), g_strdup(accountID), peer_name, peer_number, &c);
+  create_new_call(CALL, CALL_STATE_INCOMING, g_strdup(callID), g_strdup(
+      accountID), peer_name, peer_number, &c);
 #if GTK_CHECK_VERSION(2,10,0)
-    status_tray_icon_blink (TRUE);
-	popup_main_window ();
+  status_tray_icon_blink(TRUE);
+  popup_main_window();
 #endif
 
-    set_timestamp (&c->_time_start);
-    notify_incoming_call (c);
-    sflphone_incoming_call (c);
+  set_timestamp(&c->_time_start);
+  notify_incoming_call(c);
+  sflphone_incoming_call(c);
 }
 
-    static void
-zrtp_negotiation_failed_cb (DBusGProxy *proxy UNUSED,
-        const gchar* callID,
-        const gchar* reason,
-        const gchar* severity,
-        void * foo  UNUSED )
+static void
+zrtp_negotiation_failed_cb(DBusGProxy *proxy UNUSED, const gchar* callID,
+    const gchar* reason, const gchar* severity, void * foo  UNUSED )
 {
-    DEBUG ("Zrtp negotiation failed.");
-    main_window_zrtp_negotiation_failed(callID, reason, severity);
-    callable_obj_t * c = NULL;
-    c = calllist_get(current_calls, callID);
-    if(c) {
-        notify_zrtp_negotiation_failed(c);
+  DEBUG ("Zrtp negotiation failed.");
+  main_window_zrtp_negotiation_failed(callID, reason, severity);
+  callable_obj_t * c = NULL;
+  c = calllist_get(current_calls, callID);
+  if (c)
+    {
+      notify_zrtp_negotiation_failed(c);
     }
 }
 
-    static void
-curent_selected_codec (DBusGProxy *proxy UNUSED,
-        const gchar* callID,
-        const gchar* codecName,
-        void * foo  UNUSED )
+static void
+curent_selected_codec(DBusGProxy *proxy UNUSED, const gchar* callID,
+    const gchar* codecName, void * foo  UNUSED )
 {
-    // DEBUG ("%s codec decided for call %s",codecName,callID);
-    // sflphone_display_selected_codec (codecName);
+  // DEBUG ("%s codec decided for call %s",codecName,callID);
+  // sflphone_display_selected_codec (codecName);
 }
 
-    static void
-volume_changed_cb (DBusGProxy *proxy UNUSED,
-        const gchar* device,
-        const gdouble value,
-        void * foo  UNUSED )
+static void
+volume_changed_cb(DBusGProxy *proxy UNUSED, const gchar* device, const gdouble value,
+    void * foo  UNUSED )
 {
-    DEBUG ("Volume of %s changed to %f.",device, value);
-    set_slider(device, value);
+  DEBUG ("Volume of %s changed to %f.",device, value);
+  set_slider(device, value);
 }
 
-    static void
-voice_mail_cb (DBusGProxy *proxy UNUSED,
-        const gchar* accountID,
-        const guint nb,
-        void * foo  UNUSED )
+static void
+voice_mail_cb(DBusGProxy *proxy UNUSED, const gchar* accountID, const guint nb,
+    void * foo  UNUSED )
 {
-    DEBUG ("%d Voice mail waiting!",nb);
-    sflphone_notify_voice_mail (accountID , nb);
+  DEBUG ("%d Voice mail waiting!",nb);
+  sflphone_notify_voice_mail(accountID, nb);
 }
 
-    static void
-incoming_message_cb (DBusGProxy *proxy UNUSED,
-        const gchar* accountID UNUSED,
-        const gchar* msg,
-        void * foo  UNUSED )
+static void
+incoming_message_cb(DBusGProxy *proxy UNUSED, const gchar* accountID UNUSED,
+    const gchar* msg, void * foo  UNUSED )
 {
-    DEBUG ("Message %s!",msg);
+  DEBUG ("Message %s!",msg);
 
 }
 
-    static void
-call_state_cb (DBusGProxy *proxy UNUSED,
-        const gchar* callID,
-        const gchar* state,
-        void * foo  UNUSED )
+static void
+call_state_cb(DBusGProxy *proxy UNUSED, const gchar* callID, const gchar* state,
+    void * foo  UNUSED )
 {
-    DEBUG ("Call %s state %s",callID, state);
-    callable_obj_t * c = calllist_get(current_calls, callID);
-    if(c)
+  DEBUG ("Call %s state %s",callID, state);
+  callable_obj_t * c = calllist_get(current_calls, callID);
+  if (c)
     {
-        if ( strcmp(state, "HUNGUP") == 0 )
+      if (strcmp(state, "HUNGUP") == 0)
         {
-            if(c->_state==CALL_STATE_CURRENT)
+          if (c->_state == CALL_STATE_CURRENT)
             {
-                // peer hung up, the conversation was established, so _stop has been initialized with the current time value
-                DEBUG("call state current");
-                set_timestamp (&c->_time_stop);
-                calltree_update_call( history, c, NULL);
+              // peer hung up, the conversation was established, so _stop has been initialized with the current time value
+              DEBUG("call state current");
+              set_timestamp(&c->_time_stop);
+              calltree_update_call(history, c, NULL);
             }
-            stop_notification();
-            sflphone_hung_up (c);
-            calltree_update_call( history, c, NULL );
-            status_bar_display_account();
+          stop_notification();
+          sflphone_hung_up(c);
+          calltree_update_call(history, c, NULL );
+          status_bar_display_account();
         }
-        else if ( strcmp(state, "UNHOLD_CURRENT") == 0 )
+      else if (strcmp(state, "UNHOLD_CURRENT") == 0)
         {
-            sflphone_current (c);
+          sflphone_current(c);
         }
-        else if ( strcmp(state, "UNHOLD_RECORD") == 0 )
+      else if (strcmp(state, "UNHOLD_RECORD") == 0)
         {
-            sflphone_record (c);
+          sflphone_record(c);
         }
-        else if ( strcmp(state, "HOLD") == 0 )
+      else if (strcmp(state, "HOLD") == 0)
         {
-            sflphone_hold (c);
+          sflphone_hold(c);
         }
-        else if ( strcmp(state, "RINGING") == 0 )
+      else if (strcmp(state, "RINGING") == 0)
         {
-            sflphone_ringing (c);
+          sflphone_ringing(c);
         }
-        else if ( strcmp(state, "CURRENT") == 0 )
+      else if (strcmp(state, "CURRENT") == 0)
         {
-            sflphone_current (c);
+          sflphone_current(c);
         }
-        else if ( strcmp(state, "FAILURE") == 0 )
+      else if (strcmp(state, "FAILURE") == 0)
         {
-            sflphone_fail (c);
+          sflphone_fail(c);
         }
-        else if ( strcmp(state, "BUSY") == 0 )
+      else if (strcmp(state, "BUSY") == 0)
         {
-            sflphone_busy (c);
+          sflphone_busy(c);
         }
     }
-    else
+  else
     {
-        // The callID is unknow, threat it like a new call
-        // If it were an incoming call, we won't be here
-        // It means that a new call has been initiated with an other client (cli for instance)
-        if ( strcmp(state, "RINGING") == 0  || strcmp(state, "CURRENT") == 0)
+      // The callID is unknow, threat it like a new call
+      // If it were an incoming call, we won't be here
+      // It means that a new call has been initiated with an other client (cli for instance)
+      if (strcmp(state, "RINGING") == 0 || strcmp(state, "CURRENT") == 0)
         {
-            callable_obj_t *new_call;
-            GHashTable *call_details;
-            gchar *type;
+          callable_obj_t *new_call;
+          GHashTable *call_details;
+          gchar *type;
 
-            DEBUG ("New ringing call! accountID: %s", callID);
+          DEBUG ("New ringing call! accountID: %s", callID);
 
-            // We fetch the details associated to the specified call
-            call_details = dbus_get_call_details (callID);
-            create_new_call_from_details (callID, call_details, &new_call);
+          // We fetch the details associated to the specified call
+          call_details = dbus_get_call_details(callID);
+          create_new_call_from_details(callID, call_details, &new_call);
 
-            // Restore the callID to be synchronous with the daemon
-            new_call->_callID = g_strdup(callID);
-            type = g_hash_table_lookup (call_details, "CALL_TYPE");
+          // Restore the callID to be synchronous with the daemon
+          new_call->_callID = g_strdup(callID);
+          type = g_hash_table_lookup(call_details, "CALL_TYPE");
 
-            if (g_strcasecmp (type, "0") == 0)
+          if (g_strcasecmp(type, "0") == 0)
             {
-                // DEBUG("incoming\n");
-                new_call->_history_state = INCOMING;
+              // DEBUG("incoming\n");
+              new_call->_history_state = INCOMING;
             }
-            else
+          else
             {
-                // DEBUG("outgoing\n");
-                new_call->_history_state = OUTGOING;
+              // DEBUG("outgoing\n");
+              new_call->_history_state = OUTGOING;
             }
 
-            calllist_add (current_calls, new_call);
-            calllist_add (history, new_call);
-            calltree_add_call (current_calls, new_call, NULL);
-            update_actions ();
-            calltree_display (current_calls);
+          calllist_add(current_calls, new_call);
+          calllist_add(history, new_call);
+          calltree_add_call(current_calls, new_call, NULL);
+          update_actions();
+          calltree_display(current_calls);
 
-            //sflphone_incoming_call (new_call);
+          //sflphone_incoming_call (new_call);
         }
     }
 }
 
 static void
-conference_changed_cb (DBusGProxy *proxy UNUSED,
-	const gchar* confID,
-        const gchar* state,
-        void * foo  UNUSED )
+conference_changed_cb(DBusGProxy *proxy UNUSED, const gchar* confID,
+    const gchar* state, void * foo  UNUSED )
 {
-    
-    // sflphone_display_transfer_status("Transfer successfull");
-    conference_obj_t* changed_conf = conferencelist_get(confID);
-    gchar** participants;
-    gchar** part;
 
-    DEBUG("conference new state %s\n", state);
+  // sflphone_display_transfer_status("Transfer successfull");
+  conference_obj_t* changed_conf = conferencelist_get(confID);
+  gchar** participants;
+  gchar** part;
+
+  DEBUG("conference new state %s\n", state);
 
-    if(changed_conf)
+  if (changed_conf)
     {
-        // remove old conference from calltree
-	calltree_remove_conference (current_calls, changed_conf, NULL);
+      // remove old conference from calltree
+      calltree_remove_conference(current_calls, changed_conf, NULL);
 
-	// update conference state
-	if ( strcmp(state, "ACTIVE_ATACHED") == 0 ) {
-	    changed_conf->_state = CONFERENCE_STATE_ACTIVE_ATACHED;
-	}
-	else if ( strcmp(state, "ACTIVE_DETACHED") == 0 ) {
-	    changed_conf->_state = CONFERENCE_STATE_ACTIVE_DETACHED;
-	}
-	else if ( strcmp(state, "HOLD") == 0 ) {
-	    changed_conf->_state = CONFERENCE_STATE_HOLD;
-	}
-	else {
-	    DEBUG("Error: conference state not recognized");
-	}
-	
+      // update conference state
+      if (strcmp(state, "ACTIVE_ATACHED") == 0)
+        {
+          changed_conf->_state = CONFERENCE_STATE_ACTIVE_ATACHED;
+        }
+      else if (strcmp(state, "ACTIVE_DETACHED") == 0)
+        {
+          changed_conf->_state = CONFERENCE_STATE_ACTIVE_DETACHED;
+        }
+      else if (strcmp(state, "HOLD") == 0)
+        {
+          changed_conf->_state = CONFERENCE_STATE_HOLD;
+        }
+      else
+        {
+          DEBUG("Error: conference state not recognized");
+        }
 
-	participants = (gchar**)dbus_get_participant_list(changed_conf->_confID);
+      participants = (gchar**) dbus_get_participant_list(changed_conf->_confID);
 
-	// update conferece participants
-	conference_participant_list_update(participants, changed_conf);
-	
-	// add new conference to calltree
-	calltree_add_conference (current_calls, changed_conf);
+      // update conferece participants
+      conference_participant_list_update(participants, changed_conf);
+
+      // add new conference to calltree
+      calltree_add_conference(current_calls, changed_conf);
     }
 }
 
-
 static void
-conference_created_cb (DBusGProxy *proxy UNUSED,
-	const gchar* confID,
-        void * foo  UNUSED )
+conference_created_cb(DBusGProxy *proxy UNUSED, const gchar* confID, void * foo  UNUSED )
 {
-    DEBUG ("Conference added %s\n", confID);
+  DEBUG ("Conference added %s\n", confID);
 
-    conference_obj_t* new_conf;
-    callable_obj_t* call;
-    gchar* call_id;
-    gchar** participants;
-    gchar** part;
+  conference_obj_t* new_conf;
+  callable_obj_t* call;
+  gchar* call_id;
+  gchar** participants;
+  gchar** part;
 
-    create_new_conference(CONFERENCE_STATE_ACTIVE_ATACHED, confID, &new_conf);
-    // new_conf->_confID = g_strdup(confID);
+  create_new_conference(CONFERENCE_STATE_ACTIVE_ATACHED, confID, &new_conf);
+  // new_conf->_confID = g_strdup(confID);
 
-    participants = (gchar**)dbus_get_participant_list(new_conf->_confID);
+  participants = (gchar**) dbus_get_participant_list(new_conf->_confID);
 
-    conference_participant_list_update(participants, new_conf);
+  conference_participant_list_update(participants, new_conf);
 
-    // participant = new_conf->participant;
-    for (part = participants; *part; part++)
-    {	    
-	call_id = (gchar*)(*part);
-	call = calllist_get (current_calls, call_id);
-	call->_confID = g_strdup(confID);
+  // participant = new_conf->participant;
+  for (part = participants; *part; part++)
+    {
+      call_id = (gchar*) (*part);
+      call = calllist_get(current_calls, call_id);
+      call->_confID = g_strdup(confID);
     }
 
-    conferencelist_add(new_conf);
-    calltree_add_conference (current_calls, new_conf);
+  conferencelist_add(new_conf);
+  calltree_add_conference(current_calls, new_conf);
 }
 
-
 static void
-conference_removed_cb (DBusGProxy *proxy UNUSED,
-	const gchar* confID,
-        void * foo  UNUSED )
+conference_removed_cb(DBusGProxy *proxy UNUSED, const gchar* confID, void * foo  UNUSED )
 {
-    DEBUG ("Conference removed %s\n", confID);
+  DEBUG ("Conference removed %s\n", confID);
 
-    conference_obj_t * c = conferencelist_get(confID);
-    calltree_remove_conference (current_calls, c, NULL);
-    conferencelist_remove(c->_confID); 
+  conference_obj_t * c = conferencelist_get(confID);
+  calltree_remove_conference(current_calls, c, NULL);
+  conferencelist_remove(c->_confID);
 }
 
-
-    static void
-accounts_changed_cb (DBusGProxy *proxy UNUSED,
-        void * foo  UNUSED )
+static void
+accounts_changed_cb(DBusGProxy *proxy UNUSED, void * foo  UNUSED )
 {
-    DEBUG ("Accounts changed");
-    sflphone_fill_account_list ();
-    sflphone_fill_ip2ip_profile();
-    account_list_config_dialog_fill();
+  DEBUG ("Accounts changed");
+  sflphone_fill_account_list();
+  sflphone_fill_ip2ip_profile();
+  account_list_config_dialog_fill();
 
-    // Update the status bar in case something happened
-    // Should fix ticket #1215
-    status_bar_display_account();
+  // Update the status bar in case something happened
+  // Should fix ticket #1215
+  status_bar_display_account();
 
-	// Update the tooltip on the status icon
-	statusicon_set_tooltip ();
+  // Update the tooltip on the status icon
+  statusicon_set_tooltip ();
 }
 
-
-    static void
-transfer_succeded_cb (DBusGProxy *proxy UNUSED,
-        void * foo  UNUSED )
+static void
+transfer_succeded_cb(DBusGProxy *proxy UNUSED, void * foo  UNUSED )
 {
-    DEBUG ("Transfer succeded\n");
-    sflphone_display_transfer_status("Transfer successfull");
+  DEBUG ("Transfer succeded\n");
+  sflphone_display_transfer_status("Transfer successfull");
 }
 
-
-    static void
-transfer_failed_cb (DBusGProxy *proxy UNUSED,
-        void * foo  UNUSED )
+static void
+transfer_failed_cb(DBusGProxy *proxy UNUSED, void * foo  UNUSED )
 {
-    DEBUG ("Transfer failed\n");
-    sflphone_display_transfer_status("Transfer failed");
+  DEBUG ("Transfer failed\n");
+  sflphone_display_transfer_status("Transfer failed");
 }
 
-static void 
-secure_sdes_on_cb(DBusGProxy *proxy UNUSED, 
-		  const gchar *callID,
-		  void *foo UNUSED)
+static void
+secure_sdes_on_cb(DBusGProxy *proxy UNUSED, const gchar *callID, void *foo UNUSED)
 {
-    DEBUG("SRTP using SDES is on");
-    callable_obj_t *c = calllist_get(current_calls, callID);
-    if(c) {
-        sflphone_srtp_sdes_on(c);
-	notify_secure_on(c);
+  DEBUG("SRTP using SDES is on");
+  callable_obj_t *c = calllist_get(current_calls, callID);
+  if (c)
+    {
+      sflphone_srtp_sdes_on(c);
+      notify_secure_on(c);
     }
 
 }
 
-
 static void
-secure_sdes_off_cb(DBusGProxy *proxy UNUSED,
-		   const gchar *callID,
-		   void *foo UNUSED)
+secure_sdes_off_cb(DBusGProxy *proxy UNUSED, const gchar *callID, void *foo UNUSED)
 {
-    DEBUG("SRTP using SDES is off");
-    callable_obj_t *c = calllist_get(current_calls, callID);
-    if(c) {
-        sflphone_srtp_sdes_off(c);
-	notify_secure_off(c);
+  DEBUG("SRTP using SDES is off");
+  callable_obj_t *c = calllist_get(current_calls, callID);
+  if (c)
+    {
+      sflphone_srtp_sdes_off(c);
+      notify_secure_off(c);
     }
 }
 
-    static void
-secure_zrtp_on_cb (DBusGProxy *proxy UNUSED,
-        const gchar* callID,
-        const gchar* cipher,
-        void * foo  UNUSED )
+static void
+secure_zrtp_on_cb(DBusGProxy *proxy UNUSED, const gchar* callID, const gchar* cipher,
+    void * foo  UNUSED )
 {
-    DEBUG ("SRTP using ZRTP is ON secure_on_cb");
-    callable_obj_t * c = calllist_get(current_calls, callID);
-    if(c) {
-        c->_srtp_cipher = g_strdup(cipher);
-	
-        sflphone_srtp_zrtp_on (c);
-        notify_secure_on(c);
+  DEBUG ("SRTP using ZRTP is ON secure_on_cb");
+  callable_obj_t * c = calllist_get(current_calls, callID);
+  if (c)
+    {
+      c->_srtp_cipher = g_strdup(cipher);
+
+      sflphone_srtp_zrtp_on(c);
+      notify_secure_on(c);
     }
 }
 
-    static void
-secure_zrtp_off_cb (DBusGProxy *proxy UNUSED,
-        const gchar* callID,
-        void * foo  UNUSED )
+static void
+secure_zrtp_off_cb(DBusGProxy *proxy UNUSED, const gchar* callID, void * foo  UNUSED )
 {
-    DEBUG ("SRTP using ZRTP is OFF");
-    callable_obj_t * c = calllist_get(current_calls, callID);
-    if(c) {
-        sflphone_srtp_zrtp_off (c);
-        notify_secure_off (c);
+  DEBUG ("SRTP using ZRTP is OFF");
+  callable_obj_t * c = calllist_get(current_calls, callID);
+  if (c)
+    {
+      sflphone_srtp_zrtp_off(c);
+      notify_secure_off(c);
     }
 }
 
-    static void
-show_zrtp_sas_cb (DBusGProxy *proxy UNUSED,
-        const gchar* callID,
-        const gchar* sas,
-        const gboolean verified,
-        void * foo  UNUSED )
+static void
+show_zrtp_sas_cb(DBusGProxy *proxy UNUSED, const gchar* callID, const gchar* sas,
+    const gboolean verified, void * foo  UNUSED )
 {
-    DEBUG ("Showing SAS");
-    callable_obj_t * c = calllist_get(current_calls, callID);
-    if(c) {
-        sflphone_srtp_zrtp_show_sas (c, sas, verified);
+  DEBUG ("Showing SAS");
+  callable_obj_t * c = calllist_get(current_calls, callID);
+  if (c)
+    {
+      sflphone_srtp_zrtp_show_sas(c, sas, verified);
     }
 }
 
-    static void
-confirm_go_clear_cb (DBusGProxy *proxy UNUSED,
-        const gchar* callID,
-        void * foo  UNUSED )
+static void
+confirm_go_clear_cb(DBusGProxy *proxy UNUSED, const gchar* callID, void * foo  UNUSED )
 {
-    DEBUG ("Confirm Go Clear request");
-    callable_obj_t * c = calllist_get(current_calls, callID);
-    if(c) {
-        sflphone_confirm_go_clear (c);
+  DEBUG ("Confirm Go Clear request");
+  callable_obj_t * c = calllist_get(current_calls, callID);
+  if (c)
+    {
+      sflphone_confirm_go_clear(c);
     }
 }
 
-    static void
-zrtp_not_supported_cb (DBusGProxy *proxy UNUSED,
-        const gchar* callID,
-        void * foo  UNUSED )
+static void
+zrtp_not_supported_cb(DBusGProxy *proxy UNUSED, const gchar* callID, void * foo  UNUSED )
 {
-    DEBUG ("ZRTP not supported on the other end");
-    callable_obj_t * c = calllist_get(current_calls, callID);
-    if(c) {
-        sflphone_srtp_zrtp_not_supported (c);
-        notify_zrtp_not_supported(c);
+  DEBUG ("ZRTP not supported on the other end");
+  callable_obj_t * c = calllist_get(current_calls, callID);
+  if (c)
+    {
+      sflphone_srtp_zrtp_not_supported(c);
+      notify_zrtp_not_supported(c);
     }
 }
 
-    static void
-sip_call_state_cb (DBusGProxy *proxy UNUSED,
-        const gchar* callID,
-        const gchar* description,
-        const guint code, 
-        void * foo  UNUSED )
+static void
+sip_call_state_cb(DBusGProxy *proxy UNUSED, const gchar* callID,
+    const gchar* description, const guint code, void * foo  UNUSED )
 {
-    callable_obj_t * c = NULL;
-    c = calllist_get(current_calls, callID);
+  callable_obj_t * c = NULL;
+  c = calllist_get(current_calls, callID);
 
-    if(c != NULL) {
-        DEBUG("sip_call_state_cb received code %d", code);       
-        sflphone_call_state_changed(c, description, code);
+  if (c != NULL)
+    {
+      DEBUG("sip_call_state_cb received code %d", code);
+      sflphone_call_state_changed(c, description, code);
     }
 }
 
-    static void
-error_alert(DBusGProxy *proxy UNUSED,
-        int errCode,
-        void * foo  UNUSED )
+static void
+error_alert(DBusGProxy *proxy UNUSED, int errCode, void * foo  UNUSED )
 {
-    ERROR ("Error notifying : (%i)", errCode);
-    sflphone_throw_exception( errCode );
+  ERROR ("Error notifying : (%i)", errCode);
+  sflphone_throw_exception(errCode);
 }
 
-    gboolean
-dbus_connect ()
-{
-
-    GError *error = NULL;
-    connection = NULL;
-    instanceProxy = NULL;
-
-    g_type_init ();
-
-    connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+gboolean
+dbus_connect()
+{
 
-    if (error)
-    {
-        ERROR ("Failed to open connection to bus: %s",
-                error->message);
-        g_error_free (error);
-        return FALSE;
-    }
-
-    /* Create a proxy object for the "bus driver" (name "org.freedesktop.DBus") */
-
-
-    instanceProxy = dbus_g_proxy_new_for_name (connection,
-            "org.sflphone.SFLphone",
-            "/org/sflphone/SFLphone/Instance",
-            "org.sflphone.SFLphone.Instance");
-    /*
-       instanceProxy = dbus_g_proxy_new_for_name_owner (connection,
-       "org.sflphone.SFLphone",
-       "/org/sflphone/SFLphone/Instance",
-       "org.sflphone.SFLphone.Instance",
-       &error);
-     */
-
-    if (instanceProxy==NULL)
-    {
-        ERROR ("Failed to get proxy to Instance");
-        return FALSE;
-    }
-
-
-    DEBUG ("DBus connected to Instance");
-
-
-    callManagerProxy = dbus_g_proxy_new_for_name (connection,
-            "org.sflphone.SFLphone",
-            "/org/sflphone/SFLphone/CallManager",
-            "org.sflphone.SFLphone.CallManager");
-
-    /*
-       callManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
-       "org.sflphone.SFLphone",
-       "/org/sflphone/SFLphone/CallManager",
-       "org.sflphone.SFLphone.CallManager",
-       &error);
-     */
-    if (callManagerProxy==NULL)
-    {
-        ERROR ("Failed to get proxy to CallManagers");
-        return FALSE;
-    }
-
-    DEBUG ("DBus connected to CallManager");
-    /* STRING STRING STRING Marshaller */
-    /* Incoming call */
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING_STRING,
-            G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "incomingCall", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "incomingCall", G_CALLBACK(incoming_call_cb), NULL, NULL);
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "zrtpNegotiationFailed", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "zrtpNegotiationFailed", G_CALLBACK(zrtp_negotiation_failed_cb), NULL, NULL);
-            
-    /* Current codec */
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING_STRING,
-            G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "currentSelectedCodec", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "currentSelectedCodec", G_CALLBACK(curent_selected_codec), NULL, NULL);
-
-    /* Register a marshaller for STRING,STRING */
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING,
-            G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "callStateChanged", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "callStateChanged", G_CALLBACK(call_state_cb), NULL, NULL);
-
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_INT,
-            G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "voiceMailNotify", G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "voiceMailNotify", G_CALLBACK(voice_mail_cb), NULL, NULL);
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "incomingMessage", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "incomingMessage", G_CALLBACK(incoming_message_cb), NULL, NULL);
-
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_DOUBLE,
-            G_TYPE_NONE, G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "volumeChanged", G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "volumeChanged", G_CALLBACK(volume_changed_cb), NULL, NULL);
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "transferSucceded", G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "transferSucceded", G_CALLBACK(transfer_succeded_cb), NULL, NULL);
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "transferFailed", G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "transferFailed", G_CALLBACK(transfer_failed_cb), NULL, NULL);
-
-    /* Conference related callback */
-
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING,
-            G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "conferenceChanged", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "conferenceChanged", G_CALLBACK(conference_changed_cb), NULL, NULL);
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "conferenceCreated", G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "conferenceCreated", G_CALLBACK(conference_created_cb), NULL, NULL);
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "conferenceRemoved", G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "conferenceRemoved", G_CALLBACK(conference_removed_cb), NULL, NULL);
-
-    /* Security related callbacks */
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "secureSdesOn", G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "secureSdesOn", G_CALLBACK(secure_sdes_on_cb), NULL, NULL);
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "secureSdesOff", G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "secureSdesOff", G_CALLBACK(secure_sdes_off_cb), NULL, NULL);
-    
-    /* Register a marshaller for STRING,STRING,BOOL */
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING_BOOL,
-            G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "showSAS", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "showSAS", G_CALLBACK(show_zrtp_sas_cb), NULL, NULL);  
-  
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "secureZrtpOn", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "secureZrtpOn", G_CALLBACK(secure_zrtp_on_cb), NULL, NULL);
-
-    /* Register a marshaller for STRING*/
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING,
-            G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "secureZrtpOff", G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "secureZrtpOff", G_CALLBACK(secure_zrtp_off_cb), NULL, NULL);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "zrtpNotSuppOther", G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "zrtpNotSuppOther", G_CALLBACK(zrtp_not_supported_cb), NULL, NULL);
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "confirmGoClear", G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "confirmGoClear", G_CALLBACK(confirm_go_clear_cb), NULL, NULL);               
-
-    /* VOID STRING STRING INT */
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING_INT,
-            G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
-
-
-    dbus_g_proxy_add_signal (callManagerProxy,
-            "sipCallStateChanged", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (callManagerProxy,
-            "sipCallStateChanged", G_CALLBACK(sip_call_state_cb), NULL, NULL);
-                        
-    configurationManagerProxy = dbus_g_proxy_new_for_name (connection, 
-            "org.sflphone.SFLphone",
-            "/org/sflphone/SFLphone/ConfigurationManager",
-            "org.sflphone.SFLphone.ConfigurationManager");
-
-
-    /*
-       configurationManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
-       "org.sflphone.SFLphone",
-       "/org/sflphone/SFLphone/ConfigurationManager",
-       "org.sflphone.SFLphone.ConfigurationManager",
-       &error);
-     */
-    if (!configurationManagerProxy)
-    {
-        ERROR ("Failed to get proxy to ConfigurationManager");
-        return FALSE;
-    }
-    DEBUG ("DBus connected to ConfigurationManager");
-    dbus_g_proxy_add_signal (configurationManagerProxy,
-            "accountsChanged", G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (configurationManagerProxy,
-            "accountsChanged", G_CALLBACK(accounts_changed_cb), NULL, NULL);
-
-    dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__INT,
-            G_TYPE_NONE, G_TYPE_INT , G_TYPE_INVALID);
-    dbus_g_proxy_add_signal (configurationManagerProxy,
-            "errorAlert", G_TYPE_INT , G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal (configurationManagerProxy,
-            "errorAlert", G_CALLBACK(error_alert), NULL, NULL);
-            
-    /* Defines a default timeout for the proxies */
+  GError *error = NULL;
+  connection = NULL;
+  instanceProxy = NULL;
+
+  g_type_init();
+
+  connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+
+  if (error)
+    {
+      ERROR ("Failed to open connection to bus: %s",
+          error->message);
+      g_error_free(error);
+      return FALSE;
+    }
+
+  /* Create a proxy object for the "bus driver" (name "org.freedesktop.DBus") */
+
+  instanceProxy = dbus_g_proxy_new_for_name(connection,
+      "org.sflphone.SFLphone", "/org/sflphone/SFLphone/Instance",
+      "org.sflphone.SFLphone.Instance");
+  /*
+   instanceProxy = dbus_g_proxy_new_for_name_owner (connection,
+   "org.sflphone.SFLphone",
+   "/org/sflphone/SFLphone/Instance",
+   "org.sflphone.SFLphone.Instance",
+   &error);
+   */
+
+  if (instanceProxy == NULL)
+    {
+      ERROR ("Failed to get proxy to Instance");
+      return FALSE;
+    }
+
+  DEBUG ("DBus connected to Instance");
+
+  callManagerProxy = dbus_g_proxy_new_for_name(connection,
+      "org.sflphone.SFLphone", "/org/sflphone/SFLphone/CallManager",
+      "org.sflphone.SFLphone.CallManager");
+
+  /*
+   callManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
+   "org.sflphone.SFLphone",
+   "/org/sflphone/SFLphone/CallManager",
+   "org.sflphone.SFLphone.CallManager",
+   &error);
+   */
+  if (callManagerProxy == NULL)
+    {
+      ERROR ("Failed to get proxy to CallManagers");
+      return FALSE;
+    }
+
+  DEBUG ("DBus connected to CallManager");
+  /* STRING STRING STRING Marshaller */
+  /* Incoming call */
+  dbus_g_object_register_marshaller(
+      g_cclosure_user_marshal_VOID__STRING_STRING_STRING, G_TYPE_NONE,
+      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(callManagerProxy, "incomingCall", G_TYPE_STRING,
+      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "incomingCall",
+      G_CALLBACK(incoming_call_cb), NULL, NULL);
+
+  dbus_g_proxy_add_signal(callManagerProxy, "zrtpNegotiationFailed",
+      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "zrtpNegotiationFailed",
+      G_CALLBACK(zrtp_negotiation_failed_cb), NULL, NULL);
+
+  /* Current codec */
+  dbus_g_object_register_marshaller(
+      g_cclosure_user_marshal_VOID__STRING_STRING_STRING, G_TYPE_NONE,
+      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(callManagerProxy, "currentSelectedCodec",
+      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "currentSelectedCodec",
+      G_CALLBACK(curent_selected_codec), NULL, NULL);
+
+  /* Register a marshaller for STRING,STRING */
+  dbus_g_object_register_marshaller(
+      g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, G_TYPE_STRING,
+      G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(callManagerProxy, "callStateChanged", G_TYPE_STRING,
+      G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "callStateChanged",
+      G_CALLBACK(call_state_cb), NULL, NULL);
+
+  dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_INT,
+      G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(callManagerProxy, "voiceMailNotify", G_TYPE_STRING,
+      G_TYPE_INT, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "voiceMailNotify",
+      G_CALLBACK(voice_mail_cb), NULL, NULL);
+
+  dbus_g_proxy_add_signal(callManagerProxy, "incomingMessage", G_TYPE_STRING,
+      G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "incomingMessage",
+      G_CALLBACK(incoming_message_cb), NULL, NULL);
+
+  dbus_g_object_register_marshaller(
+      g_cclosure_user_marshal_VOID__STRING_DOUBLE, G_TYPE_NONE, G_TYPE_STRING,
+      G_TYPE_DOUBLE, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(callManagerProxy, "volumeChanged", G_TYPE_STRING,
+      G_TYPE_DOUBLE, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "volumeChanged",
+      G_CALLBACK(volume_changed_cb), NULL, NULL);
+
+  dbus_g_proxy_add_signal(callManagerProxy, "transferSucceded", G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "transferSucceded",
+      G_CALLBACK(transfer_succeded_cb), NULL, NULL);
+
+  dbus_g_proxy_add_signal(callManagerProxy, "transferFailed", G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "transferFailed",
+      G_CALLBACK(transfer_failed_cb), NULL, NULL);
+
+  /* Conference related callback */
+
+  dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING,
+      G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(callManagerProxy, "conferenceChanged", G_TYPE_STRING,
+      G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "conferenceChanged",
+      G_CALLBACK(conference_changed_cb), NULL, NULL);
+
+  dbus_g_proxy_add_signal(callManagerProxy, "conferenceCreated", G_TYPE_STRING,
+      G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "conferenceCreated",
+      G_CALLBACK(conference_created_cb), NULL, NULL);
+
+  dbus_g_proxy_add_signal(callManagerProxy, "conferenceRemoved", G_TYPE_STRING,
+      G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "conferenceRemoved",
+      G_CALLBACK(conference_removed_cb), NULL, NULL);
+
+  /* Security related callbacks */
+
+  dbus_g_proxy_add_signal(callManagerProxy, "secureSdesOn", G_TYPE_STRING,
+      G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "secureSdesOn",
+      G_CALLBACK(secure_sdes_on_cb), NULL, NULL);
+
+  dbus_g_proxy_add_signal(callManagerProxy, "secureSdesOff", G_TYPE_STRING,
+      G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "secureSdesOff",
+      G_CALLBACK(secure_sdes_off_cb), NULL, NULL);
+
+  /* Register a marshaller for STRING,STRING,BOOL */
+  dbus_g_object_register_marshaller(
+      g_cclosure_user_marshal_VOID__STRING_STRING_BOOL, G_TYPE_NONE,
+      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(callManagerProxy, "showSAS", G_TYPE_STRING,
+      G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "showSAS",
+      G_CALLBACK(show_zrtp_sas_cb), NULL, NULL);
+
+  dbus_g_proxy_add_signal(callManagerProxy, "secureZrtpOn", G_TYPE_STRING,
+      G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "secureZrtpOn",
+      G_CALLBACK(secure_zrtp_on_cb), NULL, NULL);
+
+  /* Register a marshaller for STRING*/
+  dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING,
+      G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(callManagerProxy, "secureZrtpOff", G_TYPE_STRING,
+      G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "secureZrtpOff",
+      G_CALLBACK(secure_zrtp_off_cb), NULL, NULL);
+  dbus_g_proxy_add_signal(callManagerProxy, "zrtpNotSuppOther", G_TYPE_STRING,
+      G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "zrtpNotSuppOther",
+      G_CALLBACK(zrtp_not_supported_cb), NULL, NULL);
+  dbus_g_proxy_add_signal(callManagerProxy, "confirmGoClear", G_TYPE_STRING,
+      G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "confirmGoClear",
+      G_CALLBACK(confirm_go_clear_cb), NULL, NULL);
+
+  /* VOID STRING STRING INT */
+  dbus_g_object_register_marshaller(
+      g_cclosure_user_marshal_VOID__STRING_STRING_INT, G_TYPE_NONE,
+      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
+
+  dbus_g_proxy_add_signal(callManagerProxy, "sipCallStateChanged",
+      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(callManagerProxy, "sipCallStateChanged",
+      G_CALLBACK(sip_call_state_cb), NULL, NULL);
+
+  configurationManagerProxy = dbus_g_proxy_new_for_name(connection,
+      "org.sflphone.SFLphone", "/org/sflphone/SFLphone/ConfigurationManager",
+      "org.sflphone.SFLphone.ConfigurationManager");
+
+  /*
+   configurationManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
+   "org.sflphone.SFLphone",
+   "/org/sflphone/SFLphone/ConfigurationManager",
+   "org.sflphone.SFLphone.ConfigurationManager",
+   &error);
+   */
+  if (!configurationManagerProxy)
+    {
+      ERROR ("Failed to get proxy to ConfigurationManager");
+      return FALSE;
+    }
+  DEBUG ("DBus connected to ConfigurationManager");
+  dbus_g_proxy_add_signal(configurationManagerProxy, "accountsChanged",
+      G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(configurationManagerProxy, "accountsChanged",
+      G_CALLBACK(accounts_changed_cb), NULL, NULL);
+
+  dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__INT,
+      G_TYPE_NONE, G_TYPE_INT, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(configurationManagerProxy, "errorAlert", G_TYPE_INT,
+      G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal(configurationManagerProxy, "errorAlert",
+      G_CALLBACK(error_alert), NULL, NULL);
+
+  /* Defines a default timeout for the proxies */
 #if HAVE_DBUS_G_PROXY_SET_DEFAULT_TIMEOUT
-    dbus_g_proxy_set_default_timeout(callManagerProxy, DEFAULT_DBUS_TIMEOUT);
-    dbus_g_proxy_set_default_timeout(instanceProxy, DEFAULT_DBUS_TIMEOUT);
-    dbus_g_proxy_set_default_timeout(configurationManagerProxy, DEFAULT_DBUS_TIMEOUT);
+  dbus_g_proxy_set_default_timeout(callManagerProxy, DEFAULT_DBUS_TIMEOUT);
+  dbus_g_proxy_set_default_timeout(instanceProxy, DEFAULT_DBUS_TIMEOUT);
+  dbus_g_proxy_set_default_timeout(configurationManagerProxy, DEFAULT_DBUS_TIMEOUT);
 #endif
-    
-    return TRUE;
+
+  return TRUE;
 }
 
-    void
-dbus_clean ()
+void
+dbus_clean()
 {
-    g_object_unref (callManagerProxy);
-    g_object_unref (configurationManagerProxy);
-    g_object_unref (instanceProxy);
+  g_object_unref(callManagerProxy);
+  g_object_unref(configurationManagerProxy);
+  g_object_unref(instanceProxy);
 }
 
-
-    void
-dbus_hold (const callable_obj_t * c)
+void
+dbus_hold(const callable_obj_t * c)
 {
-    DEBUG("dbus_hold %s\n", c->_callID);
+  DEBUG("dbus_hold %s\n", c->_callID);
 
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_hold ( callManagerProxy, c->_callID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_hold(callManagerProxy, c->_callID, &error);
+  if (error)
     {
-        ERROR ("Failed to call hold() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call hold() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_unhold (const callable_obj_t * c)
+void
+dbus_unhold(const callable_obj_t * c)
 {
-    DEBUG("dbus_unhold %s\n", c->_callID);
+  DEBUG("dbus_unhold %s\n", c->_callID);
 
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_unhold ( callManagerProxy, c->_callID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_unhold(callManagerProxy, c->_callID, &error);
+  if (error)
     {
-        ERROR ("Failed to call unhold() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call unhold() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_hold_conference (const conference_obj_t * c)
+void
+dbus_hold_conference(const conference_obj_t * c)
 {
-    DEBUG("dbus_hold_conference %s\n", c->_confID);
+  DEBUG("dbus_hold_conference %s\n", c->_confID);
 
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_hold_conference ( callManagerProxy, c->_confID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_hold_conference(callManagerProxy,
+      c->_confID, &error);
+  if (error)
     {
-        ERROR ("Failed to call hold() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call hold() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_unhold_conference (const conference_obj_t * c)
+void
+dbus_unhold_conference(const conference_obj_t * c)
 {
-    DEBUG("dbus_unhold_conference %s\n", c->_confID);
+  DEBUG("dbus_unhold_conference %s\n", c->_confID);
 
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_unhold_conference ( callManagerProxy, c->_confID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_unhold_conference(callManagerProxy,
+      c->_confID, &error);
+  if (error)
     {
-        ERROR ("Failed to call unhold() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call unhold() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_hang_up (const callable_obj_t * c)
+void
+dbus_hang_up(const callable_obj_t * c)
 {
-    DEBUG("dbus_hang_up %s\n", c->_callID);
-    
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_hang_up ( callManagerProxy, c->_callID, &error);
-    if (error)
+  DEBUG("dbus_hang_up %s\n", c->_callID);
+
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_hang_up(callManagerProxy, c->_callID,
+      &error);
+  if (error)
     {
-        ERROR ("Failed to call hang_up() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call hang_up() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-
-    void
-dbus_hang_up_conference (const conference_obj_t * c)
+void
+dbus_hang_up_conference(const conference_obj_t * c)
 {
-    DEBUG("dbus_hang_up_conference %s\n", c->_confID);
-    
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_hang_up_conference ( callManagerProxy, c->_confID, &error);
-    if (error)
+  DEBUG("dbus_hang_up_conference %s\n", c->_confID);
+
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_hang_up_conference(callManagerProxy,
+      c->_confID, &error);
+  if (error)
     {
-        ERROR ("Failed to call hang_up() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call hang_up() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_transfert (const callable_obj_t * c)
+void
+dbus_transfert(const callable_obj_t * c)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_transfert ( callManagerProxy, c->_callID, c->_trsft_to, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_transfert(callManagerProxy, c->_callID,
+      c->_trsft_to, &error);
+  if (error)
     {
-        ERROR ("Failed to call transfert() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call transfert() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_accept (const callable_obj_t * c)
+void
+dbus_accept(const callable_obj_t * c)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    status_tray_icon_blink( FALSE );
+  status_tray_icon_blink(FALSE);
 #endif
 
-    DEBUG("dbus_accept %s\n", c->_callID);
+  DEBUG("dbus_accept %s\n", c->_callID);
 
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_accept ( callManagerProxy, c->_callID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_accept(callManagerProxy, c->_callID, &error);
+  if (error)
     {
-        ERROR ("Failed to call accept(%s) on CallManager: %s", c->_callID,
-                (error->message == NULL ? g_quark_to_string(error->domain): error->message));
-        g_error_free (error);
+      ERROR ("Failed to call accept(%s) on CallManager: %s", c->_callID,
+          (error->message == NULL ? g_quark_to_string(error->domain): error->message));
+      g_error_free(error);
     }
 }
 
-    void
-dbus_refuse (const callable_obj_t * c)
+void
+dbus_refuse(const callable_obj_t * c)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    status_tray_icon_blink( FALSE );
+  status_tray_icon_blink(FALSE);
 #endif
 
-    DEBUG("dbus_refuse %s\n", c->_callID);
+  DEBUG("dbus_refuse %s\n", c->_callID);
 
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_refuse ( callManagerProxy, c->_callID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_refuse(callManagerProxy, c->_callID, &error);
+  if (error)
     {
-        ERROR ("Failed to call refuse() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call refuse() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-
-    void
-dbus_place_call (const callable_obj_t * c)
+void
+dbus_place_call(const callable_obj_t * c)
 {
-    DEBUG("dbus_place_call %s\n", c->_callID);
+  DEBUG("dbus_place_call %s\n", c->_callID);
 
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_place_call ( callManagerProxy, c->_accountID, c->_callID, c->_peer_number, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_place_call(callManagerProxy, c->_accountID,
+      c->_callID, c->_peer_number, &error);
+  if (error)
     {
-        ERROR ("Failed to call placeCall() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call placeCall() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-gchar**  dbus_account_list() {
-    GError *error = NULL;
-    char ** array;
+gchar**
+dbus_account_list()
+{
+  GError *error = NULL;
+  char ** array;
 
-    if(!org_sflphone_SFLphone_ConfigurationManager_get_account_list ( configurationManagerProxy, &array, &error))
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_account_list(
+      configurationManagerProxy, &array, &error))
     {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
         {
-            ERROR ("Caught remote method (get_account_list) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+          ERROR ("Caught remote method (get_account_list) exception  %s: %s", dbus_g_error_get_name(error), error->message);
         }
-        else
+      else
         {
-            ERROR("Error while calling get_account_list: %s", error->message);
+          ERROR("Error while calling get_account_list: %s", error->message);
         }
-        g_error_free (error);
-        return NULL;
+      g_error_free(error);
+      return NULL;
     }
-    else{
-        DEBUG ("DBus called get_account_list() on ConfigurationManager");
-        return array;
+  else
+    {
+      DEBUG ("DBus called get_account_list() on ConfigurationManager");
+      return array;
     }
 }
 
-
-GHashTable* dbus_account_details(gchar * accountID)
+GHashTable*
+dbus_account_details(gchar * accountID)
 {
-    GError *error = NULL;
-    GHashTable * details;
+  GError *error = NULL;
+  GHashTable * details;
 
-    if(!org_sflphone_SFLphone_ConfigurationManager_get_account_details( configurationManagerProxy, accountID, &details, &error))
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_account_details(
+      configurationManagerProxy, accountID, &details, &error))
     {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
         {
-            ERROR ("Caught remote method (get_account_details) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+          ERROR ("Caught remote method (get_account_details) exception  %s: %s", dbus_g_error_get_name(error), error->message);
         }
-        else
+      else
         {
-            ERROR("Error while calling get_account_details: %s", error->message);
+          ERROR("Error while calling get_account_details: %s", error->message);
         }
-        g_error_free (error);
-        return NULL;
+      g_error_free(error);
+      return NULL;
     }
-    else{
-        return details;
+  else
+    {
+      return details;
     }
 }
 
-    void
+void
 dbus_set_credential(account_t *a, int index)
 {
-    DEBUG("Sending credential %d to server", index);
-    GError *error = NULL;
-    GHashTable * credential = g_ptr_array_index(a->credential_information, index);
-    
-    if(credential == NULL) {
-        DEBUG("Credential %d was deleted", index);
-    } else {
-        org_sflphone_SFLphone_ConfigurationManager_set_credential (
-                configurationManagerProxy,
-                a->accountID,
-                index,
-                credential,
-                &error);
-    }
-            
-    if (error) {
-        ERROR ("Failed to call set_credential() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
-    }
-}
-    void 
-dbus_set_number_of_credential(account_t *a, int number) 
-{
-    DEBUG("Sending number of credential %d to server", number);
-    GError *error = NULL;
-
-    org_sflphone_SFLphone_ConfigurationManager_set_number_of_credential( configurationManagerProxy, a->accountID, number, &error);
-            
-    if (error) {
-        ERROR ("Failed to call set_number_of_credential() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
-    } 
-}
-    void
+  DEBUG("Sending credential %d to server", index);
+  GError *error = NULL;
+  GHashTable * credential = g_ptr_array_index(a->credential_information, index);
+
+  if (credential == NULL)
+    {
+      DEBUG("Credential %d was deleted", index);
+    }
+  else
+    {
+      org_sflphone_SFLphone_ConfigurationManager_set_credential(
+          configurationManagerProxy, a->accountID, index, credential, &error);
+    }
+
+  if (error)
+    {
+      ERROR ("Failed to call set_credential() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
+    }
+}
+void
+dbus_set_number_of_credential(account_t *a, int number)
+{
+  DEBUG("Sending number of credential %d to server", number);
+  GError *error = NULL;
+
+  org_sflphone_SFLphone_ConfigurationManager_set_number_of_credential(
+      configurationManagerProxy, a->accountID, number, &error);
+
+  if (error)
+    {
+      ERROR ("Failed to call set_number_of_credential() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
+    }
+}
+void
 dbus_delete_all_credential(account_t *a)
 {
-    DEBUG("Deleting all credentials\n");
-    GError *error = NULL;
-    
-    org_sflphone_SFLphone_ConfigurationManager_delete_all_credential(configurationManagerProxy, a->accountID, &error);
-        
-    if (error) {
-        ERROR ("Failed to call deleteAllCredential on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
-    } 
+  DEBUG("Deleting all credentials\n");
+  GError *error = NULL;
+
+  org_sflphone_SFLphone_ConfigurationManager_delete_all_credential(
+      configurationManagerProxy, a->accountID, &error);
+
+  if (error)
+    {
+      ERROR ("Failed to call deleteAllCredential on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
+    }
 }
 
-    int
+int
 dbus_get_number_of_credential(gchar * accountID)
 {
-    GError *error = NULL;
-    int number = 0;
+  GError *error = NULL;
+  int number = 0;
+
+  DEBUG("Getting number of credential for account %s", accountID);
 
-    DEBUG("Getting number of credential for account %s", accountID);
-        
-    if(!org_sflphone_SFLphone_ConfigurationManager_get_number_of_credential( configurationManagerProxy, accountID, &number, &error)) {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION) {
-            ERROR ("Caught remote method (get_account_details) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_number_of_credential(
+      configurationManagerProxy, accountID, &number, &error))
+    {
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
+        {
+          ERROR ("Caught remote method (get_account_details) exception  %s: %s", dbus_g_error_get_name(error), error->message);
         }
-        else {
-            ERROR("Error while calling get_account_details: %s", error->message);
+      else
+        {
+          ERROR("Error while calling get_account_details: %s", error->message);
         }
-        g_error_free (error);
-        return 0;
-    } else {
-        DEBUG("%d credential(s) found for account %s", number, accountID);
-        return number;
+      g_error_free(error);
+      return 0;
+    }
+  else
+    {
+      DEBUG("%d credential(s) found for account %s", number, accountID);
+      return number;
     }
 }
 
-GHashTable* dbus_get_credential(gchar * accountID, int index)
+GHashTable*
+dbus_get_credential(gchar * accountID, int index)
 {
-    GError *error = NULL;
-    GHashTable * details;
+  GError *error = NULL;
+  GHashTable * details;
 
-    if(!org_sflphone_SFLphone_ConfigurationManager_get_credential( configurationManagerProxy, accountID, index, &details, &error)) {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION) {
-            ERROR ("Caught remote method (get_account_details) exception  %s: %s", dbus_g_error_get_name(error), error->message);
-        } else {
-            ERROR("Error while calling get_account_details: %s", error->message);
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_credential(
+      configurationManagerProxy, accountID, index, &details, &error))
+    {
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
+        {
+          ERROR ("Caught remote method (get_account_details) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+        }
+      else
+        {
+          ERROR("Error while calling get_account_details: %s", error->message);
         }
-        g_error_free (error);
-        return NULL;
-    } else {
-        return details;
+      g_error_free(error);
+      return NULL;
+    }
+  else
+    {
+      return details;
     }
 }
 
-GHashTable* dbus_get_ip2_ip_details(void)
+GHashTable*
+dbus_get_ip2_ip_details(void)
 {
-    GError *error = NULL;
-    GHashTable * details;
-    if(!org_sflphone_SFLphone_ConfigurationManager_get_ip2_ip_details( configurationManagerProxy, &details, &error))
+  GError *error = NULL;
+  GHashTable * details;
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_ip2_ip_details(
+      configurationManagerProxy, &details, &error))
     {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
         {
-            ERROR ("Caught remote method (get_ip2_ip_details) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+          ERROR ("Caught remote method (get_ip2_ip_details) exception  %s: %s", dbus_g_error_get_name(error), error->message);
         }
-        else
+      else
         {
-            ERROR("Error while calling get_ip2_ip_details: %s", error->message);
+          ERROR("Error while calling get_ip2_ip_details: %s", error->message);
         }
-        g_error_free (error);
-        return NULL;
+      g_error_free(error);
+      return NULL;
     }
-    else{
-        return details;
+  else
+    {
+      return details;
     }
 }
 
-    void
+void
 dbus_set_ip2ip_details(GHashTable * properties)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_ip2_ip_details (
-            configurationManagerProxy,
-            properties,
-            &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_ip2_ip_details(
+      configurationManagerProxy, properties, &error);
+  if (error)
     {
-        ERROR ("Failed to call set_ip_2ip_details() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call set_ip_2ip_details() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_send_register ( gchar* accountID , const guint enable)
+void
+dbus_send_register(gchar* accountID, const guint enable)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_send_register(configurationManagerProxy, accountID, enable ,&error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_send_register(
+      configurationManagerProxy, accountID, enable, &error);
+  if (error)
     {
-        ERROR ("Failed to call send_register() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call send_register() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
+void
 dbus_remove_account(gchar * accountID)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_remove_account (
-            configurationManagerProxy,
-            accountID,
-            &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_remove_account(
+      configurationManagerProxy, accountID, &error);
+  if (error)
     {
-        ERROR ("Failed to call remove_account() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call remove_account() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
+void
 dbus_set_account_details(account_t *a)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_account_details (
-            configurationManagerProxy,
-            a->accountID,
-            a->properties,
-            &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_account_details(
+      configurationManagerProxy, a->accountID, a->properties, &error);
+  if (error)
     {
-        ERROR ("Failed to call set_account_details() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call set_account_details() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
-    gchar*
+gchar*
 dbus_add_account(account_t *a)
 {
-    gchar* accountId;
-    GError *error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_add_account (
-            configurationManagerProxy,
-            a->properties,
-            &accountId,
-            &error);
-    if (error)
+  gchar* accountId;
+  GError *error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_add_account(
+      configurationManagerProxy, a->properties, &accountId, &error);
+  if (error)
     {
-        ERROR ("Failed to call add_account() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call add_account() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
-    return accountId;
+  return accountId;
 }
 
-    void
+void
 dbus_set_volume(const gchar * device, gdouble value)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_set_volume(
-            callManagerProxy,
-            device,
-            value,
-            &error);
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_set_volume(callManagerProxy, device, value,
+      &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call set_volume() on callManagerProxy: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call set_volume() on callManagerProxy: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-
-    gdouble
+gdouble
 dbus_get_volume(const gchar * device)
 {
-    gdouble  value;
-    GError *error = NULL;
+  gdouble value;
+  GError *error = NULL;
 
-    org_sflphone_SFLphone_CallManager_get_volume(
-            callManagerProxy,
-            device,
-            &value,
-            &error);
+  org_sflphone_SFLphone_CallManager_get_volume(callManagerProxy, device,
+      &value, &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call get_volume() on callManagerProxy: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call get_volume() on callManagerProxy: %s",
+          error->message);
+      g_error_free(error);
     }
-    return value;
+  return value;
 }
 
-
-    void
+void
 dbus_play_dtmf(const gchar * key)
 {
-    GError *error = NULL;
+  GError *error = NULL;
 
-    org_sflphone_SFLphone_CallManager_play_dt_mf(
-            callManagerProxy,
-            key,
-            &error);
+  org_sflphone_SFLphone_CallManager_play_dt_mf(callManagerProxy, key, &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call playDTMF() on callManagerProxy: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call playDTMF() on callManagerProxy: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_start_tone(const int start , const guint type )
+void
+dbus_start_tone(const int start, const guint type)
 {
-    GError *error = NULL;
+  GError *error = NULL;
 
-    org_sflphone_SFLphone_CallManager_start_tone(
-            callManagerProxy,
-            start,
-            type,
-            &error);
+  org_sflphone_SFLphone_CallManager_start_tone(callManagerProxy, start, type,
+      &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call startTone() on callManagerProxy: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call startTone() on callManagerProxy: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
+void
 dbus_register(int pid, gchar * name)
 {
-    GError *error = NULL;
+  GError *error = NULL;
 
-    org_sflphone_SFLphone_Instance_register(
-            instanceProxy,
-            pid,
-            name,
-            &error);
+  org_sflphone_SFLphone_Instance_register(instanceProxy, pid, name, &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call register() on instanceProxy: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call register() on instanceProxy: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
+void
 dbus_unregister(int pid)
 {
-    GError *error = NULL;
+  GError *error = NULL;
 
-    org_sflphone_SFLphone_Instance_unregister(
-            instanceProxy,
-            pid,
-            &error);
+  org_sflphone_SFLphone_Instance_unregister(instanceProxy, pid, &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call unregister() on instanceProxy: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call unregister() on instanceProxy: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    gchar**
+gchar**
 dbus_codec_list()
 {
 
-    GError *error = NULL;
-    gchar** array = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_codec_list (
-            configurationManagerProxy,
-            &array,
-            &error);
+  GError *error = NULL;
+  gchar** array = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_codec_list(
+      configurationManagerProxy, &array, &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call get_codec_list() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call get_codec_list() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
-    return array;
+  return array;
 }
 
-    gchar**
-dbus_codec_details( int payload )
+gchar**
+dbus_codec_details(int payload)
 {
 
-    GError *error = NULL;
-    gchar ** array;
-    org_sflphone_SFLphone_ConfigurationManager_get_codec_details (
-            configurationManagerProxy,
-            payload,
-            &array,
-            &error);
+  GError *error = NULL;
+  gchar ** array;
+  org_sflphone_SFLphone_ConfigurationManager_get_codec_details(
+      configurationManagerProxy, payload, &array, &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call get_codec_details() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call get_codec_details() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
-    return array;
+  return array;
 }
 
-gchar* dbus_get_current_codec_name (const callable_obj_t * c)
+gchar*
+dbus_get_current_codec_name(const callable_obj_t * c)
 {
 
-    gchar* codecName= "";
-    GError* error = NULL;
+  gchar* codecName = "";
+  GError* error = NULL;
 
-    org_sflphone_SFLphone_CallManager_get_current_codec_name (
-            callManagerProxy,
-            c->_callID,
-            &codecName,
-            &error);
-    if(error)
+  org_sflphone_SFLphone_CallManager_get_current_codec_name(callManagerProxy,
+      c->_callID, &codecName, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 
-    DEBUG("dbus_get_current_codec_name : codecName : %s", codecName);
+  DEBUG("dbus_get_current_codec_name : codecName : %s", codecName);
 
-    return codecName;
+  return codecName;
 }
 
-gchar** dbus_get_active_codec_list (gchar *accountID) {
+gchar**
+dbus_get_active_codec_list(gchar *accountID)
+{
 
-    gchar ** array;
-    GError *error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_active_codec_list (
-            configurationManagerProxy,
-			accountID,
-            &array,
-            &error);
+  gchar ** array;
+  GError *error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_active_codec_list(
+      configurationManagerProxy, accountID, &array, &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call get_active_codec_list() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call get_active_codec_list() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
-    return array;
+  return array;
 }
 
-    void
+void
 dbus_set_active_codec_list(const gchar** list, const gchar *accountID)
 {
 
-    GError *error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_active_codec_list (
-            configurationManagerProxy,
-            list,
-			accountID,
-            &error);
+  GError *error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_active_codec_list(
+      configurationManagerProxy, list, accountID, &error);
 
-    if (error)
+  if (error)
     {
-        ERROR ("Failed to call set_active_codec_list() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call set_active_codec_list() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
 /**
  * Get a list of input supported audio plugins
  */
-    gchar**
+gchar**
 dbus_get_input_audio_plugin_list()
 {
-    gchar** array;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_input_audio_plugin_list(
-            configurationManagerProxy,
-            &array,
-            &error);
-    if(error)
+  gchar** array;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_input_audio_plugin_list(
+      configurationManagerProxy, &array, &error);
+  if (error)
     {
-        ERROR("Failed to call get_input_audio_plugin_list() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call get_input_audio_plugin_list() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
-    return array;
+  return array;
 }
 
 /**
  * Get a list of output supported audio plugins
  */
-    gchar**
+gchar**
 dbus_get_output_audio_plugin_list()
 {
-    gchar** array;
-    GError* error = NULL;
+  gchar** array;
+  GError* error = NULL;
 
-    if(!org_sflphone_SFLphone_ConfigurationManager_get_output_audio_plugin_list( configurationManagerProxy, &array, &error))
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_output_audio_plugin_list(
+      configurationManagerProxy, &array, &error))
     {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
         {
-            ERROR ("Caught remote method (get_output_audio_plugin_list) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+          ERROR ("Caught remote method (get_output_audio_plugin_list) exception  %s: %s", dbus_g_error_get_name(error), error->message);
         }
-        else
+      else
         {
-            ERROR("Error while calling get_out_audio_plugin_list: %s", error->message);
+          ERROR("Error while calling get_out_audio_plugin_list: %s", error->message);
         }
-        g_error_free (error);
-        return NULL;
+      g_error_free(error);
+      return NULL;
     }
-    else{
-        return array;
+  else
+    {
+      return array;
     }
 }
 
-    void
+void
 dbus_set_input_audio_plugin(gchar* audioPlugin)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_input_audio_plugin(
-            configurationManagerProxy,
-            audioPlugin,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_input_audio_plugin(
+      configurationManagerProxy, audioPlugin, &error);
+  if (error)
     {
-        ERROR("Failed to call set_input_audio_plugin() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call set_input_audio_plugin() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
 }
 
-    void
+void
 dbus_set_output_audio_plugin(gchar* audioPlugin)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_output_audio_plugin(
-            configurationManagerProxy,
-            audioPlugin,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_output_audio_plugin(
+      configurationManagerProxy, audioPlugin, &error);
+  if (error)
     {
-        ERROR("Failed to call set_output_audio_plugin() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call set_output_audio_plugin() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
 }
 
 /**
  * Get all output devices index supported by current audio manager
  */
-gchar** dbus_get_audio_output_device_list()
+gchar**
+dbus_get_audio_output_device_list()
 {
-    gchar** array;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_audio_output_device_list(
-            configurationManagerProxy,
-            &array,
-            &error);
-    if(error)
+  gchar** array;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_audio_output_device_list(
+      configurationManagerProxy, &array, &error);
+  if (error)
     {
-        ERROR("Failed to call get_audio_output_device_list() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call get_audio_output_device_list() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
-    return array;
+  return array;
 }
 
 /**
  * Set audio output device from its index
  */
-    void
+void
 dbus_set_audio_output_device(const int index)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_audio_output_device(
-            configurationManagerProxy,
-            index,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_audio_output_device(
+      configurationManagerProxy, index, &error);
+  if (error)
     {
-        ERROR("Failed to call set_audio_output_device() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call set_audio_output_device() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
 }
 
 /**
  * Get all input devices index supported by current audio manager
  */
-    gchar**
+gchar**
 dbus_get_audio_input_device_list()
 {
-    gchar** array;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_audio_input_device_list(
-            configurationManagerProxy,
-            &array,
-            &error);
-    if(error)
+  gchar** array;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_audio_input_device_list(
+      configurationManagerProxy, &array, &error);
+  if (error)
     {
-        ERROR("Failed to call get_audio_input_device_list() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call get_audio_input_device_list() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
-    return array;
+  return array;
 }
 
 /**
  * Set audio input device from its index
  */
-    void
+void
 dbus_set_audio_input_device(const int index)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_audio_input_device(
-            configurationManagerProxy,
-            index,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_audio_input_device(
+      configurationManagerProxy, index, &error);
+  if (error)
     {
-        ERROR("Failed to call set_audio_input_device() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call set_audio_input_device() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
 }
 
 /**
  * Get output device index and input device index
  */
-    gchar**
+gchar**
 dbus_get_current_audio_devices_index()
 {
-    gchar** array;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_current_audio_devices_index(
-            configurationManagerProxy,
-            &array,
-            &error);
-    if(error)
+  gchar** array;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_current_audio_devices_index(
+      configurationManagerProxy, &array, &error);
+  if (error)
     {
-        ERROR("Failed to call get_current_audio_devices_index() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call get_current_audio_devices_index() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
-    return array;
+  return array;
 }
 
 /**
  * Get index
  */
-    int
+int
 dbus_get_audio_device_index(const gchar *name)
 {
-    int index;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_audio_device_index(
-            configurationManagerProxy,
-            name,
-            &index,
-            &error);
-    if(error)
+  int index;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_audio_device_index(
+      configurationManagerProxy, name, &index, &error);
+  if (error)
     {
-        ERROR("Failed to call get_audio_device_index() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call get_audio_device_index() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
-    return index;
+  return index;
 }
 
 /**
  * Get audio plugin
  */
-    gchar*
+gchar*
 dbus_get_current_audio_output_plugin()
 {
-    gchar* plugin="";
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_current_audio_output_plugin(
-            configurationManagerProxy,
-            &plugin,
-            &error);
-    if(error)
+  gchar* plugin = "";
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_current_audio_output_plugin(
+      configurationManagerProxy, &plugin, &error);
+  if (error)
     {
-        ERROR("Failed to call get_current_audio_output_plugin() on ConfigurationManager: %s", error->message);
-        g_error_free(error);
+      ERROR("Failed to call get_current_audio_output_plugin() on ConfigurationManager: %s", error->message);
+      g_error_free(error);
     }
-    return plugin;
+  return plugin;
 }
 
-
-    gchar*
+gchar*
 dbus_get_ringtone_choice()
 {
-    gchar* tone;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_ringtone_choice(
-            configurationManagerProxy,
-            &tone,
-            &error);
-    if(error)
+  gchar* tone;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_ringtone_choice(
+      configurationManagerProxy, &tone, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return tone;
+  return tone;
 }
 
-    void
-dbus_set_ringtone_choice( const gchar* tone )
+void
+dbus_set_ringtone_choice(const gchar* tone)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_ringtone_choice(
-            configurationManagerProxy,
-            tone,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_ringtone_choice(
+      configurationManagerProxy, tone, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-    int
+int
 dbus_is_ringtone_enabled()
 {
-    int res;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_is_ringtone_enabled(
-            configurationManagerProxy,
-            &res,
-            &error);
-    if(error)
+  int res;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_is_ringtone_enabled(
+      configurationManagerProxy, &res, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return res;
+  return res;
 }
 
-    void
+void
 dbus_ringtone_enabled()
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_ringtone_enabled(
-            configurationManagerProxy,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_ringtone_enabled(
+      configurationManagerProxy, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-    gboolean
+gboolean
 dbus_is_md5_credential_hashing()
 {
-    int res;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_is_md5_credential_hashing(
-            configurationManagerProxy,
-            &res,
-            &error);
-    if(error)
+  int res;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_is_md5_credential_hashing(
+      configurationManagerProxy, &res, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return res;
+  return res;
 }
 
-    void
+void
 dbus_set_md5_credential_hashing(gboolean enabled)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_md5_credential_hashing(
-            configurationManagerProxy,
-            enabled,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_md5_credential_hashing(
+      configurationManagerProxy, enabled, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-    int
+int
 dbus_is_iax2_enabled()
 {
-    int res;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_is_iax2_enabled(
-            configurationManagerProxy,
-            &res,
-            &error);
-    if(error)
+  int res;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_is_iax2_enabled(
+      configurationManagerProxy, &res, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return res;
+  return res;
 }
 
-    int
+int
 dbus_get_dialpad()
 {
-    int state;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_dialpad(
-            configurationManagerProxy,
-            &state,
-            &error);
-    if(error)
+  int state;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_dialpad(
+      configurationManagerProxy, &state, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return state;
+  return state;
 }
 
-void dbus_set_dialpad (gboolean display)
+void
+dbus_set_dialpad(gboolean display)
 {
-    
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_dialpad(
-            configurationManagerProxy,
-			display,
-            &error);
-    if(error)
+
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_dialpad(
+      configurationManagerProxy, display, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-    int
+int
 dbus_get_searchbar()
 {
-    int state;
-    GError* error = NULL;
-    if(!org_sflphone_SFLphone_ConfigurationManager_get_searchbar( configurationManagerProxy, &state, &error))
+  int state;
+  GError* error = NULL;
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_searchbar(
+      configurationManagerProxy, &state, &error))
     {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
         {
-            ERROR ("Caught remote method (get_searchbar) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+          ERROR ("Caught remote method (get_searchbar) exception  %s: %s", dbus_g_error_get_name(error), error->message);
         }
-        else
+      else
         {
-            ERROR("Error while calling get_searchbar: %s", error->message);
+          ERROR("Error while calling get_searchbar: %s", error->message);
         }
-        g_error_free (error);
-        return -1;
+      g_error_free(error);
+      return -1;
     }
-    else
+  else
     {
-        return state;
+      return state;
     }
 }
 
-    void
-dbus_set_searchbar(  )
+void
+dbus_set_searchbar()
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_searchbar(
-            configurationManagerProxy,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_searchbar(
+      configurationManagerProxy, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-    int
+int
 dbus_get_volume_controls()
 {
-    int state;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_volume_controls(
-            configurationManagerProxy,
-            &state,
-            &error);
-    if(error)
+  int state;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_volume_controls(
+      configurationManagerProxy, &state, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return state;
+  return state;
 }
 
-    void
-dbus_set_volume_controls (gboolean display)
+void
+dbus_set_volume_controls(gboolean display)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_volume_controls(
-            configurationManagerProxy,
-			display,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_volume_controls(
+      configurationManagerProxy, display, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
@@ -1751,832 +1665,926 @@ void
 dbus_join_participant(const gchar* sel_callID, const gchar* drag_callID)
 {
 
-    DEBUG("dbus_join_participant %s and %s\n", sel_callID, drag_callID);
+  DEBUG("dbus_join_participant %s and %s\n", sel_callID, drag_callID);
 
-    GError* error = NULL;
-    
-    org_sflphone_SFLphone_CallManager_join_participant (
-             callManagerProxy, 
-	     sel_callID, 
-	     drag_callID, 
-	     &error);
-    if(error)
+  GError* error = NULL;
+
+  org_sflphone_SFLphone_CallManager_join_participant(callManagerProxy,
+      sel_callID, drag_callID, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    
+
 }
 
 void
 dbus_add_participant(const gchar* callID, const gchar* confID)
 {
 
-    DEBUG("dbus_add_participant %s and %s\n", callID, confID);
+  DEBUG("dbus_add_participant %s and %s\n", callID, confID);
 
-    GError* error = NULL;
-    
-    org_sflphone_SFLphone_CallManager_add_participant (
-             callManagerProxy, 
-	     callID, 
-	     confID, 
-	     &error);
-    if(error)
+  GError* error = NULL;
+
+  org_sflphone_SFLphone_CallManager_add_participant(callManagerProxy, callID,
+      confID, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    
+
 }
 
 void
 dbus_add_main_participant(const gchar* confID)
 {
-    DEBUG("dbus_add_participant %s\n", confID);
+  DEBUG("dbus_add_participant %s\n", confID);
 
-    GError* error = NULL;
+  GError* error = NULL;
 
-    org_sflphone_SFLphone_CallManager_add_main_participant (
-             callManagerProxy, 
-	     confID, 
-	     &error);
-    if(error)
+  org_sflphone_SFLphone_CallManager_add_main_participant(callManagerProxy,
+      confID, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-
-    void
+void
 dbus_detach_participant(const gchar* callID)
 {
 
-    DEBUG("dbus_detach_participant %s\n", callID);
+  DEBUG("dbus_detach_participant %s\n", callID);
 
-    GError* error = NULL;
-    org_sflphone_SFLphone_CallManager_detach_participant(
-            callManagerProxy,
-            callID,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_CallManager_detach_participant(callManagerProxy,
+      callID, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    
-}
 
+}
 
 dbus_join_conference(const gchar* sel_confID, const gchar* drag_confID)
 {
 
-    DEBUG("dbus_join_conference %s and %s\n", sel_confID, drag_confID);
+  DEBUG("dbus_join_conference %s and %s\n", sel_confID, drag_confID);
 
-    GError* error = NULL;
-    
-    org_sflphone_SFLphone_CallManager_join_conference (
-             callManagerProxy, 
-	     sel_confID, 
-	     drag_confID, 
-	     &error);
-    if(error)
+  GError* error = NULL;
+
+  org_sflphone_SFLphone_CallManager_join_conference(callManagerProxy,
+      sel_confID, drag_confID, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    
-}
-
 
+}
 
-    void
+void
 dbus_set_record(const gchar* id)
 {
-    DEBUG("dbus_set_record %s\n", id);
+  DEBUG("dbus_set_record %s\n", id);
 
-    GError* error = NULL;
-    org_sflphone_SFLphone_CallManager_set_recording (
-            callManagerProxy,
-            id,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_CallManager_set_recording(callManagerProxy, id, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-
-    gboolean
+gboolean
 dbus_get_is_recording(const callable_obj_t * c)
 {
-    DEBUG("dbus_get_is_recording %s\n", c->_callID);
-    GError* error = NULL;
-    gboolean isRecording;
-    org_sflphone_SFLphone_CallManager_get_is_recording (
-            callManagerProxy,
-            c->_callID,
-            &isRecording,
-            &error);
-    if(error)
+  DEBUG("dbus_get_is_recording %s\n", c->_callID);
+  GError* error = NULL;
+  gboolean isRecording;
+  org_sflphone_SFLphone_CallManager_get_is_recording(callManagerProxy,
+      c->_callID, &isRecording, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    //DEBUG("RECORDING: %i",isRecording);
-    return isRecording;
+  //DEBUG("RECORDING: %i",isRecording);
+  return isRecording;
 }
 
-    void
+void
 dbus_set_record_path(const gchar* path)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_record_path (
-            configurationManagerProxy,
-            path,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_record_path(
+      configurationManagerProxy, path, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-    gchar*
+gchar*
 dbus_get_record_path(void)
 {
-    GError* error = NULL;
-    gchar *path;
-    org_sflphone_SFLphone_ConfigurationManager_get_record_path (
-            configurationManagerProxy,
-            &path,
-            &error);
-    if(error)
+  GError* error = NULL;
+  gchar *path;
+  org_sflphone_SFLphone_ConfigurationManager_get_record_path(
+      configurationManagerProxy, &path, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return path;
+  return path;
 }
 
-void dbus_set_history_limit (const guint days)
+void
+dbus_set_history_limit(const guint days)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_history_limit(
-            configurationManagerProxy,
-            days,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_history_limit(
+      configurationManagerProxy, days, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-void dbus_set_history_enabled ()
+void
+dbus_set_history_enabled()
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_history_enabled(
-            configurationManagerProxy,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_history_enabled(
+      configurationManagerProxy, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-gchar* dbus_get_history_enabled ()
+gchar*
+dbus_get_history_enabled()
 {
-    gchar* state; 
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_history_enabled(
-            configurationManagerProxy,
-            &state,
-            &error);
-    if(error)
+  gchar* state;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_history_enabled(
+      configurationManagerProxy, &state, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return state;
+  return state;
 }
 
-
-
-guint dbus_get_history_limit (void)
+guint
+dbus_get_history_limit(void)
 {
-    GError* error = NULL;
-    gint days=30;
-    org_sflphone_SFLphone_ConfigurationManager_get_history_limit(
-            configurationManagerProxy,
-            &days,
-            &error);
-    if(error)
+  GError* error = NULL;
+  gint days = 30;
+  org_sflphone_SFLphone_ConfigurationManager_get_history_limit(
+      configurationManagerProxy, &days, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return (guint)days;
+  return (guint) days;
 }
 
-    void
-dbus_start_hidden( void )
+void
+dbus_start_hidden(void)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_start_hidden(
-            configurationManagerProxy,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_start_hidden(
+      configurationManagerProxy, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-
-    int
-dbus_is_start_hidden( void )
+int
+dbus_is_start_hidden(void)
 {
-    GError* error = NULL;
-    int state;
-    org_sflphone_SFLphone_ConfigurationManager_is_start_hidden(
-            configurationManagerProxy,
-            &state,
-            &error);
-    if(error)
+  GError* error = NULL;
+  int state;
+  org_sflphone_SFLphone_ConfigurationManager_is_start_hidden(
+      configurationManagerProxy, &state, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return state;
+  return state;
 }
 
-    int
-dbus_popup_mode( void )
+int
+dbus_popup_mode(void)
 {
-    GError* error = NULL;
-    int state;
-    org_sflphone_SFLphone_ConfigurationManager_popup_mode(
-            configurationManagerProxy,
-            &state,
-            &error);
-    if(error)
+  GError* error = NULL;
+  int state;
+  org_sflphone_SFLphone_ConfigurationManager_popup_mode(
+      configurationManagerProxy, &state, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
-    return state;
+  return state;
 }
 
-    void
-dbus_switch_popup_mode( void )
+void
+dbus_switch_popup_mode(void)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_switch_popup_mode(
-            configurationManagerProxy,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_switch_popup_mode(
+      configurationManagerProxy, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_set_notify( void )
+void
+dbus_set_notify(void)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_notify(
-            configurationManagerProxy,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_notify(
+      configurationManagerProxy, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-    guint
-dbus_get_notify( void )
+guint
+dbus_get_notify(void)
 {
-    gint level;
-    GError* error = NULL;
-    if( !org_sflphone_SFLphone_ConfigurationManager_get_notify( configurationManagerProxy,&level, &error) )
+  gint level;
+  GError* error = NULL;
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_notify(
+      configurationManagerProxy, &level, &error))
     {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
         {
-            ERROR ("Caught remote method (get_notify) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+          ERROR ("Caught remote method (get_notify) exception  %s: %s", dbus_g_error_get_name(error), error->message);
         }
-        else
+      else
         {
-            ERROR ("Error while calling get_notify: %s", error->message);
+          ERROR ("Error while calling get_notify: %s", error->message);
         }
-        g_error_free (error);
-        return 0;
+      g_error_free(error);
+      return 0;
     }
-    else{
-        return (guint)level;
+  else
+    {
+      return (guint) level;
     }
 }
 
-    void
-dbus_set_audio_manager( int api )
+void
+dbus_set_audio_manager(int api)
 {
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_audio_manager(
-            configurationManagerProxy,
-            api,
-            &error);
-    if(error)
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_audio_manager(
+      configurationManagerProxy, api, &error);
+  if (error)
     {
-        g_error_free(error);
+      g_error_free(error);
     }
 }
 
-    int
-dbus_get_audio_manager( void )
+int
+dbus_get_audio_manager(void)
 {
-    int api;
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_audio_manager(
-            configurationManagerProxy,
-            &api,
-            &error);
-    if(error)
+  int api;
+  GError* error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_audio_manager(
+      configurationManagerProxy, &api, &error);
+  if (error)
     {
-        ERROR("Error calling dbus_get_audio_manager");
-        g_error_free(error);
+      ERROR("Error calling dbus_get_audio_manager");
+      g_error_free(error);
     }
 
-    return api;
+  return api;
 }
 
 /*
-    void
-dbus_set_sip_address( const gchar* address )
-{
-    GError* error = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_set_sip_address(
-            configurationManagerProxy,
-            address,
-            &error);
-    if(error)
-    {
-        g_error_free(error);
-    }
-}
-*/
+ void
+ dbus_set_sip_address( const gchar* address )
+ {
+ GError* error = NULL;
+ org_sflphone_SFLphone_ConfigurationManager_set_sip_address(
+ configurationManagerProxy,
+ address,
+ &error);
+ if(error)
+ {
+ g_error_free(error);
+ }
+ }
+ */
 
- /*
+/*
 
-    gint
-dbus_get_sip_address( void )
-{
-    GError* error = NULL;
-    gint address;
-    org_sflphone_SFLphone_ConfigurationManager_get_sip_address(
-            configurationManagerProxy,
-            &address,
-            &error);
-    if(error)
-    {
-        g_error_free(error);
-    }
-    return address;
-}
+ gint
+ dbus_get_sip_address( void )
+ {
+ GError* error = NULL;
+ gint address;
+ org_sflphone_SFLphone_ConfigurationManager_get_sip_address(
+ configurationManagerProxy,
+ &address,
+ &error);
+ if(error)
+ {
+ g_error_free(error);
+ }
+ return address;
+ }
  */
 
-GHashTable* dbus_get_addressbook_settings (void) {
+GHashTable*
+dbus_get_addressbook_settings(void)
+{
 
-    GError *error = NULL;
-    GHashTable *results = NULL;
+  GError *error = NULL;
+  GHashTable *results = NULL;
 
-    //DEBUG ("Calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings");
+  //DEBUG ("Calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings");
 
-    org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings (configurationManagerProxy, &results, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings(
+      configurationManagerProxy, &results, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings");
+      g_error_free(error);
     }
 
-    return results;
+  return results;
 }
 
-void dbus_set_addressbook_settings (GHashTable * settings){
+void
+dbus_set_addressbook_settings(GHashTable * settings)
+{
 
-    GError *error = NULL;
+  GError *error = NULL;
 
-    DEBUG ("Calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings");
+  DEBUG ("Calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings");
 
-    org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings (configurationManagerProxy, settings, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings(
+      configurationManagerProxy, settings, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings");
+      g_error_free(error);
     }
 }
 
-gchar** dbus_get_addressbook_list (void) {
+gchar**
+dbus_get_addressbook_list(void)
+{
 
-    GError *error = NULL;
-    gchar** array;
+  GError *error = NULL;
+  gchar** array;
 
-    org_sflphone_SFLphone_ConfigurationManager_get_addressbook_list (configurationManagerProxy, &array, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_list");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_get_addressbook_list(
+      configurationManagerProxy, &array, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_list");
+      g_error_free(error);
     }
 
-    return array;
+  return array;
 }
 
-void dbus_set_addressbook_list (const gchar** list){
+void
+dbus_set_addressbook_list(const gchar** list)
+{
 
-    GError *error = NULL;
+  GError *error = NULL;
 
-    org_sflphone_SFLphone_ConfigurationManager_set_addressbook_list(configurationManagerProxy, list, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_list");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_set_addressbook_list(
+      configurationManagerProxy, list, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_list");
+      g_error_free(error);
     }
 }
 
-GHashTable* dbus_get_hook_settings (void) {
+GHashTable*
+dbus_get_hook_settings(void)
+{
 
-    GError *error = NULL;
-    GHashTable *results = NULL;
+  GError *error = NULL;
+  GHashTable *results = NULL;
 
-    //DEBUG ("Calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings");
+  //DEBUG ("Calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings");
 
-    org_sflphone_SFLphone_ConfigurationManager_get_hook_settings (configurationManagerProxy, &results, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_hook_settings");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_get_hook_settings(
+      configurationManagerProxy, &results, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_hook_settings");
+      g_error_free(error);
     }
 
-    return results;
+  return results;
 }
 
-void dbus_set_hook_settings (GHashTable * settings){
+void
+dbus_set_hook_settings(GHashTable * settings)
+{
 
-    GError *error = NULL;
+  GError *error = NULL;
 
-    org_sflphone_SFLphone_ConfigurationManager_set_hook_settings (configurationManagerProxy, settings, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_set_hook_settings");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_set_hook_settings(
+      configurationManagerProxy, settings, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_set_hook_settings");
+      g_error_free(error);
     }
 }
 
-GHashTable* dbus_get_call_details (const gchar *callID)
+GHashTable*
+dbus_get_call_details(const gchar *callID)
 {
-    GError *error = NULL;
-    GHashTable *details = NULL;
+  GError *error = NULL;
+  GHashTable *details = NULL;
 
-    org_sflphone_SFLphone_CallManager_get_call_details (callManagerProxy, callID, &details, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_call_details");
-        g_error_free (error);
+  org_sflphone_SFLphone_CallManager_get_call_details(callManagerProxy, callID,
+      &details, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_call_details");
+      g_error_free(error);
     }
 
-    return details;
+  return details;
 }
 
-gchar** dbus_get_call_list (void)
+gchar**
+dbus_get_call_list(void)
 {
-    GError *error = NULL;
-    gchar **list = NULL;
+  GError *error = NULL;
+  gchar **list = NULL;
 
-    org_sflphone_SFLphone_CallManager_get_call_list (callManagerProxy, &list, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_call_list");
-        g_error_free (error);
+  org_sflphone_SFLphone_CallManager_get_call_list(callManagerProxy, &list,
+      &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_call_list");
+      g_error_free(error);
     }
 
-    return list;
+  return list;
 }
 
-gchar** dbus_get_conference_list (void)
+gchar**
+dbus_get_conference_list(void)
 {
-    GError *error = NULL;
-    gchar **list = NULL;
+  GError *error = NULL;
+  gchar **list = NULL;
 
-    org_sflphone_SFLphone_CallManager_get_conference_list (callManagerProxy, &list, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_conference_list");
-        g_error_free (error);
+  org_sflphone_SFLphone_CallManager_get_conference_list(callManagerProxy,
+      &list, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_conference_list");
+      g_error_free(error);
     }
 
-    return list;
+  return list;
 }
 
-
-gchar** dbus_get_participant_list (const char * confID)
+gchar**
+dbus_get_participant_list(const char * confID)
 {
-    GError *error = NULL;
-    gchar **list = NULL;
+  GError *error = NULL;
+  gchar **list = NULL;
 
-    DEBUG("get participant list")
+  DEBUG("get participant list")
 
-    org_sflphone_SFLphone_CallManager_get_participant_list (callManagerProxy, confID, &list, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_participant_list");
-        g_error_free (error);
+  org_sflphone_SFLphone_CallManager_get_participant_list(callManagerProxy,
+      confID, &list, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_participant_list");
+      g_error_free(error);
     }
 
-    return list;
+  return list;
 }
 
-
-GHashTable* dbus_get_conference_details (const gchar *confID)
+GHashTable*
+dbus_get_conference_details(const gchar *confID)
 {
-    GError *error = NULL;
-    GHashTable *details = NULL;
+  GError *error = NULL;
+  GHashTable *details = NULL;
 
-    org_sflphone_SFLphone_CallManager_get_conference_details (callManagerProxy, confID, &details, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_conference_details");
-        g_error_free (error);
+  org_sflphone_SFLphone_CallManager_get_conference_details(callManagerProxy,
+      confID, &details, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_conference_details");
+      g_error_free(error);
     }
 
-    return details;
+  return details;
 }
 
-void dbus_set_accounts_order (const gchar* order) {
+void
+dbus_set_accounts_order(const gchar* order)
+{
 
-    GError *error = NULL;
+  GError *error = NULL;
 
-    org_sflphone_SFLphone_ConfigurationManager_set_accounts_order (configurationManagerProxy, order, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_set_accounts_order");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_set_accounts_order(
+      configurationManagerProxy, order, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_set_accounts_order");
+      g_error_free(error);
     }
 }
 
-GHashTable* dbus_get_history (void)
+GHashTable*
+dbus_get_history(void)
 {
-    GError *error = NULL;
-    GHashTable *entries = NULL;
+  GError *error = NULL;
+  GHashTable *entries = NULL;
 
-    org_sflphone_SFLphone_ConfigurationManager_get_history (configurationManagerProxy, &entries, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_history");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_get_history(
+      configurationManagerProxy, &entries, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_history");
+      g_error_free(error);
     }
 
-    return entries;
+  return entries;
 }
 
-void dbus_set_history (GHashTable* entries)
+void
+dbus_set_history(GHashTable* entries)
 {
-    GError *error = NULL;
+  GError *error = NULL;
 
-    org_sflphone_SFLphone_ConfigurationManager_set_history (configurationManagerProxy, entries, &error);
-    if (error){
-        ERROR ("Error calling org_sflphone_SFLphone_CallManager_set_history");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_set_history(
+      configurationManagerProxy, entries, &error);
+  if (error)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_CallManager_set_history");
+      g_error_free(error);
     }
 }
 
-    void
-dbus_confirm_sas (const callable_obj_t * c)
+void
+dbus_confirm_sas(const callable_obj_t * c)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_set_sa_sverified ( callManagerProxy, c->_callID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_set_sa_sverified(callManagerProxy,
+      c->_callID, &error);
+  if (error)
     {
-        ERROR ("Failed to call setSASVerified() on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call setSASVerified() on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_reset_sas (const callable_obj_t * c)
+void
+dbus_reset_sas(const callable_obj_t * c)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_reset_sa_sverified ( callManagerProxy, c->_callID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_reset_sa_sverified(callManagerProxy,
+      c->_callID, &error);
+  if (error)
     {
-        ERROR ("Failed to call resetSASVerified on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call resetSASVerified on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_set_confirm_go_clear (const callable_obj_t * c)
+void
+dbus_set_confirm_go_clear(const callable_obj_t * c)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_set_confirm_go_clear( callManagerProxy, c->_callID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_set_confirm_go_clear(callManagerProxy,
+      c->_callID, &error);
+  if (error)
     {
-        ERROR ("Failed to call set_confirm_go_clear on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call set_confirm_go_clear on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    void
-dbus_request_go_clear (const callable_obj_t * c)
+void
+dbus_request_go_clear(const callable_obj_t * c)
 {
-    GError *error = NULL;
-    org_sflphone_SFLphone_CallManager_request_go_clear( callManagerProxy, c->_callID, &error);
-    if (error)
+  GError *error = NULL;
+  org_sflphone_SFLphone_CallManager_request_go_clear(callManagerProxy,
+      c->_callID, &error);
+  if (error)
     {
-        ERROR ("Failed to call request_go_clear on CallManager: %s",
-                error->message);
-        g_error_free (error);
+      ERROR ("Failed to call request_go_clear on CallManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-    gchar**
+gchar**
 dbus_get_supported_tls_method()
 {
-    GError *error = NULL;
-    gchar** array = NULL;
-    org_sflphone_SFLphone_ConfigurationManager_get_supported_tls_method (configurationManagerProxy, &array, &error);
+  GError *error = NULL;
+  gchar** array = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_get_supported_tls_method(
+      configurationManagerProxy, &array, &error);
 
-    if (error != NULL) {
-        ERROR ("Failed to call get_supported_tls_method() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+  if (error != NULL)
+    {
+      ERROR ("Failed to call get_supported_tls_method() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
-    return array;
+  return array;
 }
 
-GHashTable* dbus_get_tls_settings_default(void) 
+GHashTable*
+dbus_get_tls_settings_default(void)
 {
-    GError *error = NULL;
-    GHashTable *results = NULL;
+  GError *error = NULL;
+  GHashTable *results = NULL;
 
-    org_sflphone_SFLphone_ConfigurationManager_get_tls_settings_default(configurationManagerProxy, &results, &error);
-    if (error != NULL){
-        ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_tls_settings_default");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_get_tls_settings_default(
+      configurationManagerProxy, &results, &error);
+  if (error != NULL)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_tls_settings_default");
+      g_error_free(error);
     }
 
-    return results;
+  return results;
 }
 
-
-gchar * dbus_get_address_from_interface_name(gchar* interface)
+gchar *
+dbus_get_address_from_interface_name(gchar* interface)
 {
-    GError *error = NULL;
-    gchar * address;
+  GError *error = NULL;
+  gchar * address;
 
-    org_sflphone_SFLphone_ConfigurationManager_get_addr_from_interface_name ( configurationManagerProxy, interface, &address, &error);
-    if (error != NULL){
-        ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addr_from_interface_name\n");
-        g_error_free (error);
+  org_sflphone_SFLphone_ConfigurationManager_get_addr_from_interface_name(
+      configurationManagerProxy, interface, &address, &error);
+  if (error != NULL)
+    {
+      ERROR ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addr_from_interface_name\n");
+      g_error_free(error);
     }
 
-    return address;
+  return address;
 
 }
 
-
-gchar ** dbus_get_all_ip_interface(void)
+gchar **
+dbus_get_all_ip_interface(void)
 {
-    GError *error = NULL;
-    gchar ** array;
+  GError *error = NULL;
+  gchar ** array;
 
-    if(!org_sflphone_SFLphone_ConfigurationManager_get_all_ip_interface ( configurationManagerProxy, &array, &error))
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_all_ip_interface(
+      configurationManagerProxy, &array, &error))
     {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
         {
-            ERROR ("Caught remote method (get_all_ip_interface) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+          ERROR ("Caught remote method (get_all_ip_interface) exception  %s: %s", dbus_g_error_get_name(error), error->message);
         }
-        else
+      else
         {
-            ERROR("Error while calling get_all_ip_interface: %s", error->message);
+          ERROR("Error while calling get_all_ip_interface: %s", error->message);
         }
-        g_error_free (error);
-        return NULL;
+      g_error_free(error);
+      return NULL;
     }
-    else{
-        DEBUG ("DBus called get_all_ip_interface() on ConfigurationManager");
-        return array;
+  else
+    {
+      DEBUG ("DBus called get_all_ip_interface() on ConfigurationManager");
+      return array;
     }
 }
 
-gchar ** dbus_get_all_ip_interface_by_name(void)
+gchar **
+dbus_get_all_ip_interface_by_name(void)
 {
-    GError *error = NULL;
-    gchar ** array;
+  GError *error = NULL;
+  gchar ** array;
 
-    if(!org_sflphone_SFLphone_ConfigurationManager_get_all_ip_interface_by_name ( configurationManagerProxy, &array, &error))
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_all_ip_interface_by_name(
+      configurationManagerProxy, &array, &error))
     {
-        if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
         {
-            ERROR ("Caught remote method (get_all_ip_interface) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+          ERROR ("Caught remote method (get_all_ip_interface) exception  %s: %s", dbus_g_error_get_name(error), error->message);
         }
-        else
+      else
         {
-            ERROR("Error while calling get_all_ip_interface: %s", error->message);
+          ERROR("Error while calling get_all_ip_interface: %s", error->message);
         }
-        g_error_free (error);
-        return NULL;
+      g_error_free(error);
+      return NULL;
     }
-    else{
-        DEBUG ("DBus called get_all_ip_interface() on ConfigurationManager");
-        return array;
+  else
+    {
+      DEBUG ("DBus called get_all_ip_interface() on ConfigurationManager");
+      return array;
     }
 }
 
-guint dbus_get_window_width (void) {
+guint
+dbus_get_window_width(void)
+{
 
-    GError *error = NULL;
-	guint value; 
+  GError *error = NULL;
+  guint value;
 
-	org_sflphone_SFLphone_ConfigurationManager_get_window_width (configurationManagerProxy, &value, &error);
+  org_sflphone_SFLphone_ConfigurationManager_get_window_width(
+      configurationManagerProxy, &value, &error);
 
-    if (error != NULL) {
-        ERROR ("Failed to call get_window_width() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+  if (error != NULL)
+    {
+      ERROR ("Failed to call get_window_width() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
-    return value;
+  return value;
 }
 
-guint dbus_get_window_height (void) {
+guint
+dbus_get_window_height(void)
+{
 
-    GError *error = NULL;
-	guint value; 
+  GError *error = NULL;
+  guint value;
 
-	org_sflphone_SFLphone_ConfigurationManager_get_window_height (configurationManagerProxy, &value, &error);
+  org_sflphone_SFLphone_ConfigurationManager_get_window_height(
+      configurationManagerProxy, &value, &error);
 
-    if (error != NULL) {
-        ERROR ("Failed to call get_window_height() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+  if (error != NULL)
+    {
+      ERROR ("Failed to call get_window_height() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
-    return value;
+  return value;
 }
 
-void dbus_set_window_width (const guint width) {
+void
+dbus_set_window_width(const guint width)
+{
 
-    GError *error = NULL;
+  GError *error = NULL;
 
-	org_sflphone_SFLphone_ConfigurationManager_set_window_width (configurationManagerProxy, width, &error);
+  org_sflphone_SFLphone_ConfigurationManager_set_window_width(
+      configurationManagerProxy, width, &error);
 
-    if (error != NULL) {
-        ERROR ("Failed to call set_window_width() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+  if (error != NULL)
+    {
+      ERROR ("Failed to call set_window_width() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
+void
+dbus_set_window_height(const guint height)
+{
 
-void dbus_set_window_height (const guint height) {
-
-    GError *error = NULL;
+  GError *error = NULL;
 
-	org_sflphone_SFLphone_ConfigurationManager_set_window_height (configurationManagerProxy, height, &error);
+  org_sflphone_SFLphone_ConfigurationManager_set_window_height(
+      configurationManagerProxy, height, &error);
 
-    if (error != NULL) {
-        ERROR ("Failed to call set_window_height() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+  if (error != NULL)
+    {
+      ERROR ("Failed to call set_window_height() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-guint dbus_get_window_position_x (void) {
+guint
+dbus_get_window_position_x(void)
+{
 
-	GError *error = NULL;
-	guint value; 
+  GError *error = NULL;
+  guint value;
 
-	org_sflphone_SFLphone_ConfigurationManager_get_window_position_x (configurationManagerProxy, &value, &error);
+  org_sflphone_SFLphone_ConfigurationManager_get_window_position_x(
+      configurationManagerProxy, &value, &error);
 
-    if (error != NULL) {
-        ERROR ("Failed to call get_window_position_x() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+  if (error != NULL)
+    {
+      ERROR ("Failed to call get_window_position_x() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
-	return value;
+  return value;
 }
 
-guint dbus_get_window_position_y (void) {
+guint
+dbus_get_window_position_y(void)
+{
 
-	GError *error = NULL;
-	guint value; 
+  GError *error = NULL;
+  guint value;
 
-	org_sflphone_SFLphone_ConfigurationManager_get_window_position_y (configurationManagerProxy, &value, &error);
+  org_sflphone_SFLphone_ConfigurationManager_get_window_position_y(
+      configurationManagerProxy, &value, &error);
 
-    if (error != NULL) {
-        ERROR ("Failed to call get_window_position_y() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+  if (error != NULL)
+    {
+      ERROR ("Failed to call get_window_position_y() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
-	return value;
+  return value;
 }
 
-void dbus_set_window_position_x (const guint posx) {
+void
+dbus_set_window_position_x(const guint posx)
+{
 
-	GError *error = NULL;
+  GError *error = NULL;
 
-	org_sflphone_SFLphone_ConfigurationManager_set_window_position_x (configurationManagerProxy, posx, &error);
+  org_sflphone_SFLphone_ConfigurationManager_set_window_position_x(
+      configurationManagerProxy, posx, &error);
 
-    if (error != NULL) {
-        ERROR ("Failed to call set_window_position_x() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+  if (error != NULL)
+    {
+      ERROR ("Failed to call set_window_position_x() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
-void dbus_set_window_position_y (const guint posy) {
+void
+dbus_set_window_position_y(const guint posy)
+{
+
+  GError *error = NULL;
+
+  org_sflphone_SFLphone_ConfigurationManager_set_window_position_y(
+      configurationManagerProxy, posy, &error);
 
-	GError *error = NULL;
+  if (error != NULL)
+    {
+      ERROR ("Failed to call set_window_position_y() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
+    }
+}
 
-	org_sflphone_SFLphone_ConfigurationManager_set_window_position_y (configurationManagerProxy, posy, &error);
+GHashTable*
+dbus_get_shortcuts(void)
+{
+  GError *error = NULL;
+  GHashTable * shortcuts;
+  if (!org_sflphone_SFLphone_ConfigurationManager_get_shortcuts(
+      configurationManagerProxy, &shortcuts, &error))
+    {
+      if (error->domain == DBUS_GERROR && error->code
+          == DBUS_GERROR_REMOTE_EXCEPTION)
+        {
+          ERROR ("Caught remote method (get_shortcuts) exception  %s: %s", dbus_g_error_get_name(error), error->message);
+        }
+      else
+        {
+          ERROR("Error while calling get_shortcuts: %s", error->message);
+        }
+      g_error_free(error);
+      return NULL;
+    }
+  else
+    {
+      return shortcuts;
+    }
+}
 
-    if (error != NULL) {
-        ERROR ("Failed to call set_window_position_y() on ConfigurationManager: %s",
-                error->message);
-        g_error_free (error);
+void
+dbus_set_shortcuts(GHashTable * shortcuts)
+{
+  GError *error = NULL;
+  org_sflphone_SFLphone_ConfigurationManager_set_shortcuts(
+      configurationManagerProxy, shortcuts, &error);
+  if (error)
+    {
+      ERROR ("Failed to call set_shortcuts() on ConfigurationManager: %s",
+          error->message);
+      g_error_free(error);
     }
 }
 
diff --git a/sflphone-client-gnome/src/dbus/dbus.h b/sflphone-client-gnome/src/dbus/dbus.h
index 4aa4af643f528eb12daf8c4fd6ae518eac3d6f46..394b1505695bf84b6c5cfa6e3e44cc5cd14461b8 100644
--- a/sflphone-client-gnome/src/dbus/dbus.h
+++ b/sflphone-client-gnome/src/dbus/dbus.h
@@ -606,8 +606,10 @@ guint dbus_get_window_position_y (void);
 void dbus_set_window_position_x (const guint posx);
 void dbus_set_window_position_y (const guint posy);
 
+GHashTable* dbus_get_shortcuts(void);
+void dbus_set_shortcuts(GHashTable * shortcuts);
+
 void dbus_enable_status_icon (const gchar*);
 gchar* dbus_is_status_icon_enabled (void);
 
-
 #endif
diff --git a/sflphone-client-gnome/src/dbus/shortcutsmanager-introspec.xml b/sflphone-client-gnome/src/dbus/shortcutsmanager-introspec.xml
new file mode 100644
index 0000000000000000000000000000000000000000..89d39efb192ecd3fe0604f080a95ff58129368d1
--- /dev/null
+++ b/sflphone-client-gnome/src/dbus/shortcutsmanager-introspec.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" ?>
+<node name="/org/sflphone/SFLphone">
+  <interface name="org.sflphone.SFLphone.ContactManager">
+    
+  <!-- Contacts related methods -->
+  
+    <!-- Called by the client to get all saved contacts -->
+    <method name="getContacts">
+      <arg type="s" name="accountID" direction="in"/>
+      <arg type="a{ss}" name="details" direction="out"/>
+    </method>
+    
+    <!-- Called by the client to save all local contacts -->
+    <method name="setContacts">
+      <arg type="s" name="accountID" direction="in"/>
+      <arg type="a{ss}" name="details" direction="in"/>
+    </method>
+   
+  <!--      ///////////////////////               -->
+
+  <!-- Presence related methods -->
+ 
+    <!-- Called by the client to set its new presence status -->
+    <method name="setPresence">
+      <arg type="s" name="accountID" direction="in"/>
+      <arg type="s" name="presence" direction="in"/>
+      <arg type="s" name="additionalInfo" direction="in"/>
+    </method>
+  
+    <!-- Called by the daemon when a contact presence changes -->
+    <method name="setContactPresence">
+      <arg type="s" name="accountID" direction="in"/>
+      <arg type="s" name="presence" direction="in"/>
+      <arg type="s" name="additionalInfo" direction="in"/>
+    </method>
+
+  </interface>
+</node>
diff --git a/sflphone-client-gnome/src/main.c b/sflphone-client-gnome/src/main.c
index 33911a7cab14275b0c6d8a630f64060adba2fc24..1d656b8f85f75128bdab778290f77ad46200ec39 100644
--- a/sflphone-client-gnome/src/main.c
+++ b/sflphone-client-gnome/src/main.c
@@ -29,6 +29,8 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
+#include "shortcuts.h"
+
 /**
  * Stop logging engine
  */
@@ -121,6 +123,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
       // Update the GUI
       update_actions ();
 
+      shortcuts_initialize_bindings();
+
       /* start the main loop */
       gtk_main ();
     }
@@ -128,6 +132,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
   // Cleanly stop logging
   shutdown_logging ();
 
+  shortcuts_destroy_bindings();
+
   return 0;
 }
 
diff --git a/sflphone-client-gnome/src/shortcuts.c b/sflphone-client-gnome/src/shortcuts.c
new file mode 100644
index 0000000000000000000000000000000000000000..44ba711b2389e0c36f1697216b4919f2a85fee2c
--- /dev/null
+++ b/sflphone-client-gnome/src/shortcuts.c
@@ -0,0 +1,400 @@
+/*
+ *  Copyright (C) 2010 Savoir-Faire Linux inc.
+ *  Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <X11/Xlib.h>
+#include <X11/XF86keysym.h>
+#include <gdk/gdkx.h>
+#include <dbus/dbus-glib.h>
+
+#include "shortcuts.h"
+#include "mainwindow.h"
+#include "callable_obj.h"
+#include "sflphone_const.h"
+#include "dbus.h"
+
+// used to store accelerator config
+static Accelerator* accelerators_list;
+
+// used to store config (for dbus calls)
+static GHashTable* shortcutsMap;
+
+/*
+ * Callbacks
+ */
+
+static void
+pick_up_callback()
+{
+  sflphone_pick_up();
+}
+
+static void
+hang_up_callback()
+{
+  sflphone_hang_up();
+}
+
+static void
+popup_window_callback()
+{
+  gtk_widget_hide(GTK_WIDGET(get_main_window()));
+  gtk_widget_show(GTK_WIDGET(get_main_window()));
+  gtk_window_move (GTK_WINDOW (get_main_window ()), dbus_get_window_position_x (), dbus_get_window_position_y ());
+}
+
+static void
+default_callback()
+{
+  ERROR("Missing shortcut callback");
+}
+
+/*
+ * return callback corresponding to a specific action
+ */
+static void*
+get_action_callback(const gchar* action)
+{
+  if(strcmp(action, "pick_up") == 0)
+    return pick_up_callback;
+
+  if(strcmp(action, "hang_up") == 0)
+    return hang_up_callback;
+
+  if(strcmp(action, "popup_window") == 0)
+    return popup_window_callback;
+
+  return default_callback;
+}
+
+/*
+ * Handle bindings
+ */
+
+/*
+ * Remove all existing bindings
+ */
+static void
+remove_bindings()
+{
+  GdkDisplay *display;
+  GdkScreen *screen;
+  GdkWindow *root;
+
+  display = gdk_display_get_default();
+
+  int i = 0;
+  int j = 0;
+  while (accelerators_list[i].action != NULL)
+    {
+      if (accelerators_list[i].value != 0)
+        {
+          for (j = 0; j < gdk_display_get_n_screens(display); j++)
+            {
+              screen = gdk_display_get_screen(display, j);
+
+              if (screen != NULL)
+                {
+                  root = gdk_screen_get_root_window(screen);
+                  ungrab_key(accelerators_list[i].value, root);
+                  gdk_window_remove_filter(root, filter_keys, NULL);
+                }
+            }
+        }
+
+      i++;
+    }
+}
+
+/*
+ * Create all bindings, using stored configuration
+ */
+static void
+create_bindings()
+{
+  GdkDisplay *display;
+  GdkScreen *screen;
+  GdkWindow *root;
+
+  display = gdk_display_get_default();
+
+  int i = 0;
+  int j = 0;
+  while (accelerators_list[i].action != NULL)
+    {
+      if (accelerators_list[i].value != 0)
+        {
+          // update value in hashtable (used for dbus calls)
+          g_hash_table_replace(shortcutsMap, g_strdup(accelerators_list[i].action),
+              GINT_TO_POINTER(accelerators_list[i].value));
+
+          // updated GDK bindings
+          for (j = 0; j < gdk_display_get_n_screens(display); j++)
+            {
+              screen = gdk_display_get_screen(display, j);
+
+              if (screen != NULL)
+                {
+                  root = gdk_screen_get_root_window(screen);
+                  grab_key(accelerators_list[i].value, root);
+                  gdk_window_add_filter(root, filter_keys, NULL);
+                }
+            }
+        }
+      i++;
+    }
+}
+
+/*
+ * Initialize a specific binding
+ */
+static void
+initialize_binding(const gchar* action, const guint code)
+{
+  //initialize_shortcuts_keys();
+  int index = 0;
+  while (accelerators_list[index].action != NULL)
+    {
+      if (strcmp(action, accelerators_list[index].action) == 0)
+        {
+          break;
+        }
+      index++;
+    }
+
+  if (accelerators_list[index].action == NULL)
+    {
+      ERROR("Should not happen: cannot find corresponding action");
+      return;
+    }
+
+  // update config value
+  accelerators_list[index].value = code;
+
+  // update bindings
+  create_bindings();
+}
+
+/*
+ * Prepare accelerators list
+ */
+static void
+initialize_accelerators_list()
+{
+  GList* shortcutsKeys = g_hash_table_get_keys(shortcutsMap);
+
+  accelerators_list = (Accelerator*)malloc((g_list_length(shortcutsKeys) + 1) *sizeof(Accelerator));
+
+  GList* shortcutsKeysElement;
+  int index = 0;
+  for (shortcutsKeysElement = shortcutsKeys; shortcutsKeysElement; shortcutsKeysElement
+      = shortcutsKeysElement->next)
+    {
+      gchar* action = shortcutsKeysElement->data;
+
+      accelerators_list[index].action = g_strdup(action);
+      accelerators_list[index].callback = get_action_callback(action);
+      accelerators_list[index].mask = 0;
+      accelerators_list[index].value = 0;
+
+      index++;
+    }
+
+  // last element must be null
+  accelerators_list[index].action = 0;
+  accelerators_list[index].callback = 0;
+  accelerators_list[index].mask = 0;
+  accelerators_list[index].value = 0;
+}
+
+/*
+ * "Public" functions
+ */
+
+/*
+ * Update current bindings with a new value
+ */
+void
+shortcuts_update_bindings(const guint index, const guint code)
+{
+  // first remove all existing bindings
+  remove_bindings();
+
+  // store new value
+  accelerators_list[index].value = code;
+
+  // recreate all bindings
+  create_bindings();
+
+  // update configuration
+  dbus_set_shortcuts(shortcutsMap);
+}
+
+/*
+ * Initialize bindings with configuration retrieved from dbus
+ */
+void
+shortcuts_initialize_bindings()
+{
+  // get shortcuts stored in config through dbus
+  shortcutsMap = dbus_get_shortcuts();
+
+  // initialize list of keys
+  initialize_accelerators_list();
+
+  // iterate through keys to initialize bindings
+  GList* shortcutsKeys = g_hash_table_get_keys(shortcutsMap);
+  GList* shortcutsKeysElement;
+  for (shortcutsKeysElement = shortcutsKeys; shortcutsKeysElement; shortcutsKeysElement
+      = shortcutsKeysElement->next)
+    {
+      gchar* key = shortcutsKeysElement->data;
+      int shortcut = (size_t) g_hash_table_lookup(shortcutsMap, key);
+      if(shortcut != 0)
+        initialize_binding(key, shortcut);
+    }
+}
+
+/*
+ * Initialize bindings with configuration retrieved from dbus
+ */
+void
+shortcuts_destroy_bindings()
+{
+  // remove bindings
+  remove_bindings();
+
+  // free pointers
+  int index = 0;
+  while (accelerators_list[index].action != NULL)
+    {
+      g_free(accelerators_list[index].action);
+      index++;
+    }
+  free(accelerators_list);
+}
+
+Accelerator*
+shortcuts_get_list()
+{
+  return accelerators_list;
+}
+
+/*
+ * XLib functions
+ */
+
+/*
+ * filter used when an event is catched
+ */
+static GdkFilterReturn
+filter_keys(GdkXEvent *xevent, GdkEvent *event, gpointer data)
+{
+  XEvent *xev;
+  XKeyEvent *key;
+
+  xev = (XEvent *) xevent;
+  if (xev->type != KeyPress)
+    {
+      return GDK_FILTER_CONTINUE;
+    }
+
+  key = (XKeyEvent *) xevent;
+
+  // try to find corresponding action
+  int i = 0;
+  while (accelerators_list[i].action != NULL)
+    {
+      if (accelerators_list[i].value == key->keycode)
+        {
+          DEBUG("catched key for action: %s (%d)", accelerators_list[i].action,
+              accelerators_list[i].value);
+
+          // call associated callback function
+          accelerators_list[i].callback();
+
+          return GDK_FILTER_REMOVE;
+        }
+      i++;
+    }
+
+  DEBUG("Should not be reached :(\n");
+  return GDK_FILTER_CONTINUE;
+}
+
+/*
+ * Remove key "catcher" from GDK layer
+ */
+static void
+ungrab_key(int key_code, GdkWindow *root)
+{
+  gdk_error_trap_push();
+
+  XUngrabKey(GDK_DISPLAY(), key_code, 0, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod2Mask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod5Mask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, LockMask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod2Mask | Mod5Mask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod2Mask | LockMask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod5Mask | LockMask, GDK_WINDOW_XID(root));
+  XUngrabKey(GDK_DISPLAY(), key_code, Mod2Mask | Mod5Mask | LockMask,
+      GDK_WINDOW_XID(root));
+
+  gdk_flush();
+  if (gdk_error_trap_pop())
+    {
+      ERROR("Error ungrabbing key");
+    }
+}
+
+/*
+ * Add key "catcher" to GDK layer
+ */
+static void
+grab_key(int key_code, GdkWindow *root)
+{
+
+  gdk_error_trap_push();
+
+  XGrabKey(GDK_DISPLAY(), key_code, 0, GDK_WINDOW_XID(root), True,
+      GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod2Mask, GDK_WINDOW_XID(root), True,
+      GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod5Mask, GDK_WINDOW_XID(root), True,
+      GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, LockMask, GDK_WINDOW_XID(root), True,
+      GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod2Mask | Mod5Mask, GDK_WINDOW_XID(root),
+      True, GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod2Mask | LockMask, GDK_WINDOW_XID(root),
+      True, GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod5Mask | LockMask, GDK_WINDOW_XID(root),
+      True, GrabModeAsync, GrabModeAsync);
+  XGrabKey(GDK_DISPLAY(), key_code, Mod2Mask | Mod5Mask | LockMask,
+      GDK_WINDOW_XID(root), True, GrabModeAsync, GrabModeAsync);
+
+  gdk_flush();
+  if (gdk_error_trap_pop())
+    {
+      ERROR("Error grabbing key");
+    }
+}
diff --git a/sflphone-client-gnome/src/shortcuts.h b/sflphone-client-gnome/src/shortcuts.h
new file mode 100644
index 0000000000000000000000000000000000000000..e5e512d5eacbbf4e1d73567c9eecb00866b68c5d
--- /dev/null
+++ b/sflphone-client-gnome/src/shortcuts.h
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (C) 2010 Savoir-Faire Linux inc.
+ *  Author: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef SHORTCUTS_H_
+#define SHORTCUTS_H_
+
+typedef struct
+{
+  gchar *action;
+  GdkModifierType mask;
+  guint value;
+  void
+  (*callback)(void);
+} Accelerator;
+
+static void
+grab_key(int key_code, GdkWindow *root);
+
+static void
+ungrab_key(int key_code, GdkWindow *root);
+
+static GdkFilterReturn
+filter_keys(GdkXEvent *xevent, GdkEvent *event, gpointer data);
+
+static void
+remove_bindings();
+
+static void
+create_bindings();
+
+static void
+pick_up_callback();
+
+static void
+hang_up_callback();
+
+static void
+initialize_binding(const gchar* action, const guint code);
+
+static void
+initialize_shortcuts_keys();
+
+static void*
+get_action_callback(const gchar* action);
+
+/*
+ * "Public" functions
+ */
+
+void
+shortcuts_initialize_bindings();
+
+void
+shortcuts_update_bindings(const guint index, const guint code);
+
+void
+shortcuts_destroy_bindings();
+
+Accelerator*
+shortcuts_get_list();
+
+#endif /* SHORTCUTS_H_ */
diff --git a/sflphone-common/.cproject b/sflphone-common/.cproject
index 0a0ee533da09696db9a9af4221c73a3c3586de16..2f2b2a83bbc18134deb427278add4fd75d92e257 100644
--- a/sflphone-common/.cproject
+++ b/sflphone-common/.cproject
@@ -43,6 +43,9 @@
 </tool>
 </toolChain>
 </folderInfo>
+<sourceEntries>
+<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+</sourceEntries>
 </configuration>
 </storageModule>
 <storageModule moduleId="scannerConfiguration">
diff --git a/sflphone-common/libs/pjproject/autogen.sh b/sflphone-common/libs/pjproject/autogen.sh
new file mode 100644
index 0000000000000000000000000000000000000000..695c27e85ee6a3fd11a52bae54b04f11ab6579b7
--- /dev/null
+++ b/sflphone-common/libs/pjproject/autogen.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+#####################################################
+# File Name: autogen.sh
+#
+# Purpose :
+#
+# Author: Julien Bonjean (julien@bonjean.info) 
+#
+# Creation Date: 2009-05-26
+# Last Modified: 2009-06-01 18:25:28 -0400
+#####################################################
+
+if [ -e /usr/share/misc/config.guess ]; then
+	rm -f config.sub config.guess
+        ln -s /usr/share/misc/config.sub .
+        ln -s /usr/share/misc/config.guess .	
+elif [ -e /usr/lib/rpm/config.guess ]; then
+	rm -f config.sub config.guess
+	ln -s /usr/lib/rpm/config.sub .
+	ln -s /usr/lib/rpm/config.guess .
+else
+	aclocal --force
+	automake --add-missing --force-missing --copy	
+fi
+
+exit 0
diff --git a/sflphone-common/src/dbus/configurationmanager-introspec.xml b/sflphone-common/src/dbus/configurationmanager-introspec.xml
index 6be7c8b6d3168ecaff8727ba732214bdffa8d150..0b66386689b19c9612c175bb562cce576fad7319 100644
--- a/sflphone-common/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-common/src/dbus/configurationmanager-introspec.xml
@@ -557,5 +557,12 @@
       <arg type="as" name="list" direction="out"/>
     </method>
     
+    <method name="getShortcuts">
+      <arg type="a{si}" name="shortcutsMap" direction="out"/>
+    </method>
+    
+    <method name="setShortcuts">
+      <arg type="a{si}" name="shortcutsMap" direction="in"/>
+    </method>
   </interface>
 </node>
diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/sflphone-common/src/dbus/configurationmanager.cpp
index 84588ea011319c0a4e23b4b2b4ab363167f75791..6c4be309b14917c9a074715db047e2b4c4aedc22 100644
--- a/sflphone-common/src/dbus/configurationmanager.cpp
+++ b/sflphone-common/src/dbus/configurationmanager.cpp
@@ -25,455 +25,480 @@
 #include "../manager.h"
 #include "sip/sipvoiplink.h"
 
-const char* ConfigurationManager::SERVER_PATH = "/org/sflphone/SFLphone/ConfigurationManager";
-
-
-
-ConfigurationManager::ConfigurationManager (DBus::Connection& connection)
-        : DBus::ObjectAdaptor (connection, SERVER_PATH)
-{
-}
-
-
-std::map< std::string, std::string >
-ConfigurationManager::getAccountDetails (const std::string& accountID)
-{
-    return Manager::instance().getAccountDetails (accountID);
-}
-
-std::map< std::string, std::string >
-ConfigurationManager::getTlsSettingsDefault (void)
-{
-
-    std::map<std::string, std::string> tlsSettingsDefault;
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_LISTENER_PORT, DEFAULT_SIP_TLS_PORT));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_CA_LIST_FILE, ""));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_CERTIFICATE_FILE, ""));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_PRIVATE_KEY_FILE, ""));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_PASSWORD, ""));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_METHOD, "TLSv1"));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_CIPHERS, ""));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_SERVER_NAME, ""));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_VERIFY_SERVER, "true"));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_VERIFY_CLIENT, "true"));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_REQUIRE_CLIENT_CERTIFICATE, "true"));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_NEGOTIATION_TIMEOUT_SEC, "2"));
-    tlsSettingsDefault.insert (std::pair<std::string, std::string> (TLS_NEGOTIATION_TIMEOUT_MSEC, "0"));
-
-    return tlsSettingsDefault;
-}
-
-std::map< std::string, std::string >
-ConfigurationManager::getIp2IpDetails (void)
-{
-
-    std::map<std::string, std::string> ip2ipAccountDetails;
-
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (ACCOUNT_ID, IP2IP_PROFILE));
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (SRTP_KEY_EXCHANGE, Manager::instance().getConfigString (IP2IP_PROFILE, SRTP_KEY_EXCHANGE)));
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (SRTP_ENABLE, Manager::instance().getConfigString (IP2IP_PROFILE, SRTP_ENABLE)));
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (SRTP_RTP_FALLBACK, Manager::instance().getConfigString (IP2IP_PROFILE, SRTP_RTP_FALLBACK)));
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (ZRTP_DISPLAY_SAS, Manager::instance().getConfigString (IP2IP_PROFILE, ZRTP_DISPLAY_SAS)));
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (ZRTP_HELLO_HASH, Manager::instance().getConfigString (IP2IP_PROFILE, ZRTP_HELLO_HASH)));
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (ZRTP_NOT_SUPP_WARNING, Manager::instance().getConfigString (IP2IP_PROFILE, ZRTP_NOT_SUPP_WARNING)));
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (ZRTP_DISPLAY_SAS_ONCE, Manager::instance().getConfigString (IP2IP_PROFILE, ZRTP_DISPLAY_SAS_ONCE)));
-
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (LOCAL_INTERFACE, Manager::instance().getConfigString(IP2IP_PROFILE, LOCAL_INTERFACE)));
-    ip2ipAccountDetails.insert (std::pair<std::string, std::string> (LOCAL_PORT, Manager::instance().getConfigString (IP2IP_PROFILE, LOCAL_PORT)));
-
-    std::map<std::string, std::string> tlsSettings;
-    tlsSettings = getTlsSettings (IP2IP_PROFILE);
-    std::copy (tlsSettings.begin(), tlsSettings.end(), std::inserter (ip2ipAccountDetails, ip2ipAccountDetails.end()));
-
-    return ip2ipAccountDetails;
-
-}
-
-void
-ConfigurationManager::setIp2IpDetails (const std::map< std::string, std::string >& details)
-{
-    std::map<std::string, std::string> map_cpy = details;
-    std::map<std::string, std::string>::iterator it;
-
-    it = map_cpy.find (LOCAL_INTERFACE);
-
-    if (it != details.end()) {
-        Manager::instance().setConfig (IP2IP_PROFILE, LOCAL_INTERFACE, it->second);
-    }
-
-    it = map_cpy.find (LOCAL_PORT);
-
-    if (it != details.end()) {
-        Manager::instance().setConfig (IP2IP_PROFILE, LOCAL_PORT, it->second);
-    }
-
-    it = map_cpy.find (SRTP_ENABLE);
-
-    if (it != details.end()) {
-        Manager::instance().setConfig (IP2IP_PROFILE, SRTP_ENABLE, it->second);
-    }
-
-    it = map_cpy.find (SRTP_RTP_FALLBACK);
-
-    if (it != details.end()) {
-        Manager::instance().setConfig(IP2IP_PROFILE, SRTP_RTP_FALLBACK, it->second);
-    }
-
-    it = map_cpy.find (SRTP_KEY_EXCHANGE);
-
-    if (it != details.end()) {
-        Manager::instance().setConfig (IP2IP_PROFILE, SRTP_KEY_EXCHANGE, it->second);
-    }
+const char* ConfigurationManager::SERVER_PATH =
+		"/org/sflphone/SFLphone/ConfigurationManager";
+
+ConfigurationManager::ConfigurationManager(DBus::Connection& connection) :
+	DBus::ObjectAdaptor(connection, SERVER_PATH) {
+	shortcutsKeys.push_back("pick_up");
+	shortcutsKeys.push_back("hang_up");
+	shortcutsKeys.push_back("popup_window");
+}
+
+std::map<std::string, std::string> ConfigurationManager::getAccountDetails(
+		const std::string& accountID) {
+	return Manager::instance().getAccountDetails(accountID);
+}
+
+std::map<std::string, std::string> ConfigurationManager::getTlsSettingsDefault(
+		void) {
+
+	std::map<std::string, std::string> tlsSettingsDefault;
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_LISTENER_PORT, DEFAULT_SIP_TLS_PORT));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_CA_LIST_FILE, ""));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_CERTIFICATE_FILE, ""));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_PRIVATE_KEY_FILE, ""));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(TLS_PASSWORD,
+			""));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(TLS_METHOD,
+			"TLSv1"));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(TLS_CIPHERS,
+			""));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_SERVER_NAME, ""));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_VERIFY_SERVER, "true"));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_VERIFY_CLIENT, "true"));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_REQUIRE_CLIENT_CERTIFICATE, "true"));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_NEGOTIATION_TIMEOUT_SEC, "2"));
+	tlsSettingsDefault.insert(std::pair<std::string, std::string>(
+			TLS_NEGOTIATION_TIMEOUT_MSEC, "0"));
+
+	return tlsSettingsDefault;
+}
+
+std::map<std::string, std::string> ConfigurationManager::getIp2IpDetails(void) {
+
+	std::map<std::string, std::string> ip2ipAccountDetails;
+
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(ACCOUNT_ID,
+			IP2IP_PROFILE));
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(
+			SRTP_KEY_EXCHANGE, Manager::instance().getConfigString(
+					IP2IP_PROFILE, SRTP_KEY_EXCHANGE)));
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(SRTP_ENABLE,
+			Manager::instance().getConfigString(IP2IP_PROFILE, SRTP_ENABLE)));
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(
+			SRTP_RTP_FALLBACK, Manager::instance().getConfigString(
+					IP2IP_PROFILE, SRTP_RTP_FALLBACK)));
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(
+			ZRTP_DISPLAY_SAS, Manager::instance().getConfigString(
+					IP2IP_PROFILE, ZRTP_DISPLAY_SAS)));
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(
+			ZRTP_HELLO_HASH, Manager::instance().getConfigString(IP2IP_PROFILE,
+					ZRTP_HELLO_HASH)));
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(
+			ZRTP_NOT_SUPP_WARNING, Manager::instance().getConfigString(
+					IP2IP_PROFILE, ZRTP_NOT_SUPP_WARNING)));
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(
+			ZRTP_DISPLAY_SAS_ONCE, Manager::instance().getConfigString(
+					IP2IP_PROFILE, ZRTP_DISPLAY_SAS_ONCE)));
+
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(
+			LOCAL_INTERFACE, Manager::instance().getConfigString(IP2IP_PROFILE,
+					LOCAL_INTERFACE)));
+	ip2ipAccountDetails.insert(std::pair<std::string, std::string>(LOCAL_PORT,
+			Manager::instance().getConfigString(IP2IP_PROFILE, LOCAL_PORT)));
+
+	std::map<std::string, std::string> tlsSettings;
+	tlsSettings = getTlsSettings(IP2IP_PROFILE);
+	std::copy(tlsSettings.begin(), tlsSettings.end(), std::inserter(
+			ip2ipAccountDetails, ip2ipAccountDetails.end()));
+
+	return ip2ipAccountDetails;
+
+}
+
+void ConfigurationManager::setIp2IpDetails(const std::map<std::string,
+		std::string>& details) {
+	std::map<std::string, std::string> map_cpy = details;
+	std::map<std::string, std::string>::iterator it;
+
+	it = map_cpy.find(LOCAL_INTERFACE);
+
+	if (it != details.end()) {
+		Manager::instance().setConfig(IP2IP_PROFILE, LOCAL_INTERFACE,
+				it->second);
+	}
 
-    it = map_cpy.find (ZRTP_DISPLAY_SAS);
+	it = map_cpy.find(LOCAL_PORT);
 
-    if (it != details.end()) {
-        Manager::instance().setConfig (IP2IP_PROFILE, ZRTP_DISPLAY_SAS, it->second);
-    }
+	if (it != details.end()) {
+		Manager::instance().setConfig(IP2IP_PROFILE, LOCAL_PORT, it->second);
+	}
 
-    it = map_cpy.find (ZRTP_NOT_SUPP_WARNING);
+	it = map_cpy.find(SRTP_ENABLE);
 
-    if (it != details.end()) {
-        Manager::instance().setConfig (IP2IP_PROFILE, ZRTP_NOT_SUPP_WARNING, it->second);
-    }
+	if (it != details.end()) {
+		Manager::instance().setConfig(IP2IP_PROFILE, SRTP_ENABLE, it->second);
+	}
 
-    it = map_cpy.find (ZRTP_HELLO_HASH);
+	it = map_cpy.find(SRTP_RTP_FALLBACK);
 
-    if (it != details.end()) {
-        Manager::instance().setConfig (IP2IP_PROFILE, ZRTP_HELLO_HASH, it->second);
-    }
+	if (it != details.end()) {
+		Manager::instance().setConfig(IP2IP_PROFILE, SRTP_RTP_FALLBACK,
+				it->second);
+	}
 
-    it = map_cpy.find (ZRTP_DISPLAY_SAS_ONCE);
+	it = map_cpy.find(SRTP_KEY_EXCHANGE);
 
-    if (it != details.end()) {
-        Manager::instance().setConfig (IP2IP_PROFILE, ZRTP_DISPLAY_SAS_ONCE, it->second);
-    }
+	if (it != details.end()) {
+		Manager::instance().setConfig(IP2IP_PROFILE, SRTP_KEY_EXCHANGE,
+				it->second);
+	}
 
-    setTlsSettings (IP2IP_PROFILE, details);
+	it = map_cpy.find(ZRTP_DISPLAY_SAS);
 
-    Manager::instance().saveConfig();
+	if (it != details.end()) {
+		Manager::instance().setConfig(IP2IP_PROFILE, ZRTP_DISPLAY_SAS,
+				it->second);
+	}
 
-    // Update account details to the client side
-    accountsChanged();
+	it = map_cpy.find(ZRTP_NOT_SUPP_WARNING);
 
-    // Reload account settings from config
-    Manager::instance().getAccount(IP2IP_PROFILE)->loadConfig();
+	if (it != details.end()) {
+		Manager::instance().setConfig(IP2IP_PROFILE, ZRTP_NOT_SUPP_WARNING,
+				it->second);
+	}
 
-}
+	it = map_cpy.find(ZRTP_HELLO_HASH);
 
-std::map< std::string, std::string >
-ConfigurationManager::getTlsSettings (const std::string& section)
-{
-    std::map<std::string, std::string> tlsSettings;
+	if (it != details.end()) {
+		Manager::instance().setConfig(IP2IP_PROFILE, ZRTP_HELLO_HASH,
+				it->second);
+	}
 
-    tlsSettings.insert (std::pair<std::string, std::string>
-			(TLS_LISTENER_PORT, Manager::instance().getConfigString(section, TLS_LISTENER_PORT)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_ENABLE, Manager::instance().getConfigString (section, TLS_ENABLE)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_CA_LIST_FILE, Manager::instance().getConfigString (section, TLS_CA_LIST_FILE)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_CERTIFICATE_FILE, Manager::instance().getConfigString (section, TLS_CERTIFICATE_FILE)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_PRIVATE_KEY_FILE, Manager::instance().getConfigString (section, TLS_PRIVATE_KEY_FILE)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_PASSWORD, Manager::instance().getConfigString (section, TLS_PASSWORD)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_METHOD, Manager::instance().getConfigString (section, TLS_METHOD)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_CIPHERS, Manager::instance().getConfigString (section, TLS_CIPHERS)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_SERVER_NAME, Manager::instance().getConfigString (section, TLS_SERVER_NAME)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_VERIFY_SERVER, Manager::instance().getConfigString (section, TLS_VERIFY_SERVER)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_VERIFY_CLIENT, Manager::instance().getConfigString (section, TLS_VERIFY_CLIENT)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_REQUIRE_CLIENT_CERTIFICATE, Manager::instance().getConfigString (section, TLS_REQUIRE_CLIENT_CERTIFICATE)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_NEGOTIATION_TIMEOUT_SEC, Manager::instance().getConfigString (section, TLS_NEGOTIATION_TIMEOUT_SEC)));
-    tlsSettings.insert (std::pair<std::string, std::string>
-                        (TLS_NEGOTIATION_TIMEOUT_MSEC, Manager::instance().getConfigString (section, TLS_NEGOTIATION_TIMEOUT_MSEC)));
-    return tlsSettings;
-}
+	it = map_cpy.find(ZRTP_DISPLAY_SAS_ONCE);
 
-void
-ConfigurationManager::setTlsSettings (const std::string& section, const std::map< std::string, std::string >& details)
-{
-    std::map<std::string, std::string> map_cpy = details;
-    std::map<std::string, std::string>::iterator it;
+	if (it != details.end()) {
+		Manager::instance().setConfig(IP2IP_PROFILE, ZRTP_DISPLAY_SAS_ONCE,
+				it->second);
+	}
 
-    it = map_cpy.find(TLS_LISTENER_PORT);
-    if(it != details.end()) {
-        Manager::instance().setConfig(section, TLS_LISTENER_PORT, it->second);
-    }
+	setTlsSettings(IP2IP_PROFILE, details);
+
+	Manager::instance().saveConfig();
+
+	// Update account details to the client side
+	accountsChanged();
+
+	// Reload account settings from config
+	Manager::instance().getAccount(IP2IP_PROFILE)->loadConfig();
+
+}
+
+std::map<std::string, std::string> ConfigurationManager::getTlsSettings(
+		const std::string& section) {
+	std::map<std::string, std::string> tlsSettings;
+
+	tlsSettings.insert(std::pair<std::string, std::string>(TLS_LISTENER_PORT,
+			Manager::instance().getConfigString(section, TLS_LISTENER_PORT)));
+	tlsSettings.insert(std::pair<std::string, std::string>(TLS_ENABLE,
+			Manager::instance().getConfigString(section, TLS_ENABLE)));
+	tlsSettings.insert(std::pair<std::string, std::string>(TLS_CA_LIST_FILE,
+			Manager::instance().getConfigString(section, TLS_CA_LIST_FILE)));
+	tlsSettings.insert(std::pair<std::string, std::string>(
+			TLS_CERTIFICATE_FILE, Manager::instance().getConfigString(section,
+					TLS_CERTIFICATE_FILE)));
+	tlsSettings.insert(std::pair<std::string, std::string>(
+			TLS_PRIVATE_KEY_FILE, Manager::instance().getConfigString(section,
+					TLS_PRIVATE_KEY_FILE)));
+	tlsSettings.insert(std::pair<std::string, std::string>(TLS_PASSWORD,
+			Manager::instance().getConfigString(section, TLS_PASSWORD)));
+	tlsSettings.insert(std::pair<std::string, std::string>(TLS_METHOD,
+			Manager::instance().getConfigString(section, TLS_METHOD)));
+	tlsSettings.insert(std::pair<std::string, std::string>(TLS_CIPHERS,
+			Manager::instance().getConfigString(section, TLS_CIPHERS)));
+	tlsSettings.insert(std::pair<std::string, std::string>(TLS_SERVER_NAME,
+			Manager::instance().getConfigString(section, TLS_SERVER_NAME)));
+	tlsSettings.insert(std::pair<std::string, std::string>(TLS_VERIFY_SERVER,
+			Manager::instance().getConfigString(section, TLS_VERIFY_SERVER)));
+	tlsSettings.insert(std::pair<std::string, std::string>(TLS_VERIFY_CLIENT,
+			Manager::instance().getConfigString(section, TLS_VERIFY_CLIENT)));
+	tlsSettings.insert(std::pair<std::string, std::string>(
+			TLS_REQUIRE_CLIENT_CERTIFICATE,
+			Manager::instance().getConfigString(section,
+					TLS_REQUIRE_CLIENT_CERTIFICATE)));
+	tlsSettings.insert(std::pair<std::string, std::string>(
+			TLS_NEGOTIATION_TIMEOUT_SEC, Manager::instance().getConfigString(
+					section, TLS_NEGOTIATION_TIMEOUT_SEC)));
+	tlsSettings.insert(std::pair<std::string, std::string>(
+			TLS_NEGOTIATION_TIMEOUT_MSEC, Manager::instance().getConfigString(
+					section, TLS_NEGOTIATION_TIMEOUT_MSEC)));
+	return tlsSettings;
+}
+
+void ConfigurationManager::setTlsSettings(const std::string& section,
+		const std::map<std::string, std::string>& details) {
+	std::map<std::string, std::string> map_cpy = details;
+	std::map<std::string, std::string>::iterator it;
+
+	it = map_cpy.find(TLS_LISTENER_PORT);
+	if (it != details.end()) {
+		Manager::instance().setConfig(section, TLS_LISTENER_PORT, it->second);
+	}
 
-    it = map_cpy.find (TLS_ENABLE);
+	it = map_cpy.find(TLS_ENABLE);
 
-    if (it != details.end()) {
-        Manager::instance().setConfig (section, TLS_ENABLE, it->second);
-    }
+	if (it != details.end()) {
+		Manager::instance().setConfig(section, TLS_ENABLE, it->second);
+	}
 
-    it = map_cpy.find (TLS_CA_LIST_FILE);
+	it = map_cpy.find(TLS_CA_LIST_FILE);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_CA_LIST_FILE, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_CA_LIST_FILE, it->second);
+	}
 
-    it = map_cpy.find (TLS_CERTIFICATE_FILE);
+	it = map_cpy.find(TLS_CERTIFICATE_FILE);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_CERTIFICATE_FILE, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_CERTIFICATE_FILE, it->second);
+	}
 
-    it = map_cpy.find (TLS_PRIVATE_KEY_FILE);
+	it = map_cpy.find(TLS_PRIVATE_KEY_FILE);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_PRIVATE_KEY_FILE, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_PRIVATE_KEY_FILE, it->second);
+	}
 
-    it = map_cpy.find (TLS_PASSWORD);
+	it = map_cpy.find(TLS_PASSWORD);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_PASSWORD, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_PASSWORD, it->second);
+	}
 
-    it = map_cpy.find (TLS_METHOD);
+	it = map_cpy.find(TLS_METHOD);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_METHOD, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_METHOD, it->second);
+	}
 
-    it = map_cpy.find (TLS_CIPHERS);
+	it = map_cpy.find(TLS_CIPHERS);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_CIPHERS, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_CIPHERS, it->second);
+	}
 
-    it = map_cpy.find (TLS_SERVER_NAME);
+	it = map_cpy.find(TLS_SERVER_NAME);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_SERVER_NAME, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_SERVER_NAME, it->second);
+	}
 
-    it = map_cpy.find (TLS_VERIFY_CLIENT);
+	it = map_cpy.find(TLS_VERIFY_CLIENT);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_VERIFY_CLIENT, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_VERIFY_CLIENT, it->second);
+	}
 
-    it = map_cpy.find (TLS_REQUIRE_CLIENT_CERTIFICATE);
+	it = map_cpy.find(TLS_REQUIRE_CLIENT_CERTIFICATE);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_REQUIRE_CLIENT_CERTIFICATE, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_REQUIRE_CLIENT_CERTIFICATE,
+				it->second);
+	}
 
-    it = map_cpy.find (TLS_NEGOTIATION_TIMEOUT_SEC);
+	it = map_cpy.find(TLS_NEGOTIATION_TIMEOUT_SEC);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_NEGOTIATION_TIMEOUT_SEC, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_NEGOTIATION_TIMEOUT_SEC,
+				it->second);
+	}
 
-    it = map_cpy.find (TLS_NEGOTIATION_TIMEOUT_MSEC);
+	it = map_cpy.find(TLS_NEGOTIATION_TIMEOUT_MSEC);
 
-    if (it != map_cpy.end()) {
-        Manager::instance().setConfig (section, TLS_NEGOTIATION_TIMEOUT_MSEC, it->second);
-    }
+	if (it != map_cpy.end()) {
+		Manager::instance().setConfig(section, TLS_NEGOTIATION_TIMEOUT_MSEC,
+				it->second);
+	}
 
-    Manager::instance().saveConfig();
+	Manager::instance().saveConfig();
 
-    // Update account details to the client side
-    accountsChanged();
+	// Update account details to the client side
+	accountsChanged();
 
 }
 
-std::map< std::string, std::string >
-ConfigurationManager::getCredential (const std::string& accountID, const int32_t& index)
-{
+std::map<std::string, std::string> ConfigurationManager::getCredential(
+		const std::string& accountID, const int32_t& index) {
 
-    std::string credentialIndex;
-    std::stringstream streamOut;
-    streamOut << index;
-    credentialIndex = streamOut.str();
+	std::string credentialIndex;
+	std::stringstream streamOut;
+	streamOut << index;
+	credentialIndex = streamOut.str();
 
-    std::string section = std::string ("Credential") + std::string (":") + accountID + std::string (":") + credentialIndex;
+	std::string section = std::string("Credential") + std::string(":")
+			+ accountID + std::string(":") + credentialIndex;
 
-    std::map<std::string, std::string> credentialInformation;
-    std::string username = Manager::instance().getConfigString (section, USERNAME);
-    std::string password = Manager::instance().getConfigString (section, PASSWORD);
-    std::string realm = Manager::instance().getConfigString (section, REALM);
+	std::map<std::string, std::string> credentialInformation;
+	std::string username = Manager::instance().getConfigString(section,
+			USERNAME);
+	std::string password = Manager::instance().getConfigString(section,
+			PASSWORD);
+	std::string realm = Manager::instance().getConfigString(section, REALM);
 
-    credentialInformation.insert (std::pair<std::string, std::string> (USERNAME, username));
-    credentialInformation.insert (std::pair<std::string, std::string> (PASSWORD, password));
-    credentialInformation.insert (std::pair<std::string, std::string> (REALM, realm));
+	credentialInformation.insert(std::pair<std::string, std::string>(USERNAME,
+			username));
+	credentialInformation.insert(std::pair<std::string, std::string>(PASSWORD,
+			password));
+	credentialInformation.insert(std::pair<std::string, std::string>(REALM,
+			realm));
 
-    return credentialInformation;
+	return credentialInformation;
 }
 
-int32_t
-ConfigurationManager::getNumberOfCredential (const std::string& accountID)
-{
-    return Manager::instance().getConfigInt (accountID, CONFIG_CREDENTIAL_NUMBER);
+int32_t ConfigurationManager::getNumberOfCredential(
+		const std::string& accountID) {
+	return Manager::instance().getConfigInt(accountID, CONFIG_CREDENTIAL_NUMBER);
 }
 
-void
-ConfigurationManager::setNumberOfCredential (const std::string& accountID, const int32_t& number)
-{
-    if (accountID != AccountNULL || !accountID.empty()) {
-        Manager::instance().setConfig (accountID, CONFIG_CREDENTIAL_NUMBER, number);
-    }
+void ConfigurationManager::setNumberOfCredential(const std::string& accountID,
+		const int32_t& number) {
+	if (accountID != AccountNULL || !accountID.empty()) {
+		Manager::instance().setConfig(accountID, CONFIG_CREDENTIAL_NUMBER,
+				number);
+	}
 }
 
-void
-ConfigurationManager::setCredential (const std::string& accountID, const int32_t& index,
-                                     const std::map< std::string, std::string >& details)
-{
-    Manager::instance().setCredential (accountID, index, details);
+void ConfigurationManager::setCredential(const std::string& accountID,
+		const int32_t& index, const std::map<std::string, std::string>& details) {
+	Manager::instance().setCredential(accountID, index, details);
 }
 
-void
-ConfigurationManager::deleteAllCredential (const std::string& accountID)
-{
-    Manager::instance().deleteAllCredential (accountID);
+void ConfigurationManager::deleteAllCredential(const std::string& accountID) {
+	Manager::instance().deleteAllCredential(accountID);
 }
 
-void
-ConfigurationManager::setAccountDetails (const std::string& accountID,
-        const std::map< std::string, std::string >& details)
-{
-    Manager::instance().setAccountDetails (accountID, details);
+void ConfigurationManager::setAccountDetails(const std::string& accountID,
+		const std::map<std::string, std::string>& details) {
+	Manager::instance().setAccountDetails(accountID, details);
 }
 
-void
-ConfigurationManager::sendRegister (const std::string& accountID, const int32_t& expire)
-{
-    Manager::instance().sendRegister (accountID, expire);
+void ConfigurationManager::sendRegister(const std::string& accountID,
+		const int32_t& expire) {
+	Manager::instance().sendRegister(accountID, expire);
 }
 
-std::string
-ConfigurationManager::addAccount (const std::map< std::string, std::string >& details)
-{
-    return Manager::instance().addAccount (details);
+std::string ConfigurationManager::addAccount(const std::map<std::string,
+		std::string>& details) {
+	return Manager::instance().addAccount(details);
 }
 
-
-void
-ConfigurationManager::removeAccount (const std::string& accoundID)
-{
-    return Manager::instance().removeAccount (accoundID);
+void ConfigurationManager::removeAccount(const std::string& accoundID) {
+	return Manager::instance().removeAccount(accoundID);
 }
 
-std::vector< std::string >
-ConfigurationManager::getAccountList()
-{
-    return Manager::instance().getAccountList();
+std::vector<std::string> ConfigurationManager::getAccountList() {
+	return Manager::instance().getAccountList();
 }
 
 //TODO
-std::vector< std::string >
-ConfigurationManager::getToneLocaleList()
-{
-    std::vector< std::string > ret;
-    return ret;
+std::vector<std::string> ConfigurationManager::getToneLocaleList() {
+	std::vector<std::string> ret;
+	return ret;
 }
 
 //TODO
-std::string
-ConfigurationManager::getVersion()
-{
-    std::string ret ("");
-    return ret;
+std::string ConfigurationManager::getVersion() {
+	std::string ret("");
+	return ret;
 }
 
 //TODO
-std::vector< std::string >
-ConfigurationManager::getRingtoneList()
-{
-    std::vector< std::string >  ret;
-    return ret;
+std::vector<std::string> ConfigurationManager::getRingtoneList() {
+	std::vector<std::string> ret;
+	return ret;
 }
 
-
 /**
  * Send the list of all codecs loaded to the client through DBus.
  * Can stay global, as only the active codecs will be set per accounts
  */
-std::vector<std::string> ConfigurationManager::getCodecList (void) {
+std::vector<std::string> ConfigurationManager::getCodecList(void) {
 
-    std::vector<std::string> list;
+	std::vector<std::string> list;
 
-    CodecsMap codecs = Manager::instance ().getCodecDescriptorMap ().getCodecsMap();
-    CodecsMap::iterator iter = codecs.begin();
+	CodecsMap codecs =
+			Manager::instance().getCodecDescriptorMap().getCodecsMap();
+	CodecsMap::iterator iter = codecs.begin();
 
-    while (iter!=codecs.end()) {
-        std::stringstream ss;
+	while (iter != codecs.end()) {
+		std::stringstream ss;
 
-        if (iter->second != NULL) {
-            ss << iter->first;
-            list.push_back ( (ss.str()).data());
-        }
+		if (iter->second != NULL) {
+			ss << iter->first;
+			list.push_back((ss.str()).data());
+		}
 
-        iter++;
-    }
+		iter++;
+	}
 
-    return list;
+	return list;
 }
 
-std::vector<std::string>
-ConfigurationManager::getSupportedTlsMethod (void)
-{
-    std::vector<std::string> method;
-    method.push_back ("Default");
-    method.push_back ("TLSv1");
-    method.push_back ("SSLv2");
-    method.push_back ("SSLv3");
-    method.push_back ("SSLv23");
-    return method;
+std::vector<std::string> ConfigurationManager::getSupportedTlsMethod(void) {
+	std::vector<std::string> method;
+	method.push_back("Default");
+	method.push_back("TLSv1");
+	method.push_back("SSLv2");
+	method.push_back("SSLv3");
+	method.push_back("SSLv23");
+	return method;
 }
 
+std::vector<std::string> ConfigurationManager::getCodecDetails(
+		const int32_t& payload) {
 
-std::vector<std::string> ConfigurationManager::getCodecDetails (const int32_t& payload) {
-
-    return Manager::instance().getCodecDescriptorMap().getCodecSpecifications (payload);
+	return Manager::instance().getCodecDescriptorMap().getCodecSpecifications(
+			payload);
 }
 
-std::vector<std::string> ConfigurationManager::getActiveCodecList (const std::string& accountID) {
+std::vector<std::string> ConfigurationManager::getActiveCodecList(
+		const std::string& accountID) {
 
-    _debug("Send active codec list for account %s", accountID.c_str ());
+	_debug("Send active codec list for account %s", accountID.c_str ());
 
-    std::vector< std::string > v;
+	std::vector<std::string> v;
 	Account *acc;
 	CodecOrder active;
-    unsigned int i=0;
+	unsigned int i = 0;
 	size_t size;
 
-	acc = Manager::instance ().getAccount (accountID);
+	acc = Manager::instance().getAccount(accountID);
 	if (acc != NULL) {
-		active = acc->getActiveCodecs ();
+		active = acc->getActiveCodecs();
 		size = active.size();
-		while (i<size) {
+		while (i < size) {
 			std::stringstream ss;
 			ss << active[i];
-			v.push_back ( (ss.str()).data());
+			v.push_back((ss.str()).data());
 			i++;
 		}
 	}
 
-    return v;
+	return v;
 
 }
 
-void ConfigurationManager::setActiveCodecList (const std::vector< std::string >& list, const std::string& accountID)
-{
+void ConfigurationManager::setActiveCodecList(
+		const std::vector<std::string>& list, const std::string& accountID) {
 
-    _debug ("ConfigurationManager::setActiveCodecList received");
+	_debug ("ConfigurationManager::setActiveCodecList received");
 
 	Account *acc;
 
 	// Save the codecs list per account
-	acc = Manager::instance ().getAccount (accountID);
+	acc = Manager::instance().getAccount(accountID);
 	if (acc != NULL) {
-		acc->setActiveCodecs (list);
+		acc->setActiveCodecs(list);
 	}
 }
 
@@ -482,391 +507,336 @@ std::vector<std::string> ConfigurationManager::getInputAudioPluginList() {
 
 	std::vector<std::string> v;
 
-    v.push_back ("default");
-    v.push_back ("surround40");
-    v.push_back ("plug:hw");
+	v.push_back("default");
+	v.push_back("surround40");
+	v.push_back("plug:hw");
 
-    return v;
+	return v;
 }
 
 std::vector<std::string> ConfigurationManager::getOutputAudioPluginList() {
 
-    std::vector<std::string> v;
+	std::vector<std::string> v;
 
-    v.push_back (PCM_DEFAULT);
-    v.push_back (PCM_DMIX);
+	v.push_back(PCM_DEFAULT);
+	v.push_back(PCM_DMIX);
 
-    return v;
+	return v;
 }
 
-void
-ConfigurationManager::setInputAudioPlugin (const std::string& audioPlugin)
-{
-    return Manager::instance().setInputAudioPlugin (audioPlugin);
+void ConfigurationManager::setInputAudioPlugin(const std::string& audioPlugin) {
+	return Manager::instance().setInputAudioPlugin(audioPlugin);
 }
 
-void
-ConfigurationManager::setOutputAudioPlugin (const std::string& audioPlugin)
-{
-    return Manager::instance().setOutputAudioPlugin (audioPlugin);
+void ConfigurationManager::setOutputAudioPlugin(const std::string& audioPlugin) {
+	return Manager::instance().setOutputAudioPlugin(audioPlugin);
 }
 
-std::vector< std::string >
-ConfigurationManager::getAudioOutputDeviceList()
-{
-    return Manager::instance().getAudioOutputDeviceList();
+std::vector<std::string> ConfigurationManager::getAudioOutputDeviceList() {
+	return Manager::instance().getAudioOutputDeviceList();
 }
 
-void
-ConfigurationManager::setAudioOutputDevice (const int32_t& index)
-{
-    return Manager::instance().setAudioOutputDevice (index);
+void ConfigurationManager::setAudioOutputDevice(const int32_t& index) {
+	return Manager::instance().setAudioOutputDevice(index);
 }
 
-std::vector< std::string >
-ConfigurationManager::getAudioInputDeviceList()
-{
-    return Manager::instance().getAudioInputDeviceList();
+std::vector<std::string> ConfigurationManager::getAudioInputDeviceList() {
+	return Manager::instance().getAudioInputDeviceList();
 }
 
-void
-ConfigurationManager::setAudioInputDevice (const int32_t& index)
-{
-    return Manager::instance().setAudioInputDevice (index);
+void ConfigurationManager::setAudioInputDevice(const int32_t& index) {
+	return Manager::instance().setAudioInputDevice(index);
 }
 
-std::vector< std::string >
-ConfigurationManager::getCurrentAudioDevicesIndex()
-{
-    return Manager::instance().getCurrentAudioDevicesIndex();
+std::vector<std::string> ConfigurationManager::getCurrentAudioDevicesIndex() {
+	return Manager::instance().getCurrentAudioDevicesIndex();
 }
 
-int32_t
-ConfigurationManager::getAudioDeviceIndex (const std::string& name)
-{
-    return Manager::instance().getAudioDeviceIndex (name);
+int32_t ConfigurationManager::getAudioDeviceIndex(const std::string& name) {
+	return Manager::instance().getAudioDeviceIndex(name);
 }
 
-std::string
-ConfigurationManager::getCurrentAudioOutputPlugin (void)
-{
-    return Manager::instance().getCurrentAudioOutputPlugin();
+std::string ConfigurationManager::getCurrentAudioOutputPlugin(void) {
+	return Manager::instance().getCurrentAudioOutputPlugin();
 }
 
-
-std::vector< std::string >
-ConfigurationManager::getPlaybackDeviceList()
-{
-    std::vector< std::string >  ret;
-    return ret;
+std::vector<std::string> ConfigurationManager::getPlaybackDeviceList() {
+	std::vector<std::string> ret;
+	return ret;
 }
 
-std::vector< std::string >
-ConfigurationManager::getRecordDeviceList()
-{
-    std::vector< std::string >  ret;
-    return ret;
+std::vector<std::string> ConfigurationManager::getRecordDeviceList() {
+	std::vector<std::string> ret;
+	return ret;
 
 }
 
-bool
-ConfigurationManager::isMd5CredentialHashing (void)
-{
-    bool isEnabled = Manager::instance().getConfigBool (PREFERENCES, CONFIG_MD5HASH);
-    return isEnabled;
+bool ConfigurationManager::isMd5CredentialHashing(void) {
+	bool isEnabled = Manager::instance().getConfigBool(PREFERENCES,
+			CONFIG_MD5HASH);
+	return isEnabled;
 }
 
-void
-ConfigurationManager::setMd5CredentialHashing (const bool& enabled)
-{
-    if (enabled) {
-        Manager::instance().setConfig (PREFERENCES, CONFIG_MD5HASH, TRUE_STR);
-    } else {
-        Manager::instance().setConfig (PREFERENCES, CONFIG_MD5HASH, FALSE_STR);
-    }
+void ConfigurationManager::setMd5CredentialHashing(const bool& enabled) {
+	if (enabled) {
+		Manager::instance().setConfig(PREFERENCES, CONFIG_MD5HASH, TRUE_STR);
+	} else {
+		Manager::instance().setConfig(PREFERENCES, CONFIG_MD5HASH, FALSE_STR);
+	}
 }
 
-int32_t
-ConfigurationManager::isIax2Enabled (void)
-{
-    return Manager::instance().isIax2Enabled();
+int32_t ConfigurationManager::isIax2Enabled(void) {
+	return Manager::instance().isIax2Enabled();
 }
 
-void
-ConfigurationManager::ringtoneEnabled (void)
-{
-    Manager::instance().ringtoneEnabled();
+void ConfigurationManager::ringtoneEnabled(void) {
+	Manager::instance().ringtoneEnabled();
 }
 
-int32_t
-ConfigurationManager::isRingtoneEnabled (void)
-{
-    return Manager::instance().isRingtoneEnabled();
+int32_t ConfigurationManager::isRingtoneEnabled(void) {
+	return Manager::instance().isRingtoneEnabled();
 }
 
-std::string
-ConfigurationManager::getRingtoneChoice (void)
-{
-    return Manager::instance().getRingtoneChoice();
+std::string ConfigurationManager::getRingtoneChoice(void) {
+	return Manager::instance().getRingtoneChoice();
 }
 
-void
-ConfigurationManager::setRingtoneChoice (const std::string& tone)
-{
-    Manager::instance().setRingtoneChoice (tone);
+void ConfigurationManager::setRingtoneChoice(const std::string& tone) {
+	Manager::instance().setRingtoneChoice(tone);
 }
 
-std::string
-ConfigurationManager::getRecordPath (void)
-{
-    return Manager::instance().getRecordPath();
+std::string ConfigurationManager::getRecordPath(void) {
+	return Manager::instance().getRecordPath();
 }
 
-void
-ConfigurationManager::setRecordPath (const std::string& recPath)
-{
-    Manager::instance().setRecordPath (recPath);
+void ConfigurationManager::setRecordPath(const std::string& recPath) {
+	Manager::instance().setRecordPath(recPath);
 }
 
-int32_t
-ConfigurationManager::getDialpad (void)
-{
-    return Manager::instance().getDialpad();
+int32_t ConfigurationManager::getDialpad(void) {
+	return Manager::instance().getDialpad();
 }
 
-void
-ConfigurationManager::setDialpad (const bool& display)
-{
-    Manager::instance().setDialpad (display);
+void ConfigurationManager::setDialpad(const bool& display) {
+	Manager::instance().setDialpad(display);
 }
 
-int32_t
-ConfigurationManager::getSearchbar (void)
-{
-    return Manager::instance().getSearchbar();
+int32_t ConfigurationManager::getSearchbar(void) {
+	return Manager::instance().getSearchbar();
 }
 
-void
-ConfigurationManager::setSearchbar (void)
-{
-    Manager::instance().setSearchbar();
+void ConfigurationManager::setSearchbar(void) {
+	Manager::instance().setSearchbar();
 }
 
-int32_t
-ConfigurationManager::getVolumeControls (void)
-{
-    return Manager::instance().getVolumeControls();
+int32_t ConfigurationManager::getVolumeControls(void) {
+	return Manager::instance().getVolumeControls();
 }
 
-void
-ConfigurationManager::setVolumeControls (const bool& display)
-{
-    Manager::instance().setVolumeControls (display);
+void ConfigurationManager::setVolumeControls(const bool& display) {
+	Manager::instance().setVolumeControls(display);
 }
 
-int32_t
-ConfigurationManager::getHistoryLimit (void)
-{
-    return Manager::instance().getHistoryLimit();
+int32_t ConfigurationManager::getHistoryLimit(void) {
+	return Manager::instance().getHistoryLimit();
 }
 
-void
-ConfigurationManager::setHistoryLimit (const int32_t& days)
-{
-    Manager::instance().setHistoryLimit (days);
+void ConfigurationManager::setHistoryLimit(const int32_t& days) {
+	Manager::instance().setHistoryLimit(days);
 }
 
-
-void ConfigurationManager::setHistoryEnabled (void)
-{
-    Manager::instance ().setHistoryEnabled ();
+void ConfigurationManager::setHistoryEnabled(void) {
+	Manager::instance().setHistoryEnabled();
 }
 
-std::string ConfigurationManager::getHistoryEnabled (void)
-{
-    return Manager::instance ().getHistoryEnabled ();
+std::string ConfigurationManager::getHistoryEnabled(void) {
+	return Manager::instance().getHistoryEnabled();
 }
 
-void
-ConfigurationManager::startHidden (void)
-{
-    Manager::instance().startHidden();
+void ConfigurationManager::startHidden(void) {
+	Manager::instance().startHidden();
 }
 
-int32_t
-ConfigurationManager::isStartHidden (void)
-{
-    return Manager::instance().isStartHidden();
+int32_t ConfigurationManager::isStartHidden(void) {
+	return Manager::instance().isStartHidden();
 }
 
-void
-ConfigurationManager::switchPopupMode (void)
-{
-    Manager::instance().switchPopupMode();
+void ConfigurationManager::switchPopupMode(void) {
+	Manager::instance().switchPopupMode();
 }
 
-int32_t
-ConfigurationManager::popupMode (void)
-{
-    return Manager::instance().popupMode();
+int32_t ConfigurationManager::popupMode(void) {
+	return Manager::instance().popupMode();
 }
 
-void
-ConfigurationManager::setNotify (void)
-{
-    Manager::instance().setNotify();
+void ConfigurationManager::setNotify(void) {
+	Manager::instance().setNotify();
 }
 
-int32_t
-ConfigurationManager::getNotify (void)
-{
-    return Manager::instance().getNotify();
+int32_t ConfigurationManager::getNotify(void) {
+	return Manager::instance().getNotify();
 }
 
-void
-ConfigurationManager::setAudioManager (const int32_t& api)
-{
-    Manager::instance().setAudioManager (api);
+void ConfigurationManager::setAudioManager(const int32_t& api) {
+	Manager::instance().setAudioManager(api);
 }
 
-int32_t
-ConfigurationManager::getAudioManager (void)
-{
-    return Manager::instance().getAudioManager();
+int32_t ConfigurationManager::getAudioManager(void) {
+	return Manager::instance().getAudioManager();
 }
 
-void
-ConfigurationManager::setMailNotify (void)
-{
-    Manager::instance().setMailNotify();
+void ConfigurationManager::setMailNotify(void) {
+	Manager::instance().setMailNotify();
 }
 
-int32_t
-ConfigurationManager::getMailNotify (void)
-{
-    return Manager::instance().getMailNotify();
+int32_t ConfigurationManager::getMailNotify(void) {
+	return Manager::instance().getMailNotify();
 }
 
-
-std::map<std::string, int32_t> ConfigurationManager::getAddressbookSettings (void)
-{
-    return Manager::instance().getAddressbookSettings ();
+std::map<std::string, int32_t> ConfigurationManager::getAddressbookSettings(
+		void) {
+	return Manager::instance().getAddressbookSettings();
 }
 
-void ConfigurationManager::setAddressbookSettings (const std::map<std::string, int32_t>& settings)
-{
-    Manager::instance().setAddressbookSettings (settings);
+void ConfigurationManager::setAddressbookSettings(const std::map<std::string,
+		int32_t>& settings) {
+	Manager::instance().setAddressbookSettings(settings);
 }
 
-std::vector< std::string > ConfigurationManager::getAddressbookList (void)
-{
-    return Manager::instance().getAddressbookList();
+std::vector<std::string> ConfigurationManager::getAddressbookList(void) {
+	return Manager::instance().getAddressbookList();
 }
 
-void ConfigurationManager::setAddressbookList (const std::vector< std::string >& list)
-{
-    Manager::instance().setAddressbookList (list);
+void ConfigurationManager::setAddressbookList(
+		const std::vector<std::string>& list) {
+	Manager::instance().setAddressbookList(list);
 }
 
-std::map<std::string,std::string> ConfigurationManager::getHookSettings (void)
-{
-    return Manager::instance().getHookSettings ();
+std::map<std::string, std::string> ConfigurationManager::getHookSettings(void) {
+	return Manager::instance().getHookSettings();
 }
 
-void ConfigurationManager::setHookSettings (const std::map<std::string, std::string>& settings)
-{
-    Manager::instance().setHookSettings (settings);
+void ConfigurationManager::setHookSettings(const std::map<std::string,
+		std::string>& settings) {
+	Manager::instance().setHookSettings(settings);
 }
 
-void  ConfigurationManager::setAccountsOrder (const std::string& order)
-{
-    Manager::instance().setAccountsOrder (order);
+void ConfigurationManager::setAccountsOrder(const std::string& order) {
+	Manager::instance().setAccountsOrder(order);
 }
 
-std::map <std::string, std::string> ConfigurationManager::getHistory (void)
-{
-    return Manager::instance().send_history_to_client ();
+std::map<std::string, std::string> ConfigurationManager::getHistory(void) {
+	return Manager::instance().send_history_to_client();
 }
 
-void ConfigurationManager::setHistory (const std::map <std::string, std::string>& entries)
-{
-    Manager::instance().receive_history_from_client (entries);
+void ConfigurationManager::setHistory(
+		const std::map<std::string, std::string>& entries) {
+	Manager::instance().receive_history_from_client(entries);
 }
 
-std::string
-ConfigurationManager::getAddrFromInterfaceName(const std::string& interface)
-{
+std::string ConfigurationManager::getAddrFromInterfaceName(
+		const std::string& interface) {
 
-    std::string address = SIPVoIPLink::instance("")->getInterfaceAddrFromName(interface);
+	std::string address = SIPVoIPLink::instance("")->getInterfaceAddrFromName(
+			interface);
 
-    return address;
+	return address;
 }
 
-std::vector<std::string> ConfigurationManager::getAllIpInterface (void)
-{
+std::vector<std::string> ConfigurationManager::getAllIpInterface(void) {
 
-    std::vector<std::string> vector;
-    SIPVoIPLink * sipLink = NULL;
-    sipLink = SIPVoIPLink::instance ("");
+	std::vector<std::string> vector;
+	SIPVoIPLink * sipLink = NULL;
+	sipLink = SIPVoIPLink::instance("");
 
-    if (sipLink != NULL) {
-        vector = sipLink->getAllIpInterface();
-    }
+	if (sipLink != NULL) {
+		vector = sipLink->getAllIpInterface();
+	}
 
-    return vector;
+	return vector;
 }
 
-std::vector<std::string> ConfigurationManager::getAllIpInterfaceByName(void)
-{
-    std::vector<std::string> vector;
-    SIPVoIPLink * sipLink = NULL;
-    sipLink = SIPVoIPLink::instance ("");
+std::vector<std::string> ConfigurationManager::getAllIpInterfaceByName(void) {
+	std::vector<std::string> vector;
+	SIPVoIPLink * sipLink = NULL;
+	sipLink = SIPVoIPLink::instance("");
 
-    if (sipLink != NULL) {
-        vector = sipLink->getAllIpInterfaceByName();
-    }
+	if (sipLink != NULL) {
+		vector = sipLink->getAllIpInterfaceByName();
+	}
 
-    return vector;
+	return vector;
 }
 
-int32_t ConfigurationManager::getWindowWidth (void) {
+int32_t ConfigurationManager::getWindowWidth(void) {
 
-	return Manager::instance ().getConfigInt (PREFERENCES, WINDOW_WIDTH);
+	return Manager::instance().getConfigInt(PREFERENCES, WINDOW_WIDTH);
 }
 
-int32_t ConfigurationManager::getWindowHeight (void) {
+int32_t ConfigurationManager::getWindowHeight(void) {
 
-	return Manager::instance ().getConfigInt (PREFERENCES, WINDOW_HEIGHT);
+	return Manager::instance().getConfigInt(PREFERENCES, WINDOW_HEIGHT);
 }
-	
-void ConfigurationManager::setWindowWidth (const int32_t& width) {
 
-	Manager::instance ().setConfig (PREFERENCES, WINDOW_WIDTH, width);
+void ConfigurationManager::setWindowWidth(const int32_t& width) {
+
+	Manager::instance().setConfig(PREFERENCES, WINDOW_WIDTH, width);
 }
-	
-void ConfigurationManager::setWindowHeight (const int32_t& height){
 
-	Manager::instance ().setConfig (PREFERENCES, WINDOW_HEIGHT, height);
+void ConfigurationManager::setWindowHeight(const int32_t& height) {
+
+	Manager::instance().setConfig(PREFERENCES, WINDOW_HEIGHT, height);
 }
-	
-int32_t ConfigurationManager::getWindowPositionX (void) {
 
-	return Manager::instance ().getConfigInt (PREFERENCES, WINDOW_POSITION_X);
+int32_t ConfigurationManager::getWindowPositionX(void) {
+
+	return Manager::instance().getConfigInt(PREFERENCES, WINDOW_POSITION_X);
+}
+
+int32_t ConfigurationManager::getWindowPositionY(void) {
+
+	return Manager::instance().getConfigInt(PREFERENCES, WINDOW_POSITION_Y);
 }
 
-int32_t ConfigurationManager::getWindowPositionY (void) {
+void ConfigurationManager::setWindowPositionX(const int32_t& posX) {
 
-	return Manager::instance ().getConfigInt (PREFERENCES, WINDOW_POSITION_Y);
+	Manager::instance().setConfig(PREFERENCES, WINDOW_POSITION_X, posX);
 }
 
-void ConfigurationManager::setWindowPositionX (const int32_t& posX) {
+void ConfigurationManager::setWindowPositionY(const int32_t& posY) {
 
-	Manager::instance ().setConfig (PREFERENCES, WINDOW_POSITION_X, posX);
+	Manager::instance().setConfig(PREFERENCES, WINDOW_POSITION_Y, posY);
 }
 
-void ConfigurationManager::setWindowPositionY (const int32_t& posY) {
+std::map<std::string, int32_t> ConfigurationManager::getShortcuts() {
+
+	std::map<std::string, int> shortcutsMap;
+	int shortcut;
+
+	for (int i = 0; i < shortcutsKeys.size(); i++) {
+		std::string key = shortcutsKeys.at(i);
+		shortcut = Manager::instance().getConfigInt("Shortcuts", key);
+		shortcutsMap.insert(std::pair<std::string, int>(key, shortcut));
+	}
+
+	return shortcutsMap;
+}
+
+void ConfigurationManager::setShortcuts(
+		const std::map<std::string, int32_t>& shortcutsMap) {
+
+	std::map<std::string, int> map_cpy = shortcutsMap;
+	std::map<std::string, int>::iterator it;
+
+	for (int i = 0; i < shortcutsKeys.size(); i++) {
+		std::string key = shortcutsKeys.at(i);
+		it = map_cpy.find(key);
+		if (it != shortcutsMap.end()) {
+			Manager::instance().setConfig("Shortcuts", key, it->second);
+		}
+	}
 
-	Manager::instance ().setConfig (PREFERENCES, WINDOW_POSITION_Y, posY);
+	Manager::instance().saveConfig();
 }
 
 void ConfigurationManager::enableStatusIcon (const std::string& value) {
diff --git a/sflphone-common/src/dbus/configurationmanager.h b/sflphone-common/src/dbus/configurationmanager.h
index eb1f63107285d0df3171f0680547d18418076c59..4025bc432429e267f5207c267c94df7aad4e03c3 100644
--- a/sflphone-common/src/dbus/configurationmanager.h
+++ b/sflphone-common/src/dbus/configurationmanager.h
@@ -37,6 +37,9 @@ public:
     ConfigurationManager(DBus::Connection& connection);
     static const char* SERVER_PATH;
 
+private:
+    std::vector<std::string> shortcutsKeys;
+
 public:
 
     std::map< std::string, std::string > getAccountDetails( const std::string& accountID );
@@ -146,6 +149,9 @@ public:
     
     std::vector<std::string> getAllIpInterface(void);
     std::vector<std::string> getAllIpInterfaceByName(void);
+
+    std::map< std::string, int32_t > getShortcuts ();
+    void setShortcuts (const std::map< std::string, int32_t >& shortcutsMap);
 };