diff --git a/po/es.po b/po/es.po
index c93aa17d8cc29ea3da55cecd66cb85554270dc00..7342207c88da7b30f9f6700bbe4e00b3adf4c13e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -310,7 +310,7 @@ msgstr "Seguir"
 
 #: calltree.c:445 calltree.c:447
 msgid "On Hold"
-msgstr "Sostener"
+msgstr "Retener"
 
 #: calltree.c:458 calltree.c:460
 msgid "Transfer"
@@ -405,7 +405,7 @@ msgstr "ConfiguraciÃ³n Audio"
 
 #: configwindow.c:625
 msgid "Audio Settings"
-msgstr "ConfiguraciÃ³n Audio"
+msgstr "ConfiguraciÃ³n de audio"
 
 #: configwindow.c:649
 msgid "Accounts"
@@ -542,7 +542,7 @@ msgstr "Aceptar"
 
 #: sflnotify.c:53
 msgid "Refuse"
-msgstr "Renunciar"
+msgstr "Rechazar"
 
 #: sflnotify.c:54 sflnotify.c:117 sflnotify.c:154
 msgid "Ignore"
diff --git a/po/es.po.orig b/po/es.po.orig
new file mode 100644
index 0000000000000000000000000000000000000000..c93aa17d8cc29ea3da55cecd66cb85554270dc00
--- /dev/null
+++ b/po/es.po.orig
@@ -0,0 +1,642 @@
+# Spanish translation of SFLphone.
+# Copyright (C) 2008 The Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License Version 3.
+#
+# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
+#
+# POT-Creation-Date: 2007-01-13 01:39+0100\n
+msgid ""
+msgstr ""
+"Project-Id-Version: SFLphone 0.8.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-29 10:56-0400\n"
+"PO-Revision-Date: 2008-03-27 11:15\n"
+"Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
+"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#: accountlist.c:158
+msgid "Registered"
+msgstr "Registrado"
+
+#: accountlist.c:161
+msgid "Not Registered"
+msgstr "No registrado"
+
+#: accountlist.c:164
+msgid "Trying..."
+msgstr "Tratando..."
+
+#: accountlist.c:167 sflnotify.c:171 sflnotify.c:210
+msgid "Error"
+msgstr "Error"
+
+#: accountlist.c:170
+msgid "Bad authentification"
+msgstr ""
+
+#: accountlist.c:173
+msgid "Network unreachable"
+msgstr ""
+
+#: accountlist.c:175
+#, fuzzy
+msgid "Host unreachable"
+msgstr "_Parte del servidor"
+
+#: accountlist.c:178
+msgid "Invalid"
+msgstr "InvÃ¡lido"
+
+#: accountwindow.c:143
+msgid "Account settings"
+msgstr "ConfiguraciÃ³n de cuentas"
+
+#: accountwindow.c:155
+msgid "Account parameters"
+msgstr "ParÃ metros de Cuenta"
+
+#: accountwindow.c:177
+msgid "_Enabled"
+msgstr "_Activado"
+
+#: accountwindow.c:183 assistant.c:210 assistant.c:264
+msgid "_Alias"
+msgstr "_Alias"
+
+#: accountwindow.c:191
+msgid "_Protocol"
+msgstr "_Protocolo"
+
+#: accountwindow.c:209
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: accountwindow.c:219 assistant.c:218 assistant.c:272
+msgid "_Host name"
+msgstr "_Parte del servidor"
+
+#: accountwindow.c:227 assistant.c:226 assistant.c:280
+msgid "_User name"
+msgstr "_Usuario"
+
+#: accountwindow.c:238 assistant.c:236 assistant.c:290
+msgid "_Password"
+msgstr "_ContraseÃ±a"
+
+#: accountwindow.c:249
+msgid "_Voicemail box #"
+msgstr "_Numero de Caja de Voz"
+
+#: accountwindow.c:260 assistant.c:313
+msgid "Network Address Translation"
+msgstr "ConversiÃ³n de DirecciÃ³n de Red"
+
+#: accountwindow.c:271 assistant.c:322
+msgid "E_nable STUN"
+msgstr "A_ctivar STUN"
+
+#: accountwindow.c:275
+msgid "Enable it if you are behind a firewall, then restart SFLphone"
+msgstr "Activar si esta atras un cortafuego, despues reiniciar SFLphone"
+
+#: accountwindow.c:279
+msgid "_STUN Server"
+msgstr "_Servidor STUN"
+
+#: accountwindow.c:286
+msgid "Format: name.server:port"
+msgstr "Formato: nombre.servidor:puerto"
+
+#: actions.c:57 sflnotify.c:103
+#, c-format
+msgid "%d voice mails"
+msgstr "%d mensajes"
+
+#: actions.c:59
+#, c-format
+msgid "%d voice mail"
+msgstr "%d mensaje"
+
+#: actions.c:80
+#, fuzzy, c-format
+msgid "%s account- %s"
+msgstr "%s cuenta: %s"
+
+#: actions.c:214
+#, fuzzy
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"Incapaz e conectar con el servidor SFLphone.\n"
+" Checa que el demonio estÃ¡ funcionando."
+
+# r sflphone-gtk/src/actions.c: 632
+#: actions.c:741
+#, c-format
+msgid ""
+"<b>Error: No audio codecs found.\n"
+"\n"
+"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
+"b> directory in your home( <i>%s</i> )"
+msgstr ""
+"<b>Error: No codec audio encontrado.\n"
+"\n"
+"</b> Los codecs audio de SFLphone deben estar en <i>%s</i> o en el "
+"directorio <b>.sflphone</b> de su home( <i>%s</i> )"
+
+#: assistant.c:138
+msgid "SFLphone account configuration wizard"
+msgstr "Asistante de ConfiguraciÃ³n de Cuenta SFLphone"
+
+#: assistant.c:165
+#, fuzzy
+msgid "SFLphone 0.8"
+msgstr "Sobre SFLphone"
+
+#: assistant.c:165
+msgid "Welcome to SFLphone!"
+msgstr "Bienvenido en SFLphone!"
+
+#: assistant.c:167
+msgid "This installation wizard will help you configure an account."
+msgstr "Ese asistante de instalaciÃ²n ayuda usted a configurar una cuenta."
+
+#: assistant.c:182
+msgid "VoIP Protocols"
+msgstr "Protocolos VoIP"
+
+#: assistant.c:182
+msgid "Select an account type:"
+msgstr "Escoje un tipo de cuenta:"
+
+#: assistant.c:202
+msgid "SIP account configuration"
+msgstr "ConfiguraciÃ²n de cuenta SIP"
+
+#: assistant.c:202 assistant.c:256
+msgid "Please fill the following information:"
+msgstr "Por favor de llenar esas informaciones:"
+
+#: assistant.c:256
+msgid "IAX2 account configuration"
+msgstr "ConfiguraciÃ²n de cuenta IAX2"
+
+#: assistant.c:313
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+"Probablemente, tiene que activar eso si usted esta atras de un cortafuego."
+
+#: assistant.c:329
+#, fuzzy
+msgid "_STUN server"
+msgstr "_Servidor STUN"
+
+#: assistant.c:346
+msgid "Account Registration"
+msgstr "RegistraciÃ²n de Cuenta"
+
+#: assistant.c:346
+msgid "Congratulations!"
+msgstr "Felicitaciones!"
+
+#: assistant.c:348
+msgid ""
+"This assistant is now finished.\n"
+"\n"
+" You can at any time check your registration state or modify your accounts "
+"parameters in the Options/Accounts window."
+msgstr ""
+"Ese asistante esta terminado.\n"
+"\n"
+" Usted puede checar su estado de registraciÃ²n o cambiar sus parametros de "
+"cuentas en cualquier momento en la ventana de Opciones/Cuentas."
+
+#: audioconf.c:150
+#, c-format
+msgid "audio device index for output = %d\n"
+msgstr ""
+
+#: audioconf.c:558
+msgid "Name"
+msgstr "Nombre"
+
+#: audioconf.c:563
+msgid "Frequency"
+msgstr "Frequencia"
+
+#: audioconf.c:568
+msgid "Bitrate"
+msgstr "Bitrato"
+
+#: audioconf.c:573
+msgid "Bandwidth"
+msgstr "Ancho de banda"
+
+#: audioconf.c:633
+msgid "Pulseaudio"
+msgstr ""
+
+#: audioconf.c:636
+msgid "ALSA"
+msgstr ""
+
+#: audioconf.c:662
+msgid "ALSA plugin"
+msgstr "Plugin ALSA"
+
+#: audioconf.c:684
+msgid "Output"
+msgstr ""
+
+#: audioconf.c:706
+msgid "Input"
+msgstr ""
+
+#: audioconf.c:739
+msgid "_Enable ringtones"
+msgstr "_Permitir los ringtones"
+
+#: audioconf.c:744
+msgid "Choose a ringtone"
+msgstr "Elija un ringtones"
+
+#: audioconf.c:749
+msgid "Audio Files"
+msgstr "Archivos Audio"
+
+#: audioconf.c:774
+msgid "Sound Manager"
+msgstr ""
+
+#: audioconf.c:781
+#, fuzzy
+msgid "ALSA configuration"
+msgstr "ConfiguraciÃ²n de cuenta SIP"
+
+#: audioconf.c:791
+msgid "Codecs"
+msgstr ""
+
+#: audioconf.c:799
+#, fuzzy
+msgid "Ringtones"
+msgstr "_Permitir los ringtones"
+
+#: calltree.c:208
+#, fuzzy, c-format
+msgid "\"Voicemail\" <%s>"
+msgstr "_Numero de Caja de Voz"
+
+#: calltree.c:405 calltree.c:407
+msgid "Place a call"
+msgstr "Llamar"
+
+#: calltree.c:414 calltree.c:416
+msgid "Pick up"
+msgstr "Colgar"
+
+#: calltree.c:424 calltree.c:426
+msgid "Hang up"
+msgstr "Descolgar"
+
+#: calltree.c:434 calltree.c:436
+msgid "Off Hold"
+msgstr "Seguir"
+
+#: calltree.c:445 calltree.c:447
+msgid "On Hold"
+msgstr "Sostener"
+
+#: calltree.c:458 calltree.c:460
+msgid "Transfer"
+msgstr "Transferir"
+
+#: calltree.c:470 calltree.c:472
+#, fuzzy
+msgid "History"
+msgstr "Historia de Llamada"
+
+#: calltree.c:480 calltree.c:484
+#, fuzzy
+msgid "Voicemail"
+msgstr "%d mensaje"
+
+#: configwindow.c:371
+msgid "Protocol"
+msgstr "Protocolo"
+
+#: configwindow.c:378
+msgid "Status"
+msgstr "Estado"
+
+#: configwindow.c:470
+msgid "Desktop Notification"
+msgstr "NotificaciÃ³n de Escritorio"
+
+#: configwindow.c:478
+msgid "_Enable"
+msgstr "_Activar"
+
+#: configwindow.c:483
+#, fuzzy
+msgid "_Notify voice mails"
+msgstr "_Notificar Mensajes Vocales"
+
+#: configwindow.c:489
+msgid "System Tray Icon"
+msgstr "Icono de Bandeja del Sistema"
+
+#: configwindow.c:497
+#, fuzzy
+msgid "_Popup main window on incoming call"
+msgstr "_Popup Ventana Principal por las Llamadas Recibidas"
+
+#: configwindow.c:502
+#, fuzzy
+msgid "Ne_ver popup main window"
+msgstr "_Jamas Popup Ventana Principal"
+
+#: configwindow.c:506
+#, fuzzy
+msgid "_Start hidden"
+msgstr "_Iniciar Escondido"
+
+#: configwindow.c:512
+msgid "Calls History"
+msgstr "Historia de Llamada"
+
+#: configwindow.c:520
+msgid "_Maximum number of calls"
+msgstr "_Numero Maximo de Llamadas"
+
+#: configwindow.c:536
+msgid "PulseAudio sound server"
+msgstr ""
+
+#: configwindow.c:544
+msgid "_Control running applications volume"
+msgstr ""
+
+#: configwindow.c:557
+msgid "SIP Port"
+msgstr ""
+
+#: configwindow.c:566
+msgid "Apply"
+msgstr ""
+
+#: configwindow.c:570
+msgid "Port:"
+msgstr ""
+
+#: configwindow.c:600
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: configwindow.c:620
+#, fuzzy
+msgid "General Settings"
+msgstr "ConfiguraciÃ³n Audio"
+
+#: configwindow.c:625
+msgid "Audio Settings"
+msgstr "ConfiguraciÃ³n Audio"
+
+#: configwindow.c:649
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: configwindow.c:661
+msgid "Accounts previously setup"
+msgstr "Cuentas existentes"
+
+#: errors.c:28
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"<b>NotificaciÃ³n ALSA</b>\n"
+"\n"
+"Error abriendo el dispositivo del aparato de lectura"
+
+#: errors.c:31
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"<b>NotificaciÃ³n ALSA</b>\n"
+"\n"
+"Error abriendo el dispositivo de captura"
+
+#: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
+msgid "Search"
+msgstr ""
+
+#: mainwindow.c:69
+msgid ""
+"<b>There is one call in progress.</b>\n"
+"Do you still want to quit?"
+msgstr ""
+
+#: mainwindow.c:73
+msgid ""
+"<b>There are calls in progress.</b>\n"
+"Do you still want to quit?"
+msgstr ""
+
+#: menus.c:129
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr ""
+"SFLphone es un telefono por Internet compatible con los protocolos SIP y IAX2"
+
+#: menus.c:132
+msgid "About SFLphone"
+msgstr "Sobre SFLphone"
+
+#: menus.c:155
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: menus.c:272
+msgid "_New call"
+msgstr "_Nueva llamada"
+
+#: menus.c:284 menus.c:768
+msgid "_Pick up"
+msgstr "_Colgar"
+
+#: menus.c:294 menus.c:780
+msgid "_Hang up"
+msgstr "_Descolgar"
+
+#: menus.c:304 menus.c:792
+msgid "On _Hold"
+msgstr "_Sostener"
+
+#: menus.c:320
+msgid "_Account Assistant"
+msgstr "_Asistente de Cuenta"
+
+#: menus.c:350
+msgid "_Call"
+msgstr "_Llamar"
+
+#: menus.c:496
+msgid "History empty"
+msgstr ""
+
+#: menus.c:537
+#, fuzzy
+msgid "_Clear history"
+msgstr "Historia de Llamada"
+
+#: menus.c:549
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: menus.c:564
+msgid "_Edit"
+msgstr "_EdiciÃ³n"
+
+#: menus.c:624
+msgid "_Dialpad"
+msgstr "_Pantalla de numero"
+
+#: menus.c:636
+msgid "_Volume controls"
+msgstr "_Controles de volumen"
+
+#: menus.c:645
+msgid "_Search history"
+msgstr ""
+
+#: menus.c:653
+msgid "_View"
+msgstr "_Ver"
+
+#: menus.c:875
+#, fuzzy
+msgid "_Call back"
+msgstr "_Llamar"
+
+#: sflnotify.c:34 sflnotify.c:100
+#, c-format
+msgid "%s account: %s"
+msgstr "%s cuenta: %s"
+
+#: sflnotify.c:37
+#, c-format
+msgid "<i>From:</i> %s"
+msgstr "<i>De:</i> %s"
+
+#: sflnotify.c:52
+msgid "Accept"
+msgstr "Aceptar"
+
+#: sflnotify.c:53
+msgid "Refuse"
+msgstr "Renunciar"
+
+#: sflnotify.c:54 sflnotify.c:117 sflnotify.c:154
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: sflnotify.c:136
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr ""
+
+#: sflnotify.c:140
+msgid "Current account"
+msgstr ""
+
+#: sflnotify.c:169
+msgid "You haven't setup any accounts"
+msgstr ""
+
+#: sflnotify.c:185 sflnotify.c:224
+#, fuzzy
+msgid "Setup Accounts"
+msgstr "Cuentas"
+
+#: sflnotify.c:208
+msgid "You have no registered accounts"
+msgstr ""
+
+#: sliders.c:161
+msgid "Speakers volume"
+msgstr "Volumen de altavoces"
+
+#: sliders.c:163
+msgid "Mic volume"
+msgstr "Volumen del micrÃ³fono"
+
+#: statusicon.c:91
+#, fuzzy
+msgid "_Show main window"
+msgstr "Mostrar Ventana Principal"
+
+#: statusicon.c:124
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts registered"
+msgstr "SFLphone - %i cuenta registrada"
+
+#: timestamp.c:45
+msgid "<small>Missed call</small>"
+msgstr ""
+
+#: timestamp.c:63
+#, c-format
+msgid "<small>Duration:</small> %s"
+msgstr ""
+
+#~ msgid "Error while opening capture device "
+#~ msgstr "Error abriendo el dispositivo de captura "
+
+#~ msgid "Error while opening playback device "
+#~ msgstr "Error abriendo el dispositivo del aparato de lectura "
+
+#~ msgid "_Toolbar"
+#~ msgstr "_Herramientas"
+
+#~ msgid "Default"
+#~ msgstr "Defecto"
+
+#~ msgid "Set the selected account as the default one to make calls"
+#~ msgstr "Fije la cuenta seleccionada como el defecto para llamar"
+
+#~ msgid "Devices"
+#~ msgstr "Dispositivos"
+
+#~ msgid "Output peripheral"
+#~ msgstr "PerifÃ©rico de salida"
+
+#~ msgid "Input peripheral"
+#~ msgstr "PerifÃ©rico de entrada"
+
+#~ msgid "Detect all"
+#~ msgstr "Detecte todos"
+
+#~ msgid "The account selected as default is not registered."
+#~ msgstr "La cuenta seleccionada como defecto no es registrada."
+
+#~ msgid "There is no registered account to make this call with."
+#~ msgstr "No hay cuenta registrada para hacer esta llamada"
+
+#~ msgid ""
+#~ "<b><big>Welcome to SFLphone!</big></b>\n"
+#~ "\n"
+#~ "There is no VoIP account configured.\n"
+#~ " Would you like to create one now?"
+#~ msgstr ""
+#~ "<b><big>Bienvenido en SFLphone!</big></b>\n"
+#~ "\n"
+#~ "No hay cuenta VoIP configurada.\n"
+#~ " Usted quiere crear una ?"
diff --git a/po/es.po.rej b/po/es.po.rej
new file mode 100644
index 0000000000000000000000000000000000000000..7679722900139c631b29d031f6faa07d8a2729fa
--- /dev/null
+++ b/po/es.po.rej
@@ -0,0 +1,636 @@
+*************** msgid ""
+*** 11,17 ****
+  msgstr ""
+  "Project-Id-Version: SFLphone 0.8.2\n"
+  "Report-Msgid-Bugs-To: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com >\n"
+- "PO-Revision-Date: 2008-03-27 11:15\n"
+  "Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
+  "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
+  "MIME-Version: 1.0\n"
+--- 11,17 ----
+  msgstr ""
+  "Project-Id-Version: SFLphone 0.8.2\n"
+  "Report-Msgid-Bugs-To: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com >\n"
++ "PO-Revision-Date: 2008-08-13 11:53+0200\n"
+  "Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
+  "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
+  "MIME-Version: 1.0\n"
+*************** msgstr ""
+*** 21,39 ****
+  
+  #: src/audio/audiolayer.cpp: 318
+  msgid "Error while opening capture device "
+- msgstr "Error abriendo el dispositivo de captura "
+  
+  #: src/audio/audiolayer.cpp: 349
+  msgid "Error while opening playback device "
+- msgstr "Error abriendo el dispositivo del aparato de lectura "
+  
+  #: sflphone-gtk/src/menus.c: 119
+  msgid "About SFLphone"
+- msgstr "Sobre SFLphone"
+  
+  #: sflphone-gtk/src/menus.c: 124
+  msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+- msgstr "SFLphone es un telefono por Internet compatible con los protocolos SIP y IAX2" 
+  
+  #: sflphone-gtk/src/menus.c: 150
+  msgid "_Help" 
+--- 21,39 ----
+  
+  #: src/audio/audiolayer.cpp: 318
+  msgid "Error while opening capture device "
++ msgstr "Error al abrir el dispositivo de captura "
+  
+  #: src/audio/audiolayer.cpp: 349
+  msgid "Error while opening playback device "
++ msgstr "Error al abrir el dispositivo de reproducciÃ³n "
+  
+  #: sflphone-gtk/src/menus.c: 119
+  msgid "About SFLphone"
++ msgstr "Acerca de SFLphone"
+  
+  #: sflphone-gtk/src/menus.c: 124
+  msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
++ msgstr "SFLphone es un cliente de VoIP compatible con los protocolos SIP y IAX2." 
+  
+  #: sflphone-gtk/src/menus.c: 150
+  msgid "_Help" 
+*************** msgstr "_Nueva llamada"
+*** 45,59 ****
+  
+  #: sflphone-gtk/src/menus.c: 217 menus.c: 605
+  msgid "_Pick up" 
+- msgstr "_Colgar"
+  
+  #: sflphone-gtk/src/menus.c: 225 menus.c: 617
+  msgid "_Hang up"
+- msgstr "_Descolgar"
+  
+  #: sflphone-gtk/src/menus.c: 233 menus.c: 629
+  msgid "On _Hold" 
+- msgstr "_Sostener"
+  
+  #: sflphone-gtk/src/menus.c: 254
+  msgid "_Call"
+--- 45,59 ----
+  
+  #: sflphone-gtk/src/menus.c: 217 menus.c: 605
+  msgid "_Pick up" 
++ msgstr "_Descolgar"
+  
+  #: sflphone-gtk/src/menus.c: 225 menus.c: 617
+  msgid "_Hang up"
++ msgstr "_Colgar"
+  
+  #: sflphone-gtk/src/menus.c: 233 menus.c: 629
+  msgid "On _Hold" 
++ msgstr "En _Espera"
+  
+  #: sflphone-gtk/src/menus.c: 254
+  msgid "_Call"
+*************** msgstr "_Cuentas"
+*** 69,79 ****
+  
+  #: sflphone-gtk/src/menus.c: 438
+  msgid "_Edit"
+- msgstr "_EdiciÃ³n"
+  
+  #: sflphone-gtk/src/menus.c: 462
+  msgid "_Dialpad"
+- msgstr "_Pantalla de numero"
+  
+  #: sflphone-gtk/src/menus.c: 471
+  msgid "_Volume controls"
+--- 69,79 ----
+  
+  #: sflphone-gtk/src/menus.c: 438
+  msgid "_Edit"
++ msgstr "_Editar"
+  
+  #: sflphone-gtk/src/menus.c: 462
+  msgid "_Dialpad"
++ msgstr "_Teclado numÃ©rico"
+  
+  #: sflphone-gtk/src/menus.c: 471
+  msgid "_Volume controls"
+*************** msgstr "Llamar"
+*** 93,103 ****
+  
+  #: sflphone-gtk/src/calltree.c: 343 sflphone-gtk/src/calltree.c: 344
+  msgid "Pick up" 
+- msgstr "Colgar"
+  
+  #: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
+  msgid "Hang up"
+- msgstr "Descolgar"
+  
+  #: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
+  msgid "Off Hold"
+--- 93,103 ----
+  
+  #: sflphone-gtk/src/calltree.c: 343 sflphone-gtk/src/calltree.c: 344
+  msgid "Pick up" 
++ msgstr "Descolgar"
+  
+  #: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
+  msgid "Hang up"
++ msgstr "Colgar"
+  
+  #: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
+  msgid "Off Hold"
+*************** msgstr "Nombre"
+*** 322,332 ****
+  
+  #: sflphone-gtk/src/configwindow.c: 804
+  msgid "Frequency"
+- msgstr "Frequencia"
+  
+  #: sflphone-gtk/src/configwindow.c: 809
+  msgid "Bitrate"
+- msgstr "Bitrato"
+  
+  #: sflphone-gtk/src/configwindow.c: 814
+  msgid "Bandwidth"
+--- 322,332 ----
+  
+  #: sflphone-gtk/src/configwindow.c: 804
+  msgid "Frequency"
++ msgstr "Frecuencia"
+  
+  #: sflphone-gtk/src/configwindow.c: 809
+  msgid "Bitrate"
++ msgstr "Tasa de transferencia"
+  
+  #: sflphone-gtk/src/configwindow.c: 814
+  msgid "Bandwidth"
+*************** msgstr "Estado"
+*** 342,352 ****
+  
+  #: sflphone-gtk/src/configwindow.c: 934
+  msgid "Default"
+- msgstr "Defecto"
+  
+  #: sflphone-gtk/src/configwindow.c: 935
+  msgid "Set the selected account as the default one to make calls"
+- msgstr "Fije la cuenta seleccionada como el defecto para llamar"
+  
+  #: sflphone-gtk/src/configwindow.c: 976
+  msgid "Devices"
+--- 342,352 ----
+  
+  #: sflphone-gtk/src/configwindow.c: 934
+  msgid "Default"
++ msgstr "Predeterminado"
+  
+  #: sflphone-gtk/src/configwindow.c: 935
+  msgid "Set the selected account as the default one to make calls"
++ msgstr "Establecer la cuenta seleccionada como predeterminada para hacer llamadas"
+  
+  #: sflphone-gtk/src/configwindow.c: 976
+  msgid "Devices"
+*************** msgstr "PerifÃ©rico de entrada"
+*** 366,384 ****
+  
+  #: sflphone-gtk/src/configwindow.c: 1080
+  msgid "Detect all"
+- msgstr "Detecte todos"
+  
+  #: sflphone-gtk/src/configwindow.c: 1107
+  msgid "_Enable ringtones"
+- msgstr "_Permitir los ringtones"
+  
+  #: sflphone-gtk/src/configwindow.c: 1112
+  msgid "Choose a ringtone"
+- msgstr "Elija un ringtones"
+  
+  #: sflphone-gtk/src/configwindow.c: 1117
+  msgid "Audio Files"
+- msgstr "Archivos Audio"
+  
+  #: sflphone-gtk/src/configwindow.c: 1142
+  msgid "Preferences"
+--- 366,384 ----
+  
+  #: sflphone-gtk/src/configwindow.c: 1080
+  msgid "Detect all"
++ msgstr "Detectar todos"
+  
+  #: sflphone-gtk/src/configwindow.c: 1107
+  msgid "_Enable ringtones"
++ msgstr "_Habilitar tonos de llamada"
+  
+  #: sflphone-gtk/src/configwindow.c: 1112
+  msgid "Choose a ringtone"
++ msgstr "Elija un tono de llamada"
+  
+  #: sflphone-gtk/src/configwindow.c: 1117
+  msgid "Audio Files"
++ msgstr "Archivos de Audio"
+  
+  #: sflphone-gtk/src/configwindow.c: 1142
+  msgid "Preferences"
+*************** msgstr "Cuentas existentes"
+*** 417,423 ****
+  
+  #: sflphone-gtk/src/configwindow.c: 1254
+  msgid "Desktop Notification"
+- msgstr "NotificaciÃ³n de Escritorio"
+  
+  #: sflphone-gtk/src/configwindow.c: 1263
+  msgid "_Enable"
+--- 417,423 ----
+  
+  #: sflphone-gtk/src/configwindow.c: 1254
+  msgid "Desktop Notification"
++ msgstr "NotificaciÃ³n de escritorio"
+  
+  #: sflphone-gtk/src/configwindow.c: 1263
+  msgid "_Enable"
+*************** msgstr "_Activar"
+*** 425,455 ****
+  
+  #: sflphone-gtk/src/configwindow.c: 1268
+  msgid "_Notify Voice Mails"
+- msgstr "_Notificar Mensajes Vocales"
+  
+  #: sflphone-gtk/src/configwindow.c: 1274
+  msgid "System Tray Icon"
+- msgstr "Icono de Bandeja del Sistema"
+  
+  #: sflphone-gtk/src/configwindow.c: 1283
+  msgid "_Popup Main Window On Incoming Call"
+- msgstr "_Popup Ventana Principal por las Llamadas Recibidas"
+  
+  #: sflphone-gtk/src/configwindow.c: 1288
+  msgid "Ne_ver Popup Main Window"
+- msgstr "_Jamas Popup Ventana Principal"
+  
+  #: sflphone-gtk/src/configwindow.c: 1292
+  msgid "_Start Hidden"
+- msgstr "_Iniciar Escondido"
+  
+  #: sflphone-gtk/src/configwindow.c: 1297
+  msgid "Calls History"
+- msgstr "Historia de Llamada"
+  
+  #: sflphone-gtk/src/configwindow.c: 1307
+  msgid "_Maximum number of calls"
+- msgstr "_Numero Maximo de Llamadas"
+  
+  #: sflphone-gtk/src/accountwindow.c: 139
+  msgid "Account settings"
+--- 425,455 ----
+  
+  #: sflphone-gtk/src/configwindow.c: 1268
+  msgid "_Notify Voice Mails"
++ msgstr "_Notificar mensajes de voz"
+  
+  #: sflphone-gtk/src/configwindow.c: 1274
+  msgid "System Tray Icon"
++ msgstr "Icono de bandeja del sistema"
+  
+  #: sflphone-gtk/src/configwindow.c: 1283
+  msgid "_Popup Main Window On Incoming Call"
++ msgstr "_Mostrar ventana principal al recibir llamadas"
+  
+  #: sflphone-gtk/src/configwindow.c: 1288
+  msgid "Ne_ver Popup Main Window"
++ msgstr "_Nunca mostrar ventana principal"
+  
+  #: sflphone-gtk/src/configwindow.c: 1292
+  msgid "_Start Hidden"
++ msgstr "_Iniciar oculto"
+  
+  #: sflphone-gtk/src/configwindow.c: 1297
+  msgid "Calls History"
++ msgstr "Historial de llamadas"
+  
+  #: sflphone-gtk/src/configwindow.c: 1307
+  msgid "_Maximum number of calls"
++ msgstr "_NÃºmero mÃ¡ximo de llamadas"
+  
+  #: sflphone-gtk/src/accountwindow.c: 139
+  msgid "Account settings"
+*************** msgstr "ConfiguraciÃ³n de cuentas"
+*** 457,463 ****
+  
+  #: sflphone-gtk/src/accountwindow.c: 151
+  msgid "Account parameters"
+- msgstr "ParÃ metros de Cuenta"
+  
+  #: sflphone-gtk/src/accountwindow.c: 174
+  msgid "_Enabled"
+--- 457,463 ----
+  
+  #: sflphone-gtk/src/accountwindow.c: 151
+  msgid "Account parameters"
++ msgstr "ParÃ¡metros de cuenta"
+  
+  #: sflphone-gtk/src/accountwindow.c: 174
+  msgid "_Enabled"
+*************** msgstr "Desconocido"
+*** 477,483 ****
+  
+  #: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
+  msgid "_Host name"
+- msgstr "_Parte del servidor"
+  
+  #: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
+  msgid "_User name"
+--- 477,483 ----
+  
+  #: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
+  msgid "_Host name"
++ msgstr "_Nombre de equipo"
+  
+  #: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
+  msgid "_User name"
+*************** msgstr "_ContraseÃ±a"
+*** 489,499 ****
+  
+  #: sflphone-gtk/src/accountwindow.c: 241
+  msgid "_Voicemail box #"
+- msgstr "_Numero de Caja de Voz"
+  
+  #: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
+  msgid "Network Address Translation"
+- msgstr "ConversiÃ³n de DirecciÃ³n de Red"
+  
+  #: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
+  msgid "E_nable STUN"
+--- 489,499 ----
+  
+  #: sflphone-gtk/src/accountwindow.c: 241
+  msgid "_Voicemail box #"
++ msgstr "_NÃºmero de buzÃ³n de voz"
+  
+  #: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
+  msgid "Network Address Translation"
++ msgstr "ConversiÃ³n de DirecciÃ³n de Red (NAT)"
+  
+  #: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
+  msgid "E_nable STUN"
+*************** msgstr "A_ctivar STUN"
+*** 501,507 ****
+  
+  #: sflphone-gtk/src/accountwindow.c: 267
+  msgid "Enable it if you are behind a firewall, then restart SFLphone"
+- msgstr "Activar si esta atras un cortafuego, despues reiniciar SFLphone"
+  
+  #: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
+  msgid "_STUN Server"
+--- 501,507 ----
+  
+  #: sflphone-gtk/src/accountwindow.c: 267
+  msgid "Enable it if you are behind a firewall, then restart SFLphone"
++ msgstr "ActÃvelo si estÃ¡ detrÃ¡s de un cortafuegos, despuÃ©s reinicie SFLphone"
+  
+  #: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
+  msgid "_STUN Server"
+*************** msgstr "Formato: nombre.servidor:puerto"
+*** 513,556 ****
+  
+  #: sflphone-gtk/src/actions.c: 45
+  msgid "%d voice mails"
+- msgstr "%d mensajes"
+  
+  #: sflphone-gtk/src/actions.c: 47
+  msgid "%d voice mail"
+- msgstr "%d mensaje"
+  
+  #: sflphone-gtk/src/actions.c: 162
+  msgid "Unable to connect to the SFLphone server.\n"
+  " Make sure the daemon is running."
+- msgstr "Incapaz e conectar con el servidor SFLphone.\n"
+- " Checa que el demonio estÃ¡ funcionando."
+  
+  #: sflphone-gtk/src/actions.c: 544
+  msgid "The account selected as default is not registered."
+- msgstr "La cuenta seleccionada como defecto no es registrada."
+  
+  #: sflphone-gtk/src/actions.c: 557
+  msgid "There is no registered account to make this call with."
+- msgstr "No hay cuenta registrada para hacer esta llamada"
+  
+  #: sflphone-gtk/src/actions.c: 591
+  msgid "<b>ALSA notification</b>\n\n"
+  "Error while opening playback device"
+  msgstr "<b>NotificaciÃ³n ALSA</b>\n\n"
+- "Error abriendo el dispositivo del aparato de lectura"
+  
+  #: sflphone-gtk/src/actions.c: 594
+  msgid "<b>ALSA notification</b>\n\n"
+  "Error while opening capture device"
+  msgstr "<b>NotificaciÃ³n ALSA</b>\n\n"
+- "Error abriendo el dispositivo de captura"
+  
+  #r sflphone-gtk/src/actions.c: 632
+  msgid "<b>Error: No audio codecs found.\n\n</b>"
+  " SFL audio codecs have to be placed in <i>%s</i>"
+  " or in the <b>.sflphone</b> directory in your home( <i>%s</i> )"
+- msgstr "<b>Error: No codec audio encontrado.\n\n</b>"
+- " Los codecs audio de SFLphone deben estar en <i>%s</i>"
+  " o en el directorio <b>.sflphone</b> de su home( <i>%s</i> )"
+  
+  #: sflphone-gtk/src/accountlist.c: 148 
+--- 513,556 ----
+  
+  #: sflphone-gtk/src/actions.c: 45
+  msgid "%d voice mails"
++ msgstr "%d mensajes de voz"
+  
+  #: sflphone-gtk/src/actions.c: 47
+  msgid "%d voice mail"
++ msgstr "%d mensaje de voz"
+  
+  #: sflphone-gtk/src/actions.c: 162
+  msgid "Unable to connect to the SFLphone server.\n"
+  " Make sure the daemon is running."
++ msgstr "Incapaz de conectar con el servidor SFLphone.\n"
++ " AsegÃºrese de que el demonio estÃ© funcionando."
+  
+  #: sflphone-gtk/src/actions.c: 544
+  msgid "The account selected as default is not registered."
++ msgstr "La cuenta seleccionada como predeterminada no estÃ¡ registrada."
+  
+  #: sflphone-gtk/src/actions.c: 557
+  msgid "There is no registered account to make this call with."
++ msgstr "No hay ninguna cuenta registrada para hacer esta llamada."
+  
+  #: sflphone-gtk/src/actions.c: 591
+  msgid "<b>ALSA notification</b>\n\n"
+  "Error while opening playback device"
+  msgstr "<b>NotificaciÃ³n ALSA</b>\n\n"
++ "Error al abrir el dispositivo de reproducciÃ³n"
+  
+  #: sflphone-gtk/src/actions.c: 594
+  msgid "<b>ALSA notification</b>\n\n"
+  "Error while opening capture device"
+  msgstr "<b>NotificaciÃ³n ALSA</b>\n\n"
++ "Error al abrir el dispositivo de captura"
+  
+  #r sflphone-gtk/src/actions.c: 632
+  msgid "<b>Error: No audio codecs found.\n\n</b>"
+  " SFL audio codecs have to be placed in <i>%s</i>"
+  " or in the <b>.sflphone</b> directory in your home( <i>%s</i> )"
++ msgstr "<b>Error: Codecs de audio no encontrados.\n\n</b>"
++ " Los codecs de audio de SFLphone deben estar en <i>%s</i>"
+  " o en el directorio <b>.sflphone</b> de su home( <i>%s</i> )"
+  
+  #: sflphone-gtk/src/accountlist.c: 148 
+*************** msgstr "No registrado"
+*** 563,569 ****
+  
+  #: sflphone-gtk/src/accountlist.c: 154
+  msgid "Trying..."
+- msgstr "Tratando..."
+  
+  #: sflphone-gtk/src/accountlist.c: 157
+  msgid "Error"
+--- 563,569 ----
+  
+  #: sflphone-gtk/src/accountlist.c: 154
+  msgid "Trying..."
++ msgstr "Intentando..."
+  
+  #: sflphone-gtk/src/accountlist.c: 157
+  msgid "Error"
+*************** msgid "<b><big>Welcome to SFLphone!</big
+*** 586,593 ****
+  "There is no VoIP account configured.\n"
+  " Would you like to create one now?"
+  msgstr "<b><big>Bienvenido en SFLphone!</big></b>\n\n"
+- "No hay cuenta VoIP configurada.\n"
+- " Usted quiere crear una ?"
+  
+  #: sflphone-gtk/src/SFLnotify.c: 32
+  msgid "%s account: %s"
+--- 586,593 ----
+  "There is no VoIP account configured.\n"
+  " Would you like to create one now?"
+  msgstr "<b><big>Bienvenido en SFLphone!</big></b>\n\n"
++ "No hay ninguna cuenta VoIP configurada.\n"
++ " Â¿Quiere crear una?"
+  
+  #: sflphone-gtk/src/SFLnotify.c: 32
+  msgid "%s account: %s"
+*************** msgstr "Ignorar"
+*** 550,556 ****
+  
+  #: sflphone-gtk/src/statusicon.c: 80 
+  msgid "Show main window"
+- msgstr "Mostrar Ventana Principal"
+  
+  #: sflphone-gtk/src/statusicon.c: 113
+  msgid "SFLphone - %i account registered"
+--- 550,556 ----
+  
+  #: sflphone-gtk/src/statusicon.c: 80 
+  msgid "Show main window"
++ msgstr "Mostrar ventana principal"
+  
+  #: sflphone-gtk/src/statusicon.c: 113
+  msgid "SFLphone - %i account registered"
+*************** msgstr[1] "SFLphone - %i cuentas registr
+*** 560,574 ****
+  
+  #: sflphone-gtk/src/assistant.c: 91
+  msgid "SFLphone account configuration wizard"
+- msgstr "Asistante de ConfiguraciÃ³n de Cuenta SFLphone"
+  
+  #: sflphone-gtk/src/assistant.c: 122
+  msgid "Welcome to SFLphone!"
+- msgstr "Bienvenido en SFLphone!"
+  
+  #: sflphone-gtk/src/assistant.c: 119
+  msgid "This installation wizard will help you configure an account."
+- msgstr "Ese asistante de instalaciÃ²n ayuda usted a configurar una cuenta."
+  
+  #: sflphone-gtk/src/assistant.c: 134
+  msgid "VoIP Protocols"
+--- 560,574 ----
+  
+  #: sflphone-gtk/src/assistant.c: 91
+  msgid "SFLphone account configuration wizard"
++ msgstr "Asistente de configuraciÃ³n de cuentas de SFLphone"
+  
+  #: sflphone-gtk/src/assistant.c: 122
+  msgid "Welcome to SFLphone!"
++ msgstr "Â¡Bienvenido a SFLphone!"
+  
+  #: sflphone-gtk/src/assistant.c: 119
+  msgid "This installation wizard will help you configure an account."
++ msgstr "Este asistente de instalaciÃ³n le ayudarÃ¡ a configurar una cuenta."
+  
+  #: sflphone-gtk/src/assistant.c: 134
+  msgid "VoIP Protocols"
+*************** msgstr "Protocolos VoIP"
+*** 576,608 ****
+  
+  #: sflphone-gtk/src/assistant.c: 134
+  msgid "Select an account type:"
+- msgstr "Escoje un tipo de cuenta:"
+  
+  #: sflphone-gtk/src/assistant.c: 153
+  msgid "SIP account configuration"
+- msgstr "ConfiguraciÃ²n de cuenta SIP"
+  
+  #: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
+  msgid "Please fill the following information:"
+- msgstr "Por favor de llenar esas informaciones:"
+  
+  #: sflphone-gtk/src/assistant.c: 202
+  msgid "IAX2 account configuration"
+- msgstr "ConfiguraciÃ²n de cuenta IAX2"
+  
+  #: sflphone-gtk/src/assistant.c: 256
+  msgid "You should probably enable this if you are behind a firewall."
+- msgstr "Probablemente, tiene que activar eso si usted esta atras de un cortafuego."
+  
+  #: sflphone-gtk/src/assistant.c: 289
+  msgid "Account Registration"
+- msgstr "RegistraciÃ²n de Cuenta"
+  
+  #: sflphone-gtk/src/assistant.c: 289
+  msgid "Congratulations!"
+- msgstr "Felicitaciones!"
+  
+  #: sflphone-gtk/src/assistant.c: 291
+  msgid "This assistant is now finished.\n\n You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window."
+- msgstr "Ese asistante esta terminado.\n\n Usted puede checar su estado de registraciÃ²n o cambiar sus parametros de cuentas en cualquier momento en la ventana de Opciones/Cuentas."
+  
+--- 576,608 ----
+  
+  #: sflphone-gtk/src/assistant.c: 134
+  msgid "Select an account type:"
++ msgstr "Escoja un tipo de cuenta:"
+  
+  #: sflphone-gtk/src/assistant.c: 153
+  msgid "SIP account configuration"
++ msgstr "ConfiguraciÃ³n de cuenta SIP"
+  
+  #: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
+  msgid "Please fill the following information:"
++ msgstr "Por favor, rellene la siguiente informaciÃ³n:"
+  
+  #: sflphone-gtk/src/assistant.c: 202
+  msgid "IAX2 account configuration"
++ msgstr "ConfiguraciÃ³n de cuenta IAX2"
+  
+  #: sflphone-gtk/src/assistant.c: 256
+  msgid "You should probably enable this if you are behind a firewall."
++ msgstr "Probablemente tiene que activar esto si estÃ¡ detrÃ¡s de un cortafuegos."
+  
+  #: sflphone-gtk/src/assistant.c: 289
+  msgid "Account Registration"
++ msgstr "Registro de cuenta"
+  
+  #: sflphone-gtk/src/assistant.c: 289
+  msgid "Congratulations!"
++ msgstr "Â¡Enhorabuena!"
+  
+  #: sflphone-gtk/src/assistant.c: 291
+  msgid "This assistant is now finished.\n\n You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window."
++ msgstr "Este asistente ha finalizado.\n\n  Puede comprobar en cualquier momento su estado de registro o modificar la configuraciÃ³n de sus cuentas en la ventana de Opciones/Cuentas."
+  
diff --git a/po/sflphone_es.po.patch b/po/sflphone_es.po.patch
new file mode 100644
index 0000000000000000000000000000000000000000..80b09273b2ce99e095bc24d5ee842c3e2461d865
--- /dev/null
+++ b/po/sflphone_es.po.patch
@@ -0,0 +1,395 @@
+--- sflphone_es.po.orig	2008-05-21 23:16:55.000000000 +0200
++++ sflphone_es.po	2008-08-13 11:53:32.000000000 +0200
+@@ -11,7 +11,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: SFLphone 0.8.2\n"
+ "Report-Msgid-Bugs-To: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com >\n"
+-"PO-Revision-Date: 2008-03-27 11:15\n"
++"PO-Revision-Date: 2008-08-13 11:53+0200\n"
+ "Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
+ "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
+ "MIME-Version: 1.0\n"
+@@ -21,19 +21,19 @@ msgstr ""
+ 
+ #: src/audio/audiolayer.cpp: 318
+ msgid "Error while opening capture device "
+-msgstr "Error abriendo el dispositivo de captura "
++msgstr "Error al abrir el dispositivo de captura "
+ 
+ #: src/audio/audiolayer.cpp: 349
+ msgid "Error while opening playback device "
+-msgstr "Error abriendo el dispositivo del aparato de lectura "
++msgstr "Error al abrir el dispositivo de reproducciÃ³n "
+ 
+ #: sflphone-gtk/src/menus.c: 119
+ msgid "About SFLphone"
+-msgstr "Sobre SFLphone"
++msgstr "Acerca de SFLphone"
+ 
+ #: sflphone-gtk/src/menus.c: 124
+ msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+-msgstr "SFLphone es un telefono por Internet compatible con los protocolos SIP y IAX2" 
++msgstr "SFLphone es un cliente de VoIP compatible con los protocolos SIP y IAX2." 
+ 
+ #: sflphone-gtk/src/menus.c: 150
+ msgid "_Help" 
+@@ -45,15 +45,15 @@ msgstr "_Nueva llamada"
+ 
+ #: sflphone-gtk/src/menus.c: 217 menus.c: 605
+ msgid "_Pick up" 
+-msgstr "_Colgar"
++msgstr "_Descolgar"
+ 
+ #: sflphone-gtk/src/menus.c: 225 menus.c: 617
+ msgid "_Hang up"
+-msgstr "_Descolgar"
++msgstr "_Colgar"
+ 
+ #: sflphone-gtk/src/menus.c: 233 menus.c: 629
+ msgid "On _Hold" 
+-msgstr "_Sostener"
++msgstr "En _Espera"
+ 
+ #: sflphone-gtk/src/menus.c: 254
+ msgid "_Call"
+@@ -69,11 +69,11 @@ msgstr "_Cuentas"
+ 
+ #: sflphone-gtk/src/menus.c: 438
+ msgid "_Edit"
+-msgstr "_EdiciÃ³n"
++msgstr "_Editar"
+ 
+ #: sflphone-gtk/src/menus.c: 462
+ msgid "_Dialpad"
+-msgstr "_Pantalla de numero"
++msgstr "_Teclado numÃ©rico"
+ 
+ #: sflphone-gtk/src/menus.c: 471
+ msgid "_Volume controls"
+@@ -93,11 +93,11 @@ msgstr "Llamar"
+ 
+ #: sflphone-gtk/src/calltree.c: 343 sflphone-gtk/src/calltree.c: 344
+ msgid "Pick up" 
+-msgstr "Colgar"
++msgstr "Descolgar"
+ 
+ #: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
+ msgid "Hang up"
+-msgstr "Descolgar"
++msgstr "Colgar"
+ 
+ #: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
+ msgid "Off Hold"
+@@ -105,7 +105,7 @@ msgstr "Seguir"
+ 
+ #: sflphone-gtk/src/calltree.c: 367 sflphone-gtk/src/calltree.c: 368
+ msgid "On Hold"
+-msgstr "Sostener"
++msgstr "Retener"
+ 
+ #: sflphone-gtk/src/calltree.c: 375 sflphone-gtk/src/calltree.c: 376
+ msgid "Transfer"
+@@ -117,11 +117,11 @@ msgstr "Nombre"
+ 
+ #: sflphone-gtk/src/configwindow.c: 804
+ msgid "Frequency"
+-msgstr "Frequencia"
++msgstr "Frecuencia"
+ 
+ #: sflphone-gtk/src/configwindow.c: 809
+ msgid "Bitrate"
+-msgstr "Bitrato"
++msgstr "Tasa de transferencia"
+ 
+ #: sflphone-gtk/src/configwindow.c: 814
+ msgid "Bandwidth"
+@@ -137,11 +137,11 @@ msgstr "Estado"
+ 
+ #: sflphone-gtk/src/configwindow.c: 934
+ msgid "Default"
+-msgstr "Defecto"
++msgstr "Predeterminado"
+ 
+ #: sflphone-gtk/src/configwindow.c: 935
+ msgid "Set the selected account as the default one to make calls"
+-msgstr "Fije la cuenta seleccionada como el defecto para llamar"
++msgstr "Establecer la cuenta seleccionada como predeterminada para hacer llamadas"
+ 
+ #: sflphone-gtk/src/configwindow.c: 976
+ msgid "Devices"
+@@ -161,19 +161,19 @@ msgstr "PerifÃ©rico de entrada"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1080
+ msgid "Detect all"
+-msgstr "Detecte todos"
++msgstr "Detectar todos"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1107
+ msgid "_Enable ringtones"
+-msgstr "_Permitir los ringtones"
++msgstr "_Habilitar tonos de llamada"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1112
+ msgid "Choose a ringtone"
+-msgstr "Elija un ringtones"
++msgstr "Elija un tono de llamada"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1117
+ msgid "Audio Files"
+-msgstr "Archivos Audio"
++msgstr "Archivos de Audio"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1142
+ msgid "Preferences"
+@@ -181,7 +181,7 @@ msgstr "Preferencias"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1167
+ msgid "Audio Settings"
+-msgstr "ConfiguraciÃ³n Audio"
++msgstr "ConfiguraciÃ³n de audio"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1191
+ msgid "Accounts"
+@@ -193,7 +193,7 @@ msgstr "Cuentas existentes"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1254
+ msgid "Desktop Notification"
+-msgstr "NotificaciÃ³n de Escritorio"
++msgstr "NotificaciÃ³n de escritorio"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1263
+ msgid "_Enable"
+@@ -201,31 +201,31 @@ msgstr "_Activar"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1268
+ msgid "_Notify Voice Mails"
+-msgstr "_Notificar Mensajes Vocales"
++msgstr "_Notificar mensajes de voz"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1274
+ msgid "System Tray Icon"
+-msgstr "Icono de Bandeja del Sistema"
++msgstr "Icono de bandeja del sistema"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1283
+ msgid "_Popup Main Window On Incoming Call"
+-msgstr "_Popup Ventana Principal por las Llamadas Recibidas"
++msgstr "_Mostrar ventana principal al recibir llamadas"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1288
+ msgid "Ne_ver Popup Main Window"
+-msgstr "_Jamas Popup Ventana Principal"
++msgstr "_Nunca mostrar ventana principal"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1292
+ msgid "_Start Hidden"
+-msgstr "_Iniciar Escondido"
++msgstr "_Iniciar oculto"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1297
+ msgid "Calls History"
+-msgstr "Historia de Llamada"
++msgstr "Historial de llamadas"
+ 
+ #: sflphone-gtk/src/configwindow.c: 1307
+ msgid "_Maximum number of calls"
+-msgstr "_Numero Maximo de Llamadas"
++msgstr "_NÃºmero mÃ¡ximo de llamadas"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 139
+ msgid "Account settings"
+@@ -233,7 +233,7 @@ msgstr "ConfiguraciÃ³n de cuentas"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 151
+ msgid "Account parameters"
+-msgstr "ParÃ metros de Cuenta"
++msgstr "ParÃ¡metros de cuenta"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 174
+ msgid "_Enabled"
+@@ -253,7 +253,7 @@ msgstr "Desconocido"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
+ msgid "_Host name"
+-msgstr "_Parte del servidor"
++msgstr "_Nombre de equipo"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
+ msgid "_User name"
+@@ -265,11 +265,11 @@ msgstr "_ContraseÃ±a"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 241
+ msgid "_Voicemail box #"
+-msgstr "_Numero de Caja de Voz"
++msgstr "_NÃºmero de buzÃ³n de voz"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
+ msgid "Network Address Translation"
+-msgstr "ConversiÃ³n de DirecciÃ³n de Red"
++msgstr "ConversiÃ³n de DirecciÃ³n de Red (NAT)"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
+ msgid "E_nable STUN"
+@@ -277,7 +277,7 @@ msgstr "A_ctivar STUN"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 267
+ msgid "Enable it if you are behind a firewall, then restart SFLphone"
+-msgstr "Activar si esta atras un cortafuego, despues reiniciar SFLphone"
++msgstr "ActÃvelo si estÃ¡ detrÃ¡s de un cortafuegos, despuÃ©s reinicie SFLphone"
+ 
+ #: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
+ msgid "_STUN Server"
+@@ -289,44 +289,44 @@ msgstr "Formato: nombre.servidor:puerto"
+ 
+ #: sflphone-gtk/src/actions.c: 45
+ msgid "%d voice mails"
+-msgstr "%d mensajes"
++msgstr "%d mensajes de voz"
+ 
+ #: sflphone-gtk/src/actions.c: 47
+ msgid "%d voice mail"
+-msgstr "%d mensaje"
++msgstr "%d mensaje de voz"
+ 
+ #: sflphone-gtk/src/actions.c: 162
+ msgid "Unable to connect to the SFLphone server.\n"
+ " Make sure the daemon is running."
+-msgstr "Incapaz e conectar con el servidor SFLphone.\n"
+-" Checa que el demonio estÃ¡ funcionando."
++msgstr "Incapaz de conectar con el servidor SFLphone.\n"
++" AsegÃºrese de que el demonio estÃ© funcionando."
+ 
+ #: sflphone-gtk/src/actions.c: 544
+ msgid "The account selected as default is not registered."
+-msgstr "La cuenta seleccionada como defecto no es registrada."
++msgstr "La cuenta seleccionada como predeterminada no estÃ¡ registrada."
+ 
+ #: sflphone-gtk/src/actions.c: 557
+ msgid "There is no registered account to make this call with."
+-msgstr "No hay cuenta registrada para hacer esta llamada"
++msgstr "No hay ninguna cuenta registrada para hacer esta llamada."
+ 
+ #: sflphone-gtk/src/actions.c: 591
+ msgid "<b>ALSA notification</b>\n\n"
+ "Error while opening playback device"
+ msgstr "<b>NotificaciÃ³n ALSA</b>\n\n"
+-"Error abriendo el dispositivo del aparato de lectura"
++"Error al abrir el dispositivo de reproducciÃ³n"
+ 
+ #: sflphone-gtk/src/actions.c: 594
+ msgid "<b>ALSA notification</b>\n\n"
+ "Error while opening capture device"
+ msgstr "<b>NotificaciÃ³n ALSA</b>\n\n"
+-"Error abriendo el dispositivo de captura"
++"Error al abrir el dispositivo de captura"
+ 
+ #r sflphone-gtk/src/actions.c: 632
+ msgid "<b>Error: No audio codecs found.\n\n</b>"
+ " SFL audio codecs have to be placed in <i>%s</i>"
+ " or in the <b>.sflphone</b> directory in your home( <i>%s</i> )"
+-msgstr "<b>Error: No codec audio encontrado.\n\n</b>"
+-" Los codecs audio de SFLphone deben estar en <i>%s</i>"
++msgstr "<b>Error: Codecs de audio no encontrados.\n\n</b>"
++" Los codecs de audio de SFLphone deben estar en <i>%s</i>"
+ " o en el directorio <b>.sflphone</b> de su home( <i>%s</i> )"
+ 
+ #: sflphone-gtk/src/accountlist.c: 148 
+@@ -339,7 +339,7 @@ msgstr "No registrado"
+ 
+ #: sflphone-gtk/src/accountlist.c: 154
+ msgid "Trying..."
+-msgstr "Tratando..."
++msgstr "Intentando..."
+ 
+ #: sflphone-gtk/src/accountlist.c: 157
+ msgid "Error"
+@@ -362,8 +362,8 @@ msgid "<b><big>Welcome to SFLphone!</big
+ "There is no VoIP account configured.\n"
+ " Would you like to create one now?"
+ msgstr "<b><big>Bienvenido en SFLphone!</big></b>\n\n"
+-"No hay cuenta VoIP configurada.\n"
+-" Usted quiere crear una ?"
++"No hay ninguna cuenta VoIP configurada.\n"
++" Â¿Quiere crear una?"
+ 
+ #: sflphone-gtk/src/SFLnotify.c: 32
+ msgid "%s account: %s"
+@@ -379,7 +379,7 @@ msgstr "Aceptar"
+ 
+ #: sflphone-gtk/src/SFLnotify.c: 51
+ msgid "Refuse"
+-msgstr "Renunciar"
++msgstr "Rechazar"
+ 
+ #: sflphone-gtk/src/SFLnotify.c: 52
+ msgid "Ignore"
+@@ -387,7 +387,7 @@ msgstr "Ignorar"
+ 
+ #: sflphone-gtk/src/statusicon.c: 80 
+ msgid "Show main window"
+-msgstr "Mostrar Ventana Principal"
++msgstr "Mostrar ventana principal"
+ 
+ #: sflphone-gtk/src/statusicon.c: 113
+ msgid "SFLphone - %i account registered"
+@@ -397,15 +397,15 @@ msgstr[1] "SFLphone - %i cuentas registr
+ 
+ #: sflphone-gtk/src/assistant.c: 91
+ msgid "SFLphone account configuration wizard"
+-msgstr "Asistante de ConfiguraciÃ³n de Cuenta SFLphone"
++msgstr "Asistente de configuraciÃ³n de cuentas de SFLphone"
+ 
+ #: sflphone-gtk/src/assistant.c: 122
+ msgid "Welcome to SFLphone!"
+-msgstr "Bienvenido en SFLphone!"
++msgstr "Â¡Bienvenido a SFLphone!"
+ 
+ #: sflphone-gtk/src/assistant.c: 119
+ msgid "This installation wizard will help you configure an account."
+-msgstr "Ese asistante de instalaciÃ²n ayuda usted a configurar una cuenta."
++msgstr "Este asistente de instalaciÃ³n le ayudarÃ¡ a configurar una cuenta."
+ 
+ #: sflphone-gtk/src/assistant.c: 134
+ msgid "VoIP Protocols"
+@@ -413,33 +413,33 @@ msgstr "Protocolos VoIP"
+ 
+ #: sflphone-gtk/src/assistant.c: 134
+ msgid "Select an account type:"
+-msgstr "Escoje un tipo de cuenta:"
++msgstr "Escoja un tipo de cuenta:"
+ 
+ #: sflphone-gtk/src/assistant.c: 153
+ msgid "SIP account configuration"
+-msgstr "ConfiguraciÃ²n de cuenta SIP"
++msgstr "ConfiguraciÃ³n de cuenta SIP"
+ 
+ #: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
+ msgid "Please fill the following information:"
+-msgstr "Por favor de llenar esas informaciones:"
++msgstr "Por favor, rellene la siguiente informaciÃ³n:"
+ 
+ #: sflphone-gtk/src/assistant.c: 202
+ msgid "IAX2 account configuration"
+-msgstr "ConfiguraciÃ²n de cuenta IAX2"
++msgstr "ConfiguraciÃ³n de cuenta IAX2"
+ 
+ #: sflphone-gtk/src/assistant.c: 256
+ msgid "You should probably enable this if you are behind a firewall."
+-msgstr "Probablemente, tiene que activar eso si usted esta atras de un cortafuego."
++msgstr "Probablemente tiene que activar esto si estÃ¡ detrÃ¡s de un cortafuegos."
+ 
+ #: sflphone-gtk/src/assistant.c: 289
+ msgid "Account Registration"
+-msgstr "RegistraciÃ²n de Cuenta"
++msgstr "Registro de cuenta"
+ 
+ #: sflphone-gtk/src/assistant.c: 289
+ msgid "Congratulations!"
+-msgstr "Felicitaciones!"
++msgstr "Â¡Enhorabuena!"
+ 
+ #: sflphone-gtk/src/assistant.c: 291
+ msgid "This assistant is now finished.\n\n You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window."
+-msgstr "Ese asistante esta terminado.\n\n Usted puede checar su estado de registraciÃ²n o cambiar sus parametros de cuentas en cualquier momento en la ventana de Opciones/Cuentas."
++msgstr "Este asistente ha finalizado.\n\n  Puede comprobar en cualquier momento su estado de registro o modificar la configuraciÃ³n de sus cuentas en la ventana de Opciones/Cuentas."
+