Merge branch 'po'

Conflicts:
	sflphone-client-gnome/src/accountlist.c
	sflphone-client-kde/po/sflphone-client-kde.pot

lang/copy-in-gnome.sh

+for fichier in `find  .  -name sflphone.po `
+do
+locale=`echo $fichier | cut -d / -f2`
+cp $fichier ../sflphone-client-gnome/po/$locale/sflphone-client-gnome.po
+done

lang/copy-in-kde.sh

+for fichier in `find  .  -name sflphone.po `
+do
+locale=`echo $fichier | cut -d / -f2`
+cp $fichier ../sflphone-client-kde/po/$locale/sflphone-client-kde.po
+done

lang/update.sh

+xgettext --from-code=utf-8 --language=C --language=C++ --kde \
+     -k_  -kc_:1c,2  -kn_:1,2    -ktr2i18n -ktr2i18n:2c,1 -kki18nc:1c,2 -kki18n -ki18n -ki18nc:1c,2 \
+     -o sflphone.pot \
+     ../sflphone-client-kde/src/*.cpp        ../sflphone-client-kde/src/*.h \
+     ../sflphone-client-kde/src/conf/*.h     ../sflphone-client-kde/src/conf/*.cpp \
+     ../sflphone-client-kde/build/src/*.h    ../sflphone-client-kde/build/src/*.cpp \
+     ../sflphone-client-gnome/src/*.c        ../sflphone-client-gnome/src/config/*.c \
+     ../sflphone-client-gnome/src/dbus/*.c   ../sflphone-client-gnome/src/contacts/*.c
+
+for fichier in `find  .  -name *.po `
+do
+msgmerge --update $fichier sflphone.pot
+done
\ No newline at end of file

sflphone-client-gnome/INSTALL

 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
+   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@ debugging `configure').
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -67,42 +67,57 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
@@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,14 +152,36 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -170,9 +207,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +218,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -190,21 +227,29 @@ them in the `configure' command line, using `VAR=value'.  For example:
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -231,6 +276,16 @@ configuration-related scripts to be executed by `/bin/bash'.
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 

sflphone-client-gnome/Makefile.am

-SUBDIRS = src pixmaps tests man
+SUBDIRS = src pixmaps tests man po
 
 ACLOCAL_AMFLAGS = -I m4
 

sflphone-client-gnome/configure.ac

@@ -76,6 +76,7 @@ pixmaps/Makefile
 sflphone.desktop
 tests/Makefile
 man/Makefile
+po/Makefile
 ])
 
 

sflphone-client-gnome/po/Makefile.am

+# location of installation directories
+locale_installdir=$(DESTDIR)$(datadir)/locale
+DOMAIN=sflphone-client-gnome
+
+
+POFILES=\
+	 fr/sflphone-client-gnome.po \
+	 es/sflphone-client-gnome.po \
+	 de/sflphone-client-gnome.po \
+     zh_CN/sflphone-client-gnome.po \
+     zh_HK/sflphone-client-gnome.po \
+	 ru/sflphone-client-gnome.po
+
+MOFILES=\
+	 fr/sflphone-client-gnome.mo \
+	 es/sflphone-client-gnome.mo \
+	 de/sflphone-client-gnome.mo \
+     zh_CN/sflphone-client-gnome.mo \
+     zh_HK/sflphone-client-gnome.mo \
+	 ru/sflphone-client-gnome.mo
+
+MSGFMT=msgfmt
+
+# necessary files
+EXTRA_DIST= $(POFILES)
+
+all:	$(MOFILES)	
+
+# tells automake that toto.po makes toto.mo
+SUFFIXES=.po .mo
+
+.po.mo:
+	$(MSGFMT) -o $@ $<
+
+install-data-local:
+	@catalogs='$(MOFILES)'; \
+	for i in $$catalogs; do \
+		destdir=$(locale_installdir); \
+		lang=`echo $$i | cut -d / -f1`; \
+		$(mkinstalldirs) $(locale_installdir)/$$lang/LC_MESSAGES; \
+		$(INSTALL_DATA) $$i $(locale_installdir)/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
+		echo "installing $$i as $(locale_installdir)/$$lang/LC_MESSAGES/$(DOMAIN).mo"; \
+	done	
+
+uninstall-local:
+	@catalogs='$(MOFILES)'; \
+	for i in $$catalogs; do \
+		destdir=$(locale_installdir); \
+		lang=`echo $$i | sed 's/\.mo//'`; \
+		rm -f $(locale_installdir)/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
+		echo "removing $$i as $(locale_installdir)/$$lang/LC_MESSAGES/$(DOMAIN).mo"; \
+	done
+
+clean-local:
+	rm -rf *.mo

sflphone-client-gnome/po/sflphone_es.po.patch

+--- 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."
+