diff --git a/gnome/po/ab.po b/gnome/po/ab.po
index cfbfffa1702acc96aeff61ddbbeea8af6f9c9f21..a38df481c5f6a1723f3483de43fbeeb64707de92 100644
--- a/gnome/po/ab.po
+++ b/gnome/po/ab.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\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"
-"X-Launchpad-Export-Date: 2014-04-06 06:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: ast\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Parámetros de cuenta"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "Nom_atu"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Desconocíu"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Nome del _host"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Nome d'_usuariu"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "Cont_raseña"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Amosar contraseña"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Númberu del buzón de _voz"
 
@@ -367,8 +367,10 @@ msgid "Advanced"
 msgstr "Avanzáu"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Rede"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Xeneral"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -427,11 +429,6 @@ msgstr "Cuentes Configuraes"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Xeneral"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -481,11 +478,11 @@ msgstr "Esbille les llibretes de direiciones d'Evolution a usar"
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Esti asistente yá finó."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -493,134 +490,101 @@ 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."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Nomatu"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Sirvidor"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Nome d'usuariu"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Seguridá: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Asistente SFLphone de creación de cuentes"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "¡Bienllegáu al asistente de creación de cuentes de SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
-"Esti asistente d'instalación echara-y un gabitu pa configurar una cuenta."
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protocolos VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Escueya una triba de cuenta"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Cuenta"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Escueya una de les siguientes opciones"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Rexistrar una cuenta SIP o IAX2 esistente"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Axustes de cuenta SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Conseñe la información siguiente"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Comunicación segura con _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Corréu ellectrónicu opcional"
-
-#: ../src/config/assistant.c:366
-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."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_Corréu"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Axustes de cuenta IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Conversión de Direición de Rede (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Seique tenga qu'activar esto si ta tres d'un torgafueos."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "A_ctivar STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_Sirvidor STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Rexistru de cuenta"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "¡Norabona!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frecuencia"
@@ -820,15 +784,28 @@ msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 "Ten cuidáu: estos atayos podríen saltase los atayos xenerales del sistema."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Opciones avanzaes pa TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Tresporte TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -843,60 +820,60 @@ msgstr ""
 "pa cada cuenta. Por embargu, caún d'ellos va executase nun puertu dedicáu,\n"
 "diferentes ente sigo.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Escucha TLS global (toles cuentes)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Llista de Certificaos d'Autoridá"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Escueya un ficheru de llista de CA (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Ficheru de certificáu de par públicu"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Escueye un certificáu públicu de par (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Escueye un ficheru de clave privada (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Contraseña de la clave privada"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Métodu del protocolu TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Llista de cifráu TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Nome de sirvidor pa la conexón TLS saliente"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Comprobar certificaos entrantes, como un sirvidor"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Comprobar certificaos de la respuesta, como un cliente"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Requerir certificáu pa les conexones TLS entrantes"
 
@@ -972,6 +949,20 @@ msgstr "Opciones SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Pasar a RTP nos fallos de SDES"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Guetar todos"
@@ -993,19 +984,19 @@ msgstr "Guetar por llamaes entrantes"
 msgid "Search by outgoing call"
 msgstr "Guetar por llamaes salientes"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1068,17 +1059,32 @@ msgstr "Confirmar mou en claro"
 msgid "Confirm"
 msgstr "Confirmar"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1087,7 +1093,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Llamada"
 
@@ -1114,6 +1120,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Error SFLphone"
@@ -1131,6 +1145,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1163,11 +1182,21 @@ msgstr "Nun hai cuentes configuraes"
 msgid "You have no registered accounts"
 msgstr "Nun tien denguna cuenta rexistrada"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1178,6 +1207,11 @@ msgstr "%s nun tien sofitu pa ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "Falló la negociación ZRTP con %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1195,8 +1229,8 @@ msgstr "Volume del micrófonu"
 msgid "_Show main window"
 msgstr "Amo_sar ventana principal"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Colgar"
 
@@ -1204,260 +1238,271 @@ msgstr "_Colgar"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Nun s'escoyó una llibreta de direiciones"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Llibreta de direiciones"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 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."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Tocante a SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Buzón de voz"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "Llamada _Nueva"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Facer una llamada nueva"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Descolgar"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Contestar la llamada"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Finar la llamada"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "_N'espera"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Poner la llamada n'espera"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "_Salir d'espera"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Sacar la llamada d'espera"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "_Asistente de configuración"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Executar l'asistente de configuración"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Llamar al buzón de voz"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Zarrar"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimizar na bandexa de sistema"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Colar"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Colar del programa"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Copiar la seleición"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "A_pegar"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Pegar el conteníu del cartafueyu"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Llimpiar _hestorial"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Llimpiar l'hestorial de llamáes"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Cuentes"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Editar les sos cuentes"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Preferencies"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Camudar les sos preferencies"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Ver"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Aida"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Conteníu"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Abrir el manual"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Tocante a esta aplicación"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Tresferir"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Tresferir la llamada"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "G_rabar"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Grabar la conversación actual"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "Amo_sar ferramientes"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Amuesa la barra de ferramientes"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Tecláu"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Amosar el tecláu pa marcar"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Controles de volume"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Amuesa los controles de volume"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Hestorial"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Llibret_a de direiciones"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "_N'espera"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "Tornar _Llamada"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Editar númberu de teléfonu"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Editar el númberu de teléfonu enantes de llamar"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/ar.po b/gnome/po/ar.po
index 35cfe59ce91b8fde1d1447d860fd93d278bb976e..65576e1377afd0daa31f27da53869534463be5c5 100644
--- a/gnome/po/ar.po
+++ b/gnome/po/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-01-13 14:45+0000\n"
 "Last-Translator: Jihed Amine Maaref <jihedamine@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: ar\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "مواصفات الحساب"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_إسم مستعار"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "مجهول"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_اسم المضيف"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "_اسم المستخدم"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_كلمة السر"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "أظهر كلمة السر"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "_الوكيل (proxy)"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "_رقم البريد الصوتي"
 
@@ -367,8 +367,10 @@ msgid "Advanced"
 msgstr "مُتقدم"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "الشّبكة"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "عام"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -427,11 +429,6 @@ msgstr "الحسابات المهيئة"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "عام"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -481,11 +478,11 @@ msgstr "حدد دفتر العناوين Evolution المستخدم"
 msgid "Name"
 msgstr "الإسم"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "انتهى هذا المساعد"
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -493,135 +490,101 @@ msgstr ""
 "يمكنك في أي وقت التحقق من حالة تسجيلك أو تغيير معلمات حسابك في نافذة "
 "\"خيارات / حسابات\""
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "الكُنية"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "الخادم"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "إسم المستخدم"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "أمن: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "لا شيئ"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "مساعد إنشاء الحساب SFLphone"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "مرحبا بك في مساعد إنشاء الحساب SFLphone"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "مساعد التثبيت سيساعدك في تكوين حساب"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "بروتوكول VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "اختر نوع حساب"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "(SIP (Session Initiation Protocol"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "(IAX2 (InterAsterix Exchange"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "الحساب"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "الرجاء إختيار أحد الخيارات التالية"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"إنشاء حساب مجاني SIP/IAX2 في sflphone.org \n"
-"(لغرض الاختبار فقط)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "تسجيل حساب SIP أو IAX2 موجود"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "إعدادات الحساب SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "الرجاء تقديم المعلومات التالية"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "اتصالات آمنة مع _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "عنوان بريد إلكتروني اختياري"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-"سيستخدم عنوان البريد الإلكتروني هذا لإرسال رسائل البريد الصوتي الخاصة بك."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "عنوان ال_بريد الإلكتروني"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "إعدادات الحساب IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "ترجمة عنوان الشبكة (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "ربما يجب عليك تمكين هذا إذا كنت خلف جدار حماية (firewall)."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "_تمكين STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_خادم STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "تسجيل الحساب"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "تهانينا!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "التردد"
@@ -820,15 +783,28 @@ msgstr "دفتر العناوين"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr "حذاري: هذه الاختصارات قد تعوض الاختصارات المحددة على نطاق المنظومة."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "الخيارات المتقدمة TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "نقل TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -842,60 +818,60 @@ msgstr ""
 "\n"
 "لكل حساب,‏ بيد أن كل منهم سيشتغل على منفذ مخصص له، مختلف عن الآخرين.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "مستمع TLS شامل (كل الحسابات)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "قائمة الشهادات من هيئة"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "اختيار ملف لقائمة الشهادات من هيئة (اختياري)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "ملف شهادة نقطة نهاية عامة"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "اختيار شهادة نقطة نهاية عامة (اختياري)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "اختيار ملف مفتاح خاص (اختياري)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "كلمة السر للمفتاح الخاص"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "أسلوب البروتوكول TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "قائمة الشفرات TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "اسم خادم للاتصال الصادر TLS"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "تحقق من الشهادات الواردة، كخادم"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "تحقق من الشهادات من الإجابة، كمستخدم"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "يقتضي شهادة للإتصالات الواردة TLS"
 
@@ -971,6 +947,20 @@ msgstr "الخيارات SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "الاستعاضة بRTP عند إخفاق SDES"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "البحث في الجميع"
@@ -992,19 +982,19 @@ msgstr "البحث حسب المكالمات الواردة"
 msgid "Search by outgoing call"
 msgstr "البحث حسب المكالمات الصادرة"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "إعلام ALSA: خطأ أثناء فتح جهاز القراءة"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "إعلام ALSA: خطأ أثناء فتح جهاز التسجيل"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "إعلام Pulseaudio: Pulseaudio لا يعمل"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "إعلام كوديك: كوديك غير موجود"
 
@@ -1067,17 +1057,32 @@ msgstr "تأكيد الذهاب الواضح (Go Clear)"
 msgid "Confirm"
 msgstr "التأكيد"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr "خطأ فالحقل"
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "حذف صديق"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "إضافة صديق جديد"
 
@@ -1086,7 +1091,7 @@ msgid "Add group"
 msgstr "إضافة مجموعة"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "المكالمة"
 
@@ -1116,6 +1121,14 @@ msgstr ""
 "شغّل الأمر '‎%s --help ' لرؤية القائمة الكاملة لخيارات الأوامر السطرية "
 "المتاحة.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "خطأ SFLphone"
@@ -1133,6 +1146,11 @@ msgstr "- مستخدم GNOME لدى SFLphone"
 msgid "%s says:"
 msgstr "‎%s يقول:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1169,11 +1187,21 @@ msgstr "ليس لديك حسابات منشأة"
 msgid "You have no registered accounts"
 msgstr "ليس لديك حسابات مسجلة"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1184,6 +1212,11 @@ msgstr "‏‎%s لا يعتمد ‏ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "فشل التفاوض ‏ZRTP مع‎ ‏‎%s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1201,8 +1234,8 @@ msgstr "حجم صوت الميكروفون"
 msgid "_Show main window"
 msgstr "_إظهار النافذة الرئيسية"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "إ_نهاء المكالمة"
 
@@ -1210,261 +1243,272 @@ msgstr "إ_نهاء المكالمة"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "لم تختر دفتر عناوين"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "دفتر العناوين"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "البريد الصوتي (‎%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 "‏SFLphone‎ يستخدم الصوت عبر بروتوكول الإنترنت (‎VOIP)‏ وهو متلائم مع "
 "البروتوكول ‎SIP و IAX2"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "حول ‏SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "البريد الصوتي"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_مكالمة جديدة"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "إحداث مكالمة جديدة"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "ت_ناول"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "الرد على المكالمة"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "إنهاء المكالمة"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "في الانت_ظار"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "وضع المكالمة قيد الانتظار"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "تفعيل المكالمة التي في قيد الانتظار"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "تفعيل المكالمة التي في قيد الانتظار"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "إرسال _رسالة"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "إرسال رسالة"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "مساعد ال_تهيئة"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "شغّل مساعد الإعداد"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "الاتصال بالبريد الصوتي"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "إ_غلاق"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "تصغير إلى شريط المهام"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "ا_خرج"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "اخرج من البرنامج"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "ت_حرير"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_نسخ"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "نسخ النص المختار"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "إل_صاق"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "ألصق محتويات الحافظة"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "مسح ال_سجل"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "مسح سجل المكالمات"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "ال_حسابات"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "تحرير حساباتك"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "ال_خيارات"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "غيّر خياراتك"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_عرض"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "م_ساعدة"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "المحتوى"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "إفتح كتيّب الإرشادات"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "حول هذا البرنامج"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_نقل"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "نقل المكالمة"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "س_جّل"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "سجّل المكالمة الحالية"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "إظهار _شريط الأدوات"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "إظهار شريط الأدوات"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_لوحة الاتصال"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "إظهار لوحة الاتصال"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "التحكم بحجم ال_صوت"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "إظهار عناصر التحكم بحجم الصوت"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "ال_سجل"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "_دفتر العناوين"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "قائمة الأ_صدقاء"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "عرض قائمة الأصدقاء"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "في الانت_ظار"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "إ_عادة الاتصال"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr "متابعة حالة التواجد"
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "تحرير رقم الهاتف"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "تحرير رقم الهاتف قبل إجراء مكالمة هاتفية"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/ast.po b/gnome/po/ast.po
index 0b860bf889dcf1bfed8e221280636998281b4c2a..47cfb78e1fc76184c5eb26a2425a77a55cafe017 100644
--- a/gnome/po/ast.po
+++ b/gnome/po/ast.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-01-13 23:58+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"
-"X-Launchpad-Export-Date: 2014-04-06 06:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: ast\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Parámetros de cuenta"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "Nom_atu"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Desconocíu"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Nome del _host"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Nome d'_usuariu"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "Cont_raseña"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Amosar contraseña"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Númberu del buzón de _voz"
 
@@ -367,8 +367,10 @@ msgid "Advanced"
 msgstr "Avanzáu"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Rede"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Xeneral"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -427,11 +429,6 @@ msgstr "Cuentes Configuraes"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Xeneral"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -481,11 +478,11 @@ msgstr "Esbille les llibretes de direiciones d'Evolution a usar"
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Esti asistente yá finó."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -493,136 +490,101 @@ 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."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Nomatu"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Sirvidor"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Nome d'usuariu"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Seguridá: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Asistente SFLphone de creación de cuentes"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "¡Bienllegáu al asistente de creación de cuentes de SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
-"Esti asistente d'instalación echara-y un gabitu pa configurar una cuenta."
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protocolos VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Escueya una triba de cuenta"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Cuenta"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Escueya una de les siguientes opciones"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Crear una cuenta SIP/IAX2 de baldre en sflphone.org \n"
-"(Namái pa facer pruebes)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Rexistrar una cuenta SIP o IAX2 esistente"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Axustes de cuenta SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Conseñe la información siguiente"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Comunicación segura con _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Corréu ellectrónicu opcional"
-
-#: ../src/config/assistant.c:366
-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."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_Corréu"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Axustes de cuenta IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Conversión de Direición de Rede (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Seique tenga qu'activar esto si ta tres d'un torgafueos."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "A_ctivar STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_Sirvidor STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Rexistru de cuenta"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "¡Norabona!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frecuencia"
@@ -822,15 +784,28 @@ msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 "Ten cuidáu: estos atayos podríen saltase los atayos xenerales del sistema."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Opciones avanzaes pa TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Tresporte TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -845,60 +820,60 @@ msgstr ""
 "pa cada cuenta. Por embargu, caún d'ellos va executase nun puertu dedicáu,\n"
 "diferentes ente sigo.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Escucha TLS global (toles cuentes)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Llista de Certificaos d'Autoridá"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Escueya un ficheru de llista de CA (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Ficheru de certificáu de par públicu"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Escueye un certificáu públicu de par (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Escueye un ficheru de clave privada (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Contraseña de la clave privada"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Métodu del protocolu TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Llista de cifráu TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Nome de sirvidor pa la conexón TLS saliente"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Comprobar certificaos entrantes, como un sirvidor"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Comprobar certificaos de la respuesta, como un cliente"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Requerir certificáu pa les conexones TLS entrantes"
 
@@ -974,6 +949,20 @@ msgstr "Opciones SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Pasar a RTP nos fallos de SDES"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Guetar todos"
@@ -995,19 +984,19 @@ msgstr "Guetar por llamaes entrantes"
 msgid "Search by outgoing call"
 msgstr "Guetar por llamaes salientes"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "Avisu d'ALSA: Error al abrir el preséu de reproducción"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "Avisu d'ALSA: Error al abrir el preséu de captura"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "Avisu de Pulseaudio: Pulseaudio nun ta executándose"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "Avisu de Codecs: Nun s'alcontraron codecs"
 
@@ -1070,17 +1059,32 @@ msgstr "Confirmar mou en claro"
 msgid "Confirm"
 msgstr "Confirmar"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr "Error nel campu"
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "Desaniciar amigu"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "Amestar amigu nuevu"
 
@@ -1089,7 +1093,7 @@ msgid "Add group"
 msgstr "Amestar grupu"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Llamada"
 
@@ -1119,6 +1123,14 @@ msgstr ""
 "Executar '%s --help' pa ver una llista completa de les opciones de comandu "
 "disponibles.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Error SFLphone"
@@ -1136,6 +1148,11 @@ msgstr "- cliente GNOME pa SFLPhone"
 msgid "%s says:"
 msgstr "%s diz:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1168,11 +1185,21 @@ msgstr "Nun hai cuentes configuraes"
 msgid "You have no registered accounts"
 msgstr "Nun tien denguna cuenta rexistrada"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1183,6 +1210,11 @@ msgstr "%s nun tien sofitu pa ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "Falló la negociación ZRTP con %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1200,8 +1232,8 @@ msgstr "Volume del micrófonu"
 msgid "_Show main window"
 msgstr "Amo_sar ventana principal"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Colgar"
 
@@ -1209,260 +1241,271 @@ msgstr "_Colgar"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Nun s'escoyó una llibreta de direiciones"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Llibreta de direiciones"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Voicemail(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 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."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Tocante a SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Buzón de voz"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "Llamada _Nueva"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Facer una llamada nueva"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Descolgar"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Contestar la llamada"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Finar la llamada"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "_N'espera"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Poner la llamada n'espera"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "_Salir d'espera"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Sacar la llamada d'espera"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Unviar _mensaxe"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Unviar mensaxe"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "_Asistente de configuración"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Executar l'asistente de configuración"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Llamar al buzón de voz"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Zarrar"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimizar na bandexa de sistema"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Colar"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Colar del programa"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Copiar la seleición"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "A_pegar"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Pegar el conteníu del cartafueyu"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Llimpiar _hestorial"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Llimpiar l'hestorial de llamáes"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Cuentes"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Editar les sos cuentes"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Preferencies"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Camudar les sos preferencies"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Ver"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Aida"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Conteníu"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Abrir el manual"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Tocante a esta aplicación"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Tresferir"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Tresferir la llamada"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "G_rabar"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Grabar la conversación actual"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "Amo_sar ferramientes"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Amuesa la barra de ferramientes"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Tecláu"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Amosar el tecláu pa marcar"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Controles de volume"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Amuesa los controles de volume"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Hestorial"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Llibret_a de direiciones"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "_Llista de collacios"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Amosar la llista de collacios"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "_N'espera"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "Tornar _Llamada"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr "Siguir estáu"
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Editar númberu de teléfonu"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Editar el númberu de teléfonu enantes de llamar"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/ca.po b/gnome/po/ca.po
index 3553e897c423c378c369372ffb570a025ee17606..0efd4a05bb427ce8e7387cd893823f5f09df43ce 100644
--- a/gnome/po/ca.po
+++ b/gnome/po/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: ca\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Paràmetres dels comptes"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "À_lies"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Desconegut"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Nom d'a_mfitrió"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Nom d'_usuari"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Contrasenya"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Mostra la contrasenya"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Número de la bústia de _veu"
 
@@ -368,8 +368,10 @@ msgid "Advanced"
 msgstr "Avançat"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Xarxa"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "General"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "Comptes configurats"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "General"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -483,11 +480,11 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Aquest auxiliar ha finalitzat."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -496,136 +493,101 @@ msgstr ""
 "així com modificar els paràmetres dels vostres comptes a la finestra "
 "d'Opcions/Comptes."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Sobrenom"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Segureat: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Cap"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Auxiliar de creació de comptes de l'SFLphone"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
 msgstr ""
-"Us donem la benvinguda a l'auxiliar de creació de comptes de l'SFLphone"
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
-"Aquest auxiliar d'instal·lació us ajudarà en la configuració d'un compte."
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protocols VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Seleccioneu el tipus de compte"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Compte"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Seleccioneu una de les opcions següents"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Registreu un compte SIP o IAX2 existent"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Paràmetres del compte SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Ompliu la informació següent"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Comunicacions segures amb _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Adreça de correu electrònic opcional"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-"Aquesta adreça de correu es farà servir per enviar-vos missatges de la "
-"bústia de veu."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "Adr_eça de correu electrònic"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Paràmetres del compte IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Traducció de l'adreça de xarxa (Network Address Translation o NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Heu d'activar aquesta opció si esteu darrere d'un tallafocs."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "Activa l'STU_N"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "Servidor _STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Registre de compte"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Enhorabona!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Periodicitat"
@@ -825,15 +787,28 @@ msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 "Avís: aquestes dreceres sobreescriuran les dreceres de tot el sistema."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Opcions avançades del TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Transport TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -848,60 +823,60 @@ msgstr ""
 "un\n"
 "port dedicat, i cada port serà diferent dels altres\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Oient TLS global (tots els comptes)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Llista de certificats d'autoritat"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Trieu un fitxer de llista de CA (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Fitxer del certificat de punt final públic"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Trieu un certificat de punt final públic (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Trieu un fitxer de clau privada (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Contrasenya de la clau privada"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Mètode del protocol TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Llista xifrada TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Instància de nom del servidor per a les connexions sortints TLS"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Comprova els certificants entrants, com a servidor"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Comprova els certificats de resposta, com a client"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Demana el certificat per a les connexions TLS entrants"
 
@@ -977,6 +952,20 @@ msgstr "Opcions SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Abandona si falla l'RTP o el SDES"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Cerca-les totes"
@@ -998,19 +987,19 @@ msgstr "Cerca per trucada entrant"
 msgid "Search by outgoing call"
 msgstr "Cerca per trucada sortint"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1074,17 +1063,32 @@ msgstr "Confirma la comunicació transparent"
 msgid "Confirm"
 msgstr "Confirma"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1093,7 +1097,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Trucada"
 
@@ -1120,6 +1124,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Error de l'SFLphone"
@@ -1137,6 +1149,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1169,11 +1186,21 @@ msgstr "No teniu cap compte configurat"
 msgid "You have no registered accounts"
 msgstr "No teniu cap compte registrat"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1184,6 +1211,11 @@ msgstr "%s no és compatible amb el ZRTP"
 msgid "ZRTP negotiation failed with %s"
 msgstr "Ha fallat la negociació ZRTP amb %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1201,8 +1233,8 @@ msgstr "Volum del micròfon"
 msgid "_Show main window"
 msgstr "Mo_stra la finestra principal"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Penja"
 
@@ -1210,260 +1242,271 @@ msgstr "_Penja"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "No s'ha seleccionat cap llibreta d'adreces"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Llibreta d'adreces"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 "L'SFLphone és un client de VoIP compatible amb els protocols SIP i IAX2."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Quant al SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Bústia de veu"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "Trucada _nova"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Fes una trucada nova"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "Des_penja"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Respon a la trucada"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Finalitza la trucada"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "E_n espera"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Posa la trucada en espera"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "_Surt del mode en espera"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Posa la trucada en mode actiu"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "_Auxiliar de configuració"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Inicia l'auxiliar de configuració"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Truca a la bústia de veu"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimitza a l'àrea de notificació"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Surt del programa"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Copia"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Copia la selecció"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "Engan_xa"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Enganxa el contingut del porta-retalls"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Neteja l'_historial"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Neteja l'historial de trucades"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Editeu els vostres comptes"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Preferències"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Canvia les preferències"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Visualitza"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Continguts"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Obre el manual"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Quant a aquesta aplicació"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Transfereix"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Transfereix la trucada"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "En_registra"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Enregistra la conversa actual"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "Mo_stra la barra d'eines"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Mostra la barra d'eines"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Marcador"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Mostra el marcador"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "Controls de _volum"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Mostra els controls de volum"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Historial"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Llibreta d'_adreces"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "En e_spera"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "Torna la tru_cada"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Edita el número de telèfon"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Edita el número de telèfon abans de trucar"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/cs.po b/gnome/po/cs.po
index 7fd82a402bca076814c0d8fe16018c3c63ef00ef..431cad769dfc36ba03dce7a672e160887253cb96 100644
--- a/gnome/po/cs.po
+++ b/gnome/po/cs.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-01-14 13:48+0000\n"
 "Last-Translator: fri <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: cs\n"
 "X-Language: cs_CZ\n"
 "X-Source-Language: C\n"
@@ -123,8 +123,8 @@ msgid "Account Parameters"
 msgstr "Nastavení účtu"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Přezdívka"
 
@@ -138,25 +138,25 @@ msgid "Unknown"
 msgstr "Neznámý"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Název _počítače"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Jméno _uživatele"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Heslo"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Ukázat heslo"
 
@@ -165,8 +165,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Volací číslo _hlasové schránky"
 
@@ -370,8 +370,10 @@ msgid "Advanced"
 msgstr "Pokročilé"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Síť"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Obecné"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -430,11 +432,6 @@ msgstr "Nastavené účty"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Obecné"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -484,11 +481,11 @@ msgstr "Vybrat používanou knihu adres Evolution"
 msgid "Name"
 msgstr "Název"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Průvodce ukončen."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -496,134 +493,101 @@ msgstr ""
 "Kdykoli můžete prověřit stav své registrace nebo změnit nastavení účtu v "
 "okně Volby -> Účty."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Přezdívka"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Bezpečnost: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Žádný"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Průvodce vytvořením účtu SFLphone"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Vítejte v průvodci vytvořením účtu SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Pomocník s nastavením vám pomůže se zřízením účtu."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protokoly VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Vyberte typ účtu"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Protokol zahájení sezení - Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Účet"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Vyberte, prosím, jednu z následujících voleb"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Vytvořit účet SIP/IAX2 zdarma na sflphone.org\n"
-"(jen pro účel zkoušení)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Zaregistrovat existující účet SIP nebo IAX2"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Nastavení účtu SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Vyplňte, prosím, následující pole"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Zabezpečené spojení s _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Volitelná adresa poštovní schránky"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "Vaše hlasové zprávy budou počítačem zasílány na tuto adresu."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "Adresa _elektronické pošty"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Nastavení účtu IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "NAT (Překlad síťové adresy - Network Address Translation)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Pokud jste za firewallem, měli byste to zřejmě povolit."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "P_ovolit STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "Server _STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Registrace účtu"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Blahopřání!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frekvence"
@@ -822,15 +786,28 @@ msgstr "Kniha adres"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr "Pozor: Tato nastavení mohou přepsat klávesové zkratky systému."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Pokročilé volby pro TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Přenos TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -844,60 +821,60 @@ msgstr ""
 "Pro každý účet můžete samostatně nastavit jiný přenos TLS.\n"
 "Přitom se vždy musí používat zvláštní přípojka navíc (port).\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Hlídač příjmu TLS (pro všechny účty)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Certifikát seznamu autorit"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Vyberte soubor s certifikátem (volitelné)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Veřejný certifikát koncového místa"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Vyberte veřejný certifikát koncového místa (volitelné)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Vyberte soubor se soukromým klíčem (volitelné)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Heslo pro soukromý klíč"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Metoda pro protokol TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Seznam šifrovacích postupů pro TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Instance názvu serveru pro odchozí spojení TLS"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Prověřit příchozí certifikáty (jako server)"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Prověřit certifikáty v odpovědích (jako klient)"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Požadovat certifikáty pro příchozí spojení TLS"
 
@@ -973,6 +950,20 @@ msgstr "Volby pro SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Záloha při selhání s RTP na SDES"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Prohledat vše"
@@ -994,19 +985,19 @@ msgstr "Hledat podle příchozího volání"
 msgid "Search by outgoing call"
 msgstr "Hledat podle odchozího volání"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "Oznámení ALSA: Chyba při otevírání zařízení pro přehrávání"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "Oznámení ALSA: Chyba při otevírání zařízení pro zachytávání"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "Oznámení ALSA: Pulseaudio neběží"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "Oznámení o kodecích: Kodeky nenalezeny"
 
@@ -1069,17 +1060,32 @@ msgstr "Potvrdit nezabezpečenou komunikaci"
 msgid "Confirm"
 msgstr "Potvrdit"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr "Chyba pole"
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "Odstranit kamaráda"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "Přidat nového kamaráda"
 
@@ -1088,7 +1094,7 @@ msgid "Add group"
 msgstr "Přidat skupinu"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Volání"
 
@@ -1118,6 +1124,14 @@ msgstr ""
 "Spusťte „%s --help“ pro zobrazení úplného seznamu dostupných přepínačů "
 "příkazového řádku.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Chyba SFLphone"
@@ -1135,6 +1149,11 @@ msgstr "- GNOME klient pro SFLPhone"
 msgid "%s says:"
 msgstr "%s říká:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1167,11 +1186,21 @@ msgstr "Nemáte nastaveny žádné účty"
 msgid "You have no registered accounts"
 msgstr "Nemáte žádné zaregistrované účty"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1182,6 +1211,11 @@ msgstr "%s nepodporuje ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "Přenos ZRTP s %s se nezdařil"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1199,8 +1233,8 @@ msgstr "Hlasitost mikrofonu"
 msgid "_Show main window"
 msgstr "_Ukázat hlavní okno"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Zavěsit"
 
@@ -1208,259 +1242,270 @@ msgstr "_Zavěsit"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Nebyla vybrána žádná kniha adres"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Kniha adres"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Hlasová schránka (%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone je klient VoIP slučitelný s protokoly SIP a IAX2."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "O programu SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Hlasová schránka"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Nové volání"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Uskutečnit nové volání"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Přijmout"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Odpovědět na volání"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Ukončit volání"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "V č_ekání"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Dát volání do čekání"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "Znovu _vzít"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Znovu vzít volání z čekání"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Poslat _zprávu"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Poslat zprávu"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Průvodce nastavením"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Spustit průvodce nastavením"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Zavolat svou hlasovou schránku"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Zmenšit do oznamovací oblasti panelu"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Ukončit"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Ukončit program"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "Úp_ravy"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Kopírovat výběr"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "_Vložit"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Vložit obsah schránky"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Vymazat _historii volání"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Vymazat seznam ukončených volání"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "Úč_ty"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Upravit účty"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Změnit nastavení"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Pohled"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Obsah"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Otevřít příručku"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Informace o tomto programu"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Předat"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Předat volání"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "Na_hrávat hovor"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Zaznamenat nynější hovor"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "_Nástrojový pruh"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Ukázat pruh s nástroji"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Vytáčecí číselník"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Ukázat vytáčecí číselník"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Ovládání hlasitosti"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Ukázat ovládání hlasitosti"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Kniha _adres"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "Seznam _kamarádů"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Zobrazit seznam kamarádů"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "V č_ekání"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Zavolat nazpět"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr "Sledovat stav"
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Upravit telefonní číslo"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Upravit telefonní číslo před zavoláním"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/da.po b/gnome/po/da.po
index a7705ae8ac4644c062ca3919edcdf9a1d9508bc6..559d83d2fbb732e9620866970e8b8461c4a64c03 100644
--- a/gnome/po/da.po
+++ b/gnome/po/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\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"
-"X-Launchpad-Export-Date: 2014-04-06 06:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: da\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Kontoparametre"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Alias"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Ukendt"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_Værtsnavn"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "_Brugernavn"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Adgangskode"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Adgangskode"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "_Nummer for talebesked"
 
@@ -368,8 +368,10 @@ msgid "Advanced"
 msgstr "Avanceret"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Netværk"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Generelt"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "Oprettede konti"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Generelt"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -482,11 +479,11 @@ msgstr "Vælg hvilke af Evolutions adressekartoteker skal benyttes"
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Denne vejledning er nu fuldført"
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -494,134 +491,101 @@ msgstr ""
 "Du kan til enhver tid undersøge din registrering eller ændre dine kontis "
 "parametre i vinduet Indstillinger/Konti"
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Brugernavn"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Sikkerhed: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFLphone-guiden til oprettelse af konto"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Velkommen til kontooperettelsesvejledning for SFLphone"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
-"Denne installeringsvejledning vil hjælpe dig med at konfigurere en konto"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP protokoller"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Vælg en kontotype"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Konto"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Vælg en af følgende indstillinger"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Registrer en eksisterende SIP eller IAX2 konto"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "SIP kontoindstillinger"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Udfyld venligst følgende information"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Sikker kommunikation med _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Valgfri emailadresse"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-"Denne emailadresse vil blive brugt til at sende dig indtalte beskeder"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_Emailadresse"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "IAX2 kontoindstillinger"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 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"
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "_Benyt STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_STUN server"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Kontoregistrering"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Tillykke!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frekvens"
@@ -821,15 +785,28 @@ msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 "Bemærk: disse genveje vil tilsidesætte genveje defineret for hele systemet."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Advancerede indstillinger for TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS transport"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -843,60 +820,60 @@ msgstr ""
 "TLS transporter for de enkelte konti. Bemærk dog at de hver vil benytte\n"
 "en dedikeret port forskellig fra hinanden.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Global TLS-modtager (alle konti)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Autoritetscertifikatsliste"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Vælg en fil med en autoritetscertifikatsliste (valgfri)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Offentlig endpoint certifikatsfil"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Vælg et offentligt endpoint-certifikat (valgfri)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Vælg en privat nøglefil (valgfri)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Adgangskode for den private nøgle"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "TLS protokolmetode"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "TLS cifferliste"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Server navneinstans for udgående TLS forbindelse"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Udfør kontrol af indgående certifikater, som en server"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Udfør kontrol af certifikater fra svar, som en klient"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Kræv certifikat for indgående TLS forbindelser"
 
@@ -972,6 +949,20 @@ msgstr "SDES indstillinger"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Fald tilbage til RTP ved SDES fejl"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Søg alle"
@@ -993,19 +984,19 @@ msgstr "Søg i indgående opkald"
 msgid "Search by outgoing call"
 msgstr "Søg i udgående opkald"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1069,17 +1060,32 @@ msgstr "Godkend sikkerhedsændring"
 msgid "Confirm"
 msgstr "Godkend"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1088,7 +1094,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Afslut opkald"
 
@@ -1115,6 +1121,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone fejl"
@@ -1132,6 +1146,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1164,11 +1183,21 @@ msgstr "Du har ingen oprettede konti"
 msgid "You have no registered accounts"
 msgstr "Du har ingen registrerede konti"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1179,6 +1208,11 @@ msgstr "%s understøtter ikke ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "ZRTP forhandling mislykkedes med %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1196,8 +1230,8 @@ msgstr "Mikrofon lydstyrke"
 msgid "_Show main window"
 msgstr "_Vis hovedvindue"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Læg på"
 
@@ -1205,259 +1239,270 @@ msgstr "_Læg på"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Ingen adressebog er valgt"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Adressebog"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone er en VoIP-klient kompatibel med SIP og IAX2 protokoller"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Om SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Talebesked"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Nyt opkald"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Lav et nyt opkald"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Svar"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Besvar opkaldet"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Afslut opkaldet"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "I _venteposition"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Sæt opkaldet i venteposition"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "F_jern fra venteposition"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Fjern opkaldet fra venteposition"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Konfigurationsfil"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Stun konfigureringsfejl"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "%d indtalt besked"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Luk"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimere til systembakken"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Afslut programmet"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Kopier det valgte"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "Inds_æt"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Indsæt indholdet af udklipsholderen"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Opkaldshistorik"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Opkaldshistorik"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "Konti"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Nuværende konto"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "Indstillinger"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Ændr dine indstillinger"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Vis"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Fortsæt"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Åbn manualen"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Godkendelse"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Overfør"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Overfør opkaldet"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Optag"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Optag den aktuelle samtale"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "_Vis værktøjslinie"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Vis værktøjslinien"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Nummertastatur"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Vis nummertastaturet"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "Vis _lydstyrke indstillinger"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Vis lydstyrke indstillingerne"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "Opkaldshistorik"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Adressebog"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "I _venteposition"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Besvar opkald"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Ændre telefonnummer"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Ændre telefonnummeret før opkald"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/de.po b/gnome/po/de.po
index bb1b064a8f7266c8c3959114ac020c9392099e7e..5a7cfb20e7f757ee240b3d2af81ad62462d82449 100644
--- a/gnome/po/de.po
+++ b/gnome/po/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-01-10 15:11+0000\n"
 "Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.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"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Konto-Einstellungen"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Alias"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Unbekannt"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_Hostname"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "_Benutzername"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Passwort"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Passwort anzeigen"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Sprachbox-Rufnummer"
 
@@ -368,8 +368,10 @@ msgid "Advanced"
 msgstr "Erweitert"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Netzwerk"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Allgemein"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "Konfigurierte Konten"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Allgemein"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -482,11 +479,11 @@ msgstr "verwendete Evolution-Adressbücher auswählen"
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Assistent beendet."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -494,135 +491,102 @@ msgstr ""
 "Sie können jederzeit Ihren Registrierungsstatus überprüfen oder Ihre "
 "Kontoparameter ändern (Bearbeiten/Konten)."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Sicherheit: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Nichts"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFLphone-Konfigurations-Assistent"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Wilkommen zu SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
-"Der Konfigurations-Assistent wird Ihnen helfen, ein Konto einzurichten."
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP-Protokolle"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Kontotyp auswählen"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterisk Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Konto"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Bitte eine Option auswählen"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr "Kostenloses SIP-/IAX2-Konto bei sflphone.org erstellen"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Existierendes SIP/IAX2 Konto einrichten"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Konfiguration des SIP-Kontos"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Folgende Informationen bitte ausfüllen"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Sichere Kommunikation mit _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Optionale E-Mail-Adresse"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-"Diese E-Mail-Adresse wird benutzt, um Ihnen Sprachnachrichten zu schicken."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_E-Mail"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Konfiguration des IAX2 Konto"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 "Sie sollten dieses einschalten, falls Sie hinter einer Firewall sind."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "STUN ei_nschalten"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_STUN-Server"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Konto-Registrierung"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Gratulation!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frequenz"
@@ -823,15 +787,28 @@ msgstr ""
 "Achtung: Diese Einstellungen können systemweite Tastenkombinationen "
 "überschreiben."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Erweiterte Optionen für TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS-Transport"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -845,60 +822,60 @@ msgstr ""
 "würden. Du kannst TLS-Übertragung für jedes Konto getrennt\n"
 "konfigurieren. Dabei muss jeweils ein extra Port verwendet werden.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Kontenübergreifender TLS-Empfangswächter"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Liste der Zertifizierungsstellen"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Wählen Sie eine Zertifikats-Datei (optional)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Öffentliches Zertifikat der Endstelle"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Wähle ein öffentliches Endstellen-Zertifikat (optional)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Wählen Sie die Datei mit Ihrem privaten Schlüssel"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Passwort für den privaten Schlüssel"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "TLS-Protokoll-Methode"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Liste der Verschlüsselungsverfahren für TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Server-Name-Instanz für ausgehende TLS-Verbindung"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Überprüfe eingehende Zertifikate (als Server)"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Überprüfe eingehende Zertifikate (als Client)"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Zertifikat für eingehende TLS-Verbindungen erforderlich"
 
@@ -974,6 +951,20 @@ msgstr "SDES-Optionen"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Weiche bei Fehlschlag mit SDES auf RTP aus"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Suche alle"
@@ -995,19 +986,19 @@ msgstr "Suche nach eingehendem Anruf"
 msgid "Search by outgoing call"
 msgstr "Suche nach ausgehendem Anruf"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "ALSA-Benachrichtigung: Fehler beim öffnen des Abspielgeräts"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "ALSA-Benachrichtigung: Fehler beim öffnen des Aufnahmegeräts"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "Pulseaudio-Benachrichtigung: Pulseaudio ist nicht aktiv"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "Codec-Benachrichtigung: Keine Codecs gefunden"
 
@@ -1070,17 +1061,32 @@ msgstr "Löschen bestätigen"
 msgid "Confirm"
 msgstr "Bestätigen"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr "Feldfehler"
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "SIP URI enfernen"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "Neuen SIP URI hinzufügen"
 
@@ -1089,7 +1095,7 @@ msgid "Add group"
 msgstr "Gruppe hinzufügen"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "_Anruf"
 
@@ -1119,6 +1125,14 @@ msgstr ""
 "Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren\n"
 "Befehlszeilenoptionen zu erhalten.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone-Fehler"
@@ -1136,6 +1150,11 @@ msgstr "- GNOME Anwendung für SFLphone"
 msgid "%s says:"
 msgstr "%s sagt:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1168,11 +1187,21 @@ msgstr "Sie haben noch kein Konto eingerichtet"
 msgid "You have no registered accounts"
 msgstr "Sie haben noch kein registriertes Konto"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1183,6 +1212,11 @@ msgstr "%s unterstützt ZRTP nicht."
 msgid "ZRTP negotiation failed with %s"
 msgstr "ZRTP-Übertragung mit %s schlug fehl"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1200,8 +1234,8 @@ msgstr "Mikrofon-Lautstärke"
 msgid "_Show main window"
 msgstr "_Hauptfenster anzeigen"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "A_uflegen"
 
@@ -1209,259 +1243,270 @@ msgstr "A_uflegen"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Kein Adressbuch ausgewählt"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Voicemail (%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone ist ein VoIP-Client kompatibel zu SIP und IAX2."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Über SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Voicemail"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Neuer Anruf"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Einen neuen Anruf tätigen"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Abnehmen"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Auf den Anruf antworten"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Den Anruf beenden"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "in _Warteschleife"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Den Anruf in die Warteschleife setzen"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "zurück zum Wartenden"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Den Anruf aus der Warteschleife nehmen"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "_Nachricht senden"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Nachricht senden"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Konfigurations-Assistent"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Konfigurations-Assistenten starten"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Die Sprachbox anrufen"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Schließen"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "In den Infobereich minimieren"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Das Programm beenden"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "K_opieren"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "E_infügen"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfügen"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Anrufchronik leeren"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Liste beendeter Anrufe leeren"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Konten"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Konten bearbeiten"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "Einstellungen"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Ihre Einstellungen ändern"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Ansicht"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Das Handbuch öffnen"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Informationen zu dieser Anwendung"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "Weiterleiten"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Anruf weiterleiten"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Gespräch aufzeichnen"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Das aktuelle Gespräch aufzeichnen"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "Wer_kzeugleiste"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Die Werkzeugleiste anzeigen"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Wähltastatur"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Die Wähltastatur anzeigen"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "Lautstärke-Regler"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Die Lautstärke-Regler anzeigen"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "Anruf_chronik"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "_Adressbuch"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "Freundesliste"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Freundesliste anzeigen"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "in _Warteschleife"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Zurückrufen"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr "Follow-Status"
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Telefonnummer bearbeiten"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Telefonnummer vor dem Anruf bearbeiten"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/el.po b/gnome/po/el.po
index c39f0707f2824897e5bc94a930048594ed400a3c..5e775bbf50abb69e503ca306602bc3ebeec611ab 100644
--- a/gnome/po/el.po
+++ b/gnome/po/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+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"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: el\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Παράμετροι λογαρισμού"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "Ψευδώνυμο"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "'Αγνωστο"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Εξυπηρετητής παρόχου"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Ονομα χρήστη"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "Συνθηματικό"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Εμφάνιση συνθηματικού"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Αριθμός τηλεφωνητή"
 
@@ -364,7 +364,9 @@ msgid "Advanced"
 msgstr ""
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
 msgstr ""
 
 #: ../src/config/accountlistconfigdialog.c:112
@@ -424,11 +426,6 @@ msgstr ""
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr ""
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -478,142 +475,111 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr ""
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr ""
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr ""
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr ""
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr ""
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr ""
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr ""
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr ""
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr ""
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
 msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr ""
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr ""
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr ""
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr ""
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr ""
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr ""
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr ""
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr ""
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr ""
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr ""
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr ""
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr ""
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr ""
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr ""
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr ""
@@ -812,15 +778,28 @@ msgstr ""
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -830,60 +809,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr ""
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -959,6 +938,20 @@ msgstr ""
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr ""
@@ -980,19 +973,19 @@ msgstr ""
 msgid "Search by outgoing call"
 msgstr ""
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1056,17 +1049,32 @@ msgstr "Επιβεβαίωση Φύγε Καθαρισμός"
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1075,7 +1083,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Κλήση"
 
@@ -1102,6 +1110,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Σφάλμα SFLphone"
@@ -1119,6 +1135,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1151,11 +1172,21 @@ msgstr "Δεν έχετε θέσει λογαριασμούς"
 msgid "You have no registered accounts"
 msgstr "Δεν έχετε κατοχυρομένους λογαριασμούς"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1166,6 +1197,11 @@ msgstr "Ο %s δεν υποστηρίζει ZRTP"
 msgid "ZRTP negotiation failed with %s"
 msgstr "Η ZRTP διαπραγμάτευση απέτυχε με %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1183,8 +1219,8 @@ msgstr "Ενταση μικροφώνου"
 msgid "_Show main window"
 msgstr "Δείξε το βα_σικό παράθυρο"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "Κλείστο _Η"
 
@@ -1192,261 +1228,272 @@ msgstr "Κλείστο _Η"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Κανένα βιβλίο διευθύνσεω δεν έχει επιλεχθεί"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Βιβλίο διευθύνσεων"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 "Το SFLphone ειναι ένα προγραμμα πελάτης VoIP συμβατό με SIP και ΙΑΧ2 "
 "πρωτόκολλα"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Σχετικά με το SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Τηλεφωνητής"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Νέα κλήση"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Κάντε μια νέα κλήση"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "Σήκωστο  _Π"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Σηκώστε το τηλέφωνο"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Κλέιστε το τηλέφωνο"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "Σε α_ναμονή"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Βάλτε την κλήση σε αναμονή"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "Επανα_φορά"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Επαναφέρετε την κλήση σε αναμονή"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Οδηγός Ρυθμίσεων _Α"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Εκτέλεση του οδηγού ρύθμισης"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Κλήση προς τον τηλεφωνητή σας"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Ελαχιστοποίηση στη περιοχή ειδοποιήσεων"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "Έξοδος"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Τερματισμός του προγράμματος"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "Αντέγρα_ψε"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Αντιγραφή της επιλογής"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "Ε_πικόλληση"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Επικόλληση των περιεχομένων του προχείρου (clipboard)"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Καθαρισμός ιστορικού κλ_ησεων"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Καθαρισμός του ιστορικού κλησεων"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "Λογαρι_ασμοί"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Επεξεργασία των λογαριασμών σας"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Αλλαγή των προτιμήσεων σας"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Προβολή"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Βο_ηθεια"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Περιεχόμενα"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Άνοιγμα του εγχειριδίου"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Περί αυτής της εφαρμογής"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "Με_ταφορά"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Μεταφορά της κλήσης"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "Καταγ_ραφή"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Καταγραψτε τη τρέχουσα συνομιλία"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "Εμφάνι_ση γραμμής εργαλείων"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Εμφάνιση της γραμμής εργαλείων"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "Πληκτρολόγιο _δ"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Εμφάνιση του πληκτρολογίου"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "Ένταση ήχων"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Δείξε τις ρυθμίσεις για την ένταση ήχων"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "Ιστορικό _Η"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Βιβλίο διευθύνσεων _Α"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "Κλ_ηση σε αναμονή"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "Κλήση"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Επεξεργσία τηελφωνικού αριθμού"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Επεξεργσία τηελφωνικού αριθμού προ της κλήσης"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/es.po b/gnome/po/es.po
index d8bf908ec1b42fb01fd1221012b212ba1f5ba4c6..e59545c34eb7131e7ef274267b5e843749adb05a 100644
--- a/gnome/po/es.po
+++ b/gnome/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-04-02 03:19+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -123,8 +123,8 @@ msgid "Account Parameters"
 msgstr "Parámetros de cuenta"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Alias"
 
@@ -138,25 +138,25 @@ msgid "Unknown"
 msgstr "Desconocido"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_Nombre de equipo"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "_Usuario"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Contraseña"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Mostrar contraseña"
 
@@ -165,8 +165,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "_Número de buzón de voz"
 
@@ -371,8 +371,10 @@ msgid "Advanced"
 msgstr "Avanzado"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Red"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "General"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -431,11 +433,6 @@ msgstr "Cuentas Configuradas"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "General"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -486,11 +483,11 @@ msgstr "Seleccione la libreta de contactos de Evolution a usar"
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "El asistente ha finalizado"
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -498,135 +495,102 @@ msgstr ""
 "Puede comprobar en cualquier momento su estado de registro o modificar la "
 "configuración de sus cuentas en la ventana de Opciones/Cuentas."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Usuario"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Seguridad: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Ninguno"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Asistente de creación de cuentas"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "¡Bienvenido al asistente de creación de cuentas de SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Este asistente de instalación le ayudará a configurar una cuenta."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protocolos VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Escoja un tipo de cuenta"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Cuenta"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Por favor, elija una de las siguientes opciones"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Crear una cuenta gratuita SIP/IAX2 en sflphone.org \n"
-"(sólo para hacer pruebas)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Registrar una cuenta SIP o IAX2 existente"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Configuración de cuenta SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Por favor, ingrese la siguiente información"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Comunicación segura con _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Dirección de correo opcional"
-
-#: ../src/config/assistant.c:366
-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"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_Correo"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Configuración de cuenta IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Conversión de Dirección de Red (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 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."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "A_ctivar STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_Servidor STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Registro de cuenta"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "¡Enhorabuena!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frecuencia"
@@ -827,15 +791,28 @@ msgstr ""
 "Tenga cuidado: estos accesos directos podrían reemplazar los accesos "
 "directos de todo sistema."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Opciones avanzadas para TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Transporte TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -849,60 +826,60 @@ msgstr ""
 "diferente transporte TLS para cada cuenta. De cualquier forma, cada uno de "
 "ellos usará un puerto dedicado, diferente el uno del otro.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Escuchador TLS global (todas cuentas)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Lista de Certificados de Autoridad"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Escoge un archivo de lista de CA (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Archivo del certificado del par público"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Escoge un certificado de par público (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Escoge un archivo de clave privada"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Contraseña de clave privada"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Método de protocolo TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Lista de cifrado TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Nombre del servidor para la conexión TLS saliente"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Checar certificados entrantes, como un servidor"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Checar certificados de la respuesta, como cliente"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Requiere certificado para conexiones TLS entrantes"
 
@@ -978,6 +955,20 @@ msgstr "Opciones SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Volver a RTP al fallar SDES"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Buscar todos"
@@ -999,19 +990,19 @@ msgstr "Buscar en llamadas entrantes"
 msgid "Search by outgoing call"
 msgstr "Buscar en llamadas salientes"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "Notificación ALSA: Error al abrir dispositivo reproductor de audio"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "Notificación ALSA: Error al abrir dispositivo de entrada"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "Notificación PulseAudio: PulseAudio no esta funcionando"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 "Notificacion de Codecs: no se encuentra un algoritmo para tratar el formato "
@@ -1076,17 +1067,32 @@ msgstr "Confirmar"
 msgid "Confirm"
 msgstr "Confirmar"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr "Error en el campo/variable"
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "Borrar SIP URI"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "Agregar nuevo SIP URI"
 
@@ -1095,7 +1101,7 @@ msgid "Add group"
 msgstr "Agregar Grupo"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Llamar"
 
@@ -1125,6 +1131,14 @@ msgstr ""
 "Ejecuta '%s --help' para ver la lista completa de opciones de línea de "
 "comando disponibles.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Error de SFLphone"
@@ -1142,6 +1156,11 @@ msgstr "- clientes GNOME para SFLPhone"
 msgid "%s says:"
 msgstr "%s dice:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1174,11 +1193,21 @@ msgstr "No tiene configurada ninguna cuenta"
 msgid "You have no registered accounts"
 msgstr "No tiene ninguna cuenta registrada"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1189,6 +1218,11 @@ msgstr "%s no soporta ZRTP"
 msgid "ZRTP negotiation failed with %s"
 msgstr "La negociación ZRTP ha fracasado con %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1206,8 +1240,8 @@ msgstr "Volumen del micrófono"
 msgid "_Show main window"
 msgstr "Mostrar _ventana principal"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Colgar"
 
@@ -1215,259 +1249,270 @@ msgstr "_Colgar"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "No se ha seleccionado ninguna libreta de direcciones"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Libreta de direcciones"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Mensaje de voz(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone es un cliente VoIP compatible con los protocolos SIP e IAX2"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Acerca de SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Mensaje de voz"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Nueva llamada"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Realizar un nuevo llamado"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Descolgar"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Responder la llamada"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Finalizar la llamada"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "En _Espera"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Poner la llamada en espera"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "Seguir"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Sacar la llamada de espera"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Enviar _mensaje"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Asistente de _configuración"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Ejecutar el asistente de configuración"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Llamar a tu correo de voz"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimizar al área de notificación"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Salir del programa"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Copiar la selección"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Pegar el contenido del portapapeles"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "_Limpiar historial"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Limpiar el historial de llamadas"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Cuentas"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Edita sus cuentas"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "Preferencias"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Cambiar sus preferencias"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Ver"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Índice"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Abrir el manual"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Acerca de esta aplicación"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "Transferir"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Transferir la llamada"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "G_rabar"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Grabar la conversación actual"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "_Mostrar barra de herramientas"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Mostrar barra de herramientas"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Teclado"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Mostrar el teclado de marcado"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Controles de volumen"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "_Controles de volumen"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "Historia de Llamada"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Libreta de contactos"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "_Lista de SIP URIs"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Mostrar la lista de SIP URIs"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "En _Espera"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Devolver la llamada"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr "En estado de seguimiento"
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Editar número de teléfono"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Editar el número de teléfono antes de llamar"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/et.po b/gnome/po/et.po
index 316f398920523e48f0592daf721cb9e8d81676d6..4f76e51f0bf9c187cdc722a2857470c2257e4b39 100644
--- a/gnome/po/et.po
+++ b/gnome/po/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-03-09 10:07+0000\n"
 "Last-Translator: Marko Silluste <marko.silluste@hot.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #: ../src/accountlist.c:183
 msgid "Not Registered"
@@ -119,8 +119,8 @@ msgid "Account Parameters"
 msgstr "Konto parameetrid"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Alias"
 
@@ -134,25 +134,25 @@ msgid "Unknown"
 msgstr "Teadmata"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_Hostinimi"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "_Kasutajanimi"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Parool"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Parooli näitamine"
 
@@ -161,8 +161,8 @@ msgid "_Proxy"
 msgstr "_Proksi"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr ""
 
@@ -363,7 +363,9 @@ msgid "Advanced"
 msgstr ""
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
 msgstr ""
 
 #: ../src/config/accountlistconfigdialog.c:112
@@ -423,11 +425,6 @@ msgstr ""
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr ""
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -477,142 +474,111 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr ""
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr ""
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr ""
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr ""
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr ""
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr ""
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr ""
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr ""
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr ""
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
 msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr ""
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr ""
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr ""
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr ""
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr ""
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr ""
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr ""
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr ""
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr ""
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr ""
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr ""
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr ""
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr ""
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr ""
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr ""
@@ -811,15 +777,28 @@ msgstr ""
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -829,60 +808,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr ""
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -958,6 +937,20 @@ msgstr ""
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr ""
@@ -979,19 +972,19 @@ msgstr ""
 msgid "Search by outgoing call"
 msgstr ""
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1050,17 +1043,32 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1069,7 +1077,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr ""
 
@@ -1096,6 +1104,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr ""
@@ -1113,6 +1129,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1145,11 +1166,21 @@ msgstr ""
 msgid "You have no registered accounts"
 msgstr ""
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1160,6 +1191,11 @@ msgstr ""
 msgid "ZRTP negotiation failed with %s"
 msgstr ""
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1177,8 +1213,8 @@ msgstr ""
 msgid "_Show main window"
 msgstr ""
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr ""
 
@@ -1186,259 +1222,270 @@ msgstr ""
 msgid "SFLphone"
 msgstr ""
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr ""
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr ""
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr ""
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr ""
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr ""
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr ""
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr ""
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr ""
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr ""
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr ""
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr ""
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr ""
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr ""
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr ""
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr ""
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr ""
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr ""
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr ""
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr ""
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr ""
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr ""
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr ""
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr ""
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr ""
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr ""
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr ""
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr ""
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr ""
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr ""
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr ""
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr ""
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr ""
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr ""
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/fa.po b/gnome/po/fa.po
index 6ef99645ddfb097325cc6afe9681c2dc73d7f0d1..422b151c7865e6127a3ae7ad597ec5275246726e 100644
--- a/gnome/po/fa.po
+++ b/gnome/po/fa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-01-08 17:44+0000\n"
 "Last-Translator: Mahtab Ghamsari <mahtab.ghamsari@savoirfairelinux.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"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "پارامتر های حساب"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "ـاسم مستعار"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "_ناشناخته"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "نام _میزبان"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "نام _کاربری"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_گذر‌واژه"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "نمایش _گذرواژه"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "_پیشکار(پراکسی)"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "شماره پست صوتی"
 
@@ -366,8 +366,10 @@ msgid "Advanced"
 msgstr "پیشرفته"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "شبکه"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "همگانی"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "پیکربندی حساب ها"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "همگانی"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -482,11 +479,11 @@ msgstr "کتاب نشانی مورد نظر را انتخاب کنید"
 msgid "Name"
 msgstr "نام"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "کار دستیار به پایان رسید"
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -494,134 +491,101 @@ msgstr ""
 "در هر لحظه با استفاده از پنجره اختیارات-حسابها می توانید چگونگی  ثبت نام خود "
 "را بررسی کرده و یا  پارامترهای حساب خود را تغییر دهید"
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "نام مستعار"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "سرور"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "نام کاربری"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "امنیت "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "هیچکدام"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "راهنمای ساخت حساب جدید"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "به بخش ساخت حساب در  SFLphone خوش آمدید"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "این راهنمای نسب به شما در پیکربندی حساب کمک خواهد کرد"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "پروتکل های VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "نوع حساب خود را انتخاب کنید"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP - Session Initiation Protocol"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "حساب کاربری"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "لطفا یکی از گزینه های زیر را انتخاب کنید"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"در وبسایت sflphone.org یک حساب SIP/IAX2 رایگان باز کنید\n"
-"(فقط به منظور تست)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "ثبت نام حساب SIP یا  IAX2"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "تنظیمات حساب SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "لطفا اطلاعات زیر را ارائه کنید"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "ارتباط مطمئن از طریق _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "آدرس ایمیل اختیاری"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "از این آدرس ایمیل برای ارسال پیغام های اتوماتیک استفاده می شود"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "ُآدرس _ایمیل"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "تنظیمات حساب IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "ترجمه آدرس های شبکه (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "اگر از دیوار آتش استفاده می کنید این گزینه را فعال کنید"
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "فعال کردن STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "سرور _STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "ثبت حساب"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "آفرین!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "بسامد"
@@ -821,15 +785,28 @@ msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 "توجه کنید:‌ این میانبرها ممکن است میانبرهای سیستم شما را جایگزین کنند"
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "گزینه های پیشرفته برای TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "انتقال با TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -843,60 +820,60 @@ msgstr ""
 "برای هر حساب می توانید یک  TLS جدا تعریف کنید! هر کدام روی یک پورت جدا دایر "
 "خواهند بود.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "شنونده TLS کلی"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "لیست گواهی های اختیارات"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "انتخاب فایل برای لیست CA"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "فایل گواهی نامه"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "گواهی نامه عمومی نقطه پایانی انتخاب کنید"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "فایل شامل کلید خصوصی را انتخاب کنید"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "برای کلید خصوصی خود رمز انتخاب کنید"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "متد پروتوکل TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "لیست حروف رمزی TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "نام مورد سرور برای ارتباط خروجی TLS"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "بررسی گواهی نامه های ورودی ( از سرور)"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "بررسی لیست گواهی ها با استفاده از پاسخ های  نرم افزار"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "درخواست گواهی نامه برای تماسهای ورودی TLS"
 
@@ -972,6 +949,20 @@ msgstr "گزینه های SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "استفاده از RTP در صورت اشکال در SDES"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "جستجو کلی"
@@ -993,19 +984,19 @@ msgstr "جستجو با استفاده از تماس های ورودی"
 msgid "Search by outgoing call"
 msgstr "جستجو با استفاده از تماس های خروجی"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "اخطار :‌ اشکال در باز شدن دستگاه بازنواخت"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "اخطارهای ALSA :‌ خطا در باز شدن دستگاه گیرنده"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "اطلاعیه های پالس آدیو:‌ پالس آدیو در حال کار نیست"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "اخطار کدک:‌ کدک پیدا نشد"
 
@@ -1068,17 +1059,32 @@ msgstr "تایید پاک کردن"
 msgid "Confirm"
 msgstr "تأیید"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "حذف دوست"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "اضافه کردن دوست"
 
@@ -1087,7 +1093,7 @@ msgid "Add group"
 msgstr "افزودن گروه"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "تماس"
 
@@ -1116,6 +1122,14 @@ msgstr ""
 "%s\n"
 "برای نمایش تمام گزینه‌های موجود خط فرمان «%s --help» را اجرا کنید.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "خطا در SFLPhone"
@@ -1133,6 +1147,11 @@ msgstr "نرم افزار GNOME  برای SFLPhone"
 msgid "%s says:"
 msgstr "%s می گوید"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1165,11 +1184,21 @@ msgstr "شما حساب کاربری ندارید"
 msgid "You have no registered accounts"
 msgstr "شما حساب ثبت شده با ما ندارید"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1180,6 +1209,11 @@ msgstr "%s با ZRTP  سازگار نیست"
 msgid "ZRTP negotiation failed with %s"
 msgstr "مذاکرات ZRTP با %s موفق نبودند"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1197,8 +1231,8 @@ msgstr "درجه صدای میکروفن"
 msgid "_Show main window"
 msgstr "نمایش پنجره اضلی"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "ـپایان تماس"
 
@@ -1206,259 +1240,270 @@ msgstr "ـپایان تماس"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "هیچ کتاب نشانی انتخاب نشده است"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "دفتر آدرس"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "پیغام گیر %i"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone یک سیستم VoIP است سازگار با پروتکل های  SIP و  IAX2"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "درباره SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "پیغام گیر"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_تماس جدید"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "تماس جدید"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "جواب"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "جواب بدهید"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "اتمام تماس"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "در انتظار"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "تماس را  در انتظارقرار ده"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "اتمام انتظار"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "تماس را از انتظار بردار"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "پیغام را بفرستید"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "ارسال پیغام"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "دستیار پیکربندی"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "دستیار پیکربندی را بکار اندازید"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "با پیغام گیر خود تماس گیرید"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_خروج"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "کوچک کردن در حد تری"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_ترک"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "ترک برنامه"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_ويرايش"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_کپی"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "کپی انتخواب شده ها"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "_چسباندن"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "چسباندن محتویات تخته گیره"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "پاک کردن تاریخچه"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "تاریخچه تماس ها را  پاک کنید"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_ تاریخچه"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "حساب‌ خود را تنظیم کنید"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_ترجیحات"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "ترجیحات خود را تغییر دهید"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_نما"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_راهنما"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "فهرست مطالب"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "باز کردن روش کار"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "درباره این برنامه"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "انتقال"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "انتقال تماس"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_ضبط"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "ضبط گفتگو فعلی"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "نشان دادن نوار ابزار"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "نوار ابزار را نشان ده"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_شماره‌گیر"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "نشان دادن صفحه مدرج"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "کنترل صدا"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "کنترل صدا را نشان ده"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_تاریخچه"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "کتاب تلفن و نشانی"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "لیست دوستان"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "نمایش لیست دوستان"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "در انتظار"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "تماس"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "ویرایش شماره تلفن"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "شماره تلفن را پیش از تماس تغییر دهید"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/fr.po b/gnome/po/fr.po
index 33e2eb280ed8da3d09710fb816aae77180fa9fd0..f93a1158f818106c1a7a3490b9624c0d090a90f4 100644
--- a/gnome/po/fr.po
+++ b/gnome/po/fr.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-03-24 14:56+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"
-"X-Launchpad-Export-Date: 2014-04-06 06:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -122,8 +122,8 @@ msgid "Account Parameters"
 msgstr "Paramètres du Compte"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "A_lias"
 
@@ -137,25 +137,25 @@ msgid "Unknown"
 msgstr "Inconnu"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_Serveur"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Usa_ger"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Mot de passe"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Afficher le mot de passe"
 
@@ -164,8 +164,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "_Boite vocale #"
 
@@ -370,8 +370,10 @@ msgid "Advanced"
 msgstr "Avancé"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Réseau"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Général"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -430,11 +432,6 @@ msgstr "Comptes Configurés"
 msgid "You have no active accounts"
 msgstr "Vous n'avez pas de comptes actifs"
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Général"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -484,11 +481,11 @@ msgstr "Sélectionnez les carnets d'adresses d'Evolution à utiliser"
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Cet assistant est maintenant terminé."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -496,136 +493,103 @@ msgstr ""
 "Vous pouvez à tout moment vérifier votre état d'enregistrement ou modifier "
 "les paramètres de vos comptes dans la fenêtre Options/Comptes."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Sécurité: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Assistant de création de compte de SFLphone"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Bienvenue dans l'assistant de création de compte de SFLphone !"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Cet assistant vous guidera dans la configuration d'un compte."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protocoles VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Sélectionnez un type de compte"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Compte"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Veuillez sélectionner une des options suivantes"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Créer un compte SIP/IAX2 gratuit sur sflphone.org\n"
-"(à des fins de tests seulement)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Enregistrer un compte SIP ou IAX2 existant"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Paramètres de compte SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Veuillez remplir les champs suivants"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Communications sécurisées avec _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Adresse courriel optionnelle"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "Vos messages vocaux seront envoyés par courriel à cette adresse."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "A_dresse courriel"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Paramètres de compte IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 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."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "A_ctiver STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "S_erveur STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Enregistrement du compte"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Félicitations!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Fréquence"
@@ -825,15 +789,28 @@ msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 "Soyez prudent; ces raccourcis peuvent entrer en conflit avec ceux du système."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Options avancées TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Transport TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -847,60 +824,60 @@ msgstr ""
 "TLS différent pour chaque compte. Cependant, chacun écoutera sur un port "
 "différent.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Port TLS global (pour tous les comptes)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Liste des autorités de certification"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Choisir une liste d'AC (optionnel)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Fichier de certificats de l'extrémité public"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Sélectionner le certificat de l'extrémité public"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Choisir une clé privée (optionnel)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Mot de passe pour la clé privée"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Méthode pour TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Liste de cryptogramme TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Instance du serveur pour les connections TLS sortantes"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "En tant que serveur, vérifier les certificats entrants"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "En tant que client, vérifier les certificats dans les réponses"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Exiger un certificat pour les connexions TLS entrantes"
 
@@ -976,6 +953,20 @@ msgstr "Options SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Recourrir à RTP si SDES échoue"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Rechercher dans tous"
@@ -997,21 +988,21 @@ msgstr "Rechercher dans les appels entrants"
 msgid "Search by outgoing call"
 msgstr "Rechercher dans les appels sortants"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 "Notification ALSA: Erreur lors de l'ouverture du périphérique de lecture"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 "Notification ALSA: Erreur lors de l'ouverture du périphérique de capture"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "Notification Pulseaudio: Pulseaudio n'est pas lancé"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "Notification de codes: Codec non trouvé"
 
@@ -1074,17 +1065,32 @@ msgstr "Confirmer Communication en clair"
 msgid "Confirm"
 msgstr "Confirmer"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr "Erreur de champs"
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "Supprimer l'URI SIP"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "Ajouter une nouvelle URI SIP"
 
@@ -1093,7 +1099,7 @@ msgid "Add group"
 msgstr "Ajouter un groupe"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Actions"
 
@@ -1123,6 +1129,14 @@ msgstr ""
 "Exécutez « %s --help » pour voir une liste complète des options "
 "disponibles.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Erreur SFLphone"
@@ -1140,6 +1154,11 @@ msgstr "- Client Gnome pour SFLphone"
 msgid "%s says:"
 msgstr "%s dit:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1172,11 +1191,21 @@ msgstr "Vous n'avez pas configuré de compte"
 msgid "You have no registered accounts"
 msgstr "Vous n'avez aucun compte enregistré"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1187,6 +1216,11 @@ msgstr "%s ne supporte pas ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "La négociation ZRTP avec %s a échoué"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1204,8 +1238,8 @@ msgstr "Volume du micro"
 msgid "_Show main window"
 msgstr "_Afficher la fenêtre principale"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Raccrocher"
 
@@ -1213,260 +1247,271 @@ msgstr "_Raccrocher"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Aucun carnet d'adresses sélectionné"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Boite vocale(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 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."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "A propos de SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Boite vocale"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Nouvel appel"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Appeler"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Décrocher"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Répondre à l'appel"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Terminer l'appel"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "Mettre en attente"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Mettre l'appel en attente"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "Reprendre"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Reprendre l'appel"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Envoyer un _message"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Envoyer le message."
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "_Assistant de configuration"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Lancer l'assistant de configuration"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Appeler la boite vocale"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimiser dans la barre des tâches"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Quitter le programme"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Editer"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Copier"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Copier la sélection"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "C_oller"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Coller le contenu du presse-papiers"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Effacer l'_historique"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Effacer l'historique"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "Co_mptes"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Éditer les comptes"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "Préférences"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Modifier les préférences"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "A_ffichage"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "A_ide"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Sommaire"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Ouvrir le manuel"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "À propos de cette application"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "Transférer"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Transférer à :"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "Enregistrer"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Enregistrer la conversation courante"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "Afficher la _barre d'outil"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Afficher la barre d'outil"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Clavier"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Afficher le clavier"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "Contrôle du _volume"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Afficher les controles du volume"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "Historique"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr "Historique des appels"
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Carnet d'adresses"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "Liste d'URI SIP"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Afficher la liste d'URI SIP"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "_Mettre en attente"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr "Sources vidéo"
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Rappeler"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr "Suivre le statut"
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Éditer le numéro"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Éditer le numéro de téléphone avant d'appeler"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/hu.po b/gnome/po/hu.po
index 03169b91ebb61cbdb29bfb80e4ddf77e63d2b20e..abf5468d3758f0055b3b665b5c6d96cdcf541fb3 100644
--- a/gnome/po/hu.po
+++ b/gnome/po/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-11-15 08:38+0000\n"
 "Last-Translator: Balazs Radak <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: hu\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Fiók paraméterek"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "Alias"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Ismeretlen"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_Hoszt név"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "_Felhasználói név"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Jelszó"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Jelszó megjelenítése"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "_Hangposta hívószáma"
 
@@ -364,8 +364,10 @@ msgid "Advanced"
 msgstr "Haladó"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Hálózat"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Általános"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -424,11 +426,6 @@ msgstr "Beállított Fiókok"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Általános"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -478,11 +475,11 @@ msgstr "Válaassza ki, melyik Címjegyzéket kívánja használni"
 msgid "Name"
 msgstr "Név"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Beállítóasszisztens vége."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -490,134 +487,101 @@ msgstr ""
 "Bármikor ellenőrizheti a Fiókja állapotát, vagy módosíthatja annak "
 "paramétereit az Szerkesztés / Fiókok menüpont alatt."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Szerver"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Biztonság "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr ""
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Egyik sem"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFLphone - Fiók létrehozása varázsló"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Üdvözöljük a  Fiók létrehozása varázslóban"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Ez a varázsló segít a Fiók beállításában"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP Protokollok"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Válasszon Fiók típust"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Fiók"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Kérem, válasszon egyet az alábbi lehetősegek közül"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Ingyenes SIP/IAX2 fiók létrehozása az sflphone.org-on\n"
-"(Csak tesztelési célra)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Meglévő SIP vagy IAX2 Fiók beállítása"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "SIP Fiók beállítások"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Kérem, adja meg a következő adatokat"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Biztonságos kommunikáció _ZRTP-val"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Opcionális e-mail cím"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "Erre az E-mail címre érkeznek majd a hangposta üzenetei."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_E-mail cím"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "IAX2 Fiók beállításai"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Hálózati Címfordítás (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Amennyiben tűzfal mögött van, valószílűeg engedélyeznie kell."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "STUN engedélyezése"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_STUN szerver"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Fiók Regisztráció"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Gratulálunk!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frekvencia"
@@ -818,15 +782,28 @@ msgstr ""
 "Figyelem : az egyes  gyorsbillentyűk felülbírálhatják a Rendszer "
 "alapértelmezett gyorbillentyű beállításait."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Haladó opciók a TLS-hez"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS átvitel"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -836,60 +813,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Válassz egy CA lista fájlt (opcionálic)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Publikus végpont tanúsítvány"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Válassz egy publikus végpont tanúsítványt (opcionális)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Válassz egy privát kulcsot (opcionális)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Privát kulcs jelszava"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "TLS protokoll eljárás"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "TLS chiper lista"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "A szerver neve kimenő TLS kapcsolatoknál"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Bejövő tanúsítványok ellenőrzése, mint szerver"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "H ívás tanúsítványok ellenőrzése, mint kliens"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Tanúsítvány megkövetelése bejövő tls kapcsolatokhoz"
 
@@ -965,6 +942,20 @@ msgstr "SDES Opciók"
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Keresés az összesben"
@@ -986,19 +977,19 @@ msgstr "Keresés a Bejövő hívások között"
 msgid "Search by outgoing call"
 msgstr "Keresés kimenő hívás szerint"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "ALSA üzenet: Hiba a hangeszköz megnyitásakor"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "ALSA üzenet: Hiba a felvevő eszköz megnyitásakor"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "Pulseaudio üzenet: nem fut a Pulseaudio"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "Kodek üzenet: nem található kodek"
 
@@ -1059,17 +1050,32 @@ msgstr ""
 msgid "Confirm"
 msgstr "Megerősít"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1078,7 +1084,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Hívás"
 
@@ -1108,6 +1114,14 @@ msgstr ""
 "Adja ki a(z) „%s --help” parancsot az elérhető parancssori kapcsolók teljes "
 "listájáért.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone Hiba"
@@ -1125,6 +1139,11 @@ msgstr ""
 msgid "%s says:"
 msgstr "%s szerint:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1157,11 +1176,21 @@ msgstr "Nics beállított Fiók"
 msgid "You have no registered accounts"
 msgstr "nincs regisztrált Fiók"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1172,6 +1201,11 @@ msgstr "%s nem támogatja a ZRTP-t."
 msgid "ZRTP negotiation failed with %s"
 msgstr "ZRTP csatlakozási hiba %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1189,8 +1223,8 @@ msgstr "Mikrofon hangereje"
 msgid "_Show main window"
 msgstr "_Főablak megjelenítése"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Vonal bontása"
 
@@ -1198,259 +1232,270 @@ msgstr "_Vonal bontása"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Nincs kiválasztva Címjegyzék"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Címjegyzék"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Hangposta(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "Az SFLphone egy SIP és IAX2 kompatibilis VoIP kliens."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Az SFLphone-ról"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Hangposta"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Új hívás"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Új hívás kezdeményezése"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Felvesz"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Hívás fogadása"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Hívás befejezése"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "Tartás"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Hívás tartásba tétele"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "Hívás visszavétele"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Hívás visszavétele"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Beállítóasszisztens"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "A beállítóasszisztens futtatása"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Hangposta hívása"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Bezár"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Tálcára helyezés"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Kilépés a programból"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Szerkesztés"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Másolás"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Kijelölés másolása"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "A vágólap tartalmának beillesztése"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Előzmények törlése"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Híváselőzmények törlése"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Fiókok"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Felhasználói fiókok szerkesztése"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Beállítások"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Beállítások megváltoztatása"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Nézet"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Tartalom"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "A kézikönyv megnyitása"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Az alkalmazás névjegye"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Átadás"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "A hívás átadása"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Felvétel"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "A jelenlegi hívás rögzítése"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "Látszódjon az eszköztár"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Látszódjon az eszköztár"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "Tárcsázó"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Tárcsázó megjelenítése"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Hangerőszabályzó"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Hangerőszabályzó megjelenítése"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Előzmények"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "_Névjegyzék"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "_Buddy lista"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Buddy lista megjelenítése"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "Tartásban"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Visszahívás"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Telefonszám szerkesztése"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Telefonszám hívás előtti szerkesztése"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/it.po b/gnome/po/it.po
index 9d721dce0dcb93dca89b5fda4b42adc8f41727ca..2d9ee3a6e90c3e6c18dec9f22f049744e4ab7837 100644
--- a/gnome/po/it.po
+++ b/gnome/po/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <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"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Parametri account"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Pseudonimo"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Sconosciuto"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Nome _host"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Nome _utente"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Password"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Password"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Numero segreteria telefonica"
 
@@ -368,8 +368,10 @@ msgid "Advanced"
 msgstr "Avanzate"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Rete"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Generale"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "Account configurati"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Generale"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -482,11 +479,11 @@ msgstr "Selezionare la rubrica di Evolution da usare"
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "La procedura guidata è terminata."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -494,135 +491,101 @@ msgstr ""
 "Puoi verificare in ogni momento il tuo stato di registrazione o modificare i "
 "parametri dei tuoi account nella finestra Opzioni/Account."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Pseudonimo"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Nome utente"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Sicurezza: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Nessuno"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Wizard creazione account di SFLphone"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
 msgstr ""
-"Benvenuti alla procedura guidata per la creazione di un account SFLphone"
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Questa procedura permetterà di configurare un account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protocolli VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Selezionare un tipo di account"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Account"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Scegliere una delle seguenti opzioni"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Registrare un account SIP o IAX2 esistente"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Impostazioni account SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Per favore inserisci le seguenti informazioni"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Comunicazioni sicure con _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Indirizzo email opzionale"
-
-#: ../src/config/assistant.c:366
-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."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "Indirizzo _email"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Impostazioni account IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Dovrebbe essere abilitato se ci si trova dietro ad un firewall."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "Abilita STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "Server STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Registrazione account"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Congratulazioni!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frequenza"
@@ -822,15 +785,28 @@ msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 "Attenzione: queste scorciatoie potrebbero sovrascrivere quelle di sistema."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Opzioni avanzate per TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Trasporto TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -844,60 +820,60 @@ msgstr ""
 "trasporto TLS differente per ogni account. Comunque, ognuno di\n"
 "questi girerà su una porta dedicata, differente l'una dall'altra\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Listener TLS globale (tutti gli account)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Lista Autorità di Certificazione"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Selezione il file delle CA (opzionale)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "File del certificato endpoint pubblico"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Seleziona un certificato per l'endpoint pubblico (opzionale)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Seleziona un file con la chiave privata (opzionale)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Password per la chiave privata"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Metodo protocollo TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Lista cifrature TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Nome istanza server per le connessioni TLS in uscita"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Verifica i certificati in ingresso, come server"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Verifica certificati dalla risposta, come client"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Richiedi certificato per le connessioni TLS in ingresso"
 
@@ -973,6 +949,20 @@ msgstr "Opzioni SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Torna in RTP se SDES fallisce"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Cerca tra tutte le chiamate"
@@ -994,19 +984,19 @@ msgstr "Cerca tra le chiamate ricevute"
 msgid "Search by outgoing call"
 msgstr "Cerca tra le chiamate effettuate"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1070,17 +1060,32 @@ msgstr "Conferma Go Clear"
 msgid "Confirm"
 msgstr "Conferma"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1089,7 +1094,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "_Chiama"
 
@@ -1116,6 +1121,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Errore SFLphone"
@@ -1133,6 +1146,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1165,11 +1183,21 @@ msgstr "Nessun account configurato"
 msgid "You have no registered accounts"
 msgstr "Nessun account registrato"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1180,6 +1208,11 @@ msgstr "%s non supporta ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "Negoziazione ZRTP fallita con %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1197,8 +1230,8 @@ msgstr "Volume microfono"
 msgid "_Show main window"
 msgstr "Mostra la finestra principale"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Chiudi"
 
@@ -1206,259 +1239,270 @@ msgstr "_Chiudi"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Rubrica"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Rubrica"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone è un client VoIP compatibile con i protocolli SIP e IAX2."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Informazioni su SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Segreteria telefonica"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "Chiama"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Effettua una nuova chiamata"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "Rispondi"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Rispondi alla chiamata"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Termina la chiamata"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "Attesa"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Metti in attesa la chiamata"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "_Metti in attesa"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Metti la chiamata in attesa"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "_Assistente di Configurazione"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Errore di configurazione STUN"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "%d messaggio vocale"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimizza nel tray"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Esce dal programma"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Copia"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Elimina l'account selezionato"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Incolla dagli appunti"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Cancella la cronologia"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Cancella la cronologia"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Account"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Account attivo"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "Preferen_ze"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Modifica le preferenze"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Visualizza"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Contenuti"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Apri il manuale"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Informazioni su SFLphone"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Inoltra"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Inoltra a:"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Registra"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Regista la conversazione in corso"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "_Mostra barra"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Mostra barra"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "Mostra tastiera"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Mostra la tastiera"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "Mostra i controlli del volume"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Mostra i controlli del volume"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "Cronologia"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Rubrica"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "Attesa"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Richiama"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Modifica numero di telefono"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Modifica numero di telefono prima di chiamare"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/ja.po b/gnome/po/ja.po
index d80a39067824251d6fec459ed9061aa067463dbb..ea26673f5a237ec91bb9e1aaeb4ff93f9ee4529e 100644
--- a/gnome/po/ja.po
+++ b/gnome/po/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\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"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: ja\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "アカウント・パラメーター"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "エイリアス(_A)"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Unknown"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "ホスト名(_H)"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "ユーザー名(_U)"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "パスワード(_P)"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "パスワードを表示"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "プロキシ(_P)"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "ボイスメール番号(_V)"
 
@@ -364,8 +364,10 @@ msgid "Advanced"
 msgstr "詳細設定"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "ネットワーク"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "全般"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -424,11 +426,6 @@ msgstr "設定済みアカウント"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "全般"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -478,144 +475,111 @@ msgstr "使用する Evolution address books の選択"
 msgid "Name"
 msgstr "名前"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "このアシスタントは完了しました。"
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr "登録状況の確認及びオプション/アカウントウィンドウからのアカウント設定の変更はいつでも可能です。"
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "エイリアス"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "サーバー"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "セキュリティ: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "None"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFLphone アカウント作成ウィザード"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "SFLphone アカウント作成ウィザードへようこそ!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "このインストールウィザードはアカウント作成を手助けします"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP プロトコル"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "アカウントタイプの選択"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "アカウント"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "次のオプションのうちの1つを選択してください"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"sflphone.org でフリーなSIP/IAX2 アカウントを作成\n"
-"(テスト目的の為のみ)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "既存の SIP 又は IAX2 アカウントを登録"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "SIP アカウント設定"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "情報を入力して下さい"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "ZRTP で保護された通信(_Z)"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "任意のメールアドレス"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "このメールアドレスはボイスメールメッセージの送信に使用されます"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "Eメールアドレス(_E)"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "IAX2 アカウント設定"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "ネットワークアドレス変換 (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "You should probably enable this if you are behind a firewall."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "STUN を有効(_E)"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "STUN サーバー(_S)"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "アカウント登録"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "コングラチュレーション!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "周波数"
@@ -814,15 +778,28 @@ msgstr "Address Book"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "TLS 詳細オプション"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -832,60 +809,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr ""
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -961,6 +938,20 @@ msgstr "SDES オプション"
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "すべて検索"
@@ -982,19 +973,19 @@ msgstr "受話の検索"
 msgid "Search by outgoing call"
 msgstr "発信の検索"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1053,17 +1044,32 @@ msgstr ""
 msgid "Confirm"
 msgstr "確認"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1072,7 +1078,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "発信"
 
@@ -1099,6 +1105,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone エラー"
@@ -1116,6 +1130,11 @@ msgstr ""
 msgid "%s says:"
 msgstr "%s のコメント:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1148,11 +1167,21 @@ msgstr "アカウントが設定されていません"
 msgid "You have no registered accounts"
 msgstr "アカウント登録されていません"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1163,6 +1192,11 @@ msgstr "%s は ZRTP をサポートしていません"
 msgid "ZRTP negotiation failed with %s"
 msgstr "%s のZRTP negotiation 失敗"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1180,8 +1214,8 @@ msgstr "マイク音量"
 msgid "_Show main window"
 msgstr "メインウィンドウを表示(_S)"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "通話を切る(_H)"
 
@@ -1189,259 +1223,270 @@ msgstr "通話を切る(_H)"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "address book が未選択です"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr ""
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "ボイスメール(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone は SIP と IAX2 プロトコルに互換性があるVoIPクライアントです"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "SFLphone について"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "ボイスメール"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "新規に発信(_N)"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "新規に発信"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr ""
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "応答"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "通話を終了"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "保留(_n)"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "保留中"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "保留解除(_f)"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "保留を解除"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "メッセージを送信(_m)"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "メッセージを送信します"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "設定アシスタント(_A)"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "設定アシスタントを起動します"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "ボイスメールに発信"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "システムトレイに最小化する"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "プログラムを終了します"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "選択範囲をコピーします"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "クリップボードへ貼り付けます"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "履歴消去(_h)"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "通話履歴を消去"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "アカウント(_A)"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "アカウントを編集します"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "設定(_P)"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "設定を変更します"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "表示(_V)"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "コンテンツ"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "手動で開く"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "このアプリケーションについて"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "転送(_T)"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "通話転送"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "録音(_R)"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "現在の会話を録音します"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "ツールバーの表示(_S)"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "ツールバーを表示します"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "ダイアルパッド(_D)"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "ダイヤルパッドを表示します"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "音量調節(_V)"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "音量を調節します"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "履歴(_H)"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "アドレスブック(_A)"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "保留(_H)"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "折り返し電話(_C)"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "電話番号の編集"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "通話する前に電話番号を編集します"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/ko.po b/gnome/po/ko.po
index 11c8e3223dbd7541d18ba0fbf9e821d65a29a9bc..954025efa94a50e35c6746e1b9fdf07d28b813d7 100644
--- a/gnome/po/ko.po
+++ b/gnome/po/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: ko\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "계정 매개 변수"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "별칭(_A)"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "알 수 없음"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "호스트 이름(_H)"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "사용자 이름(_U)"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "암호(_P)"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "암호 보기"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "음성메일 번호(_V)"
 
@@ -366,8 +366,10 @@ msgid "Advanced"
 msgstr "고급 설정"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "네트워크"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "일반"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -426,11 +428,6 @@ msgstr "계정을 설정했습니다"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "일반"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -480,142 +477,111 @@ msgstr "에볼류션 주소록 사용하여 선택"
 msgid "Name"
 msgstr "이름"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "지원자는 현재 종료되었습니다."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr "등록 상황을 확인하거나 옵션/계정 창에서 계정 매개 변수를 변경합니다."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "별명"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "서버"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "사용자 이름"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "보안: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP 초안"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "없음"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFL폰 계정 만들기 마법사"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "SFL폰 계정 만들기 마법사에 오신걸 환영합니다!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "이 설치 마법사는 계정 생성을 돕습니다"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP 프로토콜"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "계정 유형 선택"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (세션 초기화 프로토콜)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (별표 변환)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "계정"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "옵션에 따라서 1개를 선택"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "SIP 또는 IAX2 계정이 등록되어 있습니다"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "SIP 계정 설정"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "정보를 입력하세요."
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "ZRTP 보안으로 보호된 통신(_Z)"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "임의의 이메일 주소"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "이 이메일 주소는 음성메일 메시지로 보내집니다"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "이메일 주소(_E)"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "IAX2 계정 설정"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "네트워크 주소 변환 (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "방화벽을 하고 있으면 연결할 수 있습니다"
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "STUN 가능(_N)"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "STUN 서버(_S)"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "계정 등록"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "축하합니다!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "주파수"
@@ -814,15 +780,28 @@ msgstr "주소록"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr "주의: 이 단축키는 시스템-전체의 단축키를 무시할 수 있습니다."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "TLS의 고급설정"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS 전송"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -836,60 +815,60 @@ msgstr ""
 "각각의 계정에서 TLS 전송을 확인합니다.\n"
 "그러면 각각 전용 포트, 다른 한개에 수행할 수 있습니다.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "글로벌 TLS를 수신기 (모든 계정)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "인증 기관 목록"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "CA 목록 파일 선택 (임의의)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "공공의 끝점 인증서 파일"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "공공의 끝점 인증서 파일을 선택 (임의의)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "개인 키 파일 선택(임의의)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "개인키를 위한 암호"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "TLS 프로토콜 방법"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "TLS 암호화 목록"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "TLS 연결 발신 서버 네임 인스턴스"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "서버에서 인증서 수신 확인"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "클라이언트에서 응답 증명서 확인"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "수신 tls 연결에 대한 인증 요청"
 
@@ -965,6 +944,20 @@ msgstr "SDES 설정"
 msgid "Fallback on RTP on SDES failure"
 msgstr "RTP에 SDES 대체 실패"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "전체 검색"
@@ -986,19 +979,19 @@ msgstr "수신 통화 검색"
 msgid "Search by outgoing call"
 msgstr "발신 통화 검색"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1059,17 +1052,32 @@ msgstr "삭제를 확인하십시오."
 msgid "Confirm"
 msgstr "확인"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1078,7 +1086,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "호출"
 
@@ -1105,6 +1113,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone 오류"
@@ -1122,6 +1138,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1154,11 +1175,21 @@ msgstr "계정이 설정되지 않았습니다"
 msgid "You have no registered accounts"
 msgstr "계정이 등록되어 있지 않습니다"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1169,6 +1200,11 @@ msgstr "%s ZRTP를 지원하지 않습니다."
 msgid "ZRTP negotiation failed with %s"
 msgstr "ZRTP 협상 %s에서 실패했습니다."
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1186,8 +1222,8 @@ msgstr "마이크 볼륨"
 msgid "_Show main window"
 msgstr "메인 창 보기(_S)"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "통화 끊기(_H)"
 
@@ -1195,259 +1231,270 @@ msgstr "통화 끊기(_H)"
 msgid "SFLphone"
 msgstr "SFL폰"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "주소록이 선택되어 있지 않습니다"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "주소록"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFL폰은 VoIP클라이언트와 SIP, IAX2 프로토콜과 호환 가능합니다."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "SFL폰 정보"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "음성 메일"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "새 통화(_N)"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "새로 호출합니다"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "선택(_P)"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "호출 응답"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "호출 끝내기"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "보류(_N)"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "호출을 보류합니다"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "보류 해제(_F)"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "보류를 해제합니다."
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "설정 도우미(_A)"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "설정 도우미를 실행합니다"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "음성 전화를 합니다."
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "닫기(_C)"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "시스템 트레이에 최소화"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "끝내기(_Q)"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "프로그램을 끝냅니다"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "복사(_C)"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "선택한 사항을 복사합니다"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "붙여넣기(_P)"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "클립보드의 내용을 붙여넣습니다"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "기록 지우기(_H)"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "호출 기록을 지웁니다"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "계정(_A)"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "계정을 편집합니다"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "기본 설정(_P)"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "기본 설정을 바꿉니다"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "보기(_V)"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "차례"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "설명서를 엽니다"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "이 프로그램 정보"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "전송(_T)"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "호출 전송"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "녹음(_R)"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "현재 대화를 녹음합니다"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "도구모음 표시(_S)"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "도구모음 표시합니다"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "다이얼패드(_D)"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "숫자키패드 표시"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "볼륨 조정(_V)"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "볼륨 조정을 표시 합니다"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "기록(_H)"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "주소록(_A)"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "보류(_H)"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "다시 호출(_C)"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "폰  번호 편집"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "전화를 하기 전에 전화 번호를 편집합니다"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/nl.po b/gnome/po/nl.po
index 341d3bbe7ae26f26a3e2953396299fed7afc2472..1f74c5e2a9e279cd442c2a2a53858781c7374290 100644
--- a/gnome/po/nl.po
+++ b/gnome/po/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-03 20:56+0000\n"
 "Last-Translator: Jan Middelkoop <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"
-"X-Launchpad-Export-Date: 2014-04-06 06:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Account opties"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Alias"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Onbekend"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_Server naam"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "_Gebruikersnaam"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Wachtwoord"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Wachtwoord weergeven"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "_Voicemail nummer"
 
@@ -368,8 +368,10 @@ msgid "Advanced"
 msgstr "Geavanceerd"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Netwerk"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Algemeen"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "Ingestelde accounts"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Algemeen"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -482,11 +479,11 @@ msgstr "Selecteer de te gebruiken Evolution adresboeken"
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "De assistent is nu klaar."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -494,136 +491,102 @@ msgstr ""
 "De status van een account of de account instellingen kunnen altijd "
 "opgevraagd en gewijzigd worden in het Opties/Accounts scherm."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Beveiliging: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP Zimmermann concept"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Geen"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFLphone wizard account aanmaken"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Welkom bij de account aanmaken wizard van SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Deze installatiewizard helpt met het aanmaken van een account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP protocollen"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Kies een type account"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Sessie Initiatie Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Account"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Selecteer één van de volgende opties"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Maak een gratis SIP/IAX2 account bij sflphone.org\n"
-"(alleen om te testen)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Registreer een bestaande SIP of IAX2 account"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "SIP account instellingen"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Vul de volgende velden in"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Beveiligde communicatie met _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Optioneel e-mail adres"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-"Dit e-mail adres wordt gebruikt voor het versturen van voicemail berichten."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_E-mail adres"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "IAX2 account instellingen"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Netwerkadres maskering (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 "Dit moet waarschijnlijk aan staan als de verbinding via een router loopt."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "STUN _inschakelen"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_STUN server"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Account registratie"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Gefeliciteerd!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frequentie"
@@ -824,15 +787,28 @@ msgstr ""
 "Waarschuwing: deze sneltoesten overschrijven mogelijk andere globale "
 "sneltoetsen van het systeem."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Geavanceerde opties voor TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS verkeer"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -846,60 +822,60 @@ msgstr ""
 "kunnen verschillen TLS instellingen opgegeven worden. Echter,\n"
 "elke account zal wel een eigen poort nodig hebben.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Globale TLS poort (voor alle accounts)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Certificaat van authoriteit lijst"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Kies een CA lijst bestand (optioneel)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Public eindpunt certificaat bestand"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Kies een public eindpunt certificaat (optioneel)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Kies een privé sleutel bestand (optioneel)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Wachtwoord voor de privé sleutel"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "TLS protocol methode"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "TLS cipher lijst"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Server naam instantie voor uitgaande TLS verbindingen"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Controleer inkomende certificaten, wanneer server"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Controleer certificaat antwoorden, wanneer client"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Eis een certificaat voor inkomende TLS verbindingen"
 
@@ -975,6 +951,20 @@ msgstr "SDES opties"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Terugvallen op RTP bij SDES fout"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Alles doorzoeken"
@@ -996,19 +986,19 @@ msgstr "Zoek op inkomende oproepen"
 msgid "Search by outgoing call"
 msgstr "Zoek op uitgaande oproepen"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "ALSA bericht: fout bij openen afspeelapparaat"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "ALSA bericht: fout bij openen opname apparaat"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "PulseAudio bericht: applicatie is niet gestart"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "Codec bericht: codec niet gevonden"
 
@@ -1072,17 +1062,32 @@ msgstr "Bevestigen Ga Wissen"
 msgid "Confirm"
 msgstr "Bevestigen"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1091,7 +1096,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Oproep"
 
@@ -1120,6 +1125,14 @@ msgstr ""
 "%s\n"
 "Voer ‘%s --help’ uit voor een lijst van beschikbare opties.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone fout"
@@ -1137,6 +1150,11 @@ msgstr "- GNOME client voor SFLphone"
 msgid "%s says:"
 msgstr "%s zegt:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1169,11 +1187,21 @@ msgstr "Er zijn geen accounts geconfigureerd"
 msgid "You have no registered accounts"
 msgstr "Er zijn geen accounts geregistreerd"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1184,6 +1212,11 @@ msgstr "%s ondersteunt geen ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "ZRTP onderhandeling mislukt met %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1201,8 +1234,8 @@ msgstr "Microfoon volume"
 msgid "_Show main window"
 msgstr "_Weergeven"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Ophangen"
 
@@ -1210,260 +1243,271 @@ msgstr "_Ophangen"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Geen adresboek geselecteerd"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Adresboek"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Voicemail(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 "SFLphone is een VoIP telefoon compatibel met SIP en IAX2 protocollen."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Over SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Voicemail"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Nieuwe oproep"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Nieuwe oproep beginnen"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Opnemen"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Oproep beantwoorden"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Oproep beëindigen"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "_In wacht"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Plaats de oproep in de wacht"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "_Uit wacht"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Haal de oproep uit de wacht"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Verstuur _bericht"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Verstuur bericht"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Configuratie _assistent"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Start de configuratie assistent"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Bel je voicemail"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimaliseren naar systeemvak"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Dit programma afsluiten"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Bewerken"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Kopieer selectie"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Plakken van klembord"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "_Wis geschiedenis"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Wis gesprek geschiedenis"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Bewerken"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Voorkeuren instellen"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Weergeven"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Inhoud"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Open de handleiding"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Over deze software"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Doorverbinden"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Gesprek doorverbinden"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Opnemen"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Het huidige gesprek opnemen"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "_Taakbalk weergeven"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Geef de taakbalk weer"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Nummerblok"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Geef het nummerblok weer"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Volume instellingen"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Geeft de volume instellingen weer"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "_Adresboek"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "Vriendenlijst"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Vriendlijst weergeven"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "In de _wacht"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Terugbellen"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Telefoonnummer bewerken"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Telefoonnummer bewerken voor het bellen"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/oc.po b/gnome/po/oc.po
index 95aca757e87392f2bc92aaefdb06eb8eb21dd18b..f0ee7884f1b3dfc56bcc2ab25e8cd022a85e83ae 100644
--- a/gnome/po/oc.po
+++ b/gnome/po/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-15 18:09+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Paramètres del Compte"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Aliàs"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Desconegut"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_Servidor"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Usat_gièr"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Senhal"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Afichar lo senhal"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "_Bóstia vocala #"
 
@@ -364,8 +364,10 @@ msgid "Advanced"
 msgstr "Avançat"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Ret"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "General"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -424,11 +426,6 @@ msgstr "Comptes Configurats"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "General"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -478,142 +475,111 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr ""
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr ""
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Aliàs"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Nom d'utilizaire"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Seguretat : "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Pas cap"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
 msgstr ""
 
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr ""
-
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protocòls VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr ""
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Compte"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr ""
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Enregistrar un compte SIP o IAX2 existent"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Paramètres de compte SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr ""
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Comunicacions securizadas amb _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Adreça electronica opcionala"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "A_dreça de corrièr electronic"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Paramètres de compte IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "A_ctivar STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "S_ervidor STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Enregistrament del compte"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Òsca !"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frequéncia"
@@ -812,15 +778,28 @@ msgstr "Quasernet d'adreças"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Opcions avançadas TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Transpòrt TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -830,60 +809,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Causir una clau privada (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Senhal per la clau privada"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Metòde per TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Lista de criptograma TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Instància del servidor per las connexions TLS sortentas"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "En tant que servidor, verificar los certificats entrants"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "En tant que client, verificar los certificats dins las responsas"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Exigir un certificat per las connexions TLS entrantas"
 
@@ -959,6 +938,20 @@ msgstr "Opcions SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr ""
@@ -980,19 +973,19 @@ msgstr ""
 msgid "Search by outgoing call"
 msgstr ""
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1051,17 +1044,32 @@ msgstr ""
 msgid "Confirm"
 msgstr "Confirmar"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1070,7 +1078,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Sonar"
 
@@ -1100,6 +1108,14 @@ msgstr ""
 "Aviatz « %s --help » per veire la lista completa de las opcions en linha de "
 "comanda disponiblas.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Error SFLphone"
@@ -1117,6 +1133,11 @@ msgstr "- Client Gnome per SFLphone"
 msgid "%s says:"
 msgstr "%s ditz:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1149,11 +1170,21 @@ msgstr ""
 msgid "You have no registered accounts"
 msgstr ""
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1164,6 +1195,11 @@ msgstr ""
 msgid "ZRTP negotiation failed with %s"
 msgstr ""
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1181,8 +1217,8 @@ msgstr ""
 msgid "_Show main window"
 msgstr ""
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr ""
 
@@ -1190,259 +1226,270 @@ msgstr ""
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr ""
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Quasernet d'adreças"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "A prepaus de SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Messatjariá Vocala"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr ""
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Efectuar una sonada novèla"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr ""
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Acabar la sonada"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "Metre en espèra"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr ""
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Mandar un messatge"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "_Assistent de configuracion"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Aviar l'assistent de configuracion"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Tampar"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Quitar"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Quitar lo programa"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Copiar la seleccion"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "Em_pegar"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Empegar lo contengut del quichapapièr"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr ""
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr ""
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Modificar vòstres comptes"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Preferéncias"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Modificar vòstras preferéncias"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Afichatge"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Ensenhador"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Dobrir lo manual"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "A prepaus d'aquesta aplicacion"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Transferir"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Transferir a :"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "En_registrar"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Aficha la barra d'aisinas"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Istoric"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr ""
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr ""
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Editar lo numèro"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/pl.po b/gnome/po/pl.po
index 409f8ec8f97857a2d54f8dceff3446cc6b4cdc84..948488c0a413ee6d395f609dedfae7e2b1f09223 100644
--- a/gnome/po/pl.po
+++ b/gnome/po/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-01-14 17:44+0000\n"
 "Last-Translator: Łukasz Cieliński <lukasc@mp.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: pl\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr ""
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr ""
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Nieznany"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr ""
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr ""
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Hasło:"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Pokaż hasło"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr ""
 
@@ -364,8 +364,10 @@ msgid "Advanced"
 msgstr "Zaawansowane"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Sieć"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Ogólne"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -424,11 +426,6 @@ msgstr "Zdefiniowane konta"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Ogólne"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -478,144 +475,111 @@ msgstr ""
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr ""
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr ""
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Bezpieczeństwo: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Brak"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Przewodnik tworzenia konta SFLphone"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Witaj w przewodniku tworzenia konta SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Ten przewodnik instalacyjny pomoże ci skonfigurować konto."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protokoły VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Wybierz typ konta"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Konto"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Wybierz jedną z zaproponowanych opcji"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Utwórz darmowe konto SIP/IAX2 na sflphone.org \n"
-"(Tylko w celach testowych)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Zarejestruj do istniejącego konta SIP lub IAX2"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Ustawienia konta SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Podaj wymagane informacje"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Bezpieczna komunikacja z _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Opcjonalny adres e-mail"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "Ten adres email będzie używany do przesyłania powiadomień głosowych."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "Adres _e-mail"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Ustawienia konta IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Włącz tę opcję jeśli jesteś za zaporą sieciową."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "W_łącz STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "Serwer _STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Rejestracja konta"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Gratulacje!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Częstotliwość"
@@ -814,15 +778,28 @@ msgstr "Książka adresowa"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -832,60 +809,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Wybierz plik klucza prywatnego"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Hasło klucza prywatnego"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -961,6 +938,20 @@ msgstr ""
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr ""
@@ -982,19 +973,19 @@ msgstr ""
 msgid "Search by outgoing call"
 msgstr ""
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1053,17 +1044,32 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1072,7 +1078,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr ""
 
@@ -1099,6 +1105,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "błąd programu SFLphon"
@@ -1116,6 +1130,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1148,11 +1167,21 @@ msgstr ""
 msgid "You have no registered accounts"
 msgstr ""
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1163,6 +1192,11 @@ msgstr ""
 msgid "ZRTP negotiation failed with %s"
 msgstr ""
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1180,8 +1214,8 @@ msgstr ""
 msgid "_Show main window"
 msgstr ""
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Rozłącz"
 
@@ -1189,259 +1223,270 @@ msgstr "_Rozłącz"
 msgid "SFLphone"
 msgstr "SFLphone - telefon VoIP"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr ""
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr ""
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr ""
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr ""
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr ""
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr ""
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr ""
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr ""
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr ""
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "%d głosowa wiadomość"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr ""
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr ""
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr ""
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr ""
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr ""
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr ""
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr ""
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr ""
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr ""
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr ""
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Brak zarejestrowanych kont"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr ""
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr ""
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr ""
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr ""
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr ""
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr ""
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr ""
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr ""
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr ""
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr ""
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr ""
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr ""
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr ""
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/pt.po b/gnome/po/pt.po
index ba5d947d0a5e8ac9c999ef06b5f3cb5ded0fefd5..c3034deceef355ccb02605f318a5b9f90819b5b7 100644
--- a/gnome/po/pt.po
+++ b/gnome/po/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:38+0000\n"
 "Last-Translator: Emmanuel Milou <emmanuel.milou@savoirfairelinux.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"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr ""
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Nomear"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Desconhecido"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr ""
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr ""
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Senha"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Senha"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr ""
 
@@ -364,8 +364,10 @@ msgid "Advanced"
 msgstr "Avançado"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Rede"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Geral"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -424,11 +426,6 @@ msgstr ""
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Geral"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -478,142 +475,111 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr ""
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr ""
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Nome Alternativo"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Utilizador"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr ""
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr ""
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr ""
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
 msgstr ""
 
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr ""
-
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protocolos VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr ""
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Conta"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr ""
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr ""
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr ""
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Endereço de email opcional"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr ""
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr ""
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_Servidor STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr ""
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Parabéns!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frequência"
@@ -812,15 +778,28 @@ msgstr "Livro de Endereços"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -830,60 +809,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr ""
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -959,6 +938,20 @@ msgstr ""
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr ""
@@ -980,19 +973,19 @@ msgstr ""
 msgid "Search by outgoing call"
 msgstr ""
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1051,17 +1044,32 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1070,7 +1078,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "_Chamar"
 
@@ -1097,6 +1105,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr ""
@@ -1114,6 +1130,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1146,11 +1167,21 @@ msgstr ""
 msgid "You have no registered accounts"
 msgstr ""
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1161,6 +1192,11 @@ msgstr ""
 msgid "ZRTP negotiation failed with %s"
 msgstr ""
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1178,8 +1214,8 @@ msgstr ""
 msgid "_Show main window"
 msgstr ""
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Desligar"
 
@@ -1187,259 +1223,270 @@ msgstr "_Desligar"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Livro de endereços"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Livro de endereços"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr ""
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Correio de voz"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr ""
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr ""
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr ""
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr ""
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr ""
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr ""
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr ""
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Editar"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr ""
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr ""
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Remover a conta seleccionada"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr ""
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Histórico de chamadas"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Histórico de chamadas"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Contas"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr ""
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "Preferências"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr ""
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Ver"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr ""
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr ""
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr ""
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "Transferir"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Transferir"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Gravar"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "Marca_dor"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "Histórico"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Livro de endereços"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr ""
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr ""
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr ""
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/pt_BR.po b/gnome/po/pt_BR.po
index 4bdfbd83fe17a3eb0df760e7e6636d455442c362..371380f1f85ce17e8470767c5f772a238e6f5757 100644
--- a/gnome/po/pt_BR.po
+++ b/gnome/po/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-03-29 17:56+0000\n"
 "Last-Translator: Habner Costa <habner@outlook.com>\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"
-"X-Launchpad-Export-Date: 2014-04-06 06:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: pt_BR\n"
 
 #: ../src/config/accountlistconfigdialog.c:638
@@ -125,8 +125,8 @@ msgid "Account Parameters"
 msgstr "Dados da conta"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Apelido"
 
@@ -140,25 +140,25 @@ msgid "Unknown"
 msgstr "Desconhecido"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Servidor"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Usuário"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Senha"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Mostrar senha"
 
@@ -167,8 +167,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "_Número da caixa postal"
 
@@ -373,8 +373,10 @@ msgid "Advanced"
 msgstr "Avançado"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Rede"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Geral"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "Contas configuradas"
 msgid "You have no active accounts"
 msgstr "Nenhuma conta ativa"
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Geral"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -482,11 +479,11 @@ msgstr "Selecione qual catálogo de endereços do Evolution deseja utilizar"
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Este assistente está finalizado."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -494,137 +491,102 @@ msgstr ""
 "Você pode a qualquer momento checar seu estado de registro ou modificar seus "
 "parâmetros de conta na janela Opções/Contas."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Apelido"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Segurança: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP rascunho-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Assistente de criação de contas do SFLphone"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Bem vindo ao assistente de criação de contas do SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Este assistente de instalação irá lhe ajudar a configurar uma conta."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Protocolos VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Selecione um tipo de conta"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Conta"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Por favor, selecione uma das seguintes opções"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Criar uma conta gratuita SIP/IAX2 em sflphone.org \n"
-"(apenas para fins de teste)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Registrar uma conta SIP ou IAX2 existente"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Configurações de conta SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Por favor, preencha as informações a seguir"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Comunicações seguras com _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Endereço de e-mail opcional"
-
-#: ../src/config/assistant.c:366
-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."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_Endereço de email"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Configurações de conta IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 "Você pode ter de habilitar esta opção caso esteja detras de um firewall."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "Ha_bilitar STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_Servidor STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Registro de conta"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Parabéns!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frequência"
@@ -825,15 +787,28 @@ msgstr ""
 "Tenha cuidado: estes atalhos podem predominar sobre atalhos definidos "
 "globalmente."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Opções avançadas para o TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Transporte TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -849,60 +824,60 @@ msgstr ""
 "funcionar em uma\n"
 "porta dedicada, uma diferente da outra\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Listener global de TLS (todas as contas)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Certificado da lista de Autoridades"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Escolha um arquivo de lista CA (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Arquivo certificado endpoint público"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Escolha um certificado endpoint público (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Escolha um arquivo de chave privada (opcional)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Senha para a chave privada"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Método do protocolo TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Lista de cifras TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Instância de nome do servidor para saída da conexão TLS"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr "Limite para negociação (segundos)"
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Verificar os certificados de entrada, como um servidor"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Verificar certificados de resposta, como um cliente"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Requer certificado para conexões tls entrantes"
 
@@ -978,6 +953,20 @@ msgstr "Opções do SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Voltar para RTP se SDES falhar"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Buscar todos"
@@ -999,19 +988,19 @@ msgstr "Buscar por chamadas recebidas"
 msgid "Search by outgoing call"
 msgstr "Buscar por chamadas feitas"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "Notificação ALSA: Erro ao abrir dispositivo de reprodução"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "Notificação ALSA: Erro ao abrir dispositivo de captura"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "Notificação Pulseaudio: Pulseaudio está parado"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "Notificação Codecs: Codecs não encontrado"
 
@@ -1074,17 +1063,32 @@ msgstr "Confirmar Vá Limpar"
 msgid "Confirm"
 msgstr "Confirmar"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr "Erro no campo"
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "Remover contato"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "Adicionar novo contato"
 
@@ -1093,7 +1097,7 @@ msgid "Add group"
 msgstr "Adicionar grupo"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Chamar"
 
@@ -1123,6 +1127,14 @@ msgstr ""
 "Execute \"%s --help\" para ver uma lista completa das opções de linha de "
 "comando.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Erro no SFLphone"
@@ -1140,6 +1152,11 @@ msgstr "Cliente GNOME para o SFLPhone"
 msgid "%s says:"
 msgstr "%s diz:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1172,11 +1189,21 @@ msgstr "Você não tem contas configuradas"
 msgid "You have no registered accounts"
 msgstr "Você não tem contas registradas"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr "<i>Com:</i> %s \n"
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1187,6 +1214,11 @@ msgstr "%s não suporta ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "Negociação ZRTP falhou com %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1204,8 +1236,8 @@ msgstr "Volume do microfone"
 msgid "_Show main window"
 msgstr "_Mostrar janela principal"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Desligar"
 
@@ -1213,259 +1245,270 @@ msgstr "_Desligar"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Nenhum catálogo de endereços selecionado"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Correio de voz(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 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."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Sobre o SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Correio de voz"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Nova chamada"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Faz uma nova chamada"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Atender"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Responder a chamada"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Terminar a chamada"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "Em _Espera"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Colocar a chamada em espera"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "Sair _da espera"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Encerrar a chamada em espera"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Enviar _mensagem"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr "Compartilhar tela"
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Assistente de configuração"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Executa o assistente de configuração"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Chamar seu correio de voz"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimizar para a área de notificação"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Sair do programa"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Copiar a seleção"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "_Colar"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Colar o conteúdo da Área de Transferência"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Limpar _histórico"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Limpar histórico de chamadas"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Contas"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Editar suas contas"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Modificar suas preferências"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Exibir"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Conteúdo"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Abrir o manual"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Sobre este aplicativo"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Transferir"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Transferir a chamada"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Gravar"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Gravar a conversação atual"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "_Exibir barra de ferramentas"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Mostra a barra de ferramentas"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Teclado"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Exibir o teclado"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Controles de Volume"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Exibir controles de volume"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr "Histórico de chamadas"
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Catálogo de endereços"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "_Lista de contatos"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Exibir lista de contatos"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "Em _Espera"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr "Origem de vídeo"
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Ligar de volta"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr "Acompanhar status"
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Editar número de telefone"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Edite o número de telefone antes de fazer uma ligação"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/ru.po b/gnome/po/ru.po
index e2c7548c151e1cc7a6ae22ff87501ebb8655c784..bb461f38afb8256d56b0b1d58a657c4e74e66e29 100644
--- a/gnome/po/ru.po
+++ b/gnome/po/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-01-09 21:07+0000\n"
 "Last-Translator: Marat Gubaidullin <marat.gubaidullin@gmail.com>\n"
 "Language-Team: Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:38+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/config/accountlistconfigdialog.c:638
@@ -125,8 +125,8 @@ msgid "Account Parameters"
 msgstr "Параметры учетной записи"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "_Псевдоним"
 
@@ -140,25 +140,25 @@ msgid "Unknown"
 msgstr "Неизвестный"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Имя или IP-адрес _сервера"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Имя пользователя"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "Па_роль"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Показать пароль"
 
@@ -167,8 +167,8 @@ msgid "_Proxy"
 msgstr "_Прокси сервер"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Номер _голосовой почты"
 
@@ -373,8 +373,10 @@ msgid "Advanced"
 msgstr "Дополнительно"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Сеть"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Общие настройки"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "Настройка аккаунтов"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Общие настройки"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -482,11 +479,11 @@ msgstr "Выбрать адресную книгу Evolution:"
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Мастер закончил настройку."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -494,137 +491,102 @@ msgstr ""
 "Вы можете в любое время проверить статус регистрации или изменить параметры  "
 "ваших аккаунтов в меню Правка / Аккаунты."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Псевдоним"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Шифрование: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Нет"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Мастер создания аккаунта SFLphone"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Добро пожаловать в мастер создания аккаунта SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Этот мастер установки поможет вам настроить ваш аккаунт."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP-протоколы"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Выберите тип аккаунта"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Аккаунт"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Выберите одну из следующих возможностей"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Создать бесплатный SIP/IAX2 аккаунт на sflphone.org\n"
-"(Только в тестовых целях)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Использовать существующий SIP или IAX2 аккаунт"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Настройка SIP-аккаунта"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Введите пожалуйста следующие данные"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Защищëнная связь с _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "e-mail"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-"Этот электронный адрес будет использоваться для отправки сообщений голосовой "
-"почты"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_Адрес эл. почты"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Настройка IAX2-аккаунта"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 "Возможно нужно выбрать эту опцию если вы находитесь за сетевым экраном."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "Включить STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_STUN-сервер"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Регистрация аккаунта"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Поздравляем!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Частота"
@@ -823,15 +785,28 @@ msgstr "Адресная книга"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr "ВНИМАНИЕ: эти комбинации могут заменить системные комбинации клавиш"
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Дополнительные настройки для TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Транспорт TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -845,60 +820,60 @@ msgstr ""
 "каждого аккаунта (но каждый из них будет использовать свой выделенный "
 "порт).\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Global TLS listener (для всех аккаунтов)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Список центров сертификации"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Выберите файл Центра сертификации (необязательно)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Файл с публичным сертификатом"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Выберите публичный сертификат (необязательно)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Выберите файл с приватным ключом (необязательно)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Пароль для приватного ключа"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Метод протокола TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Список шифров TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Имя сервера для исходящих TLS-подключений"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Проверять входящие сертификаты как сервер"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Проверять входящие сертификаты как клиент"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Требовать сертификат для входящих TLS-подключений"
 
@@ -974,6 +949,20 @@ msgstr "Настройка SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Использовать RTP при сбое SDES"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Искать все"
@@ -995,19 +984,19 @@ msgstr "Поиск в входящих вызовах"
 msgid "Search by outgoing call"
 msgstr "Поиск в исходящих вызовах"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "Сообщение ALSA: Ошибка запуска проигрывателя"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "Сообщение ALSA: Ошибка запуска  устройства захвата"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "Сообщение Pulseaudio: Pulseaudio не запущено"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "Сообщение Codecs: Codecs не найден"
 
@@ -1071,17 +1060,32 @@ msgstr "Подтвердить переход на незашифрованну
 msgid "Confirm"
 msgstr "Подтвердить"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr "Oшибка в поле"
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "Удалить собеседника"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "Добавить нового собеседника"
 
@@ -1090,7 +1094,7 @@ msgid "Add group"
 msgstr "Добавить группу"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "_Вызов"
 
@@ -1119,6 +1123,14 @@ msgstr ""
 "%s\n"
 "Запустите '%s --help', чтобы увидеть полный список доступных команд.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Ошибка SFLphone."
@@ -1136,6 +1148,11 @@ msgstr "Клиент GNOME для SFLPhone"
 msgid "%s says:"
 msgstr "%s сказал:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1168,11 +1185,21 @@ msgstr "У вас нет настроенных учетных записей"
 msgid "You have no registered accounts"
 msgstr "У вас нет зарегистрированных учетных записей"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1183,6 +1210,11 @@ msgstr "%s не поддерживает ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "Обмен информации ZRTP не удался (%s)"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1200,8 +1232,8 @@ msgstr "Чувствительность микрофона"
 msgid "_Show main window"
 msgstr "_Показать главное окно"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Положить трубку"
 
@@ -1209,259 +1241,270 @@ msgstr "_Положить трубку"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Адресная книга не выбрана"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Адресная книга"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Голосовое сообщение(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone - SIP и IAX2-совместимый VoIP-клиент"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "О программе SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Голосовая почта"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Новый вызов"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Сделать новый вызов"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Взять трубку"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Ответить на вызов"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Завершить вызов"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "_Удерживать вызов"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Поставить вызов на удержание"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "_Снять вызов с удержания"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Поставить вызов на удержание"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Отправить _сообщение"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Мастер настройки"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Запустить мастер настройки"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Прослушивание голосовой почты"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Свернуть в трей"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "В_ыход"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Выйти из программы"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Копировать выделенное"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "В_ставить"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Вставить из буфера обмена"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Очистить журнал"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Очистить журнал вызовов"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Аккаунты"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Нстройка аккаунта"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Изменить ваши настройки"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Вид"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Помощь"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Содержание"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Открыть руководство пользователя"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "О программе"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "Переадресация вызова"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Переадресовать вызов"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Запись"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Записать текущий разговор"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "Показать _панель инструментов"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Показывать панель инструментов"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Номеронабиратель"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Показывать _номеронабиратель"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "Настройки _громкости"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Показывать настройки _громкости"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "Журнал вызовов"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "Адресная книга"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "Список собеседников"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Показать список собеседников"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "_Удерживать звонок"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "Обратный вызов"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr "Следить за статусом"
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Изменить номер телефона"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Изменить номер телефона перед вызовом"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/sr.po b/gnome/po/sr.po
index 0bce3572aa08b17bc0ddb12302156c999e53777c..520428ea7425d91c7f05c005b7bd561609932451 100644
--- a/gnome/po/sr.po
+++ b/gnome/po/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Ubuntu Serbian Translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: sr\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Подешавања налога"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "Н_адимак"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Непознат(о)"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Име домаћина"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Корисничко име"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "Лозинка"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Прикажи лозинку"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "_Посредник"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Број говорне поште"
 
@@ -368,8 +368,10 @@ msgid "Advanced"
 msgstr "Напредно"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Мрежа"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Опште"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "Подешени налози"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Опште"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -482,11 +479,11 @@ msgstr "Изаберите које именике из Еволуције ће
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "То је то. СФЛ-телефон је подешен."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -494,134 +491,101 @@ msgstr ""
 "Можете у било ком тренутку проверити стање регистрације или изменити ваше "
 "налоге у прозорчету Поставке/Налози."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Псеудоним"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Корисничко име"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Безбедност: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "СРТП/ЗРТП draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Ништа"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "СФЛ-телефон помоћник за прављење налога"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Добро дошли у испомоћ СФЛ-телефона"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Ова испомоћ ће вам олакшати подешавање налога."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "ВоИП протоколи"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Изаберите врсту налога"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "СИП (Session Inititation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "ИА-Икс2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Налог"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Изаберите једну од понуђених могућности"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"Направите бесплатни СИП/ИА-Икс2 налог на sflphone.org\n"
-"(Само у пробне сврхе)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Региструјте постојећи СИП или ИА-Икс2 налог"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Подешавања СИП налога"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Упишите следеће податке"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Безбедне везе са ЗРТП-ом"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Необавезна е-адреса"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "Ова е-адреса ће бити коришћена за слање ваших говорних порука."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "Е-адреса"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "ИА-Икс2 подешавања налоаг"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Превођење мрежних адреса (НАТ)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Требало би омогућити ово уколико сте иза заштитног зида."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "Укључи СТУН"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "СТУН сервер"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Регистрација налога"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Свака част!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Учестаност"
@@ -820,15 +784,28 @@ msgstr "Именик"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr "Пажња! Ове пречице могу прегазити системске пречице."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Напредне поставке за ТЛС"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "ТЛС пренос"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -842,60 +819,60 @@ msgstr ""
 "ТЛС пренос за сваки налог појединачно. Имајте на уму да ће сваки од њих\n"
 "бити покренут на другачијем, посебно намењеном порту.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Општи ТЛС прислушкивач (сви налози)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Сертификат или списак издавача уверења"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Изабери датотеку са списком издавача уверења (необавезно)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Изаберите датотеку личног кључа (по жељи)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Лозинка за лични кључ"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Начин ТЛС протокола"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Списак ТЛС шифрарника"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Име сервера за одлазећу ТЛС везу"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -971,6 +948,20 @@ msgstr "СДЕС (SDES) могућ"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Повратни режим приликом РТП преко СДЕС грешке"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Претражи све"
@@ -992,19 +983,19 @@ msgstr "Претражи по долазним позивима"
 msgid "Search by outgoing call"
 msgstr "Претражи по одлазећим позивима"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1063,17 +1054,32 @@ msgstr "Потврди Го чишћење"
 msgid "Confirm"
 msgstr "Потврди"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1082,7 +1088,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Позови"
 
@@ -1109,6 +1115,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "СФЛ-телефон грешка"
@@ -1126,6 +1140,11 @@ msgstr ""
 msgid "%s says:"
 msgstr "%s каже:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1158,11 +1177,21 @@ msgstr "Немате ниједан постављен налог"
 msgid "You have no registered accounts"
 msgstr "Немате регистрованих налога"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1173,6 +1202,11 @@ msgstr "%s не подржава ЗРТП (ZRTP)."
 msgid "ZRTP negotiation failed with %s"
 msgstr "ЗРТП успостава са %s неуспешна"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1190,8 +1224,8 @@ msgstr "Јачина улаза микрофона"
 msgid "_Show main window"
 msgstr "_Прикажи главни прозор"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Спусти слушалицу"
 
@@ -1199,259 +1233,270 @@ msgstr "_Спусти слушалицу"
 msgid "SFLphone"
 msgstr "СФЛ-фон"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Није изабран именик"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Именик"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Говорна пошта(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "СФЛ-фон је ВоИП клијент који подржава СИП и ИА-Икс2 протоколе."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "О СФЛ-фону"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Говорна пошта"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Нови позив"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Нови позив"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Прихвати"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Прихвати позив"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Прекини позив"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "_На чекању"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Стави позив на чекање"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "Настави позив"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Скини позив са чекања"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Пошаљи поруку"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Пошаљи поруку"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Помоћник"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Покрени помоћника"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Говорна пошта"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "Затвори"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Умањи у системску касету"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Изађи из програма"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Уреди"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "У_множи"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Умножи изабрано"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "Нале_пи"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Налепи из оставе"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Очисти _историјат"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Очисти историјат позива"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Налози"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Уредите ваше налоге"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Поставке"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Промените ваше поставке"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Приказ"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Садржај"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Отвори упутство"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "О програму"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Пребаци"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Пребаци везу"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Снимај"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Снимај тренутни разговор"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "Прикажи алатницу"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Прикажи алатницу"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Бројчаник"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Прикажи бројчаник"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Управљање јачином звука"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Прикажи управљање јачином звука"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Историјат"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "_Именик"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "На _чекању"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Позови поново"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Уреди број телефона"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Уреди број телефона пре позивања"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/sv.po b/gnome/po/sv.po
index 22d4c109b04a72c3d68e99fec9ddfdec75906bb0..b0b9c4c2f6ad460919b3864a0473194210194831 100644
--- a/gnome/po/sv.po
+++ b/gnome/po/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: sv\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Kontoparametrar"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "A_lias"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Okänd"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Vä_rdnamn"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "Använ_darnamn"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Lösenord"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Visa lösenordet"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr ""
 
@@ -368,8 +368,10 @@ msgid "Advanced"
 msgstr "Avancerat"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Nätverk"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Allmänt"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -428,11 +430,6 @@ msgstr "Konfigurerade konton"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Allmänt"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -482,11 +479,11 @@ msgstr "Välj vilka Evolution-adressböcker att använda"
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Denna guide är nu färdig."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -494,135 +491,102 @@ msgstr ""
 "Du kan när som helst kontrollera din registreringsstatus eller ändra "
 "kontoparametrar i fönstret Alternativ/Konton."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Säkerhet: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Guide för att skapa SFLphone-konto"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Välkommen till guiden för att skapa konto för SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Denna installationsguide hjälper dig att konfigurera ett konto."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP-protokoll"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Välj en kontotyp"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Konto"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Välj ett av följande alternativ"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Registrera ett befintligt SIP eller IAX2-konto"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Inställningar för SIP-konto"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Fyll i följande information"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Säker kommunikation med _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Valfri e-postadress"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-"Denna e-postadress kommer att användas för att skicka dig dina "
-"röstmeddelanden."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_E-postadress"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Inställningar för IAX2-konto"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 "Du bör antagligen aktivera detta om du befinner dig bakom en brandvägg."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "Ak_tivera STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_STUN-server"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Kontoregistrering"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Gratulerar!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frekvens"
@@ -821,15 +785,28 @@ msgstr "Adressbok"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr "Var försiktig: dessa genvägar kan åsidosätta systemets genvägar."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Avancerade alternativ för TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS-transport"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -839,60 +816,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Lista över certifikatutfärdare"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Fil för publikt användarcertifikat"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Välj ett publikt användarcertifikat (valfritt)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Välj en privat nyckelfil (valfritt)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Lösenord för den privata nyckeln"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Lista över TLS-skiffer"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Servernamninstans för utgående TLS-anslutning"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Verifiera inkommande certifikat, som en server"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Verifiera certifikat från svar, som en klient"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Kräv certifikat för inkommande TLS-anslutningar"
 
@@ -968,6 +945,20 @@ msgstr "SDES-alternativ"
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Sök i alla"
@@ -989,19 +980,19 @@ msgstr "Sök efter inkommande samtal"
 msgid "Search by outgoing call"
 msgstr "Sök efter utgående samtal"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1062,17 +1053,32 @@ msgstr "Bekräfta okrypterat"
 msgid "Confirm"
 msgstr "Bekräfta"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1081,7 +1087,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Samtal"
 
@@ -1108,6 +1114,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Fel i SFLphone"
@@ -1125,6 +1139,11 @@ msgstr ""
 msgid "%s says:"
 msgstr "%s säger:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1157,11 +1176,21 @@ msgstr "Du har inga konton konfigurerade"
 msgid "You have no registered accounts"
 msgstr "Du har inga registrerade konton"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1172,6 +1201,11 @@ msgstr "%s saknar stöd för ZRTP."
 msgid "ZRTP negotiation failed with %s"
 msgstr "ZRTP-förhandling misslyckades med %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1189,8 +1223,8 @@ msgstr "Mikrofonvolym"
 msgid "_Show main window"
 msgstr "_Visa huvudfönstret"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Lägg på"
 
@@ -1198,259 +1232,270 @@ msgstr "_Lägg på"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Ingen adressbok har valts"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Adressbok"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone är en VoIP-klient kompatibel med SIP och IAX2-protokollen."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Om SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Röstbrevlåda"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Nytt samtal"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Ring ett nytt samtal"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "Sva_ra"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Lyft på luren"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Lägg på"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "Par_kera"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Parkera samtalet"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "F_ortsätt samtal"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Fortsätt ett parkerat samtal"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Skicka _meddelande"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Konfigurations_guide"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Kör konfigurationsguiden"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Ring din röstbrevlåda"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "S_täng"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Minimera till aktivitetsfältet"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Avsluta programmet"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Kopiera markeringen"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "Klistra i_n"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Klistra in urklipp"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "Töm _historik"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Töm samtalshistoriken"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "K_onton"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Redigera dina konton"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Ändra dina inställningar"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Visa"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Innehåll"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Öppna handboken"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Om programmet"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Koppla vidare"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Koppla vidare samtalet"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "Spela _in"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Spela in aktuellt samtal"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "_Visa verktygsrad"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Visa verktygsraden"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "Knappsa_ts"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Visa knappsats"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "Volym_kontroller"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Visa volymkontroller"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Historik"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "_Adressbok"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "_Parkerat"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "Ring _tillbaka"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Redigera telefonnummer"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Redigera telefonnumret innan du ringer"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/te.po b/gnome/po/te.po
index 69c9fb619dc687d3701fe526220091e7660bf73e..20dac50e951b8765d091862d2757d7808b4a1b38 100644
--- a/gnome/po/te.po
+++ b/gnome/po/te.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: te\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "ఖాతా పరామితులు"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "మారుపేరు (_A)"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr ""
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr ""
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr ""
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "సంకేతపదం (_P)"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "సంకేతపదాన్ని చూపించు"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr ""
 
@@ -364,8 +364,10 @@ msgid "Advanced"
 msgstr "ఉన్నత"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr ""
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "సాధారణ"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -424,11 +426,6 @@ msgstr ""
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "సాధారణ"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -478,142 +475,111 @@ msgstr ""
 msgid "Name"
 msgstr "పేరు"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr ""
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr ""
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "మారుపేరు"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "సేవిక"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "వాడుకరిపేరు"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "భద్రత: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr ""
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr ""
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
 msgstr ""
 
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr ""
-
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "ఖాతా రకాన్ని ఎంచుకోండి"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr ""
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr ""
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "ఖాతా"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr ""
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr ""
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr ""
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr ""
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr ""
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr ""
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr ""
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr ""
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "ఖాతా నమోదు"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "అభినందనలు!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "తరచుదనం"
@@ -812,15 +778,28 @@ msgstr ""
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -830,60 +809,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr ""
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -959,6 +938,20 @@ msgstr "SDES ఎంపికలు"
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr ""
@@ -980,19 +973,19 @@ msgstr ""
 msgid "Search by outgoing call"
 msgstr ""
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1051,17 +1044,32 @@ msgstr ""
 msgid "Confirm"
 msgstr "నిర్ధారించు"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1070,7 +1078,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr ""
 
@@ -1097,6 +1105,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr ""
@@ -1114,6 +1130,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1146,11 +1167,21 @@ msgstr ""
 msgid "You have no registered accounts"
 msgstr ""
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1161,6 +1192,11 @@ msgstr ""
 msgid "ZRTP negotiation failed with %s"
 msgstr ""
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1178,8 +1214,8 @@ msgstr ""
 msgid "_Show main window"
 msgstr ""
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr ""
 
@@ -1187,259 +1223,270 @@ msgstr ""
 msgid "SFLphone"
 msgstr ""
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr ""
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr ""
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "SFLphone గురించి"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr ""
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr ""
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr ""
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr ""
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr ""
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr ""
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "మూసివేయి (_C)"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr ""
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr ""
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr ""
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr ""
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr ""
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr ""
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr ""
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr ""
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "ఖాతాలు (_A)"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr ""
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "అభీష్టాలు (_P)"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr ""
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr ""
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "సహాయం (_H)"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr ""
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr ""
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr ""
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr ""
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr ""
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "చరిత్ర (_H)"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr ""
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr ""
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr ""
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/tr.po b/gnome/po/tr.po
index f211a8fc8bdcd0acf836c73142ee9d3a614ca5cd..b0b1f1058558d8d0a7ae67625ecc95e5fb54b18b 100644
--- a/gnome/po/tr.po
+++ b/gnome/po/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <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"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: tr\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Hesap Parametreleri"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "T_akma isim"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Bilinmiyor"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "Sunucu adı"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "_Kullanıcı adı"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "_Parola"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Parolayı göster"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "Sesli posta numarası"
 
@@ -364,8 +364,10 @@ msgid "Advanced"
 msgstr "Gelişmiş"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "Ağ"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "Genel"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -424,11 +426,6 @@ msgstr "Ayarlı Hesaplar"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "Genel"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -478,11 +475,11 @@ msgstr "Kullanılacak Evolution adres defterlerini seç"
 msgid "Name"
 msgstr "İsim"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Bu kılavuz şu an sonlandırılacak."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -490,136 +487,103 @@ msgstr ""
 "İstenildiğinde Ayarlar/Hesaplar penceresinden kayıt durumunuzu yada "
 "hesabınızın parametrelerini düzenleyebilirsiniz."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Rumuz"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Sunucu"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Güvenlik: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFLphone hesap oluşturma sihirbazı"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "SFLphone Hesap oluşturma sihirbazına Hoşgeldiniz!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Bu kurulum sihirbazı bir hesap ayarlamanıza yardımcı olacak."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP Protokolleri"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Bir hesap tipi seçin"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Hesap"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Lütfen aşağıdaki ayarlardan birini seçiniz"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"sflphone.org üzerinden ücretsiz bir SIP/IAX2 hesabı oluştur \n"
-"(Yalnızca deneme amaçlı)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Var olan SIP ya da IAX2 hesabını kaydedin"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "SIP hesap ayarları"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Lütfen aşağıdaki bilgileri doldurunuz."
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "_ZRTP aracılığıyla güvenli iletişim"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "isteğe bağlı e-posta adresi"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "Bu e-posta adresi, sesli mesajlarınızı göndermek için kullanılacak."
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_E-Posta adresi"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "IAX2 hesap ayarları"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 "Bir güvenlik duvarı arkasındaysanız muhtemelen bunu seçili duruma "
 "getireceksiniz."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "STUN aktif"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_STUN sunucusu"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Hesap kaydı"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Tebrikler!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Frekans"
@@ -820,15 +784,28 @@ msgstr ""
 "Dikkat! burada yapacağınız değişiklikler sistem bütününe ait kısayolları "
 "geçersiz kılabilir."
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "TLS için gelişmiş seçenekler"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS nakli"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -838,60 +815,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Küresel TLS dinleyicisi (tüm hesaplar için)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "CA listesi"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Bir yetki belge listesi seçiniz (isteğe bağlı)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Umumi sonlandırma sertifikası"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Bir umumi sonlandırma sertifikası seçiniz (isteğe bağlı)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Bir özel anahtar dosyası seçiniz"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Özel anahtar şifresi"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "TLS iletişim metodu"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "TLS şifreleme listesi"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Giden TLS bağlantısı için sunucu adı örneği"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Gelen belgeleri sunucu olarak doğrula"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Belgeleri yanıtlara göre istemci olarak doğrula"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Gelen TLS bağlantıları için belge iste"
 
@@ -967,6 +944,20 @@ msgstr "SDES Seçenekleri"
 msgid "Fallback on RTP on SDES failure"
 msgstr "SDES hatası durumunda RTP'ye geri çekil"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Tamamında ara"
@@ -988,19 +979,19 @@ msgstr "Gelen aramalarda ara"
 msgid "Search by outgoing call"
 msgstr "Giden aramalarda ara"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1061,17 +1052,32 @@ msgstr ""
 msgid "Confirm"
 msgstr "Onayla"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1080,7 +1086,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Çağrı"
 
@@ -1107,6 +1113,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone Hatası"
@@ -1124,6 +1138,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1156,11 +1175,21 @@ msgstr "Kurulu bir hesabınız bulunmamaktadır"
 msgid "You have no registered accounts"
 msgstr "Kayıtlı hesabınız bulunmamaktadır"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1171,6 +1200,11 @@ msgstr "%s ZRTP'yi desteklememektedir"
 msgid "ZRTP negotiation failed with %s"
 msgstr "%s ile ZRTP görüşmesi başarısız oldu"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1188,8 +1222,8 @@ msgstr "Mikrofon ses ayarı"
 msgid "_Show main window"
 msgstr "Ana pencereyi _Göster"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr ""
 
@@ -1197,259 +1231,270 @@ msgstr ""
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Hiçbir adres defteri seçilmedi"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Adres Defteri"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Sesli posta(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone SIP ve IAX2 protokolleri ile uyumlu bir VoIP istemcisidir."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "SFLphone Hakkında"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Sesli mesaj"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "_Yeni çağrı"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Yeni bir arama yap"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "Ceva_pla"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Aramayı cevapla"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Aramayı sonlandır"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "Beklemede"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Aramayı beklemeye al"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr ""
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "İleti yolla"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "İleti yolla"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Yapılandırma sihirbazını çalıştır"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "_Kapat"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Sistem çubuğuna küçült"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Çık"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Programdan çık"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Seçimi kopyala"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Panoya yapıştır"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "_Geçmişi sil"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Arama geçmişini sil"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "_Hesaplar"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Hesaplarınızı düzenleyin"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "_Tercihler"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Tercihlerinizi değiştirin"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Göster"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "İçerikler"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Kılavuzu aç"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Bu uygulama hakkında"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Transfer"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Aramayı aktar"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "_Kayıt"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Şuanki görüşmeyi kaydet"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "_Araç çubuğunu göster"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Araç çubuğunu göster"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "_Dialpad"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Ses ayarları"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "_Ses ayarlarını göster"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Geçmiş"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "_Adres defteri"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr ""
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Tekrar ara"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Telefon numarasını düzelt"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Arama yapmadan önce telefon numarasını düzelt"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/uz.po b/gnome/po/uz.po
index af6501d402fd63535c7277ff235ee9e4a96025f5..c9b3b849d364a9c9aecbc11e851ba262bc7c68e2 100644
--- a/gnome/po/uz.po
+++ b/gnome/po/uz.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-02-11 01:07+0000\n"
 "Last-Translator: Maxime Turcotte <maxime.turcotte@savoirfairelinux.com>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: uz\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr ""
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr ""
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr ""
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr ""
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr ""
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr ""
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr ""
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr ""
 
@@ -364,7 +364,9 @@ msgid "Advanced"
 msgstr ""
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
 msgstr ""
 
 #: ../src/config/accountlistconfigdialog.c:112
@@ -424,11 +426,6 @@ msgstr ""
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr ""
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -478,142 +475,111 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr ""
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr ""
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr ""
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr ""
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr ""
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr ""
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr ""
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr ""
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr ""
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
 msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
 msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr ""
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr ""
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr ""
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr ""
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr ""
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr ""
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr ""
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr ""
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr ""
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr ""
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr ""
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr ""
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr ""
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr ""
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr ""
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr ""
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr ""
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr ""
@@ -812,15 +778,28 @@ msgstr ""
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -830,60 +809,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr ""
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -959,6 +938,20 @@ msgstr ""
 msgid "Fallback on RTP on SDES failure"
 msgstr ""
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr ""
@@ -980,19 +973,19 @@ msgstr ""
 msgid "Search by outgoing call"
 msgstr ""
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1051,17 +1044,32 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1070,7 +1078,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr ""
 
@@ -1097,6 +1105,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr ""
@@ -1114,6 +1130,11 @@ msgstr ""
 msgid "%s says:"
 msgstr "%s айтди:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1146,11 +1167,21 @@ msgstr "Сиз ҳеч қанақа ҳисоб созламадингиз"
 msgid "You have no registered accounts"
 msgstr "Сизда рўйхатдан ўтган ҳисоб мавжуд эмас"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1161,6 +1192,11 @@ msgstr "%s ZRTP ни қўллаб қувватламайди"
 msgid "ZRTP negotiation failed with %s"
 msgstr ""
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1178,8 +1214,8 @@ msgstr ""
 msgid "_Show main window"
 msgstr ""
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr ""
 
@@ -1187,259 +1223,270 @@ msgstr ""
 msgid "SFLphone"
 msgstr ""
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr ""
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr ""
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr ""
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr ""
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr ""
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr ""
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr ""
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr ""
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr ""
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr ""
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr ""
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr ""
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr ""
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr ""
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr ""
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr ""
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr ""
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr ""
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr ""
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr ""
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr ""
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr ""
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr ""
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr ""
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr ""
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr ""
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr ""
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr ""
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr ""
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr ""
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr ""
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr ""
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr ""
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr ""
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr ""
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr ""
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr ""
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr ""
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr ""
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr ""
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/vi.po b/gnome/po/vi.po
index 55b5f79a64eb9201b3cbb659947907d7e193dbd1..9a3c4b03db42d4eeab6222acd0ebf5c09cea1756 100644
--- a/gnome/po/vi.po
+++ b/gnome/po/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2014-01-08 16:56+0000\n"
 "Last-Translator: Tho Duy Nguyen <nguyenduytho@gmail.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-06 06:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: vi\n"
 
 #: ../src/accountlist.c:183
@@ -120,8 +120,8 @@ msgid "Account Parameters"
 msgstr "Tham số tài khoản"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "Bí d_anh:"
 
@@ -135,25 +135,25 @@ msgid "Unknown"
 msgstr "Không rõ"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "_Tên máy chủ"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "_Tên người dùng"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "Mật _khẩu"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "Hiển thị mật khẩu"
 
@@ -162,8 +162,8 @@ msgid "_Proxy"
 msgstr "_Proxy"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "_Số hộp thư thoại"
 
@@ -367,8 +367,10 @@ msgid "Advanced"
 msgstr "Tiên tiến"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "mạng"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "General"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -427,11 +429,6 @@ msgstr "Các tài khoản đã thiết lập"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "General"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -481,11 +478,11 @@ msgstr "Hãy chọn trong các danh bạ Evolution"
 msgid "Name"
 msgstr "Tên:"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "Sự hỗ trợ này kết thúc ở đây"
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
@@ -493,132 +490,101 @@ msgstr ""
 "Bạn có thể kiểm tra tình trạng đăng ký hoặc thay đổi các tham số tài khoản "
 "trong cửa sổLựa chọn/Tài khoản"
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "Bí danh"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "Máy chủ"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "Tên người dùng"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "Bảo mật "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr "SRTP/ZRTP draft-zimmermann"
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "Không có"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "Trợ giúp tạo tài khoản SFLphone"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "Chào mừng bạn đến với trợ giúp tạo tài khoản SFLphone"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "Sự trợ giúp bạn cấu hình một tài khoản"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "Các giao thức VoIP"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "Hãy lựa chọn một kiểu tài khoản"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (Session Initiation Protocol)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "Tài khoản"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "Hãy chọn một trong các lựa chọn sau"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr "Tạo một tài khoản SIP/IAX2 miễn phí tại sflphone.org"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "Nhập vào một tài khoản SIP hoặc IAX2 đã có"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "Thiết lập tài khoản SIP"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "Hãy điền vào các thông tin sau"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "Bảo mật liên lạc với _ZRTP"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "Địa chỉ thư điện tử tùy chọn"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "Địa chỉ thư điện tử sau sẽ được dùng để gửi các tin thư thoại"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "_Thư điện tử"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "Thiết lập tài khoản IAX2"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "Network Address Translation (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "Có thể bạn phải bật tính năng này nếu bạn ở sau tường lửa."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "_Bật STUN"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "Máy chủ _STUN"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "Đăng ký tài khoản"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "Xin chúc mừng!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "Tần số"
@@ -818,15 +784,28 @@ msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 "Hãy cẩn thận: các đường tắt này sẽ thay đổi các đường tắt của hệ thống"
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "Các lựa chọn cao cấp cho TLS"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "Giao thức TLS"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -840,60 +819,60 @@ msgstr ""
 "cho các tài khoản khác nhau. Tuy nhiên, mỗi tài khoản sẽ được chạy trên \n"
 "các cổng mạng khác nhau.\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "Nghe TLS tổng quát (cho tất cả các tài khoản)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "Danh sách Certificate of Authority"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "Chọn một tệp danh sách CA (tùy ý)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "Tệp Public endpoint certificate"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "Chọn một  public endpoint certificate (tùy ý)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "Chọn một tệp khóa cá nhân"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "Mật mã cho khóa cá nhân"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "Phương pháp của giao thức TLS"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "Danh sách mật mã TLS"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "Tên của máy chủ cá biệt cho kết nối đi ra TLS"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "Kiểm tra các certificate mới đển, với phương diện máy chủ"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "Kiểm tra các certificate trả lời, với phương diện máy khách"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "Cần có certificate cho các kết nối đến TLS"
 
@@ -969,6 +948,20 @@ msgstr "Lựa chọn SDES"
 msgid "Fallback on RTP on SDES failure"
 msgstr "Quay về RTP nếu không sử dụng được SDES"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "Tìm tất cả"
@@ -990,19 +983,19 @@ msgstr "Tìm các cuộc gọi đến"
 msgid "Search by outgoing call"
 msgstr "Tìm các cuộc gọi đi"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr "Thông báo ALSA: Lỗi khi mở thiết bị đọc"
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr "Thông báo ALSA: Lỗi khi mở thiết bị ghi"
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr "Thông báo Pulseaudio: Hiện thời Pulseaudio đang bị tắt"
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr "Thông báo Codecs: không tìm thấy Codecs"
 
@@ -1065,17 +1058,32 @@ msgstr "Xác nhận Go Clear"
 msgid "Confirm"
 msgstr "Xác nhận"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr "Trường lỗi"
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr "Gỡ bạn chát"
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr "Thêm bạn chát mới"
 
@@ -1084,7 +1092,7 @@ msgid "Add group"
 msgstr "Thêm nhóm"
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "Gọi"
 
@@ -1113,6 +1121,14 @@ msgstr ""
 "%s\n"
 "Chạy '%s --help' để xem danh sách tuỳ chọn dòng lệnh.\n"
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "Lỗi SFLphone"
@@ -1130,6 +1146,11 @@ msgstr "- Chương trình khách GNOME cho SFLphone"
 msgid "%s says:"
 msgstr "%s báo:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1162,11 +1183,21 @@ msgstr "Bạn không có tài khoàn nào được thiết lập"
 msgid "You have no registered accounts"
 msgstr "Bạn không có tài khoản nào được đăng ký"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1177,6 +1208,11 @@ msgstr "%s không hỗ trợ ZRTP"
 msgid "ZRTP negotiation failed with %s"
 msgstr "Dàn xếp ZRTP thất bại với %s"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1194,8 +1230,8 @@ msgstr "Âm lượng cho micro"
 msgid "_Show main window"
 msgstr "_Hiển thị cửa sổ chính"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "_Ngừng"
 
@@ -1203,261 +1239,272 @@ msgstr "_Ngừng"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "Chưa có sổ danh bạ nào được lựa chọn"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "Sổ danh bạ"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "Thư thoại(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 "SFLphone là một chương trình khách VoIP tương thích với các giao thức SIP và "
 "IAX2"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "Nói về SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "Thư thoại"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "Cuộc gọi _mới"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "Gọi mới"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "_Nhấc máy"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "Trả lời cuộc gọi"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "Kết thúc cuộc gọi"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "_Chờ"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "Chuyển cuộc gọi sang chờ"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "_Hết chờ"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "Chuyển cuộc gọi sang không chờ"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "Gửi _thông điệp"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "Gửi thông điệp"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "Trợ lý cấu hình"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Chạy Trợ lý Cấu hình"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "Gọi hộp thư thoại của bạn"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "Đón_g"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "Thu nhỏ về khay hệ thống"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "_Thoát"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "Thoát khỏi chương trình"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "_Sao chép"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "Sao chép vùng chọn"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "Riêng"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "Dán bảng lưu tạm"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "_Xóa lược sử"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "Xóa lược sử các cuộc gọi"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "Tài _khoản"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "Sửa đổi tài khoản của bạn"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "Tù_y thích"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "Thay đổi sở thích của bạn"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "_Xem"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "_Trợ giúp"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "Nội dung"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "Mở sổ tay hướng dẫn"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "Giới thiệu về ứng dụng này"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "_Chuyển"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "Chuyển cuộc gọi"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "Th_u"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "Thu cuộc gọi hiện tại"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "_Hiện thanh công cụ"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "Hiện thanh công cụ"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "Vùng _quay số"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "Hiện thị vùng quay số"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "_Kiểm soát âm lượng"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "Hiển thị kiểm soát âm lượng"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "_Lược sử"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "_Danh bạ"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr "_Danh sách bạn bè"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr "Hiển thị danh sách bạn bè"
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "Đang _chờ"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "_Gọi lại"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr "Trạng thái theo"
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "Nhập số điện thoại"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "Nhập số điện thoại trước khi gọi"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/zh_CN.po b/gnome/po/zh_CN.po
index 3eb0d8fe30d869ff31011ef4d14bb0c998b9a29d..904afc5fa28299b57036175b1f3015a27e1435c5 100644
--- a/gnome/po/zh_CN.po
+++ b/gnome/po/zh_CN.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\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"
-"X-Launchpad-Export-Date: 2014-04-06 06:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -121,8 +121,8 @@ msgid "Account Parameters"
 msgstr "帐户相关参数"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "别名(A)"
 
@@ -136,25 +136,25 @@ msgid "Unknown"
 msgstr "未知"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "主机名(H)"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "用户名(U)"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "密码(P)"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "密码"
 
@@ -163,8 +163,8 @@ msgid "_Proxy"
 msgstr ""
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "语音信箱号码(V)"
 
@@ -365,8 +365,10 @@ msgid "Advanced"
 msgstr "高级"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "网络"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "常用配置"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -425,11 +427,6 @@ msgstr "已配置帐户"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "常用配置"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -479,142 +476,111 @@ msgstr "选择使用如下Evolution地址薄"
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "配置完成."
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr "你可以随时在 选项/帐户 窗口中查看注册状态或者修改帐户参数."
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "别名"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "用户名"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "安全: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr ""
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "无"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFLphone账户创建向导"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "欢迎使用SFLphone帐户创建向导!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "安装向导将帮助您配置帐户"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP协议"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "选择帐户类型"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP(会话初始化协议)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2(Asterisk内部交换协议)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "帐户"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "请选择以下选项中的一个"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "注册已存在的SIP或IAX2帐户"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "SIP帐户设置"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "请填写以下信息"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr ""
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "可选邮件地址"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "这个邮件地址将被用来发送您的语音邮箱消息"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "邮件地址(E)"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "IAX2帐户设置"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "网络地址解析(NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "如果你使用网络使用防火墙,你很有可能需要设定此项."
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "使用STUN(n)"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "STUN服务器(S)"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "帐户注册"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "恭喜!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "频率"
@@ -813,15 +779,28 @@ msgstr "地址簿"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "TLS 高级选项"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS 传输"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -831,60 +810,60 @@ msgid ""
 "port, different one from each other\n"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "证书机构列表"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "选择 CA 列表文件(可选)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "选择私钥文件(可选)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "私钥密码"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "TLS 协议方法"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr ""
 
@@ -960,6 +939,20 @@ msgstr "SDES 选项"
 msgid "Fallback on RTP on SDES failure"
 msgstr "SDES 失败时会滚为使用 RTP"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "查询所有"
@@ -981,19 +974,19 @@ msgstr "从来电中查询"
 msgid "Search by outgoing call"
 msgstr "从拨出电话中查询"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1052,17 +1045,32 @@ msgstr ""
 msgid "Confirm"
 msgstr "确认"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1071,7 +1079,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "电话(_C)"
 
@@ -1098,6 +1106,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone出错"
@@ -1115,6 +1131,11 @@ msgstr ""
 msgid "%s says:"
 msgstr ""
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1147,11 +1168,21 @@ msgstr "你没有设置任何账户"
 msgid "You have no registered accounts"
 msgstr "未发现已注册帐户"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1162,6 +1193,11 @@ msgstr "%s 不支持 ZRTP。"
 msgid "ZRTP negotiation failed with %s"
 msgstr ""
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1179,8 +1215,8 @@ msgstr "话筒音量"
 msgid "_Show main window"
 msgstr "显示主窗口(S)"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "挂断(_H)"
 
@@ -1188,259 +1224,270 @@ msgstr "挂断(_H)"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "地址簿"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "地址簿"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr ""
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone是一个VoIP客户端,它兼容SIP和IAX2协议."
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "关于SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "语音信箱"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "新电话(_N)"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "打一通电话"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "接听(_P)"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "接听"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "完成呼叫"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "保持(_H)"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "挂起"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "恢复通话"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "挂断"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr ""
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr ""
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "配置助手(_A)"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "Stun配置有误"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "%d 个语音信息"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "最小化到系统托盘"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "退出程序"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "删除所选账户"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板中的内容"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "清空历史记录(_H)"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "清空历史记录"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "账户(_A)"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "当前帐户"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "更改您的首选项"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "查看(_V)"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "继续"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "打开手册"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "关于本程序"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "转接"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "转给:"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "录音(_R)"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "记录当前会话"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "显示工具栏(_S)"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "显示工具栏"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "禁用"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "显示拨号键盘"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "音量控制(V)"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "音量控制(V)"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "历史"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "地址簿"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "保持(_H)"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "回叫(_C)"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "编辑电话号码"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "拨出电话前编辑电话号码"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/zh_HK.po b/gnome/po/zh_HK.po
index 6335266f56d7a2f9435197bb2ab791a1d4f42039..0b847b7a3d01d457abb1f4213d1d782abe9ff1cc 100644
--- a/gnome/po/zh_HK.po
+++ b/gnome/po/zh_HK.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\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"
-"X-Launchpad-Export-Date: 2014-04-06 06:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -121,8 +121,8 @@ msgid "Account Parameters"
 msgstr "帳號參數"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "別名(_A)"
 
@@ -136,25 +136,25 @@ msgid "Unknown"
 msgstr "不詳"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "主機名稱(_H)"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "用戶名稱(_U)"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "密碼(_P)"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "顯示密碼"
 
@@ -163,8 +163,8 @@ msgid "_Proxy"
 msgstr "代理伺服器(_P)"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "留言信箱號碼(_V)"
 
@@ -367,8 +367,10 @@ msgid "Advanced"
 msgstr "進階"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "網絡"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "一般"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -427,11 +429,6 @@ msgstr "已設定帳號"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "一般"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -481,144 +478,111 @@ msgstr "選擇使用哪個 Evolution 通訊錄"
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "設定完成。"
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr "您可隨時在「選項/帳號」視窗查看註冊狀態或修改帳號參數。"
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "別名"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "伺服器"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "用戶名稱"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "保安: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr ""
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "無"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFLphone 帳號建立精靈"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "歡迎使用 SFLphone 帳號建立精靈!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "安裝精靈會幫您設定帳號。"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP 協定"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "選擇帳號類型"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (會話初始化協定)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "帳號"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "請選擇以下選項其中一個"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"於 sflphone.org 建立免費 SIP/IAX2 帳號\n"
-"(只供測試)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "登記已有的 SIP 或 IAX2 帳號"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "SIP 帳號設定"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "請填寫以下資料"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "以 _ZRTP 進行保密通訊"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "電郵地址 (非必要)"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "此電郵地址會用來發送您的留言信息"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "電郵地址(_E)"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "IAX2 帳號設定"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "網絡地址轉譯(NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "如使用網絡防火牆,很可能需要啟用此項。"
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "啟用 STU_N"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_STUN 伺服器"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "登記帳號"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "恭喜!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "頻率"
@@ -817,15 +781,28 @@ msgstr "通訊錄"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr "注意:此等快捷鍵可能會使全域快捷鍵失效。"
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "TLS 進階選項"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS transport"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -837,60 +814,60 @@ msgstr ""
 "TLS transport 可配合 UDP 用於需要保密式 SIP (又名 SIPS) 通訊。\n"
 "您可為每個帳號設定不同的 TLS transport,但每個都要有不同連接埠。\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "全域 TLS listener (所有帳號)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "憑證機構(CA)列表"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "選擇憑證機構(CA)列表檔案 (非必要)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "公開端點憑證檔案"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "選擇公開端點憑證 (非必要)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "選擇私鑰檔案 (非必要)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "私鑰密碼"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "TLS 協定方法"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "TLS cipher 列表"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "外送 TLS 連線的伺服器名稱實體"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "檢驗內送憑證 (以伺服器方式)"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "檢驗應答憑證 (以用戶端方式)"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "內送 TLS 連線要有憑證"
 
@@ -966,6 +943,20 @@ msgstr "SDES 選項"
 msgid "Fallback on RTP on SDES failure"
 msgstr "SDES 失敗時會轉為使用 RTP"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "全部搜查"
@@ -987,19 +978,19 @@ msgstr "搜查來電"
 msgid "Search by outgoing call"
 msgstr "搜查撥出電話"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1060,17 +1051,32 @@ msgstr "確認 Go Clear"
 msgid "Confirm"
 msgstr "確認"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1079,7 +1085,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "電話"
 
@@ -1106,6 +1112,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone 出錯"
@@ -1123,6 +1137,11 @@ msgstr ""
 msgid "%s says:"
 msgstr "%s 說:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1155,11 +1174,21 @@ msgstr "未有設置帳號"
 msgid "You have no registered accounts"
 msgstr "未有登記帳號"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1170,6 +1199,11 @@ msgstr "%s 不支援 ZRTP。"
 msgid "ZRTP negotiation failed with %s"
 msgstr "ZRTP 未能以 %s 進行接洽"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1187,8 +1221,8 @@ msgstr "話筒音量"
 msgid "_Show main window"
 msgstr "顯示主視窗(_S)"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "收線(_H)"
 
@@ -1196,259 +1230,270 @@ msgstr "收線(_H)"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "未選擇通訊錄"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "通訊錄"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "留言信息(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone 是 VoIP 用戶端,兼容 SIP 和 IAX2 協定。"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "關於 SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "留言信息"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "新電話(_N)"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "打出新電話"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "接聽(_P)"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "接聽"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "收線"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "正暫停(_N)"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "暫停通話"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "恢復通話(_F)"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "恢復通話"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "發送訊息(_M)"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "發送訊息"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "設定助理(_A)"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "執行設定助理"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "打開留言信箱"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "最小化到系統匣"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "結束程式"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "複製所選賬號"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿內容"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "清除通話紀錄(_H)"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "清除通話紀錄"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "編輯您的帳號"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "更改偏好設定"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "檢視(_V)"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "目錄"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "打開使用手冊"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "關於本程式"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "轉駁(_T)"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "轉駁來電"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "錄音(_R)"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "錄下當前對話"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "顯示工具列(_S)"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "顯示工具列"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "撥號盤(_D)"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "顯示撥號盤"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "音量控制(_V)"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "顯示音量控制"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "通話紀錄(_H)"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "通訊錄(_A)"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "正暫停(_H)"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "回電(_C)"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "編輯電話號碼"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "撥出電話前編輯電話號碼"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""
diff --git a/gnome/po/zh_TW.po b/gnome/po/zh_TW.po
index 74b6f0452c5256a97789d527bf621f37777c1d4a..3e4a92e6549add6ee75fa3ebf4fab206f5f6b346 100644
--- a/gnome/po/zh_TW.po
+++ b/gnome/po/zh_TW.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-04 21:10-0400\n"
+"POT-Creation-Date: 2014-04-18 21:29-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\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"
-"X-Launchpad-Export-Date: 2014-04-06 06:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: \n"
 
 #: ../src/accountlist.c:183
@@ -121,8 +121,8 @@ msgid "Account Parameters"
 msgstr "帳號參數"
 
 #. alias field
-#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:305
-#: ../src/config/assistant.c:403
+#: ../src/config/accountconfigdialog.c:279 ../src/config/assistant.c:291
+#: ../src/config/assistant.c:360
 msgid "_Alias"
 msgstr "別名(_A)"
 
@@ -136,25 +136,25 @@ msgid "Unknown"
 msgstr "不詳"
 
 #. server field
-#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:313
-#: ../src/config/assistant.c:411
+#: ../src/config/accountconfigdialog.c:326 ../src/config/assistant.c:300
+#: ../src/config/assistant.c:369
 msgid "_Host name"
 msgstr "主機名稱(_H)"
 
 #. username field
-#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:321
-#: ../src/config/assistant.c:419
+#: ../src/config/accountconfigdialog.c:336 ../src/config/assistant.c:308
+#: ../src/config/assistant.c:377
 msgid "_User name"
 msgstr "用戶名稱(_U)"
 
 #. password field
-#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:331
-#: ../src/config/assistant.c:428
+#: ../src/config/accountconfigdialog.c:357 ../src/config/assistant.c:318
+#: ../src/config/assistant.c:386
 msgid "_Password"
 msgstr "密碼(_P)"
 
-#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:340
-#: ../src/config/assistant.c:437
+#: ../src/config/accountconfigdialog.c:376 ../src/config/assistant.c:327
+#: ../src/config/assistant.c:395
 msgid "Show password"
 msgstr "顯示密碼"
 
@@ -163,8 +163,8 @@ msgid "_Proxy"
 msgstr "代理(_P)"
 
 #. voicemail number field
-#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:345
-#: ../src/config/assistant.c:442
+#: ../src/config/accountconfigdialog.c:391 ../src/config/assistant.c:332
+#: ../src/config/assistant.c:400
 msgid "_Voicemail number"
 msgstr "留言信箱號碼(_V)"
 
@@ -365,8 +365,10 @@ msgid "Advanced"
 msgstr "進階"
 
 #: ../src/config/accountconfigdialog.c:1572
-msgid "Network"
-msgstr "網路"
+#: ../src/config/addressbook-config.c:313
+#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
+msgid "General"
+msgstr "一般"
 
 #: ../src/config/accountlistconfigdialog.c:112
 #, c-format
@@ -425,11 +427,6 @@ msgstr "已設定帳號"
 msgid "You have no active accounts"
 msgstr ""
 
-#: ../src/config/addressbook-config.c:313
-#: ../src/config/preferencesdialog.c:433 ../src/config/shortcuts-config.c:117
-msgid "General"
-msgstr "一般"
-
 #. PHOTO DISPLAY
 #: ../src/config/addressbook-config.c:317
 msgid "_Use Evolution address books"
@@ -479,144 +476,111 @@ msgstr "選擇使用哪個 Evolution 通訊錄"
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/config/assistant.c:76
+#: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
 msgstr "設定完成。"
 
-#: ../src/config/assistant.c:79
+#: ../src/config/assistant.c:114
 msgid ""
 "You can at any time check your registration state or modify your accounts "
 "parameters in the Options/Accounts window."
 msgstr "您可隨時在「選項/帳號」視窗查看註冊狀態或修改帳號參數。"
 
-#: ../src/config/assistant.c:81
+#: ../src/config/assistant.c:116
 msgid "Alias"
 msgstr "別名"
 
-#: ../src/config/assistant.c:82
+#: ../src/config/assistant.c:117
 msgid "Server"
 msgstr "伺服器"
 
-#: ../src/config/assistant.c:83
+#: ../src/config/assistant.c:118
 msgid "Username"
 msgstr "用戶名稱"
 
-#: ../src/config/assistant.c:84
+#: ../src/config/assistant.c:119
 msgid "Security: "
 msgstr "安全性: "
 
-#: ../src/config/assistant.c:88
+#: ../src/config/assistant.c:123
 msgid "SRTP/ZRTP draft-zimmermann"
 msgstr ""
 
-#: ../src/config/assistant.c:90
+#: ../src/config/assistant.c:125
 msgid "None"
 msgstr "無"
 
-#: ../src/config/assistant.c:226
-msgid "SFLphone account creation wizard"
-msgstr "SFLphone 帳號建立精靈"
-
-#: ../src/config/assistant.c:251
-msgid "Welcome to the Account creation wizard of SFLphone!"
-msgstr "歡迎使用 SFLphone 帳號建立精靈!"
+#: ../src/config/assistant.c:241
+msgid "Welcome to the account registration wizard for SFLphone!"
+msgstr ""
 
-#: ../src/config/assistant.c:252
-msgid "This installation wizard will help you configure an account."
-msgstr "安裝精靈會幫您設定帳號。"
+#: ../src/config/assistant.c:242
+msgid "This wizard will help you configure an existing account."
+msgstr ""
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "VoIP Protocols"
 msgstr "VoIP 協定"
 
-#: ../src/config/assistant.c:264
+#: ../src/config/assistant.c:254
 msgid "Select an account type"
 msgstr "選擇帳號類型"
 
-#: ../src/config/assistant.c:266
+#: ../src/config/assistant.c:256
 msgid "SIP (Session Initiation Protocol)"
 msgstr "SIP (會話初始化協定)"
 
-#: ../src/config/assistant.c:268
+#: ../src/config/assistant.c:258
 msgid "IAX2 (InterAsterix Exchange)"
 msgstr "IAX2 (InterAsterix Exchange)"
 
-#: ../src/config/assistant.c:280
-msgid "Account"
-msgstr "帳號"
-
-#: ../src/config/assistant.c:280
-msgid "Please select one of the following options"
-msgstr "請選擇以下選項其中一個"
-
-#: ../src/config/assistant.c:282
-msgid ""
-"Create a free SIP/IAX2 account on sflphone.org \n"
-"(For testing purpose only)"
-msgstr ""
-"於 sflphone.org 建立免費 SIP/IAX2 帳號\n"
-"(只供測試)"
-
-#: ../src/config/assistant.c:284
-msgid "Register an existing SIP or IAX2 account"
-msgstr "註冊已有的 SIP 或 IAX2 帳號"
-
-#: ../src/config/assistant.c:297
+#: ../src/config/assistant.c:283
 msgid "SIP account settings"
 msgstr "SIP 帳號設定"
 
-#: ../src/config/assistant.c:297 ../src/config/assistant.c:395
+#: ../src/config/assistant.c:283 ../src/config/assistant.c:352
 msgid "Please fill the following information"
 msgstr "請填寫以下資料"
 
 #. Security options
-#: ../src/config/assistant.c:353 ../src/config/assistant.c:382
+#: ../src/config/assistant.c:340
 msgid "Secure communications with _ZRTP"
 msgstr "以 _ZRTP 進行保密通信"
 
-#: ../src/config/assistant.c:366
-msgid "Optional email address"
-msgstr "電郵地址(非必要)"
-
-#: ../src/config/assistant.c:366
-msgid "This email address will be used to send your voicemail messages."
-msgstr "此電郵地址會用來發送您的留言信息"
-
-#. email field
-#: ../src/config/assistant.c:374
-msgid "_Email address"
-msgstr "電郵地址(_E)"
-
-#: ../src/config/assistant.c:395
+#: ../src/config/assistant.c:352
 msgid "IAX2 account settings"
 msgstr "IAX2 帳號設定"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "Network Address Translation (NAT)"
 msgstr "網路地址轉換 (NAT)"
 
-#: ../src/config/assistant.c:460
+#: ../src/config/assistant.c:417
 msgid "You should probably enable this if you are behind a firewall."
 msgstr "如使用網路防火牆,很可能需要啟用此項。"
 
 #. enable
-#: ../src/config/assistant.c:469
+#: ../src/config/assistant.c:426
 msgid "E_nable STUN"
 msgstr "使用 STU_N"
 
 #. server address
-#: ../src/config/assistant.c:476
+#: ../src/config/assistant.c:433
 msgid "_STUN server"
 msgstr "_STUN 伺服器"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Account Registration"
 msgstr "帳號註冊"
 
-#: ../src/config/assistant.c:491
+#: ../src/config/assistant.c:447
 msgid "Congratulations!"
 msgstr "恭喜!"
 
+#: ../src/config/assistant.c:560
+msgid "SFLphone account registration wizard"
+msgstr ""
+
 #: ../src/config/audioconf.c:502
 msgid "Frequency"
 msgstr "頻率"
@@ -815,15 +779,28 @@ msgstr "通訊錄"
 msgid "Be careful: these shortcuts might override system-wide shortcuts."
 msgstr "注意:此等快捷鍵可能會使全域快捷鍵失效。"
 
-#: ../src/config/tlsadvanceddialog.c:55
+#: ../src/config/tlsadvanceddialog.c:58
+#, c-format
+msgid "Are you sure want to use this certificate?"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:67
+msgid "Use anyway"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:69
+msgid "Invalid certificate detected"
+msgstr ""
+
+#: ../src/config/tlsadvanceddialog.c:94
 msgid "Advanced options for TLS"
 msgstr "TLS 進階選項"
 
-#: ../src/config/tlsadvanceddialog.c:72
+#: ../src/config/tlsadvanceddialog.c:111
 msgid "TLS transport"
 msgstr "TLS transport"
 
-#: ../src/config/tlsadvanceddialog.c:76
+#: ../src/config/tlsadvanceddialog.c:115
 #, c-format
 msgid ""
 "TLS transport can be used along with UDP for those calls that would\n"
@@ -835,60 +812,60 @@ msgstr ""
 "TLS transport 可配合 UDP 用於需要保密式 SIP (又名 SIPS) 的通信。\n"
 "您可為每個帳號設定不同的 TLS transport,但每個都要有不同的連接埠。\n"
 
-#: ../src/config/tlsadvanceddialog.c:118
+#: ../src/config/tlsadvanceddialog.c:157
 msgid "Global TLS listener (all accounts)"
 msgstr "全域 TLS listener (所有帳號)"
 
-#: ../src/config/tlsadvanceddialog.c:128
+#: ../src/config/tlsadvanceddialog.c:167
 msgid "Certificate of Authority list"
 msgstr "憑證機構(CA)列表"
 
-#: ../src/config/tlsadvanceddialog.c:131
+#: ../src/config/tlsadvanceddialog.c:170
 msgid "Choose a CA list file (optional)"
 msgstr "選擇憑證機構(CA)列表檔案 (非必要)"
 
-#: ../src/config/tlsadvanceddialog.c:142
+#: ../src/config/tlsadvanceddialog.c:181
 msgid "Public endpoint certificate file"
 msgstr "公開端點憑證檔案"
 
-#: ../src/config/tlsadvanceddialog.c:145
+#: ../src/config/tlsadvanceddialog.c:184
 msgid "Choose a public endpoint certificate (optional)"
 msgstr "選擇公開端點憑證 (非必要)"
 
-#: ../src/config/tlsadvanceddialog.c:163
+#: ../src/config/tlsadvanceddialog.c:203
 msgid "Choose a private key file (optional)"
 msgstr "選擇私鑰檔案 (非必要)"
 
-#: ../src/config/tlsadvanceddialog.c:178
+#: ../src/config/tlsadvanceddialog.c:218
 msgid "Password for the private key"
 msgstr "私鑰密碼"
 
 #. TLS protocol methods
-#: ../src/config/tlsadvanceddialog.c:193
+#: ../src/config/tlsadvanceddialog.c:233
 msgid "TLS protocol method"
 msgstr "TLS 協定方法"
 
-#: ../src/config/tlsadvanceddialog.c:216
+#: ../src/config/tlsadvanceddialog.c:256
 msgid "TLS cipher list"
 msgstr "TLS cipher 列表"
 
-#: ../src/config/tlsadvanceddialog.c:225
+#: ../src/config/tlsadvanceddialog.c:265
 msgid "Server name instance for outgoing TLS connection"
 msgstr "外送 TLS 連線的伺服器名稱實體"
 
-#: ../src/config/tlsadvanceddialog.c:233
+#: ../src/config/tlsadvanceddialog.c:273
 msgid "Negotiation timeout (seconds)"
 msgstr ""
 
-#: ../src/config/tlsadvanceddialog.c:245
+#: ../src/config/tlsadvanceddialog.c:285
 msgid "Verify incoming certificates, as a server"
 msgstr "檢驗內送憑證 (以伺服器方式)"
 
-#: ../src/config/tlsadvanceddialog.c:251
+#: ../src/config/tlsadvanceddialog.c:291
 msgid "Verify certificates from answer, as a client"
 msgstr "檢驗應答憑證 (以用戶端方式)"
 
-#: ../src/config/tlsadvanceddialog.c:257
+#: ../src/config/tlsadvanceddialog.c:297
 msgid "Require certificate for incoming tls connections"
 msgstr "內送 TLS 連線要有憑證"
 
@@ -964,6 +941,20 @@ msgstr "SDES 選項"
 msgid "Fallback on RTP on SDES failure"
 msgstr "SDES 失敗時會轉為使用 RTP"
 
+#: ../src/contacts/calltree.c:369
+#, c-format
+msgid ""
+"\n"
+"<i>Transfer to:%s</i> "
+msgstr ""
+
+#: ../src/contacts/calltree.c:372
+#, c-format
+msgid ""
+"\n"
+"<i>Confirm SAS <b>%s</b> ?</i>"
+msgstr ""
+
 #: ../src/contacts/searchbar.c:226
 msgid "Search all"
 msgstr "全部搜查"
@@ -985,19 +976,19 @@ msgstr "搜查來電"
 msgid "Search by outgoing call"
 msgstr "搜查撥出電話"
 
-#: ../src/dbus/dbus.c:598
+#: ../src/dbus/dbus.c:610
 msgid "ALSA notification: Error while opening playback device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:601
+#: ../src/dbus/dbus.c:613
 msgid "ALSA notification: Error while opening capture device"
 msgstr ""
 
-#: ../src/dbus/dbus.c:604
+#: ../src/dbus/dbus.c:616
 msgid "Pulseaudio notification: Pulseaudio is not running"
 msgstr ""
 
-#: ../src/dbus/dbus.c:607
+#: ../src/dbus/dbus.c:619
 msgid "Codecs notification: Codecs not found"
 msgstr ""
 
@@ -1058,17 +1049,32 @@ msgstr "確認 Go Clear"
 msgid "Confirm"
 msgstr "確認"
 
+#: ../src/presencewindow.c:477
+#, c-format
+msgid "Field error %s."
+msgstr ""
+
 #: ../src/presencewindow.c:486
 msgid "Field error"
 msgstr ""
 
+#: ../src/presencewindow.c:657
+#, c-format
+msgid "Are you sure want to delete \"%s\""
+msgstr ""
+
 #: ../src/presencewindow.c:667 ../src/presencewindow.c:691
 #: ../src/presencewindow.c:817
 msgid "Remove buddy"
 msgstr ""
 
+#: ../src/presencewindow.c:681
+#, c-format
+msgid "Do you really want to delete the group %s"
+msgstr ""
+
 #. popup
-#: ../src/presencewindow.c:755 ../src/uimanager.c:1197
+#: ../src/presencewindow.c:755 ../src/uimanager.c:1208
 msgid "Add new buddy"
 msgstr ""
 
@@ -1077,7 +1083,7 @@ msgid "Add group"
 msgstr ""
 
 #. Call Menu
-#: ../src/presencewindow.c:802 ../src/uimanager.c:1027
+#: ../src/presencewindow.c:802 ../src/uimanager.c:1038
 msgid "Call"
 msgstr "電話"
 
@@ -1104,6 +1110,14 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
+#: ../src/sflphone_client.c:67
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the daemon is running.\n"
+"Error: %s"
+msgstr ""
+
 #: ../src/sflphone_client.c:70
 msgid "SFLphone Error"
 msgstr "SFLphone 出錯"
@@ -1121,6 +1135,11 @@ msgstr ""
 msgid "%s says:"
 msgstr "%s 說:"
 
+#: ../src/sflnotify.c:111
+#, c-format
+msgid "IP-to-IP call"
+msgstr ""
+
 #. the account is different from NULL
 #: ../src/sflnotify.c:116 ../src/sflnotify.c:136
 #, c-format
@@ -1153,11 +1172,21 @@ msgstr "您未有設置帳號"
 msgid "You have no registered accounts"
 msgstr "沒有已註冊帳號"
 
+#: ../src/sflnotify.c:196
+#, c-format
+msgid "Secure mode on."
+msgstr ""
+
 #: ../src/sflnotify.c:197
 #, c-format
 msgid "<i>With:</i> %s \n"
 msgstr ""
 
+#: ../src/sflnotify.c:211 ../src/sflnotify.c:225
+#, c-format
+msgid "ZRTP Error."
+msgstr ""
+
 #: ../src/sflnotify.c:212
 #, c-format
 msgid "%s does not support ZRTP."
@@ -1168,6 +1197,11 @@ msgstr "%s 不支援 ZRTP。"
 msgid "ZRTP negotiation failed with %s"
 msgstr "ZRTP 未能以 %s 進行接洽"
 
+#: ../src/sflnotify.c:239
+#, c-format
+msgid "Secure mode is off."
+msgstr ""
+
 #: ../src/sflnotify.c:240
 #, c-format
 msgid "<i>With:</i> %s"
@@ -1185,8 +1219,8 @@ msgstr "話筒音量"
 msgid "_Show main window"
 msgstr "顯示主視窗(_S)"
 
-#: ../src/statusicon.c:139 ../src/uimanager.c:1037 ../src/uimanager.c:1390
-#: ../src/uimanager.c:1474
+#: ../src/statusicon.c:139 ../src/uimanager.c:1048 ../src/uimanager.c:1401
+#: ../src/uimanager.c:1487
 msgid "_Hang up"
 msgstr "掛線(_H)"
 
@@ -1194,259 +1228,270 @@ msgstr "掛線(_H)"
 msgid "SFLphone"
 msgstr "SFLphone"
 
-#: ../src/uimanager.c:434
+#: ../src/uimanager.c:435
 msgid "No address book selected"
 msgstr "未選擇通訊錄"
 
-#: ../src/uimanager.c:454 ../src/uimanager.c:1114
+#: ../src/uimanager.c:455 ../src/uimanager.c:1125
 msgid "Address book"
 msgstr "通訊錄"
 
-#: ../src/uimanager.c:486
+#: ../src/uimanager.c:487
 #, c-format
 msgid "Voicemail(%i)"
 msgstr "留言信息(%i)"
 
-#: ../src/uimanager.c:579
+#: ../src/uimanager.c:580
 msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFLphone 是 VoIP 用戶端,兼容 SIP 和 IAX2 協定。"
 
-#: ../src/uimanager.c:582
+#: ../src/uimanager.c:583
 msgid "About SFLphone"
 msgstr "關於 SFLphone"
 
-#: ../src/uimanager.c:978 ../src/uimanager.c:1061
+#: ../src/uimanager.c:989 ../src/uimanager.c:1072
 msgid "Voicemail"
 msgstr "留言信息"
 
-#: ../src/uimanager.c:1029 ../src/uimanager.c:1581
+#: ../src/uimanager.c:1040 ../src/uimanager.c:1594
 msgid "_New call"
 msgstr "新電話(_N)"
 
-#: ../src/uimanager.c:1030
+#: ../src/uimanager.c:1041
 msgid "Place a new call"
 msgstr "打出新電話"
 
-#: ../src/uimanager.c:1033 ../src/uimanager.c:1378
+#: ../src/uimanager.c:1044 ../src/uimanager.c:1389
 msgid "_Pick up"
 msgstr "接聽(_P)"
 
-#: ../src/uimanager.c:1034
+#: ../src/uimanager.c:1045
 msgid "Answer the call"
 msgstr "接聽"
 
-#: ../src/uimanager.c:1038
+#: ../src/uimanager.c:1049
 msgid "Finish the call"
 msgstr "完成通話"
 
-#: ../src/uimanager.c:1041
+#: ../src/uimanager.c:1052
 msgid "O_n hold"
 msgstr "正暫停(_N)"
 
-#: ../src/uimanager.c:1042
+#: ../src/uimanager.c:1053
 msgid "Place the call on hold"
 msgstr "暫停通話"
 
-#: ../src/uimanager.c:1045
+#: ../src/uimanager.c:1056
 msgid "O_ff hold"
 msgstr "恢復通話(_F)"
 
-#: ../src/uimanager.c:1046
+#: ../src/uimanager.c:1057
 msgid "Place the call off hold"
 msgstr "恢復通話"
 
-#: ../src/uimanager.c:1049 ../src/uimanager.c:1432
+#: ../src/uimanager.c:1060 ../src/uimanager.c:1443
 msgid "Send _message"
 msgstr "發送訊息(_M)"
 
-#: ../src/uimanager.c:1050
+#: ../src/uimanager.c:1061
 msgid "Send message"
 msgstr "發送訊息"
 
-#: ../src/uimanager.c:1053 ../src/uimanager.c:1054
+#: ../src/uimanager.c:1064 ../src/uimanager.c:1065
 msgid "Share screen"
 msgstr ""
 
-#: ../src/uimanager.c:1057
+#: ../src/uimanager.c:1068
 msgid "Configuration _Assistant"
 msgstr "設定助理(_A)"
 
-#: ../src/uimanager.c:1058
+#: ../src/uimanager.c:1069
 msgid "Run the configuration assistant"
 msgstr "執行設定助理"
 
-#: ../src/uimanager.c:1062
+#: ../src/uimanager.c:1073
 msgid "Call your voicemail"
 msgstr "打開留言信箱"
 
-#: ../src/uimanager.c:1065
+#: ../src/uimanager.c:1076
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../src/uimanager.c:1066
+#: ../src/uimanager.c:1077
 msgid "Minimize to system tray"
 msgstr "最小化到系統匣"
 
-#: ../src/uimanager.c:1069
+#: ../src/uimanager.c:1080
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../src/uimanager.c:1070
+#: ../src/uimanager.c:1081
 msgid "Quit the program"
 msgstr "結束程式"
 
 #. Edit Menu
-#: ../src/uimanager.c:1074
+#: ../src/uimanager.c:1085
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/uimanager.c:1076 ../src/uimanager.c:1357
+#: ../src/uimanager.c:1087 ../src/uimanager.c:1368
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../src/uimanager.c:1077
+#: ../src/uimanager.c:1088
 msgid "Copy the selection"
 msgstr "複製所選範圍"
 
-#: ../src/uimanager.c:1080 ../src/uimanager.c:1365
+#: ../src/uimanager.c:1091 ../src/uimanager.c:1376
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../src/uimanager.c:1081
+#: ../src/uimanager.c:1092
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿內容"
 
-#: ../src/uimanager.c:1084
+#: ../src/uimanager.c:1095
 msgid "Clear _history"
 msgstr "清除通話紀錄(_H)"
 
-#: ../src/uimanager.c:1085
+#: ../src/uimanager.c:1096
 msgid "Clear the call history"
 msgstr "清除通話紀錄"
 
-#: ../src/uimanager.c:1088
+#: ../src/uimanager.c:1099
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/uimanager.c:1089
+#: ../src/uimanager.c:1100
 msgid "Edit your accounts"
 msgstr "編輯您的帳號"
 
-#: ../src/uimanager.c:1092
+#: ../src/uimanager.c:1103
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../src/uimanager.c:1093
+#: ../src/uimanager.c:1104
 msgid "Change your preferences"
 msgstr "變更偏好設定"
 
 #. View Menu
-#: ../src/uimanager.c:1097
+#: ../src/uimanager.c:1108
 msgid "_View"
 msgstr "檢視(_V)"
 
 #. Help menu
-#: ../src/uimanager.c:1100
+#: ../src/uimanager.c:1111
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/uimanager.c:1101
+#: ../src/uimanager.c:1112
 msgid "Contents"
 msgstr "內容"
 
-#: ../src/uimanager.c:1102
+#: ../src/uimanager.c:1113
 msgid "Open the manual"
 msgstr "打開使用手冊"
 
-#: ../src/uimanager.c:1104
+#: ../src/uimanager.c:1115
 msgid "About this application"
 msgstr "關於本應用程式"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "_Transfer"
 msgstr "轉接(_T)"
 
-#: ../src/uimanager.c:1108
+#: ../src/uimanager.c:1119
 msgid "Transfer the call"
 msgstr "轉接來電"
 
-#: ../src/uimanager.c:1109 ../src/uimanager.c:1412
+#: ../src/uimanager.c:1120 ../src/uimanager.c:1423
 msgid "_Record"
 msgstr "錄音(_R)"
 
-#: ../src/uimanager.c:1109
+#: ../src/uimanager.c:1120
 msgid "Record the current conversation"
 msgstr "記錄當前對話"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "_Show toolbar"
 msgstr "顯示工具列(_S)"
 
-#: ../src/uimanager.c:1110
+#: ../src/uimanager.c:1121
 msgid "Show the toolbar"
 msgstr "顯示工具列"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "_Dialpad"
 msgstr "撥號盤(_D)"
 
-#: ../src/uimanager.c:1111
+#: ../src/uimanager.c:1122
 msgid "Show the dialpad"
 msgstr "顯示撥號盤"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "_Volume controls"
 msgstr "音量控制(_V)"
 
-#: ../src/uimanager.c:1112
+#: ../src/uimanager.c:1123
 msgid "Show the volume controls"
 msgstr "顯示音量控制"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "_History"
 msgstr "通話紀錄(_H)"
 
-#: ../src/uimanager.c:1113
+#: ../src/uimanager.c:1124
 msgid "Call history"
 msgstr ""
 
-#: ../src/uimanager.c:1114
+#: ../src/uimanager.c:1125
 msgid "_Address book"
 msgstr "通訊錄(_A)"
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "_Buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1116
+#: ../src/uimanager.c:1127
 msgid "Display the buddy list"
 msgstr ""
 
-#: ../src/uimanager.c:1401 ../src/uimanager.c:1483
+#: ../src/uimanager.c:1412 ../src/uimanager.c:1496
 msgid "On _Hold"
 msgstr "正暫停(_H)"
 
 #. Add a video sources menu
-#: ../src/uimanager.c:1452
+#: ../src/uimanager.c:1463
 msgid "Video sources"
 msgstr ""
 
-#: ../src/uimanager.c:1520
+#: ../src/uimanager.c:1533
 msgid "_Call back"
 msgstr "回撥(_C)"
 
-#: ../src/uimanager.c:1530 ../src/uimanager.c:1589
+#: ../src/uimanager.c:1543 ../src/uimanager.c:1602
 msgid "Follow status"
 msgstr ""
 
-#: ../src/uimanager.c:1650
+#: ../src/uimanager.c:1663
 msgid "Edit phone number"
 msgstr "編輯電話號碼"
 
-#: ../src/uimanager.c:1661
+#: ../src/uimanager.c:1674
 msgid "Edit the phone number before making a call"
 msgstr "撥出電話前編輯電話號碼"
 
-#: ../src/video/video_callbacks.c:139
+#: ../src/video/video_callbacks.c:241
 msgid "Local View"
 msgstr ""
+
+#. on a conference call
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:257
+msgid "Conference with"
+msgstr ""
+
+#. build the prefix title name
+#: ../src/video/video_callbacks.c:269
+msgid "Call with"
+msgstr ""