diff -Nru ekiga-3.2.5/aclocal.m4 ekiga-3.2.6~ppa~karmic1/aclocal.m4
--- ekiga-3.2.5/aclocal.m4	2009-07-06 20:10:32.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/aclocal.m4	2009-09-22 15:36:17.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+[m4_warning([this file was generated for autoconf 2.64.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -31,10 +31,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.2], [],
+m4_if([$1], [1.11], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,7 +50,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
+[AM_AUTOMAKE_VERSION([1.11])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -132,14 +132,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -152,6 +152,7 @@
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -165,14 +166,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
+# serial 10
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -229,6 +230,16 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -246,7 +257,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -256,19 +277,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -332,59 +357,61 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 4
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
@@ -416,13 +443,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 13
+# serial 16
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -439,7 +466,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -490,8 +517,8 @@
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -499,23 +526,36 @@
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
 
 # When config.status generates a header, we must update the stamp-h file.
@@ -539,7 +579,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -550,7 +590,14 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -577,27 +624,38 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
+  AC_SUBST([MAINT])dnl
 ]
 )
 
@@ -605,13 +663,13 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -620,7 +678,7 @@
 [am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -630,24 +688,24 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 AC_SUBST([am__include])
 AC_SUBST([am__quote])
@@ -657,14 +715,14 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 6
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -681,7 +739,14 @@
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -752,14 +817,14 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_SANITY_CHECK
 # ---------------
@@ -768,16 +833,29 @@
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$[*]" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -830,18 +908,25 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
@@ -1458,12 +1543,15 @@
 
 ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
 
+AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
 PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
 	[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
 
 if test "$gdu_cv_have_gdu" = "yes"; then
+	AC_MSG_RESULT([yes])
 	ifelse([$2],,[:],[$2])
 else
+	AC_MSG_RESULT([no])
 	ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
 fi
 
diff -Nru ekiga-3.2.5/config.guess ekiga-3.2.6~ppa~karmic1/config.guess
--- ekiga-3.2.5/config.guess	2009-07-06 20:10:36.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/config.guess	2009-09-22 15:36:21.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -170,7 +170,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -656,7 +656,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -822,6 +822,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -882,40 +885,17 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
@@ -947,7 +927,7 @@
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
@@ -1001,14 +981,6 @@
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -1074,7 +1046,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1154,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
diff -Nru ekiga-3.2.5/config.h.in ekiga-3.2.6~ppa~karmic1/config.h.in
--- ekiga-3.2.5/config.h.in	2009-07-06 20:10:35.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/config.h.in	2009-09-22 15:36:20.000000000 +0100
@@ -85,9 +85,6 @@
 /* SHM Support */
 #undef HAVE_SHM
 
-/* SIP support */
-#undef HAVE_SIP
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -146,6 +143,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff -Nru ekiga-3.2.5/config.sub ekiga-3.2.6~ppa~karmic1/config.sub
--- ekiga-3.2.5/config.sub	2009-07-06 20:10:36.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/config.sub	2009-09-22 15:36:21.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -153,6 +153,9 @@
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -467,6 +470,10 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -1260,7 +1267,7 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -1613,7 +1620,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff -Nru ekiga-3.2.5/configure ekiga-3.2.6~ppa~karmic1/configure
--- ekiga-3.2.5/configure	2009-07-06 20:10:35.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/configure	2009-09-22 15:36:19.000000000 +0100
@@ -1,20 +1,22 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for ekiga 3.2.5.
+# Generated by GNU Autoconf 2.64 for ekiga 3.2.6.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +24,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -46,7 +40,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +57,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,13 +80,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -96,15 +89,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -116,12 +109,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -133,330 +130,301 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
 fi
-
-
 fi
-
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
 
-exitcode=0
-if as_func_success; then
-  :
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
 
-if as_func_ret_success; then
-  :
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_ret_success failed.
+  as_expr=false
 fi
 
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -473,8 +441,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -484,29 +451,18 @@
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -536,7 +492,7 @@
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -555,10 +511,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -573,7 +529,6 @@
 
 
 
-
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -740,14 +695,14 @@
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='ekiga'
 PACKAGE_TARNAME='ekiga'
-PACKAGE_VERSION='3.2.5'
-PACKAGE_STRING='ekiga 3.2.5'
+PACKAGE_VERSION='3.2.6'
+PACKAGE_STRING='ekiga 3.2.6'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga'
+PACKAGE_URL=''
 
 ac_unique_file="src/gui/main.cpp"
 # Factoring default headers for most tests.
@@ -786,7 +741,9 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='LTLIBOBJS
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
 LIBOBJS
 gnomeconfdir
 gnomedatadir
@@ -802,8 +759,6 @@
 CATALOGS
 MSGFMT_OPTS
 GETTEXT_PACKAGE
-HAVE_SIP_FALSE
-HAVE_SIP_TRUE
 HAVE_H323_FALSE
 HAVE_H323_TRUE
 OPAL_LIBS
@@ -1041,6 +996,7 @@
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -1090,6 +1046,7 @@
 enable_gdu
 enable_opal_debug
 enable_static_libs
+enable_h323
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1247,8 +1204,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1274,8 +1230,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1479,8 +1434,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1496,8 +1450,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1527,17 +1480,17 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1554,15 +1507,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1585,8 +1536,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1616,11 +1566,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1659,13 +1607,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1691,7 +1637,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ekiga 3.2.5 to adapt to many kinds of systems.
+\`configure' configures ekiga 3.2.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1762,7 +1708,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ekiga 3.2.5:";;
+     short | recursive ) echo "Configuration of ekiga 3.2.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1812,6 +1758,7 @@
                           ptlib_d) (default is disabled)
   --enable-static-libs    link to opal and ptlib static libraries (default is
                           disabled)
+  --enable-h323           enable H.323 support (default same as opal)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1954,195 +1901,821 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ekiga configure 3.2.5
-generated by GNU Autoconf 2.63
+ekiga configure 3.2.6
+generated by GNU Autoconf 2.64
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
 
-It was created by ekiga $as_me 3.2.5, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  $ $0 $@
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
 
-_ACEOF
-exec 5>>config.log
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
 {
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
 
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+} # ac_fn_c_try_link
 
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
-_ASUNAME
+} # ac_fn_c_check_header_compile
 
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-} >&5
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
 
-cat >&5 <<_ACEOF
+} # ac_fn_c_try_cpp
 
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-## ----------- ##
-## Core tests. ##
-## ----------- ##
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
 
-_ACEOF
+} # ac_fn_c_try_run
 
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
 
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
+#undef $2
 
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
 
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_cxx_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_cxx_try_run
+
+# ac_fn_cxx_check_decl LINENO SYMBOL VAR
+# --------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_cxx_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $2
+  (void) $2;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_cxx_check_decl
+
+# ac_fn_cxx_check_func LINENO FUNC VAR
+# ------------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_cxx_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_cxx_check_func
+
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_cxx_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( cat <<\_ASBOX
+## -------------------------------------------------------------------- ##
+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga ##
+## -------------------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_cxx_check_header_mongrel
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by ekiga $as_me 3.2.6, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
 	case $ac_val in
 	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
@@ -2170,39 +2743,41 @@
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
@@ -2221,7 +2796,7 @@
 do
   test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
@@ -2232,7 +2807,7 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -2240,7 +2815,7 @@
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -2255,11 +2830,11 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -2269,17 +2844,17 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -2291,43 +2866,20 @@
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2338,24 +2890,16 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2369,35 +2913,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2413,28 +2949,24 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2450,28 +2982,24 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then
+if test "${ac_cv_target+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-$as_echo "$as_me: error: invalid value of canonical target" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -2495,7 +3023,7 @@
   program_prefix=${target_alias}-
 
 
-am__api_version='1.10'
+am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2511,10 +3039,10 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2522,11 +3050,11 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2563,7 +3091,7 @@
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -2579,7 +3107,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2590,21 +3118,34 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$*" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
@@ -2614,11 +3155,8 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
    fi
 
    test "$2" = conftest.file
@@ -2627,13 +3165,10 @@
    # Ok.
    :
 else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -2648,20 +3183,136 @@
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
-  am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
 fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2669,7 +3320,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
+    for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -2681,7 +3332,7 @@
 	   esac
 	 done
        done
-done
+  done
 IFS=$as_save_IFS
 
 fi
@@ -2697,7 +3348,7 @@
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
@@ -2710,9 +3361,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2723,24 +3374,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2748,11 +3399,11 @@
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2770,11 +3421,11 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2794,9 +3445,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2812,7 +3461,7 @@
 
 # Define the identity of the package.
  PACKAGE=ekiga
- VERSION=3.2.5
+ VERSION=3.2.6
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2840,108 +3489,6 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.
@@ -2955,16 +3502,17 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
 $as_echo "$USE_MAINTAINER_MODE" >&6; }
    if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
@@ -2991,10 +3539,10 @@
 MAJOR_VERSION=3
 MINOR_VERSION=2
 BUILD_TYPE=ReleaseCode
-BUILD_NUMBER=5
+BUILD_NUMBER=6
 
-PTLIB_REC_VERSION="2.6.4"
-OPAL_REC_VERSION="3.6.4"
+PTLIB_REC_VERSION="2.6.5"
+OPAL_REC_VERSION="3.6.6"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3024,9 +3572,9 @@
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -3039,14 +3587,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -3054,10 +3602,10 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3067,9 +3615,9 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -3082,14 +3630,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -3097,10 +3645,10 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3109,7 +3657,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3122,13 +3670,13 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	else
-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
@@ -3137,7 +3685,7 @@
 
 case `pwd` in
   *\ * | *\	*)
-    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
@@ -3168,44 +3716,44 @@
 am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
 $as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
 $as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
   enableval=$enable_dependency_tracking;
 fi
 
@@ -3230,9 +3778,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3243,24 +3791,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3270,9 +3818,9 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3283,24 +3831,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3309,7 +3857,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3323,9 +3871,9 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3336,24 +3884,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3363,9 +3911,9 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3377,18 +3925,18 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -3407,10 +3955,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3422,9 +3970,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3435,24 +3983,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3466,9 +4014,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3479,24 +4027,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3509,7 +4057,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3520,73 +4068,55 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+#include <stdio.h>
 int
 main ()
 {
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 $as_echo_n "checking for C compiler default output file name... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
@@ -3603,17 +4133,17 @@
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -3630,7 +4160,7 @@
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -3649,84 +4179,75 @@
 else
   ac_file=''
 fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
+if test -z "$ac_file"; then :
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 fi
-
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 $as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
+  { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3741,32 +4262,24 @@
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3778,17 +4291,17 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3801,31 +4314,23 @@
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3839,37 +4344,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -3878,20 +4362,16 @@
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3902,35 +4382,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3941,36 +4397,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3981,42 +4413,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -4033,18 +4440,14 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -4101,32 +4504,9 @@
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -4137,17 +4517,19 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4157,9 +4539,9 @@
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4185,6 +4567,11 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -4202,7 +4589,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -4212,19 +4609,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -4248,7 +4649,7 @@
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
@@ -4263,9 +4664,9 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -4273,7 +4674,7 @@
        ac_script="$ac_script$as_nl$ac_script"
      done
      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     $as_unset ac_script || ac_script=
+     { ac_script=; unset ac_script;}
      if test -z "$SED"; then
   ac_path_SED_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -4282,7 +4683,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in sed gsed; do
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
@@ -4302,7 +4703,7 @@
     $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
@@ -4317,19 +4718,17 @@
       $ac_path_SED_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
@@ -4347,9 +4746,9 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4360,7 +4759,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
+    for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -4380,7 +4779,7 @@
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -4395,26 +4794,24 @@
       $ac_path_GREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4428,7 +4825,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
+    for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -4448,7 +4845,7 @@
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -4463,12 +4860,10 @@
       $ac_path_EGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4476,14 +4871,14 @@
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then
+if test "${ac_cv_path_FGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -4497,7 +4892,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in fgrep; do
+    for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
@@ -4517,7 +4912,7 @@
     $as_echo 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_FGREP="$ac_path_FGREP"
@@ -4532,12 +4927,10 @@
       $ac_path_FGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -4545,7 +4938,7 @@
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
 $as_echo "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
@@ -4571,7 +4964,7 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -4580,7 +4973,7 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -4610,13 +5003,13 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -4647,18 +5040,16 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -4671,7 +5062,7 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
@@ -4683,9 +5074,9 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
+if test "${lt_cv_path_NM+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -4732,7 +5123,7 @@
   : ${lt_cv_path_NM=no}
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
 if test "$lt_cv_path_NM" != "no"; then
   NM="$lt_cv_path_NM"
@@ -4743,9 +5134,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -4756,24 +5147,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
 $as_echo "$DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4787,9 +5178,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -4800,24 +5191,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
 $as_echo "$ac_ct_DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4830,7 +5221,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4850,44 +5241,44 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then
+if test "${lt_cv_nm_interface+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4860: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5251: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4863: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5254: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4866: output\"" >&5)
+  (eval echo "\"\$as_me:5257: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
   fi
   rm -f conftest*
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
@@ -5005,10 +5396,10 @@
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: none" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 $as_echo "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
@@ -5022,7 +5413,7 @@
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
 # Try some XSI features
 xsi_shell=no
@@ -5032,17 +5423,17 @@
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
 $as_echo "$xsi_shell" >&6; }
 
 
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
 lt_shell_append=no
 ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
     >/dev/null 2>&1 \
   && lt_shell_append=yes
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
 $as_echo "$lt_shell_append" >&6; }
 
 
@@ -5077,14 +5468,14 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
 $as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
@@ -5113,9 +5504,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -5126,24 +5517,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5153,9 +5544,9 @@
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -5166,24 +5557,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5192,7 +5583,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5212,9 +5603,9 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -5408,7 +5799,7 @@
 esac
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
@@ -5428,9 +5819,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
+if test "${ac_cv_prog_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -5441,24 +5832,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5468,9 +5859,9 @@
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -5481,24 +5872,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5507,7 +5898,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5533,9 +5924,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -5546,24 +5937,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5573,9 +5964,9 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -5586,24 +5977,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5612,7 +6003,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5632,9 +6023,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -5645,24 +6036,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5672,9 +6063,9 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -5685,24 +6076,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5711,7 +6102,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5789,9 +6180,9 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5907,18 +6298,18 @@
 int main(){nm_test_var='a';nm_test_func();return(0);}
 _LT_EOF
 
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -5971,11 +6362,11 @@
 	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$lt_save_LIBS"
@@ -6009,10 +6400,10 @@
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:$LINENO: result: failed" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
 $as_echo "failed" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: ok" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
 fi
 
@@ -6039,7 +6430,7 @@
 
 
 # Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
+if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
@@ -6051,11 +6442,11 @@
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE="32"
@@ -6069,12 +6460,12 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6072 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  echo '#line 6463 "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
@@ -6108,11 +6499,11 @@
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
       *32-bit*)
 	case $host in
@@ -6161,9 +6552,9 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -6172,11 +6563,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6187,38 +6574,13 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_cc_needs_belf=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_cc_needs_belf=no
+  lt_cv_cc_needs_belf=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6226,7 +6588,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -6236,11 +6598,11 @@
 sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
@@ -6266,9 +6628,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -6279,24 +6641,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
 $as_echo "$DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6306,9 +6668,9 @@
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -6319,24 +6681,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
 $as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6345,7 +6707,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6358,9 +6720,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -6371,24 +6733,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
 $as_echo "$NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6398,9 +6760,9 @@
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -6411,24 +6773,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
 $as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6437,7 +6799,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6450,9 +6812,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then
+if test "${ac_cv_prog_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -6463,24 +6825,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
 $as_echo "$LIPO" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6490,9 +6852,9 @@
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -6503,24 +6865,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
 $as_echo "$ac_ct_LIPO" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6529,7 +6891,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6542,9 +6904,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -6555,24 +6917,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
 $as_echo "$OTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6582,9 +6944,9 @@
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -6595,24 +6957,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
 $as_echo "$ac_ct_OTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6621,7 +6983,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6634,9 +6996,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -6647,24 +7009,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
 $as_echo "$OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6674,9 +7036,9 @@
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -6687,24 +7049,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
 $as_echo "$ac_ct_OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6713,7 +7075,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6749,9 +7111,9 @@
 
 
 
-    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
@@ -6776,22 +7138,18 @@
 	rm -f conftest.*
       fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6802,42 +7160,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_ld_exported_symbols_list=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_ld_exported_symbols_list=no
+  lt_cv_ld_exported_symbols_list=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
@@ -6879,14 +7212,14 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -6901,11 +7234,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -6914,78 +7243,34 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -6997,7 +7282,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -7008,11 +7293,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -7021,87 +7302,40 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -7111,16 +7345,12 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7135,48 +7365,23 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -7186,18 +7391,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -7207,14 +7408,10 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -7241,118 +7438,34 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7362,62 +7475,13 @@
 done
 
 
-
 for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DLFCN_H 1
 _ACEOF
 
 fi
@@ -7437,7 +7501,7 @@
 
 
             # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
+if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -7468,7 +7532,7 @@
 
 
   # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
+if test "${enable_static+set}" = set; then :
   enableval=$enable_static; p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
@@ -7500,7 +7564,7 @@
 
 
 # Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
+if test "${with_pic+set}" = set; then :
   withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
@@ -7516,7 +7580,7 @@
 
 
   # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
+if test "${enable_fast_install+set}" = set; then :
   enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -7597,9 +7661,9 @@
    setopt NO_GLOB_SUBST
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then
+if test "${lt_cv_objdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -7612,7 +7676,7 @@
 fi
 rmdir .libs 2>/dev/null
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
 $as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
@@ -7705,9 +7769,9 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -7758,10 +7822,10 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7771,9 +7835,9 @@
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:$LINENO: checking for file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -7824,10 +7888,10 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7904,9 +7968,9 @@
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -7922,11 +7986,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7925: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7989: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7929: \$? = $ac_status" >&5
+   echo "$as_me:7993: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7939,7 +8003,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
@@ -7959,7 +8023,7 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
@@ -8231,7 +8295,7 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
 $as_echo "$lt_prog_compiler_pic" >&6; }
 
 
@@ -8243,9 +8307,9 @@
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -8261,11 +8325,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8264: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8328: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8268: \$? = $ac_status" >&5
+   echo "$as_me:8332: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8278,7 +8342,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
@@ -8302,9 +8366,9 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -8330,7 +8394,7 @@
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
@@ -8345,9 +8409,9 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -8366,11 +8430,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8369: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8433: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8373: \$? = $ac_status" >&5
+   echo "$as_me:8437: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8392,7 +8456,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -8400,9 +8464,9 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -8421,11 +8485,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8424: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8488: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8428: \$? = $ac_status" >&5
+   echo "$as_me:8492: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8447,7 +8511,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -8456,7 +8520,7 @@
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -8464,10 +8528,10 @@
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -8480,7 +8544,7 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -8926,11 +8990,7 @@
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -8939,29 +8999,9 @@
 
   ;
   return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -8975,16 +9015,9 @@
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -8997,11 +9030,7 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9012,27 +9041,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -9046,16 +9055,9 @@
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -9267,42 +9269,16 @@
 	# implicitly export all symbols.
         save_LDFLAGS="$LDFLAGS"
         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat >conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 int foo(void) {}
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
         LDFLAGS="$save_LDFLAGS"
       else
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -9558,7 +9534,7 @@
     fi
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
@@ -9595,16 +9571,16 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -9618,11 +9594,11 @@
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag
         allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
         then
 	  archive_cmds_need_lc=no
         else
@@ -9633,7 +9609,7 @@
         cat conftest.err 1>&5
       fi
       $RM conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
 $as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
@@ -9797,7 +9773,7 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test "$GCC" = yes; then
@@ -10219,11 +10195,7 @@
   save_libdir=$libdir
   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10234,41 +10206,13 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
   shlibpath_overrides_runpath=yes
 fi
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$save_LDFLAGS
   libdir=$save_libdir
 
@@ -10492,7 +10436,7 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
@@ -10594,7 +10538,7 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -10619,7 +10563,7 @@
   # directories.
   hardcode_action=unsupported
 fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink ||
@@ -10664,18 +10608,14 @@
 
   darwin*)
   # if libdl is installed we need to link against it
-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -10693,43 +10633,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -10742,106 +10657,18 @@
     ;;
 
   *)
-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_shl_load=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load"
 else
-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -10859,145 +10686,32 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
+  ac_cv_lib_dld_shl_load=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_dlopen=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11015,57 +10729,28 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11083,57 +10768,28 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_svld_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
+  ac_cv_lib_svld_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11151,43 +10807,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_dld_link=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
+  ac_cv_lib_dld_dld_link=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -11226,9 +10857,9 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
+if test "${lt_cv_dlopen_self+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -11237,7 +10868,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11240 "configure"
+#line 10871 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11296,11 +10927,11 @@
   return status;
 }
 _LT_EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -11317,14 +10948,14 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -11333,7 +10964,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11336 "configure"
+#line 10967 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11392,11 +11023,11 @@
   return status;
 }
 _LT_EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -11413,7 +11044,7 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
@@ -11452,12 +11083,12 @@
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
@@ -11466,15 +11097,15 @@
     if test -n "$STRIP" ; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
     else
-      { $as_echo "$as_me:$LINENO: result: no" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     fi
     ;;
   *)
-    { $as_echo "$as_me:$LINENO: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     ;;
   esac
@@ -11492,12 +11123,12 @@
 
 
   # Report which library types will actually be built
-  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
 $as_echo "$can_build_shared" >&6; }
 
-  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
   test "$can_build_shared" = "no" && enable_shared=no
 
@@ -11518,14 +11149,14 @@
     fi
     ;;
   esac
-  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
 $as_echo "$enable_shared" >&6; }
 
-  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
 
@@ -11561,18 +11192,14 @@
 
 
 
-   { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
-if test "${ac_cv_prog_cc_c99+set}" = set; then
+if test "${ac_cv_prog_cc_c99+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c99=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdbool.h>
@@ -11714,32 +11341,9 @@
 for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c99=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c99" != "xno" && break
 done
@@ -11750,17 +11354,19 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c99" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c99"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
 $as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
 
+fi
 
 
 ac_ext=cpp
@@ -11777,9 +11383,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -11790,24 +11396,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11821,9 +11427,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -11834,24 +11440,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11864,7 +11470,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -11875,53 +11481,36 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11935,37 +11524,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
@@ -11974,20 +11542,16 @@
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11998,35 +11562,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12037,36 +11577,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12077,42 +11593,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -12137,9 +11628,9 @@
 
 depcc="$CXX"  am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -12165,6 +11656,11 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -12182,7 +11678,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -12192,19 +11698,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -12228,7 +11738,7 @@
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
@@ -12258,9 +11768,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -12271,24 +11781,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12302,9 +11812,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -12315,24 +11825,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12345,7 +11855,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -12356,53 +11866,36 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12416,37 +11909,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
@@ -12455,20 +11927,16 @@
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12479,35 +11947,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12518,36 +11962,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12558,42 +11978,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -12618,9 +12013,9 @@
 
 depcc="$CXX"  am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -12646,6 +12041,11 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -12663,7 +12063,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -12673,19 +12083,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -12709,7 +12123,7 @@
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
@@ -12732,10 +12146,10 @@
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
@@ -12750,11 +12164,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -12763,78 +12173,34 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -12846,7 +12212,7 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
 $as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -12857,11 +12223,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -12870,81 +12232,37 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 _lt_caught_CXX_error=yes; }
 fi
@@ -13087,7 +12405,7 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -13096,7 +12414,7 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -13126,13 +12444,13 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -13163,18 +12481,16 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -13187,7 +12503,7 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
@@ -13242,7 +12558,7 @@
     fi
 
     # PORTME: fill in a description of your system's C++ link characteristics
-    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
     ld_shlibs_CXX=yes
     case $host_os in
@@ -13343,11 +12659,7 @@
           allow_undefined_flag_CXX='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13358,27 +12670,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -13392,16 +12684,9 @@
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -13415,11 +12700,7 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13430,27 +12711,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -13464,16 +12725,9 @@
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -14217,7 +13471,7 @@
         ;;
     esac
 
-    { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
     test "$ld_shlibs_CXX" = no && can_build_shared=no
 
@@ -14245,11 +13499,11 @@
 };
 _LT_EOF
 
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
 
@@ -14430,7 +13684,7 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
@@ -14747,7 +14001,7 @@
     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
 $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 
@@ -14756,9 +14010,9 @@
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_CXX=no
@@ -14774,11 +14028,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14777: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14031: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14781: \$? = $ac_status" >&5
+   echo "$as_me:14035: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14791,7 +14045,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
@@ -14812,9 +14066,9 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
@@ -14840,7 +14094,7 @@
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
@@ -14852,9 +14106,9 @@
 
 
 
-    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -14873,11 +14127,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14876: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14130: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14880: \$? = $ac_status" >&5
+   echo "$as_me:14134: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14899,14 +14153,14 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 
-    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -14925,11 +14179,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14928: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14182: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14932: \$? = $ac_status" >&5
+   echo "$as_me:14186: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14951,7 +14205,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
@@ -14960,7 +14214,7 @@
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -14968,10 +14222,10 @@
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -14981,7 +14235,7 @@
 
 
 
-    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -15010,7 +14264,7 @@
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
@@ -15038,16 +14292,16 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -15061,11 +14315,11 @@
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
         allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
         then
 	  archive_cmds_need_lc_CXX=no
         else
@@ -15076,7 +14330,7 @@
         cat conftest.err 1>&5
       fi
       $RM conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
 $as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
@@ -15147,7 +14401,7 @@
 
 
 
-    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 library_names_spec=
@@ -15517,11 +14771,7 @@
   save_libdir=$libdir
   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -15532,41 +14782,13 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+if ac_fn_cxx_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
   shlibpath_overrides_runpath=yes
 fi
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$save_LDFLAGS
   libdir=$save_libdir
 
@@ -15790,7 +15012,7 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
@@ -15841,7 +15063,7 @@
 
 
 
-    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" ||
@@ -15866,7 +15088,7 @@
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
 $as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink ||
@@ -15905,17 +15127,13 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
+if test "${ac_cv_search_strerror+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15940,69 +15158,38 @@
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_search_strerror=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_strerror+set}" = set; then
-  :
+if test "${ac_cv_search_strerror+set}" = set; then :
+
 else
   ac_cv_search_strerror=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
 $as_echo "$ac_cv_search_strerror" >&6; }
 ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -16017,48 +15204,23 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -16068,18 +15230,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -16089,14 +15247,10 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -16123,125 +15277,38 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether strcasecmp is declared" >&5
-$as_echo_n "checking whether strcasecmp is declared... " >&6; }
-if test "${ac_cv_have_decl_strcasecmp+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef strcasecmp
-  (void) strcasecmp;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_strcasecmp=yes
+ac_fn_cxx_check_decl "$LINENO" "strcasecmp" "ac_cv_have_decl_strcasecmp" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strcasecmp" = x""yes; then :
+  ac_have_decl=1
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_strcasecmp=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_have_decl=0
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strcasecmp" >&5
-$as_echo "$ac_cv_have_decl_strcasecmp" >&6; }
-if test "x$ac_cv_have_decl_strcasecmp" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRCASECMP 1
+#define HAVE_DECL_STRCASECMP $ac_have_decl
 _ACEOF
 
 
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRCASECMP 0
-_ACEOF
-
-
-fi
-
-
-
 if test ".$ac_cv_c_compiler_gnu" = .yes; then
    CFLAGS="$CFLAGS -Wall -Wextra -Winit-self -Wswitch-default -Wswitch-enum -Wstrict-aliasing=2 -Wfloat-equal -Wshadow"
    CXXFLAGS="$CXXFLAGS -Wall -Wextra -Winit-self -Wswitch-default -Wswitch-enum -Wstrict-aliasing=2 -Wfloat-equal -Wshadow"
@@ -16254,11 +15321,11 @@
     echo 'int i;' > conftest.$ac_ext
     ekiga_cv_cc_64bit_output=no
 
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
       case `/usr/bin/file conftest.$ac_objext` in
         *"ELF 64"*)
           ekiga_cv_cc_64bit_output=yes
@@ -16280,7 +15347,7 @@
     ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking whether OS type is supported" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS type is supported" >&5
 $as_echo_n "checking whether OS type is supported... " >&6; }
 win32=0
 
@@ -16294,7 +15361,7 @@
     gm_platform="linux"
     ;;
 
-  FreeBSD* | freebsd* | NetBSD* | netbsd* )
+  FreeBSD* | freebsd* | kfreebsd* | NetBSD* | netbsd* )
     gm_platform="freebsd"
     ;;
 
@@ -16306,9 +15373,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RC+set}" = set; then
+if test "${ac_cv_prog_RC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RC"; then
@@ -16319,24 +15386,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RC=$ac_cv_prog_RC
 if test -n "$RC"; then
-  { $as_echo "$as_me:$LINENO: result: $RC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
 $as_echo "$RC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -16346,9 +15413,9 @@
   ac_ct_RC=$RC
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_RC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RC"; then
@@ -16359,24 +15426,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RC="windres"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RC=$ac_cv_prog_ac_ct_RC
 if test -n "$ac_ct_RC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
 $as_echo "$ac_ct_RC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -16385,7 +15452,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -16484,12 +15551,10 @@
     ;;
 
   *)
-    { { $as_echo "$as_me:$LINENO: error: Only Linux, FreeBSD, NetBSD, Solaris and Mac OS X are supported. Please contact the author to know how you can add more OS types." >&5
-$as_echo "$as_me: error: Only Linux, FreeBSD, NetBSD, Solaris and Mac OS X are supported. Please contact the author to know how you can add more OS types." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Only Linux, FreeBSD, NetBSD, Solaris and Mac OS X are supported. Please contact the author to know how you can add more OS types." "$LINENO" 5
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
  if test "x${win32}" = "x1"; then
@@ -16529,27 +15594,22 @@
     ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking Byte order" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Byte order" >&5
 $as_echo_n "checking Byte order... " >&6; }
 byte_order="unknown"
 
 # Check whether --with-endianess was given.
-if test "${with_endianess+set}" = set; then
+if test "${with_endianess+set}" = set; then :
   withval=$with_endianess; byte_order="$withval endian"
 else
-
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
+if test "${ac_cv_c_bigendian+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __APPLE_CC__
 	       not a universal capable compiler
@@ -16557,46 +15617,34 @@
 	     typedef int dummy;
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
 	# Check for potential -arch flags.  It is not universal unless
-	# there are some -arch flags.  Note that *ppc* also matches
-	# ppc64.  This check is also rather less than ideal.
-	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
-	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-	esac
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 	     #include <sys/param.h>
@@ -16614,30 +15662,9 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 		#include <sys/param.h>
@@ -16653,49 +15680,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
+  ac_cv_c_bigendian=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
@@ -16710,30 +15706,9 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
@@ -16748,51 +15723,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
+  ac_cv_c_bigendian=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # Compile a test program.
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   # Try to guess by grepping values from an object file.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 short int ascii_mm[] =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@ -16818,24 +15762,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
@@ -16847,20 +15774,10 @@
 		ac_cv_c_bigendian=unknown
 	      fi
 	    fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -16880,45 +15797,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_cxx_try_run "$LINENO"; then :
   ac_cv_c_bigendian=no
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
+  ac_cv_c_bigendian=yes
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
     fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
 $as_echo "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
@@ -16927,17 +15817,12 @@
      byte_order="little endian" ;; #(
    universal)
 
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
-     { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
+     as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 fi
@@ -16945,38 +15830,32 @@
 
 if test "x$byte_order" = "xbig endian"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
+$as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
 
 else
     if test "x$byte_order" = "xlittle endian"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_LITTLEENDIAN 1
-_ACEOF
+$as_echo "#define WORDS_LITTLEENDIAN 1" >>confdefs.h
 
     else
-      { { $as_echo "$as_me:$LINENO: error: Unable to detect endianess of target system - please specify" >&5
-$as_echo "$as_me: error: Unable to detect endianess of target system - please specify" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Unable to detect endianess of target system - please specify" "$LINENO" 5
     fi
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $byte_order" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $byte_order" >&5
 $as_echo "$byte_order" >&6; }
 
 
-  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
+if test "${enable_nls+set}" = set; then :
   enableval=$enable_nls; USE_NLS=$enableval
 else
   USE_NLS=yes
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
 $as_echo "$USE_NLS" >&6; }
 
 
@@ -16984,35 +15863,31 @@
 
 case "$am__api_version" in
     1.01234)
-	{ { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
     ;;
     *)
     ;;
 esac
 
 if test -n "0.35.0"; then
-    { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
 $as_echo_n "checking for intltool >= 0.35.0... " >&6; }
 
     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
     INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
     INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 
-    { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	{ { $as_echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.35.0 or later." >&5
-$as_echo "$as_me: error: Your intltool is too old.  You need intltool 0.35.0 or later." >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Your intltool is too old.  You need intltool 0.35.0 or later." "$LINENO" 5
 fi
 
 # Extract the first word of "intltool-update", so it can be a program name with args.
 set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_UPDATE in
@@ -17025,14 +15900,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -17040,19 +15915,19 @@
 fi
 INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
 if test -n "$INTLTOOL_UPDATE"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
 $as_echo "$INTLTOOL_UPDATE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "intltool-merge", so it can be a program name with args.
 set dummy intltool-merge; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_MERGE in
@@ -17065,14 +15940,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -17080,19 +15955,19 @@
 fi
 INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
 if test -n "$INTLTOOL_MERGE"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
 $as_echo "$INTLTOOL_MERGE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "intltool-extract", so it can be a program name with args.
 set dummy intltool-extract; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_EXTRACT in
@@ -17105,14 +15980,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -17120,18 +15995,16 @@
 fi
 INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
 if test -n "$INTLTOOL_EXTRACT"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
 $as_echo "$INTLTOOL_EXTRACT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
 
   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -17253,9 +16126,9 @@
 # Check the gettext tools to make sure they are GNU
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $XGETTEXT in
@@ -17268,14 +16141,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -17283,19 +16156,19 @@
 fi
 XGETTEXT=$ac_cv_path_XGETTEXT
 if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
 $as_echo "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGMERGE in
@@ -17308,14 +16181,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -17323,19 +16196,19 @@
 fi
 MSGMERGE=$ac_cv_path_MSGMERGE
 if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
 $as_echo "$MSGMERGE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -17348,14 +16221,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -17363,19 +16236,19 @@
 fi
 MSGFMT=$ac_cv_path_MSGFMT
 if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
 $as_echo "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -17388,14 +16261,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -17404,33 +16277,29 @@
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
 $as_echo "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
 mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
 mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
 if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_PERL in
@@ -17443,14 +16312,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -17458,41 +16327,35 @@
 fi
 INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
 if test -n "$INTLTOOL_PERL"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
 $as_echo "$INTLTOOL_PERL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$INTLTOOL_PERL"; then
-   { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
-$as_echo "$as_me: error: perl not found" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "perl not found" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
 $as_echo_n "checking for perl >= 5.8.1... " >&6; }
 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
-   { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
 if test "x" != "xno-xml"; then
-   { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
 $as_echo_n "checking for XML::Parser... " >&6; }
    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { $as_echo "$as_me:$LINENO: result: ok" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
    else
-       { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
    fi
 fi
 
@@ -17502,11 +16365,7 @@
 # Set DATADIRNAME correctly if it is not set yet
 # (copied from glib-gettext.m4)
 if test -z "$DATADIRNAME"; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -17518,120 +16377,13 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   DATADIRNAME=share
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	case $host in
+  case $host in
     *-*-solaris*)
-                        { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char bind_textdomain_codeset (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef bind_textdomain_codeset
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bind_textdomain_codeset ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-#endif
-
-int
-main ()
-{
-return bind_textdomain_codeset ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_bind_textdomain_codeset=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_bind_textdomain_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+                        ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   DATADIRNAME=share
 else
   DATADIRNAME=lib
@@ -17643,10 +16395,8 @@
     ;;
     esac
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 
 
@@ -17657,7 +16407,7 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GTK" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
 $as_echo_n "checking for GTK... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -17665,11 +16415,11 @@
         pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -17683,11 +16433,11 @@
         pkg_cv_GTK_LIBS="$GTK_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -17714,18 +16464,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.12.0) were not met:
-
-$GTK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GTK_CFLAGS
-and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.12.0) were not met:
+	as_fn_error "Package requirements (gtk+-2.0 >= 2.12.0) were not met:
 
 $GTK_PKG_ERRORS
 
@@ -17735,22 +16474,11 @@
 Alternatively, you may set the environment variables GTK_CFLAGS
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GTK_CFLAGS
-and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -17759,18 +16487,17 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
 	GTK_LIBS=$pkg_cv_GTK_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
 $as_echo_n "checking for GLIB... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -17778,11 +16505,11 @@
         pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -17796,11 +16523,11 @@
         pkg_cv_GLIB_LIBS="$GLIB_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -17827,18 +16554,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0) were not met:
-
-$GLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GLIB_CFLAGS
-and GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0) were not met:
+	as_fn_error "Package requirements (glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -17848,22 +16564,11 @@
 Alternatively, you may set the environment variables GLIB_CFLAGS
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GLIB_CFLAGS
-and GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -17872,17 +16577,16 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
 	GLIB_LIBS=$pkg_cv_GLIB_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 # Check whether --enable-gtk-debug was given.
-if test "${enable_gtk_debug+set}" = set; then
+if test "${enable_gtk_debug+set}" = set; then :
   enableval=$enable_gtk_debug; if test "x$enableval" = "xyes"; then
                 GTK_CFLAGS="$GTK_CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
                 GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
@@ -17897,7 +16601,7 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for SIGC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGC" >&5
 $as_echo_n "checking for SIGC... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -17905,11 +16609,11 @@
         pkg_cv_SIGC_CFLAGS="$SIGC_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sigc++-2.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sigc++-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sigc++-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_SIGC_CFLAGS=`$PKG_CONFIG --cflags "sigc++-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -17923,11 +16627,11 @@
         pkg_cv_SIGC_LIBS="$SIGC_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sigc++-2.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sigc++-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sigc++-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_SIGC_LIBS=`$PKG_CONFIG --libs "sigc++-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -17954,18 +16658,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SIGC_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (sigc++-2.0) were not met:
-
-$SIGC_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SIGC_CFLAGS
-and SIGC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (sigc++-2.0) were not met:
+	as_fn_error "Package requirements (sigc++-2.0) were not met:
 
 $SIGC_PKG_ERRORS
 
@@ -17975,22 +16668,11 @@
 Alternatively, you may set the environment variables SIGC_CFLAGS
 and SIGC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SIGC_CFLAGS
-and SIGC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -17999,12 +16681,11 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	SIGC_CFLAGS=$pkg_cv_SIGC_CFLAGS
 	SIGC_LIBS=$pkg_cv_SIGC_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -18014,7 +16695,7 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XML" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML" >&5
 $as_echo_n "checking for XML... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -18022,11 +16703,11 @@
         pkg_cv_XML_CFLAGS="$XML_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18040,11 +16721,11 @@
         pkg_cv_XML_LIBS="$XML_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18071,18 +16752,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$XML_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libxml-2.0) were not met:
-
-$XML_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XML_CFLAGS
-and XML_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (libxml-2.0) were not met:
+	as_fn_error "Package requirements (libxml-2.0) were not met:
 
 $XML_PKG_ERRORS
 
@@ -18092,22 +16762,11 @@
 Alternatively, you may set the environment variables XML_CFLAGS
 and XML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XML_CFLAGS
-and XML_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -18116,12 +16775,11 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XML_CFLAGS=$pkg_cv_XML_CFLAGS
 	XML_LIBS=$pkg_cv_XML_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -18135,7 +16793,7 @@
   if $PKG_CONFIG --max-version 2.13.1 gtk+-2.0; then
     GNOME="disabled"
     # Check whether --enable-gnome was given.
-if test "${enable_gnome+set}" = set; then
+if test "${enable_gnome+set}" = set; then :
   enableval=$enable_gnome; if test "x$enableval" = "xyes"; then
   enable_gnome=yes
 fi
@@ -18147,7 +16805,7 @@
     if test "x$enable_gnome" = "xyes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GNOME" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME" >&5
 $as_echo_n "checking for GNOME... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -18155,11 +16813,11 @@
         pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18173,11 +16831,11 @@
         pkg_cv_GNOME_LIBS="$GNOME_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18204,18 +16862,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNOME_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0) were not met:
-
-$GNOME_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GNOME_CFLAGS
-and GNOME_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0) were not met:
+	as_fn_error "Package requirements (libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0) were not met:
 
 $GNOME_PKG_ERRORS
 
@@ -18225,22 +16872,11 @@
 Alternatively, you may set the environment variables GNOME_CFLAGS
 and GNOME_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GNOME_CFLAGS
-and GNOME_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -18249,12 +16885,11 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
 	GNOME_LIBS=$pkg_cv_GNOME_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	found_gnome=yes
 fi
@@ -18262,9 +16897,7 @@
 
       GNOME="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNOME 1
-_ACEOF
+$as_echo "#define HAVE_GNOME 1" >>confdefs.h
 
     fi
   fi
@@ -18283,7 +16916,7 @@
 
 if test "x${gm_platform}" != "xmingw" ; then
   # Check whether --enable-gconf was given.
-if test "${enable_gconf+set}" = set; then
+if test "${enable_gconf+set}" = set; then :
   enableval=$enable_gconf; if test "x$enableval" = "xyes"; then
   enable_gconf = yes
 fi
@@ -18295,7 +16928,7 @@
   if test "x$enable_gconf" = "xyes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GCONF" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
 $as_echo_n "checking for GCONF... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -18303,11 +16936,11 @@
         pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.6.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.6.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.6.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.6.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18321,11 +16954,11 @@
         pkg_cv_GCONF_LIBS="$GCONF_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.6.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.6.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.6.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.6.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18352,18 +16985,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GCONF_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gconf-2.0 >= 2.6.0) were not met:
-
-$GCONF_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GCONF_CFLAGS
-and GCONF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (gconf-2.0 >= 2.6.0) were not met:
+	as_fn_error "Package requirements (gconf-2.0 >= 2.6.0) were not met:
 
 $GCONF_PKG_ERRORS
 
@@ -18373,12 +16995,11 @@
 Alternatively, you may set the environment variables GCONF_CFLAGS
 and GCONF_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -18387,22 +17008,11 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GCONF_CFLAGS
-and GCONF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
 	GCONF_LIBS=$pkg_cv_GCONF_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	found_gconf=yes
 fi
@@ -18415,13 +17025,13 @@
 
 
 # Check whether --with-gconf-source was given.
-if test "${with_gconf_source+set}" = set; then
+if test "${with_gconf_source+set}" = set; then :
   withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
 fi
 
 
 
-  { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
 $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
 
   if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
@@ -18430,22 +17040,20 @@
 
 
 # Check whether --with-gconf-schema-file-dir was given.
-if test "${with_gconf_schema_file_dir+set}" = set; then
+if test "${with_gconf_schema_file_dir+set}" = set; then :
   withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
 fi
 
 
 
-  { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
 $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
 
   # Check whether --enable-schemas-install was given.
-if test "${enable_schemas_install+set}" = set; then
+if test "${enable_schemas_install+set}" = set; then :
   enableval=$enable_schemas_install; case ${enableval} in
        yes|no) ;;
-       *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
-   { (exit 1); exit 1; }; } ;;
+       *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
       esac
 fi
 
@@ -18462,9 +17070,7 @@
 
     GCONF="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GCONF 1
-_ACEOF
+$as_echo "#define HAVE_GCONF 1" >>confdefs.h
 
   else
      if false; then
@@ -18501,7 +17107,7 @@
 
 if test "x${gm_platform}" != "xmingw" ; then
   # Check whether --enable-eds was given.
-if test "${enable_eds+set}" = set; then
+if test "${enable_eds+set}" = set; then :
   enableval=$enable_eds; if test "x$enableval" = "xyes"; then
   enable_eds=yes
 fi
@@ -18513,7 +17119,7 @@
   if test "x$enable_eds" = "xyes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for EDS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDS" >&5
 $as_echo_n "checking for EDS... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -18521,11 +17127,11 @@
         pkg_cv_EDS_CFLAGS="$EDS_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebook-1.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libebook-1.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_EDS_CFLAGS=`$PKG_CONFIG --cflags "libebook-1.2" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18539,11 +17145,11 @@
         pkg_cv_EDS_LIBS="$EDS_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-1.2\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebook-1.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libebook-1.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_EDS_LIBS=`$PKG_CONFIG --libs "libebook-1.2" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18570,18 +17176,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$EDS_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libebook-1.2) were not met:
-
-$EDS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables EDS_CFLAGS
-and EDS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (libebook-1.2) were not met:
+	as_fn_error "Package requirements (libebook-1.2) were not met:
 
 $EDS_PKG_ERRORS
 
@@ -18591,22 +17186,11 @@
 Alternatively, you may set the environment variables EDS_CFLAGS
 and EDS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables EDS_CFLAGS
-and EDS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -18615,12 +17199,11 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	EDS_CFLAGS=$pkg_cv_EDS_CFLAGS
 	EDS_LIBS=$pkg_cv_EDS_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	found_eds=yes
 fi
@@ -18628,9 +17211,7 @@
 
     EDS="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_EDS 1
-_ACEOF
+$as_echo "#define HAVE_EDS 1" >>confdefs.h
 
   fi
 fi
@@ -18649,7 +17230,7 @@
 
 if test "x${gm_platform}" != "xmingw" ; then
   # Check whether --enable-notify was given.
-if test "${enable_notify+set}" = set; then
+if test "${enable_notify+set}" = set; then :
   enableval=$enable_notify; if test "x$enableval" = "xyes"; then
   enable_notify=yes
 fi
@@ -18661,7 +17242,7 @@
   if test "x$enable_notify" = "xyes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for NOTIFY" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5
 $as_echo_n "checking for NOTIFY... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -18669,11 +17250,11 @@
         pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18687,11 +17268,11 @@
         pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null`
 else
   pkg_failed=yes
@@ -18718,7 +17299,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$NOTIFY_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 foo=bar
 elif test $pkg_failed = untried; then
@@ -18726,7 +17307,7 @@
 else
 	NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS
 	NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	found_notify=yes
 fi
@@ -18735,9 +17316,7 @@
 
       NOTIFY="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NOTIFY 1
-_ACEOF
+$as_echo "#define HAVE_NOTIFY 1" >>confdefs.h
 
     fi
   fi
@@ -18756,7 +17335,7 @@
 LDAP="disabled"
 
 # Check whether --enable-ldap was given.
-if test "${enable_ldap+set}" = set; then
+if test "${enable_ldap+set}" = set; then :
   enableval=$enable_ldap; if test "x$enableval" = "xyes"; then
   enable_ldap=yes
 fi
@@ -18769,41 +17348,35 @@
 
 
 # Check whether --with-ldap-dir was given.
-if test "${with_ldap_dir+set}" = set; then
+if test "${with_ldap_dir+set}" = set; then :
   withval=$with_ldap_dir; with_ldap_dir="$withval"
 else
   with_ldap_dir="/usr"
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking for LDAP includes in ${with_ldap_dir}/include/" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP includes in ${with_ldap_dir}/include/" >&5
 $as_echo_n "checking for LDAP includes in ${with_ldap_dir}/include/... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: " >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
 
 
   if test -f ${with_ldap_dir}/include/ldap.h; then
   	LDAP_CFLAGS="-I${with_ldap_dir}/include"
   else
-  	{ { $as_echo "$as_me:$LINENO: error: You need the LDAP headers to compile Ekiga with LDAP support" >&5
-$as_echo "$as_me: error: You need the LDAP headers to compile Ekiga with LDAP support" >&2;}
-   { (exit 1); exit 1; }; }
+  	as_fn_error "You need the LDAP headers to compile Ekiga with LDAP support" "$LINENO" 5
   fi
 
     LIBS_save="$LIBS"
   LIBS="${LIBS} -L${with_ldap_dir}/${libname}/ -llber"
-  { $as_echo "$as_me:$LINENO: checking for main in -lldap" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lldap" >&5
 $as_echo_n "checking for main in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_main+set}" = set; then
+if test "${ac_cv_lib_ldap_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -18815,43 +17388,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_ldap_main=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ldap_main=no
+  ac_cv_lib_ldap_main=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_main" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_main" >&5
 $as_echo "$ac_cv_lib_ldap_main" >&6; }
-if test "x$ac_cv_lib_ldap_main" = x""yes; then
+if test "x$ac_cv_lib_ldap_main" = x""yes; then :
   ldap_libs="yes"
 else
   ldap_libs="no"
@@ -18865,47 +17413,39 @@
   		LDAP_LIBS="-L${with_ldap_dir}/${libname} $LDAP_LIBS"
   	fi
   else
-  	{ { $as_echo "$as_me:$LINENO: error: You need the LDAP library to compile Ekiga with LDAP support" >&5
-$as_echo "$as_me: error: You need the LDAP library to compile Ekiga with LDAP support" >&2;}
-   { (exit 1); exit 1; }; }
+  	as_fn_error "You need the LDAP library to compile Ekiga with LDAP support" "$LINENO" 5
   fi
 
 
 # Check whether --with-libsasl2-dir was given.
-if test "${with_libsasl2_dir+set}" = set; then
+if test "${with_libsasl2_dir+set}" = set; then :
   withval=$with_libsasl2_dir; with_libsasl2_dir="$withval"
 else
   with_libsasl2_dir="/usr"
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking for LIBSASL2 includes in ${with_libsasl2_dir}/include/" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSASL2 includes in ${with_libsasl2_dir}/include/" >&5
 $as_echo_n "checking for LIBSASL2 includes in ${with_libsasl2_dir}/include/... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: " >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
 
   if test -f ${with_libsasl2_dir}/include/sasl/sasl.h; then
   	LDAP_CFLAGS="${LDAP_CFLAGS} -I${with_libsasl2_dir}/include"
   else
-  	{ { $as_echo "$as_me:$LINENO: error: *** libsasl2 headers not found" >&5
-$as_echo "$as_me: error: *** libsasl2 headers not found" >&2;}
-   { (exit 1); exit 1; }; }
+  	as_fn_error "*** libsasl2 headers not found" "$LINENO" 5
   fi
   LDAP_LIBS="$LDAP_LIBS -lsasl2"
 
     if test ${gm_platform} = "linux" ; then
-  	{ $as_echo "$as_me:$LINENO: checking for res_gethostbyaddr in -lresolv" >&5
+  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_gethostbyaddr in -lresolv" >&5
 $as_echo_n "checking for res_gethostbyaddr in -lresolv... " >&6; }
-if test "${ac_cv_lib_resolv_res_gethostbyaddr+set}" = set; then
+if test "${ac_cv_lib_resolv_res_gethostbyaddr+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv -lresolv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18915,56 +17455,29 @@
 extern "C"
 #endif
 char res_gethostbyaddr ();
-int
-main ()
-{
-return res_gethostbyaddr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+int
+main ()
+{
+return res_gethostbyaddr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_gethostbyaddr=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv_res_gethostbyaddr=no
+  ac_cv_lib_resolv_res_gethostbyaddr=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_gethostbyaddr" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_gethostbyaddr" >&5
 $as_echo "$ac_cv_lib_resolv_res_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_resolv_res_gethostbyaddr" = x""yes; then
+if test "x$ac_cv_lib_resolv_res_gethostbyaddr" = x""yes; then :
   LIBS="-lresolv $LIBS"
 else
-  { { $as_echo "$as_me:$LINENO: error: *** libresolv not found." >&5
-$as_echo "$as_me: error: *** libresolv not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "*** libresolv not found." "$LINENO" 5
 fi
 
   	LDAP_LIBS="${LDAP_LIBS} -lresolv"
@@ -18974,9 +17487,7 @@
 
   LDAP="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LDAP 1
-_ACEOF
+$as_echo "#define HAVE_LDAP 1" >>confdefs.h
 
 fi
 
@@ -18999,9 +17510,9 @@
 
 depcc="$CCAS"   am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -19027,6 +17538,9 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
+  am__universal=false
+
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -19044,7 +17558,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -19054,19 +17578,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -19090,7 +17618,7 @@
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
 CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
 
@@ -19106,12 +17634,12 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for x86 platform" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 platform" >&5
 $as_echo_n "checking for x86 platform... " >&6; }
 case $host_cpu in
   i386|i486|i586|i686|i786|k6|k7)
         # Check whether --enable-mmx was given.
-if test "${enable_mmx+set}" = set; then
+if test "${enable_mmx+set}" = set; then :
   enableval=$enable_mmx; if test "x$enableval" = "xyes"; then
                              use_x86_asm=yes
 			   else
@@ -19125,7 +17653,7 @@
    *)
   	use_x86_asm=no
 esac
-{ $as_echo "$as_me:$LINENO: result: $use_x86_asm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_x86_asm" >&5
 $as_echo "$use_x86_asm" >&6; }
 
 use_mmx_asm=no
@@ -19133,14 +17661,14 @@
     save_ac_ext=$ac_ext
     ac_ext=S
 
-    { $as_echo "$as_me:$LINENO: checking compiler support for MMX" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for MMX" >&5
 $as_echo_n "checking compiler support for MMX... " >&6; }
     cp lib/pixops/scale_line_22_33_mmx.S conftest.S
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
         use_mmx_asm=yes
     fi
 
@@ -19149,14 +17677,12 @@
     ac_ext=$save_ac_ext
     if test "x$use_mmx_asm" = "xyes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_MMX 1
-_ACEOF
+$as_echo "#define USE_MMX 1" >>confdefs.h
 
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
     else
-      { $as_echo "$as_me:$LINENO: result: no" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     fi
 fi
@@ -19176,7 +17702,7 @@
 
 if test "x${gm_platform}" = "xlinux" ; then
   # Check whether --enable-shm was given.
-if test "${enable_shm+set}" = set; then
+if test "${enable_shm+set}" = set; then :
   enableval=$enable_shm; if test "x$enableval" = "xyes"; then
   enable_shm=yes
 fi
@@ -19185,18 +17711,14 @@
 fi
 
   if test "x$enable_shm" = "xyes"; then
-    { $as_echo "$as_me:$LINENO: checking for XShmAttach in -lXext" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmAttach in -lXext" >&5
 $as_echo_n "checking for XShmAttach in -lXext... " >&6; }
-if test "${ac_cv_lib_Xext_XShmAttach+set}" = set; then
+if test "${ac_cv_lib_Xext_XShmAttach+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -19214,43 +17736,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_Xext_XShmAttach=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_Xext_XShmAttach=no
+  ac_cv_lib_Xext_XShmAttach=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmAttach" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShmAttach" >&5
 $as_echo "$ac_cv_lib_Xext_XShmAttach" >&6; }
-if test "x$ac_cv_lib_Xext_XShmAttach" = x""yes; then
+if test "x$ac_cv_lib_Xext_XShmAttach" = x""yes; then :
   with_shm="yes"
 else
   with_shm="no"
@@ -19259,9 +17756,7 @@
     if test "x${with_shm}" != "xno"; then
       SHM="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SHM 1
-_ACEOF
+$as_echo "#define HAVE_SHM 1" >>confdefs.h
 
     fi
   fi
@@ -19277,7 +17772,7 @@
 
 XV="disabled"
 # Check whether --enable-xv was given.
-if test "${enable_xv+set}" = set; then
+if test "${enable_xv+set}" = set; then :
   enableval=$enable_xv; if test "x$enableval" = "xyes"; then
   enable_xv=yes
 fi
@@ -19288,7 +17783,7 @@
 if test "x${gm_platform}" != "mingw" -a "x$enable_xv" = "xyes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XV" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XV" >&5
 $as_echo_n "checking for XV... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -19296,11 +17791,11 @@
         pkg_cv_XV_CFLAGS="$XV_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xv\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xv\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xv") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XV_CFLAGS=`$PKG_CONFIG --cflags "xv" 2>/dev/null`
 else
   pkg_failed=yes
@@ -19314,11 +17809,11 @@
         pkg_cv_XV_LIBS="$XV_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xv\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xv\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xv") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XV_LIBS=`$PKG_CONFIG --libs "xv" 2>/dev/null`
 else
   pkg_failed=yes
@@ -19345,18 +17840,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$XV_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (xv) were not met:
-
-$XV_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables XV_CFLAGS
-and XV_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (xv) were not met:
+	as_fn_error "Package requirements (xv) were not met:
 
 $XV_PKG_ERRORS
 
@@ -19366,12 +17850,11 @@
 Alternatively, you may set the environment variables XV_CFLAGS
 and XV_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -19380,27 +17863,14 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XV_CFLAGS
-and XV_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XV_CFLAGS=$pkg_cv_XV_CFLAGS
 	XV_LIBS=$pkg_cv_XV_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XV 1
-_ACEOF
+$as_echo "#define HAVE_XV 1" >>confdefs.h
 
                      XV="enabled"
 
@@ -19424,16 +17894,16 @@
 if test "x${gm_platform}" = "xmingw" ; then
 
 # Check whether --with-directx-dir was given.
-if test "${with_directx_dir+set}" = set; then
+if test "${with_directx_dir+set}" = set; then :
   withval=$with_directx_dir; with_directx_dir="$withval"
 else
   with_directx_dir="."
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking for DirectX includes in ${with_directx_dir}" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX includes in ${with_directx_dir}" >&5
 $as_echo_n "checking for DirectX includes in ${with_directx_dir}... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: " >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
   if test -d ${with_directx_dir}; then
     DX_CFLAGS="-I${with_directx_dir}"
@@ -19442,14 +17912,10 @@
 
     DX="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DX 1
-_ACEOF
+$as_echo "#define HAVE_DX 1" >>confdefs.h
 
   else
-    { { $as_echo "$as_me:$LINENO: error: Unable to locate DirectX header files; --with-directx-dir is obligatory" >&5
-$as_echo "$as_me: error: Unable to locate DirectX header files; --with-directx-dir is obligatory" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Unable to locate DirectX header files; --with-directx-dir is obligatory" "$LINENO" 5
   fi
 fi
 
@@ -19468,7 +17934,7 @@
 
 if test "x${gm_platform}" != "xmingw" ; then
   # Check whether --enable-dbus was given.
-if test "${enable_dbus+set}" = set; then
+if test "${enable_dbus+set}" = set; then :
   enableval=$enable_dbus; if test "x$enableval" = "xyes"; then
   enable_dbus=yes
 fi
@@ -19477,7 +17943,7 @@
 fi
 
   # Check whether --enable-dbus-service was given.
-if test "${enable_dbus_service+set}" = set; then
+if test "${enable_dbus_service+set}" = set; then :
   enableval=$enable_dbus_service; if test "x$enableval" = "xyes"; then
   enable_dbus_service=yes
 fi
@@ -19489,7 +17955,7 @@
   if test "x$enable_dbus" = "xyes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
 $as_echo_n "checking for DBUS... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -19497,11 +17963,11 @@
         pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.36 dbus-glib-1 >= 0.36\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.36 dbus-glib-1 >= 0.36\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.36 dbus-glib-1 >= 0.36") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.36 dbus-glib-1 >= 0.36" 2>/dev/null`
 else
   pkg_failed=yes
@@ -19515,11 +17981,11 @@
         pkg_cv_DBUS_LIBS="$DBUS_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.36 dbus-glib-1 >= 0.36\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.36 dbus-glib-1 >= 0.36\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.36 dbus-glib-1 >= 0.36") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.36 dbus-glib-1 >= 0.36" 2>/dev/null`
 else
   pkg_failed=yes
@@ -19546,18 +18012,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUS_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-1 >= 0.36 dbus-glib-1 >= 0.36) were not met:
-
-$DBUS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DBUS_CFLAGS
-and DBUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (dbus-1 >= 0.36 dbus-glib-1 >= 0.36) were not met:
+	as_fn_error "Package requirements (dbus-1 >= 0.36 dbus-glib-1 >= 0.36) were not met:
 
 $DBUS_PKG_ERRORS
 
@@ -19567,22 +18022,11 @@
 Alternatively, you may set the environment variables DBUS_CFLAGS
 and DBUS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DBUS_CFLAGS
-and DBUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -19591,12 +18035,11 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	found_dbus=yes
 fi
@@ -19604,9 +18047,7 @@
 
     DBUS="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DBUS 1
-_ACEOF
+$as_echo "#define HAVE_DBUS 1" >>confdefs.h
 
 
     if test "x$found_dbus" = "xyes" -a "x$enable_dbus_service" = "xyes"; then
@@ -19636,139 +18077,8 @@
 
 V4L="disabled"
 if test "x${win32}" != "x1"; then
-  if test "${ac_cv_header_linux_videodev_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for linux/videodev.h" >&5
-$as_echo_n "checking for linux/videodev.h... " >&6; }
-if test "${ac_cv_header_linux_videodev_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev_h" >&5
-$as_echo "$ac_cv_header_linux_videodev_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking linux/videodev.h usability" >&5
-$as_echo_n "checking linux/videodev.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <linux/videodev.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking linux/videodev.h presence" >&5
-$as_echo_n "checking linux/videodev.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <linux/videodev.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------------------- ##
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga ##
-## -------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for linux/videodev.h" >&5
-$as_echo_n "checking for linux/videodev.h... " >&6; }
-if test "${ac_cv_header_linux_videodev_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_linux_videodev_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev_h" >&5
-$as_echo "$ac_cv_header_linux_videodev_h" >&6; }
-
-fi
-if test "x$ac_cv_header_linux_videodev_h" = x""yes; then
+  ac_fn_cxx_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_videodev_h" = x""yes; then :
   V4L="enabled"
 fi
 
@@ -19776,9 +18086,7 @@
 
   if test "x${V4L}" != "xdisabled"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_V4L 1
-_ACEOF
+$as_echo "#define HAVE_V4L 1" >>confdefs.h
 
   fi
 fi
@@ -19795,7 +18103,7 @@
 
 if test "x${gm_platform}" != "xmingw" ; then
   # Check whether --enable-avahi was given.
-if test "${enable_avahi+set}" = set; then
+if test "${enable_avahi+set}" = set; then :
   enableval=$enable_avahi; if test "x$enableval" = "xyes"; then
   enable_avahi=yes
 fi
@@ -19807,7 +18115,7 @@
   if test "x$enable_avahi" = "xyes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for AVAHI" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5
 $as_echo_n "checking for AVAHI... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -19815,11 +18123,11 @@
         pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6 avahi-glib >= 0.6\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6 avahi-glib >= 0.6\""; } >&5
   ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6 avahi-glib >= 0.6") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-client >= 0.6 avahi-glib >= 0.6" 2>/dev/null`
 else
   pkg_failed=yes
@@ -19833,11 +18141,11 @@
         pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6 avahi-glib >= 0.6\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6 avahi-glib >= 0.6\""; } >&5
   ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6 avahi-glib >= 0.6") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-client >= 0.6 avahi-glib >= 0.6" 2>/dev/null`
 else
   pkg_failed=yes
@@ -19864,18 +18172,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$AVAHI_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (avahi-client >= 0.6 avahi-glib >= 0.6) were not met:
-
-$AVAHI_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables AVAHI_CFLAGS
-and AVAHI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (avahi-client >= 0.6 avahi-glib >= 0.6) were not met:
+	as_fn_error "Package requirements (avahi-client >= 0.6 avahi-glib >= 0.6) were not met:
 
 $AVAHI_PKG_ERRORS
 
@@ -19885,22 +18182,11 @@
 Alternatively, you may set the environment variables AVAHI_CFLAGS
 and AVAHI_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables AVAHI_CFLAGS
-and AVAHI_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -19909,12 +18195,11 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
 	AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	found_avahi=yes
 fi
@@ -19922,9 +18207,7 @@
 
     AVAHI="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AVAHI 1
-_ACEOF
+$as_echo "#define HAVE_AVAHI 1" >>confdefs.h
 
   fi
 fi
@@ -19942,7 +18225,7 @@
 GSTREAMER="disabled"
 
 # Check whether --enable-gstreamer was given.
-if test "${enable_gstreamer+set}" = set; then
+if test "${enable_gstreamer+set}" = set; then :
   enableval=$enable_gstreamer; if test "x$enableval" = "xyes"; then
   enable_gstreamer=yes
 fi
@@ -19953,7 +18236,7 @@
   found_gstreamer=yes
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GSTREAMER" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
 $as_echo_n "checking for GSTREAMER... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -19961,11 +18244,11 @@
         pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10" 2>/dev/null`
 else
   pkg_failed=yes
@@ -19979,11 +18262,11 @@
         pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10" 2>/dev/null`
 else
   pkg_failed=yes
@@ -20010,7 +18293,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GSTREAMER_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10) were not met:
+	as_fn_error "Package requirements (gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10) were not met:
 
 $GSTREAMER_PKG_ERRORS
 
@@ -20020,33 +18303,11 @@
 Alternatively, you may set the environment variables GSTREAMER_CFLAGS
 and GSTREAMER_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (gstreamer-plugins-base-0.10 >= 0.10.21.3 gstreamer-interfaces-0.10) were not met:
-
-$GSTREAMER_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GSTREAMER_CFLAGS
-and GSTREAMER_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GSTREAMER_CFLAGS
-and GSTREAMER_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -20055,29 +18316,24 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
 	GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
   if test "x$found_gstreamer" = "xno"; then
-    { { $as_echo "$as_me:$LINENO: error: You asked for GStreamer, but we didn't find what we need" >&5
-$as_echo "$as_me: error: You asked for GStreamer, but we didn't find what we need" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You asked for GStreamer, but we didn't find what we need" "$LINENO" 5
   fi
   GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstapp-0.10"
 
 
   GSTREAMER="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GSTREAMER 1
-_ACEOF
+$as_echo "#define HAVE_GSTREAMER 1" >>confdefs.h
 
 fi
 
@@ -20093,7 +18349,7 @@
 KDE="disabled"
 
 # Check whether --enable-kde was given.
-if test "${enable_kde+set}" = set; then
+if test "${enable_kde+set}" = set; then :
   enableval=$enable_kde; if test "x$enableval" = "xyes"; then
   enable_kde=yes
 fi
@@ -20104,7 +18360,7 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for KDE" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE" >&5
 $as_echo_n "checking for KDE... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -20112,11 +18368,11 @@
         pkg_cv_KDE_CFLAGS="$KDE_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtCore\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore\""; } >&5
   ($PKG_CONFIG --exists --print-errors "QtCore") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_KDE_CFLAGS=`$PKG_CONFIG --cflags "QtCore" 2>/dev/null`
 else
   pkg_failed=yes
@@ -20130,188 +18386,57 @@
         pkg_cv_KDE_LIBS="$KDE_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtCore\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore\""; } >&5
   ($PKG_CONFIG --exists --print-errors "QtCore") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_KDE_LIBS=`$PKG_CONFIG --libs "QtCore" 2>/dev/null`
 else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        KDE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore"`
-        else
-	        KDE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$KDE_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-                found_kde=no
-elif test $pkg_failed = untried; then
-	found_kde=no
-else
-	KDE_CFLAGS=$pkg_cv_KDE_CFLAGS
-	KDE_LIBS=$pkg_cv_KDE_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	found_kde=yes
-fi
-
-  CPPFLAGS_save="$CPPFLAGS"
-  LIBS_save="$LIBS"
-  CPPFLAGS="$CPPFLAGS $KDE_CFLAGS"
-  LIBS="$LIBS $KDE_LIBS"
-  if test "${ac_cv_header_kapplication_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for kapplication.h" >&5
-$as_echo_n "checking for kapplication.h... " >&6; }
-if test "${ac_cv_header_kapplication_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kapplication_h" >&5
-$as_echo "$ac_cv_header_kapplication_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking kapplication.h usability" >&5
-$as_echo_n "checking kapplication.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <kapplication.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking kapplication.h presence" >&5
-$as_echo_n "checking kapplication.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <kapplication.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
+  pkg_failed=yes
+fi
+    fi
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
+	pkg_failed=untried
 fi
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: kapplication.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: kapplication.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kapplication.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: kapplication.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: kapplication.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: kapplication.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kapplication.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: kapplication.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kapplication.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: kapplication.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kapplication.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: kapplication.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kapplication.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: kapplication.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kapplication.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: kapplication.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------------------- ##
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga ##
-## -------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for kapplication.h" >&5
-$as_echo_n "checking for kapplication.h... " >&6; }
-if test "${ac_cv_header_kapplication_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  ac_cv_header_kapplication_h=$ac_header_preproc
+        _pkg_short_errors_supported=no
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kapplication_h" >&5
-$as_echo "$ac_cv_header_kapplication_h" >&6; }
+        if test $_pkg_short_errors_supported = yes; then
+	        KDE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore"`
+        else
+	        KDE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$KDE_PKG_ERRORS" >&5
 
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                found_kde=no
+elif test $pkg_failed = untried; then
+	found_kde=no
+else
+	KDE_CFLAGS=$pkg_cv_KDE_CFLAGS
+	KDE_LIBS=$pkg_cv_KDE_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	found_kde=yes
 fi
-if test "x$ac_cv_header_kapplication_h" = x""yes; then
-  :
+
+  CPPFLAGS_save="$CPPFLAGS"
+  LIBS_save="$LIBS"
+  CPPFLAGS="$CPPFLAGS $KDE_CFLAGS"
+  LIBS="$LIBS $KDE_LIBS"
+  ac_fn_cxx_check_header_mongrel "$LINENO" "kapplication.h" "ac_cv_header_kapplication_h" "$ac_includes_default"
+if test "x$ac_cv_header_kapplication_h" = x""yes; then :
+
 else
   found_kde=no
 fi
@@ -20320,26 +18445,20 @@
   CPPFLAGS="$CPPFLAGS_save"
   LIBS="$LIBS_save"
   if test "x$found_kde" = "xno"; then
-    { { $as_echo "$as_me:$LINENO: error: We need this header!" >&5
-$as_echo "$as_me: error: We need this header!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "We need this header!" "$LINENO" 5
   fi
 
   LIBS_save="$LIBS"
   CPPFLAGS="$CPPFLAGS $KDE_CFLAGS"
   LIBS="$LIBS $KDE_LIBS"
-  { $as_echo "$as_me:$LINENO: checking for ki18n in -lkdeui" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ki18n in -lkdeui" >&5
 $as_echo_n "checking for ki18n in -lkdeui... " >&6; }
-if test "${ac_cv_lib_kdeui_ki18n+set}" = set; then
+if test "${ac_cv_lib_kdeui_ki18n+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkdeui  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20357,52 +18476,25 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_kdeui_ki18n=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_kdeui_ki18n=no
+  ac_cv_lib_kdeui_ki18n=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kdeui_ki18n" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kdeui_ki18n" >&5
 $as_echo "$ac_cv_lib_kdeui_ki18n" >&6; }
-if test "x$ac_cv_lib_kdeui_ki18n" = x""yes; then
+if test "x$ac_cv_lib_kdeui_ki18n" = x""yes; then :
   found_kde=no
 fi
 
   CPPFLAGS="$CPPFLAGS_save"
   LIBS="$LIBS_save"
   if test "x$found_kde" = "xno"; then
-    { { $as_echo "$as_me:$LINENO: error: We need this lib!" >&5
-$as_echo "$as_me: error: We need this lib!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "We need this lib!" "$LINENO" 5
   fi
 
   KDE_LIBS="$KDE_LIBS -lkdeui"
@@ -20411,9 +18503,7 @@
 
   KDE="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KDE 1
-_ACEOF
+$as_echo "#define HAVE_KDE 1" >>confdefs.h
 
 fi
 
@@ -20429,7 +18519,7 @@
 KAB="disabled"
 
 # Check whether --enable-kab was given.
-if test "${enable_kab+set}" = set; then
+if test "${enable_kab+set}" = set; then :
   enableval=$enable_kab; if test "x$enableval" = "xyes"; then
   enable_kab=yes
 fi
@@ -20439,9 +18529,7 @@
 if test "x$enable_kab" = "xyes"; then
 
   if test "x$found_kde" != "xyes"; then
-    { { $as_echo "$as_me:$LINENO: error: No kab without kde: --enable-kde" >&5
-$as_echo "$as_me: error: No kab without kde: --enable-kde" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "No kab without kde: --enable-kde" "$LINENO" 5
   fi
   found_kab=yes
   KAB_CFLAGS="-I/usr/include/qt4"
@@ -20450,140 +18538,9 @@
   LIBS_save="$LIBS"
   CPPFLAGS="$CPPFLAGS $KAB_CFLAGS"
   LIBS="$LIBS $KAB_LIBS"
-  if test "${ac_cv_header_kabc_addressee_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for kabc/addressee.h" >&5
-$as_echo_n "checking for kabc/addressee.h... " >&6; }
-if test "${ac_cv_header_kabc_addressee_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kabc_addressee_h" >&5
-$as_echo "$ac_cv_header_kabc_addressee_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking kabc/addressee.h usability" >&5
-$as_echo_n "checking kabc/addressee.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <kabc/addressee.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking kabc/addressee.h presence" >&5
-$as_echo_n "checking kabc/addressee.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <kabc/addressee.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: kabc/addressee.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: kabc/addressee.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kabc/addressee.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: kabc/addressee.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: kabc/addressee.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: kabc/addressee.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kabc/addressee.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: kabc/addressee.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kabc/addressee.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: kabc/addressee.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kabc/addressee.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: kabc/addressee.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kabc/addressee.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: kabc/addressee.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: kabc/addressee.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: kabc/addressee.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------------------- ##
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga ##
-## -------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for kabc/addressee.h" >&5
-$as_echo_n "checking for kabc/addressee.h... " >&6; }
-if test "${ac_cv_header_kabc_addressee_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_kabc_addressee_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kabc_addressee_h" >&5
-$as_echo "$ac_cv_header_kabc_addressee_h" >&6; }
+  ac_fn_cxx_check_header_mongrel "$LINENO" "kabc/addressee.h" "ac_cv_header_kabc_addressee_h" "$ac_includes_default"
+if test "x$ac_cv_header_kabc_addressee_h" = x""yes; then :
 
-fi
-if test "x$ac_cv_header_kabc_addressee_h" = x""yes; then
-  :
 else
   found_kab=no
 fi
@@ -20592,17 +18549,13 @@
   CPPFLAGS="$CPPFLAGS_save"
   LIBS="$LIBS_save"
   if test "x$found_kab" = "xno"; then
-    { { $as_echo "$as_me:$LINENO: error: We need this header!" >&5
-$as_echo "$as_me: error: We need this header!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "We need this header!" "$LINENO" 5
   fi
 
 
   KAB="enabled"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KAB 1
-_ACEOF
+$as_echo "#define HAVE_KAB 1" >>confdefs.h
 
 fi
 
@@ -20618,7 +18571,7 @@
 XCAP="disabled"
 
 # Check whether --enable-xcap was given.
-if test "${enable_xcap+set}" = set; then
+if test "${enable_xcap+set}" = set; then :
   enableval=$enable_xcap; if test "x$enableval" = "xyes"; then
   enable_xcap=yes
 fi
@@ -20628,7 +18581,7 @@
 if test "x$enable_xcap" = "xyes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for SOUP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUP" >&5
 $as_echo_n "checking for SOUP... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -20636,11 +18589,11 @@
         pkg_cv_SOUP_CFLAGS="$SOUP_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
 else
   pkg_failed=yes
@@ -20654,11 +18607,11 @@
         pkg_cv_SOUP_LIBS="$SOUP_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
 else
   pkg_failed=yes
@@ -20685,18 +18638,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4) were not met:
-
-$SOUP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SOUP_CFLAGS
-and SOUP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (libsoup-2.4) were not met:
+	as_fn_error "Package requirements (libsoup-2.4) were not met:
 
 $SOUP_PKG_ERRORS
 
@@ -20706,22 +18648,11 @@
 Alternatively, you may set the environment variables SOUP_CFLAGS
 and SOUP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SOUP_CFLAGS
-and SOUP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -20730,12 +18661,11 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS
 	SOUP_LIBS=$pkg_cv_SOUP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -20744,9 +18674,7 @@
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XCAP 1
-_ACEOF
+$as_echo "#define HAVE_XCAP 1" >>confdefs.h
 
 fi
 
@@ -20768,27 +18696,33 @@
 
 gdu_cv_version_required=0.3.2
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
 if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   gdu_cv_have_gdu=yes
 else
   gdu_cv_have_gdu=no
 fi
 
 if test "$gdu_cv_have_gdu" = "yes"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	$GNOME_DOC_INIT_ARG
 fi
 
 
 
 # Check whether --with-help-dir was given.
-if test "${with_help_dir+set}" = set; then
+if test "${with_help_dir+set}" = set; then :
   withval=$with_help_dir;
 else
   with_help_dir='${datadir}/gnome/help'
@@ -20799,7 +18733,7 @@
 
 
 # Check whether --with-omf-dir was given.
-if test "${with_omf_dir+set}" = set; then
+if test "${with_omf_dir+set}" = set; then :
   withval=$with_omf_dir;
 else
   with_omf_dir='${datadir}/omf'
@@ -20810,7 +18744,7 @@
 
 
 # Check whether --with-help-formats was given.
-if test "${with_help_formats+set}" = set; then
+if test "${with_help_formats+set}" = set; then :
   withval=$with_help_formats;
 else
   with_help_formats=''
@@ -20820,7 +18754,7 @@
 
 
 # Check whether --enable-scrollkeeper was given.
-if test "${enable_scrollkeeper+set}" = set; then
+if test "${enable_scrollkeeper+set}" = set; then :
   enableval=$enable_scrollkeeper;
 else
   enable_scrollkeeper=yes
@@ -20850,7 +18784,7 @@
 
 if test "x${gm_platform}" != "xmingw" ; then
   # Check whether --enable-gdu was given.
-if test "${enable_gdu+set}" = set; then
+if test "${enable_gdu+set}" = set; then :
   enableval=$enable_gdu; if test "x$enableval" = "xyes"; then
   enable_gdu=yes
 fi
@@ -20861,9 +18795,9 @@
   if test "x$enable_gdu" = "xyes"; then
     # Extract the first word of "scrollkeeper-config", so it can be a program name with args.
 set dummy scrollkeeper-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SK_CONFIG+set}" = set; then
+if test "${ac_cv_path_SK_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $SK_CONFIG in
@@ -20876,14 +18810,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_SK_CONFIG" && ac_cv_path_SK_CONFIG="no"
@@ -20892,18 +18826,16 @@
 fi
 SK_CONFIG=$ac_cv_path_SK_CONFIG
 if test -n "$SK_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $SK_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SK_CONFIG" >&5
 $as_echo "$SK_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
     if test "x$SK_CONFIG" = "xno"; then
-      { { $as_echo "$as_me:$LINENO: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net" >&5
-$as_echo "$as_me: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net" "$LINENO" 5
     fi
     GDU="enabled"
   fi
@@ -20921,7 +18853,7 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for PTLIB" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTLIB" >&5
 $as_echo_n "checking for PTLIB... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -20929,11 +18861,11 @@
         pkg_cv_PTLIB_CFLAGS="$PTLIB_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ptlib >= \${PTLIB_REC_VERSION}\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ptlib >= \${PTLIB_REC_VERSION}\""; } >&5
   ($PKG_CONFIG --exists --print-errors "ptlib >= ${PTLIB_REC_VERSION}") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_PTLIB_CFLAGS=`$PKG_CONFIG --cflags "ptlib >= ${PTLIB_REC_VERSION}" 2>/dev/null`
 else
   pkg_failed=yes
@@ -20947,11 +18879,11 @@
         pkg_cv_PTLIB_LIBS="$PTLIB_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ptlib >= \${PTLIB_REC_VERSION}\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ptlib >= \${PTLIB_REC_VERSION}\""; } >&5
   ($PKG_CONFIG --exists --print-errors "ptlib >= ${PTLIB_REC_VERSION}") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_PTLIB_LIBS=`$PKG_CONFIG --libs "ptlib >= ${PTLIB_REC_VERSION}" 2>/dev/null`
 else
   pkg_failed=yes
@@ -20978,18 +18910,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$PTLIB_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (ptlib >= ${PTLIB_REC_VERSION}) were not met:
-
-$PTLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables PTLIB_CFLAGS
-and PTLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (ptlib >= ${PTLIB_REC_VERSION}) were not met:
+	as_fn_error "Package requirements (ptlib >= ${PTLIB_REC_VERSION}) were not met:
 
 $PTLIB_PKG_ERRORS
 
@@ -20999,22 +18920,11 @@
 Alternatively, you may set the environment variables PTLIB_CFLAGS
 and PTLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables PTLIB_CFLAGS
-and PTLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -21023,18 +18933,17 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	PTLIB_CFLAGS=$pkg_cv_PTLIB_CFLAGS
 	PTLIB_LIBS=$pkg_cv_PTLIB_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for OPAL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPAL" >&5
 $as_echo_n "checking for OPAL... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -21042,11 +18951,11 @@
         pkg_cv_OPAL_CFLAGS="$OPAL_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"opal >= \${OPAL_REC_VERSION}\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opal >= \${OPAL_REC_VERSION}\""; } >&5
   ($PKG_CONFIG --exists --print-errors "opal >= ${OPAL_REC_VERSION}") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_OPAL_CFLAGS=`$PKG_CONFIG --cflags "opal >= ${OPAL_REC_VERSION}" 2>/dev/null`
 else
   pkg_failed=yes
@@ -21060,11 +18969,11 @@
         pkg_cv_OPAL_LIBS="$OPAL_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"opal >= \${OPAL_REC_VERSION}\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opal >= \${OPAL_REC_VERSION}\""; } >&5
   ($PKG_CONFIG --exists --print-errors "opal >= ${OPAL_REC_VERSION}") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_OPAL_LIBS=`$PKG_CONFIG --libs "opal >= ${OPAL_REC_VERSION}" 2>/dev/null`
 else
   pkg_failed=yes
@@ -21091,18 +19000,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$OPAL_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (opal >= ${OPAL_REC_VERSION}) were not met:
-
-$OPAL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables OPAL_CFLAGS
-and OPAL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (opal >= ${OPAL_REC_VERSION}) were not met:
+	as_fn_error "Package requirements (opal >= ${OPAL_REC_VERSION}) were not met:
 
 $OPAL_PKG_ERRORS
 
@@ -21112,22 +19010,11 @@
 Alternatively, you may set the environment variables OPAL_CFLAGS
 and OPAL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables OPAL_CFLAGS
-and OPAL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -21136,19 +19023,18 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	OPAL_CFLAGS=$pkg_cv_OPAL_CFLAGS
 	OPAL_LIBS=$pkg_cv_OPAL_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
 
 SUFFIX=
 # Check whether --enable-opal-debug was given.
-if test "${enable_opal_debug+set}" = set; then
+if test "${enable_opal_debug+set}" = set; then :
   enableval=$enable_opal_debug; if test "x$enableval" = "xyes"; then
                 SUFFIX="_d"
               fi
@@ -21156,7 +19042,7 @@
 
 
 # Check whether --enable-static-libs was given.
-if test "${enable_static_libs+set}" = set; then
+if test "${enable_static_libs+set}" = set; then :
   enableval=$enable_static_libs; if test "x$enableval" = "xyes"; then
                 SUFFIX="${SUFFIX}_s"
                fi
@@ -21173,207 +19059,70 @@
 
 
 
-
-H323=`$PKG_CONFIG --variable=h323 opal`
-if test "x$H323" = "x1"; then
-  H323="yes"
-else
-  H323=`$PKG_CONFIG --variable=OPAL_H323 opal`
-fi
-
-if test "x$H323" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_H323 1
-_ACEOF
-
-fi
- if test "x${H323}" = "xyes"; then
-  HAVE_H323_TRUE=
-  HAVE_H323_FALSE='#'
-else
-  HAVE_H323_TRUE='#'
-  HAVE_H323_FALSE=
-fi
-
-
-SIP=`$PKG_CONFIG --variable=sip opal`
-if test "x$SIP" = "x1"; then
-  SIP="yes"
-else
-  SIP=`$PKG_CONFIG --variable=OPAL_SIP opal`
-fi
-
-if test "x$SIP" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIP 1
-_ACEOF
-
-fi
- if test "x${SIP}" = "xyes"; then
-  HAVE_SIP_TRUE=
-  HAVE_SIP_FALSE='#'
-else
-  HAVE_SIP_TRUE='#'
-  HAVE_SIP_FALSE=
-fi
-
-
-
-GETTEXT_PACKAGE=ekiga
-
-
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
-
-
-
-for ac_header in locale.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
+
+# check for H.323 support
+# Check whether --enable-h323 was given.
+if test "${enable_h323+set}" = set; then :
+  enableval=$enable_h323; enable_h323=$enableval
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+if test x$enable_h323 != xno; then
+    H323=`$PKG_CONFIG --variable=h323 opal`
+  if test "x$H323" = "x1"; then
+    H323="yes"
+  else
+    H323=`$PKG_CONFIG --variable=OPAL_H323 opal`
+  fi
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
+  if test "x$H323" = "xyes"; then
+
+$as_echo "#define HAVE_H323 1" >>confdefs.h
+
+  else
+    if test x$enable_h323 = xyes; then
+      as_fn_error "To enable H.323 support you need to re-install opal with H.323 support" "$LINENO" 5
+    fi
+  fi
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  H323="no"
+fi
 
-  ac_header_preproc=no
+ if test "x${H323}" = "xyes"; then
+  HAVE_H323_TRUE=
+  HAVE_H323_FALSE='#'
+else
+  HAVE_H323_TRUE='#'
+  HAVE_H323_FALSE=
 fi
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------------------- ##
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga ##
-## -------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+# check for mandatory SIP support in opal
+SIP=`$PKG_CONFIG --variable=sip opal`
+if test "x$SIP" = "x1"; then
+  SIP="yes"
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  SIP=`$PKG_CONFIG --variable=OPAL_SIP opal`
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 
+if test "x$SIP" != "xyes"; then
+  as_fn_error "You have to compile opal with SIP support. SIP support is mandatory." "$LINENO" 5
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+
+
+GETTEXT_PACKAGE=ekiga
+
+
+cat >>confdefs.h <<_ACEOF
+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+_ACEOF
+
+
+   for ac_header in locale.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+if test "x$ac_cv_header_locale_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LOCALE_H 1
 _ACEOF
 
 fi
@@ -21381,16 +19130,12 @@
 done
 
     if test $ac_cv_header_locale_h = yes; then
-    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
 int
@@ -21401,46 +19146,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   am_cv_val_LC_MESSAGES=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_val_LC_MESSAGES=no
+  am_cv_val_LC_MESSAGES=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
 $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
     if test $am_cv_val_LC_MESSAGES = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
 
     fi
   fi
@@ -21453,155 +19171,20 @@
     XGETTEXT=:
     INTLLIBS=
 
-    if test "${ac_cv_header_libintl_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
-$as_echo_n "checking libintl.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <libintl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
-$as_echo_n "checking libintl.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------------------- ##
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga ##
-## -------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_libintl_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-
-fi
-if test "x$ac_cv_header_libintl_h" = x""yes; then
+    ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
   gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
 
       #
       # First check in libc
       #
-      { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
 $as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <libintl.h>
@@ -21614,54 +19197,25 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   gt_cv_func_ngettext_libc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_ngettext_libc=no
+  gt_cv_func_ngettext_libc=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
 $as_echo "$gt_cv_func_ngettext_libc" >&6; }
 
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
 $as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <libintl.h>
@@ -21674,141 +19228,26 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   gt_cv_func_dgettext_libc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_dgettext_libc=no
+  gt_cv_func_dgettext_libc=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
 $as_echo "$gt_cv_func_dgettext_libc" >&6; }
       fi
 
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-
-for ac_func in bind_textdomain_codeset
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+        for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
 
 fi
@@ -21823,18 +19262,14 @@
 	 || test "$gt_cv_func_ngettext_libc" != "yes" \
          || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
 
-        { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21844,63 +19279,34 @@
 extern "C"
 #endif
 char bindtextdomain ();
-int
-main ()
-{
-return bindtextdomain ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+int
+main ()
+{
+return bindtextdomain ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_intl_bindtextdomain=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_bindtextdomain=no
+  ac_cv_lib_intl_bindtextdomain=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21918,55 +19324,26 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_intl_ngettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_ngettext=no
+  ac_cv_lib_intl_ngettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
 $as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21984,43 +19361,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_intl_dgettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_dgettext=no
+  ac_cv_lib_intl_dgettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
 $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
   gt_cv_func_dgettext_libintl=yes
 fi
 
@@ -22030,22 +19382,18 @@
 
 
 	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
 $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-	  { $as_echo "$as_me:$LINENO: result: " >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
-  	  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl -liconv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -22063,55 +19411,26 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_intl_ngettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_ngettext=no
+  ac_cv_lib_intl_ngettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
 $as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl -liconv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -22129,43 +19448,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_intl_dcgettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_dcgettext=no
+  ac_cv_lib_intl_dcgettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
   gt_cv_func_dgettext_libintl=yes
 			libintl_extra_libs=-liconv
 else
@@ -22187,102 +19481,12 @@
           glib_save_LIBS="$LIBS"
           LIBS="$LIBS -lintl $libintl_extra_libs"
           unset ac_cv_func_bind_textdomain_codeset
-
-for ac_func in bind_textdomain_codeset
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+          for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
 
 fi
@@ -22312,15 +19516,13 @@
 
       if test "$gt_cv_have_gettext" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 
 	# Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -22345,118 +19547,28 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != "no"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
 $as_echo "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 	if test "$MSGFMT" != "no"; then
           glib_save_LIBS="$LIBS"
           LIBS="$LIBS $INTLLIBS"
-
-for ac_func in dcgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	  for ac_func in dcgettext
+do :
+  ac_fn_cxx_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_DCGETTEXT 1
 _ACEOF
 
 fi
 done
 
 	  MSGFMT_OPTS=
-	  { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
 $as_echo_n "checking if msgfmt accepts -c... " >&6; }
 	  cat >conftest.foo <<_ACEOF
 
@@ -22471,14 +19583,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 _ACEOF
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
   ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-else { $as_echo "$as_me:$LINENO: result: no" >&5
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 echo "$as_me: failed input was:" >&5
 sed 's/^/| /' conftest.foo >&5
@@ -22486,9 +19598,9 @@
 
 	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -22501,14 +19613,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -22517,19 +19629,19 @@
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
 $as_echo "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 	  # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -22554,144 +19666,33 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
 $as_echo "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-	  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  CATOBJEXT=.gmo
-             DATADIRNAME=share
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	case $host in
-	    *-*-solaris*)
-	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char bind_textdomain_codeset (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef bind_textdomain_codeset
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bind_textdomain_codeset ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-#endif
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 int
 main ()
 {
-return bind_textdomain_codeset ();
+extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_bind_textdomain_codeset=yes
+if ac_fn_cxx_try_link "$LINENO"; then :
+  CATOBJEXT=.gmo
+             DATADIRNAME=share
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_bind_textdomain_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+  case $host in
+	    *-*-solaris*)
+	    	                	    	                ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   CATOBJEXT=.gmo
                DATADIRNAME=share
 else
@@ -22706,10 +19707,8 @@
 	    ;;
 	    esac
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
           LIBS="$glib_save_LIBS"
 	  INSTOBJEXT=.mo
 	else
@@ -22723,9 +19722,7 @@
 
     if test "$gt_cv_have_gettext" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
 
     fi
 
@@ -22733,7 +19730,7 @@
                   if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
         : ;
       else
-        { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
 $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
         XGETTEXT=":"
       fi
@@ -22766,7 +19763,7 @@
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
 $as_echo_n "checking for catalogs to be installed... " >&6; }
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -22791,7 +19788,7 @@
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
 $as_echo "$LINGUAS" >&6; }
      fi
 
@@ -22888,13 +19885,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -22902,8 +19899,8 @@
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -22926,11 +19923,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -22950,55 +19947,45 @@
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
 LTLIBOBJS=$ac_ltlibobjs
 
 
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 
@@ -23006,195 +19993,114 @@
 
 
 if test -z "${HAVE_GNOME_TRUE}" && test -z "${HAVE_GNOME_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_GNOME\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_GNOME\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_GCONF_TRUE}" && test -z "${HAVE_GCONF_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GCONF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_GCONF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_GCONF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_EDS_TRUE}" && test -z "${HAVE_EDS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_EDS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_EDS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_EDS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_NOTIFY_TRUE}" && test -z "${HAVE_NOTIFY_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NOTIFY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_NOTIFY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_NOTIFY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LDAP_TRUE}" && test -z "${HAVE_LDAP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LDAP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_LDAP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_LDAP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_MMX_TRUE}" && test -z "${USE_MMX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"USE_MMX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"USE_MMX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_SHM_TRUE}" && test -z "${HAVE_SHM_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SHM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_SHM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_SHM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_XV_TRUE}" && test -z "${HAVE_XV_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XV\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_XV\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_XV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_DX_TRUE}" && test -z "${HAVE_DX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_DX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_DX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DBUS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_DBUS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_DBUS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INSTALL_DBUS_SERVICE_TRUE}" && test -z "${INSTALL_DBUS_SERVICE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_DBUS_SERVICE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"INSTALL_DBUS_SERVICE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"INSTALL_DBUS_SERVICE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_V4L_TRUE}" && test -z "${HAVE_V4L_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_V4L\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_V4L\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_V4L\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_AVAHI_TRUE}" && test -z "${HAVE_AVAHI_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_AVAHI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_AVAHI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_AVAHI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_GSTREAMER_TRUE}" && test -z "${HAVE_GSTREAMER_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GSTREAMER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_GSTREAMER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_GSTREAMER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_KDE_TRUE}" && test -z "${HAVE_KDE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_KDE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_KDE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_KDE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_KAB_TRUE}" && test -z "${HAVE_KAB_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_KAB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_KAB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_KAB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_XCAP_TRUE}" && test -z "${HAVE_XCAP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XCAP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_XCAP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_XCAP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"ENABLE_SK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_H323_TRUE}" && test -z "${HAVE_H323_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_H323\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_H323\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${HAVE_SIP_TRUE}" && test -z "${HAVE_SIP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SIP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_SIP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_H323\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -23204,17 +20110,18 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -23222,23 +20129,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -23246,7 +20145,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -23257,7 +20162,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -23280,13 +20185,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -23296,15 +20194,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -23316,12 +20214,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -23333,7 +20235,89 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -23347,8 +20331,12 @@
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -23368,76 +20356,25 @@
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -23466,8 +20403,56 @@
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -23486,10 +20471,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -23504,13 +20489,19 @@
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ekiga $as_me 3.2.5, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+This file was extended by ekiga $as_me 3.2.6, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -23542,10 +20533,11 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
@@ -23567,16 +20559,16 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-ekiga config.status 3.2.5
-configured by $0, generated by GNU Autoconf 2.63,
+ekiga config.status 3.2.6
+configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -23619,20 +20611,19 @@
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -23640,11 +20631,10 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -24195,9 +21185,7 @@
     "lib/engine/components/echo/Makefile") CONFIG_FILES="$CONFIG_FILES lib/engine/components/echo/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -24224,7 +21212,7 @@
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -24235,11 +21223,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -24247,10 +21231,16 @@
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -24264,24 +21254,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -24370,9 +21354,7 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -24413,9 +21395,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -24500,9 +21480,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -24515,9 +21493,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -24545,12 +21521,10 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -24561,7 +21535,7 @@
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -24574,9 +21548,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -24604,47 +21576,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -24701,7 +21633,6 @@
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -24711,12 +21642,11 @@
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -24726,7 +21656,7 @@
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -24755,14 +21685,12 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
@@ -24772,9 +21700,7 @@
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -24785,25 +21711,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -24841,34 +21761,35 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
 
   case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
@@ -24891,28 +21812,28 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
@@ -24935,51 +21856,12 @@
 	    q
 	  }
 	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
     done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
   done
-done
+}
  ;;
     "libtool":C)
 
@@ -25941,9 +22823,7 @@
       esac ;;
     "po/stamp-it":C)
     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
     fi
     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
     >"po/stamp-it.tmp"
@@ -25966,15 +22846,12 @@
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -25995,10 +22872,10 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
@@ -26023,7 +22900,6 @@
 fi
 echo ""
 echo "                   H.323 support  :  $H323"
-echo "                     SIP support  :  $SIP"
 echo ""
 if test "x${gm_platform}" != "xmingw" ; then
 echo "                    DBUS support  :  $DBUS"
diff -Nru ekiga-3.2.5/configure.ac ekiga-3.2.6~ppa~karmic1/configure.ac
--- ekiga-3.2.5/configure.ac	2009-07-06 20:09:34.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/configure.ac	2009-09-22 15:28:49.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT(ekiga, 3.2.5, http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga)
+AC_INIT(ekiga, 3.2.6, http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga)
 AC_CANONICAL_TARGET
 AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR(src/gui/main.cpp)
@@ -16,10 +16,10 @@
 MAJOR_VERSION=3
 MINOR_VERSION=2
 BUILD_TYPE=ReleaseCode
-BUILD_NUMBER=5
+BUILD_NUMBER=6
 
-PTLIB_REC_VERSION="2.6.4"
-OPAL_REC_VERSION="3.6.4"
+PTLIB_REC_VERSION="2.6.5"
+OPAL_REC_VERSION="3.6.6"
 
 AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION,[fix])
 AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION,[fix])
@@ -91,7 +91,7 @@
     gm_platform="linux"
     ;;
 
-  FreeBSD* | freebsd* | NetBSD* | netbsd* )
+  FreeBSD* | freebsd* | kfreebsd* | NetBSD* | netbsd* )
     gm_platform="freebsd"
     ;;
 
@@ -741,19 +741,33 @@
 AC_SUBST(OPAL_CFLAGS)
 AC_SUBST(OPAL_LIBS)
 
-dnl The =1 checks are here only for backward compatibility
-H323=`$PKG_CONFIG --variable=h323 opal`
-if test "x$H323" = "x1"; then
-  H323="yes"
+# check for H.323 support
+AC_ARG_ENABLE(h323, AC_HELP_STRING([--enable-h323],
+              [enable H.323 support (default same as opal)]),
+              enable_h323=$enableval)
+if test x$enable_h323 != xno; then
+  dnl The =1 checks are here only for backward compatibility
+  H323=`$PKG_CONFIG --variable=h323 opal`
+  if test "x$H323" = "x1"; then
+    H323="yes"
+  else
+    H323=`$PKG_CONFIG --variable=OPAL_H323 opal`
+  fi
+
+  if test "x$H323" = "xyes"; then
+    AC_DEFINE(HAVE_H323,1,[H323 support])
+  else
+    if test x$enable_h323 = xyes; then
+      AC_MSG_ERROR([To enable H.323 support you need to re-install opal with H.323 support])
+    fi
+  fi
 else
-  H323=`$PKG_CONFIG --variable=OPAL_H323 opal`
+  H323="no"
 fi
 
-if test "x$H323" = "xyes"; then
-  AC_DEFINE(HAVE_H323,1,[H323 support])
-fi
 AM_CONDITIONAL(HAVE_H323, test "x${H323}" = "xyes")
 
+# check for mandatory SIP support in opal
 SIP=`$PKG_CONFIG --variable=sip opal`
 if test "x$SIP" = "x1"; then
   SIP="yes"
@@ -761,10 +775,9 @@
   SIP=`$PKG_CONFIG --variable=OPAL_SIP opal`
 fi
 
-if test "x$SIP" = "xyes"; then
-  AC_DEFINE(HAVE_SIP,1,[SIP support])
+if test "x$SIP" != "xyes"; then
+  AC_MSG_ERROR([You have to compile opal with SIP support. SIP support is mandatory.])
 fi
-AM_CONDITIONAL(HAVE_SIP, test "x${SIP}" = "xyes")
 
 
 dnl #########################################################################
@@ -887,7 +900,6 @@
 fi
 echo ""
 echo "                   H.323 support  :  $H323"
-echo "                     SIP support  :  $SIP"
 echo ""
 if test "x${gm_platform}" != "xmingw" ; then
 echo "                    DBUS support  :  $DBUS"
diff -Nru ekiga-3.2.5/debian/changelog ekiga-3.2.6~ppa~karmic1/debian/changelog
--- ekiga-3.2.5/debian/changelog	2010-03-26 16:12:14.000000000 +0000
+++ ekiga-3.2.6~ppa~karmic1/debian/changelog	2010-03-26 16:12:14.000000000 +0000
@@ -1,3 +1,14 @@
+ekiga (3.2.6~ppa~karmic1) karmic; urgency=low
+
+  * Get upstream source from Gnome FTP
+  * BuildDeps on libpt2.6.5~ and libopal3.6.6~, runtime dep on
+    libpt2.6.5-plugins
+  * Disabled patch for Launchpad Integration
+  * ekiga-dbg depends on libpt2.6.5-dbg, libopal3.6.6-dbg
+  * Updated debian/control and debian/control.in accordingly
+
+ -- Yannick Defais (packager key) <sevmek@free.fr>  Wed, 23 Sep 2009 01:19:29 +0200
+
 ekiga (3.2.5-1ubuntu1) karmic; urgency=low
 
   * Merge from Debian unstable.
diff -Nru ekiga-3.2.5/debian/control ekiga-3.2.6~ppa~karmic1/debian/control
--- ekiga-3.2.5/debian/control	2010-03-26 16:12:14.000000000 +0000
+++ ekiga-3.2.6~ppa~karmic1/debian/control	2010-03-26 16:12:14.000000000 +0000
@@ -8,8 +8,8 @@
                libsasl2-dev,
                gettext,
                libldap2-dev,
-               libpt-dev (>= 2.6.4),
-               libopal-dev (>= 3.6.4~),
+               libpt-dev (>= 2.6.5~),
+               libopal-dev (>= 3.6.6~),
                libgconf2-dev,
                libxv-dev,
                autotools-dev,
@@ -42,7 +42,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-data-server,
-         libpt2.6.4-plugins
+         libpt2.6.5-plugins
 Recommends: gvfs, yelp
 Suggests: siproxd,
           gnugk,
@@ -70,8 +70,8 @@
 Architecture: any
 Depends: ekiga (= ${binary:Version}),
          ${misc:Depends},
-         libpt2.6.4-dbg,
-         libopal3.6.4-dbg
+         libpt2.6.5-dbg,
+         libopal3.6.6-dbg
 Suggests: libc6-dbg
 Description: H.323 and SIP compatible VoIP client - debug symbols
  H.323 and SIP compatible videoconferencing and VoIP/IP-Telephony application
diff -Nru ekiga-3.2.5/debian/control.in ekiga-3.2.6~ppa~karmic1/debian/control.in
--- ekiga-3.2.5/debian/control.in	2010-03-26 16:12:14.000000000 +0000
+++ ekiga-3.2.6~ppa~karmic1/debian/control.in	2010-03-26 16:12:14.000000000 +0000
@@ -8,8 +8,8 @@
                libsasl2-dev,
                gettext,
                libldap2-dev,
-               libpt-dev (>= 2.6.4),
-               libopal-dev (>= 3.6.4~),
+               libpt-dev (>= 2.6.5~),
+               libopal-dev (>= 3.6.6~),
                libgconf2-dev,
                libxv-dev,
                autotools-dev,
@@ -42,7 +42,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-data-server,
-         libpt2.6.4-plugins
+         libpt2.6.5-plugins
 Recommends: gvfs, yelp
 Suggests: siproxd,
           gnugk,
@@ -70,8 +70,8 @@
 Architecture: any
 Depends: ekiga (= ${binary:Version}),
          ${misc:Depends},
-         libpt2.6.4-dbg,
-         libopal3.6.4-dbg
+         libpt2.6.5-dbg,
+         libopal3.6.6-dbg
 Suggests: libc6-dbg
 Description: H.323 and SIP compatible VoIP client - debug symbols
  H.323 and SIP compatible videoconferencing and VoIP/IP-Telephony application
diff -Nru ekiga-3.2.5/debian/patches/series ekiga-3.2.6~ppa~karmic1/debian/patches/series
--- ekiga-3.2.5/debian/patches/series	2010-03-26 16:12:14.000000000 +0000
+++ ekiga-3.2.6~ppa~karmic1/debian/patches/series	2010-03-26 16:12:14.000000000 +0000
@@ -1 +1 @@
-ubuntu_lpi.patch
+
diff -Nru ekiga-3.2.5/debian/rules ekiga-3.2.6~ppa~karmic1/debian/rules
--- ekiga-3.2.5/debian/rules	2010-03-26 16:12:14.000000000 +0000
+++ ekiga-3.2.6~ppa~karmic1/debian/rules	2010-03-26 16:12:14.000000000 +0000
@@ -50,7 +50,7 @@
 build-stamp: patch-stamp
 	dh_testdir
 	rm -f config.cache
-	autoreconf
+	#autoreconf
 	CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	    ./configure $(confflags)
 	$(MAKE) $(MAKEFLAGS)
diff -Nru ekiga-3.2.5/depcomp ekiga-3.2.6~ppa~karmic1/depcomp
--- ekiga-3.2.5/depcomp	2009-07-06 20:10:42.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/depcomp	2009-09-22 15:36:31.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2007-03-29.01
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,6 +85,15 @@
    depmode=dashmstdout
 fi
 
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -192,14 +199,14 @@
 ' < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
     tr '
-' ' ' >> $depfile
-    echo >> $depfile
+' ' ' >> "$depfile"
+    echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
     tr ' ' '
 ' < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+   >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -328,7 +335,12 @@
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
   else
     echo "#dummy" > "$depfile"
   fi
@@ -404,7 +416,7 @@
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -455,32 +467,39 @@
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  cleared=no eat=no
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
@@ -500,7 +519,7 @@
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -538,13 +557,27 @@
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # always write the preprocessed file to stdout.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
@@ -557,16 +590,23 @@
 	;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
   echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -585,5 +625,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -Nru ekiga-3.2.5/ekiga.desktop ekiga-3.2.6~ppa~karmic1/ekiga.desktop
--- ekiga-3.2.5/ekiga.desktop	2009-07-06 20:11:09.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/ekiga.desktop	2009-09-22 15:37:03.000000000 +0100
@@ -1,11 +1,12 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Ekiga Softphone
 Name[ar]=الهاتف البرمجي إكِجا
 Name[as]=Ekiga Softphone
 Name[bg]=Телефон по Интернет (Ekiga)
+Name[bn]=Ekiga Softphone
 Name[bn_IN]=Ekiga Softphone
 Name[ca]=Telèfon per programari Ekiga
+Name[ca@valencia]=Telèfon per programari Ekiga
 Name[crh]=Ekiga Yazılımfon
 Name[cs]=Telefon Ekiga
 Name[cy]=Ffôn meddal Ekiga
@@ -20,6 +21,7 @@
 Name[eu]=Ekiga soft-fonoa
 Name[fi]=Ekiga-ohjelmistopuhelin
 Name[fr]=Softphone Ekiga
+Name[ga]=Fón Bogearraí Ekiga
 Name[gl]=Softphone do Ekiga
 Name[gu]=Ekiga સોફ્ટફોન
 Name[he]=תוכנת הטלפון Ekiga
@@ -67,8 +69,10 @@
 GenericName[ar]=هوتفة ب.إ ، صوت عبر ب.إ و مؤتمرات فيديو
 GenericName[as]=IP Telephony, VoIP আৰু ভিডিঅ' কন্‌ফাৰেঞ্চিং
 GenericName[bg]=Телефония по IP, VoIP и видео конференции
+GenericName[bn]=IP টেলিফোনি, VoIP ও ভিডিও সম্মেলন
 GenericName[bn_IN]=IP টেলিফোনি, VoIP ও ভিডিও সম্মেলন
 GenericName[ca]=Telefonia IP, VoIP i videoconferència
+GenericName[ca@valencia]=Telefonia IP, VoIP i videoconferència
 GenericName[crh]=İP Telefoncılığı, İP üzeri Ses (VoİP) ve Video Toplaşuvlama
 GenericName[cs]=IP telefonie, VoIP a videokonference
 GenericName[cy]=Teleffoni IP, VoIP a Chynadledda Fideo
@@ -130,9 +134,11 @@
 Comment[as]=ইন্টাৰ্নে'টৰ যোগেদি অন্যৰ লগত কথা পাতক
 Comment[az]=İnternet üstündən insanlarla rabitə qurun
 Comment[bg]=Разговор с хора по Интернет
+Comment[bn]=ইন্টারনেট-এর সাহায্যে লোকজনের সাথে কথা বলুন
 Comment[bn_IN]=ইন্টারনেট-এর সাহায্যে যোগাযোগস্থাপন করুন
 Comment[bs]=Razgovarajte s ljudima preko Interneta
 Comment[ca]=Parleu amb gent arreu d'Internet
+Comment[ca@valencia]=Parleu amb gent arreu d'Internet
 Comment[crh]=İnternet üzerinden insanlar ile söyleş
 Comment[cs]=Hovořit s lidmi přes Internet
 Comment[cy]=Siarad â phobl dros y Rhyngrwyd
@@ -206,4 +212,4 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=ekiga
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.2.5
+X-GNOME-Bugzilla-Version=3.2.6
diff -Nru ekiga-3.2.5/ekiga.desktop.in.in ekiga-3.2.6~ppa~karmic1/ekiga.desktop.in.in
--- ekiga-3.2.5/ekiga.desktop.in.in	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/ekiga.desktop.in.in	2009-09-22 15:27:35.000000000 +0100
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 _Name=Ekiga Softphone
 TryExec=@PACKAGE_NAME@
 _GenericName=IP Telephony, VoIP and Video Conferencing
diff -Nru ekiga-3.2.5/ekiga.schemas ekiga-3.2.6~ppa~karmic1/ekiga.schemas
--- ekiga-3.2.5/ekiga.schemas	2009-07-06 20:11:10.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/ekiga.schemas	2009-09-22 15:37:04.000000000 +0100
@@ -33,7 +33,7 @@
 
       <locale name="bn">
 	<short>অডিও আউটপুট ডিভাইস</short>
-	
+	<long>ব্যবহারের জন্য অডিও আউটপুট ডিভাইস নির্বাচন করুন</long>
       </locale>
 
       <locale name="bn_IN">
@@ -51,6 +51,11 @@
 	<long>Seleccioneu el dispositiu d&apos;àudio de sortida que vulgueu utilitzar</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Dispositiu d&apos;àudio d&apos;eixida</short>
+	<long>Seleccioneu el dispositiu d&apos;àudio d&apos;eixida que vulgueu utilitzar</long>
+      </locale>
+
       <locale name="crh">
 	<short>Davuş çıqtısı cihazı</short>
 	<long>Qullanılacaq davuş çıqtısı cihazını saylañız</long>
@@ -399,7 +404,7 @@
 
       <locale name="bn">
 	<short>অডিও ইনপুট ডিভাইস</short>
-	
+	<long>ব্যবহারের জন্য অডিও ইনপুট ডিভাইস নির্বাচন করুন</long>
       </locale>
 
       <locale name="bn_IN">
@@ -417,6 +422,11 @@
 	<long>Seleccioneu el dispositiu d&apos;àudio d&apos;entrada que vulgueu utilitzar</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Dispositiu d&apos;àudio d&apos;entrada</short>
+	<long>Seleccioneu el dispositiu d&apos;àudio d&apos;entrada que vulgueu utilitzar</long>
+      </locale>
+
       <locale name="crh">
 	<short>Davuş kirdisi cihazı</short>
 	<long>Qullanılacaq davuş kirdisi cihazını saylañız</long>
@@ -763,6 +773,11 @@
 	<long>Избор на входното видео устройство, което да се използва. Ако се появи грешка при използването на това устройство, ще се появи тестова картина.</long>
       </locale>
 
+      <locale name="bn">
+	<short>ভিডিও ইনপুট ডিভাইস</short>
+	<long>ব্যবহারযোগ্য ভিডিও ইনপুট ডিভাইস নির্বাচন করুন। এই ডিভাইস ব্যবহারকালে কোনো ধরনের ত্রুটি উৎপন্ন হলে একটি পরীক্ষামূলক ছবি সম্প্রচার করা হবে।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ভিডিও ইনপুট ডিভাইস</short>
 	<long>ব্যবহারযোগ্য ভিডিও ইনপুট ডিভাইস নির্বাচন করুন। এই ডিভাইস ব্যবহারকালে কোনো ধরনের ত্রুটি উৎপন্ন হলে একটি পরীক্ষামূলক ছবি সম্প্রচার করা হবে।</long>
@@ -778,6 +793,11 @@
 	<long>Seleccioneu el dispositiu de vídeo d&apos;entrada que vulgueu fer servir. Si es produeix algun error, es transmetrà una imatge de prova.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Dispositiu de vídeo d&apos;entrada</short>
+	<long>Seleccioneu el dispositiu de vídeo d&apos;entrada que vulgueu fer servir. Si es produeix algun error, es transmetrà una imatge de prova.</long>
+      </locale>
+
       <locale name="crh">
 	<short>Video kirdisi cihazı</short>
 	<long>Qullanılacaq video kirdisi cihazını saylañız. Eger bu cihaznı qullanğanda bir hata rastkelse, bir deñeme resmi naqil etilecek.</long>
@@ -1135,8 +1155,8 @@
       </locale>
 
       <locale name="bn">
-	<short>ভিডিও-র আকার</short>
-	
+	<short>ভিডিও-এর আকার</short>
+	<long>সম্প্রচার করা ভিডিও মাপ নির্বাচন করুন: ছোট (QCIF 176x144) অথবা বড় (CIF 352x288)</long>
       </locale>
 
       <locale name="bn_IN">
@@ -1154,6 +1174,11 @@
 	<long>Escolliu la mida del vídeo transmès: Petita (QCIF 176x144) o Gran (CIF 352x288)</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida del vídeo</short>
+	<long>Escolliu la mida del vídeo transmés: Petita (QCIF 176x144) o Gran (CIF 352x288)</long>
+      </locale>
+
       <locale name="crh">
 	<short>Video ölçüsi</short>
 	<long>Naqil etilgen video ölçüsini saylañız: Kiçik (QCIF 176x144) ya da Büyük (CIF 352x288)</long>
@@ -1512,7 +1537,7 @@
 
       <locale name="bn">
 	<short>ভিডিও চ্যানেল</short>
-	
+	<long>ব্যবহারযোগ্য ভিডিও চ্যানেলের সংখ্যা (ক্যামেরা, টিভি অথবা অন্যান্য উৎস নির্বাচনের জন্য)</long>
       </locale>
 
       <locale name="bn_IN">
@@ -1530,6 +1555,11 @@
 	<long>El canal de vídeo que es farà servir (seleccioneu càmera, tv, o altres fonts...)</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Canal de vídeo</short>
+	<long>El canal de vídeo que es farà servir (seleccioneu càmera, tv, o altres fonts...)</long>
+      </locale>
+
       <locale name="crh">
 	<short>Video kanalı</short>
 	<long>Qullanılacaq video kanalı nomerası (kamera, tv ya da diger menbalarnı saylamaq içün)</long>
@@ -1887,8 +1917,8 @@
       </locale>
 
       <locale name="bn">
-	<short>ভিডিও-র ধরণ</short>
-	
+	<short>ভিডিও-এর বিন্যাস</short>
+	<long>ভিডিও ক্যামেরার বিন্যাস বেছে নিন (অধিকাংশ USB ক্যামেরার ক্ষেত্রে প্রযোজ্য নয়)</long>
       </locale>
 
       <locale name="bn_IN">
@@ -1906,6 +1936,11 @@
 	<long>Seleccioneu el format per a càmeres de vídeo. (No té rellevància en la majoria de càmeres USB)</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Format de vídeo</short>
+	<long>Seleccioneu el format per a càmeres de vídeo. (No té rellevància en la majoria de càmeres USB)</long>
+      </locale>
+
       <locale name="crh">
 	<short>Video formatı</short>
 	<long>Video kameralar içün format saylañız (USB kameralarınıñ ekseriyetine uyğulanmaz)</long>
@@ -2252,6 +2287,11 @@
  	<long>Показване на изображения от камерата ви</long>
       </locale>
 
+      <locale name="bn">
+	<short>ভিডিও-এর প্রাকদর্শন</short>
+ 	<long>ক্যামেরা ডিভাইস থেকে ছবি প্রদর্শন করা হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ভিডিও-র পূর্ব প্রদর্শন</short>
  	<long>ক্যামেরা ডিভাইস থেকে ছবি প্রদর্শন করা হবে</long>
@@ -2267,6 +2307,11 @@
  	<long>Mostra imatges de la càmera</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Visualització prèvia del vídeo</short>
+ 	<long>Mostra imatges de la càmera</long>
+      </locale>
+
       <locale name="crh">
 	<short>Video ög-baquv</short>
  	<long>Kamera cihazıñızdan suretlerni köster</long>
@@ -2608,6 +2653,11 @@
 	<long>Максималната честота кадри в секунда на излъчвания сигнал. Тя може да не бъде достигната, ако е зададено минимално графично качeство (стойност на ключа „TSTO“ под 31), а избраната честотна лента не стига.</long>
       </locale>
 
+      <locale name="bn">
+	<short>ফ্রেমের হার</short>
+	<long>ফ্রেম/সেকেন্ড অনুযায়ী পরিবাহিত সর্বাধিক ফ্রেমের হার। সর্বনিম্ন গুণমান চিহ্নকারী মান, TSTO-র মাধ্যমে ৩১-এর কম কোনো সংখ্যায় ধার্য করা হলে ও সর্বনিম্ন এই মান সমর্থনের জন্য নির্বাচিত বিটের হার পর্যাপত না হলে এই মাত্রা স্পর্শ সম্ভব না হতে পারে।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ফ্রেমের হার</short>
 	<long>ফ্রেম/সেকেন্ড অনুযায়ী পরিবাহিত সর্বাধিক ফ্রেমের হার। সর্বনিম্ন গুণমান চিহ্নকারী মান, TSTO-র মাধ্যমে ৩১-র কম কোনো সংখ্যায় ধার্য করা হলে ও সর্বনিম্ন এই মান সমর্থনের জন্য নির্বাচিত বিটের হার পর্যাপত না হলে এই মাত্রা স্পর্শ সম্ভব না হতে পারে।</long>
@@ -2618,6 +2668,11 @@
 	<long>El nombre màxim de quadres per segon transmesos. Pot ser que aquesta taxa no s&apos;assoleixi en cas que s&apos;hagi configurat una qualitat mínima a través d&apos;un valor de balanç temporal/espacial menor de 31, i que la taxa de bits seleccionada no sigui suficient per a funcionar amb aquesta qualitat mínima</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Velocitat dels quadres</short>
+	<long>El nombre màxim de quadres per segon transmesos. Pot ser que esta taxa no s&apos;assolisca en cas que s&apos;haja configurat una qualitat mínima a través d&apos;un valor de balanç temporal/espacial menor de 31, i que la taxa de bits seleccionada no siga suficient per a funcionar amb esta qualitat mínima</long>
+      </locale>
+
       <locale name="crh">
 	<short>Çerçive Nisbeti</short>
 	<long>Çerçive/saniye olaraq azamiy naqil etilgen çerçive nisbeti. Asğariy keyfiyetniñ 31 altındaki bir TSTO qıymeti vastası ile ayarlanğan olğanı ve saylanğan bit-nisbetiniñ bu asğariy keyfiyetni desteklemege yeterli olmağanı taqdirde, bu nisbet irişilmey bilir.</long>
@@ -2715,7 +2770,7 @@
 
       <locale name="hi">
 	<short>फ्रेम दर</short>
-	
+	<long>फ्रेम में अधिकतम प्रेषित ढांचा. यह दर नहीं पहुँच सकता है उस स्थिति में न्यूनतम गुणवत्ता को को TSTO मान से विन्यस्त किया जाना है जो 31 से छोटा है और चुना गया बिटरेट इस न्यूनतम गुणवत्ता को समर्थन देने के लिए पर्याप्त नहीं है</long>
       </locale>
 
       <locale name="hr">
@@ -2755,7 +2810,7 @@
 
       <locale name="lt">
 	<short>Kadrų dažnis</short>
-	
+	<long>Maksimalus siunčiamų kadrų kiekis per sekundę. Realus siunčiamų kadrų skaičius gali būti mažesnis, jei </long>
       </locale>
 
       <locale name="lv">
@@ -2775,7 +2830,7 @@
 
       <locale name="ml">
 	<short>ഫ്റെയിം റേറ്റ്</short>
-	
+	<long>The maximum transmitted frame rate in frames/s. This rate may not be reached in case a minimum quality was configure via a TSTO value smaller than 31 and the bitrate selected is not sufficient to support this minimum quality</long>
       </locale>
 
       <locale name="mr">
@@ -2854,13 +2909,13 @@
       </locale>
 
       <locale name="sr">
-	<short>Слика у секунди</short>
-	
+	<short>Учестаност кадрова</short>
+	<long>Максимални проток број кадрова у секунди. Овај проток не мора да се достигне уколико је минимални квалитет подешен TSTO вредношћу мањом од 31 и битски проток није довољан да подржи минимални квалитет слике</long>
       </locale>
 
       <locale name="sr@latin">
-	<short>Slika u sekundi</short>
-	
+	<short>Učestanost kadrova</short>
+	<long>Maksimalni protok broj kadrova u sekundi. Ovaj protok ne mora da se dostigne ukoliko je minimalni kvalitet podešen TSTO vrednošću manjom od 31 i bitski protok nije dovoljan da podrži minimalni kvalitet slike</long>
       </locale>
 
       <locale name="sv">
@@ -2944,6 +2999,11 @@
 	<long>Въведете пълното си име</long>
       </locale>
 
+      <locale name="bn">
+	<short>পুরো নাম</short>
+	<long>আপনার নাম লিখুন</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>নাম</short>
 	<long>আপনার নাম লিখুন</long>
@@ -2954,6 +3014,11 @@
 	<long>Introduïu el vostre nom i cognoms</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Nom complet</short>
+	<long>Introduïu el vostre nom i cognoms</long>
+      </locale>
+
       <locale name="crh">
 	<short>Tam isim</short>
 	<long>Soyadıñıznı kirsetiñiz</long>
@@ -3139,6 +3204,16 @@
 	<long>Shkruaj emrin tuaj të plotë</long>
       </locale>
 
+      <locale name="sr">
+	<short>Пуно име</short>
+	<long>Унесите пуно име</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Puno ime</short>
+	<long>Unesite puno ime</long>
+      </locale>
+
       <locale name="sv">
 	<short>Fullständigt namn</short>
 	<long>Ange ditt fullständiga namn</long>
@@ -3215,6 +3290,11 @@
 	<long>Кратко състояние на контакта</long>
       </locale>
 
+      <locale name="bn">
+	<short>পরিচিতির অবস্থার সংক্ষিপ্ত সূচনা</short>
+	<long>অবস্থা সম্পর্কিত সংক্ষিপ্ত সূচনা</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পরিচিতির অবস্থার সংক্ষিপ্ত সূচনা</short>
 	<long>অবস্থা সম্পর্কিত সংক্ষিপ্ত সূচনা</long>
@@ -3225,6 +3305,11 @@
 	<long>La informació resumida sobre l&apos;estat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Estat resumit del contacte</short>
+	<long>La informació resumida sobre l&apos;estat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Temasnıñ qısqa durumı</short>
 	<long>Qısqa durum malümatı</long>
@@ -3292,7 +3377,7 @@
 
       <locale name="hi">
 	<short>छोटी स्थिति संपर्क करें</short>
-	
+	<long>संक्षिप्क स्थिति सूचना</long>
       </locale>
 
       <locale name="hu">
@@ -3390,6 +3475,16 @@
 	<long>Informacione shkurt të gjëndjes</long>
       </locale>
 
+      <locale name="sr">
+	<short>Сажето стање контакта</short>
+	<long>Сажети подаци о стању</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Sažeto stanje kontakta</short>
+	<long>Sažeti podaci o stanju</long>
+      </locale>
+
       <locale name="sv">
 	<short>Kontaktens korta status</short>
 	<long>Den korta statusinformationen</long>
@@ -3466,6 +3561,11 @@
 	<long>Подробно описание на състоянието</long>
       </locale>
 
+      <locale name="bn">
+	<short>সংযোগের অবস্থা</short>
+	<long>যোগাযোগ সংক্রান্ত তথ্যাদি সম্পাদন</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>সংযোগের অবস্থা</short>
 	<long>যোগাযোগ সংক্রান্ত তথ্যাদি সম্পাদন</long>
@@ -3476,6 +3576,11 @@
 	<long>La informació detallada sobre l&apos;estat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Estat detallat del contacte</short>
+	<long>La informació detallada sobre l&apos;estat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Temasnıñ uzun durumı</short>
 	<long>Uzun durum malümatı</long>
@@ -3641,6 +3746,16 @@
 	<long>Informacione të hollësishme të gjëndjes</long>
       </locale>
 
+      <locale name="sr">
+	<short>Опширно стање контакта</short>
+	<long>Проширени подаци стања</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Opširno stanje kontakta</short>
+	<long>Prošireni podaci stanja</long>
+      </locale>
+
       <locale name="sv">
 	<short>Kontaktens långa status</short>
 	<long>Den långa statusinformationen</long>
@@ -3763,7 +3878,7 @@
 
       <locale name="bn">
 	<short>অডিও কোডেকের তালিকা</short>
-	
+	<long>অডিও কোডেকের তালিকা</long>
       </locale>
 
       <locale name="bn_IN">
@@ -3781,6 +3896,11 @@
 	<long>La llista de còdecs d&apos;àudio</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Llista de còdecs d&apos;àudio</short>
+	<long>La llista de còdecs d&apos;àudio</long>
+      </locale>
+
       <locale name="crh">
 	<short>Davuş Kodekleri Listesi</short>
 	<long>Davuş kodekleri listesi</long>
@@ -4028,12 +4148,12 @@
 
       <locale name="sr">
 	<short>Списак аудио кодека</short>
-	
+	<long>Списак аудио кодека</long>
       </locale>
 
       <locale name="sr@latin">
 	<short>Spisak audio kodeka</short>
-	
+	<long>Spisak audio kodeka</long>
       </locale>
 
       <locale name="sv">
@@ -4134,7 +4254,7 @@
 
       <locale name="bn">
 	<short>নৈশব্দ সন্ধান সক্রিয়</short>
-	
+	<long>সক্রিয় হলে, সমর্থনকারী কোডেকের ক্ষেত্রে নিঃশব্দ অবস্থা সনাক্ত করা হবে</long>
       </locale>
 
       <locale name="bn_IN">
@@ -4152,6 +4272,11 @@
 	<long>Si s&apos;habilita, es farà servir la detecció de silenci per als còdecs que ho permetin</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Habilita la detecció de silenci</short>
+	<long>Si s&apos;habilita, es farà servir la detecció de silenci per als còdecs que ho permeten</long>
+      </locale>
+
       <locale name="crh">
 	<short>Davuşsızlıq alğılamasını qabilleştir</short>
 	<long>Qabilleştirilgen ise, onı desteklegen kodekler ile davuşsızlıq alğılamasını qullan</long>
@@ -4314,7 +4439,7 @@
 
       <locale name="ml">
 	<short>നിശബ്ദത തിരിച്ചറിയുന്നത് സജ്ജമാക്കുക</short>
-	
+	<long>പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, പിന്തുണയ്ക്കുന്ന കോഡക്കുകള്‍ക്കൊപ്പം സൈലന്‍സ് ഡിറ്റക്ഷന്‍ ഉപയോഗിക്കുക</long>
       </locale>
 
       <locale name="mn">
@@ -4493,6 +4618,11 @@
 	<long>Ако е включено, ехото се маха автоматично</long>
       </locale>
 
+      <locale name="bn">
+	<short>প্রতিধ্বনি বাতিল করা সক্রিয় করুন</short>
+	<long>সক্রিয় হলে, স্বয়ংক্রিয় প্রতিধ্বনি বাতিল ব্যবস্থা প্রয়োগ করা হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>প্রতিধ্বনি বাতিল করা সক্রিয় করুন</short>
 	<long>সক্রিয় হলে, স্বয়ংক্রিয় প্রতিধ্বনি বাতিল ব্যবস্থা প্রয়োগ করা হবে</long>
@@ -4503,6 +4633,11 @@
 	<long>Si s&apos;habilita, utilitza la cancel·lació de l&apos;eco</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Habilita la cancel·lació automàtica de l&apos;eco</short>
+	<long>Si s&apos;habilita, utilitza la cancel·lació de l&apos;eco</long>
+      </locale>
+
       <locale name="crh">
 	<short>Akisseda lâğvını qabilleştir</short>
 	<long>Qabilleştirilgen ise, akisseda lâğvını qullan</long>
@@ -4560,7 +4695,7 @@
 
       <locale name="et">
 	<short>Kaja eemaldamine lubatud</short>
-	
+	<long>Kui lubatud, siis kasutatakse kaja eemaldamist</long>
       </locale>
 
       <locale name="eu">
@@ -4814,6 +4949,11 @@
 	<long>Избор на алтернативно изходно аудио устройство за звуковите ефекти.</long>
       </locale>
 
+      <locale name="bn">
+	<short>বিকল্প অডিও আউটপুট ডিভাইস</short>
+	<long>শব্দ সহ ইভেন্টের জন্য বিকল্প অডিও আউটপুট ডিভাইস নির্বাচন করুন।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>বিকল্প অডিও আউটপুট ডিভাইস</short>
 	<long>শব্দ সহ ইভেন্টের জন্য বিকল্প অডিও আউটপুট ডিভাইস নির্বাচন করুন।</long>
@@ -4824,6 +4964,11 @@
 	<long>Seleccioneu el dispositiu d&apos;àudio de sortida alternatiu per al so de les incidències.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Dispositiu d&apos;àudio d&apos;eixida alternatiu</short>
+	<long>Seleccioneu el dispositiu d&apos;àudio d&apos;eixida alternatiu per al so de les incidències.</long>
+      </locale>
+
       <locale name="crh">
 	<short>Alternativ ses çıqtısı cihazı</short>
 	<long>Davuş vaqiaları içün qullanılacaq alternativ bir davuş çıqtısı cihazı saylañız.</long>
@@ -4971,7 +5116,7 @@
 
       <locale name="ml">
 	<short>മറ്റൊരു ഓഡിയോ ഔട്ട്പുട്ട് ഡിവൈസ്</short>
-	
+	<long>ശബ്ദ ഇവന്റുകള്‍ക്കായി മറ്റൊരു ഓഡിയോ ഔട്ട്പുട്ട് ഉപകരണം തെരഞ്ഞെടുക്കുക.</long>
       </locale>
 
       <locale name="mr">
@@ -5140,6 +5285,11 @@
 	<long>Ако е включено, е звукът, който ще се пуска при входящи обаждания</long>
       </locale>
 
+      <locale name="bn">
+	<short>কল গ্রহণ করার ধ্বনি</short>
+	<long>সক্রিয় হলে‌, আগত কলের জন্য যে শব্দ বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>কল গ্রহণ করার ধ্বনি</short>
 	<long>সক্রিয় হলে‌, আগত কলের জন্য যে শব্দ বাজানো হবে</long>
@@ -5155,6 +5305,11 @@
 	<long>Si s&apos;habilita, el so que es reproduirà per a trucades entrants</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>El so per a trucades que rebeu</short>
+	<long>Si s&apos;habilita, el so que es reproduirà per a trucades entrants</long>
+      </locale>
+
       <locale name="crh">
 	<short>Kelgen arama davuşı</short>
 	<long>Kelgen aramalar üzerine çalınacaq davuş, qabilleştirilgen ise</long>
@@ -5496,6 +5651,11 @@
 	<long>Ако е включен, избраният звук ще се пуска при входящи обаждания</long>
       </locale>
 
+      <locale name="bn">
+	<short>কল প্রাপ্ত হলে শব্দ বাজিয়ে সূচিত করা হবে</short>
+	<long>সক্রিয় থাকলে কল গ্রহণ করার সময় এই ধ্বনি বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>কল প্রাপ্ত হলে শব্দ বাজিয়ে সূচিত করা হবে</short>
 	<long>সক্রিয় থাকলে কল গ্রহণ করার সময় এই ধ্বনি বাজানো হবে</long>
@@ -5511,6 +5671,11 @@
 	<long>Si s&apos;habilita, el so que escolliu es reproduirà quan us truquin</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Reprodueix un so per a trucades entrants</short>
+	<long>Si s&apos;habilita, el so que escolliu es reproduirà quan vos truquen</long>
+      </locale>
+
       <locale name="crh">
 	<short>Kelgen aramalar üzerine davuş çal</short>
 	<long>Saylanğan davuş kelgen aramalar üzerine çalınacaq, qabilleştirilgen ise</long>
@@ -5852,6 +6017,11 @@
 	<long>Ако е включено, е звукът, който ще се пуска, при ново съобщение</long>
       </locale>
 
+      <locale name="bn">
+	<short>নতুন ইনস্ট্যান্ট বার্তার জন্য চিহ্নিত শব্দ</short>
+	<long>সক্রিয় হলে‌, নতুন ইন্সট্যান্ট বার্তা প্রাপ্ত হলে যে শব্দ বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>নতুন ইনস্ট্যান্ট বার্তার জন্য চিহ্নিত শব্দ</short>
 	<long>সক্রিয় হলে‌, নতুন ইন্সট্যান্ট বার্তা প্রাপ্ত হলে যে শব্দ বাজানো হবে</long>
@@ -5862,6 +6032,11 @@
 	<long>Si s&apos;habilita, el so que es reproduirà quan es rebi un missatge instantani</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>El so per a nous missatges instantanis</short>
+	<long>Si s&apos;habilita, el so que es reproduirà quan es reba un missatge instantani</long>
+      </locale>
+
       <locale name="crh">
 	<short>Yañı aniy mesaj davuşı</short>
 	<long>Yañı bir aniy mesaj bar ise çalınacaq davuş, qabilleştirilgen ise</long>
@@ -6173,6 +6348,11 @@
 	<long>Ако е включен, избраният звук ще се пуска, когато се обаждате на някой</long>
       </locale>
 
+      <locale name="bn">
+	<short>বার্তা প্রাপ্ত হলে শব্দ বাজিয়ে সূচিত করা হবে</short>
+	<long>সক্রিয় থাকলে নতুন বার্তা গ্রহণ করার সময় এই ধ্বনি বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>বার্তা প্রাপ্ত হলে শব্দ বাজিয়ে সূচিত করা হবে</short>
 	<long>সক্রিয় থাকলে নতুন বার্তা গ্রহণ করার সময় এই ধ্বনি বাজানো হবে</long>
@@ -6183,6 +6363,11 @@
 	<long>Si s&apos;habilita, el so que escolliu es reproduirà quan rebeu algun missatge instantani</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Reprodueix un so quan hi haja nous missatges</short>
+	<long>Si s&apos;habilita, el so que escolliu es reproduirà quan rebeu algun missatge instantani</long>
+      </locale>
+
       <locale name="crh">
 	<short>Yañı mesaj üzerine davuş çal</short>
 	<long>Saylanğan davuş yañı bir aniy mesaj alınğanında çalınacaq, qabilleştirilgen ise</long>
@@ -6494,6 +6679,11 @@
 	<long>Ако е включено, е звукът, който ще се пуска при нова гласова поща</long>
       </locale>
 
+      <locale name="bn">
+	<short>প্রাপ্ত নতুন ভয়েস মেইলের শব্দ</short>
+	<long>সক্রিয় হলে‌, নতুন ভয়েস মেইল প্রাপ্ত হলে যে শব্দ বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>প্রাপ্ত নতুন ভয়েস মেইলের শব্দ</short>
 	<long>সক্রিয় হলে‌, নতুন ভয়েস মেইল প্রাপ্ত হলে যে শব্দ বাজানো হবে</long>
@@ -6504,6 +6694,11 @@
 	<long>Si s&apos;habilita, el so que es reproduirà quan es rebi un correu de veu</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>El so per a nous correus de veu</short>
+	<long>Si s&apos;habilita, el so que es reproduirà quan es reba un correu de veu</long>
+      </locale>
+
       <locale name="crh">
 	<short>Yañı sesli poçta davuşı</short>
 	<long>Yañı bir sesli poçta bar ise çalınacaq davuş, qabilleştirilgen ise</long>
@@ -6815,6 +7010,11 @@
 	<long>Ако е включен, избраният звук ще се пуска, когато се обаждате на някой.</long>
       </locale>
 
+      <locale name="bn">
+	<short>ভয়েস-মেইল প্রাপ্ত হলে শব্দ বাজিয়ে সূচিত করা হবে</short>
+	<long>সক্রিয় হলে, নতুন ভয়েস মেইল পেলে নির্বাচিত শব্দ বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ভয়েস-মেইল প্রাপ্ত হলে শব্দ বাজিয়ে সূচিত করা হবে</short>
 	<long>সক্রিয় হলে, নতুন ভয়েস মেইল প্রাপ্ত হলে নির্বাচিত শব্দ বাজানো হবে</long>
@@ -6825,6 +7025,11 @@
 	<long>Si s&apos;habilita, el so que escolliu es reproduirà quan rebeu algun correu de veu</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Reprodueix un so quan hi haja nous correus de veu</short>
+	<long>Si s&apos;habilita, el so que escolliu es reproduirà quan rebeu algun correu de veu</long>
+      </locale>
+
       <locale name="crh">
 	<short>Yañı sesli poçta üzerine davuş çal</short>
 	<long>Saylanğan davuş yañı bir sesli poçta alınğanında çalınacaq, qabilleştirilgen ise</long>
@@ -7141,6 +7346,11 @@
 	<long>Ако е включен, избраният звук ще се пуска, когато се обаждате на някой</long>
       </locale>
 
+      <locale name="bn">
+	<short>রিং টোন বাজান</short>
+	<long>সক্রিয় হলে, কোনো কল করার সময় নির্বাচিত শব্দ বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>রিং টোন বাজান</short>
 	<long>সক্রিয় হলে, কোনো কল করার সময় নির্বাচিত শব্দ বাজানো হবে</long>
@@ -7156,6 +7366,11 @@
 	<long>Si s&apos;habilita, el so que escolliu es reproduirà quan truqueu a algú</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Reprodueix el so del marcat</short>
+	<long>Si s&apos;habilita, el so que escolliu es reproduirà quan truqueu a algú</long>
+      </locale>
+
       <locale name="crh">
 	<short>Zil tonu çal</short>
 	<long>Saylanğan davuş birevni arağanda çalınacaq, qabilleştirilgen ise</long>
@@ -7502,6 +7717,11 @@
 	<long>Ако е включено, е звукът, който ще се пуска, когато се обаждате на някой</long>
       </locale>
 
+      <locale name="bn">
+	<short>ডায়াল টোন ধ্বনি</short>
+	<long>সক্রিয় হলে‌, কোনো ব্যক্তিকে কল করার সময় যে শব্দ বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ডায়াল টোন ধ্বনি</short>
 	<long>সক্রিয় হলে‌, কোনো ব্যক্তিকে কল করার সময় যে শব্দ বাজানো হবে</long>
@@ -7517,6 +7737,11 @@
 	<long>Si s&apos;habilita, el so que es reproduirà quan es truqui algú</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>El so del to del marcatge</short>
+	<long>Si s&apos;habilita, el so que es reproduirà quan es truque algú</long>
+      </locale>
+
       <locale name="crh">
 	<short>Qadranlav tonu davuşı</short>
 	<long>Birevni arağanda çalınacaq davuş, qabilleştirilgen ise</long>
@@ -7858,6 +8083,11 @@
 	<long>Избраният аудио файл ще бъде изпълняван след края на обажданията или когато се свързвате с някой, който е зает.</long>
       </locale>
 
+      <locale name="bn">
+	<short>ব্যস্ত চিহ্নকারী শব্দ বাজানো হবে</short>
+	<long>যদি সক্রিয় করা থাকে, তাহলে নির্বাচিত ধ্বনি কলের শেষে অথবা কোন ব্যস্ত সংযোগস্থাপনের সময় বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ব্যস্ত চিহ্নকারী শব্দ বাজানো হবে</short>
 	<long>যদি সক্রিয় করা থাকে, তাহলে নির্বাচিত ধ্বনি কলের শেষে অথবা কোন ব্যস্ত সংযোগস্থাপনের সময় বাজানো হবে</long>
@@ -7873,6 +8103,11 @@
 	<long>Si s&apos;habilita, el so que escolliu es reproduirà al final de cada trucada o si truqueu algú que estigui ocupat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Reprodueix el so d&apos;ocupat</short>
+	<long>Si s&apos;habilita, el so que escolliu es reproduirà al final de cada trucada o si truqueu algú que estiga ocupat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Meşğul tonu çal</short>
 	<long>Saylanğan davuş, aramalarnıñ soñunda yaki çağırılğan kişi meşğul ise çalınacaq, qabilleştirilgen ise</long>
@@ -8035,7 +8270,7 @@
 
       <locale name="ml">
 	<short>തിരക്കാണെന്ന് അറിയിക്കുന്നതിനുള്ള ശബ്ദം പ്റവറ്‍ത്തിപ്പിക്കുക</short>
-	
+	<long>കോളുകളുടെ ഒടുവില്‍ അല്ലെങ്കില്‍ തിരക്കിലുള്ള ആരെയെങ്കിലും വിളിക്കുമ്പോള്‍, പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, തെരഞ്ഞെടുത്ത ശബ്ദം കേള്‍ക്കുന്നു.</long>
       </locale>
 
       <locale name="mn">
@@ -8219,6 +8454,11 @@
 	<long>Ако е включено, е звукът, който ще се пуска в края на всяко обаждане или когато се обаждате на някой и ви дава заето</long>
       </locale>
 
+      <locale name="bn">
+	<short>ব্যস্ত টোন ধ্বনি</short>
+	<long>বৈশিষ্ট্য সক্রিয় করা হলে, কলের সমাপ্তির পরে অথবা কল করা ব্যক্তি ব্যস্ত থাকলে চিহ্নিত শব্দ বাজানো হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ব্যস্ত টোন ধ্বনি</short>
 	<long>বৈশিষ্ট্য সক্রিয় করা হলে, কলের সমাপ্তির পরে অথবা কল করা ব্যক্তি ব্যস্ত থাকলে চিহ্নিত শব্দ বাজানো হবে</long>
@@ -8234,6 +8474,11 @@
 	<long>Si s&apos;habilita, el so que es reproduirà al final de les trucades o quan truqueu algú que estigui ocupat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>El so d&apos;ocupat</short>
+	<long>Si s&apos;habilita, el so que es reproduirà al final de les trucades o quan truqueu algú que estiga ocupat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Meşğul tonu davuşı</short>
 	<long>Aramalarnıñ soñunda yaki meşğul olğan birevni arağanda çalınacaq davuş, qabilleştirilgen ise</long>
@@ -8576,6 +8821,11 @@
 	<long>Списък на регистрациите, към които Ekiga трябва да се включи</long>
       </locale>
 
+      <locale name="bn">
+	<short>অ্যাকাউন্ট তালিকা</short>
+	<long>Ekiga দ্বারা যে সমস্ত অ্যাকাউন্টের সাথে নিবন্ধন করা হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>অ্যাকাউন্ট তালিকা</short>
 	<long>Ekiga দ্বারা যে সমস্ত অ্যাকাউন্টের সাথে নিবন্ধন করা হবে</long>
@@ -8586,6 +8836,11 @@
 	<long>La llista de comptes als que l&apos;Ekiga s&apos;hauria de registrar</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>La llista de comptes</short>
+	<long>La llista de comptes als que l&apos;Ekiga s&apos;hauria de registrar</long>
+      </locale>
+
       <locale name="crh">
 	<short>Esaplar listesi</short>
 	<long>Ekiga&apos;nıñ qayd olacağı esaplarnıñ listesi</long>
@@ -8912,6 +9167,11 @@
 	<long>Порт за очакване на входящи връзки. Трябва да рестартирате Ekiga, за да може новата настройка да влезе в сила.</long>
       </locale>
 
+      <locale name="bn">
+	<short>অপেক্ষার জন্য ব্যবহৃত পোর্ট</short>
+	<long>আগমনকারী সংযোগের জন্য অপেক্ষামান পোর্ট। নতুন মান প্রয়োগ করার জন্য Ekiga পুনরায় আরম্ভ করা আবশ্যক</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>অপেক্ষার জন্য ব্যবহৃত পোর্ট</short>
 	<long>আগমনকারী সংযোগের জন্য অপেক্ষামান পোর্ট। নতুন মান প্রয়োগ করার জন্য Ekiga পুনরায় আরম্ভ করা আবশ্যক</long>
@@ -8927,6 +9187,11 @@
 	<long>El port on escoltar per a la recepció de connexions entrants. Caldrà que reinicieu l&apos;Ekiga per tal que el nou valor tingui efecte</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Port on escoltar</short>
+	<long>El port on escoltar per a la recepció de connexions entrants. Caldrà que reinicieu l&apos;Ekiga per tal que el nou valor tinga efecte</long>
+      </locale>
+
       <locale name="crh">
 	<short>Diñlenecek liman</short>
 	<long>Kelgen bağlantılar içün diñlenecek liman. Yañı qıymetniñ yürürlikke kirüvi içün Ekiga&apos;nıñ kene başlatıluvı kerek</long>
@@ -9268,6 +9533,11 @@
 	<long>Изходящият посредник за SIP за изходящите обаждания</long>
       </locale>
 
+      <locale name="bn">
+	<short>বাহির্মূখী প্রক্সি</short>
+	<long>যে সকল কল বাইরে যাচ্ছে তাতে ব্যবহৃত SIP Outbound Proxy নির্বাচন করুন</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>বাহিরমূখী প্রক্সি</short>
 	<long>যে সকল কল বাইরে যাচ্ছে তাতে ব্যবহৃত SIP Outbound Proxy নির্বাচন করুন</long>
@@ -9278,6 +9548,11 @@
 	<long>El servidor intermediari de sortida SIP per a utilitzar en trucades sortints</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Servidor intermediari d&apos;eixida</short>
+	<long>El servidor intermediari d&apos;eixida SIP per a utilitzar en trucades eixints</long>
+      </locale>
+
       <locale name="crh">
 	<short>Tışarı-bağlı Proksi</short>
 	<long>Ketken aramalarda qullanılacaq SİP Tışarı-bağlı Proksisi</long>
@@ -9601,7 +9876,7 @@
 
       <locale name="bn">
 	<short>সব কল হোস্টে পাঠানো হবে</short>
-	
+	<long>ওপরে উল্লেখিত ক্ষেত্রসমূহ নির্বাচিত হলে যে হোস্টে সব কল পাঠিয়ে দেওয়া হবে</long>
       </locale>
 
       <locale name="bn_IN">
@@ -9619,6 +9894,11 @@
 	<long>El nom de l&apos;ordinador on es desviaran les trucades si el desviament de trucades està activat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Desvia trucades a l&apos;ordinador</short>
+	<long>El nom de l&apos;ordinador on es desviaran les trucades si el desviament de trucades està activat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Aramalarnı qonaqbayğa yönlendir</short>
 	<long>Arama yönlendirüv qabilleştirilgen ise, aramalarnıñ qaysı qonaqbayğa yönlendirilecegi</long>
@@ -9781,7 +10061,7 @@
 
       <locale name="ml">
 	<short>ഹോസ്റ്റിലേക്ക് കോളുകള്‍ നീക്കുക</short>
-	
+	<long>കോള്‍ ഫോര്‍വേഡിങ് പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, കോളുകള്‍ ഫോര്‍വേഡ് ചെയ്യേണ്ട ഹോസ്റ്റ്</long>
       </locale>
 
       <locale name="mn">
@@ -9965,6 +10245,11 @@
 	<long>Това позволява указването на режима за изпращане на DTMF. Валидните стойности са  „RFC2833“ (0) и „INFO“ (1)</long>
       </locale>
 
+      <locale name="bn">
+	<short>DTMF প্রেরণ করা হচ্ছে</short>
+	<long>এর সাহায্যে DTMF প্রেরণের মোড নির্ধারণ করা যাবে। সম্ভাব্য মান হল &quot;RFC2833&quot; (0), &quot;INFO&quot; (1)</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>DTMF প্রেরণ করা হচ্ছে</short>
 	<long>এর সাহায্যে DTMF প্রেরণের মোড নির্ধারণ করা যাবে। সম্ভাব্য মান হল &quot;RFC2833&quot; (0), &quot;INFO&quot; (1)</long>
@@ -9980,9 +10265,14 @@
 	<long>Això permet especificar el mode d&apos;enviament de DTMF. Els valors poden ser «RFC2833», «\» (0), «INDO» (1)</long>
       </locale>
 
-      <locale name="crh">
-	<short>DTMF yiberüv</short>
-	<long>Bu, DTMF&apos;lerni yiberüv içün sizge tarznı tesbit etmege imkân berir. Caiz qıymetler: &quot;RFC2833&quot; (0), &quot;INFO&quot; (1)</long>
+      <locale name="ca@valencia">
+	<short>S&apos;està enviant DTMF</short>
+	<long>Això permet especificar el mode d&apos;enviament de DTMF. Els valors poden ser «RFC2833», «\» (0), «INDO» (1)</long>
+      </locale>
+
+      <locale name="crh">
+	<short>DTMF yiberüv</short>
+	<long>Bu, DTMF&apos;lerni yiberüv içün sizge tarznı tesbit etmege imkân berir. Caiz qıymetler: &quot;RFC2833&quot; (0), &quot;INFO&quot; (1)</long>
       </locale>
 
       <locale name="cs">
@@ -10077,7 +10367,7 @@
 
       <locale name="hi">
 	<short>DTMF भेज रहा है</short>
-	
+	<long>यह आपको DTMF को भेजने के लिए विधि सेट करने देता है. मान &quot;RFC2833&quot; (0), &quot;INFO&quot; (1) हो सकता है</long>
       </locale>
 
       <locale name="hr">
@@ -10122,7 +10412,7 @@
 
       <locale name="lt">
 	<short>Siunčiamas DTMF</short>
-	
+	<long>Čia leidžiama nustatyti DTMF siuntimo režimą. Reikšmė gali būti tik „RFC2833“ (0) ir „INFO“ (1)</long>
       </locale>
 
       <locale name="lv">
@@ -10232,12 +10522,12 @@
 
       <locale name="sr">
 	<short>Слање ДТМФ-а</short>
-	
+	<long>Ово дозвољава да поставите режим за DTMF слање. Вредност може бити „RFC2833“ (0), „INFO“ (1)</long>
       </locale>
 
       <locale name="sr@latin">
 	<short>Slanje DTMF-a</short>
-	
+	<long>Ovo dozvoljava da postavite režim za DTMF slanje. Vrednost može biti „RFC2833“ (0), „INFO“ (1)</long>
       </locale>
 
       <locale name="sv">
@@ -10328,6 +10618,11 @@
 	<long>Порт за очакване на входящи връзки. Трябва да рестартирате Ekiga, за да може новата настройка да влезе в сила.</long>
       </locale>
 
+      <locale name="bn">
+	<short>অপেক্ষার জন্য ব্যবহৃত পোর্ট</short>
+	<long>আগমনকারী সংযোগের জন্য অপেক্ষামান পোর্ট। নতুন মান প্রয়োগ করার জন্য Ekiga পুনরায় আরম্ভ করা আবশ্যক।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>অপেক্ষার জন্য ব্যবহৃত পোর্ট</short>
 	<long>আগমনকারী সংযোগের জন্য অপেক্ষামান পোর্ট। নতুন মান প্রয়োগ করার জন্য Ekiga পুনরায় আরম্ভ করা আবশ্যক।</long>
@@ -10343,6 +10638,11 @@
 	<long>El port on escoltar per a la recepció de connexions entrants. Caldrà que reinicieu l&apos;Ekiga per tal que el nou valor tingui efecte.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Port on escoltar</short>
+	<long>El port on escoltar per a la recepció de connexions entrants. Caldrà que reinicieu l&apos;Ekiga per tal que el nou valor tinga efecte.</long>
+      </locale>
+
       <locale name="crh">
 	<short>Diñlenecek liman</short>
 	<long>Kelgen bağlantılar içün diñlenecek liman. Yañı qıymetniñ yürürlikke kirüvi içün Ekiga&apos;nıñ kene başlatıluvı kerek.</long>
@@ -10689,6 +10989,11 @@
 	<long>Диапазон от портове по TCP, които Ekiga ще използва за канала H.245 за H.323. Този диапазон от портове няма никакво значение, ако и двамата участници в обаждането използват тунелиране на H.245.</long>
       </locale>
 
+      <locale name="bn">
+	<short>TCP পোর্টের সীমা</short>
+	<long>H.323 H.245 চ্যানেলের জন্য Ekiga দ্বারা ব্যবহৃত TCP পোর্টের সীমা। কনফারেন্সের সকল অংশগ্রহকারী দ্বারা H.245 টানেলিং ব্যবহার করা হলে পোর্টের এই সীমা দ্বারা কোনো প্রভাব সৃষ্টি হবে না।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>TCP পোর্টের সীমা</short>
 	<long>H.323 H.245 চ্যানেলের জন্য Ekiga দ্বারা ব্যবহৃত TCP পোর্টের সীমা। কনফারেন্সের সকল অংশগ্রহকারী দ্বারা H.245 টানেলিং ব্যবহার করা হলে পোর্টের এই সীমা দ্বারা কোনো প্রভাব সৃষ্টি হবে না।</long>
@@ -10704,6 +11009,11 @@
 	<long>L&apos;interval de ports TCP que l&apos;Ekiga farà servir per al canal H.323 H.245. Aquest rang de ports no té cap efecte si els dos participants a la conferència fan servir la tunelització H.245.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Rang de ports TCP</short>
+	<long>L&apos;interval de ports TCP que l&apos;Ekiga farà servir per al canal H.323 H.245. Este rang de ports no té cap efecte si els dos participants a la conferència fan servir la tunelització H.245.</long>
+      </locale>
+
       <locale name="crh">
 	<short>TCP liman menzili</short>
 	<long>H.323 protokolı H.245 kanalı içün Ekiga tarafından qullanılacaq TCP limanlarınıñ menzili. Toplaşuv iştirakçileriniñ episi H.245 tunnellemesi qullana ise, bu liman aralığınıñ bir tesiri yoqtır.</long>
@@ -10801,7 +11111,7 @@
 
       <locale name="hi">
 	<short>TCP पोर्ट सीमा</short>
-	
+	<long>TCP पोर्ट की संख्या जो Ekiga H.323 H.245 चैनल के लिए प्रयोग करेगा. इस पोर्ट परिसर का कोई प्रभाव नहीं है यदि सम्मेलन के दोनों सहभागी H.245 टनेलिंग का प्रयोग कर रहे हैं.</long>
       </locale>
 
       <locale name="hr">
@@ -10846,7 +11156,7 @@
 
       <locale name="lt">
 	<short>TCP prievadų sritis</short>
-	
+	<long>TCP prievadų, kuriuos Ekiga naudos H.323 H.245 kanalui, intervalas.Šis adresų intervalas nesvarbus kai abu pokalbio dalyviai naudoja H.245 tuneliavimą.</long>
       </locale>
 
       <locale name="lv">
@@ -10866,7 +11176,7 @@
 
       <locale name="ml">
 	<short>TCP പോറ്‍ട്ടിന്റെ പരിധി</short>
-	
+	<long>The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This port range has no effect if both participants to the conference are using H.245 Tunneling.</long>
       </locale>
 
       <locale name="mn">
@@ -10956,12 +11266,12 @@
 
       <locale name="sr">
 	<short>Опсег TCP портова</short>
-	
+	<long>Опсег TCP портова који Екига користи за H.323 и H.245 канал. Овај опсег нема утицаја ако оба учесника конференције користе H.245 тунел.</long>
       </locale>
 
       <locale name="sr@latin">
 	<short>Opseg TCP portova</short>
-	
+	<long>Opseg TCP portova koji Ekiga koristi za H.323 i H.245 kanal. Ovaj opseg nema uticaja ako oba učesnika konferencije koriste H.245 tunel.</long>
       </locale>
 
       <locale name="sv">
@@ -11050,6 +11360,11 @@
 	<long>Обхватът от портове по UDP, които да се ползват от програмата</long>
       </locale>
 
+      <locale name="bn">
+	<short>UDP পোর্টের সীমা</short>
+	<long>Ekiga দ্বারা ব্যবহারযোগ্য UDP পোর্টের সীমা।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>UDP পোর্টের সীমা</short>
 	<long>Ekiga দ্বারা ব্যবহারযোগ্য UDP পোর্টের সীমা।</long>
@@ -11065,6 +11380,11 @@
 	<long>L&apos;interval de ports UDP que utilitzarà l&apos;Ekiga.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Rang de ports UDP</short>
+	<long>L&apos;interval de ports UDP que utilitzarà l&apos;Ekiga.</long>
+      </locale>
+
       <locale name="crh">
 	<short>UDP liman menzili</short>
 	<long>Ekiga tarafından qullanılacaq UDP limanlarınıñ menzili.</long>
@@ -11162,7 +11482,7 @@
 
       <locale name="hi">
 	<short>UDP पोर्ट परिसर</short>
-	
+	<long>UDP पोर्ट की संख्या जो Ekiga प्रयोग करेगा.</long>
       </locale>
 
       <locale name="hr">
@@ -11207,7 +11527,7 @@
 
       <locale name="lt">
 	<short>UDP prievadų sritis</short>
-	
+	<long>UDP prievadų, kuriuos turėtų naudoti „Ekiga“, intervalas.</long>
       </locale>
 
       <locale name="lv">
@@ -11312,12 +11632,12 @@
 
       <locale name="sr">
 	<short>Опсег UDP портова</short>
-	
+	<long>Опсег UDP портова које Екига користи.</long>
       </locale>
 
       <locale name="sr@latin">
 	<short>Opseg UDP portova</short>
-	
+	<long>Opseg UDP portova koje Ekiga koristi.</long>
       </locale>
 
       <locale name="sv">
@@ -11401,6 +11721,11 @@
 	<long>Това включва тунелирането на H.245. В този режим съобщенията за H.245 се вграждат в канала за H.225 (порт 1720). Това спестява една връзка по TCP по време на обаждане. Тунелирането на H.245 бе въведено с H.323v2 и Netmeeting не го поддържа. Ползването едновременно на „Бързо набиране“ и тунелиране по H.245 може да забие някои версии на Netmeeting.</long>
       </locale>
 
+      <locale name="bn">
+	<short>H.245 টানেলিং সক্রিয় করুন</short>
+	<long>এর ফলে H.245 টানেলিং মোড সক্রিয় করা হবে। H.245 টানেলিং মোডের অধীন, H.245 বার্তাগুলি H.225 চ্যানেলে (পোর্ট ১৭২০) আবদ্ধ করা হয় ও কল চলাকালীন একটি TCP সংযোগ ব্যবহার করার প্রয়োজন হবে না। H.245 টানেলিং প্রণালী H.323v2-এ প্রথম উপলব্ধ করা হয়েছিল ও  Netmeeting দ্বারা এটি সমর্থিত নয়। ফাস্ট স্টার্ট ও H.245 টানেলিং একযোগে ব্যবহারে Netmeeting-র কিছু সংস্করণ বিকল হতে পারে।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>H.245 টানেলিং সক্রিয় করুন</short>
 	<long>এর ফলে H.245 টানেলিং মোড সক্রিয় করা হবে। H.245 টানেলিং মোডের অধীন, H.245 বার্তাগুলি H.225 চ্যানেলে (পোর্ট ১৭২০) আবদ্ধ করা হয় ও কল চলাকালীন একটি TCP সংযোগ ব্যবহার করার প্রয়োজন হবে না। H.245 টানেলিং প্রণালী H.323v2-এ প্রথম উপলব্ধ করা হয়েছিল ও  Netmeeting দ্বারা এটি সমর্থিত নয়। ফাস্ট স্টার্ট ও H.245 টানেলিং একযোগে ব্যবহারে Netmeeting-র কিছু সংস্করণ বিকল হতে পারে।</long>
@@ -11411,6 +11736,11 @@
 	<long>Això habilitarà la tunelització H.245. En aquest mode, els missatges estaran encapsulats en el canal H.225 (port 1720), cosa que permet estalviar un port TCP durant les trucades. La tunelització H.245 es va introduir a la versió 2 del protocol H.323, i el Netmeeting no ho implementa. Si s&apos;utilitza l&apos;Arrencada ràpida juntament amb la Tunelització H.245 al mateix temps, és possible que algunes versions del Netmeeting fallin.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Habilita la tunelització H.245</short>
+	<long>Això habilitarà la tunelització H.245. En este mode, els missatges estaran encapsulats en el canal H.225 (port 1720), cosa que permet estalviar un port TCP durant les trucades. La tunelització H.245 es va introduir a la versió 2 del protocol H.323, i el Netmeeting no ho implementa. Si s&apos;utilitza l&apos;Arrencada ràpida juntament amb la Tunelització H.245 al mateix temps, és possible que algunes versions del Netmeeting fallen.</long>
+      </locale>
+
       <locale name="crh">
 	<short>H.245 tunnellemesini qabilleştir</short>
 	<long>Bu, H.245 Tunnelleme tarzını qabilleştirir. H.245 Tunnelleme tarzında, H.245 mesajları H.225 kanalına kapsüllenir (liman 1720). Bu, aramalar esnasında bir dane TCP bağlantısını tasarruf eter. H.245 Tunnellemesiniñ muqaddemesi H.323v2 içinde yapıldı ve Netmeeting onı desteklemey. Hem Tez Başlanğıçnıñ hem de H.245 Tunnellemesiniñ beraber qullanıluvı bazı Netmeeting sürümleriniñ çöküvine sebep ola bilir.</long>
@@ -11503,7 +11833,7 @@
 
       <locale name="hi">
 	<short>H.245 टनलिंग सक्षम करें</short>
-	
+	<long>यह H.245 टनेलिंग विधि को सक्रिय करता है. H.245 टनेलिंग विधि में H.245 संदेश को H.225 चैनल में समाहित किया जाता है (पोर्ट 1720). यह एक TCP कनेक्शन को कॉल के दौरान सहेजता है. H.245 टनेलिंग को H.323v2 में लाया गया था और नेटमीटिंग इसका समर्थन नहीं करता है. फास्ट स्टार्ट और H.245 टनेलिंग दोनों को प्रयोग नेटमीटिंग के कुछ संस्करण को क्रैस कर सकता है.</long>
       </locale>
 
       <locale name="hr">
@@ -11543,7 +11873,7 @@
 
       <locale name="lt">
 	<short>Naudoti H.245 tuneliavimą</short>
-	
+	<long>Čia įjungiama H.245 tuneliavimo veiksena. Naudojant H.245 tuneliavimą, H.245 pranešimai yra patalpinami H.225 kanale (1720 prievadas). Tai sutaupo vieną TCP jungtį vykdant skambučius. H.245 tuneliavimas buvo įvestas H.323v2 specifikacijoje ir yra nesuderinamas su „NetMeeting“. Tuo pat metu įjungtos greitojo starto ir H.245 tuneliavimo veiksenos gali sutrikdyti kai kurių „NetMeeting“ versijų darbą.</long>
       </locale>
 
       <locale name="lv">
@@ -11558,7 +11888,7 @@
 
       <locale name="ml">
 	<short>H.245 ടണലിങ് സജ്ജമാക്കുക</short>
-	
+	<long>This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages are encapsulated into the H.225 channel (port 1720). This saves one TCP connection during calls. H.245 Tunneling was introduced in H.323v2 and Netmeeting does not support it. Using both Fast Start and H.245 Tunneling can crash some versions of Netmeeting.</long>
       </locale>
 
       <locale name="mr">
@@ -11568,7 +11898,7 @@
 
       <locale name="nb">
 	<short>Aktiver H.245-tunnellering</short>
-	
+	<long>Dette aktiverer H.245-tunnelleringsmodus. For H.245-tunnellering blir H.245-meldinger pakket inn i H.225-kanalen (port 1720). Dette sparer en TCP-tilkopling under anrop. H.245-tunnellering ble introdusert i H.323v2 og Netmeeting støtter det ikke. Bruk av både hurtigstart og H.245-tunnellering kan krasje noen versjoner av Netmeeting.</long>
       </locale>
 
       <locale name="ne">
@@ -11638,12 +11968,12 @@
 
       <locale name="sr">
 	<short>Омогући H.245 тунел</short>
-	
+	<long>Ово укључује H.245 режим тунела. У H.245 режиму тунела H.245 поруке су уоквирене у H.225 канал (порт 1720). Ово штеди једну TCP везу за време позива. H.245 тунел је уведен у H.323v2 и Netmeeting га не подржава. Употреба и Брзог старта и H.245 тунела може да сруши неке верзије Netmeeting-а.</long>
       </locale>
 
       <locale name="sr@latin">
 	<short>Omogući H.245 tunel</short>
-	
+	<long>Ovo uključuje H.245 režim tunela. U H.245 režimu tunela H.245 poruke su uokvirene u H.225 kanal (port 1720). Ovo štedi jednu TCP vezu za vreme poziva. H.245 tunel je uveden u H.323v2 i Netmeeting ga ne podržava. Upotreba i Brzog starta i H.245 tunela može da sruši neke verzije Netmeeting-a.</long>
       </locale>
 
       <locale name="sv">
@@ -11727,6 +12057,11 @@
 	<long>Това включва ранния H.245 при осъществяване на връзка</long>
       </locale>
 
+      <locale name="bn">
+	<short>শীঘ্রই H.245 সক্রিয় করুন</short>
+	<long>এর ফলে, প্রস্তুতির প্রারম্ভিক ধাপে H.245 সক্রিয় করা হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>শীঘ্র H.245 সক্রিয় করুন</short>
 	<long>এর ফলে, প্রস্তুতির প্রারম্ভিক ধাপে H.245 সক্রিয় করা হবে</long>
@@ -11742,6 +12077,11 @@
 	<long>Això habilita H.245 al principi de la configuració</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Habilita H.245 a l&apos;inici</short>
+	<long>Això habilita H.245 al principi de la configuració</long>
+      </locale>
+
       <locale name="crh">
 	<short>Erteki H.245&apos;ni qabilleştir</short>
 	<long>Bu, H.245&apos;ni tesbit esnasında erte qabilleştirir</long>
@@ -12094,8 +12434,8 @@
       </locale>
 
       <locale name="bn">
-	<short>&apos;জলদি শুরু&apos; সক্রিয়</short>
-	
+	<short>&apos;তাড়াতাড়ি শুরু&apos; সক্রিয় করুন</short>
+	<long>ফাস্ট স্টার্ট উপায় যোগাযোগ স্থাপন করা হবে। H.245 টানেলিং প্রণালী H.323v2-এ প্রথম উপলব্ধ করা হয়েছিল ও  Netmeeting দ্বারা এটি সমর্থিত নয়। ফাস্ট স্টার্ট ও H.245 টানেলিং একযোগে ব্যবহারে Netmeeting-র কিছু সংস্করণ বিকল হতে পারে।</long>
       </locale>
 
       <locale name="bn_IN">
@@ -12113,6 +12453,11 @@
 	<long>La connexió s&apos;establirà en el mode d&apos;Arrencada Ràpida. Aquesta és una nova manera d&apos;iniciar les trucades que va introduir-se en l&apos;H.323v2. El Netmeeting no ho implementa, de manera que si utilitzeu l&apos;arrencada ràpida i la tunelització H.245 al mateix temps, us podeu trobar que algunes versions del Netmeeting es pengin</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Habilita l&apos;arrencada ràpida</short>
+	<long>La connexió s&apos;establirà en el mode d&apos;Arrencada Ràpida. Esta és una nova manera d&apos;iniciar les trucades que va introduir-se en l&apos;H.323v2. El Netmeeting no ho implementa, de manera que si utilitzeu l&apos;arrencada ràpida i la tunelització H.245 al mateix temps, vos podeu trobar que algunes versions del Netmeeting es pengen</long>
+      </locale>
+
       <locale name="crh">
 	<short>&apos;Tez Başlanğıç&apos;nı qabilleştir</short>
 	<long>Bağlantı, Tez Başlanğıç tarzında qurulacaq. Tez Başlanğıç, aramalarnı daa çabik başlatmaq içün H.323v2&apos;de kirsetilgen yañı bir yoldur. Netmeeting tarafından desteklenmez ve hem Tez Başlanğıçnıñ hem de H.245 Tunnellemesininiñ beraber qullanıluvı bazı Netmeeting sürümleriniñ çöküvine sebep ola bilir</long>
@@ -12275,7 +12620,7 @@
 
       <locale name="ml">
 	<short>&apos;വേഗത്തില്‍ ആരംഭിക്കുക&apos; സജ്ജമാക്കുക</short>
-	
+	<long>ഫാസ്റ്റ് സ്റ്റാര്‍ട്ട് മോഡില്‍ കണക്ഷന്‍ സ്ഥാപിക്കപ്പെടുന്നു. കോളുകള്‍ പെട്ടെന്നാരംഭിക്കുന്നതിനുള്ള ഒരു പുതിയാ മാര്‍ഗ്ഗമാണു് ഫാസ്റ്റ് സ്റ്റാര്‍ട്ട് വേ. H.323v2-ലാണു് ഇതു് ലഭ്യമാകുവാന്‍ തുടങ്ങിയതു്. നെറ്റ്മീറ്റിങ് ഇതു് പിന്തുണയ്ക്കുന്നില്ല. ഫാസ്റ്റ് സ്റ്റാര്‍ട്ടും H.245 ടണലിങും ഉപയോഗിക്കുന്നതു് നെറ്റ്മീറ്റിങ് പതിപ്പുകളുടെ തകര്‍ച്ചയ്ക്കു് കാരണമാകുന്നു.</long>
       </locale>
 
       <locale name="mn">
@@ -12459,6 +12804,11 @@
 	<long>Това позволява указването на режима за изпращане на DTMF. Валидните стойности са „String“ (0), „Tone“ (1), „RFC2833“ (2), „Q.931“ (3) (стандартно е „String“ — низ). Ако изберете стойност различна от „String“, няма да можете да пращате текстови съобщения</long>
       </locale>
 
+      <locale name="bn">
+	<short>DTMF প্রেরণ করা হচ্ছে</short>
+	<long>এর সাহায্যে DTMF প্রেরণের মোড নির্ধারণ করা যাবে। সম্ভাব্য মান &quot;String&quot; (0), &quot;Tone&quot; (1), &quot;RFC2833&quot; (2), &quot;Q.931&quot; (3) (ডিফল্ট মান হল &quot;String&quot;)। &quot;String&quot; ভিন্ন অন্য কোনো মান নির্ধারিত হলে টেক্স চ্যাট নিষ্ক্রিয় হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>DTMF প্রেরণ করা হচ্ছে</short>
 	<long>এর সাহায্যে DTMF প্রেরণের মোড নির্ধারণ করা যাবে। সম্ভাব্য মান &quot;String&quot; (0), &quot;Tone&quot; (1), &quot;RFC2833&quot; (2), &quot;Q.931&quot; (3) (ডিফল্ট মান হল &quot;String&quot;)। &quot;String&quot; ভিন্ন অন্য কোনো মান নির্ধারিত হলে টেক্স চ্যাট নিষ্ক্রিয় হবে</long>
@@ -12474,6 +12824,11 @@
 	<long>Això permet seleccionar el mode per a l&apos;emissió de DTMF. Els valors poden ser «String» (0), «To» (1), «RFC2833» (2), o bé «Q.931» (3) (per defecte és «String»). Si escolliu un valor que no sigui «String», s&apos;inhabilitarà el xat de text</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>S&apos;està enviant DTMF</short>
+	<long>Això permet seleccionar el mode per a l&apos;emissió de DTMF. Els valors poden ser «String» (0), «To» (1), «RFC2833» (2), o bé «Q.931» (3) (per defecte és «String»). Si escolliu un valor que no siga «String», s&apos;inhabilitarà el xat de text</long>
+      </locale>
+
       <locale name="crh">
 	<short>DTMF yiberüv</short>
 	<long>Bu, DTMF&apos;lerni yiberüv içün sizge tarznı tesbit etmege imkân berir. Caiz qıymetler: &quot;Tizgi&quot; (0), &quot;Ton&quot; (1), &quot;RFC2833&quot; (2), &quot;Q.931&quot; (3) (ög-belgilengen: &quot;Tizgi&quot;). &quot;Tizgi&quot; qıymetinden başqa qıymetlerni saylamaq Metin Sübetini ğayrı qabilleştirir</long>
@@ -12571,7 +12926,7 @@
 
       <locale name="hi">
 	<short>DTMF भेज रहा है</short>
-	
+	<long>यह DTMF के भेजने के लिए विधि सेट करने की छूट देता है. मान हो सकता है &quot;String&quot; (0), &quot;Tone&quot; (1), &quot;RFC2833&quot; (2), &quot;Q.931&quot; (3) (default is &quot;String&quot;). &quot;String&quot; के बजाय अन्य मान चुनना टेक्स्ट चैट को निष्क्रिय करता है</long>
       </locale>
 
       <locale name="hr">
@@ -12616,7 +12971,7 @@
 
       <locale name="lt">
 	<short>Siunčiamas DTMF</short>
-	
+	<long>Čia galima nustatyti DTMF siuntimo veikseną. Galimos reikšmės yra „String“ (0), „Tone“ (1), „RFC2833“ (2) ir „Q.931“ (3), numatytoji – „String“. Pasirinkus kitas reikšmes nei „String“ bus išjungtas tekstinis pokalbis</long>
       </locale>
 
       <locale name="lv">
@@ -12726,12 +13081,12 @@
 
       <locale name="sr">
 	<short>Слање ДТМФ-а</short>
-	
+	<long>Ово омогућава подешавање режима за слање DTMF сигнала. Вредности могу бити „Низ“ (0), „Тон“ (1), „RFC2833“ (2), „Q.931“ (3) (почетна вредност је „Низ“)  Избор неке друге вредности од „Низ“ искључује текстуални разговор</long>
       </locale>
 
       <locale name="sr@latin">
 	<short>Slanje DTMF-a</short>
-	
+	<long>Ovo omogućava podešavanje režima za slanje DTMF signala. Vrednosti mogu biti „Niz“ (0), „Ton“ (1), „RFC2833“ (2), „Q.931“ (3) (početna vrednost je „Niz“)  Izbor neke druge vrednosti od „Niz“ isključuje tekstualni razgovor</long>
       </locale>
 
       <locale name="sv">
@@ -12832,7 +13187,7 @@
 
       <locale name="bn">
 	<short>সব কল হোস্টে পাঠানো হবে</short>
-	
+	<long>ওপরে উল্লেখিত ক্ষেত্রসমূহ নির্বাচিত হলে যে হোস্টে সব কল পাঠিয়ে দেওয়া হবে</long>
       </locale>
 
       <locale name="bn_IN">
@@ -12850,6 +13205,11 @@
 	<long>El nom de l&apos;ordinador on es desviaran les trucades si el desviament de trucades està activat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Desvia trucades a l&apos;ordinador</short>
+	<long>El nom de l&apos;ordinador on es desviaran les trucades si el desviament de trucades està activat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Aramalarnı qonaqbayğa yönlendir</short>
 	<long>Arama yönlendirüv qabilleştirilgen ise, aramalarnıñ qaysı qonaqbayğa yönlendirilecegi</long>
@@ -13012,7 +13372,7 @@
 
       <locale name="ml">
 	<short>ഹോസ്റ്റിലേക്ക് കോളുകള്‍ നീക്കുക</short>
-	
+	<long>കോള്‍ ഫോര്‍വേഡിങ് പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, കോളുകള്‍ ഫോര്‍വേഡ് ചെയ്യേണ്ട ഹോസ്റ്റ്</long>
       </locale>
 
       <locale name="mn">
@@ -13202,8 +13562,8 @@
       </locale>
 
       <locale name="bn">
-	<short>সব সময়ই নির্দিশ্ট হোস্টে কল এগিয়ে দেওয়া হবে</short>
-	
+	<short>সব সময়ই নির্দিষ্ট হোস্টে কল এগিয়ে দেওয়া হবে</short>
+	<long>সক্রিয় থাকলে, নিম্নলিখিত ক্ষেত্রের বৈশিষ্ট্য অনুযায়ী নির্ধারিত হোস্টে সকল কল ফরওয়ার্ড করা হবে</long>
       </locale>
 
       <locale name="bn_IN">
@@ -13221,6 +13581,11 @@
 	<long>Si s&apos;habilita, totes les trucades entrants es desviaran a l&apos;ordinador indicat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Desvia sempre les trucades a un ordinador en concret</short>
+	<long>Si s&apos;habilita, totes les trucades entrants es desviaran a l&apos;ordinador indicat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Aramalarnı er zaman berilgen qonaqbayğa yönlendir</short>
 	<long>Qabilleştirilgen ise, kelgen aramalarnıñ episi altta belirtilgen qonaqbayğa yönlendirilecek</long>
@@ -13383,7 +13748,7 @@
 
       <locale name="ml">
 	<short>നല്‍കിയിരിക്കുന്ന ഹോസ്റ്റിലേക്ക് കോളുകള്‍ നീക്കുക</short>
-	
+	<long>പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, ഫീള്‍ഡില്‍ പറഞ്ഞിരിക്കുന്ന ഹോസ്റ്റിലേക്ക് എല്ലാ കോളുകളും ഫോര്‍വേഡ് ചെയ്യുന്നു.</long>
       </locale>
 
       <locale name="mn">
@@ -13579,7 +13944,7 @@
 
       <locale name="bn">
 	<short>ব্যস্ত থাকলে কল নির্দিস্ট হোস্টে পাঠানো হবে</short>
-	
+	<long>সক্রিয় থাকলে, কোনো কলে ব্যস্ত থাকলে অথবা &apos;বিঘ্নিত করা হবে না&apos; মোডে চিহ্নিত থাকলে নিম্নলিখিত ক্ষেত্রের বৈশিষ্ট্য অনুযায়ী নির্ধারিত হোস্টে সকল কল ফরওয়ার্ড করা হবে</long>
       </locale>
 
       <locale name="bn_IN">
@@ -13597,6 +13962,11 @@
 	<long>Si s&apos;activa, totes les trucades entrants que rebeu mentre estigueu en una trucada, o en mode «no molesteu», es desviaran a l&apos;ordinador indicat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Desvia les trucades a un ordinador en concret quan estiga ocupat</short>
+	<long>Si s&apos;activa, totes les trucades entrants que rebeu mentre estigueu en una trucada, o en mode «no molesteu», es desviaran a l&apos;ordinador indicat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Meşğul olğanda, aramalarnı berilgen qonaqbayğa yönlendir</short>
 	<long>Qabilleştirilgen ise, kelgen aramalarnıñ episi aşağıdaki alanda belirtilgen qonaqbayğa yönlendirilecek, eger endi bir aramada olsañız ya da Raatsız Etmeñiz tarzında olsañız</long>
@@ -13759,7 +14129,7 @@
 
       <locale name="ml">
 	<short>തിരക്കാണ് എങ്കില്‍ നല്‍കിയിരിക്കുന്ന ഹോസ്റ്റിലേക്ക് കോളുകള്‍ നീക്കുക</short>
-	
+	<long>പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, നിങ്ങള്‍ മറ്റൊരു കോളിലാണു് അല്ലെങ്കില്‍ ശല്യപ്പെടുത്തരുതു് എന്ന മോഡിലാണെങ്കില്‍, ഫീള്‍ഡില്‍ പറഞ്ഞിരിക്കുന്ന ഹോസ്റ്റിലേക്ക് എല്ലാ കോളുകളും ഫോര്‍വേഡ് ചെയ്യുന്നു.</long>
       </locale>
 
       <locale name="mn">
@@ -13955,7 +14325,7 @@
 
       <locale name="bn">
 	<short>উত্তর না পেলে কল নির্দিস্ট হোস্টে পাঠানো হবে</short>
-	
+	<long>এটি সক্রিয় হলে যে সমস্ত কলগুলির আপনি উত্তর দেবেন না তা সবই নিম্নোক্ত হোস্টটিতে পাঠিয়ে দেওয়া হবে</long>
       </locale>
 
       <locale name="bn_IN">
@@ -13973,6 +14343,11 @@
 	<long>Si s&apos;habilita, les trucades entrants que no contesteu es desviaran cap a l&apos;ordinador indicat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Desvia les trucades a un ordinador en concret si no contesto</short>
+	<long>Si s&apos;habilita, les trucades entrants que no contesteu es desviaran cap a l&apos;ordinador indicat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Cevapsız aramalarnı berilgen qonaqbayğa yönlendir</short>
 	<long>Qabilleştirilgen ise, kelgen aramalarnıñ episi altta belirtilgen qonaqbayğa yönlendirilecek, eger aramağa cevap bermeseñiz</long>
@@ -14135,7 +14510,7 @@
 
       <locale name="ml">
 	<short>മറുപടു ലഭ്യമായില്ല എങ്കില്‍ നല്‍കിയിരിക്കുന്ന ഹോസ്റ്റിലേക്ക് കോളുകള്‍ നീക്കുക</short>
-	
+	<long>പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, നിങ്ങള്‍ കോള്‍ എടുത്തില്ലെങ്കില്‍, ഫീള്‍ഡില്‍ പറഞ്ഞിരിക്കുന്ന ഹോസ്റ്റിലേക്ക് എല്ലാ കോളുകളും ഫോര്‍വേഡ് ചെയ്യുന്നു.</long>
       </locale>
 
       <locale name="mn">
@@ -14319,6 +14694,11 @@
 	<long>Сървърът за STUN позволява преминаването през някои видове шлюзове за NAT.</long>
       </locale>
 
+      <locale name="bn">
+	<short>STUN সার্ভার</short>
+	<long>STUN সমর্থনে ব্যবহৃত STUN সার্ভার। STUN প্রযুক্তির সাহায্যে কিছু প্রকার NAT গেটওয়ের মধ্যে পথ প্রস্তুত করা সম্ভব</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>STUN সার্ভার</short>
 	<long>STUN সমর্থনে ব্যবহৃত STUN সার্ভার। STUN প্রযুক্তির সাহায্যে কিছু প্রকার NAT গেটওয়ের মধ্যে পথ প্রস্তুত করা সম্ভব</long>
@@ -14329,6 +14709,11 @@
 	<long>El servidor STUN a utilitzar per a les funcions d&apos;STUN. L&apos;STUN és una tecnologia que permet travessar certs tipus d&apos;encaminadors NAT.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>El servidor STUN</short>
+	<long>El servidor STUN a utilitzar per a les funcions d&apos;STUN. L&apos;STUN és una tecnologia que permet travessar certs tipus d&apos;encaminadors NAT.</long>
+      </locale>
+
       <locale name="crh">
 	<short>STUN Sunucısı</short>
 	<long>STUN destegi içün qullanılacaq STUN sunucısı. STUN, bazı tür Şebeke Adresi Çevirme (ŞAÇ; NAT) savaqları üzerinden keçişke imkân bergen bir tehnologiyadır</long>
@@ -14431,7 +14816,7 @@
 
       <locale name="hi">
 	<short>STUN सर्वर</short>
-	
+	<long>STUN समर्थन के लिए STUN सर्वर. STUN एक प्रौद्योगिकी है जो कि NAT गेटवे के कुछ प्रकार से रास्ता देता है</long>
       </locale>
 
       <locale name="hr">
@@ -14571,12 +14956,12 @@
 
       <locale name="sr">
 	<short>STUN сервер</short>
-	
+	<long>STUN сервер за STUN подршку. STUN је технологија која допушта да се прође кроз неке врсте маскирања мреже.</long>
       </locale>
 
       <locale name="sr@latin">
 	<short>STUN server</short>
-	
+	<long>STUN server za STUN podršku. STUN je tehnologija koja dopušta da se prođe kroz neke vrste maskiranja mreže.</long>
       </locale>
 
       <locale name="sv">
@@ -14661,6 +15046,11 @@
 	<long>Изключване на автоматичната настройка на мрежата от теста за STUN</long>
       </locale>
 
+      <locale name="bn">
+	<short>STUN নেটওয়ার্ক সনাক্তরণ ব্যবস্থা নিষ্ক্রিয় করুন</short>
+	
+      </locale>
+
       <locale name="bn_IN">
 	<short>STUN নেটওয়ার্ক সনাক্তরণ ব্যবস্থা নিষ্ক্রিয় করুন</short>
 	<long>STUN পরীক্ষার ফলে স্বয়ংক্রিয়ভাবে নেটওয়ার্ক নির্ধারণ ব্যবস্থা নিষ্ক্রিয় করুন</long>
@@ -14671,6 +15061,11 @@
 	<long>Inhabilita la configuració automàtica de la xarxa resultant de la comprovació de l&apos;STUN</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Inhabilita la detecció de xarxa STUN</short>
+	<long>Inhabilita la configuració automàtica de la xarxa resultant de la comprovació de l&apos;STUN</long>
+      </locale>
+
       <locale name="crh">
 	<short>STUN şebekesi keşfini ğayrı qabilleştir</short>
 	<long>STUN sınamasından neticelengen avtomatik şebeke tesbitini ğayrı qabilleştir</long>
@@ -14706,6 +15101,11 @@
 	<long>Desactivar la configuración automática de la configuración de red con los resultados del test de STUN</long>
       </locale>
 
+      <locale name="et">
+	<short>STUN-võrgu tuvastamine keelatud</short>
+	
+      </locale>
+
       <locale name="eu">
 	<short>Desgaitu STUN sarea detektatzea</short>
 	<long>Desgaitu sarea automatikoki konfiguratzea STUN probaren emaitzekin</long>
@@ -14738,7 +15138,7 @@
 
       <locale name="hi">
 	<short>STUN संजाल जाँच निष्क्रिय करें</short>
-	
+	<long>STUN जाँच से आया स्वचालित संजाल सेटअप निष्क्रिय करें</long>
       </locale>
 
       <locale name="hu">
@@ -14831,6 +15231,16 @@
 	<long>Onemogoči samodejno nastavitev omrežja preko STUN preizkusa</long>
       </locale>
 
+      <locale name="sr">
+	<short>Онемогући STUN детекцију мреже</short>
+	<long>Онемогући аутоматско подешавање мреже добијено STUN тестом</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Onemogući STUN detekciju mreže</short>
+	<long>Onemogući automatsko podešavanje mreže dobijeno STUN testom</long>
+      </locale>
+
       <locale name="sv">
 	<short>Inaktivera STUN-nätverksdetektering</short>
 	<long>Inaktivera den automatiska nätverkskonfigurationen som togs fram av STUN-testet</long>
@@ -14856,6 +15266,11 @@
 	<long>STUN testi sonucundaki otomatik ağ yapılandırmasını etkisizleştir</long>
       </locale>
 
+      <locale name="uk">
+	<short>Вимкнути автоматичне визначення конфігурації мережі</short>
+	<long>Вимкнути автоматичне визначення конфігурації мережі за допомогою тесту STUN</long>
+      </locale>
+
       <locale name="vi">
 	<short>Tắt dò tìm mạng STUN</short>
 	<long>Tắt tự động thiết lập mạng là kết quả của hàm thử STUN</long>
@@ -14902,6 +15317,11 @@
         <long>Въведете броя секунди, които Ekiga трябва да изчака преди обновяване на правилата за NAT при използване на STUN</long>
       </locale>
 
+      <locale name="bn">
+	<short>NAT Binding এর সময়সীমা পার হয়ে গেছে</short>
+        <long>STUN ব্যবহারকালে Ekiga দ্বারা NAT বাইন্ডিং পুনরায় প্রচেষ্টার পূর্বে যে সংখ্যক সেকেন্ড অপেক্ষা করা হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>NAT Binding এর সময়সীমা পার হয়ে গেছে</short>
         <long>STUN ব্যবহারকালে Ekiga দ্বারা NAT বাইন্ডিং পুনরায় প্রচেষ্টার পূর্বে যে সংখ্যক সেকেন্ড অপেক্ষা করা হবে</long>
@@ -14912,6 +15332,11 @@
         <long>Entreu el nombre de segons que l&apos;Ekiga ha d&apos;esperar abans d&apos;intentar actualitzar la vinculació NAT quan es faci servir STUN</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>S&apos;ha excedit el temps d&apos;espera de la vinculació NAT</short>
+        <long>Entreu el nombre de segons que l&apos;Ekiga ha d&apos;esperar abans d&apos;intentar actualitzar la vinculació NAT quan es faça servir STUN</long>
+      </locale>
+
       <locale name="crh">
 	<short>NAT Bağlamı Zaman Aşımı</short>
         <long>STUN qullanılğanı zaman qaç saniyeden soñ Ekiga&apos;nıñ NAT bağlamını tazertüvi lâzim olğanını kirsetiñiz</long>
@@ -15059,7 +15484,7 @@
 
       <locale name="ml">
 	<short>NAT ബൈന്‍ഡിങ് സമയപരിധി</short>
-        
+        <long>STUN ഉപയോഗിക്കുമ്പോള്‍ NAT ബൈന്‍ഡിങ് എകീഗാ എപ്പോള്‍ പുതുക്കണമെന്നു് സെക്കന്‍ഡുകളില്‍ നല്‍കുക</long>
       </locale>
 
       <locale name="mr">
@@ -15234,8 +15659,8 @@
       </locale>
 
       <locale name="bn">
-	<short>লুকিয়ে রেখে শুরু কর</short>
-	
+	<short>লুকিয়ে রেখে শুরু করুন</short>
+	<long>এটি সক্রিয় করলে, Ekiga লুকিয়ে চালু হবে যদি GNOME প্যানেল-এর সতর্ক স্থান উপস্থিত থাকে</long>
       </locale>
 
       <locale name="bn_IN">
@@ -15253,6 +15678,11 @@
 	<long>Si s&apos;habilita, l&apos;Ekiga s&apos;iniciarà amagat, suposant que l&apos;àrea de notificació estigui habilitada</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Arrenca amagat</short>
+	<long>Si s&apos;habilita, l&apos;Ekiga s&apos;iniciarà amagat, suposant que l&apos;àrea de notificació estiga habilitada</long>
+      </locale>
+
       <locale name="crh">
 	<short>Gizlengen başla</short>
 	<long>Qabilleştirilgen ise, GNOME panelinde bildirim mıntıqası bulunğanı taqdirde Ekiga gizlengen olaraq başlaycaq</long>
@@ -15420,7 +15850,7 @@
 
       <locale name="ml">
 	<short>അദൃശ്യമായത് ആരംഭിക്കുക</short>
-	
+	<long>പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, ഗ്നോം പാനലില്‍ അറിയിപ്പിനുള്ള സ്ഥലം ലഭ്യമെങ്കില്‍ എകീഗാ അദൃശ്യമാകുവാന്‍ തുടങ്ങുന്നു.</long>
       </locale>
 
       <locale name="mn">
@@ -15604,6 +16034,11 @@
 	<long>Позицията на екрана на главния прозорец</long>
       </locale>
 
+      <locale name="bn">
+	<short>পর্দার মধ্যে প্রধান উইন্ডোর অবস্থান</short>
+	<long>পর্দার মধ্যে প্রধান উইন্ডোর অবস্থান</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পর্দার মধ্যে প্রধান উইন্ডোর অবস্থান</short>
 	<long>পর্দার মধ্যে প্রধান উইন্ডোর অবস্থান</long>
@@ -15619,6 +16054,11 @@
 	<long>Posició en pantalla de la finestra principal</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició en pantalla de la finestra principal</short>
+	<long>Posició en pantalla de la finestra principal</long>
+      </locale>
+
       <locale name="crh">
 	<short>Baş pencereniñ ekrandaki mevamı</short>
 	<long>Baş pencereniñ ekrandaki mevamı</long>
@@ -15960,6 +16400,11 @@
 	<long>Показване таблото за набиране</long>
       </locale>
 
+      <locale name="bn">
+	<short>কলের প্যানেল প্রদর্শন করা হবে</short>
+	<long>কলের প্যানেল প্রদর্শন করা হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>কলের প্যানেল প্রদর্শন করা হবে</short>
 	<long>কলের প্যানেল প্রদর্শন করা হবে</long>
@@ -15970,6 +16415,11 @@
 	<long>Mostra el quadre de trucada</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mostra el quadre de trucada</short>
+	<long>Mostra el quadre de trucada</long>
+      </locale>
+
       <locale name="crh">
 	<short>Arama panelini köster</short>
 	<long>Arama panelini köster</long>
@@ -16140,6 +16590,16 @@
 	<long>Shfaq panelin e thirrjes</long>
       </locale>
 
+      <locale name="sr">
+	<short>Прикажи површ за позиве</short>
+	<long>Прикажи површ за позиве</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Prikaži površ za pozive</short>
+	<long>Prikaži površ za pozive</long>
+      </locale>
+
       <locale name="sv">
 	<short>Visa samtalspanelen</short>
 	<long>Visa samtalspanelen</long>
@@ -16216,6 +16676,11 @@
 	<long>Промяна на секцията за основния панел</long>
       </locale>
 
+      <locale name="bn">
+	<short>প্রধান উইন্ডো প্যানেল ভাগে পরিবর্তন করুন</short>
+	<long>প্রধান উইন্ডো প্যানেল ভাগে পরিবর্তন করুন</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>প্রধান উইন্ডো প্যানেল ভাগে পরিবর্তন করুন</short>
 	<long>প্রধান উইন্ডো প্যানেল ভাগে পরিবর্তন করুন</long>
@@ -16226,6 +16691,11 @@
 	<long>Canvia la secció del quadre de la finestra principal</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Canvia la secció del quadre de la finestra principal</short>
+	<long>Canvia la secció del quadre de la finestra principal</long>
+      </locale>
+
       <locale name="crh">
 	<short>Baş pencere paneli bölügini deñiştir</short>
 	<long>Baş pencere paneli bölügini deñiştir</long>
@@ -16291,6 +16761,11 @@
 	<long>Change the main window panel section</long>
       </locale>
 
+      <locale name="hi">
+	<short>मुख्य विंडो पटल खंड बदलें</short>
+	<long>मुख्य विंडो पटल खंड बदलें</long>
+      </locale>
+
       <locale name="hu">
 	<short>A főablak panelszakaszának megváltoztatása</short>
 	<long>A főablak panelszakaszának megváltoztatása</long>
@@ -16401,6 +16876,16 @@
 	<long>Ndrysho seksionin e panelit të dritares qendrore</long>
       </locale>
 
+      <locale name="sr">
+	<short>Промените одељак управљачког панела</short>
+	<long>Промените одељак управљачког панела</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Promenite odeljak upravljačkog panela</short>
+	<long>Promenite odeljak upravljačkog panela</long>
+      </locale>
+
       <locale name="sv">
 	<short>Ändra huvudfönsterpanelssektionen</short>
 	<long>Ändra huvudfönsterpanelssektionen</long>
@@ -16482,6 +16967,11 @@
 	<long>Позицията на екрана на прозореца с журнала</long>
       </locale>
 
+      <locale name="bn">
+	<short>পর্দার মধ্যে লগ উইন্ডোর অবস্থান</short>
+	<long>পর্দার মধ্যে লগ উইন্ডোর অবস্থান</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পর্দার মধ্যে লগ উইন্ডোর অবস্থান</short>
 	<long>পর্দার মধ্যে লগ উইন্ডোর অবস্থান</long>
@@ -16497,6 +16987,11 @@
 	<long>Posició en pantalla de la finestra del registre</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició en pantalla de la finestra del registre</short>
+	<long>Posició en pantalla de la finestra del registre</long>
+      </locale>
+
       <locale name="crh">
 	<short>Kütük penceresiniñ ekrandaki mevamı</short>
 	<long>Kütük penceresiniñ ekrandaki mevamı</long>
@@ -16838,6 +17333,11 @@
 	<long>Размер на прозореца за съобщения</long>
       </locale>
 
+      <locale name="bn">
+	<short>আড্ডা উইন্ডোর মাপ</short>
+	<long>আড্ডা উইন্ডোর মাপ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>আলাপন উইন্ডোর মাপ</short>
 	<long>আলাপন উইন্ডোর মাপ</long>
@@ -16848,6 +17348,11 @@
 	<long>Mida de la finestra del xat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida de la finestra del xat</short>
+	<long>Mida de la finestra del xat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Sübet penceresiniñ ölçüsi</short>
 	<long>Sübet penceresiniñ ölçüsi</long>
@@ -17159,6 +17664,11 @@
 	<long>Позицията на екрана на прозореца за съобщения</long>
       </locale>
 
+      <locale name="bn">
+	<short>পর্দার মধ্যে আলাপন উইন্ডোর অবস্থান</short>
+	<long>পর্দার মধ্যে আলাপন উইন্ডোর অবস্থান</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পর্দার মধ্যে আলাপন উইন্ডোর অবস্থান</short>
 	<long>পর্দার মধ্যে আলাপন উইন্ডোর অবস্থান</long>
@@ -17169,6 +17679,11 @@
 	<long>Posició en pantalla de la finestra de xat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició en pantalla de la finestra de xat</short>
+	<long>Posició en pantalla de la finestra de xat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Sübet penceresiniñ ekrandaki mevamı</short>
 	<long>Sübet penceresiniñ ekrandaki mevamı</long>
@@ -17485,6 +18000,11 @@
 	<long>Размер на прозореца за помощника за настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>druid উইন্ডোর মাপ</short>
+	<long>druid উইন্ডোর মাপ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>druid উইন্ডোর মাপ</short>
 	<long>druid উইন্ডোর মাপ</long>
@@ -17500,6 +18020,11 @@
 	<long>Mida de la finestra de l&apos;auxiliar</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida de la finestra de l&apos;auxiliar</short>
+	<long>Mida de la finestra de l&apos;auxiliar</long>
+      </locale>
+
       <locale name="crh">
 	<short>Siirbaz penceresiniñ ölçüsi</short>
 	<long>Siirbaz penceresiniñ ölçüsi</long>
@@ -17601,8 +18126,8 @@
       </locale>
 
       <locale name="hu">
-	<short>A varázslóablak mérete</short>
-	<long>A varázslóablak mérete</long>
+	<short>Az asszisztensablak mérete</short>
+	<long>Az asszisztensablak mérete</long>
       </locale>
 
       <locale name="id">
@@ -17841,6 +18366,11 @@
 	<long>Позиция на екрана за прозореца с помощника за настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>পর্দার মধ্যে druid উইন্ডোর অবস্থান</short>
+	<long>পর্দার মধ্যে druid উইন্ডোর অবস্থান</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পর্দার মধ্যে druid উইন্ডোর অবস্থান</short>
 	<long>পর্দার মধ্যে druid উইন্ডোর অবস্থান</long>
@@ -17856,6 +18386,11 @@
 	<long>Posició en pantalla de la finestra de l&apos;auxiliar de configuració</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició en pantalla de la finestra de l&apos;auxiliar de configuració</short>
+	<long>Posició en pantalla de la finestra de l&apos;auxiliar de configuració</long>
+      </locale>
+
       <locale name="crh">
 	<short>Siirbaz penceresiniñ ekrandaki mevamı</short>
 	<long>Siirbaz penceresiniñ ekrandaki mevamı</long>
@@ -17957,8 +18492,8 @@
       </locale>
 
       <locale name="hu">
-	<short>A varázslóablak pozíciója a képernyőn</short>
-	<long>A varázslóablak pozíciója a képernyőn</long>
+	<short>Az asszisztensablak pozíciója a képernyőn</short>
+	<long>Az asszisztensablak pozíciója a képernyőn</long>
       </locale>
 
       <locale name="id">
@@ -18197,6 +18732,11 @@
 	<long>Позицията на екрана на прозореца с адресника</long>
       </locale>
 
+      <locale name="bn">
+	<short>অ্যাড্রেস বুক উইন্ডোর স্ক্রীনে স্থান</short>
+	<long>অ্যাড্রেস বুক উইন্ডোর স্ক্রীনে স্থান</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>অ্যাড্রেস বুক উইন্ডোর স্ক্রীনে স্থান</short>
 	<long>অ্যাড্রেস বুক উইন্ডোর স্ক্রীনে স্থান</long>
@@ -18212,8 +18752,13 @@
 	<long>Posició en pantalla de la finestra de la llibreta d&apos;adreces</long>
       </locale>
 
-      <locale name="crh">
-	<short>Adres defteri penceresiniñ ekrandaki mevamı</short>
+      <locale name="ca@valencia">
+	<short>Posició en pantalla de la finestra de la llibreta d&apos;adreces</short>
+	<long>Posició en pantalla de la finestra de la llibreta d&apos;adreces</long>
+      </locale>
+
+      <locale name="crh">
+	<short>Adres defteri penceresiniñ ekrandaki mevamı</short>
 	<long>Adres defteri penceresiniñ ekrandaki mevamı</long>
       </locale>
 
@@ -18553,6 +19098,11 @@
 	<long>Размер на прозореца за адресника</long>
       </locale>
 
+      <locale name="bn">
+	<short>ঠিকানা বইয়ের উইন্ডোর মাপ</short>
+	<long>ঠিকানা বইয়ের উইন্ডোর মাপ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ঠিকানা বইয়ের উইন্ডোর মাপ</short>
 	<long>ঠিকানা বইয়ের উইন্ডোর মাপ</long>
@@ -18568,6 +19118,11 @@
 	<long>Mida de la finestra de la llibreta d&apos;adreces</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida de la finestra de la llibreta d&apos;adreces</short>
+	<long>Mida de la finestra de la llibreta d&apos;adreces</long>
+      </locale>
+
       <locale name="crh">
 	<short>Adres defteri penceresiniñ ölçüsi</short>
 	<long>Adres defteri penceresiniñ ölçüsi</long>
@@ -18909,6 +19464,11 @@
 	<long>Позицията на екрана на прозореца за аудио настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>পর্দার মধ্যে অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান</short>
+	<long>পর্দার মধ্যে অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পর্দার মধ্যে অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান</short>
 	<long>পর্দার মধ্যে অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান</long>
@@ -18919,6 +19479,11 @@
 	<long>Posició en pantalla de la finestra de paràmetres d&apos;àudio</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició en pantalla de la finestra de paràmetres d&apos;àudio</short>
+	<long>Posició en pantalla de la finestra de paràmetres d&apos;àudio</long>
+      </locale>
+
       <locale name="crh">
 	<short>Davuş tesbitleri penceresiniñ ekrandaki mevamı</short>
 	<long>Davuş tesbitleri penceresiniñ ekrandaki mevamı</long>
@@ -18989,6 +19554,11 @@
 	<long>Position on the screen of the audio settings window</long>
       </locale>
 
+      <locale name="hi">
+	<short>ऑडियो सेटिंग विंडो के स्क्रीन की स्थिति</short>
+	<long>ऑडियो सेटिंग विंडो के स्क्रीन की स्थिति</long>
+      </locale>
+
       <locale name="hu">
 	<short>A hangbeállítások ablak pozíciója a képernyőn</short>
 	<long>A hangbeállítások ablak pozíciója a képernyőn</long>
@@ -19099,6 +19669,16 @@
 	<long>Pozicioni në ekran i dritares së rregullimeve audio</long>
       </locale>
 
+      <locale name="sr">
+	<short>Положај прозора са подешавањима звука на екрану</short>
+	<long>Положај прозора са подешавањима звука на екрану</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Položaj prozora sa podešavanjima zvuka na ekranu</short>
+	<long>Položaj prozora sa podešavanjima zvuka na ekranu</long>
+      </locale>
+
       <locale name="sv">
 	<short>Position på skärmen för ljudinställningsfönstret</short>
 	<long>Position på skärmen för ljudinställningsfönstret</long>
@@ -19175,6 +19755,11 @@
 	<long>Размер на прозореца за аудио настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ</short>
+	<long>অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ</short>
 	<long>অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ</long>
@@ -19185,6 +19770,11 @@
 	<long>Mida de la finestra de paràmetres d&apos;àudio</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida de la finestra de paràmetres d&apos;àudio</short>
+	<long>Mida de la finestra de paràmetres d&apos;àudio</long>
+      </locale>
+
       <locale name="crh">
 	<short>Davuş tesbitleri penceresiniñ ölçüsi</short>
 	<long>Davuş tesbitleri penceresiniñ ölçüsi</long>
@@ -19240,6 +19830,11 @@
 	<long>Taille de la fenêtre des paramètres audio</long>
       </locale>
 
+      <locale name="ga">
+	<short>Méid na fuinneoige socruithe fuaime</short>
+	<long>Méid na fuinneoige socruithe fuaime</long>
+      </locale>
+
       <locale name="gl">
 	<short>Tamaño da xanela de configuracións de son</short>
 	<long>Tamaño da xanela de configuracións de son</long>
@@ -19370,6 +19965,16 @@
 	<long>Madhësia e dritares së rregullimeve audio</long>
       </locale>
 
+      <locale name="sr">
+	<short>Величина прозора са звучним подешавањима</short>
+	<long>Величина прозора са звучним подешавањима</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Veličina prozora sa zvučnim podešavanjima</short>
+	<long>Veličina prozora sa zvučnim podešavanjima</long>
+      </locale>
+
       <locale name="sv">
 	<short>Storlek på ljudinställningsfönstret</short>
 	<long>Storlek på ljudinställningsfönstret</long>
@@ -19446,6 +20051,11 @@
 	<long>Позицията на екрана за видео настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>পর্দার মধ্যে ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান</short>
+	<long>পর্দার মধ্যে ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পর্দার মধ্যে ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান</short>
 	<long>পর্দার মধ্যে ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান</long>
@@ -19456,6 +20066,11 @@
 	<long>Posició en pantalla de la finestra de paràmetres de vídeo</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició en pantalla de la finestra de paràmetres de vídeo</short>
+	<long>Posició en pantalla de la finestra de paràmetres de vídeo</long>
+      </locale>
+
       <locale name="crh">
 	<short>Video tesbitleri penceresiniñ ekrandaki mevamı</short>
 	<long>Video tesbitleri penceresiniñ ekrandaki mevamı</long>
@@ -19526,6 +20141,11 @@
 	<long>Position on the screen of the video settings window</long>
       </locale>
 
+      <locale name="hi">
+	<short>वीडियो सेटिंग विंडो के स्क्रीन की स्थिति</short>
+	<long>वीडियो सेटिंग विंडो के स्क्रीन की स्थिति</long>
+      </locale>
+
       <locale name="hu">
 	<short>A videobeállítások ablak pozíciója a képernyőn</short>
 	<long>A videobeállítások ablak pozíciója a képernyőn</long>
@@ -19636,6 +20256,16 @@
 	<long>Pozicioni në ekran i dritares së rregullimeve video</long>
       </locale>
 
+      <locale name="sr">
+	<short>Положај прозора са видео подешавањима на екрану</short>
+	<long>Положај прозора са видео подешавањима на екрану</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Položaj prozora sa video podešavanjima na ekranu</short>
+	<long>Položaj prozora sa video podešavanjima na ekranu</long>
+      </locale>
+
       <locale name="sv">
 	<short>Position på skärmen för videoinställningsfönstret</short>
 	<long>Position på skärmen för videoinställningsfönstret</long>
@@ -19712,6 +20342,11 @@
 	<long>Размер на прозореца за видео настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ</short>
+	<long>ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ</short>
 	<long>ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ</long>
@@ -19722,6 +20357,11 @@
 	<long>Mida de la finestra de paràmetres de vídeo</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida de la finestra de paràmetres de vídeo</short>
+	<long>Mida de la finestra de paràmetres de vídeo</long>
+      </locale>
+
       <locale name="crh">
 	<short>Video tesbitleri penceresiniñ ölçüsi</short>
 	<long>Video tesbitleri penceresiniñ ölçüsi</long>
@@ -19777,6 +20417,11 @@
 	<long>Taille de la fenêtre des paramètres vidéo</long>
       </locale>
 
+      <locale name="ga">
+	<short>Méid na fuinneoige socruithe físe</short>
+	<long>Méid na fuinneoige socruithe físe</long>
+      </locale>
+
       <locale name="gl">
 	<short>Tamaño da xanela de configuracións de vídeo</short>
 	<long>Tamaño da xanela de configuracións de vídeo</long>
@@ -19907,6 +20552,16 @@
 	<long>Madhësia e dritares së rregullimeve video</long>
       </locale>
 
+      <locale name="sr">
+	<short>Величина прозора са видео подешавањима</short>
+	<long>Величина прозора са видео подешавањима</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Veličina prozora sa video podešavanjima</short>
+	<long>Veličina prozora sa video podešavanjima</long>
+      </locale>
+
       <locale name="sv">
 	<short>Storlek på videoinställningsfönstret</short>
 	<long>Storlek på videoinställningsfönstret</long>
@@ -19988,6 +20643,11 @@
 	<long>Позицията на екрана на прозореца за настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>পছন্দসই বৈশিষ্ট্য স্ক্রীনের উপর রাখুন</short>
+	<long>পছন্দসই বৈশিষ্ট্য স্ক্রীনের উপর রাখুন</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পছন্দসই বৈশিষ্ট্য স্ক্রীনের উপর রাখুন</short>
 	<long>পছন্দসই বৈশিষ্ট্য স্ক্রীনের উপর রাখুন</long>
@@ -20003,6 +20663,11 @@
 	<long>Posició en pantalla de la finestra de preferències</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició en pantalla de la finestra de preferències</short>
+	<long>Posició en pantalla de la finestra de preferències</long>
+      </locale>
+
       <locale name="crh">
 	<short>Tercihler penceresiniñ ekrandaki mevamı</short>
 	<long>Tercihler penceresiniñ ekrandaki mevamı</long>
@@ -20344,6 +21009,11 @@
 	<long>Размер на прозореца с настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>পছন্দসই বৈশিষ্ট্যের উইন্ডোর মাপ</short>
+	<long>পছন্দসই বৈশিষ্ট্যের উইন্ডোর মাপ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পছন্দসই বৈশিষ্ট্যের উইন্ডোর মাপ</short>
 	<long>পছন্দসই বৈশিষ্ট্যের উইন্ডোর মাপ</long>
@@ -20359,6 +21029,11 @@
 	<long>Mida de la finestra de preferències</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida de la finestra de preferències</short>
+	<long>Mida de la finestra de preferències</long>
+      </locale>
+
       <locale name="crh">
 	<short>Tercihler penceresiniñ ölçüsi</short>
 	<long>Tercihler penceresiniñ ölçüsi</long>
@@ -20705,6 +21380,11 @@
 	<long>Позицията на екрана на прозореца за настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>পছন্দসই বৈশিষ্ট্য স্ক্রীনের উপর রাখুন</short>
+	<long>পছন্দসই বৈশিষ্ট্য স্ক্রীনের উপর রাখুন</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পছন্দসই বৈশিষ্ট্য স্ক্রীনের উপর রাখুন</short>
 	<long>পছন্দসই বৈশিষ্ট্য স্ক্রীনের উপর রাখুন</long>
@@ -20720,6 +21400,11 @@
 	<long>Posició en pantalla de la finestra de preferències</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició en pantalla de la finestra de preferències</short>
+	<long>Posició en pantalla de la finestra de preferències</long>
+      </locale>
+
       <locale name="crh">
 	<short>Tercihler penceresiniñ ekrandaki mevamı</short>
 	<long>Tercihler penceresiniñ ekrandaki mevamı</long>
@@ -21061,6 +21746,11 @@
 	<long>Размер на прозореца с настройките</long>
       </locale>
 
+      <locale name="bn">
+	<short>পছন্দসই বৈশিষ্ট্যের উইন্ডোর মাপ</short>
+	<long>পছন্দসই বৈশিষ্ট্যের উইন্ডোর মাপ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পছন্দসই বৈশিষ্ট্যের উইন্ডোর মাপ</short>
 	<long>পছন্দসই বৈশিষ্ট্যের উইন্ডোর মাপ</long>
@@ -21076,6 +21766,11 @@
 	<long>Mida de la finestra de preferències</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida de la finestra de preferències</short>
+	<long>Mida de la finestra de preferències</long>
+      </locale>
+
       <locale name="crh">
 	<short>Tercihler penceresiniñ ölçüsi</short>
 	<long>Tercihler penceresiniñ ölçüsi</long>
@@ -21417,6 +22112,11 @@
 	<long>Този ключ изключва видео ускорението чрез DirectX (под Уиндоус) и XVideo (под Линукс)</long>
       </locale>
 
+      <locale name="bn">
+	<short>ভিডিও হার্ডওয়ার অ্যাক্সিলারেশন নিষ্ক্রয় করুন</short>
+	<long>এই কি-র ফলে, DirectX (win32-র ক্ষেত্রে) ও XVideo (Linux-র ক্ষেত্রে) ভিডিও হার্ডওয়্যার গতিবর্ধন ব্যবস্থা নিষ্ক্রিয় করা হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ভিডিও হার্ডওয়ের অ্যাক্সিলারেশন নিষ্ক্রয় করুন</short>
 	<long>এই কি-র ফলে, DirectX (win32-র ক্ষেত্রে) ও XVideo (Linux-র ক্ষেত্রে) ভিডিও হার্ডওয়্যার গতিবর্ধন ব্যবস্থা নিষ্ক্রিয় করা হবে</long>
@@ -21427,6 +22127,11 @@
 	<long>Aquesta clau inhabilita l&apos;acceleració per maquinari del DirectX (al win32) i de l&apos;XVideo (al Linux)</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Inhabilita l&apos;acceleració del vídeo per maquinari</short>
+	<long>Esta clau inhabilita l&apos;acceleració per maquinari del DirectX (al win32) i de l&apos;XVideo (al Linux)</long>
+      </locale>
+
       <locale name="crh">
 	<short>Video donanımı tezleşmesini ğayrı qabilleştir</short>
 	<long>Bu anahtar, DirectX (win32 üzerinde) ve XVideo (Linux üzerinde) video donanım tezleşmesini ğayrı qabilleştirir</long>
@@ -21499,7 +22204,7 @@
 
       <locale name="hi">
 	<short>वीडियो हार्डवेयर त्वरण निष्क्रिय करें</short>
-	
+	<long>यह कुंजी DirectX (win32 पर) और XVideo (Linux पर) वीडियो हार्डवेयर त्वरण को निष्क्रिय करता है</long>
       </locale>
 
       <locale name="hu">
@@ -21529,7 +22234,7 @@
 
       <locale name="lt">
 	<short>Išjungti vaizdo aparatinės įrangos spartinimą</short>
-	
+	<long>Ši nuostata išjungia aparatinį vaizdo spartinimą „DirectX“ („Windows“ platformose) ir „XVideo“ („Linux“ platformose) priemonėmis</long>
       </locale>
 
       <locale name="ml">
@@ -21602,6 +22307,16 @@
 	<long>Ky opsion çaktivizon përshpejtimin hardware video DirectX (në win32) dhe XVideo (në Linux)</long>
       </locale>
 
+      <locale name="sr">
+	<short>Онемогући хардверско убрзавање за видео</short>
+	<long>Овај кључ онемогућава DirectX (на win32) и ИксВидео (на Линуксу) хардверско убрзање видеа</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Onemogući hardversko ubrzavanje za video</short>
+	<long>Ovaj ključ onemogućava DirectX (na win32) i IksVideo (na Linuksu) hardversko ubrzanje videa</long>
+      </locale>
+
       <locale name="sv">
 	<short>Inaktivera accelerering av videohårdvara</short>
 	<long>Den här nyckeln inaktiverar DirectX-accelering (på win32) och XVideo (på Linux) för videohårdvara</long>
@@ -21678,6 +22393,11 @@
 	<long>Разрешаване на Ekiga да ползва софтуерно мащабиране при кадър в кадъра, ако не е налично хардуерно мащабиране. Ако това е лъжа, то Ekiga няма да се опитва да отвори кадър в кадъра, когато няма хардуерна поддръжка.</long>
       </locale>
 
+      <locale name="bn">
+	<short>picture-in-picture সফ্টওয়ার স্কেলিং এ অনুমতি দিন</short>
+	<long>হার্ডওয়্যার দ্বারা সমর্থন বিদ্যমান না থাকলে, ছবির-মধ্যে-ছবির মাপ নির্ধারণের জন্য Ekiga দ্বারা সফ্টওয়্যার প্রয়োগ করা হবে। এই বৈশিষ্ট্যের মান সত্য নয় নির্ধারিত হলে, হার্ডওয়্যার সমর্থন ছাড়া Ekiga দ্বারা PIP আরম্ভের প্রচেষ্টা করা হবে না।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>picture-in-picture software scaling ৰ অনুমতি দিয়ক</short>
 	<long>হার্ডওয়্যার দ্বারা সমর্থন উপলব্ধ না থাকলে, ছবির-মধ্যে-ছবির মাপ নির্ধারণের জন্য Ekiga দ্বারা সফ্টওয়্যার প্রয়োগ করা হবে। এই বৈশিষ্ট্যের মান false (সত্য নয়) নির্ধারিত হলে, হার্ডওয়্যার সমর্থন বিনা Ekiga দ্বারা PIP আরম্ভের প্রচেষ্টা করা হবে না।</long>
@@ -21688,6 +22408,11 @@
 	<long>Permet que l&apos;Ekiga utilitzi l&apos;escalat per programari per a la imatge-en-imatge com a última alternativa en cas que no estigui implementat per maquinari. Si ho establiu com a fals, l&apos;Ekiga no intentarà obrir la PIP (imatge-en-imatge) si no està implementat per maquinari.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Permet l&apos;escalat per programari de la imatge-en-imatge</short>
+	<long>Permet que l&apos;Ekiga utilitze l&apos;escalat per programari per a la imatge-en-imatge com a última alternativa en cas que no estiga implementat per maquinari. Si ho establiu com a fals, l&apos;Ekiga no intentarà obrir la PIP (imatge-en-imatge) si no està implementat per maquinari.</long>
+      </locale>
+
       <locale name="crh">
 	<short>Resim-içinde-resim yazılım miqyaslamasına izin ber</short>
 	<long>Donanım destegi mevcut degil ise, Ekiga&apos;ğa resim-içinde-resim içün yazılım miqyaslamasına keri tüşmege izin ber. Eger bu yañlışqa tesbitli ise, donanım destegi faydalanılışlı olmağanda Ekiga RİR&apos;ni (PIP&apos;ni) açmağa talpınmaycaq.</long>
@@ -21753,6 +22478,11 @@
 	<long>Allow Ekiga to fall back to software scaling the picture-in-picture if hardware support is not available. If this is set to false, Ekiga will not try to open the PIP if hardware support is not available.</long>
       </locale>
 
+      <locale name="hi">
+	<short>तस्वीर के अंदर तस्वीर सॉफ़्टवेयर अनुमापन स्वीकारें</short>
+	<long>एकिगा को सॉफ्टवेयर अनुमापन तस्वीर में तस्वीर की ओर ले जाता है यदि हार्डवेयर समर्थन उपलब्ध नहीं है. यदि इसे गलत पर सेट किया जाता है, एकिगा खोलने की कोशिश नहीं करेगा PIP को यदि हार्डवेयर समर्थन अनुपलब्ध है.</long>
+      </locale>
+
       <locale name="hu">
 	<short>A képben kép szoftveres méretezésének engedélyezése</short>
 	<long>Az Ekiga visszatérhet a képben kép szoftveres átméretezésére, ha a hardveres támogatás nem áll rendelkezésre. Ha ez hamis, akkor az Ekiga nem próbál képben képet nyitni, ha a hardveres támogatás nem áll rendelkezésre.</long>
@@ -21780,7 +22510,7 @@
 
       <locale name="ml">
 	<short>picture-in-picture സോഫ്റ്റ്‌വെയര്‍ സ്കെയിലിങ് അനുവദിക്കുക</short>
-	
+	<long>Allow Ekiga to fall back to software scaling the picture-in-picture if hardware support is not available. false അല്ലെങ്കില്‍, ഹാര്‍ഡ്‌വെയര്‍ പിന്തുണ ലഭ്യമാകാത്തപ്പോള്‍, എകീഗാ PIP തുറക്കുവാന്‍ ശ്രമിക്കുകയില്ല.</long>
       </locale>
 
       <locale name="mr">
@@ -21843,6 +22573,16 @@
 	<long>Lejon Ekiga të përdorë shkallëzimin software figurë-në-figurë nëse mungon suporti hardware. Nëse është caktuar në &quot;false&quot;, Ekiga nuk do të përpiqet të hapë PIP nëse mungon suporti hardware.</long>
       </locale>
 
+      <locale name="sr">
+	<short>Дозволи програмско увећање слике-у-слици</short>
+	<long>Дозвољава Екиги да користи програмско повећавање и смањивање слике-у-слици уколико не постоји хардверска подршка. Уколико поставите на „false“, Екига неће користити програмско повећање чак и кад не постоји хардверска подршка.</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Dozvoli programsko uvećanje slike-u-slici</short>
+	<long>Dozvoljava Ekigi da koristi programsko povećavanje i smanjivanje slike-u-slici ukoliko ne postoji hardverska podrška. Ukoliko postavite na „false“, Ekiga neće koristiti programsko povećanje čak i kad ne postoji hardverska podrška.</long>
+      </locale>
+
       <locale name="sv">
 	<short>Tillåt programvaruskalning för bild-i-bild</short>
 	<long>Tillåt Ekiga att falla tillbaka på programvaruskalning av bild-i-bild om hårdvarustöd inte finns tillgängligt. Om denna är inställd till falskt kommer Ekiga inte att försöka att öppna Bild-i-Bild om hårdvarustöd inte finns tillgängligt.</long>
@@ -21919,6 +22659,11 @@
 	<long>Указване на алгоритъма за мащабиране: 0 — най-близък съсед, 1 — най-близък съсед с филтър по кутия, 2 — билинейно филтриране, 3 — хиперболично филтриране. Не се отнася за системите под Уиндоус.</long>
       </locale>
 
+      <locale name="bn">
+	<short>সফ্টওয়ার স্কেলিং-এর অ্যালগরিদম নির্ধারন করুন</short>
+	<long>ছবির মাপ পরিবর্তনের জন্য অ্যালগোরিদম নির্ধারণ করুন: ০: nearest neighbor, ১: nearest neighbor with box filter , ২: bilinear filtering , ৩: hyperbolic filtering। windows সিস্টেমের ক্ষেত্রে প্রযোজ্য নয়।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>সফ্টওয়ের স্কেলিং-এর অ্যাল্গোরিদম নির্ধারন করুন</short>
 	<long>ছবির মাপ পরিবর্তনের জন্য অ্যালগোরিদম নির্ধারণ করুন: 0: nearest neighbor (নিয়ারেস্ট নেইবর), 1: nearest neighbor with box filter (নিয়ারেস্ট নেইবর উইথ বক্স ফিল্টার), 2: bilinear filtering (বাই-লিনিয়ার ফিল্টারিং), 3: hyperbolic filtering (হাইপারবোলিক ফিল্টারিং)। windows সিস্টেমের ক্ষেত্রে প্রযোজ্য নয়।</long>
@@ -21929,6 +22674,11 @@
 	<long>Especifiqueu l&apos;algorisme d&apos;escalat per programari: 0: veí més proper, 1: veí més proper amb un filtre de caixa, 2: filtrat bilineal, 3: filtrat hiperbòlic. No és aplicable als sistemes Windows.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Especifiqueu l&apos;algorisme d&apos;escalat per programari</short>
+	<long>Especifiqueu l&apos;algorisme d&apos;escalat per programari: 0: veí més proper, 1: veí més proper amb un filtre de caixa, 2: filtrat bilineal, 3: filtrat hiperbòlic. No és aplicable als sistemes Windows.</long>
+      </locale>
+
       <locale name="crh">
 	<short>Yazılım miqyaslaması algoritmini belirtiñiz</short>
 	<long>Yazılım miqyaslaması algoritmini belirtiñiz: 0: eñ yaqın qomşu, 1: qutu süzgüçi ile eñ yaqın qomşu, 2: eki-hizalı süzgüçleme, 3: hiperbolik süzgüçleme. Windows sistemlerinde uyğulanmaz.</long>
@@ -21994,6 +22744,11 @@
 	<long>Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. Does not apply on windows systems.</long>
       </locale>
 
+      <locale name="hi">
+	<short>सॉफ्टवेयर अनुमापन अलगोरिथम निर्दिष्ट करें</short>
+	<long>सॉफ्टवेयर अनुमापन अलगोरिथम निर्दिष्ट करें: 0: nearest neighbor, 1: nearest neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. किसी विंडोज तंत्र पर मत लागू करें.</long>
+      </locale>
+
       <locale name="hu">
 	<short>Adja meg a szoftveres méretezési algoritmust</short>
 	<long>Adja meg a szoftveres méretezési algoritmust: 0: legközelebbi szomszéd, 1: legközelebbi szomszéd négyzetszűrővel, 2: bilineáris szűrés, 3: hiperbolikus szűrés. Nem érvényes Windows rendszereken.</long>
@@ -22020,6 +22775,11 @@
 	<long>소프트웨어 스케일링 알고리즘을 지정합니다: 0: 이웃 화소 보간법 (nearest neighbor), 1: 이웃 화소 보간법과 박스 필터링 사용 (nearest neighbor with box filter), 2: 양선형 (bilinear filtering), 3: 쌍곡선 (hyperbolic filtering). 윈도우즈 시스템에서는 관계없습니다.</long>
       </locale>
 
+      <locale name="lt">
+	<short>Programinis vaizdo mastelio keitimo algoritmas</short>
+	<long>Pasirinkite programinį algoritmą vaizdo masteliui keisti: 0 – artimiausias kaimynas, 1 – artimiausias kaimynas naudojant „dėžutės“ filtrą, 2 – dviejų tiesių (bilinear) filtras, 3 – hiperbolinis filtras. Ši nuostata nesvarbi „Windows“ platformose.</long>
+      </locale>
+
       <locale name="ml">
 	<short>സോഫ്റ്റ്‌വെയര്‍ സ്കെയിലിങ് ആല്‍ഗോരിഥം വ്യക്തമാക്കുക</short>
 	<long>സോഫ്റ്റ്‌വെയര്‍ സ്കെയിലിങ് ആല്‍ഗോരിഥം വ്യക്തമാക്കുക: 0: nearest neighbor, 1: nearest neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. വിന്‍ഡോസ് സിസ്റ്റമുകളില്‍ ഇതു് നല്‍കരുതു്.</long>
@@ -22090,6 +22850,16 @@
 	<long>Specifikon algoritmin e shkallëzimit software: 0: fqinj i afërt, 1: fqinj i afërt me kutizë filtrimi, 2: filtrim bilinear, 3: filtrim hiperbolik. Nuk aplikohet në sistemet windows.</long>
       </locale>
 
+      <locale name="sr">
+	<short>Одаберите алгоритам за програмско повећање слике</short>
+	<long>Изверите алгоритам за програмско повећавање или смањивање слике: 0: најближи сусед, 1: најближи сусед са филтером кутије, 2: билинеарно филтрирање, 3: хиперболично филтрирање. Не користи се на Windows системима.</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Odaberite algoritam za programsko povećanje slike</short>
+	<long>Izverite algoritam za programsko povećavanje ili smanjivanje slike: 0: najbliži sused, 1: najbliži sused sa filterom kutije, 2: bilinearno filtriranje, 3: hiperbolično filtriranje. Ne koristi se na Windows sistemima.</long>
+      </locale>
+
       <locale name="sv">
 	<short>Ange algoritm för programvaruskalning</short>
 	<long>Ange algoritm för programvaruskalning: 0: närmsta granne, 1: närmsta granne med rutfilter, 2: bilinjär filtrering, 3: hyperbolisk filtrering. Gäller inte för Windows-system.</long>
@@ -22183,7 +22953,7 @@
 
       <locale name="bn">
 	<short>ছোট/বড় করে দেখানোর মাত্রা</short>
-	
+	<long>প্রধান GUI-র মধ্যে প্রদর্শিত ছবির মাপ, শতাংশে ধার্য (যেমন ৫০, ১০০, অথবা ২০০)</long>
       </locale>
 
       <locale name="bn_IN">
@@ -22201,6 +22971,11 @@
 	<long>El percentatge d&apos;augment que s&apos;aplicarà per a les imatges mostrades a la interfície principal (pot ser 50, 100 o 200)</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>El valor del zoom</short>
+	<long>El percentatge d&apos;augment que s&apos;aplicarà per a les imatges mostrades a la interfície principal (pot ser 50, 100 o 200)</long>
+      </locale>
+
       <locale name="crh">
 	<short>Miqyaslama qıymeti</short>
 	<long>Baş qullanıcı arayüzünde kösterilgen suretlerge uyğulanacaq miqyas qıymeti (50, 100, ya da 200 ola bilir)</long>
@@ -22298,7 +23073,7 @@
 
       <locale name="hi">
 	<short>ज़ूम मान</short>
-	
+	<long>मुख्य GUI में दिखाई गई छवि को लागू करने के लिए प्रतिशत ज़ूम मान  (50, 100, या 200 हो सकता है)</long>
       </locale>
 
       <locale name="hr">
@@ -22343,7 +23118,7 @@
 
       <locale name="lt">
 	<short>Mastelio reikšmė</short>
-	
+	<long>Mastelis naudojamas atvaizduojant paveikslėlius pagrindiniame lange (gali būti 50, 100 arba 200)</long>
       </locale>
 
       <locale name="lv">
@@ -22363,7 +23138,7 @@
 
       <locale name="ml">
 	<short>സൂം ചെയ്യുന്ന മൂല്ല്യം</short>
-	
+	<long>The zoom value in percent to apply to images displayed in the main GUI (can be 50, 100, or 200)</long>
       </locale>
 
       <locale name="mn">
@@ -22453,12 +23228,12 @@
 
       <locale name="sr">
 	<short>Вредност увећања</short>
-	
+	<long>Вредност увећања слика које се приказују у главном прозору (може бити 50, 100 или 200)</long>
       </locale>
 
       <locale name="sr@latin">
 	<short>Vrednost uvećanja</short>
-	
+	<long>Vrednost uvećanja slika koje se prikazuju u glavnom prozoru (može biti 50, 100 ili 200)</long>
       </locale>
 
       <locale name="sv">
@@ -22547,6 +23322,11 @@
 	<long>Прозорците с видео картината да са над всички останали по време на обаждания</long>
       </locale>
 
+      <locale name="bn">
+	<short>কল চলাকালে, ভিডিওর উইন্ডোগুলো অন্যান্য উইন্ডোর উপরে প্রদর্শন করা হবে</short>
+	<long>কল চলাকালে, ভিডিওর উইন্ডোগুলো অন্যান্য উইন্ডোর উপরে প্রদর্শন করা হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>কল চলাকালে, ভিডিওর উইন্ডোগুলি অন্যান্য উইন্ডোর উপরে প্রদর্শন করা হবে</short>
 	<long>কল চলাকালে, ভিডিওর উইন্ডোগুলি অন্যান্য উইন্ডোর উপরে প্রদর্শন করা হবে</long>
@@ -22562,6 +23342,11 @@
 	<long>Disposa les finestres que mostrin vídeo per sobre de les altres finestres durant una trucada</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Disposa les finestres que mostren vídeo per sobre de les altres finestres durant una trucada</short>
+	<long>Disposa les finestres que mostren vídeo per sobre de les altres finestres durant una trucada</long>
+      </locale>
+
       <locale name="crh">
 	<short>Aramalar esnasında video köstergen pencerelerni diger pencerelerniñ üstünde yerleştir</short>
 	<long>Aramalar esnasında video köstergen pencerelerni diger pencerelerniñ üstünde yerleştir</long>
@@ -22722,6 +23507,11 @@
 	<long>Постави го прозорецот што прикажува видео пред останатите прозорци за време на повици</long>
       </locale>
 
+      <locale name="ml">
+	<short>കോളുകള്‍ക്കിടയില്‍ മറ്റു് ജാലകങ്ങളില്‍ വീഡിയോ പ്രദര്‍ശിപ്പിക്കുന്ന ജാലകങ്ങള്‍ സ്ഥാപിക്കുക</short>
+	<long>കോളുകള്‍ക്കിടയില്‍ മറ്റു് ജാലകങ്ങളില്‍ വീഡിയോ പ്രദര്‍ശിപ്പിക്കുന്ന ജാലകങ്ങള്‍ സ്ഥാപിക്കുക</long>
+      </locale>
+
       <locale name="mn">
 	<short>Дуудлагын үед дээрх цонхноос бусад гарч байгаа видео цонхуудыг байрлуул.</short>
 	<long>Дуудлагын үед дээрх цонхноос бусад гарч байгаа видео цонхуудыг байрлуул.</long>
@@ -22910,7 +23700,7 @@
 
       <locale name="bn">
 	<short>ডিফল্ট ভিডিও দর্শনের ধরণ</short>
-	
+	<long>ডিফল্ট ভিডিও দর্শনের ধরণ (০: স্থানীয়, ১: দূরবর্তী, ২: দুটিই ইনক্রাস্টেড, ৩: দুটিই তবে স্থানীয় ভিডিও আলাদা উইন্ডোতে, ৪: দুটিই)</long>
       </locale>
 
       <locale name="bn_IN">
@@ -22928,6 +23718,11 @@
 	<long>La visualització de vídeo predeterminada (0: Local, 1: Remota, 2: Ambdues en capes, 3: Ambdues, amb el vídeo local en una finestra separada, 4: Ambdues)</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>La visualització de vídeo predeterminada</short>
+	<long>La visualització de vídeo predeterminada (0: Local, 1: Remota, 2: Ambdues en capes, 3: Ambdues, amb el vídeo local en una finestra separada, 4: Ambdues)</long>
+      </locale>
+
       <locale name="crh">
 	<short>Ög-belgilengen video körünimi</short>
 	<long>Ög-belgilengen video körünimi (0: Yerli, 1: Uzaqtan, 2: Ekisi de qatlamlı, 3: Yerli video ayrı bir pencerede olıp ekisi de, 4: Ekisi de)</long>
@@ -23025,7 +23820,7 @@
 
       <locale name="hi">
 	<short>मूलभूत वीडियो दृश्य</short>
-	
+	<long>तयशुदा वीडियो दृश्य (0: Local, 1: Remote, 2: Both layered, 3: Both with local video in a separate window, 4: Both)</long>
       </locale>
 
       <locale name="hr">
@@ -23180,12 +23975,12 @@
 
       <locale name="sr">
 	<short>Почетни приказ слике</short>
-	
+	<long>Подразумевани приказ слике (0: локални, 1: удаљени, 2: оба пресвучена, 3: оба са локалном сликом у посебном прозору, 4: оба)</long>
       </locale>
 
       <locale name="sr@latin">
 	<short>Početni prikaz slike</short>
-	
+	<long>Podrazumevani prikaz slike (0: lokalni, 1: udaljeni, 2: oba presvučena, 3: oba sa lokalnom slikom u posebnom prozoru, 4: oba)</long>
       </locale>
 
       <locale name="sv">
@@ -23274,6 +24069,11 @@
 	<long>Видео изгледът преди превключване на цял екран (същите възможни стойности като ключа „video_view“)</long>
       </locale>
 
+      <locale name="bn">
+	<short>পূর্ণ পর্দা জুড়ে প্রদর্শনের পূর্বে ভিডিও প্রদর্শনের ক্ষেত্র</short>
+	<long>পূর্ণ পর্দা জুড়ে প্রদর্শনের পূর্বে ভিডিও প্রদর্শনের ক্ষেত্র (video_view-র সমান মাপ)</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>পূর্ণ পর্দা জুড়ে প্রদর্শনের পূর্বে ভিডিও প্রদর্শনের ক্ষেত্র</short>
 	<long>পূর্ণ পর্দা জুড়ে প্রদর্শনের পূর্বে ভিডিও প্রদর্শনের ক্ষেত্র (video_view-র সমান মাপ)</long>
@@ -23284,6 +24084,11 @@
 	<long>La vista de vídeo abans d&apos;haver commutat a la visualització de pantalla completa (s&apos;hi permeten els mateixos valors que a video_view)</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>La vista del vídeo abans d&apos;haver commutat a pantalla completa</short>
+	<long>La vista de vídeo abans d&apos;haver commutat a la visualització de pantalla completa (s&apos;hi permeten els mateixos valors que a video_view)</long>
+      </locale>
+
       <locale name="crh">
 	<short>Tam ekranğa almaşmadan evelki video körünimi</short>
 	<long>Tam ekranğa almaşmadan evelki video körünimi (video_view ile aynı qıymetler)</long>
@@ -23349,6 +24154,11 @@
 	<long>The video view before having switched to fullscreen (same values as video_view)</long>
       </locale>
 
+      <locale name="hi">
+	<short>विडियो दृश्य पूर्णस्क्रीन में जाने से पहले</short>
+	<long>विडियो दृश्य पूर्णस्क्रीन में जाने से पहले (video_view के समान मान)</long>
+      </locale>
+
       <locale name="hu">
 	<short>A videonézet a teljes képernyőre váltás előtt</short>
 	<long>A videonézet a teljes képernyőre váltás előtt (ugyanazon értékek, mint a video_view kulcsnál)</long>
@@ -23374,6 +24184,11 @@
 	<long>전체 화면으로 전환하기 전의 비디오 보기 (video_view와 같은 값)</long>
       </locale>
 
+      <locale name="lt">
+	<short>Vaizdas prieš įjungiant pilno ekrano veikseną</short>
+	<long>Vaizdas prieš įjungiant pilno ekrano veikseną (reikšmė ta pati kaip ir video_view)</long>
+      </locale>
+
       <locale name="ml">
 	<short>സ്ക്രീന്റെ വലുപ്പത്തില്‍ ആക്കുന്നതിന് മുമ്പുള്ള വീഡിയോ കാഴ്ച</short>
 	<long>സ്ക്രീന്റെ വലുപ്പത്തില്‍ ആക്കുന്നതിന് മുമ്പുള്ള വീഡിയോ കാഴ്ച (വീഡിയോ കാഴ്ചയുടെ‌ അതേ മൂല്ല്യം)</long>
@@ -23434,6 +24249,16 @@
 	<long>Shfaqja e video-s para se të kalohet në modalitet me ekran të plotë (të njëjtat vlera sikurse video_view)</long>
       </locale>
 
+      <locale name="sr">
+	<short>Ширина слике пре пребацивања на цео екран</short>
+	<long>Ширина слике пре пребацивања на цео екран (иста вредност као video_view)</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Širina slike pre prebacivanja na ceo ekran</short>
+	<long>Širina slike pre prebacivanja na ceo ekran (ista vrednost kao video_view)</long>
+      </locale>
+
       <locale name="sv">
 	<short>Videovyn innan växling till helskärmsläge</short>
 	<long>Videovyn innan växling till helskärmsläge (samma värden som video_view)</long>
@@ -23515,6 +24340,11 @@
 	<long>Размерът на прозореца за локалния видео сигнал</long>
       </locale>
 
+      <locale name="bn">
+	<short>স্থানীয় ভিডিও প্রদর্শনের জন্য উইন্ডো মাপ</short>
+	<long>স্থানীয় ভিডিও উইন্ডোর মাপ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>স্থানীয় ভিডিও প্রদর্শনের জন্য উইন্ডো মাপ</short>
 	<long>স্থানীয় ভিডিও উইন্ডোর মাপ</long>
@@ -23530,6 +24360,11 @@
 	<long>La mida de la finestra del vídeo local</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida de la finestra del vídeo local</short>
+	<long>La mida de la finestra del vídeo local</long>
+      </locale>
+
       <locale name="crh">
 	<short>Yerli video penceresi ölçüsi</short>
 	<long>Yerli video penceresiniñ ölçüsi</long>
@@ -23876,6 +24711,11 @@
 	<long>Позицията на прозореца за локалната видео картина</long>
       </locale>
 
+      <locale name="bn">
+	<short>স্থানীয় ভিডিও উইন্ডোর অবস্থান</short>
+	<long>স্থানীয় ভিডিও উইন্ডোর অবস্থান</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>স্থানীয় ভিডিও উইন্ডোর অবস্থান</short>
 	<long>স্থানীয় ভিডিও উইন্ডোর অবস্থান</long>
@@ -23891,6 +24731,11 @@
 	<long>La posició de la finestra del vídeo local</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició de la finestra del vídeo local</short>
+	<long>La posició de la finestra del vídeo local</long>
+      </locale>
+
       <locale name="crh">
 	<short>Yerli video penceresiniñ mevamı</short>
 	<long>Yerli video penceresiniñ mevamı</long>
@@ -24237,6 +25082,11 @@
 	<long>Размерът на прозореца за отдалечената видео картина</long>
       </locale>
 
+      <locale name="bn">
+	<short>দূরবর্তী ভিডিও উইন্ডোর মাপ</short>
+	<long>দূরবর্তী ভিডিও উইন্ডোর মাপ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>দূরবর্তী ভিডিও উইন্ডোর মাপ</short>
 	<long>দূরবর্তী ভিডিও উইন্ডোর মাপ</long>
@@ -24252,6 +25102,11 @@
 	<long>La mida de la finestra del vídeo remot</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mida de la finestra del vídeo remot</short>
+	<long>La mida de la finestra del vídeo remot</long>
+      </locale>
+
       <locale name="crh">
 	<short>Uzaqtan video penceresiniñ ölçüsi</short>
 	<long>Uzaqtan video penceresiniñ ölçüsi</long>
@@ -24598,6 +25453,11 @@
 	<long>Позицията на прозореца за отдалечената видео картина</long>
       </locale>
 
+      <locale name="bn">
+	<short>দূরবর্তী ভিডিও উইন্ডোর অবস্থান</short>
+	<long>দূরবর্তী ভিডিও উইন্ডোর অবস্থান</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>দূরবর্তী ভিডিও উইন্ডোর অবস্থান</short>
 	<long>দূরবর্তী ভিডিও উইন্ডোর অবস্থান</long>
@@ -24613,6 +25473,11 @@
 	<long>La posició de la finestra del vídeo remot</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Posició de la finestra del vídeo remot</short>
+	<long>La posició de la finestra del vídeo remot</long>
+      </locale>
+
       <locale name="crh">
 	<short>Uzaqtan video penceresiniñ mevamı</short>
 	<long>Uzaqtan video penceresiniñ mevamı</long>
@@ -24966,7 +25831,7 @@
 
       <locale name="bn">
 	<short>সর্বাধিক জিট্টার বাফার</short>
-	
+	<long>অডিও গ্রহণের উদ্দেশ্যে jitter বাফারের সর্বাধিক মাপ (মিলিসেকেন্ডে ধার্য)</long>
       </locale>
 
       <locale name="bn_IN">
@@ -24984,6 +25849,11 @@
 	<long>El valor màxim de la memòria intermèdia per al jitter en la recepció d&apos;àudio (en ms)</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Memòria intermèdia màxima per al jitter</short>
+	<long>El valor màxim de la memòria intermèdia per al jitter en la recepció d&apos;àudio (en ms)</long>
+      </locale>
+
       <locale name="crh">
 	<short>Azamiy titreme bufferi</short>
 	<long>Davuş qabulı içün azamiy titreme bufferi ölçüsi (ms cınsından)</long>
@@ -25146,7 +26016,7 @@
 
       <locale name="ml">
 	<short>ഏറ്റവും കൂടിയ ജിറ്ററ്‍ ബഫറ്‍</short>
-	
+	<long>ഓഡിയോ റിസപ്ഷനുള്ള ഏറ്റവും കൂടിയ ജിറ്റര്‍ ബഫര്‍ വ്യാപ്തി (ms-ല്‍)</long>
       </locale>
 
       <locale name="mn">
@@ -25326,6 +26196,11 @@
 	<long>Списък със видео декодерите</long>
       </locale>
 
+      <locale name="bn">
+	<short>ভিডিও কোডেকের তালিকা</short>
+	<long>ভিডিও কোডেকের তালিকা</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>ভিডিও কোডেকের তালিকা</short>
 	<long>ভিডিও কোডেকের তালিকা</long>
@@ -25336,6 +26211,11 @@
 	<long>La llista de còdecs de vídeo</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>La llista de còdecs de vídeo</short>
+	<long>La llista de còdecs de vídeo</long>
+      </locale>
+
       <locale name="crh">
 	<short>Video Kodekleri Listesi</short>
 	<long>Video kodekleri listesi</long>
@@ -25516,6 +26396,16 @@
 	<long>Lista e kodekëve video</long>
       </locale>
 
+      <locale name="sr">
+	<short>Списак видео кодека</short>
+	<long>Списак видео кодека</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Spisak video kodeka</short>
+	<long>Spisak video kodeka</long>
+      </locale>
+
       <locale name="sv">
 	<short>Listan över videokodekar</short>
 	<long>Listan över videokodekar</long>
@@ -25592,6 +26482,11 @@
 	<long>Максимална широчина на лентата за предаваното видео в kbit/s. Качеството на видео изображенията и честотата на предаваните кадри ще бъде автоматично регулирана по време на обажданията, за да се минимизира широчината на ползваната лента до указаната стойност, без да се преминава под минимума (това зависи от използвания кодер)</long>
       </locale>
 
+      <locale name="bn">
+	<short>TX ভিডিওর সর্বাধিক বিটের মাত্রা</short>
+	<long>কিলোবাইট/সেকেন্ডে ধার্য TX ভিডিওর সর্বাধিক বিটের হার। কল চলাকালীন ব্যান্ডউইর্থের সুনির্দিষ্ট মান বজায় রাখার জন্য ভিডিও গুনমান ও প্রতি সেকেন্ডে পরিবাহিত ফ্রেমের সংখ্যাগুলি তৎক্ষনাৎ পরিবর্তন করা হবে (নির্বাচিত কোডেকের উপর নির্ভরশীল) ও সর্বনিম্ন পরিমাণের চেয়ে বেশি মাপে ধার্য করা হবে।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>TX ভিডিওর সর্বাধিক বিটের মাত্রা</short>
 	<long>কিলোবাইট/সেকেন্ডে ধার্য TX ভিডিওর সর্বাধিক বিটের হার। কল চলাকালীন ব্যান্ডউইর্থের সুনির্দিষ্ট মান বজায় রাখার জন্য ভিডিও গুনমান ও প্রতি সেকেন্ডে পরিবাহিত ফ্রেমের সংখ্যাগুলি তৎক্ষনাৎ পরিবর্তন করা হবে (নির্বাচিত কোডেকের উপর নির্ভরশীল) ও সর্বনিম্ন পরিমাণের চেয়ে বেশি মাপে ধার্য করা হবে।</long>
@@ -25602,6 +26497,11 @@
 	<long>La taxa de bits per a la transmissió de vídeo en kbits/s. La qualitat del vídeo i el nombre de quadres per segon transmesos (depenent del còdec utilitzat) s&apos;ajustaran automàticament per sobre del seu mínim durant les trucades. D&apos;aquesta manera, s&apos;intentarà minimitzar l&apos;amplada de banda al valor que indiqueu aquí</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Taxa de bits màxima per a la transmissió del vídeo</short>
+	<long>La taxa de bits per a la transmissió de vídeo en kbits/s. La qualitat del vídeo i el nombre de quadres per segon transmesos (depenent del còdec utilitzat) s&apos;ajustaran automàticament per sobre del seu mínim durant les trucades. D&apos;esta manera, s&apos;intentarà minimitzar l&apos;amplada de banda al valor que indiqueu ací</long>
+      </locale>
+
       <locale name="crh">
 	<short>Naqil etilgen videonıñ azamiy bit-nisbeti</short>
 	<long>Naqil etilgen videonıñ kbit/saniye olaraq azamiy bit-nisbeti. Video keyfiyeti ve saniye başına naqil etilgen çerçive sayısı (saylanğan kodekke bağlı), quşaq-kenişligini berilgen qıymetke asğariyleştirmege talpınmaq içün aramalar esnasında dinamik olaraq asğariyleriniñ üzerine tadil etilecek</long>
@@ -25674,7 +26574,7 @@
 
       <locale name="hi">
 	<short>अधिकतम TX वीडियो विट्रेट</short>
-	
+	<long>अधिकतम TX वीडियो बिटरेट kbit/s में. वीडियो गुणवत्ता और प्रेषित ढ़ांचा प्रति सेकेंड की संख्या (जो कि चुने गए codec) को गतिशील रूप से समायोजित किया जाएगा उसके न्यूनतम में कॉल के दौरान बैंडविड्थ को दिए मान में बचाने के लिए</long>
       </locale>
 
       <locale name="hu">
@@ -25704,12 +26604,12 @@
 
       <locale name="lt">
 	<short>Maksimalus siunčiamo vaizdo bitų dažnis</short>
-	
+	<long>Leistinas siunčiamo vaizdo srauto dydis (kb/s). Vaizdo kokybė ir perduodamų kadrų per sekundę skaičius (priklausomai nuo pasirinkto kodeko) bus automatiškai koreguojami pokalbių metu siekiant sumažinti naudojamą srautą iki nurodytos vertės</long>
       </locale>
 
       <locale name="ml">
 	<short>ഏറ്റവും കൂടിയ TX വീഡിയോയുടെ ബിറ്റ് റേറ്റ്</short>
-	
+	<long>ഏറ്റവും കൂടിയ TX വീഡിയോ ബിറ്റ്റേറ്റ് kbits/s-ല്‍. TThe video quality and the number of transmitted frames per second (depends on selected codec) will be dynamically adjusted above their minimum during calls to try to minimize the bandwidth to the given value</long>
       </locale>
 
       <locale name="mr">
@@ -25777,6 +26677,16 @@
 	<long>Maksimumi i bandës video TX në kbit/s. Cilësia e videos dhe numri i imazheve të transmetuara për sekondë (varet nga kodeku i zgjedhur) do të përshtatet në mënyrë dinamike sipër minimumit gjatë telefonatave për të minimizuar bandën tek vlera e dhënë</long>
       </locale>
 
+      <locale name="sr">
+	<short>Максимални видео проток за слање</short>
+	<long>Максимални видео проток за слање у kbit/s. Квалитет слике и број пренесених кадрова у секунди (у зависности од одабраног кодека) биће динамички прилагођени изнад њиховог минимума за време позива при покушају да се умањи проток на дату вредност</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Maksimalni video protok za slanje</short>
+	<long>Maksimalni video protok za slanje u kbit/s. Kvalitet slike i broj prenesenih kadrova u sekundi (u zavisnosti od odabranog kodeka) biće dinamički prilagođeni iznad njihovog minimuma za vreme poziva pri pokušaju da se umanji protok na datu vrednost</long>
+      </locale>
+
       <locale name="sv">
 	<short>Maximal bitfrekvens för videosändning</short>
 	<long>Den maximala bitfrekvensen för videosändning i kbit/s. Videokvaliteten och antalet överförda bildrutor per sekund (beroende på vald kodek) kommer att justeras dynamiskt över dess minimum under samtal för att försöka minimera bandbredden till det angivna värdet</long>
@@ -25853,6 +26763,11 @@
 	<long>Максимална широчина на лентата за приемане на видео в kbit/s. Тази стойност ще бъде подадена на отсрещната страна, така че при възможност тя да промени широчината на лентата на предавания поток, когато тя е по-висока от подадената стойност.</long>
       </locale>
 
+      <locale name="bn">
+	<short>RX ভিডিওর সর্বাধিক বিটের মাত্রা</short>
+	<long>কিলোবিট/সেকেন্ড অনুযায়ী সর্বাধিক RX ভিডিওর বিটের হার। সমতূল্য প্রান্তিক সমাপ্তিস্থলে এই মান প্রেরিত হবে এবং (বৈশিষ্ট্য সমর্থিত হলে) সেটির TX বিটের হার বেশি হলে তা যথাযতভাবে পরিবর্তিত হবে।</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>RX ভিডিওর সর্বাধিক বিটের মাত্রা</short>
 	<long>কিলোবিট/সেকেন্ড অনুযায়ী সর্বাধিক RX ভিডিওর বিটের হার। সমতূল্য প্রান্তিক সমাপ্তিস্থলে এই মান প্রেরিত হবে এবং (বৈশিষ্ট্য সমর্থিত হলে) সেটির TX বিটের হার বেশি হলে তা যথাযতভাবে পরিবর্তিত হবে।</long>
@@ -25863,6 +26778,11 @@
 	<long>La taxa de bits màxima per a la recepció del vídeo, en kbit/s. Aquest valor s&apos;indicarà a l&apos;extrem de l&apos;interlocutor que pugui (si ho implementa) ajustar la seva taxa de bits de transmissió en cas que sobrepassi el valor indicat.</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Taxa de bits màxima per a la recepció del vídeo</short>
+	<long>La taxa de bits màxima per a la recepció del vídeo, en kbit/s. Este valor s&apos;indicarà a l&apos;extrem de l&apos;interlocutor que puga (si ho implementa) ajustar la seua taxa de bits de transmissió en cas que sobrepasse el valor indicat.</long>
+      </locale>
+
       <locale name="crh">
 	<short>Qabul etilgen videonıñ azamiy bit-nisbeti</short>
 	<long>Qabul etilgen videonıñ kbit/saniye olaraq azamiy bit-nisbeti. Bu qıymet, naqil etilgen videonıñ bit-nisbeti signallanğan qıymetniñ üstünde ise bit-nisbetini tadil ete bilgen (destekley ise) aqran uc-noqtasına signallanacaq</long>
@@ -25935,7 +26855,7 @@
 
       <locale name="hi">
 	<short>अधिकतम RX वीडियो विट्रेट</short>
-	
+	<long>अधिकतम RX वीडियो बिटरेट kbit/s में. यह मान पीयर अंतबिंदु को संकेतित किया जाएगा जो कि (if it supports it) इसके TX बिटरेट को समायोजित करेगा यदि संकेत किए मान से ऊपर है</long>
       </locale>
 
       <locale name="hu">
@@ -25965,12 +26885,12 @@
 
       <locale name="lt">
 	<short>Maksimalus gauto vaizdo bitų dažnis</short>
-	
+	<long>Leistinas gaunamo vaizdo srauto dydis (kb/s). Ši reikšmė bus perduoda pašnekovo programai, kuri (jei šią galimybę palaiko) prireikus galės atitinkamai pakoreguoti savo siunčiamo vaizdo srauto dydį.</long>
       </locale>
 
       <locale name="ml">
 	<short>ഏറ്റവും കൂടിയ RX വീഡിയോയുടെ ബിറ്റ് റേറ്റ്</short>
-	
+	<long>ഏറ്റവും കൂടിയ RX വീഡിയോ ബിറ്റ്റേറ്റ് kbits/s-ല്‍. This value will be signaled to the peer endpoint that can adjust (if it supports it) its TX bitrate if it is above the signaled value</long>
       </locale>
 
       <locale name="mr">
@@ -26038,6 +26958,16 @@
 	<long>Bitrate maksimum për marrjen video në kbit/s. Kjo vlerë do t&apos;i kalohet palës tjetër në menyrë që të përshtasë (nëse mund ta bëjë) shpejtësinë maksimum të dërgimit nëse gjendet mbi vlerën e dhënë</long>
       </locale>
 
+      <locale name="sr">
+	<short>Максимални видео проток за примање</short>
+	<long>Максимални видео проток за примање у kbit/s. Ова вредност ће бити послата особи са којом разговарате (ако њен програм то подржава) ради подешавања видео проток за слање уколико је изнад ове вредности.</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Maksimalni video protok za primanje</short>
+	<long>Maksimalni video protok za primanje u kbit/s. Ova vrednost će biti poslata osobi sa kojom razgovarate (ako njen program to podržava) radi podešavanja video protok za slanje ukoliko je iznad ove vrednosti.</long>
+      </locale>
+
       <locale name="sv">
 	<short>Maximal bitfrekvens för videomottagning</short>
 	<long>Den maximala bitfrekvensen för mottagning av video i kbit/s. Detta värde kommer att signaleras till motparten så den justera (om stöd finns) dess bitfrekvens för sändning om det är över det signalerade värdet</long>
@@ -26114,6 +27044,11 @@
 	<long>Дали да се предпочита запазването на максималната честота на кадри или тя да си намали, за да се запази някакво минимално ниво на геометрично качество на всички кадри: 0 — най-високо минимално качество, 31 — най-ниско минимално качество</long>
       </locale>
 
+      <locale name="bn">
+	<short>অস্থায়ী বিশেষ ট্রেড অফ</short>
+	<long>ফ্রেমের সর্বাধিক হার জারি রাখা হবে নাকি সকল ফ্রেমের জন্য সর্বনিম্ন গুণমান (স্পেশিয়াল) বজায় রাখার প্রচেষ্টায় হারের মাত্রা হ্রাস করা হবে। 0: সর্বনিম্ন গুণমানের সর্বাধিক পরিমাণ, 31: সর্বনিম্ন গুণমানের সর্বনিম্ন পরিমাণ</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>টেম্পোরাল স্পেশিয়াল ট্রেড অফ</short>
 	<long>ফ্রেমের সর্বাধিক হার জারি রাখা হবে নাকি সকল ফ্রেমের জন্য সর্বনিম্ন গুণমান (স্পেশিয়াল) বজায় রাখার প্রচেষ্টায় হারের মাত্রা হ্রাস করা হবে। 0: সর্বনিম্ন গুণমানের সর্বাধিক পরিমাণ, 31: সর্বনিম্ন গুণমানের সর্বনিম্ন পরিমাণ</long>
@@ -26124,6 +27059,11 @@
 	<long>Si preferiu mantenir el nombre màxim de quadres per segon o bé disminuir-lo de manera que es mantingui un nivell mínim de qualitat (espacial) per a tots els quadres. S&apos;hi permet l&apos;interval de valors següents: 0: qualitat mínima màxima, 31: qualitat mínima mínima</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Balanç temporal/espacial</short>
+	<long>Si preferiu mantindre el nombre màxim de quadres per segon o bé disminuir-lo de manera que es mantinga un nivell mínim de qualitat (espacial) per a tots els quadres. Es permet l&apos;interval de valors següents: 0: qualitat mínima màxima, 31: qualitat mínima mínima</long>
+      </locale>
+
       <locale name="crh">
 	<short>Vaqıtlı Fezaiy Deñiş Toquş</short>
 	<long>Azamiy çerçive nisbetiniñ maişetiniñmi tercih etilecegi, yoqsa belki çerçivelerniñ episi içün asğariy bir seviyedeki (fezaiy) keyfiyetni tutmaq üzre onıñ tüşürilüviniñmi. 0: Eñ yüksek asğariy keyfiyet, 31: eñ tüşük asğariy keyfiyet</long>
@@ -26189,6 +27129,11 @@
 	<long>Whether to prefer to sustain the max. frame rate or lower it possibly in order to keep a minimum level of (spatial) quality for all frames. 0: Highest minimal quality, 31: lowest minimal quality</long>
       </locale>
 
+      <locale name="hi">
+	<short>टेंपोरल स्पासियल ट्रैड ऑफ</short>
+	<long>क्या अधिकतम फ्रेम दर को बनाए रखना या इसे कम करना है संभवतः न्यूनतम स्तर (spatial) गुणवत्ता पर सभी फ्रेम के लिए बनाए रखने के लिए. Highest minimal quality, 31: lowest minimal quality</long>
+      </locale>
+
       <locale name="hu">
 	<short>Ideiglenes térbeli kompromisszum</short>
 	<long>A maximális képkockasebesség megtartása, vagy az összes képkocka minimális (térbeli) minőségének megtartásának érdekében ez csökkenthető. 0: legnagyobb minimális minőség, 31: legkisebb minimális minőség.</long>
@@ -26211,7 +27156,17 @@
 
       <locale name="ko">
 	<short>전체 화질과 순간 화질의 트레이드 오프</short>
-	<long>프레임 전송률을 최대로 유지할 지 아니면 반대로 프레임 전송률을 낮출 지 (낮추어서 순간의 프레임별 화질을 일정 수준으로 유지할 수 있습니다) 결정합니다. 0: 가능한 높은 수준, 31: 가능한 낮은 수준.</long>
+	<long>프레임 전송률을 최대로 유지할지 아니면 반대로 프레임 전송률을 낮출지 (낮추어서 순간의 프레임별 화질을 일정 수준으로 유지할 수 있습니다) 결정합니다. 0: 가능한 높은 수준, 31: 가능한 낮은 수준.</long>
+      </locale>
+
+      <locale name="lt">
+	
+	<long>Ar norite išlaikyti maksimalų kadrų skaičių per sekundę, ar mažinti jį, prireikus minimaliai užtikrinti visų kadrų kokybę. 0 – aukščiausia minimali kokybė, 31 – žemiausia minimali kokybė</long>
+      </locale>
+
+      <locale name="ml">
+	<short>ടെംബറല്‍ സ്പേഷ്യല്‍ ട്രേഡ് ഓഫ്</short>
+	<long>Whether to prefer to sustain the max. frame rate or lower it possibly in order to keep a minimum level of (spatial) quality for all frames. 0: Highest minimal quality, 31: lowest minimal quality</long>
       </locale>
 
       <locale name="mr">
@@ -26269,6 +27224,16 @@
 	<long>Tregon nëse duhen mbajtur në maksimum frame në sekondë apo duhen ulur për të mbajtur një nivel minimum (spacior) kualiteti për të gjithë frame. 0: kualiteti më i lartë minimum, 31: kualiteti më i ulët minimum.</long>
       </locale>
 
+      <locale name="sr">
+	<short>Временско просторни однос</short>
+	<long>Да ли да се одржава максимална брзина кадрова или да се смањује због одржавања минимални ниво (просторног) квалитета свих кадрова. 0: Највећи минимални квалитет, 32: најмањи минимални квалитет</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Vremensko prostorni odnos</short>
+	<long>Da li da se održava maksimalna brzina kadrova ili da se smanjuje zbog održavanja minimalni nivo (prostornog) kvaliteta svih kadrova. 0: Najveći minimalni kvalitet, 32: najmanji minimalni kvalitet</long>
+      </locale>
+
       <locale name="sv">
 	<short>Temporär spatial kompromiss</short>
 	<long>Huruvida föredraget val är att upprätthålla maximum bildfrekvens eller att sänka den för att möjligen behålla en minimumnivå av (spatial) kvalitet för alla bildrutor. 0: Högsta minimala kvalitet, 31: lägsta minimala kvalitet</long>
@@ -26312,12 +27277,12 @@
       </locale>
 
       <locale name="zh_HK">
-	
+	<short>暫時空間替換</short>
 	<long>是否傾向維持最大幀率或是要降低它以保持所有幀最低限度的品質。0: 最低品質設為最大。31: 最低品質設為最小</long>
       </locale>
 
       <locale name="zh_TW">
-	
+	<short>暫時空間替換</short>
 	<long>是否傾向維持最大幀率或是要降低它以保持所有幀最低限度的品質。0: 最低品質設為最大。31: 最低品質設為最小</long>
       </locale>
     </schema>
@@ -26348,6 +27313,11 @@
 	
       </locale>
 
+      <locale name="bn">
+	<short>রোস্টার-এ অন্তর্ভুক্ত ফোল্ডেড গ্রুপ-এর তালিকা</short>
+	
+      </locale>
+
       <locale name="bn_IN">
 	<short>রোস্টার-এ অন্তর্ভুক্ত ফোল্ডেড গ্রুপ-এর তালিকা</short>
 	
@@ -26358,6 +27328,11 @@
 	
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Llista dels grups plegats a la llista</short>
+	
+      </locale>
+
       <locale name="crh">
 	<short>Temasnamede qatlanğan zümreler listesi</short>
 	
@@ -26423,6 +27398,11 @@
 	
       </locale>
 
+      <locale name="hi">
+	<short>रोस्टर में फोल्ड किया समूह की सूची</short>
+	
+      </locale>
+
       <locale name="hu">
 	<short>A partnerlista összecsukott csoportjainak listája</short>
 	
@@ -26518,6 +27498,16 @@
 	
       </locale>
 
+      <locale name="sr">
+	<short>Списак преклопљених група у листи контаката</short>
+	
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Spisak preklopljenih grupa u listi kontakata</short>
+	
+      </locale>
+
       <locale name="sv">
 	<short>Lista över infällda grupper i kontaktlistan</short>
 	
@@ -26594,6 +27584,11 @@
 	<long>Ако е включено, изключените контакти ще се показват в указателя</long>
       </locale>
 
+      <locale name="bn">
+	<short>অনুপস্থিত কন্ট্যাক্টদের প্রদর্শন করুন</short>
+	<long>সক্রিয় হলে, অফ-লাইন পরিচিতদের নাম পরিচিতি তালিকা প্রদর্শিত হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>অনুপস্থিত কন্ট্যাক্টদের প্রদর্শন করুন</short>
 	<long>সক্রিয় হলে, অফ-লাইন পরিচিতদের নাম পরিচিতি তালিকা প্রদর্শিত হবে</long>
@@ -26604,6 +27599,11 @@
 	<long>Si s&apos;activa, els contactes fora de línia es mostraran a la llista</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Mostra els contactes fora de línia</short>
+	<long>Si s&apos;activa, els contactes fora de línia es mostraran a la llista</long>
+      </locale>
+
       <locale name="crh">
 	<short>Devre-tışı temaslarnı köster</short>
 	<long>Qabilleştirilgen ise, devre-tışı temaslar temasnamede kösterilecek</long>
@@ -26774,6 +27774,16 @@
 	<long>Nëse aktivizuar, kontaktet jashtë linje do të shfaqen në listë</long>
       </locale>
 
+      <locale name="sr">
+	<short>Прикажи контакте ван мреже</short>
+	<long>Ако је укључено, контакти који нису на мрежи ће бити приказани у листи контаката</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>Prikaži kontakte van mreže</short>
+	<long>Ako je uključeno, kontakti koji nisu na mreži će biti prikazani u listi kontakata</long>
+      </locale>
+
       <locale name="sv">
 	<short>Visa frånkopplade kontakter</short>
 	<long>Om aktiverad kommer frånkopplade kontakter att visas i kontaktlistan</long>
@@ -26850,6 +27860,11 @@
 	<long>Списък с настроените сървъри за LDAP</long>
       </locale>
 
+      <locale name="bn">
+	<short>LDAP সার্ভার</short>
+	<long>প্রস্তুত করা LDAP সার্ভার-এর তালিকা</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>LDAP সার্ভার</short>
 	<long>প্রস্তুত করা LDAP সার্ভার-এর তালিকা</long>
@@ -26860,6 +27875,11 @@
 	<long>Llista de servidors LDAP configurats</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Servidors LDAP</short>
+	<long>Llista de servidors LDAP configurats</long>
+      </locale>
+
       <locale name="crh">
 	<short>LDAP sunucıları</short>
 	<long>Ayarlanğan LDAP sunucıları listesi</long>
@@ -26937,7 +27957,7 @@
 
       <locale name="hi">
 	<short>LDAP सर्वर</short>
-	
+	<long>विन्यस्त LDAP सर्वर की सूची</long>
       </locale>
 
       <locale name="hu">
@@ -27035,6 +28055,16 @@
 	<long>Lista e serverëve të konfiguruar LDAP</long>
       </locale>
 
+      <locale name="sr">
+	<short>ЛДАП сервери</short>
+	<long>Списак подешених ЛДАП сервера</long>
+      </locale>
+
+      <locale name="sr@latin">
+	<short>LDAP serveri</short>
+	<long>Spisak podešenih LDAP servera</long>
+      </locale>
+
       <locale name="sv">
 	<short>LDAP-servrar</short>
 	<long>Lista över konfigurerade LDAP-servrar</long>
@@ -27110,6 +28140,11 @@
  	<long>История на последните 100 набрани номера</long>
       </locale>
 
+      <locale name="bn">
+ 	<short>কলের ইতিহাস</short>
+ 	<long>পূর্ববর্তী ১০০-টি কল সম্পর্কিত তথ্য</long>
+      </locale>
+
       <locale name="bn_IN">
  	<short>কলের ইতিহাস</short>
  	<long>পূর্ববর্তী ১০০-টি কল সম্পর্কিত তথ্য</long>
@@ -27120,6 +28155,11 @@
  	<long>L&apos;historial de les darreres 100 trucades</long>
       </locale>
 
+      <locale name="ca@valencia">
+ 	<short>Historial de trucades</short>
+ 	<long>L&apos;historial de les darreres 100 trucades</long>
+      </locale>
+
       <locale name="crh">
  	<short>Aramalar keçmişi</short>
  	<long>Soñki 100 aramanıñ keçmişi</long>
@@ -27310,6 +28350,16 @@
  	<long>Kronollogjia e 100 thirrjeve të fundit</long>
       </locale>
 
+      <locale name="sr">
+ 	<short>Историјат позива</short>
+ 	<long>Историјат последњих 100 начињених позива</long>
+      </locale>
+
+      <locale name="sr@latin">
+ 	<short>Istorijat poziva</short>
+ 	<long>Istorijat poslednjih 100 načinjenih poziva</long>
+      </locale>
+
       <locale name="sv">
  	<short>Samtalshistorik</short>
  	<long>Historiken för de 100 senaste samtalen</long>
@@ -27403,7 +28453,7 @@
 
       <locale name="bn">
 	<short>ড্রুইডের দ্বারা বেছে নেওয়া নেটওয়ার্কের ধরণ</short>
-	
+	<long>০: ৫৬ Kbps, ১: ISDN, ২: DSL, ৩: LAN, ৪: স্বনির্বাচিত</long>
       </locale>
 
       <locale name="bn_IN">
@@ -27421,6 +28471,11 @@
 	<long>0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: Personalitzat</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>Tipus de xarxa seleccionada en l&apos;auxiliar</short>
+	<long>0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: Personalitzat</long>
+      </locale>
+
       <locale name="crh">
 	<short>Siirbazda saylanğan şebeke çeşiti</short>
 	<long>0: 56Kbps, 1: İSDN, 2: DSL, 3: LAN, 4: Şahsiyleştirilgen</long>
@@ -27532,7 +28587,7 @@
       </locale>
 
       <locale name="hu">
-	<short>A varázslóban kiválasztott hálózattípus</short>
+	<short>Az asszisztensben kiválasztott hálózattípus</short>
 	<long>0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: Egyedi</long>
       </locale>
 
@@ -27568,7 +28623,7 @@
 
       <locale name="lt">
 	<short>Pasirinktas tinklinio ryšio tipas</short>
-	<long>0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: kitas</long>
+	<long>0: 56kb/s, 1: ISDN, 2:DSL, 3: LAN, 4: kitas</long>
       </locale>
 
       <locale name="lv">
@@ -27782,6 +28837,11 @@
 	<long>Автоматично отказване или прехвърляне на входящи обаждания, ако няма отговор в рамките на посочения брой секунди</long>
       </locale>
 
+      <locale name="bn">
+	<short>প্রত্যুত্তোর বিনা সময়সীমা</short>
+	<long>চিহ্নিত সময়ের মধ্যে (সেকেন্ডে ধার্য) কোনো উত্তর না পাওয়া গেলে, আগত কলগুলো স্বয়ংক্রিয়ভাবে প্রত্যাখ্যান অথবা ফরওয়ার্ড করা হবে</long>
+      </locale>
+
       <locale name="bn_IN">
 	<short>প্রত্যুত্তোর বিনা সময়সীমা</short>
 	<long>চিহ্নিত সময়ের মধ্যে (সেকেন্ডে ধার্য) কোনো উত্তর না পাওয়া গেলে, আগত কলগুলি স্বয়ংক্রিয়ভাবে প্রত্যাখ্যান অথবা অনুবর্তন করা হবে</long>
@@ -27797,6 +28857,11 @@
 	<long>Rebutja o desvia automàticament les trucades entrants si no es contesta dins el marge de temps especificat (en segons)</long>
       </locale>
 
+      <locale name="ca@valencia">
+	<short>S&apos;ha excedit el temps d&apos;espera</short>
+	<long>Rebutja o desvia automàticament les trucades entrants si no es contesta dins el marge de temps especificat (en segons)</long>
+      </locale>
+
       <locale name="crh">
 	<short>Cevapsızlıq zaman aşımı</short>
 	<long>Eger belirtilgen vaqıt miqdarından soñ (saniye cınsından) cevap berilmegen ise, kelgen aramalarnı öz-özünden red et yaki yönlendir</long>
@@ -27957,6 +29022,11 @@
 	<long>Автоматски одбиј го или пренасочи го пристигнатиот повик ако на него не е одговорено во одреден период од време (во секунди)</long>
       </locale>
 
+      <locale name="ml">
+	<short>കോളെടുക്കുന്നതിനുള്ള സമയപരിധി ലഭ്യമല്ല</short>
+	<long>പറഞ്ഞിരിക്കുന്ന സമയത്തിനുള്ളില്‍ (സെക്കന്‍ഡുകള്‍) കോള്‍ എടുത്തില്ലെങ്കില്‍, സ്വയമായി ഇന്‍കമിങ് കോളുകള്‍ നിരസിക്കുന്നതിനോ ഫോര്‍വേഡ് ചെയ്യുക</long>
+      </locale>
+
       <locale name="mn">
 	<short>Хариу өгөөгүй хугацааны завсар</short>
 	<long>Хэрэв тодорхой хугацааны (секунтээр) дараа ямар ч хариу өгөхгүй бол орж ирж буй дуулагыг автоматаар таслана эсвэл дамжуулна</long>
diff -Nru ekiga-3.2.5/gnome-doc-utils.make ekiga-3.2.6~ppa~karmic1/gnome-doc-utils.make
--- ekiga-3.2.5/gnome-doc-utils.make	2009-07-06 20:10:28.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/gnome-doc-utils.make	2009-09-22 15:36:12.000000000 +0100
@@ -92,6 +92,14 @@
 ## The name of the document being built
 DOC_MODULE ?=
 
+## @ DOC_ID
+## The unique identifier for a Mallard document
+DOC_ID ?=
+
+## @ DOC_PAGES
+## Page files in a Mallard document
+DOC_PAGES ?=
+
 ## @ DOC_ENTITIES
 ## Files included with a SYSTEM entity
 DOC_ENTITIES ?=
@@ -123,9 +131,11 @@
 ## Variables for Bootstrapping
 
 _xml2po ?= `which xml2po`
+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
 
 _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
 _db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
 _chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
 _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
 _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
@@ -205,6 +215,10 @@
 ## The top-level documentation file in the C locale
 _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
 
+## @ _DOC_C_PAGES
+## Page files in a Mallard document in the C locale
+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
+
 ## @ _DOC_C_ENTITIES
 ## Files included with a SYSTEM entity in the C locale
 _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
@@ -217,13 +231,14 @@
 ## All documentation files in the C locale
 _DOC_C_DOCS =								\
 	$(_DOC_C_ENTITIES)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_MODULE)
+	$(_DOC_C_PAGES)		$(_DOC_C_MODULE)
 
 ## @ _DOC_C_DOCS_NOENT
 ## All documentation files in the C locale,
 ## except files included with a SYSTEM entity
 _DOC_C_DOCS_NOENT =							\
-	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)
+	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)			\
+	$(_DOC_C_PAGES)
 
 ## @ _DOC_C_FIGURES
 ## All figures and other external data in the C locale
@@ -245,7 +260,7 @@
 
 ## @ _DOC_POFILES
 ## The .po files used for translating the document
-_DOC_POFILES = $(if $(DOC_MODULE),						\
+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
 	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
 
 .PHONY: po
@@ -256,6 +271,12 @@
 _DOC_LC_MODULES = $(if $(DOC_MODULE),						\
 	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
 
+## @ _DOC_LC_PAGES
+## Page files in a Mallard document in all other locales
+_DOC_LC_PAGES =									\
+	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),	\
+		$(lc)/$(notdir $(page)) ))
+
 ## @ _DOC_LC_XINCLUDES
 ## Files included with XInclude in all other locales
 _DOC_LC_INCLUDES =								\
@@ -272,7 +293,7 @@
 ## @ _DOC_LC_DOCS
 ## All documentation files in all other locales
 _DOC_LC_DOCS =									\
-	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)				\
+	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)	$(_DOC_LC_PAGES)	\
 	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
 
 ## @ _DOC_LC_FIGURES
@@ -299,16 +320,16 @@
 	done; \
 	if ! test -f $@; then \
 	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -e $$docs > $(notdir $@).tmp && \
+	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
 	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
 	  (cd $(dir $@) && \
-	    $(_xml2po) -e $$docs > $(notdir $@).tmp && \
+	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
 	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
 	else \
 	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -e -u $(notdir $@) $$docs)"; \
+	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
 	  (cd $(dir $@) && \
-	    $(_xml2po) -e -u $(notdir $@) $$docs); \
+	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
 	fi
 
 # FIXME: fix the dependancy
@@ -317,9 +338,10 @@
 $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
 	if ! test -d $(dir $@); then mkdir $(dir $@); fi
 	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+	po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+	if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
 	(cd $(dir $@) && \
-	  $(_xml2po) -e -p \
-	    "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
+	  $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
 	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
 	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
 
@@ -329,7 +351,7 @@
 .PHONY: pot
 pot: $(_DOC_POT)
 $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-	$(_xml2po) -e -o $@ $^
+	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
 
 
 ################################################################################
@@ -347,6 +369,7 @@
 
 
 ################################################################################
+## All
 
 all:							\
 	$(_DOC_C_DOCS)		$(_DOC_LC_DOCS)		\
@@ -354,6 +377,9 @@
 	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
 
 
+################################################################################
+## Clean
+
 .PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
 
 clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
@@ -385,7 +411,7 @@
 _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
 _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
 _clean_lc  = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
 
 clean-local:						\
 	$(_clean_omf)		$(_clean_dsk)		\
@@ -401,10 +427,14 @@
 	$(_clean_lc)		$(_clean_dir)
 
 
-.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
-doc-dist-hook: 					\
-	$(if $(DOC_MODULE),dist-doc-docs)	\
-	$(if $(_DOC_C_FIGURES),dist-doc-figs)	\
+
+################################################################################
+## Dist
+
+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
+doc-dist-hook: 						\
+	$(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)	\
+	$(if $(_DOC_C_FIGURES),dist-doc-figs)		\
 	$(if $(_DOC_OMF_IN),dist-doc-omf)
 #	$(if $(_DOC_DSK_IN),dist-doc-dsk)
 
@@ -451,9 +481,14 @@
 	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
 
 
+
+################################################################################
+## Check
+
 .PHONY: check-doc-docs check-doc-omf
 check:							\
 	$(if $(DOC_MODULE),check-doc-docs)		\
+	$(if $(DOC_ID),check-doc-pages)			\
 	$(if $(_DOC_OMF_IN),check-doc-omf)
 
 check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
@@ -469,6 +504,21 @@
 	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
 	done
 
+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
+	for lc in C $(_DOC_REAL_LINGUAS); do \
+	  if test -f "$$lc"; \
+	    then d=; \
+	    xmlpath="$$lc"; \
+	  else \
+	    d="$(srcdir)/"; \
+	    xmlpath="$$lc:$(srcdir)/$$lc"; \
+	  fi; \
+	  for page in $(DOC_PAGES); do \
+	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
+	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
+	  done; \
+	done
+
 check-doc-omf: $(_DOC_OMF_ALL)
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
 	  echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
@@ -476,9 +526,16 @@
 	done
 
 
+
+################################################################################
+## Install
+
 .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
+
+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
+
 install-data-local:					\
-	$(if $(DOC_MODULE),install-doc-docs)		\
+	$(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)	\
 	$(if $(_DOC_HTML_ALL),install-doc-html)		\
 	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
 	$(if $(_DOC_OMF_IN),install-doc-omf)
@@ -486,19 +543,19 @@
 
 install-doc-docs:
 	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
-	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
+	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
+	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
 	done
 	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
 	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
 	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	  docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
+	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
 	  if ! test -d "$$docdir"; then \
 	    echo "$(mkinstalldirs) $$docdir"; \
 	    $(mkinstalldirs) "$$docdir"; \
 	  fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
 	done
 
 install-doc-figs:
@@ -513,7 +570,7 @@
 	      figsymlink=true; \
 	    fi; \
 	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+	    figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
 	    if ! test -d "$$figdir"; then \
 	      echo "$(mkinstalldirs) $$figdir"; \
 	      $(mkinstalldirs) "$$figdir"; \
@@ -533,23 +590,27 @@
 	echo install-html
 
 install-doc-omf:
-	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
+	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
+	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
 	done
 	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
+	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
+	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
 	fi;
 
 install-doc-dsk:
 	echo install-dsk
 
 
+
+################################################################################
+## Uninstall
+
 .PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
 uninstall-local:					\
-	$(if $(DOC_MODULE),uninstall-doc-docs)		\
+	$(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs)	\
 	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
 	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
 	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
@@ -557,22 +618,22 @@
 
 uninstall-doc-docs:
 	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
+	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
 	done
 
 uninstall-doc-figs:
 	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
+	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
 	done;
 
 uninstall-doc-omf:
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
 	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 	  fi; \
-	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-	  rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 	done
diff -Nru ekiga-3.2.5/help/de/de.po ekiga-3.2.6~ppa~karmic1/help/de/de.po
--- ekiga-3.2.5/help/de/de.po	2009-07-06 20:11:25.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/help/de/de.po	2009-09-22 15:37:25.000000000 +0100
@@ -1,20 +1,23 @@
-# SOME DESCRIPTIVE TITLE.
+# German translation of the ekiga manual.
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # Stefan Brüns <lurchi@kawo1.rwth-aachen.de>, 2005.
-# Mario Blättermann <mario.blaettermann@t-online.de>, 2008.
+# Mario Blättermann <mariobl@gnome.org>, 2008, 2009.
+# Wolfgang Stöggl <c72578@yahoo.de>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GnomeMeeting 1.0\n"
-"POT-Creation-Date: 2008-10-13 04:09+0000\n"
-"PO-Revision-Date: 2008-10-13 17:50+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@t-online.de>\n"
+"Project-Id-Version: ekiga\n"
+"POT-Creation-Date: 2009-08-08 15:48+0000\n"
+"PO-Revision-Date: 2009-08-08 22:42+0200\n"
+"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: GERMANY\n"
 
 #: C/ekiga.xml:12(title)
 msgid "<application>Ekiga</application> Manual 3.00"
@@ -105,6 +108,8 @@
 "Ekiga is an application for voice over IP, IP telephony, and video "
 "conferencing, with support for many audio and video codecs."
 msgstr ""
+"Ekiga ist eine Anwendung für Voice-over-IP, IP-Telefonie und "
+"Videokonferenzen, die zahlreiche Video- und Audio-Codecs unterstützt."
 
 #: C/ekiga.xml:80(primary) C/ekiga.xml:83(primary) C/ekiga.xml:86(primary)
 #: C/ekiga.xml:95(title)
@@ -122,14 +127,14 @@
 "OpenSolaris or MacOSX). It was written by Damien Sandras and is licensed "
 "under the GNU/GPL."
 msgstr ""
-"<application>Ekiga</application> is ein freies Voice-over-IP-, IP-Telefonie- "
-"und Videokonferenz-Programm für Linux und andere Unixe (z.B. BSD, OpenSolaris "
-"oder MacOS X). Es wurde von Damien Sandras geschrieben und ist  unter der GNU/"
-"GPL lizenziert."
+"<application>Ekiga</application> ist ein freies Voice-over-IP-, IP-"
+"Telefonie- und Videokonferenz-Programm für Linux und andere Unixe (z.B. BSD, "
+"OpenSolaris oder MacOS X). Es wurde von Damien Sandras geschrieben und ist "
+"unter der GNU/GPL lizenziert."
 
 #: C/ekiga.xml:99(para)
 msgid ""
-"Ekiga is able to use modern Voice over IP protocols like SIP, and H.323. It "
+"Ekiga is able to use modern Voice over IP protocols like SIP and H.323. It "
 "supports all major features defined by those protocols like <emphasis>call "
 "hold</emphasis>, <emphasis>call transfer</emphasis>, <emphasis>call "
 "forwarding</emphasis>, ... It also supports <emphasis>instant messaging</"
@@ -139,12 +144,12 @@
 "for a superior audio quality, together with echo cancellation."
 msgstr ""
 "Ekiga unterstützt aktuelle Voice-over-IP-Protokolle wie SIP und H.323. Es "
-"unterstützt alle wichtigen Funktionen dieser Protolle wie <emphasis>Parken "
+"unterstützt alle wichtigen Funktionen dieser Protokolle wie <emphasis>Parken "
 "von Verbindungen</emphasis>, <emphasis>Weitervermittlung</emphasis>, "
 "<emphasis>Anruf-Weiterleitung</emphasis>, … Es stellt außerdem einfache "
 "<emphasis>Sofortnachrichten</emphasis>- und <emphasis>Verfügbarkeits</"
 "emphasis>-Funktionen sowie fortgeschrittene Funktionen zur <emphasis>NAT-"
-"Durchquerung</emphasis> bereit. Ekiga enthält die besten verfügbaren "
+"Durchquerung</emphasis> bereit. Ekiga unterstützt die besten verfügbaren "
 "<emphasis>freien</emphasis> Codecs für Audio und Video, und bietet Breitband-"
 "Sprachübertragung und Echo-Unterdrückung für eine herausragende Audio-"
 "Qualität."
@@ -159,12 +164,12 @@
 "MMUSIC Working Group and proposed standard for initiating, modifying, and "
 "terminating an interactive user session that involves multimedia elements "
 "such as video, voice, instant messaging, online games, and virtual reality. "
-"In November 2000, SIP was accepted as a 3GPP signaling protocol and permanent "
-"element of the IMS architecture. It is one of the leading signalling "
-"protocols for Voice over IP."
+"In November 2000, SIP was accepted as a 3GPP signaling protocol and "
+"permanent element of the IMS architecture. It is one of the leading "
+"signalling protocols for Voice over IP."
 msgstr ""
-"Das Sitzungs-Initiierungs-Protokoll (Session Initiation Protocol, SIP) is ein "
-"von der IETF MMUSIC Arbeitsgruppe entwickeltes und zur Standardisierung "
+"Das Sitzungs-Initiierungs-Protokoll (Session Initiation Protocol, SIP) ist "
+"ein von der IETF MMUSIC Arbeitsgruppe entwickeltes und zur Standardisierung "
 "vorgeschlagenes Protokoll, um interaktive Benutzer-Sitzungen aufzubauen, zu "
 "verändern und zu beenden. Diese können Multimedia-Elemente wie Video, "
 "Sprache, Sofortnachrichten, Online-Spiele und Virtuelle Realität beinhalten. "
@@ -178,27 +183,27 @@
 "multimedia applications over LANs but it has rapidly evolved to address the "
 "growing needs of VoIP networks. One strength of H.323 was the relatively "
 "early availability of a set of standards, not only defining the basic call "
-"model, but in addition the supplementary services, needed to address business "
-"communication expectations. H.323 was the first VoIP standard to adopt the "
-"IETF standard RTP to transport audio and video over IP networks. H.323 is "
-"based on the ISDN Q.931 protocol and is suited for interworking scenarios "
-"between IP and ISDN, respectively between IP and QSIG. A call model, similar "
-"to the ISDN call model, eases the introduction of IP Telephony into existing "
-"networks of ISDN based PBX systems."
-msgstr ""
-"H.323 wurde ursprünglich dafür erstellt, um einen Mechnismus für den "
-"Transport von Multimedia-Applikationen über lokale Netze (Local Area "
-"Networks, LAN) zur Verfügung zu stellen, es hat sich aber schnell "
-"weiterentwickelt um den gestiegenen Bedürfnissen von VoIP-Netzwerken gerecht "
-"zu werden. Eine der Stärken von H.323 war die frühzeitige Verfügbarkeit einer "
-"Sammlung von Standards, die nicht nur einfache Anrufe, sondern auch "
-"Zusatzdienste spezifizieren, um den Erwartungen im Unternehmensumfeld gerecht "
-"zu werden. H.323 war der erste VoIP-Standard, der den RTP-Standard der IETF "
-"für den Transport von Audio- und Videodaten über IP-Netze übernahm. H.323 "
-"basiert auf dem ISDN Q.931 Protokoll und eignet sich für Zusammenarbeit-"
-"Szenarien von IP und ISDN bzw. zwischen IP und QSIG. Ein Verbindungsmodell, "
-"dass dem von ISDN ähnelt, erleichtert die Einbindung von IP-Telefonie in "
-"bestehende ISDN-basierte Netze von Telefonanlagen."
+"model, but in addition the supplementary services, needed to address "
+"business communication expectations. H.323 was the first VoIP standard to "
+"adopt the IETF standard RTP to transport audio and video over IP networks. "
+"H.323 is based on the ISDN Q.931 protocol and is suited for interworking "
+"scenarios between IP and ISDN, respectively between IP and QSIG. A call "
+"model, similar to the ISDN call model, eases the introduction of IP "
+"Telephony into existing networks of ISDN based PBX systems."
+msgstr ""
+"H.323 wurde ursprünglich dafür erstellt, um einen Mechanismus für den "
+"Transport von Multimedia-Anwendungen über lokale Netze (Local Area Networks, "
+"LAN) zur Verfügung zu stellen. Es hat sich aber schnell weiterentwickelt, um "
+"den gestiegenen Bedürfnissen von VoIP-Netzwerken gerecht zu werden. Eine der "
+"Stärken von H.323 war die frühzeitige Verfügbarkeit einer Sammlung von "
+"Standards, die nicht nur einfache Anrufe, sondern auch Zusatzdienste "
+"spezifizieren, um den Erwartungen im Unternehmensumfeld gerecht zu werden. "
+"H.323 war der erste VoIP-Standard, der den RTP-Standard der IETF für den "
+"Transport von Audio- und Videodaten über IP-Netze übernahm. H.323 basiert "
+"auf dem ISDN Q.931 Protokoll und eignet sich für Zusammenarbeit-Szenarien "
+"von IP und ISDN bzw. zwischen IP und QSIG. Ein Verbindungsmodell, das dem "
+"von ISDN ähnelt, erleichtert die Einbindung von IP-Telefonie in bestehende "
+"ISDN-basierte Netze von Telefonanlagen."
 
 #: C/ekiga.xml:120(title)
 msgid "Getting Started"
@@ -213,23 +218,23 @@
 "<application>Ekiga</application>. You should go through all of these steps "
 "properly, otherwise the assistant will re-appear (when it has not been "
 "completed) or <application>Ekiga</application> will not function "
-"appropriately (if some of your answers have not been correct). You may run "
-"the Configuration Assistant at any time from the Edit menu."
+"appropriately (if some of your answers were not correct). You may run the "
+"Configuration Assistant at any time from the Edit menu."
 msgstr ""
 "Beim ersten Start von <application>Ekiga</application> erscheint automatisch "
 "der Einrichtungs-Assistent. Dieser stellt Ihnen Fragen, und hilft Ihnen "
 "Schritt-für-Schritt die Grundkonfiguration zu erstellen, die für "
 "<application>Ekiga</application> benötigt wird. Sie sollten alle diese "
-"Schritte sorgfältig durchgehen, da der Assistent ansonsten erneut augerufen "
+"Schritte sorgfältig durchgehen, da der Assistent ansonsten erneut aufgerufen "
 "wird (bei Abbruch vor Fertigstellung des Assistenten), oder Probleme beim "
 "Betrieb von <application>Ekiga</application> auftreten können (falls "
 "fehlerhafte Antworten gegeben wurden). Der Assistent kann jederzeit über das "
-"\"Bearbeiten\"-Menü aufgerufen werden."
+"Menü <guimenu>Bearbeiten</guimenu> aufgerufen werden."
 
 #: C/ekiga.xml:127(title) C/ekiga.xml:291(title) C/ekiga.xml:301(title)
-#: C/ekiga.xml:307(title) C/ekiga.xml:341(title) C/ekiga.xml:364(title)
-#: C/ekiga.xml:403(title) C/ekiga.xml:420(title) C/ekiga.xml:464(title)
-#: C/ekiga.xml:503(title)
+#: C/ekiga.xml:307(title) C/ekiga.xml:341(title) C/ekiga.xml:368(title)
+#: C/ekiga.xml:407(title) C/ekiga.xml:424(title) C/ekiga.xml:468(title)
+#: C/ekiga.xml:507(title)
 msgid "Tip"
 msgstr "Tipp"
 
@@ -247,15 +252,15 @@
 "Throughout the entire configuration process navigation is available at the "
 "bottom of the window. You will be able to navigate through the questions "
 "using Back, Forward and Cancel. If you hit Cancel during the setup "
-"<application>Ekiga</application> will not be affected by your changes and all "
-"entered information will be discarded."
+"<application>Ekiga</application> will not be affected by your changes and "
+"all entered information will be discarded."
 msgstr ""
 "Während des gesamten Konfigurations-Prozesses ist eine Navigation über die "
-"Knöpfe am unteren Rand des Fensters möglich. Sie können sich mittels »Zurück«, "
-"»Vor« und »Abbrechen« zwischen den Fragen bewegen. Wenn Sie während der "
-"Konfiguration »Abbrechen« drücken, haben eventuelle Änderungen keinen Einfluss "
-"auf <application>Ekiga</application> und die eingegebenen Informationen "
-"werden verworfen."
+"Knöpfe am unteren Rand des Fensters möglich. Sie können sich mittels "
+"»Zurück«, »Vor« und »Abbrechen« zwischen den Fragen bewegen. Wenn Sie während "
+"der Konfiguration »Abbrechen« drücken, haben eventuelle Änderungen keinen "
+"Einfluss auf <application>Ekiga</application> und die eingegebenen "
+"Informationen werden verworfen."
 
 #: C/ekiga.xml:141(para)
 msgid ""
@@ -278,14 +283,15 @@
 "connecting to other audio/video applications."
 msgstr ""
 "Im Fenster »Persönliche Daten« müssen Sie einige persönliche Daten eingeben, "
-"die für <application>Ekiga</application> benötigt werden. Diese Informationen "
-"werden in anderen Audio-/Video-Programmen bei einer Verbindung dargestellt."
+"die für <application>Ekiga</application> benötigt werden. Diese "
+"Informationen werden in anderen Audio-/Video-Programmen bei einer Verbindung "
+"dargestellt."
 
 #: C/ekiga.xml:162(title)
 msgid "Ekiga.net Account"
 msgstr "Ekiga.net-Konto"
 
-#: C/ekiga.xml:168(para) C/ekiga.xml:538(para)
+#: C/ekiga.xml:168(para)
 msgid ""
 "Ekiga.net is a free SIP services platform provided to <application>Ekiga</"
 "application> users. If you want to call other users and to be callable, you "
@@ -298,53 +304,81 @@
 "Ekiga.net ist eine freie SIP Dienste-Plattform, die Benutzern von "
 "<application>Ekiga</application> zur Verfügung gestellt wird. Diese stellt "
 "für Sie eine SIP-Adresse bereit, über die Ihre Freunde und Familie Sie mit "
-"jeder SIP-konformen Soft- oder Hardware erreichen können. Eine solche Sdresse "
-"erhalten Sie hier: <ulink url=\"http://www.ekiga.net\" type=\"http\">http://"
-"www.ekiga.net</ulink>. Ekiga.net bietet Ihnen außerdem zusätzliche Dienste "
-"wie Konferenzräume, Zustellung von Sprachnachrichten per Mail und ein Online-"
-"Telefonbuch. Weitere Informationen finden Sie unter <ulink url=\"http://www."
-"ekiga.net\" type=\"http\">http://www.ekiga.net</ulink>."
-
-#: C/ekiga.xml:174(para) C/ekiga.xml:193(para)
-msgid ""
-"Just follow the link given in the dialog to get an account if you do not have "
-"one, then fill in your username and password. Please press 'Forward' after "
-"having entered all required information to continue."
+"jeder SIP-konformen Soft- oder Hardware erreichen können. Eine solche "
+"Adresse erhalten Sie hier: <ulink url=\"http://www.ekiga.net\" type=\"http"
+"\">http://www.ekiga.net</ulink>. Ekiga.net bietet Ihnen außerdem zusätzliche "
+"Dienste wie Konferenzräume, Zustellung von Sprachnachrichten per Mail und "
+"ein Online-Telefonbuch. Weitere Informationen finden Sie unter <ulink url="
+"\"http://www.ekiga.net\" type=\"http\">http://www.ekiga.net</ulink>."
+
+#: C/ekiga.xml:174(para)
+msgid ""
+"Just follow the link given in the dialog to get an account if you do not "
+"have one, then fill in your username and password. Please press 'Forward' "
+"after having entered all required information to continue."
 msgstr ""
 "Folgen Sie einfach dem im Dialog angegebenen Link, um ein Konto zu bekommen, "
-"falls Sie nicht bereits eines haben. Tragen Sie danach ihren Benutzernamen "
+"falls Sie nicht bereits eines haben. Tragen Sie danach Ihren Benutzernamen "
 "und Ihr Passwort ein. Bitte drücken Sie »Vor« wenn Sie alle benötigten "
 "Informationen angegeben haben."
 
 #: C/ekiga.xml:181(title)
 msgid "Ekiga Call Out Account"
-msgstr ""
+msgstr "Ekiga »PC zu Telefon«-Konto"
 
 #: C/ekiga.xml:187(para)
 msgid ""
 "<application>Ekiga</application> can be used with several Internet Telephony "
 "Service Providers. Those providers will allow calling real phones from your "
-"computer using <application>Ekiga</application> at interesting rates. We are "
-"recommending you to use the default <application>Ekiga</application> provider."
+"computer using <application>Ekiga</application> at interesting rates. We "
+"recommend you use the default <application>Ekiga</application> provider."
 msgstr ""
+"<application>Ekiga</application> kann mit verschiedenen Internet-"
+"Telefonanbietern benutzt werden. Diese Dienstanbieter ermöglichen Anrufe zu "
+"realen Telefonnummern mittels <application>Ekiga</application> von Ihrem "
+"Rechner aus, und das zu interessanten Preisen. Wir empfehlen die Nutzung des "
+"vorgegebenen <application>Ekiga</application>-Dienstanbieters."
 
 #: C/ekiga.xml:189(para)
 msgid ""
 "If you want to create an account and use it to call your friends and family "
-"using regular phones at interesting rates, simply create an account using the "
-"\"Get an Ekiga Call Out account\" link. Once the account has been created, "
-"you will receive a login and a password by e-mail. Simply enter them in the "
-"dialog, and you are ready to call regular phones using <application>Ekiga</"
-"application>"
+"using regular phones at interesting rates, simply create an account using "
+"the \"Get an Ekiga Call Out account\" link. Once the account has been "
+"created, you will receive a login and a password by e-mail. Simply enter "
+"them in the dialog, and you are ready to call regular phones using "
+"<application>Ekiga</application>"
 msgstr ""
+"Falls Sie ein Konto einrichten wollen, das Sie für Gespräche zu einem "
+"gewöhnlichen Telefon mit Familie und Freunden zu günstigen Preisen nutzen "
+"können, erstellen Sie ein solches Konto über den Link <guilabel>Ekiga »PC zu "
+"Telefon«-Konto hinzufügen</guilabel>. Sobald dieses Konto erstellt ist, "
+"erhalten Sie einen Anmeldenamen und ein Passwort per E-Mail. Geben Sie dies "
+"im Dialog ein. Ab sofort können Sie <application>Ekiga</application> für "
+"Anrufe zu gewöhnlichen Telefonanschlüssen nutzen."
 
 #: C/ekiga.xml:191(para)
 msgid ""
 "With the default setup, you can simply use sip:3210444555 and choose sip."
 "diamondcard.us to call the real phone number +3210444555, 32 is the country "
-"code, 10444555 is the number to call. We encourage you putting your favorite "
+"code, 10444555 is the number to call. We encourage you to put your favorite "
 "phone numbers in the address book."
 msgstr ""
+"Mit der Vorgabekonfiguration können Sie einfach sip:3210444555 verwenden und "
+"sip.diamondcard.us in der Liste wählen, um die reale Telefonnummer "
+"+3210444555 anzurufen, wobei 32 die Landesvorwahl darstellt und 10444555 die "
+"anzurufende Nummer. Wir empfehlen Ihnen, Ihre wichtigen Telefonnummern im "
+"Adressbuch zu speichern."
+
+#: C/ekiga.xml:193(para)
+msgid ""
+"Just follow the link given in the dialog to get an account if you do not "
+"have one, then fill in your username and password. Please press 'Forward' "
+"after entering all required information to continue."
+msgstr ""
+"Folgen Sie einfach dem im Dialog angegebenen Link, um ein Konto zu bekommen, "
+"falls Sie nicht bereits eines haben. Tragen Sie danach Ihren Benutzernamen "
+"und Ihr Passwort ein. Bitte drücken Sie »Vor«, sobald Sie alle benötigten "
+"Informationen angegeben haben."
 
 #: C/ekiga.xml:200(title)
 msgid "Connection Type"
@@ -363,10 +397,22 @@
 "closest to your network connection and adjust <application>Ekiga</"
 "application> manually with the preferences window (codecs section) later on."
 msgstr ""
+"<application>Ekiga</application> unterstützt verschiedene Audio- und Video-"
+"Codecs, sowohl solche mit hoher Qualität als auch solche mit niederer "
+"Qualität. Je höher die Qualität eines Codecs ist, umso mehr "
+"Übertragungsbandbreite wird benötigt. Außerdem können Video-Codecs ihre "
+"Qualität an die verfügbare Bandbreite anpassen. Diese Option ist in der "
+"Erstkonfiguration von <application>Ekiga</application> erforderlich, so dass "
+"jederzeit der optimal zu Ihrer Netzwerkverbindung passende Codec gewählt "
+"werden kann, um die Video-Qualitätseinstellungen anzupassen. Falls Ihr "
+"Verbindungstyp nicht in der Liste aufgeführt ist, sollten Sie denjenigen "
+"wählen, der Ihrer Verbindung am nächsten kommt und die "
+"Verbindungsgeschwindigkeit für <application>Ekiga</application> später "
+"manuell im Codec-Abschnitt des Einstellungsfensters konfigurieren."
 
 #: C/ekiga.xml:211(para) C/ekiga.xml:228(para) C/ekiga.xml:246(para)
 msgid "When done, continue on with the Configuration."
-msgstr ""
+msgstr "Sobald Sie fertig sind, fahren Sie mit der Konfiguration fort."
 
 #: C/ekiga.xml:217(title)
 msgid "Audio Devices"
@@ -377,14 +423,28 @@
 "<application>Ekiga</application> requires audio devices to play and record "
 "sound. The audio output device ouputs the incoming sound stream during a "
 "call. Please select the device that your headset or speakers are connected "
-"to. The audio input device is where your microphone is connected to. These "
+"to. The audio input device is what your microphone is connected to. These "
 "settings might be the same as the settings for the audio player if you have "
 "only one soundcard. But please note that it is also possible to record sound "
 "via another device (e.g. internal microphone in a webcam) too. This section "
 "also allows you to choose the ringing device. This device can be different "
-"from the audio output device. It allows you hearing the incoming call ringing "
-"sound event in your speakers, while having your headset connected for calls."
-msgstr ""
+"from the audio output device. It allows you to hear the incoming call "
+"ringing sound event in your speakers, while having your headset connected "
+"for calls."
+msgstr ""
+"<application>Ekiga</application> benötigt Audiogeräte zum Wiedergeben und "
+"Aufnehmen von Klängen. Das Audio-Ausgabegerät ist für die Ausgabe des "
+"eingehenden Audio-Datenstroms während eines Gesprächs zuständig. Bitte "
+"wählen Sie das Gerät, mit dem Ihr Headset oder Ihre Lautsprecher verbunden "
+"sind. Das Audio-Eingabegerät ist jenes, mit welchem Ihr Mikrofon verbunden "
+"ist. Diese Einstellungen können den Einstellungen der Audio-Wiedergabe "
+"gleichen, falls Sie nur über eine Soundkarte verfügen. Beachten Sie, dass es "
+"auch möglich ist, Klänge über ein anderes Gerät aufzunehmen, zum Beispiel "
+"über das in einer Webcam eingebaute Mikrofon. In diesem Abschnitt können Sie "
+"auch das Gerät für den Klingelton einstellen. Dieses Gerät kann sich vom "
+"Audio-Wiedergabegerät unterscheiden. Es ermöglicht Ihnen, das Klingeln eines "
+"eingehenden Anrufs über die Lautsprecher zu hören, während Ihr Headset für "
+"Gespräche angeschlossen ist."
 
 #: C/ekiga.xml:234(title)
 msgid "Video Devices"
@@ -400,7 +460,8 @@
 "diese Seite überspringen."
 
 #: C/ekiga.xml:244(para)
-msgid "If you have a webcam or video device in the list you may select it here."
+msgid ""
+"If you have a webcam or video device in the list you may select it here."
 msgstr ""
 "Wenn Sie eine Webcam oder anderes Videogerät verwenden, können Sie es in "
 "dieser Liste auswählen."
@@ -412,10 +473,10 @@
 #: C/ekiga.xml:258(para)
 msgid ""
 "The configuration of <application>Ekiga</application> is now completed. The "
-"last window only shows a short configuration summary of the settings you have "
-"chosen. Please verify that all these settings are correct. If something is "
-"incorrect you may use the 'Back' button in the lower right hand corner of the "
-"window to move to any page of the assistant and correct the mistake."
+"last window only shows a short configuration summary of the settings you "
+"have chosen. Please verify that all these settings are correct. If something "
+"is incorrect you may use the 'Back' button in the lower right hand corner of "
+"the window to move to any page of the assistant and correct the mistake."
 msgstr ""
 "Die Konfiguration von <application>Ekiga</application> ist jetzt "
 "abgeschlossen. Auf der letzten Seite wird Ihnen nur eine kurze "
@@ -452,50 +513,83 @@
 #: C/ekiga.xml:281(para)
 msgid ""
 "If you want to call other users and to be callable, you need a SIP address. "
-"You can get a SIP address from <ulink url=\"http://www.ekiga.net\" type=\"http"
-"\">http://www.ekiga.net</ulink> as described above."
+"You can get a SIP address from <ulink url=\"http://www.ekiga.net\" type="
+"\"http\">http://www.ekiga.net</ulink> as described above."
 msgstr ""
+"Falls Sie andere Benutzer anrufen und selbst auch angerufen werden wollen, "
+"benötigen Sie eine SIP-Adresse. Eine solche Adresse erhalten Sie auf <ulink "
+"url=\"http://www.ekiga.net\" type=\"http\">http://www.ekiga.net</ulink>, wie "
+"oben beschrieben."
 
 #: C/ekiga.xml:283(para)
 msgid ""
 "The SIP address can be used by other users to call you. Similarly, you can "
 "use the SIP address of your friends and family to call them. You can for "
-"example use <emphasis>sip:dsandras@ekiga.net</emphasis> to call the author of "
-"Ekiga."
+"example use <emphasis>sip:dsandras@ekiga.net</emphasis> to call the author "
+"of Ekiga."
 msgstr ""
+"Andere Benutzer können Ihre SIP-Adresse benutzen, um Sie anzurufen. Ebenso "
+"rufen Sie Ihre Familie und Freunde über deren SIP-Adresse an. Beispielsweise "
+"erreichen Sie den Autor von Ekiga über <emphasis>sip:dsandras@ekiga.net</"
+"emphasis>."
 
 #: C/ekiga.xml:285(para)
 msgid ""
 "You can use the online address book of <application>Ekiga</application> to "
-"find the SIP addresses of other <application>Ekiga</application> users. It is "
-"of course possible to call users who are using another provider than ekiga."
-"net. You can actually call any user using SIP software or hardware, and "
-"registered to any public SIP provider"
-msgstr ""
+"find the SIP addresses of other <application>Ekiga</application> users. It "
+"is of course possible to call users who are using another provider than "
+"ekiga.net. You can actually call any user using SIP software or hardware, "
+"and registered to any public SIP provider"
+msgstr ""
+"Das Online-Adressbuch von <application>Ekiga</application> können Sie "
+"benutzen, um die SIP-Adressen anderer <application>Ekiga</application>-"
+"Benutzer zu ermitteln. Natürlich können Sie auch Benutzer anrufen, die einen "
+"anderen Dienstanbieter verwenden als Ekiga.net. Derzeit können Sie jeden "
+"Benutzer erreichen, der SIP-Geräte oder -Software benutzt und bei einem "
+"beliebigen öffentlichen SIP-Dienstanbieter registriert ist."
 
+# <guilabel>sip:</guilabel>
 #: C/ekiga.xml:287(para)
 msgid ""
-"If you know the URI address of the party that you wish to call, you may enter "
-"that URI into the sip: input box at the top of the screen and press the "
-"Connect button; eg: sip:foo@ekiga.net and pressing the Connect button would "
-"call the user at that address."
-msgstr ""
+"If you know the URI address of the party that you wish to call, you may "
+"enter that URI into the sip: input box at the top of the screen and press "
+"the Connect button; eg: sip:foo@ekiga.net and pressing the Connect button "
+"would call the user at that address."
+msgstr ""
+"Falls Sie die Adresse des Teilnehmers kennen, den Sie anrufen wollen, geben "
+"Sie diese Adresse in das Eingabefeld <guilabel>sip:</guilabel> am oberen "
+"Rand des Fensters ein und klicken Sie auf den Knopf <guibutton>Verbinden</"
+"guibutton>. Mit <guilabel>sip:foo@ekiga.net</guilabel> und anschließendem "
+"Anklicken des <guibutton>Verbinden</guibutton>-Knopfes rufen Sie den "
+"Benutzer mit dieser Adresse an."
 
 #: C/ekiga.xml:289(para)
 msgid ""
-"It is also possible to call contacts using the address book, the call history "
-"or the roster. You can add contacts you call frequently to your roster, and "
-"watch their presence information in order to know when they are available. "
-"Please refer to the appropriate section of the manual for full explanations."
-msgstr ""
+"It is also possible to call contacts using the address book, the call "
+"history or the roster. You can add contacts you call frequently to your "
+"roster, and watch their presence information in order to know when they are "
+"available. Please refer to the appropriate section of the manual for full "
+"explanations."
+msgstr ""
+"Es ist auch möglich, Kontakte unter Zuhilfenahme des Adressbuchs, der "
+"Anrufchronik oder der Kontaktliste anzurufen. Häufig genutzte Kontakte "
+"können Sie zu Ihrer Kontaktliste hinzufügen und deren "
+"Anwesenheitsinformationen überwachen, um die Verfügbarkeit zu prüfen. In den "
+"entsprechenden Abschnitten dieses Handbuchs finden Sie hierzu ausführliche "
+"Erläuterungen."
 
 #: C/ekiga.xml:291(para)
 msgid ""
-"<application>Ekiga</application> also supports H.323 and as such can call any "
-"H.323 software or hardware. Please refer to the section related to URIs to "
-"learn more about the various types of URIs that can be used to call remote "
-"H.323 and SIP users."
-msgstr ""
+"<application>Ekiga</application> also supports H.323 and as such can call "
+"any H.323 software or hardware. Please refer to the section related to URIs "
+"to learn more about the various types of URIs that can be used to call "
+"remote H.323 and SIP users."
+msgstr ""
+"<application>Ekiga</application> unterstützt auch H.323 und ist somit in der "
+"Lage, jegliche H.323-Hardware oder -Software anzurufen. Informieren Sie sich "
+"in den Abschnitten bezüglich der Adressen über die verschiedenen "
+"Adresstypen, die zum Anrufen entfernter H.323- und SIP-Benutzer verwendet "
+"werden."
 
 #: C/ekiga.xml:294(title)
 msgid "From computer to real phones (PC-To-Phone)"
@@ -505,11 +599,18 @@
 msgid ""
 "<application>Ekiga</application> can be used with several Internet Telephony "
 "Service Providers. Those providers will allow calling real phones from your "
-"computer using <application>Ekiga</application> at interesting rates. We are "
-"recommending you to use the default <application>Ekiga</application> "
-"provider. You can get an account using the links in the configuration "
-"assistant as described above."
-msgstr ""
+"computer using <application>Ekiga</application> at interesting rates. We "
+"recommend you use the default <application>Ekiga</application> provider. You "
+"can get an account using the links in the configuration assistant as "
+"described above."
+msgstr ""
+"<application>Ekiga</application> kann mit verschiedenen Internet-"
+"Telefondienstanbietern verwendet werden. Diese Dienstanbieter ermöglichen "
+"Anrufe zu realen Telefonanschlüssen von Ihrem Rechner mittels "
+"<application>Ekiga</application> zu günstigen Preisen. Wir empfehlen, den "
+"vorgegebenen Dienstanbieter <application>Ekiga</application> zu verwenden. "
+"Ein Konto erhalten Sie über die Links im Konfigurationsassistenten, wie oben "
+"beschrieben."
 
 #: C/ekiga.xml:297(para)
 msgid ""
@@ -517,22 +618,39 @@
 "diamondcard.us in the list to call the real phone number +3210444555, 32 is "
 "the country code, 10444555 is the number to call."
 msgstr ""
+"Mit der Vorgabekonfiguration können Sie einfach sip:3210444555 verwenden und "
+"sip.diamondcard.us in der Liste wählen, um die reale Telefonnummer "
+"+3210444555 anzurufen, wobei 32 die Landesvorwahl darstellt und 10444555 die "
+"anzurufende Nummer."
 
 #: C/ekiga.xml:299(para)
 msgid ""
 "You can also dial real phone numbers from the address book. If the phone "
 "number of the contact you want to call is stored in the address book, simply "
-"select Action -&gt; Call [Ekiga Call Out] when the contact is highlighted. It "
-"will dial the phone number of the contact using the Ekiga Call Out account."
-msgstr ""
+"select Action -&gt; Call [Ekiga Call Out] when the contact is highlighted. "
+"It will dial the phone number of the contact using the Ekiga Call Out "
+"account."
+msgstr ""
+"Aus dem Adressbuch können Sie auch reale Telefonnummern anrufen. Falls die "
+"gewünschte Telefonnummer im Adressbuch gespeichert ist, wählen Sie "
+"<menuchoice><guimenu>Aktion</guimenu><guimenuitem>Anruf [Ekiga »PC zu "
+"Telefon«]</guimenuitem></menuchoice>, wenn der Kontakt hervorgehoben ist. "
+"Daraufhin wird die Telefonnummer des Kontakts über das »PC zu Telefon«-Konto "
+"von <application>Ekiga</application> gewählt."
 
 #: C/ekiga.xml:301(para)
 msgid ""
 "<application>Ekiga</application> also supports connecting to H.323 and SIP "
 "PBX systems. If the PBX at your office supports those protocols, you will be "
 "able to call real phones and be called from real phones after having "
-"connected to the PBX. Please ask for the settings to your administrator."
+"connected to the PBX. Please ask for the settings from your administrator."
 msgstr ""
+"<application>Ekiga</application> unterstützt auch die Verbindung zu "
+"Telefonanlagen über die H.323- und SIP-Protokolle. Falls die Telefonanlage "
+"in Ihrem Büro diese Protokolle unterstützt, können Sie gewöhnliche "
+"Telefonanschlüsse anrufen und von diesen aus angerufen werden, sobald Sie "
+"sich mit der Telefonanlage verbunden haben. Bitte fragen Sie Ihren "
+"Systemverwalter nach den erforderlichen Einstellungen."
 
 #: C/ekiga.xml:304(title)
 msgid "From real phone to computer (Phone-To-PC)"
@@ -546,12 +664,21 @@
 "the country of your choice. <application>Ekiga</application> will ring when "
 "people will call that phone number."
 msgstr ""
+"Mit <application>Ekiga</application> können Sie eingehende Anrufe von "
+"gewöhnlichen Telefonen empfangen. Um dies zu ermöglichen, melden Sie sich "
+"unter Zuhilfenahme des oben erwähnten Werkzeug-Menüs an Ihrem PC-zu-Telefon-"
+"Konto an und erwerben eine Telefonnummer in dem Land Ihrer Wahl. "
+"<application>Ekiga</application> klingelt, wenn jemand diese Telefonnummer "
+"anruft."
 
 #: C/ekiga.xml:307(para)
 msgid ""
 "You can actually use any H.323 or SIP ITSP provider, including your own PBX "
 "at work. However we recommend using the integrated provider."
 msgstr ""
+"Derzeit können Sie H.323- oder SIP-Dienste benutzen, einschließlich einer "
+"eigenen PBX-Telefonanlage. Wir empfehlen jedoch die Nutzung des integrierten "
+"Dienstes."
 
 #: C/ekiga.xml:314(title)
 msgid "Managing Contacts"
@@ -559,7 +686,7 @@
 
 #: C/ekiga.xml:315(title)
 msgid "Adding contacts to the roster"
-msgstr ""
+msgstr "Hinzufügen von Kontakten zur Kontaktliste"
 
 #: C/ekiga.xml:319(para)
 msgid ""
@@ -570,23 +697,43 @@
 "presence information</emphasis> about your friends. Ekiga.net supports "
 "publishing presence information for its users. Software PBX systems like "
 "<ulink url=\"http://www.asterisk.org\" type=\"http\">Asterisk</ulink> can "
-"report if an user is on the phone or not, and <application>Ekiga</"
+"report if a user is on the phone or not, and <application>Ekiga</"
 "application> will display that information in its roster."
 msgstr ""
+"<application>Ekiga</application> ermöglicht Ihnen das Hinzufügen Ihrer "
+"meistgenutzten Kontakten zur Kontaktliste. Dadurch können Sie Ihre Freunde "
+"anrufen oder eine Unterhaltung beginnen, ohne über deren Adressen nachdenken "
+"zu müssen. Falls dies vom Dienst unterstützt wird, zeigt <application>Ekiga</"
+"application> <emphasis>erweiterte Anwesenheitsinformationen</emphasis> zu "
+"Ihren Freunden an. Ekiga.net unterstützt das Veröffentlichen von "
+"Anwesenheitsinformationen für seine Benutzer. Softwaregestützte PBX-"
+"Telefonanlagen wie <ulink url=\"http://www.asterisk.org\" type=\"http"
+"\">Asterisk</ulink> können ermitteln, ob ein Benutzer telefoniert oder "
+"nicht. Diese Information zeigt <application>Ekiga</application> in der "
+"Kontaktliste an."
 
 #: C/ekiga.xml:325(para)
 msgid ""
 "You can thus use <application>Ekiga</application> to monitor lines on your "
 "PBX."
 msgstr ""
+"Sie können daher <application>Ekiga</application> zum Überwachen der "
+"Leitungen Ihrer PBX-Telefonanlage nutzen."
 
 #: C/ekiga.xml:329(para)
 msgid ""
 "<application>Ekiga</application> is also able to detect other "
 "<application>Ekiga</application> users on the LAN using the Bonjour "
 "technology popularized by Apple (tm) and to display them in the roster. That "
-"supposes you have a local mDNSResponder daemon running on your computer."
+"supposes you have a local mDNSResponder daemon running on your computer. On "
+"Linux systems this service will usually be provided by Avahi."
 msgstr ""
+"<application>Ekiga</application> ist außerdem in der Lage, andere "
+"<application>Ekiga</application>-Benutzer im lokalen Netzwerk mit Hilfe der "
+"von Apple™ popularisierten Bonjour-Technologie aufzuspüren und diese in der "
+"Kontaktliste anzuzeigen. Das setzt voraus, dass auf Ihrem Rechner ein "
+"lokaler mDNSResponder-Dienst läuft. Auf Linux-Systemen wird dieser Dienst "
+"üblicherweise von Avahi bereitgestellt."
 
 #: C/ekiga.xml:333(para)
 msgid ""
@@ -594,17 +741,28 @@
 "required fields. If the service managing the URI you entered for the contact "
 "is able to publish presence status, Ekiga will automatically display it."
 msgstr ""
+"Um einen Kontakt zur Kontaktliste hinzuzufügen, wählen Sie "
+"<menuchoice><guimenu>Chat</guimenu><guimenuitem>Kontakt hinzufügen</"
+"guimenuitem></menuchoice> und füllen die erforderlichen Felder aus. Falls "
+"der Dienst, der die für diesen Kontakt eingegebene Adresse verwaltet, zur "
+"Veröffentlichung des Anwesenheitsstatus fähig ist, dann zeigt "
+"<application>Ekiga</application> diesen Status automatisch an."
 
 #: C/ekiga.xml:337(para)
 msgid ""
-"If you do not know the VoIP URI of a contact, you might try searching for him "
-"using the Ekiga.net online directory. To do so, select Chat -&gt; Address "
-"Book, and start searching using the 'Search Filter' feature."
-msgstr ""
+"If you do not know the VoIP URI of a contact, you might try searching for "
+"him using the Ekiga.net online directory. To do so, select Chat -&gt; "
+"Address Book, and start searching using the 'Search Filter' feature."
+msgstr ""
+"Falls Sie die VoIP-Adresse eines Kontakts nicht kennen, können Sie im Online-"
+"Verzeichnis von Ekiga.net danach suchen. Wählen Sie hierzu "
+"<menuchoice><guimenu>Chat</guimenu><guimenuitem>Adressbuch</guimenuitem></"
+"menuchoice> und starten die Suche über das Eingabefeld <guilabel>Suchfilter</"
+"guilabel>."
 
 #: C/ekiga.xml:341(para)
 msgid "You can organise your contacts in groups in the roster."
-msgstr ""
+msgstr "Sie können innerhalb der Kontaktliste Ihre Kontakte in Gruppen ordnen."
 
 #: C/ekiga.xml:343(title)
 msgid "Managing contacts"
@@ -612,106 +770,212 @@
 
 #: C/ekiga.xml:347(para)
 msgid ""
-"<application>Ekiga</application> allows you looking for contacts using "
-"various sources like the <ulink url=\"http://www.novell.com/products/evolution"
-"\" type=\"http\">Novell Evolution</ulink> address book, an LDAP directory or "
-"the Ekiga.net contact directory. You can use the result of your search to "
-"start a chat, call the contact, or simply add him to your roster if you have "
-"frequent calls with him. To start looking for contacts, select Chat -&gt; "
-"Address Book in the menu. To your left there will be a list dialog showing "
-"the LDAP directories as well as a list of local Address Books. The defaults "
-"are the <application>Ekiga</application> white pages, and the personal "
-"address book from <ulink url=\"http://www.novell.com/products/evolution\" "
-"type=\"http\">Novell Evolution</ulink>. Support for more contact sources is "
-"possible."
-msgstr ""
+"<application>Ekiga</application> allows you to look for contacts using "
+"various sources like the <ulink url=\"http://www.novell.com/products/"
+"evolution\" type=\"http\">Novell Evolution</ulink> address book, an LDAP "
+"directory or the Ekiga.net contact directory. You can use the result of your "
+"search to start a chat, call the contact, or simply add him to your roster "
+"if you have frequent calls with him. To start looking for contacts, select "
+"Chat -&gt; Address Book in the menu. To your left there will be a list "
+"dialog showing the LDAP directories as well as a list of local Address "
+"Books. The defaults are the <application>Ekiga</application> white pages, "
+"and the personal address book from <ulink url=\"http://www.novell.com/"
+"products/evolution\" type=\"http\">Novell Evolution</ulink>. Support for "
+"more contact sources is possible."
+msgstr ""
+"<application>Ekiga</application> ermöglicht Ihnen die Suche nach Kontakten "
+"in verschiedenen Quellen wie dem Adressbuch von <ulink url=\"http://www."
+"novell.com/products/evolution\" type=\"http\">Novell Evolution</ulink>, "
+"einem LDAP-Verzeichnisdienst oder dem Kontaktverzeichnis von Ekiga.net. Sie "
+"können die Suchergebnisse zum Starten von Unterhaltungen, Anrufen des "
+"Kontakts oder zum Hinzufügen des Kontakts zur Kontaktliste verwenden, wenn "
+"Sie ihn häufiger anrufen. Um mit der Suche nach Kontakten zu beginnen, "
+"wählen Sie <menuchoice><guimenu>Chat</guimenu><guimenuitem>Adressbuch</"
+"guimenuitem></menuchoice> aus dem Menü. Links wird ein Listendialog "
+"angezeigt, der sowohl die LDAP-Verzeichnisse als auch die Liste der lokalen "
+"Adressbücher anzeigt. Vorgegeben sind hierbei das Telefonbuch von "
+"<application>Ekiga</application> und das persönliche Adressbuch von <ulink "
+"url=\"http://www.novell.com/products/evolution\" type=\"http\">Novell "
+"Evolution</ulink>. Die Unterstützung weiterer Kontaktquellen ist ebenfalls "
+"möglich."
 
 #: C/ekiga.xml:352(para)
 msgid ""
-"<application>Ekiga</application> is able to browse any LDAP directory and use "
-"a specific attribute as calling URI. For example, you could have an LDAP "
+"<application>Ekiga</application> is able to browse any LDAP directory and "
+"use any attribute as the calling URI. For example, you could have an LDAP "
 "directory in your company, with a specific attribute containing the local "
 "extensions of all your colleagues. <application>Ekiga</application> is able "
 "to use such an LDAP directory. Simply select in Address Book -&gt; Add an "
-"LDAP Address Book, and fill in the required details. You can then right-click "
-"on the contact and call him using the call attribute as VoIP URI."
+"LDAP Address Book, and fill in the required details. You can then right-"
+"click on the contact and call him using the call attribute as VoIP URI."
 msgstr ""
+"<application>Ekiga</application> ist fähig, beliebige LDAP-Verzeichnisse zu "
+"durchsuchen und Attribute als Anrufadresse zu verwenden. Wenn Ihr "
+"Unternehmen über einen LDAP-Verzeichnisdienst verfügt, der ein spezifisches "
+"Attribut mit den lokalen Erweiterungen der Mitarbeiter beinhaltet, dann ist "
+"<application>Ekiga</application> in der Lage, ein solches LDAP-Verzeichnis "
+"zu benutzen. Wählen Sie <menuchoice><guimenu>Adressbuch</"
+"guimenu><guimenuitem>Ein LDAP-Adressbuch hinzufügen</guimenuitem></"
+"menuchoice> und geben Sie die benötigten Details an. Sie können dann mit der "
+"rechten Maustaste auf den Kontakt klicken und ihn unter Verwendung der "
+"Anrufattribute als VoIP-Adresse anrufen."
 
 #: C/ekiga.xml:356(para)
 msgid ""
+"The LDAP Address Book supports a range of settings to allow it to work with "
+"any LDAPv3 directory. It allows you to choose the attribute to use for "
+"displaying a contact's name in the address book as well as a list of "
+"attributes for callng info. E.g., if the directory uses the LDAP "
+"inetOrgPerson schema you can configure the Address Book to retrieve the "
+"homePhone, mobile, and pager attributes make those values available for "
+"calling or messaging. You can also customize a Filter Template for the "
+"default LDAP search filter, and override the default filter at any time if "
+"you need to perform a more specialized search. The browser also supports all "
+"security options for LDAP including ldaps:// (LDAP over SSL), StartTLS, and "
+"SASL authentication."
+msgstr ""
+"Das LDAP-Adressbuch unterstützt eine Reihe von Einstellungen, um die "
+"reibungslose Zusammenarbeit mit beliebigen LDAP-Verzeichnisdiensten zu "
+"gewährleisten. Es ermöglicht Ihnen sowohl die Auswahl von Attributen zur "
+"Anzeige eines Kontaktnamens als auch die Anzeige einer Liste von Attributen "
+"für Anrufinformationen. Wenn beispielsweise der Verzeichnisdienst das LDAP-"
+"Schema »inetOrgPerson« verwendet, können Sie das Adressbuch so konfigurieren, "
+"dass die Werte der Attribute »homePhone«, »mobile« und »pager« für Anrufe oder "
+"Sofortnachrichten verfügbar gemacht werden. Außerdem lässt sich die "
+"Filterschablone für den vorgegebenen LDAP-Suchfilter anpassen und jederzeit "
+"anstatt des vorgegebenen Filters verwenden, falls Sie eine speziellere Suche "
+"ausführen wollen. Der Browser unterstützt auch alle Sicherheitsoptionen für "
+"LDAP, wie ldaps:// (LDAP über SSL) sowie die Legitimierung mittels StartTLS "
+"und SASL."
+
+#: C/ekiga.xml:360(para)
+msgid ""
 "To refresh the list of users for a specific address book, simply click the "
 "Find button. It will search for all users in that address book. You can "
 "contact people by double clicking on their highlighted field. You can also "
 "message them by right-clicking or by choosing the appropriate action in the "
 "Action menu of the window."
 msgstr ""
+"Um die Benutzerliste für ein bestimmtes Adressbuch zu aktualisieren, klicken "
+"Sie einfach auf den Knopf <guibutton>Suchen</guibutton>. Dadurch wird die "
+"Suche nach allen Benutzern in diesem Adressbuch ausgelöst. Sie können "
+"Benutzer kontaktieren, indem Sie auf das jeweils hervorgehobene Feld "
+"doppelklicken. Ebenfalls möglich ist der Zugriff über das Kontextmenü der "
+"rechten Maustaste oder durch Wählen der entsprechenden Aktion im Menü "
+"<guimenu>Aktionen</guimenu> des Fensters."
 
-#: C/ekiga.xml:360(para)
+#: C/ekiga.xml:364(para)
 msgid ""
 "In certain cases you will want to search specifically for a person name, or "
 "his or her call URI in the <application>Ekiga</application> white pages. The "
-"address book window allows you to apply filters when searching for contacts."
-msgstr ""
+"address book window allows you to apply filters when searching for contacts. "
+"When searching an LDAP directory, entering a simple name in the Search "
+"Filter field will perform an LDAP Substring search using the configured "
+"Filter Template. If you need to perform a more specialized search you can "
+"enter a complete LDAP Filter string, and it will be used instead of the "
+"configured Filter Template."
+msgstr ""
+"In verschiedenen Fällen wollen Sie speziell nach dem Namen einer Person oder "
+"nach ihrer Anrufadresse im Telefonbuch von <application>Ekiga</application> "
+"suchen. Das Adressbuch-Fenster erlaubt Ihnen die Anwendung von Filtern, wenn "
+"Sie nach Kontakten suchen. Beim Durchsuchen eines LDAP-Verzeichnisses geben "
+"Sie einen Namen in das Suchfilter-Feld ein, woraufhin eine Suche nach einer "
+"LDAP-Teilzeichenkette anhand dieser Filterschablone ausgeführt wird. Falls "
+"Sie die Suche weiter eingrenzen wollen, können Sie auch eine vollständige "
+"LDAP-Suchzeichenkette eingeben, welche dann anstatt der eingestellten "
+"Filterschablone verwendet wird."
 
-#: C/ekiga.xml:364(para)
+#: C/ekiga.xml:368(para)
 msgid ""
 "The <application>Ekiga</application> white pages will allow you to look for "
-"users in your region. It returns a limited number of results corresponding to "
-"your search. You can then add him to your personal roster to call him later."
-msgstr ""
+"users in your region. It returns a limited number of results corresponding "
+"to your search. You can then add them to your personal roster to call them "
+"later."
+msgstr ""
+"Im Telefonbuch von <application>Ekiga</application> können Sie nach "
+"Benutzern in Ihrer Region suchen. Die Suche gibt anhand Ihrer Suchanfrage "
+"eine begrenzte Anzahl von Ergebnissen aus. Diese können Sie dann zu Ihrer "
+"persönlichen Kontaktliste hinzufügen, um sie später anzurufen."
 
-#: C/ekiga.xml:367(title)
+#: C/ekiga.xml:371(title)
 msgid "Editing contacts"
 msgstr "Kontakte bearbeiten"
 
-#: C/ekiga.xml:371(para)
+#: C/ekiga.xml:375(para)
 msgid ""
-"Local address books provided by Novell Evolution allow you adding new "
-"contacts, or editing existing contacts. Each different address book allows a "
+"Local address books provided by Novell Evolution allow you to add new "
+"contacts, or to edit existing contacts. Each different address book allows a "
 "different set of features depending on what makes sense for the address book "
 "in question. To discover what features are possible, simply select the "
 "address book and consult the Action menu."
 msgstr ""
+"Sie können aus den von <application>Novell Evolution</application> "
+"bereitgestellten lokalen Adressbüchern neue Kontakte hinzufügen oder "
+"vorhandene Kontakte bearbeiten. Die verschiedenen Adressbücher verfügen über "
+"unterschiedliche Funktionsmerkmale, abhängig davon, was für das jeweilige "
+"Adressbuch sinnvoll erscheint und was nicht. Um mehr über die verfügbaren "
+"Funktionen zu erfahren, wählen Sie das Adressbuch aus und öffnen Sie das "
+"Menü <guimenu>Aktionen</guimenu>."
 
-#: C/ekiga.xml:375(para)
+#: C/ekiga.xml:379(para)
 msgid ""
 "To add a contact to one of your local address books, simply select the "
 "address book you wish to add the contact to and select Action -&gt; New "
-"Contact. The option of adding a New Contact will appear and you may now enter "
-"his name and VoIP URI as well as other settings. After complete select 'OK' "
-"and now your contact has been added. You can only add contacts to local "
-"address books. The contact parameters can be changed at any time by selecting "
-"Action -&gt; Properties when the contact is highlighted. He can also be "
-"deleted by selecting Action -&gt; Remove."
-msgstr ""
+"Contact. The option of adding a New Contact will appear and you may now "
+"enter his name and VoIP URI as well as other settings. After complete select "
+"'OK' and now your contact has been added. You can only add contacts to local "
+"address books. The contact parameters can be changed at any time by "
+"selecting Action -&gt; Properties when the contact is highlighted. He can "
+"also be deleted by selecting Action -&gt; Remove."
+msgstr ""
+"Um einen Kontakt zu einem Ihrer lokalen Adressbücher hinzuzufügen, wählen "
+"Sie das gewünschte Adressbuch aus und wählen Sie "
+"<menuchoice><guimenu>Aktion</guimenu><guimenuitem>Neuer Kontakt</"
+"guimenuitem></menuchoice>. Ein Dialogfeld zum Hinzufügen eines neuen "
+"Kontakts wird geöffnet. Hier können Sie den Namen und die VoIP-Adresse sowie "
+"weitere Daten eingeben. Klicken Sie auf <guibutton>OK</guibutton>, sobald "
+"Sie fertig sind, woraufhin Ihr neuer Kontakt hinzugefügt wird. Sie können "
+"Kontakte nur zu lokalen Adressbüchern hinzufügen. Die Parameter des Kontakts "
+"können Sie jederzeit ändern, indem Sie <menuchoice><guimenu>Aktion</"
+"guimenu><guimenuitem>Bearbeiten</guimenuitem></menuchoice> wählen, wenn der "
+"Kontakt hervorgehoben ist. Mittels <menuchoice><guimenu>Aktion</"
+"guimenu><guimenuitem>Entfernen</guimenuitem></menuchoice> können Sie den "
+"Kontakt entfernen."
 
-#: C/ekiga.xml:379(para)
+#: C/ekiga.xml:383(para)
 msgid ""
-"You can also add a contact from the white pages (or any other local or remote "
-"address book) to the roster by selecting Action -&gt; Add to local roster "
-"when the contact is highlighted."
-msgstr ""
+"You can also add a contact from the white pages (or any other local or "
+"remote address book) to the roster by selecting Action -&gt; Add to local "
+"roster when the contact is highlighted."
+msgstr ""
+"Sie können auch einen Kontakt aus dem Telefonbuch oder jedem anderen lokalen "
+"oder entfernten Adressbuch zur Kontaktliste hinzufügen. Wählen Sie hierzu "
+"<menuchoice><guimenu>Aktion</guimenu><guimenuitem>Zur lokalen Kontaktliste "
+"hinzufügen</guimenuitem></menuchoice>, wenn der Kontakt hervorgehoben ist."
 
-#: C/ekiga.xml:383(para)
+#: C/ekiga.xml:387(para)
 msgid ""
 "Finally, you can edit the groups your users belong to using the Action -&gt; "
 "Properties dialog when the contact is highlighted."
 msgstr ""
-"Abschließend können Sie auch die Gruppe festlegen, zu der eine Person gehören "
-"soll. Benutzen Sie hierzu den Dialog »Benutzereigenschaften«, wenn der Kontakt "
-"hervorgehoben ist."
+"Abschließend können Sie auch die Gruppe festlegen, zu der eine Person "
+"gehören soll. Benutzen Sie hierzu den Dialog »Benutzereigenschaften«, wenn "
+"der Kontakt hervorgehoben ist."
 
-#: C/ekiga.xml:391(title)
+#: C/ekiga.xml:395(title)
 msgid "Sending instant messages"
 msgstr "Sofortnachrichten senden"
 
-#: C/ekiga.xml:395(para)
+#: C/ekiga.xml:399(para)
 msgid ""
 "<application>Ekiga</application> allows you to send instant messages to "
 "remote users provided that you know their URI."
 msgstr ""
+"<application>Ekiga</application> ermöglicht Ihnen das Senden von "
+"Sofortnachrichten zu entfernten Benutzern, vorausgesetzt dass Sie deren "
+"Adresse kennen."
 
-#: C/ekiga.xml:399(para)
+#: C/ekiga.xml:403(para)
 msgid ""
 "You can send instant messages from the roster, from the call history or from "
 "the address book. From the roster or from the call history, simply select "
@@ -720,19 +984,31 @@
 "is highlighted. A window pops up, enter your text message, and hit the Enter "
 "key."
 msgstr ""
+"Sie können Sofortnachrichten aus der Kontaktliste, der Anrufchronik oder aus "
+"dem Adressbuch versenden. Aus der Kontaktliste oder der Anrufchronik wählen "
+"Sie <menuchoice><guimenu>Kontakt</guimenu><guimenuitem>Nachricht</"
+"guimenuitem></menuchoice> im Hauptfenster, wenn der Kontakt hervorgehoben "
+"ist. Im Adressbuchfenster wählen Sie <menuchoice><guimenu>Aktion</"
+"guimenu><guimenuitem>Nachricht</guimenuitem></menuchoice>, wenn der Kontakt "
+"hervorgehoben ist. Geben Sie im sich öffnenden Fenster Ihre Nachricht ein "
+"und bestätigen Sie mit der <keycap>Eingabetaste</keycap>."
 
-#: C/ekiga.xml:403(para)
+#: C/ekiga.xml:407(para)
 msgid ""
 "You can not exchange text messages with all protocols. <application>Ekiga</"
-"application> will only display the Message menun item when the protocol "
+"application> will only display the Message menu item when the protocol "
 "associated with the user permits it."
 msgstr ""
+"Für den Austausch von Textnachrichten stehen nicht alle Protokolle zur "
+"Verfügung. <application>Ekiga</application> zeigt den Menüeintrag "
+"<guilabel>Nachricht</guilabel> nur dann an, wenn es mit dem dem Benutzer "
+"zugeordneten Protokoll umgehen kann."
 
-#: C/ekiga.xml:408(title)
+#: C/ekiga.xml:412(title)
 msgid "Updating his own status"
-msgstr ""
+msgstr "Aktualisierung des eigenen Status."
 
-#: C/ekiga.xml:412(para)
+#: C/ekiga.xml:416(para)
 msgid ""
 "<application>Ekiga</application> allows you to publish your status to other "
 "users."
@@ -740,77 +1016,118 @@
 "<application>Ekiga</application> ermöglicht Ihnen, Ihren Status anderen "
 "Benutzern zu übermitteln."
 
-#: C/ekiga.xml:416(para)
+#: C/ekiga.xml:420(para)
 msgid ""
 "There are three categories of status messages : online, away and do not "
 "disturb. Each of them allows you to specify a more complete status "
-"information. Simply select Custom message in the status menu at the bottom of "
-"the main window. You can then define your extended status message that will "
-"be published using all available protocols supporting it."
-msgstr ""
+"information. Simply select Custom message in the status menu at the bottom "
+"of the main window. You can then define your extended status message that "
+"will be published using all available protocols supporting it."
+msgstr ""
+"Es gibt drei Kategorien von Statusmeldungen: »Verbunden«, »Abwesend« und "
+"»Nicht stören«. Jede davon ermöglicht Ihnen die Angabe erweiterter "
+"Statusinformationen. Wählen Sie <guilabel>Angepasste Nachricht</guilabel> "
+"aus der Auswahlliste für den Status am unteren Rand des Hauptfensters. Die "
+"von Ihnen hier festgelegte erweiterte Statusnachricht wird mittels aller "
+"unterstützter Protokolle veröffentlicht."
+
+#: C/ekiga.xml:424(para)
+msgid ""
+"Many servers will not support relaying your extended presence information. "
+"To make sure that this feature is available with the server you are using or "
+"with the PBX you are connected to, please ask your administrator. Please "
+"note that Ekiga.net will publish your presence information."
+msgstr ""
+"Viele Server unterstützen die Änderung Ihrer erweiterten "
+"Anwesenheitsinformationen nicht. Um sicherzustellen, dass dieses "
+"Funktionsmerkmal mit dem verwendeten Server oder der verbundenen PBX-"
+"Telefonanlage verfügbar ist, fragen Sie bitte Ihren Systemverwalter. Bitte "
+"beachten Sie, dass Ekiga.net Ihre Anwesenheitsinformationen veröffentlicht."
 
-#: C/ekiga.xml:420(para)
-msgid ""
-"Many servers will not accept to relay your extended presence information. To "
-"make sure that this feature is available with the server you are using or "
-"with the PBX you are connected to, please ask your administrator. Please note "
-"that Ekiga.net will publish your presence information."
-msgstr ""
-
-#: C/ekiga.xml:425(title)
+#: C/ekiga.xml:429(title)
 msgid "Managing Calls"
-msgstr ""
+msgstr "Verwalten von Anrufen"
 
-#: C/ekiga.xml:427(title)
+#: C/ekiga.xml:431(title)
 msgid "Forwarding incoming calls"
 msgstr "Weiterleiten eingehender Anrufe"
 
-#: C/ekiga.xml:428(para)
+#: C/ekiga.xml:432(para)
 msgid ""
 "<application>Ekiga</application> supports different policies for unanswered "
 "incoming calls. Per default it displays a popup window which allows you to "
-"decide whether you want to refuse or accept the request for an incoming call. "
-"If you do not answer the call in the required time, or if you are busy, or if "
-"you do not want to receive any call, <application>Ekiga</application> can "
-"forward the call to another party."
-msgstr ""
+"decide whether you want to refuse or accept the request for an incoming "
+"call. If you do not answer the call in the required time, or if you are "
+"busy, or if you do not want to receive any call, <application>Ekiga</"
+"application> can forward the call to another party."
+msgstr ""
+"<application>Ekiga</application> unterstützt verschiedene Regeln für den "
+"Umgang mit unbeantworteten eingehenden Anrufen. Per Vorgabe wird ein Fenster "
+"geöffnet, in welchem Sie wählen können, ob Sie den eingehenden Anruf "
+"annehmen oder abweisen wollen. Falls Sie in der erforderlichen Zeit nicht "
+"antworten, wenn Sie beschäftigt sind oder wenn Sie überhaupt keine Anrufe "
+"entgegennehmen wollen, dann kann <application>Ekiga</application> den Anruf "
+"an einen anderen Teilnehmer weiterleiten."
 
-#: C/ekiga.xml:434(para)
+#: C/ekiga.xml:438(para)
 msgid ""
 "Notice that you need to specify an URI where to forward calls in the "
 "preferences to be able to activate that option. Open the preferences window "
-"by choosing Edit -&gt; Preferences in the main window and select Call Options "
-"on the left. You will now see the appropriate section. It contains three "
-"checkboxes for the three cases described above. The URI of the party the "
-"calls shall be forwarded to can be configured separate in SIP Settings for "
-"SIP and accordingly in H.323 Settings for H.323."
-msgstr ""
+"by choosing Edit -&gt; Preferences in the main window and select Call "
+"Options on the left. You will now see the appropriate section. It contains "
+"three checkboxes for the three cases described above. The URI of the party "
+"the calls shall be forwarded to can be configured separately in SIP Settings "
+"for SIP and accordingly in H.323 Settings for H.323."
+msgstr ""
+"Beachten Sie, dass Sie eine Weiterleitungsadresse in den Einstellungen "
+"angeben müssen, um diese Option nutzen zu können. Wählen Sie "
+"<menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Einstellungen</"
+"guimenuitem></menuchoice>, um den Einstellungsdialog zu öffnen. Wählen Sie "
+"an der linken Seite <guilabel>Verbindungs-Optionen</guilabel> aus. Der "
+"entsprechende Abschnitt enthält drei Ankreuzfelder für die drei oben "
+"beschriebenen Fälle. Die eigentliche Weiterleitungsadresse kann separat in "
+"den SIP-Einstellungen beziehungsweise für das H.323-Protokoll in den H.323-"
+"Einstellungen festgelegt werden."
 
-#: C/ekiga.xml:439(title)
+#: C/ekiga.xml:443(title)
 msgid "Controlling the call"
 msgstr "Verbindungen steuern"
 
-#: C/ekiga.xml:440(para)
+#: C/ekiga.xml:444(para)
 msgid ""
 "<application>Ekiga</application> supports several actions which can be "
-"performed when in a call. These actions enable you to control active sessions."
+"performed when in a call. These actions enable you to control active "
+"sessions."
 msgstr ""
+"<application>Ekiga</application> unterstützt verschiedene Aktionen, die "
+"während eines Anrufs ausgeführt werden können. Diese Aktionen ermöglichen "
+"Ihnen die Steuerung aktiver Sitzungen."
 
-#: C/ekiga.xml:444(para)
+#: C/ekiga.xml:448(para)
 msgid ""
-"Ending a call: The communication to the remote user can be ended by selecting "
-"Chat -&gt; Hang up."
+"Ending a call: The communication to the remote user can be ended by "
+"selecting Chat -&gt; Hang up."
 msgstr ""
+"Beenden eines Anrufs: Die Verbindung zu einem entfernten Benutzer wird durch "
+"<menuchoice><guimenu>Chat</guimenu><guimenuitem>Auflegen</guimenuitem></"
+"menuchoice> beendet."
 
-#: C/ekiga.xml:448(para)
+#: C/ekiga.xml:452(para)
 msgid ""
-"Holding a call: You can hold a remote party call by selecting Chat -&gt; Hold "
-"Call. This effectively pauses Video and Audio transmission, to continue "
+"Holding a call: You can hold a remote party call by selecting Chat -&gt; "
+"Hold Call. This effectively pauses Video and Audio transmission; to continue "
 "transmission again you select Chat -&gt; Retrieve Call and Video and Audio "
 "Transmission will begin again."
 msgstr ""
+"Halten eines Anrufs: Durch Wählen von <menuchoice><guimenu>Chat</"
+"guimenu><guimenuitem>Verbindung halten</guimenuitem></menuchoice> können Sie "
+"die Verbindung zu einem entfernten Benutzer halten. Die Video- und "
+"Audioübertragung wird unmittelbar angehalten. Um die Übertragung "
+"fortzusetzen, wählen Sie <menuchoice><guimenu>Chat</"
+"guimenu><guimenuitem>Verbindung fortsetzen</guimenuitem></menuchoice>, "
+"woraufhin die Video- und Audioübertragung wieder aufgenommen wird."
 
-#: C/ekiga.xml:452(para)
+#: C/ekiga.xml:456(para)
 msgid ""
 "Suspend Audio: This effectively prevents all Audio communication to your "
 "respective party when selecting Chat -&gt; Suspend Audio."
@@ -818,7 +1135,7 @@
 "Audio abschalten: Dies verhindert jegliche Audioübertragung zum jeweiligen "
 "Gesprächspartner, wenn Sie »Chat &gt; Audio abschalten« wählen."
 
-#: C/ekiga.xml:456(para)
+#: C/ekiga.xml:460(para)
 msgid ""
 "Suspend Video: This effectively prevents all Video transmission to your "
 "respective party when selecting Chat -&gt; Suspend Video."
@@ -826,7 +1143,7 @@
 "Video anhalten: Dies verhindert jegliche Videoübertragung zum jeweiligen "
 "Gesprächspartner, wenn Sie »Chat &gt; Video anhalten« wählen."
 
-#: C/ekiga.xml:460(para)
+#: C/ekiga.xml:464(para)
 msgid ""
 "Transferring the remote party: You can transfer the remote user to another "
 "user by selecting Chat -&gt; Transfer Call. It is also possible to transfer "
@@ -836,45 +1153,61 @@
 "the Action menu in the Address Book window and choosing the transfer action "
 "will also work."
 msgstr ""
+"Anruf entfernt weiterleiten: Sie können einen entfernten Benutzer an einen "
+"anderen Benutzer weiterleiten, indem Sie im Menü <menuchoice><guimenu>Chat</"
+"guimenu><guimenuitem>Anruf weiterleiten</guimenuitem></menuchoice> wählen. "
+"Es ist auch möglich, einen aktiven Anruf durch einen Klick mit der rechten "
+"Maustaste und Auswählen der Weiterleitungsaktion weiterzuleiten, wenn der "
+"Kontakt in der Kontaktliste, im Adressbuch oder in der Anrufchronik "
+"hervorgehoben ist. Doppelklicken auf das Menü <guimenu>Kontakt</guimenu> im "
+"Hauptfenster oder auf das Menü <guimenu>Aktion</guimenu> im Adressbuch-"
+"Fenster funktioniert ebenfalls."
 
-#: C/ekiga.xml:464(para)
+#: C/ekiga.xml:468(para)
 msgid ""
 "All URIs supported by <application>Ekiga</application> can be used for call "
 "transfer if the protocol supports it."
 msgstr ""
+"Alle von <application>Ekiga</application> unterstützten Adressen können für "
+"Anrufe verwendet werden, sofern das Protokoll dies unterstützt."
 
-#: C/ekiga.xml:467(title)
+#: C/ekiga.xml:471(title)
 msgid "Adjusting the audio and video settings"
 msgstr "Audio- und Video-Einstellungen vornehmen"
 
-#: C/ekiga.xml:468(para)
+#: C/ekiga.xml:472(para)
 msgid ""
 "Your audio and video settings can be adjusted through the call panel while "
-"you are in a call. If you want to change the audio or video settings during a "
-"call, simply show the Call Panel by select View -&gt; Show Call Panel in the "
-"menu. The audio volume, but also the brightness, whiteness, color and "
+"you are in a call. If you want to change the audio or video settings during "
+"a call, simply show the Call Panel by select View -&gt; Show Call Panel in "
+"the menu. The audio volume, but also the brightness, whiteness, color and "
 "contrast of your video input device can be changed to achieve the best "
 "quality."
 msgstr ""
-"Die Audio- und Video-Einstellugen können während einer Verbindung in der "
+"Die Audio- und Video-Einstellungen können während einer Verbindung in der "
 "Anrufleiste angepasst werden. Falls Sie die Audio- oder Videoeinstellungen "
 "während eines Anrufs ändern wollen, rufen Sie die Anrufleiste über das Menü "
 "»Ansicht -&gt; Anrufleiste anzeigen« auf. Um die bestmögliche Qualität zu "
-"erreichen, können Sie hier die Lautstärke, die Helligkeit, den Gammawert, die "
-"Farbe und den Kontrats Ihres Video-Eingabegeräts ändern."
+"erreichen, können Sie hier die Lautstärke, die Helligkeit, den Gammawert, "
+"die Farbe und den Kontrast Ihres Video-Eingabegeräts ändern."
 
-#: C/ekiga.xml:472(para)
+#: C/ekiga.xml:476(para)
 msgid ""
 "You can also change your audio and video devices during a call. Simply go in "
 "the preferences window by selecting Edit -&gt; Preferences in the menu, and "
 "adjust your devices in the appropriate section."
 msgstr ""
+"Es ist möglich, während eines Gesprächs Ihre Audio- und Video-Geräte zu "
+"wechseln. Wählen Sie <menuchoice><guimenu>Bearbeiten</"
+"guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice>, um den "
+"Einstellungsdialog zu öffnen. Ändern Sie dann die Angaben zu den Geräten in "
+"den entsprechenden Abschnitten."
 
-#: C/ekiga.xml:477(title)
+#: C/ekiga.xml:481(title)
 msgid "Checking the call history"
-msgstr ""
+msgstr "Überprüfen der Anrufchronik"
 
-#: C/ekiga.xml:484(para)
+#: C/ekiga.xml:488(para)
 msgid ""
 "Received calls contains all incoming calls which were accepted by "
 "<application>Ekiga</application>"
@@ -882,47 +1215,61 @@
 "Angenommene Anrufe listet alle von <application>Ekiga</application> "
 "angenommenen Anrufe auf"
 
-#: C/ekiga.xml:490(para)
+#: C/ekiga.xml:494(para)
 msgid ""
-"Placed calls keeps track of all attempts - succesful or not - to call another "
-"user."
+"Placed calls keeps track of all attempts - successful or not - to call "
+"another user."
 msgstr ""
 "»Getätigte Anrufe« gibt einen Überblick über erfolgreiche als auch "
 "fehlgeschlagene Versuche, einen anderen Benutzer anzurufen."
 
-#: C/ekiga.xml:496(para)
+#: C/ekiga.xml:500(para)
 msgid "Missed calls shows incoming calls which timed out."
 msgstr ""
+"Versäumte Anrufe sind eingehende Anrufe, die wegen Zeitüberschreitung nicht "
+"angenommen wurden."
 
-#: C/ekiga.xml:481(para)
+#: C/ekiga.xml:485(para)
 msgid ""
 "The Call History stores information (date, duration, URI, Remote user) about "
 "all outgoing and incoming calls. They are divided into three groups - "
 "received calls, placed calls and missed calls. You can consult the call "
 "history by selecting View -&gt; Call History in the menu. <placeholder-1/>"
 msgstr ""
+"Die Anrufchronik speichert Informationen (Zeitpunkt, Dauer, Adresse, "
+"entfernter Benutzer) zu allen ausgehenden und eingehenden Anrufen. Diese "
+"sind in drei Gruppen gegliedert: empfangene Anrufe, getätigte Anrufe und "
+"versäumte Anrufe. Wählen Sie <menuchoice><guimenu>Ansicht</"
+"guimenu><guimenuitem>Anrufchronik</guimenuitem></menuchoice>, um die "
+"Anrufchronik anzuzeigen. <placeholder-1/>"
 
-#: C/ekiga.xml:503(para)
+#: C/ekiga.xml:507(para)
 msgid ""
 "Double-clicking on a row in the Calls History will call back the selected "
 "user or transfer any active call to that user. Notice that you can also add "
-"the contact to your roster by selecting Chat -&gt; Contact -&gt; Add to local "
-"roster in the main menu when the call is highlighted."
+"the contact to your roster by selecting Chat -&gt; Contact -&gt; Add to "
+"local roster in the main menu when the call is highlighted."
 msgstr ""
+"Ein Doppelklick auf eine Zeile in der Anrufchronik ruft den gewählten "
+"Benutzer zurück oder überträgt einen eventuellen aktiven Anruf auf diesen "
+"Benutzer. Sie können den Kontakt auch zur Kontaktliste hinzufügen, indem Sie "
+"<menuchoice><guimenu>Chat</guimenu><guisubmenu>Kontakt</"
+"guisubmenu><guimenuitem>Zur lokalen Kontaktliste hinzufügen</guimenuitem></"
+"menuchoice> wählen, wenn der Anruf hervorgehoben ist."
 
-#: C/ekiga.xml:511(title)
+#: C/ekiga.xml:515(title)
 msgid "Advanced Usage"
 msgstr "Fortgeschrittene Verwendung"
 
-#: C/ekiga.xml:514(title)
+#: C/ekiga.xml:518(title)
 msgid "Registering Additional Accounts"
 msgstr "Registrieren zusätzlicher Konten"
 
-#: C/ekiga.xml:516(title)
+#: C/ekiga.xml:520(title)
 msgid "The accounts window"
-msgstr ""
+msgstr "Das Konten-Fenster"
 
-#: C/ekiga.xml:520(para)
+#: C/ekiga.xml:524(para)
 msgid ""
 "You can open the accounts window by selecting Edit -&gt; Accounts. This will "
 "open the Accounts Window. The Accounts Window will allow you to add Ekiga."
@@ -932,434 +1279,635 @@
 "Telephony Service provider (like ekiga.net), or an IPBX (like CISCO, Nortel, "
 "or Asterisk)."
 msgstr ""
+"Wählen Sie <menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Konten</"
+"guimenuitem></menuchoice>, um das Konten-Fenster zu öffnen. In diesem "
+"Fenster können Sie Konten für Ekiga.net, Ekiga »PC zu Telefon«, SIP und H.323 "
+"hinzufügen und sich bei diesen Diensten registrieren. Ein Konto beschreibt "
+"die Parameter zur Benutzeranmeldung und Passwort für SIP- und H.323-Dienste. "
+"Diese <emphasis>Dienste</emphasis> können Internet-Telefondienstanbieter "
+"sein, oder IPBX-Dienste, wie CISCO, Nortel, oder Asterisk."
 
-#: C/ekiga.xml:526(title)
+#: C/ekiga.xml:530(title)
 msgid "Adding an Ekiga.net account"
 msgstr "Hinzufügen eines Ekiga.net-Kontos"
 
-#: C/ekiga.xml:533(para) C/ekiga.xml:573(para) C/ekiga.xml:591(para)
+#: C/ekiga.xml:537(para) C/ekiga.xml:577(para) C/ekiga.xml:595(para)
 msgid "<emphasis>User:</emphasis> You can enter your login."
-msgstr ""
+msgstr "<emphasis>Benutzer:</emphasis> Geben Sie Ihren Benutzernamen ein."
 
-#: C/ekiga.xml:534(para) C/ekiga.xml:575(para) C/ekiga.xml:593(para)
+#: C/ekiga.xml:538(para) C/ekiga.xml:579(para) C/ekiga.xml:597(para)
 msgid "<emphasis>Password:</emphasis> You can enter your password."
-msgstr ""
+msgstr "<emphasis>Passwort:</emphasis> Geben Sie Ihr Passwort ein."
 
-#: C/ekiga.xml:530(para)
+#: C/ekiga.xml:534(para)
 msgid ""
 "To add an Ekiga.net account, simply select Account -&gt; Add an Ekiga.net "
 "Account in the menu. A dialog will appear and allow you to enter several "
 "parameters: <placeholder-1/>"
 msgstr ""
+"Um ein neues Ekiga.net-Konto hinzuzufügen, wählen Sie "
+"<menuchoice><guimenu>Konto</guimenu><guimenuitem>Ekiga.net-Konto hinzufügen</"
+"guimenuitem></menuchoice>. Ein Dialog wird geöffnet, in welchem Sie "
+"verschiedene Parameter angeben können: <placeholder-1/>"
 
-#: C/ekiga.xml:545(title)
-msgid "Adding an Ekiga Call Out account"
+#: C/ekiga.xml:542(para)
+msgid ""
+"Ekiga.net is a free SIP services platform provided to <application>Ekiga</"
+"application> users. If you want to call other users and to be callable, you "
+"need a SIP address. You can get one from <ulink url=\"http://www.ekiga.net\" "
+"type=\"http\">http://www.ekiga.net</ulink>. Ekiga.net also offers additional "
+"services like conference rooms, voice mail and online white pages. Please "
+"see <ulink url=\"http://www.ekiga.net\" type=\"http\">http://www.ekiga.net</"
+"ulink> for more information."
 msgstr ""
+"Ekiga.net ist eine freie SIP Dienste-Plattform, die Benutzern von "
+"<application>Ekiga</application> zur Verfügung gestellt wird. Diese stellt "
+"für Sie eine SIP-Adresse bereit, über die Ihre Freunde und Familie Sie mit "
+"jeder SIP-konformen Soft- oder Hardware erreichen können. Eine solche "
+"Adresse erhalten Sie hier: <ulink url=\"http://www.ekiga.net\" type=\"http"
+"\">http://www.ekiga.net</ulink>. Ekiga.net bietet Ihnen außerdem zusätzliche "
+"Dienste wie Konferenzräume, Zustellung von Sprachnachrichten per Mail und "
+"ein Online-Telefonbuch. Weitere Informationen finden Sie unter <ulink url="
+"\"http://www.ekiga.net\" type=\"http\">http://www.ekiga.net</ulink>."
+
+#: C/ekiga.xml:549(title)
+msgid "Adding an Ekiga Call Out account"
+msgstr "Hinzufügen eines »PC zu Telefon«-Kontos in Ekiga"
 
-#: C/ekiga.xml:552(para)
+#: C/ekiga.xml:556(para)
 msgid "<emphasis>Account ID:</emphasis> You can enter your account ID."
-msgstr ""
+msgstr "<emphasis>Konto-ID:</emphasis> Geben Sie die Kennung Ihres Kontos ein."
 
-#: C/ekiga.xml:553(para)
+#: C/ekiga.xml:557(para)
 msgid "<emphasis>PIN Code:</emphasis> You can enter your PIN code."
-msgstr ""
+msgstr "<emphasis>PIN Code:</emphasis> Geben Sie Ihren PIN Code ein."
 
-#: C/ekiga.xml:549(para)
+#: C/ekiga.xml:553(para)
 msgid ""
 "To add an Ekiga Call Out account, simply select Account -&gt; Add an Ekiga "
 "Call Out Account in the menu. A dialog will appear and allow you to enter "
 "several parameters: <placeholder-1/>"
 msgstr ""
+"Um ein »PC zu Telefon«-Konto in <application>Ekiga</application> "
+"hinzuzufügen, wählen Sie <menuchoice><guimenu>Konto</"
+"guimenu><guimenuitem>Ekiga »PC zu Telefon«-Konto hinzufügen</guimenuitem></"
+"menuchoice>. Ein Dialog wird geöffnet, in welchem Sie verschiedene Parameter "
+"angeben können: <placeholder-1/>"
 
-#: C/ekiga.xml:557(para)
+#: C/ekiga.xml:561(para)
 msgid ""
 "If you do not have an Ekiga Call Out account yet, you can subscribe for one "
 "using the 'Get an Ekiga.net Call Out account' link in the dialog. As "
-"described above, this service will allow you calling normal phones worldwide "
+"described above, this service will allow you to call normal phones worldwide "
 "at interesting rates. Once the account has been added, you can recharge it, "
 "consult the balance history or the call history by selecting the appropriate "
 "menu item in the Account menu of the window when the account is highlighted."
 msgstr ""
+"Falls Sie noch nicht über ein Ekiga »PC zu Telefon«-Konto verfügen, können "
+"Sie eines registrieren, indem Sie den Link <guilabel>»PC zu Telefon«-Konto "
+"für Ekiga erstellen</guilabel> anklicken. Wie oben beschrieben, ermöglicht "
+"Ihnen dieser Dienst weltweite Anrufe zu gewöhnlichen Telefonen zu günstigen "
+"Preisen. Sobald das Konto hinzugefügt wurde, können Sie es aufladen und den "
+"Verlauf des Kontostandes oder die Anrufchronik anzeigen. Wählen Sie hierzu "
+"den entsprechenden Eintrag im Menü <guimenu>Konto</guimenu> des "
+"Hauptfensters, wenn das Konto hervorgehoben ist."
 
-#: C/ekiga.xml:564(title)
+#: C/ekiga.xml:568(title)
 msgid "Adding a SIP account"
 msgstr "Hinzufügen eines SIP-Kontos"
 
-#: C/ekiga.xml:571(para) C/ekiga.xml:589(para)
+#: C/ekiga.xml:575(para) C/ekiga.xml:593(para)
 msgid "<emphasis>Name:</emphasis> You can enter the account name."
 msgstr "<emphasis>Name:</emphasis> Geben Sie hier den Namen des Kontos ein."
 
-#: C/ekiga.xml:572(para)
+#: C/ekiga.xml:576(para)
 msgid ""
 "<emphasis>Registrar:</emphasis> The registrar to which you want to register. "
 "This is usually an IP address or an host name that will be given to you by "
-"your Internet Telephony Service Provider, or by your administrator if you are "
-"trying to register to a SIP IPBX."
+"your Internet Telephony Service Provider, or by your administrator if you "
+"are trying to register to a SIP IPBX."
 msgstr ""
+"<emphasis>Registrar:</emphasis> Der Registrar, bei dem Sie sich "
+"registrieren. Dies ist üblicherweise eine IP-Adresse oder ein Rechnername, "
+"die oder den Sie von Ihrem Internet-Telefondienstanbieter erhalten haben, "
+"oder von Ihrem Systemverwalter, falls Sie sich bei einem SIP-IPBX "
+"registrieren wollen."
 
-#: C/ekiga.xml:574(para) C/ekiga.xml:592(para)
+#: C/ekiga.xml:578(para) C/ekiga.xml:596(para)
 msgid ""
 "<emphasis>Authentication User:</emphasis> If it is different from the user "
 "parameter you provided above. In that case, the user field will be used to "
-"control the outgoing identity for the account you are adding, while the login "
-"will be used during the authentication phase."
+"control the outgoing identity for the account you are adding, while the "
+"login will be used during the authentication phase."
 msgstr ""
+"<emphasis>Authentifizierungs-Name:</emphasis> Dieser unterscheidet sich vom "
+"bereits angegebenen Benutzer-Parameter. In diesem Fall wird das Benutzerfeld "
+"dazu verwendet, um die ausgehende Identität des hinzugefügten Kontos zu "
+"steuern, während der Benutzername während der Authentifizierungsphase "
+"benutzt wird."
 
-#: C/ekiga.xml:576(para)
+#: C/ekiga.xml:580(para)
 msgid ""
-"<emphasis>Timeout:</emphasis> The timeout after which the registration should "
-"be refreshed."
+"<emphasis>Timeout:</emphasis> The timeout after which the registration "
+"should be refreshed."
 msgstr ""
+"<emphasis>Zeitüberschreitung:</emphasis> Die Zeitspanne, nach deren Ablauf "
+"die Registrierung aufgefrischt werden sollte."
 
-#: C/ekiga.xml:568(para)
+#: C/ekiga.xml:572(para)
 msgid ""
 "To add a SIP account, simply select Account -&gt; Add a SIP Account in the "
 "menu. A dialog will appear and allow you to enter several parameters: "
 "<placeholder-1/>"
 msgstr ""
+"Um ein SIP-Konto hinzuzufügen, wählen Sie <menuchoice><guimenu>Konto</"
+"guimenu><guimenuitem>SIP-Konto hinzufügen</guimenuitem></menuchoice> aus dem "
+"Menü. Ein Dialog wird geöffnet, in welchem Sie verschiedene Parameter "
+"angeben können: <placeholder-1/>"
 
-#: C/ekiga.xml:582(title)
+#: C/ekiga.xml:586(title)
 msgid "Adding an H.323 account"
 msgstr "Hinzufügen eines H.323-Kontos"
 
-#: C/ekiga.xml:590(para)
+#: C/ekiga.xml:594(para)
 msgid ""
 "<emphasis>Gatekeeper:</emphasis> The gatekeeper to which you want to "
-"register. This is usually an IP address or an host name that will be given to "
+"register. This is usually an IP address or a host name that will be given to "
 "you by your Internet Telephony Service Provider, or by your administrator if "
 "you are trying to register to an H.323 IPBX."
 msgstr ""
+"<emphasis>Gatekeeper:</emphasis> Der Gatekeeper, bei dem Sie sich "
+"registrieren wollen. Dies ist üblicherweise eine IP-Adresse oder ein "
+"Rechnername, die oder den Sie von Ihrem Internet-Telefondienstanbieter "
+"erhalten haben, oder von Ihrem Systemverwalter, falls Sie sich bei einem SIP-"
+"IPBX registrieren wollen."
 
-#: C/ekiga.xml:594(para)
+#: C/ekiga.xml:598(para)
 msgid ""
 "<emphasis>Registration Timeout:</emphasis> The timeout after which the "
 "registration should be updated."
 msgstr ""
+"<emphasis>Zeitlimit für Anmeldung:</emphasis> Die Zeitspanne, nach deren "
+"Ablauf die Registrierung aktualisiert werden sollte."
 
-#: C/ekiga.xml:586(para)
+#: C/ekiga.xml:590(para)
 msgid ""
 "To add an H.323 account, simply select Account -&gt; Add an H.323 Account in "
 "the menu. A dialog will appear and allow you to enter several parameters: "
 "<placeholder-1/>"
 msgstr ""
+"Um ein SIP-Konto hinzuzufügen, wählen Sie <menuchoice><guimenu>Konto</"
+"guimenu><guimenuitem>H.323-Konto hinzufügen</guimenuitem></menuchoice> aus "
+"dem Menü. Ein Dialog wird geöffnet, in welchem Sie verschiedene Parameter "
+"angeben können: <placeholder-1/>"
 
-#: C/ekiga.xml:603(title)
+#: C/ekiga.xml:607(title)
 msgid "Understanding URIs"
-msgstr ""
+msgstr "Erklärungen zu Adressen"
 
-#: C/ekiga.xml:605(title)
+#: C/ekiga.xml:609(title)
 msgid "SIP URI's"
-msgstr "SIP-URIs"
+msgstr "SIP-Adressen"
 
-#: C/ekiga.xml:607(para)
+#: C/ekiga.xml:611(para)
 msgid "SIP URIs are formatted as such \"sip:user@[host[:port]]\""
 msgstr ""
-"SIP-URIs werden nach folgendem Muster formatiert: sip:user@[host[:port]]"
+"SIP-Adressen werden nach folgendem Muster formatiert: sip:user@[host[:port]]"
 
-#: C/ekiga.xml:609(para)
+#: C/ekiga.xml:613(para)
 msgid ""
 "This permits you to call the given user or extension on the specified SIP "
 "proxy: <emphasis>sip:jonita@ekiga.net</emphasis>"
 msgstr ""
+"Dies ermöglicht Ihnen, den angegebenen Benutzer oder die Erweiterung über "
+"den entsprechenden SIP-Proxy anzurufen: <emphasis>sip:jonita@ekiga.net</"
+"emphasis>"
 
-#: C/ekiga.xml:613(title)
+#: C/ekiga.xml:617(title)
 msgid "H.323 URIs"
-msgstr "H.323-URIs"
+msgstr "H.323-Adressen"
 
-#: C/ekiga.xml:615(para)
+#: C/ekiga.xml:619(para)
 msgid "H.323 URIs are formatted as such \"h323:[user@][host[:port]]\""
-msgstr ""
+msgstr "H.323-Adressen sind als »h323:[benutzer@][rechner[:port]]« formatiert."
 
-#: C/ekiga.xml:619(para)
+#: C/ekiga.xml:623(para)
 msgid ""
 "Call a given host on a port different from the default port which is 1720: "
 "<emphasis>h323:seconix.com:1740</emphasis>"
 msgstr ""
+"Anruf zu einem angegebenen Rechner auf einem anderen Port als dem "
+"Standardport 1720: <emphasis>h323:seconix.com:1740</emphasis>"
 
-#: C/ekiga.xml:620(para)
+#: C/ekiga.xml:624(para)
 msgid ""
-"Call a given user using their respective alias if registered to a gatekeeper: "
-"<emphasis>h323:jonita</emphasis>"
+"Call a given user using their respective alias if registered to a "
+"gatekeeper: <emphasis>h323:jonita</emphasis>"
 msgstr ""
+"Anruf zu einem angegebenen Benutzer unter Benutzer seines Alias, falls "
+"dieser bei einem Gatekeeper registriert ist: <emphasis>h323:jonita</emphasis>"
 
-#: C/ekiga.xml:621(para)
+#: C/ekiga.xml:625(para)
 msgid ""
 "Call a given phone number if you are registered to a gatekeeper for a PC-To-"
 "Phone provider, or if that user has an ENUM record associated to an H.323 "
 "URI: <emphasis>h323:003210111222</emphasis>"
 msgstr ""
+"Anruf zu einer angegebenen Telefonnummer, falls Sie bei einem Gatekeeper für "
+"einen PC-zu-Telefon-Dienst registriert sind, oder wenn der Benutzer über "
+"einen einer H.323-Adresse zugeordneten ENUM-Eintrag verfügt: "
+"<emphasis>h323:003210111222</emphasis>"
 
-#: C/ekiga.xml:622(para)
+#: C/ekiga.xml:626(para)
 msgid ""
 "Call a given user using their alias through a specific gateway or proxy: "
 "<emphasis>h323:jonita@gateway.seconix.com</emphasis>"
 msgstr ""
+"Anruf zu einem angegebenen Benutzer unter Verwendung dessen Alias über ein "
+"bestimmtes Gateway oder einen Proxy: <emphasis>h323:jonita@gateway.seconix."
+"com</emphasis>"
 
-#: C/ekiga.xml:623(para)
+#: C/ekiga.xml:627(para)
 msgid ""
 "Call an MCU and join a specific room: <emphasis>h323:myfriendsroom@mcu."
 "seconix.com</emphasis>"
 msgstr ""
+"Anruf bei einem MCU und Betreten eines bestimmten Raums: <emphasis>h323:"
+"myfriendsroom@mcu.seconix.com</emphasis>"
 
-#: C/ekiga.xml:617(para)
+#: C/ekiga.xml:621(para)
 msgid "This permits you to: <placeholder-1/>"
 msgstr "Dies erlaubt Ihnen: <placeholder-1/>"
 
-#: C/ekiga.xml:632(title)
+#: C/ekiga.xml:636(title)
 msgid "Controlling the Video Bandwidth"
 msgstr "Ändern der Videobandbreite"
 
-#: C/ekiga.xml:634(para)
+#: C/ekiga.xml:638(para)
 msgid ""
-"<application>Ekiga</application> is using a best-effort algorithm to maintain "
-"a low bandwidth when transmitting video. You can adjust the video quality "
-"settings following you prefer to have a good frame rate, or a good picture "
-"quality. It will permit <application>Ekiga</application> to dynamically "
-"adjust the video bandwidth and the number of transmitted images per second "
-"during a call while trying to respect the requested video bandwidth."
-msgstr ""
+"<application>Ekiga</application> uses a best-effort algorithm to maintain a "
+"low bandwidth when transmitting video. You can adjust the video quality "
+"settings depending on whether you prefer to have a good frame rate, or a "
+"good picture quality. It will permit <application>Ekiga</application> to "
+"dynamically adjust the video bandwidth and the number of transmitted images "
+"per second during a call while trying to respect the requested video "
+"bandwidth."
+msgstr ""
+"<application>Ekiga</application> benutzt einen effektiven Algorithmus, um "
+"eine niedrige Bandbreite bei der Videoübertragung zu gewährleisten. Sie "
+"können die Video-Bildrate anpassen, je nachdem, ob Sie eine höhere Bildrate "
+"oder eine bessere Bildqualität bevorzugen. <application>Ekiga</application> "
+"wird angewiesen, die Video-Bandbreite und die Anzahl der pro Sekunde "
+"übertragenen Bilder anhand der geforderten Video-Bandbreite während eines "
+"Anrufs dynamisch anzupassen."
 
-#: C/ekiga.xml:636(para)
+#: C/ekiga.xml:640(para)
 msgid ""
-"Notice that the algorithm is a best-effort algorithm, which means that if you "
-"specify too low video bandwidth settings, it can be impossible to respect "
+"Notice that the algorithm is a best-effort algorithm, which means that if "
+"your video bandwidth settings are too low, it can be impossible to respect "
 "them. However, if the video bandwidth permits to transmit with a better "
 "quality, or faster than the requested values, then <application>Ekiga</"
 "application> will dynamically increase them so that the quality and the "
 "framerate are always the best possible."
 msgstr ""
+"Bedenken Sie, dass es sich um einen bestmöglich arbeitenden Algorithmus "
+"handelt. Das bedeutet, dass zu niedrig gewählte Video-"
+"Bandbreiteneinstellungen eventuell nicht berücksichtigt werden können. Wie "
+"auch immer, falls die Video-Bandbreite eine bessere Qualität oder eine "
+"höhere Bildrate ermöglicht, dann erhöht <application>Ekiga</application> die "
+"Werte dynamisch, um jederzeit die bestmögliche Bildrate und Bildqualität zu "
+"gewährleisten."
 
-#: C/ekiga.xml:638(para)
+#: C/ekiga.xml:642(para)
 msgid ""
 "Choosing a higher framerate and a lower quality will have the same result in "
-"terms of video bandwidth than choosing a higher quality with a lower "
-"framerate. It depends if you prefer using your bandwidth to transmit more "
-"lower quality images or fewer big quality images."
-msgstr ""
+"terms of video bandwidth as choosing a higher quality with a lower "
+"framerate. The choice depends on if you prefer using your bandwidth to "
+"transmit more lower quality images or fewer high quality images."
+msgstr ""
+"Die Wahl einer höheren Bildrate und einer niedrigeren Qualität erzeugt "
+"hinsichtlich der Videobandbreite die gleichen Ergebnisse wie die Wahl einer "
+"höheren Qualität mit einer niedrigeren Bildrate. Wofür Sie sich entscheiden, "
+"hängt davon ab, ob Sie die Ihnen zur Verfügung stehende Bandbreite lieber "
+"zur Übertragung von mehr Bildern minderer Qualität oder weniger Bildern "
+"höherer Qualität nutzen wollen."
 
-#: C/ekiga.xml:643(title)
+#: C/ekiga.xml:647(title)
 msgid "Monitoring lines"
-msgstr ""
+msgstr "Überwachen von Leitungen"
 
-#: C/ekiga.xml:647(para)
+#: C/ekiga.xml:651(para)
 msgid ""
 "<application>Ekiga</application> can connect to PBX systems supporting the "
 "SIP protocol. In that case, it is able to indicate if the line associated "
-"with an user is in use or not. Please refer to the documentation of your PBX "
+"with a user is in use or not. Please refer to the documentation of your PBX "
 "to enable that feature."
 msgstr ""
+"<application>Ekiga</application> kann unter Verwendung des SIP-Protokolls "
+"Verbindungen zu PBX-Telefonanlagen unterhalten. In diesem Fall ist es in der "
+"Lage festzustellen, ob die einem Benutzer zugeordnete Leitung in Benutzung "
+"ist oder nicht. Bitte ziehen Sie die Dokumentation Ihrer PBX-Telefonanlage "
+"zu Rate, um dieses Funktionsmerkmal zu aktivieren."
 
-#: C/ekiga.xml:649(para)
+#: C/ekiga.xml:653(para)
 msgid ""
 "To enable that feature on <application>Ekiga</application>, simply add the "
 "contact with his URI in the roster. If the server supports publishing "
 "presence information, <application>Ekiga</application> will automatically "
-"publish your own presence information and display the presence of contacts in "
-"your roster."
+"publish your own presence information and display the presence of contacts "
+"in your roster."
 msgstr ""
+"Um dieses Funktionsmerkmal in <application>Ekiga</application> zu "
+"aktivieren, fügen Sie den Kontakt mit seiner Adresse zur Kontaktliste hinzu. "
+"Falls der Server das Veröffentlichen von Anwesenheitsinformationen "
+"unterstützt, dann veröffentlicht <application>Ekiga</application> Ihre "
+"eigenen Anwesenheitsinformationen automatisch und zeigt die Anwesenheit "
+"Ihrer Kontakte in der Kontaktliste an."
 
-#: C/ekiga.xml:653(title)
+#: C/ekiga.xml:657(title)
 msgid "Managing Codecs"
 msgstr "Verwalten der Codecs"
 
-#: C/ekiga.xml:655(title)
+#: C/ekiga.xml:659(title)
 msgid "Audio Codecs"
 msgstr "Audio-Codecs"
 
-#: C/ekiga.xml:659(para)
+#: C/ekiga.xml:663(para)
 msgid ""
 "The <application>Ekiga</application> audio codecs table in the preferences "
-"permits you to change the codecs order as well as disabling the codecs you "
+"permits you to change the codec order as well as disabling the codecs you "
 "don't want to use. Each codec has strong and weak points. For example, G.711 "
 "will give the best voice quality but will use the most bandwidth while SPEEX "
 "will give an average voice quality but requiring a very low bandwidth usage. "
-"Notice that there are two versions of SPEEX, one of them is SPEEX WideBand. "
-"You can see that to the 16 kHz clock rate."
+"Notice that there are two versions of SPEEX; one of them is SPEEX WideBand, "
+"which has a 16 kHz clock rate."
 msgstr ""
+"Die Tabelle der Audio-Codecs in den Einstellungen von <application>Ekiga</"
+"application> ermöglicht Ihnen sowohl das Ändern der Codec-Reihenfolge als "
+"auch das Deaktivieren nicht benutzter Codecs. Jeder der Codecs hat Stärken "
+"und Schwächen. Beispielsweise liefert G.711 die beste Sprachqualität, "
+"benötigt aber die größte Bandbreite, während SPEEX durchschnittliche "
+"Sprachqualität bietet, aber mit einer sehr geringen Bandbreite auskommt. "
+"Beachten Sie, dass SPEEX in zwei Versionen verfügbar ist, eine davon ist "
+"SPEEX WideBand mit einer Samplingfrequenz von 16 kHz."
 
-#: C/ekiga.xml:663(title)
+#: C/ekiga.xml:667(title)
 msgid "Video Codecs"
 msgstr "Video-Codecs"
 
-#: C/ekiga.xml:667(para)
+#: C/ekiga.xml:671(para)
 msgid ""
 "The <application>Ekiga</application> video codecs table in the preferences "
-"permits you to change the codecs order as well as disabling the codecs you "
+"permits you to change the codec order as well as disabling the codecs you "
 "don't want to use. <application>Ekiga</application> supports codecs like "
 "H.261, H.263+, H.264, MPEG-4 or Theora."
 msgstr ""
+"Die Tabelle der Audio-Codecs in den Einstellungen von <application>Ekiga</"
+"application> ermöglicht Ihnen sowohl das Ändern der Codec-Reihenfolge als "
+"auch das Deaktivieren nicht benutzter Codecs. <application>Ekiga</"
+"application> unterstützt Codecs wie H.261, H.263+, H.264, MPEG-4 oder Theora."
 
-#: C/ekiga.xml:672(title)
+#: C/ekiga.xml:676(title)
 msgid "Reordering the codecs"
 msgstr "Codec-Rangfolge ändern"
 
-#: C/ekiga.xml:673(para)
+#: C/ekiga.xml:677(para)
 msgid ""
-"When you reorder the codecs, you are reordering the local capabilities table, "
-"ie the codecs you will use for sending. You will always transmit audio and "
-"video using the first codec in the corresponding table that is in common with "
-"the remote user. The remote user will transmit audio and video using the "
-"first codec in his table that is common with you."
-msgstr ""
+"When you reorder the codecs, you are reordering the local capabilities "
+"table, ie the codecs you will use for sending. You will always transmit "
+"audio and video using the first codec in the corresponding table that is in "
+"common with the remote user. The remote user will transmit audio and video "
+"using the first codec in his table that is common with you."
+msgstr ""
+"Wenn Sie die Codec-Reihenfolge ändern, dann ändern Sie die Tabelle der "
+"lokalen Fähigkeiten, das heißt, die zum Senden verwendeten Codecs. Sie "
+"werden Video und Audio immer mit dem obersten Codec in Ihrer Liste senden, "
+"der mit einem der Codecs in der Liste des entfernten Benutzers "
+"übereinstimmt. Ebenso sendet der entfernte Benutzer Video und Audio immer "
+"mit dem obersten Codec in seiner Liste, der mit einem der Codecs in Ihrer "
+"Liste übereinstimmt."
 
-#: C/ekiga.xml:677(title)
+#: C/ekiga.xml:681(title)
 msgid "Forcing the use of a specific codec"
 msgstr "Bestimmte Codecs erzwingen"
 
-#: C/ekiga.xml:678(para)
+#: C/ekiga.xml:682(para)
 msgid ""
 "You can force the use of a specific codec by disabling all other codecs, but "
-"it will result in failed calls if the remote user doesn't allow that specific "
-"codec. The best is to put your prefered codecs at the top of the list so that "
-"you always transmit with them if the remote user allows it and to disable the "
-"codecs that you don't want to use for transmission and reception."
-msgstr ""
+"it will result in failed calls if the remote user doesn't support that "
+"specific codec. The best approach is to put your preferred codecs at the top "
+"of the list so that you always transmit with them if the remote user allows "
+"it and to disable the codecs that you don't want to use for transmission and "
+"reception."
+msgstr ""
+"Sie können die Benutzung eines bestimmten Codecs erzwingen, indem Sie alle "
+"anderen Codecs deaktivieren. Dadurch könnten allerdings Verbindungen "
+"scheitern, wenn der entfernte Benutzer diesen bestimmten Codec nicht "
+"unterstützt. Der beste Kompromiss ist, dass Sie Ihre bevorzugten Codecs in "
+"den oberen Bereich der Liste setzen, so dass sie immer mit übertragen "
+"werden, wenn der entfernte Benutzer es ermöglicht, und diejenigen Codecs zu "
+"deaktivieren, die Sie nicht für Übertragung und Empfang nutzen wollen."
 
-#: C/ekiga.xml:682(title)
+#: C/ekiga.xml:686(title)
 msgid "Adjusting the jitter buffer"
-msgstr ""
+msgstr "Anpassen des Jitter-Puffers"
 
-#: C/ekiga.xml:683(para)
+#: C/ekiga.xml:687(para)
 msgid ""
 "You can adjust the delay to wait before playing the sound buffers that you "
 "have received using the jitter buffer adjustment. If there is too much "
-"packets loss, the delay required to have received all packets could be so "
+"packet loss, the delay required to have received all packets could be so "
 "important that it will exceed the jitter buffer. In such a case, the sound "
-"you are receiving will be of bad quality. A solution to that problem would be "
-"to increase the maximum limit of the jitter buffer to a few seconds, "
+"you are receiving will be of bad quality. A solution to that problem would "
+"be to increase the maximum limit of the jitter buffer to a few seconds, "
 "resulting in a big delay but in an improved voice quality. Notice that the "
 "jitter buffer will readapt itself to the lowest delay allowing for optimum "
 "transmission, and that a bad voice quality in reception is not due to a too "
 "low jitter buffer value, but to bad internet connection quality."
 msgstr ""
+"Sie können mit den Jitter-Puffer-Einstellungen die Verzögerung festlegen, "
+"bevor die empfangenen Klangpuffer wiedergegeben werden. Falls zu viele "
+"Pakete verloren gehen, könnte die zum Empfang aller Pakete erforderliche "
+"Verzögerung die Größe des Jitter-Puffers überschreiten. In einem solchen "
+"Fall wird der empfangene Klang von schlechter Qualität sein. Eine Lösung des "
+"Problems könnte die Erhöhung der Obergrenze des Jitter-Puffers bis hin zu "
+"einigen Sekunden sein, was sich in einer starken Verzögerung äußert, aber "
+"die Sprachqualität deutlich verbessert. Beachten Sie, dass der Jitter-Puffer "
+"selbsttätig immer wieder auf einen für optimale Übertragung nötigen "
+"Verzögerungswert zurückfällt. Die schlechte Sprachqualität des Empfangs ist "
+"daher oft nicht auf einen zu niedrig gewählten Wert des Jitter-Puffers "
+"zurückzuführen, sondern auf die schlechte Qualität der Internetverbindung."
 
-#: C/ekiga.xml:692(title)
+#: C/ekiga.xml:696(title)
 msgid "Changing Ports"
-msgstr ""
+msgstr "Ändern von Ports"
 
-#: C/ekiga.xml:694(title)
+#: C/ekiga.xml:698(title)
 msgid "The listen ports"
-msgstr ""
+msgstr "Die überwachten Ports"
 
-#: C/ekiga.xml:695(para)
+#: C/ekiga.xml:699(para)
 msgid ""
-"The main port listening for incoming connections in <application>Ekiga</"
+"The main port used to listen for incoming connections in <application>Ekiga</"
 "application> for SIP is port 5060 (UDP), while 1720 (TCP) is used by H.323. "
 "To change those ports you need to load \"gconf-editor\". Open gconf-editor, "
 "select apps from the left hand side menu and then select <application>Ekiga</"
-"application>. Then select \"sip\" or \"h323\", it should give you a list in "
-"the corresponding window to your right. Select listen_port and change it to "
-"your desired value. You can also change the UDP/RTP port ranges."
-msgstr ""
+"application>, Protocols. Then select \"sip\" or \"h323\", it should give you "
+"a list in the corresponding window to your right. Select listen_port and "
+"change it to your desired value. You can also change the UDP/RTP port ranges."
+msgstr ""
+"Der hauptsächlich in <application>Ekiga</application> zum Lauschen nach "
+"eingehenden SIP-Verbindungen benutzte Port ist der Port 5060 (UDP). Analog "
+"dazu wird für H.323-Verbindungen der Port 1720 (TCP) benutzt. Diese Ports "
+"lassen sich im Konfigurationseditor ändern. Rufen Sie <command>gconf-editor</"
+"command> auf und wählen Sie im Menü in der linken Seitenleiste "
+"<menuchoice><guimenu>apps</guimenu><guisubmenu>ekiga</"
+"guisubmenu><guimenuitem>protocols</guimenuitem></menuchoice>. Dann wählen "
+"Sie <guilabel>sip</guilabel> oder <guilabel>h.323</guilabel>. Daraufhin "
+"erhalten Sie eine Liste im rechten Teilfenster. Wählen Sie "
+"<guilabel>listen_port</guilabel> und geben Sie hier den gewünschten Wert "
+"ein. Sie können hier auch die Bereiche für die UDP/RTP-Ports ändern."
 
-#: C/ekiga.xml:700(title)
+#: C/ekiga.xml:704(title)
 msgid "Explanation of the port ranges"
-msgstr ""
+msgstr "Erklärung der Portbereiche"
 
-#: C/ekiga.xml:702(para)
+#: C/ekiga.xml:706(para)
 msgid ""
 "1. The \"listen_port\" value is the port <application>Ekiga</application> "
-"will listen for incoming connections on. It is different for SIP and H.323."
+"will use to listen for incoming connections. It is different for SIP and "
+"H.323."
 msgstr ""
+"1. Der Wert »listen_port« ist der von <application>Ekiga</application> zum "
+"Lauschen nach eingehenden Verbindungen benutzte Port. Die Werte für SIP und "
+"H.323 unterscheiden sich hierbei."
 
-#: C/ekiga.xml:704(para)
+#: C/ekiga.xml:708(para)
 msgid ""
 "2. The \"udp_port_range\" value is the range of UDP ports that "
 "<application>Ekiga</application> will use for SIP signalling or when "
 "registering to H.323 gatekeepers. It is also used for RTP (audio and video "
 "communication channels)."
 msgstr ""
+"2. Der Wert »udp_port_range« ist der Bereich der UDP-Ports, die von "
+"<application>Ekiga</application> für SIP-Signalisierungen oder zum "
+"Registrieren von H.323-Gatekeepers verwendet wird. Er wird auch für RTP "
+"verwendet (Audio- und Video-Kommunikationskanäle)."
 
-#: C/ekiga.xml:706(para)
+#: C/ekiga.xml:710(para)
 msgid ""
 "3. The \"tcp_port_range\" value is the range of TCP ports beside the "
 "listen_port that <application>Ekiga</application> will use for the H.245 "
 "channel with the H.323 protocol. That port range is not used by SIP. It is "
-"not used either when H.245 Tunneling is enabled, which is in general always "
-"the case, except when calling old H.323 implementations like Netmeeting."
+"also not used when H.245 Tunneling is enabled, which is generally the case, "
+"except when calling old H.323 implementations like Netmeeting."
 msgstr ""
+"3. Der Wert »tcp_port_range« ist neben dem listen_port der Bereich der TCP-"
+"Ports, die <application>Ekiga</application> für den H.245-Kanal mit dem "
+"H.323-Protokoll verwendet. Dieser Portbereich wird von SIP nicht benutzt. "
+"Außerdem nicht bei aktiviertem H.245-Tunneling, was generell der Fall ist, "
+"außer beim Anrufen älterer H.323-Implementationen, wie beispielsweise "
+"NetMeeting."
 
-#: C/ekiga.xml:712(title)
+#: C/ekiga.xml:716(title)
 msgid "Controlling the SIP and H.323 Settings"
 msgstr "Ändern der Einstellungen für SIP und H.323"
 
-#: C/ekiga.xml:714(title)
+#: C/ekiga.xml:718(title)
 msgid "Controlling the SIP Settings"
-msgstr "Änern der SIP-Einstellungen"
+msgstr "Ändern der SIP-Einstellungen"
 
-#: C/ekiga.xml:716(title) C/ekiga.xml:729(title)
+#: C/ekiga.xml:720(title) C/ekiga.xml:733(title)
 msgid "Misc Settings"
-msgstr ""
+msgstr "Verschiedene Einstellungen"
 
-#: C/ekiga.xml:717(emphasis)
+#: C/ekiga.xml:721(emphasis)
 msgid "Outbound Proxy"
-msgstr ""
+msgstr "Proxy für ausgehende Verbindungen"
 
-#: C/ekiga.xml:718(para)
+#: C/ekiga.xml:722(para)
 msgid ""
 "The outbound proxy is the SIP proxy that will relay your calls. The behavior "
-"of a SIP proxy is similar to the behavior of an HTTP proxy, ie some entity "
-"that issues the requests on your behalve and proxies the streams."
+"of a SIP proxy is similar to the behavior of an HTTP proxy, i.e. some entity "
+"that issues the requests on your behalf and proxies the streams."
 msgstr ""
+"Der Proxy für ausgehende Verbindungen ist der SIP-Proxy, der Ihre Anrufe "
+"weitergibt. Das Verhalten eines SIP-Proxy ähnelt dem eines HTTP-Proxys, d.h. "
+"es handelt sich um eine Stelle, die Anfragen stellvertretend entgegennimmt "
+"und Datenströme weiterleitet."
 
-#: C/ekiga.xml:720(emphasis) C/ekiga.xml:730(emphasis)
+#: C/ekiga.xml:724(emphasis) C/ekiga.xml:734(emphasis)
 msgid "Forward URI"
-msgstr ""
+msgstr "Weiterleitungsadresse"
 
-#: C/ekiga.xml:721(para)
+#: C/ekiga.xml:725(para)
 msgid ""
 "The URI to which SIP incoming calls should be forwarded if configured in the "
 "preferences."
 msgstr ""
+"Die Adresse, an die eingehende SIP-Anrufe weitergeleitet werden, falls dies "
+"in den Einstellungen festgelegt wurde."
 
-#: C/ekiga.xml:727(title)
+#: C/ekiga.xml:731(title)
 msgid "Controlling the H.323 Settings"
 msgstr "Ändern der Einstellungen für H.323"
 
-#: C/ekiga.xml:731(para)
+#: C/ekiga.xml:735(para)
 msgid ""
 "The URI to which H.323 incoming calls should be forwarded if configured in "
 "the preferences."
 msgstr ""
+"Die Adresse, an die eingehende H.323-Anrufe weitergeleitet werden, falls "
+"dies in den Einstellungen festgelegt wurde."
 
-#: C/ekiga.xml:735(title)
+#: C/ekiga.xml:739(title)
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: C/ekiga.xml:736(para)
+#: C/ekiga.xml:740(para)
 msgid ""
-"<application>Ekiga</application> permits a fine control of the H.323 settings "
-"in the Advanced H.323 Settings section of the preferences. You can enable "
-"H.245 Tunneling, Early H.245 and Fast Start."
-msgstr ""
+"<application>Ekiga</application> permits a fine control of the H.323 "
+"settings in the Advanced H.323 Settings section of the preferences. You can "
+"enable H.245 Tunneling, Early H.245 and Fast Start."
+msgstr ""
+"<application>Ekiga</application> ermöglicht eine Feineinstellung der H.323-"
+"Parameter im Abschnitt <guilabel>Erweiterte H.323-Einstellungen</guilabel> "
+"des Einstellungsdialogs. Sie können H.245-Tunneling, frühzeitiges Verwenden "
+"von H.245 und Schnellstart einstellen."
 
-#: C/ekiga.xml:738(emphasis)
+#: C/ekiga.xml:742(emphasis)
 msgid "H.245 Tunneling"
 msgstr "H.245-Tunnelung"
 
-#: C/ekiga.xml:740(para)
+#: C/ekiga.xml:744(para)
 msgid ""
 "H.245 Tunneling is the encapsulation of H.245 messages within H.225/Q.931 "
 "messages (H.245 Tunneling). If you have a firewall and enable H.245 "
 "Tunneling, there is one less TCP port that you need to allow for incoming "
 "connections."
 msgstr ""
+"H.245-Tunneling ist das Einschließen von H.245-Meldungen innerhalb von H.225/"
+"Q.931-Meldungen. Falls Sie über eine Firewall verfügen und H.245-Tunneling "
+"aktiviert haben, müssen Sie noch einen TCP-Port für eingehende Verbindungen "
+"festlegen."
 
-#: C/ekiga.xml:742(emphasis)
+#: C/ekiga.xml:746(emphasis)
 msgid "Early H.245"
 msgstr "Frühzeitiges H.245"
 
-#: C/ekiga.xml:744(para)
+#: C/ekiga.xml:748(para)
 msgid ""
-"This enables H.245 early in the setup and permits to achieve faster call "
+"This enables H.245 early in the setup and permits achieving faster call "
 "initiation."
 msgstr ""
+"Dies aktiviert H.245 frühzeitig während der Einrichtung und führt zu einer "
+"schnelleren Initiierung eines Anrufs."
 
-#: C/ekiga.xml:746(emphasis)
+#: C/ekiga.xml:750(emphasis)
 msgid "Fast Start"
 msgstr "Schnelles Starten"
 
-#: C/ekiga.xml:748(para)
+#: C/ekiga.xml:752(para)
 msgid ""
 "Fast Connect is a new method of call setup that bypasses some usual steps in "
 "order to make it faster. In addition to the speed improvement, Fast Connect "
@@ -1367,12 +1915,18 @@
 "sent, which is a requirement for certain billing procedures. It was "
 "introduced in H.323 version 2."
 msgstr ""
+"Der Schnellstart ist eine neue Methode der Einrichtung eines Anrufs. Einige "
+"der üblichen Schritte werden dabei umgangen, um die Geschwindigkeit zu "
+"erhöhen. Zusätzlich zum Geschwindigkeitsgewinn erlaubt der Schnellstart das "
+"Funktionieren der Medienkanäle, bevor die CONNECT-Meldung gesendet wird, was "
+"für einige Abrechnungsmodi erforderlich ist. Dieses Funktionsmerkmal wurde "
+"in H.323 Version 2 eingeführt."
 
-#: C/ekiga.xml:756(title)
+#: C/ekiga.xml:760(title)
 msgid "About <application>Ekiga</application>"
-msgstr "Über <application>Ekiga</application>"
+msgstr "Info zu <application>Ekiga</application>"
 
-#: C/ekiga.xml:757(para)
+#: C/ekiga.xml:761(para)
 msgid ""
 "<application>Ekiga</application> is written by Damien Sandras "
 "(<email>dsandras@seconix.com</email>). To find more information about "
@@ -1385,7 +1939,7 @@
 "<ulink url=\"http://www.ekiga.org\" type=\"http\"><application>Ekiga</"
 "application> Home Page</ulink>."
 
-#: C/ekiga.xml:761(para)
+#: C/ekiga.xml:765(para)
 msgid ""
 "To report a bug or make a suggestion regarding this application or this "
 "manual, follow the directions in <ulink url=\"ghelp:user-guide?feedback\" "
@@ -1395,35 +1949,35 @@
 "Handbuch zu machen, folgen Sie den Anweisungen in diesem <ulink url=\"ghelp:"
 "usr-guide?feedback\" type=\"help\">Dokument</ulink>.\""
 
-#: C/ekiga.xml:765(para)
+#: C/ekiga.xml:769(para)
 msgid ""
-"This program is distributed under the terms of the GNU General Public license "
-"as published by the Free Software Foundation; either version 2 of the "
-"License, or (at your option) any later version. A copy of this license can be "
-"found at this <ulink url=\"ghelp:gpl\" type=\"help\">link</ulink>, or in the "
-"file COPYING included with the source code of this program."
+"This program is distributed under the terms of the GNU General Public "
+"license as published by the Free Software Foundation; either version 2 of "
+"the License, or (at your option) any later version. A copy of this license "
+"can be found at this <ulink url=\"ghelp:gpl\" type=\"help\">link</ulink>, or "
+"in the file COPYING included with the source code of this program."
 msgstr ""
 "Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
 "<citetitle>GNU General Public License</citetitle>, wie von der Free Software "
 "Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß "
 "Version 2 der Lizenz oder (nach Ihrer Option) jeder späteren Version. Eine "
-"Kopie der <citetitle>GNU General Public License</citetitle> finden Sie in der "
-"<ulink url=\"ghelp:gpl\" type=\"help\">GPL</ulink>, oder in der Datei "
+"Kopie der <citetitle>GNU General Public License</citetitle> finden Sie in "
+"der <ulink url=\"ghelp:gpl\" type=\"help\">GPL</ulink>, oder in der Datei "
 "COPYING, die im Quellcode dieses Programms enthalten ist."
 
-#: C/ekiga.xml:771(title)
+#: C/ekiga.xml:775(title)
 msgid "Appendix"
 msgstr "Anhang"
 
-#: C/ekiga.xml:774(title)
+#: C/ekiga.xml:778(title)
 msgid "Related Software"
 msgstr "Verwandte Programme"
 
-#: C/ekiga.xml:776(emphasis)
+#: C/ekiga.xml:780(emphasis)
 msgid "IPBX"
 msgstr "IPBX"
 
-#: C/ekiga.xml:778(para)
+#: C/ekiga.xml:782(para)
 msgid ""
 "Asterisk PBX: <ulink url=\"http://asterisk.org\" type=\"http\">http://"
 "asterisk.org</ulink>"
@@ -1431,11 +1985,11 @@
 "Asterisk PBX: <ulink url=\"http://asterisk.org\" type=\"http\">http://"
 "asterisk.org</ulink>"
 
-#: C/ekiga.xml:781(emphasis)
+#: C/ekiga.xml:785(emphasis)
 msgid "SIP"
 msgstr "SIP"
 
-#: C/ekiga.xml:783(para)
+#: C/ekiga.xml:787(para)
 msgid ""
 "SIP Express Router: <ulink url=\"http://www.iptel.org/ser\" type=\"http"
 "\">http://www.iptel.org/ser</ulink>"
@@ -1443,11 +1997,11 @@
 "SIP Express Router: <ulink url=\"http://www.iptel.org/ser\" type=\"http"
 "\">http://www.iptel.org/ser</ulink>"
 
-#: C/ekiga.xml:786(emphasis)
+#: C/ekiga.xml:790(emphasis)
 msgid "H.323"
 msgstr "H.323"
 
-#: C/ekiga.xml:788(para)
+#: C/ekiga.xml:792(para)
 msgid ""
 "OpenH323 Gatekeeper: <ulink url=\"http://www.openh323.org\" type=\"http"
 "\">http://www.openh323.org</ulink>"
@@ -1455,7 +2009,7 @@
 "OpenH323 Gatekeeper: <ulink url=\"http://www.openh323.org\" type=\"http"
 "\">http://www.openh323.org</ulink>"
 
-#: C/ekiga.xml:789(para)
+#: C/ekiga.xml:793(para)
 msgid ""
 "GNU Gatekeeper: <ulink url=\"http://www.gnugk.org\" type=\"http\">http://www."
 "gnugk.org</ulink>"
@@ -1463,7 +2017,7 @@
 "GNU Gatekeeper: <ulink url=\"http://www.gnugk.org\" type=\"http\">http://www."
 "gnugk.org</ulink>"
 
-#: C/ekiga.xml:790(para)
+#: C/ekiga.xml:794(para)
 msgid ""
 "OpenH323 Proxy: <ulink url=\"http://openh323.sourceforge.net\" type=\"http"
 "\">http://openh323.sourceforge.net</ulink>"
@@ -1471,7 +2025,7 @@
 "OpenH323 Proxy: <ulink url=\"http://openh323.sourceforge.net\" type=\"http"
 "\">http://openh323.sourceforge.net</ulink>"
 
-#: C/ekiga.xml:791(para)
+#: C/ekiga.xml:795(para)
 msgid ""
 "H323 - ISDN Gateway: <ulink url=\"http://www.telos.de/linux/H323/\" type="
 "\"http\">http://www.telos.de/linux/H323/</ulink>"
@@ -1479,11 +2033,11 @@
 "H323 - ISDN Gateway: <ulink url=\"http://www.telos.de/linux/H323/\" type="
 "\"http\">http://www.telos.de/linux/H323/</ulink>"
 
-#: C/ekiga.xml:794(emphasis)
+#: C/ekiga.xml:798(emphasis)
 msgid "Conferencing/VoIP Software"
 msgstr "Konferenz-/VoIP-Programme"
 
-#: C/ekiga.xml:797(para)
+#: C/ekiga.xml:801(para)
 msgid ""
 "OpenMCU: <ulink url=\"http://www.openh323.org\" type=\"http\">http://www."
 "openh323.org</ulink>"
@@ -1491,11 +2045,11 @@
 "OpenMCU: <ulink url=\"http://www.openh323.org\" type=\"http\">http://www."
 "openh323.org</ulink>"
 
-#: C/ekiga.xml:800(emphasis)
+#: C/ekiga.xml:804(emphasis)
 msgid "Similar Clients"
 msgstr "Ähnliche Clients"
 
-#: C/ekiga.xml:803(para)
+#: C/ekiga.xml:807(para)
 msgid ""
 "XTen: <ulink url=\"http://www.xten.com\" type=\"http\">http://www.xten.com</"
 "ulink>"
@@ -1503,7 +2057,7 @@
 "XTen: <ulink url=\"http://www.xten.com\" type=\"http\">http://www.xten.com</"
 "ulink>"
 
-#: C/ekiga.xml:804(para)
+#: C/ekiga.xml:808(para)
 msgid ""
 "SJPhone: <ulink url=\"http://www.sjlabs.com/\" type=\"http\">http://www."
 "sjlabs.com/</ulink>"
@@ -1511,7 +2065,7 @@
 "SJPhone: <ulink url=\"http://www.sjlabs.com/\" type=\"http\">http://www."
 "sjlabs.com/</ulink>"
 
-#: C/ekiga.xml:805(para)
+#: C/ekiga.xml:809(para)
 msgid ""
 "OpenPhone: <ulink url=\"http://www.openh323.org\" type=\"http\">http://www."
 "openh323.org</ulink>"
@@ -1519,7 +2073,7 @@
 "OpenPhone: <ulink url=\"http://www.openh323.org\" type=\"http\">http://www."
 "openh323.org</ulink>"
 
-#: C/ekiga.xml:806(para)
+#: C/ekiga.xml:810(para)
 msgid ""
 "Netmeeting: <ulink url=\"http://www.microsoft.com\" type=\"http\">http://www."
 "microsoft.com</ulink>"
@@ -1532,7 +2086,8 @@
 msgid "translator-credits"
 msgstr ""
 "Stefan Brüns <stefan.bruens@rwth-aachen.de>, 2006\n"
-"Mario Blättermann <mario.blaettermann@t-online.de>, 2008"
+"Mario Blättermann <mariobl@gnome.org>, 2008, 2009\n"
+"Wolfgang Stöggl <c72578@yahoo.de>, 2009"
 
 #~ msgid ""
 #~ "User manual for the Ekiga Voice over IP, IP Telephony and Video-"
@@ -1549,8 +2104,8 @@
 
 #~ msgid ""
 #~ "The Audio manager manages everything audio. It is dependant on the "
-#~ "operating system on which <application>Ekiga</application> is running, and "
-#~ "some operating systems offer different alternatives."
+#~ "operating system on which <application>Ekiga</application> is running, "
+#~ "and some operating systems offer different alternatives."
 #~ msgstr ""
 #~ "Der Audio-Manager verwaltet alles, was mit Audio zu tun hat. Er ist "
 #~ "abhängig vom Betriebssystem, auf dem <application>Ekiga</application> "
@@ -1584,8 +2139,8 @@
 #~ "To view the statistics, please select the Statistics tab in the control "
 #~ "panel."
 #~ msgstr ""
-#~ "Um die Statistiken zu sehen, wählen sie bitte den entsprechenden Reiter in "
-#~ "der Kontrollleiste aus."
+#~ "Um die Statistiken zu sehen, wählen sie bitte den entsprechenden Reiter "
+#~ "in der Kontrollleiste aus."
 
 #~ msgid "Using text chat"
 #~ msgstr "Verwendung des Text-Chats"
@@ -1636,8 +2191,8 @@
 #~ msgstr "Modus »Gesprächsbereit«"
 
 #~ msgid ""
-#~ "This mode can be enabled by selecting Call -&gt; Free For Chat in the main "
-#~ "window menu."
+#~ "This mode can be enabled by selecting Call -&gt; Free For Chat in the "
+#~ "main window menu."
 #~ msgstr ""
 #~ "Dieser Modus kann über den Menüpunkt »Automatisch entgegennehmen« im Menu "
 #~ "»Anruf« des Hauptfensters eingestellt werden."
diff -Nru ekiga-3.2.5/help/de/ekiga.xml ekiga-3.2.6~ppa~karmic1/help/de/ekiga.xml
--- ekiga-3.2.5/help/de/ekiga.xml	2009-07-06 20:11:25.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/help/de/ekiga.xml	2009-09-22 15:37:25.000000000 +0100
@@ -11,7 +11,7 @@
 
 <copyright><year>2003-2008</year><holder>Damien Sandras</holder></copyright>
 <copyright><year>2003-2004</year><holder>Matthias Redlich</holder></copyright>
-<copyright><year>2003-2004</year><holder>Christopher Warner</holder></copyright><copyright><year>2006</year><holder>Stefan Brüns (stefan.bruens@rwth-aachen.de)</holder></copyright><copyright><year>2008</year><holder>Mario Blättermann (mario.blaettermann@t-online.de)</holder></copyright>
+<copyright><year>2003-2004</year><holder>Christopher Warner</holder></copyright><copyright><year>2006</year><holder>Stefan Brüns (stefan.bruens@rwth-aachen.de)</holder></copyright><copyright><year>2008, 2009</year><holder>Mario Blättermann (mariobl@gnome.org)</holder></copyright><copyright><year>2009</year><holder>Wolfgang Stöggl (c72578@yahoo.de)</holder></copyright>
 <!-- translators: uncomment this:
 
 <copyright>
@@ -67,8 +67,7 @@
 <releaseinfo>Diese Dokumentation bezieht sich auf Ekiga Version 3.00</releaseinfo>
 
 <abstract role="description">
-<para>Ekiga is an application for voice over IP, IP telephony, and video
-conferencing, with support for many audio and video codecs.</para>
+<para>Ekiga ist eine Anwendung für Voice-over-IP, IP-Telefonie und Videokonferenzen, die zahlreiche Video- und Audio-Codecs unterstützt.</para>
 </abstract>
 </articleinfo>
 
@@ -89,18 +88,15 @@
 <title>Einleitung</title>
 
 <section><title>Ekiga</title>
-<para><application>Ekiga</application> is ein freies Voice-over-IP-, IP-Telefonie- und Videokonferenz-Programm für Linux und andere Unixe (z.B. BSD, OpenSolaris oder MacOS X). Es wurde von Damien Sandras geschrieben und ist  unter der GNU/GPL lizenziert.</para>
+<para><application>Ekiga</application> ist ein freies Voice-over-IP-, IP-Telefonie- und Videokonferenz-Programm für Linux und andere Unixe (z.B. BSD, OpenSolaris oder MacOS X). Es wurde von Damien Sandras geschrieben und ist unter der GNU/GPL lizenziert.</para>
 
-<para>
-Ekiga is able to use modern Voice over IP protocols like SIP and H.323. It supports all major features defined by those protocols like <emphasis>call hold</emphasis>, <emphasis>call transfer</emphasis>, <emphasis>call forwarding</emphasis>, ... It also supports <emphasis>instant messaging</emphasis>, and <emphasis>presence</emphasis>. It also has advanced support for <emphasis>NAT traversal</emphasis>.
-Ekiga supports the best <emphasis>free</emphasis> audio and video codecs, and has wideband support for a superior audio quality, together with echo cancellation.
-</para>
+<para>Ekiga unterstützt aktuelle Voice-over-IP-Protokolle wie SIP und H.323. Es unterstützt alle wichtigen Funktionen dieser Protokolle wie <emphasis>Parken von Verbindungen</emphasis>, <emphasis>Weitervermittlung</emphasis>, <emphasis>Anruf-Weiterleitung</emphasis>, … Es stellt außerdem einfache <emphasis>Sofortnachrichten</emphasis>- und <emphasis>Verfügbarkeits</emphasis>-Funktionen sowie fortgeschrittene Funktionen zur <emphasis>NAT-Durchquerung</emphasis> bereit. Ekiga unterstützt die besten verfügbaren <emphasis>freien</emphasis> Codecs für Audio und Video, und bietet Breitband-Sprachübertragung und Echo-Unterdrückung für eine herausragende Audio-Qualität.</para>
 </section>
 
 <section><title>SIP und H.323</title>
-<para>Das Sitzungs-Initiierungs-Protokoll (Session Initiation Protocol, SIP) is ein von der IETF MMUSIC Arbeitsgruppe entwickeltes und zur Standardisierung vorgeschlagenes Protokoll, um interaktive Benutzer-Sitzungen aufzubauen, zu verändern und zu beenden. Diese können Multimedia-Elemente wie Video, Sprache, Sofortnachrichten, Online-Spiele und Virtuelle Realität beinhalten. Im November 2000 wurde SIP als Signalisierungs-Protokoll für 3GPP und dauerhaftes Element der IMS-Architektur angenommen. Es ist eines der vorherrschenden Signalisierungs-Protokolle für Voice-over-IP.</para>
+<para>Das Sitzungs-Initiierungs-Protokoll (Session Initiation Protocol, SIP) ist ein von der IETF MMUSIC Arbeitsgruppe entwickeltes und zur Standardisierung vorgeschlagenes Protokoll, um interaktive Benutzer-Sitzungen aufzubauen, zu verändern und zu beenden. Diese können Multimedia-Elemente wie Video, Sprache, Sofortnachrichten, Online-Spiele und Virtuelle Realität beinhalten. Im November 2000 wurde SIP als Signalisierungs-Protokoll für 3GPP und dauerhaftes Element der IMS-Architektur angenommen. Es ist eines der vorherrschenden Signalisierungs-Protokolle für Voice-over-IP.</para>
 
-<para>H.323 wurde ursprünglich dafür erstellt, um einen Mechnismus für den Transport von Multimedia-Applikationen über lokale Netze (Local Area Networks, LAN) zur Verfügung zu stellen, es hat sich aber schnell weiterentwickelt um den gestiegenen Bedürfnissen von VoIP-Netzwerken gerecht zu werden. Eine der Stärken von H.323 war die frühzeitige Verfügbarkeit einer Sammlung von Standards, die nicht nur einfache Anrufe, sondern auch Zusatzdienste spezifizieren, um den Erwartungen im Unternehmensumfeld gerecht zu werden. H.323 war der erste VoIP-Standard, der den RTP-Standard der IETF für den Transport von Audio- und Videodaten über IP-Netze übernahm. H.323 basiert auf dem ISDN Q.931 Protokoll und eignet sich für Zusammenarbeit-Szenarien von IP und ISDN bzw. zwischen IP und QSIG. Ein Verbindungsmodell, dass dem von ISDN ähnelt, erleichtert die Einbindung von IP-Telefonie in bestehende ISDN-basierte Netze von Telefonanlagen.</para>
+<para>H.323 wurde ursprünglich dafür erstellt, um einen Mechanismus für den Transport von Multimedia-Anwendungen über lokale Netze (Local Area Networks, LAN) zur Verfügung zu stellen. Es hat sich aber schnell weiterentwickelt, um den gestiegenen Bedürfnissen von VoIP-Netzwerken gerecht zu werden. Eine der Stärken von H.323 war die frühzeitige Verfügbarkeit einer Sammlung von Standards, die nicht nur einfache Anrufe, sondern auch Zusatzdienste spezifizieren, um den Erwartungen im Unternehmensumfeld gerecht zu werden. H.323 war der erste VoIP-Standard, der den RTP-Standard der IETF für den Transport von Audio- und Videodaten über IP-Netze übernahm. H.323 basiert auf dem ISDN Q.931 Protokoll und eignet sich für Zusammenarbeit-Szenarien von IP und ISDN bzw. zwischen IP und QSIG. Ein Verbindungsmodell, das dem von ISDN ähnelt, erleichtert die Einbindung von IP-Telefonie in bestehende ISDN-basierte Netze von Telefonanlagen.</para>
 <para>
 <graphic fileref="figures/lumi.png"/> 
 </para>
@@ -109,11 +105,7 @@
 
 <section id="ekiga-getting-started">
 <title>Erste Schritte</title>
-<para>
-When starting <application>Ekiga</application> for the first time the configuration assistant will show automatically. The Configuration Assistant is a step-by-step questionnaire that will guide you through all the steps involved in creating the basic configuration you will need to operate <application>Ekiga</application>.
-You should go through all of these steps properly, otherwise the assistant will re-appear (when it has not been completed) or <application>Ekiga</application> will not function appropriately (if some of your answers were not correct).
-You may run the Configuration Assistant at any time from the Edit menu.
-</para>
+<para>Beim ersten Start von <application>Ekiga</application> erscheint automatisch der Einrichtungs-Assistent. Dieser stellt Ihnen Fragen, und hilft Ihnen Schritt-für-Schritt die Grundkonfiguration zu erstellen, die für <application>Ekiga</application> benötigt wird. Sie sollten alle diese Schritte sorgfältig durchgehen, da der Assistent ansonsten erneut aufgerufen wird (bei Abbruch vor Fertigstellung des Assistenten), oder Probleme beim Betrieb von <application>Ekiga</application> auftreten können (falls fehlerhafte Antworten gegeben wurden). Der Assistent kann jederzeit über das Menü <guimenu>Bearbeiten</guimenu> aufgerufen werden.</para>
 
 <tip><title>Tipp</title><para>Alle Einstellungen können jederzeit im Einstellungs-Dialog verändert werden.</para></tip>
 
@@ -146,28 +138,25 @@
 <graphic fileref="figures/config_d3.png"/>
 </figure>
 
-<para>Ekiga.net ist eine freie SIP Dienste-Plattform, die Benutzern von <application>Ekiga</application> zur Verfügung gestellt wird. Diese stellt für Sie eine SIP-Adresse bereit, über die Ihre Freunde und Familie Sie mit jeder SIP-konformen Soft- oder Hardware erreichen können. Eine solche Sdresse erhalten Sie hier: <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink>. Ekiga.net bietet Ihnen außerdem zusätzliche Dienste wie Konferenzräume, Zustellung von Sprachnachrichten per Mail und ein Online-Telefonbuch. Weitere Informationen finden Sie unter <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink>.</para>
+<para>Ekiga.net ist eine freie SIP Dienste-Plattform, die Benutzern von <application>Ekiga</application> zur Verfügung gestellt wird. Diese stellt für Sie eine SIP-Adresse bereit, über die Ihre Freunde und Familie Sie mit jeder SIP-konformen Soft- oder Hardware erreichen können. Eine solche Adresse erhalten Sie hier: <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink>. Ekiga.net bietet Ihnen außerdem zusätzliche Dienste wie Konferenzräume, Zustellung von Sprachnachrichten per Mail und ein Online-Telefonbuch. Weitere Informationen finden Sie unter <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink>.</para>
 
-<para>Folgen Sie einfach dem im Dialog angegebenen Link, um ein Konto zu bekommen, falls Sie nicht bereits eines haben. Tragen Sie danach ihren Benutzernamen und Ihr Passwort ein. Bitte drücken Sie »Vor« wenn Sie alle benötigten Informationen angegeben haben.</para>
+<para>Folgen Sie einfach dem im Dialog angegebenen Link, um ein Konto zu bekommen, falls Sie nicht bereits eines haben. Tragen Sie danach Ihren Benutzernamen und Ihr Passwort ein. Bitte drücken Sie »Vor« wenn Sie alle benötigten Informationen angegeben haben.</para>
 </section>
 
 
-<section><title>Ekiga Call Out Account</title>
+<section><title>Ekiga »PC zu Telefon«-Konto</title>
 <figure>
 <title/>
 <graphic fileref="figures/config_d4.png"/>
 </figure>
 
-<para><application>Ekiga</application> can be used with several Internet Telephony Service Providers. Those providers will allow calling real phones from your computer using <application>Ekiga</application> at interesting rates. We recommend you use the default <application>Ekiga</application> provider.</para>
+<para><application>Ekiga</application> kann mit verschiedenen Internet-Telefonanbietern benutzt werden. Diese Dienstanbieter ermöglichen Anrufe zu realen Telefonnummern mittels <application>Ekiga</application> von Ihrem Rechner aus, und das zu interessanten Preisen. Wir empfehlen die Nutzung des vorgegebenen <application>Ekiga</application>-Dienstanbieters.</para>
 
-<para>If you want to create an account and use it to call your friends and family using regular phones at interesting rates, simply create an account using the "Get an Ekiga Call Out account" link. Once the account has been created, you will receive a login and a password by e-mail. Simply enter them in the dialog, and you are ready to call regular phones using <application>Ekiga</application></para> 
+<para>Falls Sie ein Konto einrichten wollen, das Sie für Gespräche zu einem gewöhnlichen Telefon mit Familie und Freunden zu günstigen Preisen nutzen können, erstellen Sie ein solches Konto über den Link <guilabel>Ekiga »PC zu Telefon«-Konto hinzufügen</guilabel>. Sobald dieses Konto erstellt ist, erhalten Sie einen Anmeldenamen und ein Passwort per E-Mail. Geben Sie dies im Dialog ein. Ab sofort können Sie <application>Ekiga</application> für Anrufe zu gewöhnlichen Telefonanschlüssen nutzen.</para> 
 
-<para>With the default setup, you can simply use sip:3210444555 and choose sip.diamondcard.us to call the real phone number +3210444555, 32 is the country code, 10444555 is the number to call. We encourage you to put your favorite phone numbers in the address book.</para>
+<para>Mit der Vorgabekonfiguration können Sie einfach sip:3210444555 verwenden und sip.diamondcard.us in der Liste wählen, um die reale Telefonnummer +3210444555 anzurufen, wobei 32 die Landesvorwahl darstellt und 10444555 die anzurufende Nummer. Wir empfehlen Ihnen, Ihre wichtigen Telefonnummern im Adressbuch zu speichern.</para>
 
-<para>
-Just follow the link given in the dialog to get an account if you do not have one, then fill in your username and password.
-Please press 'Forward' after entering all required information to continue.
-</para>
+<para>Folgen Sie einfach dem im Dialog angegebenen Link, um ein Konto zu bekommen, falls Sie nicht bereits eines haben. Tragen Sie danach Ihren Benutzernamen und Ihr Passwort ein. Bitte drücken Sie »Vor«, sobald Sie alle benötigten Informationen angegeben haben.</para>
 </section>
 
 
@@ -177,14 +166,9 @@
 <graphic fileref="figures/config_d5.png"/>
 </figure>
 
-<para>
-<application>Ekiga</application> supports several audio and video codecs. It includes codecs with excellent quality as well as codecs with medium to good quality. The higher the quality of a codec, the more bandwidth it requires. Moreover, video codecs can adapt their quality to the available bandwidth. This option is necessary in the initial configuration of <application>Ekiga</application> so that it chooses the optimal codec suited to your network connection and so that it adjusts the video quality settings.
-If your connection type is not mentioned in the list you should select the one closest to your network connection and adjust <application>Ekiga</application> manually with the preferences window (codecs section) later on.
-</para>	
+<para><application>Ekiga</application> unterstützt verschiedene Audio- und Video-Codecs, sowohl solche mit hoher Qualität als auch solche mit niederer Qualität. Je höher die Qualität eines Codecs ist, umso mehr Übertragungsbandbreite wird benötigt. Außerdem können Video-Codecs ihre Qualität an die verfügbare Bandbreite anpassen. Diese Option ist in der Erstkonfiguration von <application>Ekiga</application> erforderlich, so dass jederzeit der optimal zu Ihrer Netzwerkverbindung passende Codec gewählt werden kann, um die Video-Qualitätseinstellungen anzupassen. Falls Ihr Verbindungstyp nicht in der Liste aufgeführt ist, sollten Sie denjenigen wählen, der Ihrer Verbindung am nächsten kommt und die Verbindungsgeschwindigkeit für <application>Ekiga</application> später manuell im Codec-Abschnitt des Einstellungsfensters konfigurieren.</para>	
 
-<para>
-When done, continue on with the Configuration.
-</para>
+<para>Sobald Sie fertig sind, fahren Sie mit der Konfiguration fort.</para>
 </section>
 
 
@@ -194,14 +178,9 @@
 <graphic fileref="figures/config_d6.png"/>
 </figure>
 
-<para>
-<application>Ekiga</application> requires audio devices to play and record sound. The audio output device ouputs the incoming sound stream during a call. Please select the device that your headset or speakers are connected to. The audio input device is what your microphone is connected to. These settings might be the same as the settings for the audio player if you have only one soundcard. But please note that it is also possible to record sound via another device (e.g. internal microphone in a webcam) too.
-This section also allows you to choose the ringing device. This device can be different from the audio output device. It allows you to hear the incoming call ringing sound event in your speakers, while having your headset connected for calls. 
-</para>
+<para><application>Ekiga</application> benötigt Audiogeräte zum Wiedergeben und Aufnehmen von Klängen. Das Audio-Ausgabegerät ist für die Ausgabe des eingehenden Audio-Datenstroms während eines Gesprächs zuständig. Bitte wählen Sie das Gerät, mit dem Ihr Headset oder Ihre Lautsprecher verbunden sind. Das Audio-Eingabegerät ist jenes, mit welchem Ihr Mikrofon verbunden ist. Diese Einstellungen können den Einstellungen der Audio-Wiedergabe gleichen, falls Sie nur über eine Soundkarte verfügen. Beachten Sie, dass es auch möglich ist, Klänge über ein anderes Gerät aufzunehmen, zum Beispiel über das in einer Webcam eingebaute Mikrofon. In diesem Abschnitt können Sie auch das Gerät für den Klingelton einstellen. Dieses Gerät kann sich vom Audio-Wiedergabegerät unterscheiden. Es ermöglicht Ihnen, das Klingeln eines eingehenden Anrufs über die Lautsprecher zu hören, während Ihr Headset für Gespräche angeschlossen ist.</para>
 
-<para>
-When done, continue on with the Configuration.
-</para>
+<para>Sobald Sie fertig sind, fahren Sie mit der Konfiguration fort.</para>
 </section>
 
 
@@ -215,9 +194,7 @@
 
 <para>Wenn Sie eine Webcam oder anderes Videogerät verwenden, können Sie es in dieser Liste auswählen.</para>
 
-<para>
-When done, continue on with the Configuration.
-</para>
+<para>Sobald Sie fertig sind, fahren Sie mit der Konfiguration fort.</para>
 </section>
 
 
@@ -246,33 +223,33 @@
 <graphic fileref="figures/call_d1.png"/>
 
 <section><title>Von Computer zu Computer (PC-zu-PC)</title>
-<para>If you want to call other users and to be callable, you need a SIP address. You can get a SIP address from <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink> as described above.</para>
+<para>Falls Sie andere Benutzer anrufen und selbst auch angerufen werden wollen, benötigen Sie eine SIP-Adresse. Eine solche Adresse erhalten Sie auf <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink>, wie oben beschrieben.</para>
 
-<para>The SIP address can be used by other users to call you. Similarly, you can use the SIP address of your friends and family to call them. You can for example use <emphasis>sip:dsandras@ekiga.net</emphasis> to call the author of Ekiga.</para>
+<para>Andere Benutzer können Ihre SIP-Adresse benutzen, um Sie anzurufen. Ebenso rufen Sie Ihre Familie und Freunde über deren SIP-Adresse an. Beispielsweise erreichen Sie den Autor von Ekiga über <emphasis>sip:dsandras@ekiga.net</emphasis>.</para>
 
-<para>You can use the online address book of <application>Ekiga</application> to find the SIP addresses of other <application>Ekiga</application> users. It is of course possible to call users who are using another provider than ekiga.net. You can actually call any user using SIP software or hardware, and registered to any public SIP provider</para>
+<para>Das Online-Adressbuch von <application>Ekiga</application> können Sie benutzen, um die SIP-Adressen anderer <application>Ekiga</application>-Benutzer zu ermitteln. Natürlich können Sie auch Benutzer anrufen, die einen anderen Dienstanbieter verwenden als Ekiga.net. Derzeit können Sie jeden Benutzer erreichen, der SIP-Geräte oder -Software benutzt und bei einem beliebigen öffentlichen SIP-Dienstanbieter registriert ist.</para>
 
-<para>If you know the URI address of the party that you wish to call, you may enter that URI into the sip: input box at the top of the screen and press the Connect button; eg: sip:foo@ekiga.net and pressing the Connect button would call the user at that address.</para>
+<para>Falls Sie die Adresse des Teilnehmers kennen, den Sie anrufen wollen, geben Sie diese Adresse in das Eingabefeld <guilabel>sip:</guilabel> am oberen Rand des Fensters ein und klicken Sie auf den Knopf <guibutton>Verbinden</guibutton>. Mit <guilabel>sip:foo@ekiga.net</guilabel> und anschließendem Anklicken des <guibutton>Verbinden</guibutton>-Knopfes rufen Sie den Benutzer mit dieser Adresse an.</para>
 
-<para>It is also possible to call contacts using the address book, the call history or the roster. You can add contacts you call frequently to your roster, and watch their presence information in order to know when they are available. Please refer to the appropriate section of the manual for full explanations.</para>
+<para>Es ist auch möglich, Kontakte unter Zuhilfenahme des Adressbuchs, der Anrufchronik oder der Kontaktliste anzurufen. Häufig genutzte Kontakte können Sie zu Ihrer Kontaktliste hinzufügen und deren Anwesenheitsinformationen überwachen, um die Verfügbarkeit zu prüfen. In den entsprechenden Abschnitten dieses Handbuchs finden Sie hierzu ausführliche Erläuterungen.</para>
 
-<tip><title>Tipp</title><para><application>Ekiga</application> also supports H.323 and as such can call any H.323 software or hardware. Please refer to the section related to URIs to learn more about the various types of URIs that can be used to call remote H.323  and SIP users.</para></tip>
+<tip><title>Tipp</title><para><application>Ekiga</application> unterstützt auch H.323 und ist somit in der Lage, jegliche H.323-Hardware oder -Software anzurufen. Informieren Sie sich in den Abschnitten bezüglich der Adressen über die verschiedenen Adresstypen, die zum Anrufen entfernter H.323- und SIP-Benutzer verwendet werden.</para></tip>
 </section>
 
 <section><title>Von Computern zu gewöhnlichen Telefonen (PC-zu-Telefon)</title>
-<para><application>Ekiga</application> can be used with several Internet Telephony Service Providers. Those providers will allow calling real phones from your computer using <application>Ekiga</application> at interesting rates. We recommend you use the default <application>Ekiga</application> provider. You can get an account using the links in the configuration assistant as described above.</para>
+<para><application>Ekiga</application> kann mit verschiedenen Internet-Telefondienstanbietern verwendet werden. Diese Dienstanbieter ermöglichen Anrufe zu realen Telefonanschlüssen von Ihrem Rechner mittels <application>Ekiga</application> zu günstigen Preisen. Wir empfehlen, den vorgegebenen Dienstanbieter <application>Ekiga</application> zu verwenden. Ein Konto erhalten Sie über die Links im Konfigurationsassistenten, wie oben beschrieben.</para>
 
-<para>With the default setup, you can simply use sip:3210444555 and select sip.diamondcard.us in the list to call the real phone number +3210444555, 32 is the country code, 10444555 is the number to call.</para>
+<para>Mit der Vorgabekonfiguration können Sie einfach sip:3210444555 verwenden und sip.diamondcard.us in der Liste wählen, um die reale Telefonnummer +3210444555 anzurufen, wobei 32 die Landesvorwahl darstellt und 10444555 die anzurufende Nummer.</para>
 
-<para>You can also dial real phone numbers from the address book. If the phone number of the contact you want to call is stored in the address book, simply select Action -&gt; Call [Ekiga Call Out] when the contact is highlighted. It will dial the phone number of the contact using the Ekiga Call Out account.</para>
+<para>Aus dem Adressbuch können Sie auch reale Telefonnummern anrufen. Falls die gewünschte Telefonnummer im Adressbuch gespeichert ist, wählen Sie <menuchoice><guimenu>Aktion</guimenu><guimenuitem>Anruf [Ekiga »PC zu Telefon«]</guimenuitem></menuchoice>, wenn der Kontakt hervorgehoben ist. Daraufhin wird die Telefonnummer des Kontakts über das »PC zu Telefon«-Konto von <application>Ekiga</application> gewählt.</para>
 
-<tip><title>Tipp</title><para><application>Ekiga</application> also supports connecting to H.323 and SIP PBX systems. If the PBX at your office supports those protocols, you will be able to call real phones and be called from real phones after having connected to the PBX. Please ask for the settings from your administrator.</para></tip>
+<tip><title>Tipp</title><para><application>Ekiga</application> unterstützt auch die Verbindung zu Telefonanlagen über die H.323- und SIP-Protokolle. Falls die Telefonanlage in Ihrem Büro diese Protokolle unterstützt, können Sie gewöhnliche Telefonanschlüsse anrufen und von diesen aus angerufen werden, sobald Sie sich mit der Telefonanlage verbunden haben. Bitte fragen Sie Ihren Systemverwalter nach den erforderlichen Einstellungen.</para></tip>
 </section>
 
 <section><title>Von einem gewöhnlichen Telefon zu einem Computer (Telefon-zu-PC)</title>
-<para><application>Ekiga</application> can be used to receive incoming calls from regular phones. To allow this, you can simply login to your PC-To-Phone account using the Tools menu as described above, and buy a phone number in the country of your choice. <application>Ekiga</application> will ring when people will call that phone number.</para>
+<para>Mit <application>Ekiga</application> können Sie eingehende Anrufe von gewöhnlichen Telefonen empfangen. Um dies zu ermöglichen, melden Sie sich unter Zuhilfenahme des oben erwähnten Werkzeug-Menüs an Ihrem PC-zu-Telefon-Konto an und erwerben eine Telefonnummer in dem Land Ihrer Wahl. <application>Ekiga</application> klingelt, wenn jemand diese Telefonnummer anruft.</para>
 
-<tip><title>Tipp</title><para>You can actually use any H.323 or SIP ITSP provider, including your own PBX at work. However we recommend using the integrated provider.</para></tip>
+<tip><title>Tipp</title><para>Derzeit können Sie H.323- oder SIP-Dienste benutzen, einschließlich einer eigenen PBX-Telefonanlage. Wir empfehlen jedoch die Nutzung des integrierten Dienstes.</para></tip>
 </section>
 
 </section>
@@ -280,77 +257,48 @@
 
 <section id="ekiga-manage-contacts">
 <title>Kontakte verwalten</title>
-<section><title>Adding contacts to the roster</title>
+<section><title>Hinzufügen von Kontakten zur Kontaktliste</title>
 
 <graphic fileref="figures/roster.png"/>
 
-<para>
-<application>Ekiga</application> allows you to add the contacts you dial the most in the roster. It allows to call them or start a chat conversation with your friends without having to remember their URI.
-If supported by the service, <application>Ekiga</application> will display <emphasis>extended presence information</emphasis> about your friends.
-Ekiga.net supports publishing presence information for its users. Software PBX systems like <ulink url="http://www.asterisk.org" type="http">Asterisk</ulink> can report if a user is on the phone or not, and <application>Ekiga</application> will display that information in its roster. 
-</para>
+<para><application>Ekiga</application> ermöglicht Ihnen das Hinzufügen Ihrer meistgenutzten Kontakten zur Kontaktliste. Dadurch können Sie Ihre Freunde anrufen oder eine Unterhaltung beginnen, ohne über deren Adressen nachdenken zu müssen. Falls dies vom Dienst unterstützt wird, zeigt <application>Ekiga</application> <emphasis>erweiterte Anwesenheitsinformationen</emphasis> zu Ihren Freunden an. Ekiga.net unterstützt das Veröffentlichen von Anwesenheitsinformationen für seine Benutzer. Softwaregestützte PBX-Telefonanlagen wie <ulink url="http://www.asterisk.org" type="http">Asterisk</ulink> können ermitteln, ob ein Benutzer telefoniert oder nicht. Diese Information zeigt <application>Ekiga</application> in der Kontaktliste an.</para>
 
-<para>
-You can thus use <application>Ekiga</application> to monitor lines on your PBX.
-</para>
+<para>Sie können daher <application>Ekiga</application> zum Überwachen der Leitungen Ihrer PBX-Telefonanlage nutzen.</para>
 
-<para>
-<application>Ekiga</application> is also able to detect other <application>Ekiga</application> users on the LAN using the Bonjour technology popularized by Apple (tm) and to display them in the roster. That supposes you have a local mDNSResponder daemon running on your computer. On Linux systems this service will usually be provided by Avahi.
-</para>
+<para><application>Ekiga</application> ist außerdem in der Lage, andere <application>Ekiga</application>-Benutzer im lokalen Netzwerk mit Hilfe der von Apple™ popularisierten Bonjour-Technologie aufzuspüren und diese in der Kontaktliste anzuzeigen. Das setzt voraus, dass auf Ihrem Rechner ein lokaler mDNSResponder-Dienst läuft. Auf Linux-Systemen wird dieser Dienst üblicherweise von Avahi bereitgestellt.</para>
 
-<para>
-To add a contact to the roster, select Chat-&gt;Add Contact, and fill in the required fields. If the service managing the URI you entered for the contact is able to publish presence status, Ekiga will automatically display it.
-</para>
+<para>Um einen Kontakt zur Kontaktliste hinzuzufügen, wählen Sie <menuchoice><guimenu>Chat</guimenu><guimenuitem>Kontakt hinzufügen</guimenuitem></menuchoice> und füllen die erforderlichen Felder aus. Falls der Dienst, der die für diesen Kontakt eingegebene Adresse verwaltet, zur Veröffentlichung des Anwesenheitsstatus fähig ist, dann zeigt <application>Ekiga</application> diesen Status automatisch an.</para>
 
-<para>
-If you do not know the VoIP URI of a contact, you might try searching for him using the Ekiga.net online directory. To do so, select Chat -&gt; Address Book, and start searching using the 'Search Filter' feature.
-</para>
+<para>Falls Sie die VoIP-Adresse eines Kontakts nicht kennen, können Sie im Online-Verzeichnis von Ekiga.net danach suchen. Wählen Sie hierzu <menuchoice><guimenu>Chat</guimenu><guimenuitem>Adressbuch</guimenuitem></menuchoice> und starten die Suche über das Eingabefeld <guilabel>Suchfilter</guilabel>.</para>
 
-<tip><title>Tipp</title><para>You can organise your contacts in groups in the roster.</para></tip>
+<tip><title>Tipp</title><para>Sie können innerhalb der Kontaktliste Ihre Kontakte in Gruppen ordnen.</para></tip>
 
 <section><title>Kontakte verwalten</title>
 
 <graphic fileref="figures/addressbook_d1.png"/>
 
-<para>
-<application>Ekiga</application> allows you to look for contacts using various sources like the <ulink url="http://www.novell.com/products/evolution" type="http">Novell Evolution</ulink> address book, an LDAP directory or the Ekiga.net contact directory. You can use the result of your search to start a chat, call the contact, or simply add him to your roster if you have frequent calls with him. To start looking for contacts, select Chat -&gt; Address Book in the menu.
-To your left there will be a list dialog showing the LDAP directories as well as a list of local Address Books. The defaults are the <application>Ekiga</application> white pages, and the personal address book from <ulink url="http://www.novell.com/products/evolution" type="http">Novell Evolution</ulink>. Support for more contact sources is possible. 
-</para>
+<para><application>Ekiga</application> ermöglicht Ihnen die Suche nach Kontakten in verschiedenen Quellen wie dem Adressbuch von <ulink url="http://www.novell.com/products/evolution" type="http">Novell Evolution</ulink>, einem LDAP-Verzeichnisdienst oder dem Kontaktverzeichnis von Ekiga.net. Sie können die Suchergebnisse zum Starten von Unterhaltungen, Anrufen des Kontakts oder zum Hinzufügen des Kontakts zur Kontaktliste verwenden, wenn Sie ihn häufiger anrufen. Um mit der Suche nach Kontakten zu beginnen, wählen Sie <menuchoice><guimenu>Chat</guimenu><guimenuitem>Adressbuch</guimenuitem></menuchoice> aus dem Menü. Links wird ein Listendialog angezeigt, der sowohl die LDAP-Verzeichnisse als auch die Liste der lokalen Adressbücher anzeigt. Vorgegeben sind hierbei das Telefonbuch von <application>Ekiga</application> und das persönliche Adressbuch von <ulink url="http://www.novell.com/products/evolution" type="http">Novell Evolution</ulink>. Die Unterstützung weiterer Kontaktquellen ist ebenfalls möglich.</para>
 
-<para>
-<application>Ekiga</application> is able to browse any LDAP directory and use any attribute as the calling URI. For example, you could have an LDAP directory in your company, with a specific attribute containing the local extensions of all your colleagues. <application>Ekiga</application> is able to use such an LDAP directory. Simply select in Address Book -&gt; Add an LDAP Address Book, and fill in the required details. You can then right-click on the contact and call him using the call attribute as VoIP URI.
-</para>
+<para><application>Ekiga</application> ist fähig, beliebige LDAP-Verzeichnisse zu durchsuchen und Attribute als Anrufadresse zu verwenden. Wenn Ihr Unternehmen über einen LDAP-Verzeichnisdienst verfügt, der ein spezifisches Attribut mit den lokalen Erweiterungen der Mitarbeiter beinhaltet, dann ist <application>Ekiga</application> in der Lage, ein solches LDAP-Verzeichnis zu benutzen. Wählen Sie <menuchoice><guimenu>Adressbuch</guimenu><guimenuitem>Ein LDAP-Adressbuch hinzufügen</guimenuitem></menuchoice> und geben Sie die benötigten Details an. Sie können dann mit der rechten Maustaste auf den Kontakt klicken und ihn unter Verwendung der Anrufattribute als VoIP-Adresse anrufen.</para>
 
-<para>
-The LDAP Address Book supports a range of settings to allow it to work with any LDAPv3 directory. It allows you to choose the attribute to use for displaying a contact's name in the address book as well as a list of attributes for callng info. E.g., if the directory uses the LDAP inetOrgPerson schema you can configure the Address Book to retrieve the homePhone, mobile, and pager attributes make those values available for calling or messaging. You can also customize a Filter Template for the default LDAP search filter, and override the default filter at any time if you need to perform a more specialized search. The browser also supports all security options for LDAP including ldaps:// (LDAP over SSL), StartTLS, and SASL authentication. 
-</para>
+<para>Das LDAP-Adressbuch unterstützt eine Reihe von Einstellungen, um die reibungslose Zusammenarbeit mit beliebigen LDAP-Verzeichnisdiensten zu gewährleisten. Es ermöglicht Ihnen sowohl die Auswahl von Attributen zur Anzeige eines Kontaktnamens als auch die Anzeige einer Liste von Attributen für Anrufinformationen. Wenn beispielsweise der Verzeichnisdienst das LDAP-Schema »inetOrgPerson« verwendet, können Sie das Adressbuch so konfigurieren, dass die Werte der Attribute »homePhone«, »mobile« und »pager« für Anrufe oder Sofortnachrichten verfügbar gemacht werden. Außerdem lässt sich die Filterschablone für den vorgegebenen LDAP-Suchfilter anpassen und jederzeit anstatt des vorgegebenen Filters verwenden, falls Sie eine speziellere Suche ausführen wollen. Der Browser unterstützt auch alle Sicherheitsoptionen für LDAP, wie ldaps:// (LDAP über SSL) sowie die Legitimierung mittels StartTLS und SASL.</para>
 
-<para>
-To refresh the list of users for a specific address book, simply click the Find button. It will search for all users in that address book. You can contact people by double clicking on their highlighted field. You can also message them by right-clicking or by choosing the appropriate action in the Action menu of the window.
-</para>
+<para>Um die Benutzerliste für ein bestimmtes Adressbuch zu aktualisieren, klicken Sie einfach auf den Knopf <guibutton>Suchen</guibutton>. Dadurch wird die Suche nach allen Benutzern in diesem Adressbuch ausgelöst. Sie können Benutzer kontaktieren, indem Sie auf das jeweils hervorgehobene Feld doppelklicken. Ebenfalls möglich ist der Zugriff über das Kontextmenü der rechten Maustaste oder durch Wählen der entsprechenden Aktion im Menü <guimenu>Aktionen</guimenu> des Fensters.</para>
 
-<para>
-In certain cases you will want to search specifically for a person name, or his or her call URI in the <application>Ekiga</application> white pages. The address book window allows you to apply filters when searching for contacts. When searching an LDAP directory, entering a simple name in the Search Filter field will perform an LDAP Substring search using the configured Filter Template. If you need to perform a more specialized search you can enter a complete LDAP Filter string, and it will be used instead of the configured Filter Template.
-</para>
+<para>In verschiedenen Fällen wollen Sie speziell nach dem Namen einer Person oder nach ihrer Anrufadresse im Telefonbuch von <application>Ekiga</application> suchen. Das Adressbuch-Fenster erlaubt Ihnen die Anwendung von Filtern, wenn Sie nach Kontakten suchen. Beim Durchsuchen eines LDAP-Verzeichnisses geben Sie einen Namen in das Suchfilter-Feld ein, woraufhin eine Suche nach einer LDAP-Teilzeichenkette anhand dieser Filterschablone ausgeführt wird. Falls Sie die Suche weiter eingrenzen wollen, können Sie auch eine vollständige LDAP-Suchzeichenkette eingeben, welche dann anstatt der eingestellten Filterschablone verwendet wird.</para>
 
-<tip><title>Tipp</title><para>The <application>Ekiga</application> white pages will allow you to look for users in your region. It returns a limited number of results corresponding to your search. You can then add them to your personal roster to call them later.</para></tip>
+<tip><title>Tipp</title><para>Im Telefonbuch von <application>Ekiga</application> können Sie nach Benutzern in Ihrer Region suchen. Die Suche gibt anhand Ihrer Suchanfrage eine begrenzte Anzahl von Ergebnissen aus. Diese können Sie dann zu Ihrer persönlichen Kontaktliste hinzufügen, um sie später anzurufen.</para></tip>
 </section>
 
 <section><title>Kontakte bearbeiten</title>
 
 <graphic fileref="figures/addressbook_d2.png"/>
 
-<para>
-Local address books provided by Novell Evolution allow you to add new contacts, or to edit existing contacts. Each different address book allows a different set of features depending on what makes sense for the address book in question. To discover what features are possible, simply select the address book and consult the Action menu. 
-</para>
+<para>Sie können aus den von <application>Novell Evolution</application> bereitgestellten lokalen Adressbüchern neue Kontakte hinzufügen oder vorhandene Kontakte bearbeiten. Die verschiedenen Adressbücher verfügen über unterschiedliche Funktionsmerkmale, abhängig davon, was für das jeweilige Adressbuch sinnvoll erscheint und was nicht. Um mehr über die verfügbaren Funktionen zu erfahren, wählen Sie das Adressbuch aus und öffnen Sie das Menü <guimenu>Aktionen</guimenu>.</para>
 
-<para>
-To add a contact to one of your local address books, simply select the address book you wish to add the contact to and select Action -&gt; New Contact. The option of adding a New Contact will appear and you may now enter his name and VoIP URI as well as other settings. After complete select 'OK' and now your contact has been added. You can only add contacts to local address books. The contact parameters can be changed at any time by selecting Action -&gt; Properties when the contact is highlighted. He can also be deleted by selecting Action -&gt; Remove.
-</para>
+<para>Um einen Kontakt zu einem Ihrer lokalen Adressbücher hinzuzufügen, wählen Sie das gewünschte Adressbuch aus und wählen Sie <menuchoice><guimenu>Aktion</guimenu><guimenuitem>Neuer Kontakt</guimenuitem></menuchoice>. Ein Dialogfeld zum Hinzufügen eines neuen Kontakts wird geöffnet. Hier können Sie den Namen und die VoIP-Adresse sowie weitere Daten eingeben. Klicken Sie auf <guibutton>OK</guibutton>, sobald Sie fertig sind, woraufhin Ihr neuer Kontakt hinzugefügt wird. Sie können Kontakte nur zu lokalen Adressbüchern hinzufügen. Die Parameter des Kontakts können Sie jederzeit ändern, indem Sie <menuchoice><guimenu>Aktion</guimenu><guimenuitem>Bearbeiten</guimenuitem></menuchoice> wählen, wenn der Kontakt hervorgehoben ist. Mittels <menuchoice><guimenu>Aktion</guimenu><guimenuitem>Entfernen</guimenuitem></menuchoice> können Sie den Kontakt entfernen.</para>
 
-<para>
-You can also add a contact from the white pages (or any other local or remote address book) to the roster by selecting Action -&gt; Add to local roster when the contact is highlighted.
-</para>
+<para>Sie können auch einen Kontakt aus dem Telefonbuch oder jedem anderen lokalen oder entfernten Adressbuch zur Kontaktliste hinzufügen. Wählen Sie hierzu <menuchoice><guimenu>Aktion</guimenu><guimenuitem>Zur lokalen Kontaktliste hinzufügen</guimenuitem></menuchoice>, wenn der Kontakt hervorgehoben ist.</para>
 
 <para>Abschließend können Sie auch die Gruppe festlegen, zu der eine Person gehören soll. Benutzen Sie hierzu den Dialog »Benutzereigenschaften«, wenn der Kontakt hervorgehoben ist.</para>
 </section>
@@ -362,58 +310,46 @@
 
 <graphic fileref="figures/chat_d1.png"/>
 
-<para>
-<application>Ekiga</application> allows you to send instant messages to remote users provided that you know their URI. 
-</para>
+<para><application>Ekiga</application> ermöglicht Ihnen das Senden von Sofortnachrichten zu entfernten Benutzern, vorausgesetzt dass Sie deren Adresse kennen.</para>
 
-<para>
-You can send instant messages from the roster, from the call history or from the address book. From the roster or from the call history, simply select Contact -&gt; Message in the main window when a contact is highlighted. From the address book window, simply select Action -&gt; Message when the contact is highlighted. A window pops up, enter your text message, and hit the Enter key. 
-</para>
+<para>Sie können Sofortnachrichten aus der Kontaktliste, der Anrufchronik oder aus dem Adressbuch versenden. Aus der Kontaktliste oder der Anrufchronik wählen Sie <menuchoice><guimenu>Kontakt</guimenu><guimenuitem>Nachricht</guimenuitem></menuchoice> im Hauptfenster, wenn der Kontakt hervorgehoben ist. Im Adressbuchfenster wählen Sie <menuchoice><guimenu>Aktion</guimenu><guimenuitem>Nachricht</guimenuitem></menuchoice>, wenn der Kontakt hervorgehoben ist. Geben Sie im sich öffnenden Fenster Ihre Nachricht ein und bestätigen Sie mit der <keycap>Eingabetaste</keycap>.</para>
 
-<tip><title>Tipp</title><para>You can not exchange text messages with all protocols. <application>Ekiga</application> will only display the Message menu item when the protocol associated with the user permits it.</para></tip>
+<tip><title>Tipp</title><para>Für den Austausch von Textnachrichten stehen nicht alle Protokolle zur Verfügung. <application>Ekiga</application> zeigt den Menüeintrag <guilabel>Nachricht</guilabel> nur dann an, wenn es mit dem dem Benutzer zugeordneten Protokoll umgehen kann.</para></tip>
 </section>
 
 
 <section id="ekiga-changing-status">
-<title>Updating his own status</title>
+<title>Aktualisierung des eigenen Status.</title>
 
 <graphic fileref="figures/status.png"/>
 
 <para><application>Ekiga</application> ermöglicht Ihnen, Ihren Status anderen Benutzern zu übermitteln.</para>
 
-<para>
-There are three categories of status messages : online, away and do not disturb. Each of them allows you to specify a more complete status information. Simply select Custom message in the status menu at the bottom of the main window. You can then define your extended status message that will be published using all available protocols supporting it.
-</para>
+<para>Es gibt drei Kategorien von Statusmeldungen: »Verbunden«, »Abwesend« und »Nicht stören«. Jede davon ermöglicht Ihnen die Angabe erweiterter Statusinformationen. Wählen Sie <guilabel>Angepasste Nachricht</guilabel> aus der Auswahlliste für den Status am unteren Rand des Hauptfensters. Die von Ihnen hier festgelegte erweiterte Statusnachricht wird mittels aller unterstützter Protokolle veröffentlicht.</para>
 
-<tip><title>Tipp</title><para>Many servers will not support relaying your extended presence information. To make sure that this feature is available with the server you are using or with the PBX you are connected to, please ask your administrator. Please note that Ekiga.net will publish your presence information.</para></tip>
+<tip><title>Tipp</title><para>Viele Server unterstützen die Änderung Ihrer erweiterten Anwesenheitsinformationen nicht. Um sicherzustellen, dass dieses Funktionsmerkmal mit dem verwendeten Server oder der verbundenen PBX-Telefonanlage verfügbar ist, fragen Sie bitte Ihren Systemverwalter. Bitte beachten Sie, dass Ekiga.net Ihre Anwesenheitsinformationen veröffentlicht.</para></tip>
 </section>
 
 
 <section id="ekiga-manage-calls">
-<title>Managing Calls</title>
+<title>Verwalten von Anrufen</title>
 
 <section><title>Weiterleiten eingehender Anrufe</title>
-<para>
-<application>Ekiga</application> supports different policies for unanswered incoming calls. Per default it displays a 
-popup window which allows you to decide whether you want to refuse or accept the request for 
-an incoming call. If you do not answer the call in the required time, or if you are busy, or if you do not want to receive any call, <application>Ekiga</application> can forward the call to another party.
-</para>
+<para><application>Ekiga</application> unterstützt verschiedene Regeln für den Umgang mit unbeantworteten eingehenden Anrufen. Per Vorgabe wird ein Fenster geöffnet, in welchem Sie wählen können, ob Sie den eingehenden Anruf annehmen oder abweisen wollen. Falls Sie in der erforderlichen Zeit nicht antworten, wenn Sie beschäftigt sind oder wenn Sie überhaupt keine Anrufe entgegennehmen wollen, dann kann <application>Ekiga</application> den Anruf an einen anderen Teilnehmer weiterleiten.</para>
 
-<para>
-Notice that you need to specify an URI where to forward calls in the preferences to be able to activate that option. Open the preferences window by choosing Edit -&gt; Preferences in the main window and select Call Options on the left. You will now see the appropriate section. It contains three checkboxes for the three cases described above. The URI of the party the calls shall be forwarded to can be configured separately in SIP Settings for SIP and accordingly in H.323 Settings for H.323.
-</para>
+<para>Beachten Sie, dass Sie eine Weiterleitungsadresse in den Einstellungen angeben müssen, um diese Option nutzen zu können. Wählen Sie <menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice>, um den Einstellungsdialog zu öffnen. Wählen Sie an der linken Seite <guilabel>Verbindungs-Optionen</guilabel> aus. Der entsprechende Abschnitt enthält drei Ankreuzfelder für die drei oben beschriebenen Fälle. Die eigentliche Weiterleitungsadresse kann separat in den SIP-Einstellungen beziehungsweise für das H.323-Protokoll in den H.323-Einstellungen festgelegt werden.</para>
 </section>
 
 <section><title>Verbindungen steuern</title>
-<para><application>Ekiga</application> supports several actions which can be performed when in a call. These actions enable you to control active sessions.</para>
+<para><application>Ekiga</application> unterstützt verschiedene Aktionen, die während eines Anrufs ausgeführt werden können. Diese Aktionen ermöglichen Ihnen die Steuerung aktiver Sitzungen.</para>
 
 <itemizedlist>
 <listitem>
-<para>Ending a call: The communication to the remote user can be ended by selecting Chat -&gt; Hang up.</para>
+<para>Beenden eines Anrufs: Die Verbindung zu einem entfernten Benutzer wird durch <menuchoice><guimenu>Chat</guimenu><guimenuitem>Auflegen</guimenuitem></menuchoice> beendet.</para>
 </listitem>
 
 <listitem>
-<para>Holding a call: You can hold a remote party call by selecting Chat -&gt; Hold Call. This effectively pauses Video and Audio transmission; to continue transmission again you select Chat -&gt; Retrieve Call and Video and Audio Transmission will begin again.</para>
+<para>Halten eines Anrufs: Durch Wählen von <menuchoice><guimenu>Chat</guimenu><guimenuitem>Verbindung halten</guimenuitem></menuchoice> können Sie die Verbindung zu einem entfernten Benutzer halten. Die Video- und Audioübertragung wird unmittelbar angehalten. Um die Übertragung fortzusetzen, wählen Sie <menuchoice><guimenu>Chat</guimenu><guimenuitem>Verbindung fortsetzen</guimenuitem></menuchoice>, woraufhin die Video- und Audioübertragung wieder aufgenommen wird.</para>
 </listitem>
 
 <listitem>
@@ -425,46 +361,38 @@
 </listitem>
 
 <listitem>
-<para>Transferring the remote party: You can transfer the remote user to another user by selecting Chat -&gt; Transfer Call. It is also possible to transfer an active call by right-clicking and choosing the transfer action when a contact is highlighted in the roster, in the address book or in the call history. Double-clicking or selecting the Contact menu in the main window or the Action menu in the Address Book window and choosing the transfer action will also work.</para>
+<para>Anruf entfernt weiterleiten: Sie können einen entfernten Benutzer an einen anderen Benutzer weiterleiten, indem Sie im Menü <menuchoice><guimenu>Chat</guimenu><guimenuitem>Anruf weiterleiten</guimenuitem></menuchoice> wählen. Es ist auch möglich, einen aktiven Anruf durch einen Klick mit der rechten Maustaste und Auswählen der Weiterleitungsaktion weiterzuleiten, wenn der Kontakt in der Kontaktliste, im Adressbuch oder in der Anrufchronik hervorgehoben ist. Doppelklicken auf das Menü <guimenu>Kontakt</guimenu> im Hauptfenster oder auf das Menü <guimenu>Aktion</guimenu> im Adressbuch-Fenster funktioniert ebenfalls.</para>
 </listitem>
 </itemizedlist>
 
-<tip><title>Tipp</title><para>All URIs supported by <application>Ekiga</application> can be used for call transfer if the protocol supports it.</para></tip>
+<tip><title>Tipp</title><para>Alle von <application>Ekiga</application> unterstützten Adressen können für Anrufe verwendet werden, sofern das Protokoll dies unterstützt.</para></tip>
 </section>
 
 <section><title>Audio- und Video-Einstellungen vornehmen</title>
-<para>Die Audio- und Video-Einstellugen können während einer Verbindung in der Anrufleiste angepasst werden. Falls Sie die Audio- oder Videoeinstellungen während eines Anrufs ändern wollen, rufen Sie die Anrufleiste über das Menü »Ansicht -&gt; Anrufleiste anzeigen« auf. Um die bestmögliche Qualität zu erreichen, können Sie hier die Lautstärke, die Helligkeit, den Gammawert, die Farbe und den Kontrats Ihres Video-Eingabegeräts ändern.</para>
+<para>Die Audio- und Video-Einstellungen können während einer Verbindung in der Anrufleiste angepasst werden. Falls Sie die Audio- oder Videoeinstellungen während eines Anrufs ändern wollen, rufen Sie die Anrufleiste über das Menü »Ansicht -&gt; Anrufleiste anzeigen« auf. Um die bestmögliche Qualität zu erreichen, können Sie hier die Lautstärke, die Helligkeit, den Gammawert, die Farbe und den Kontrast Ihres Video-Eingabegeräts ändern.</para>
 
-<para>
-You can also change your audio and video devices during a call. Simply go in the preferences window by selecting Edit -&gt; Preferences in the menu, and adjust your devices in the appropriate section.
-</para>
+<para>Es ist möglich, während eines Gesprächs Ihre Audio- und Video-Geräte zu wechseln. Wählen Sie <menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Einstellungen</guimenuitem></menuchoice>, um den Einstellungsdialog zu öffnen. Ändern Sie dann die Angaben zu den Geräten in den entsprechenden Abschnitten.</para>
 </section>
 
-<section><title>Checking the call history</title>
+<section><title>Überprüfen der Anrufchronik</title>
 
 <graphic fileref="figures/call_history.png"/>
 
-<para>The Call History stores information (date, duration, URI, Remote user) about all outgoing and incoming calls. They are divided into three groups - received calls, placed calls and missed calls. You can consult the call history by selecting View -&gt; Call History in the menu.
-<itemizedlist>
+<para>Die Anrufchronik speichert Informationen (Zeitpunkt, Dauer, Adresse, entfernter Benutzer) zu allen ausgehenden und eingehenden Anrufen. Diese sind in drei Gruppen gegliedert: empfangene Anrufe, getätigte Anrufe und versäumte Anrufe. Wählen Sie <menuchoice><guimenu>Ansicht</guimenu><guimenuitem>Anrufchronik</guimenuitem></menuchoice>, um die Anrufchronik anzuzeigen. <itemizedlist>
 <listitem>
 <para>Angenommene Anrufe listet alle von <application>Ekiga</application> angenommenen Anrufe auf</para>
 </listitem>
 
 <listitem>
-<para>
-Placed calls keeps track of all attempts - successful or not - to call another user.
-</para>
+<para>»Getätigte Anrufe« gibt einen Überblick über erfolgreiche als auch fehlgeschlagene Versuche, einen anderen Benutzer anzurufen.</para>
 </listitem>
 
 <listitem>
-<para>
-Missed calls shows incoming calls which timed out.
-</para>
+<para>Versäumte Anrufe sind eingehende Anrufe, die wegen Zeitüberschreitung nicht angenommen wurden.</para>
 </listitem>
-</itemizedlist>
-</para>
+</itemizedlist></para>
 
-<tip><title>Tipp</title><para>Double-clicking on a row in the Calls History will call back the selected user or transfer any active call to that user. Notice that you can also add the contact to your roster by selecting Chat -&gt; Contact -&gt; Add to local roster in the main menu when the call is highlighted.</para></tip>
+<tip><title>Tipp</title><para>Ein Doppelklick auf eine Zeile in der Anrufchronik ruft den gewählten Benutzer zurück oder überträgt einen eventuellen aktiven Anruf auf diesen Benutzer. Sie können den Kontakt auch zur Kontaktliste hinzufügen, indem Sie <menuchoice><guimenu>Chat</guimenu><guisubmenu>Kontakt</guisubmenu><guimenuitem>Zur lokalen Kontaktliste hinzufügen</guimenuitem></menuchoice> wählen, wenn der Anruf hervorgehoben ist.</para></tip>
 </section>
 
 </section>
@@ -477,69 +405,49 @@
 <section id="ekiga-registering-additional-accounts">
 <title>Registrieren zusätzlicher Konten</title>
 
-<section><title>The accounts window</title>
+<section><title>Das Konten-Fenster</title>
 
 <graphic fileref="figures/accounts_d1.png"/>
 
-<para>
-You can open the accounts window by selecting Edit -&gt; Accounts. This will open the Accounts Window. The Accounts Window will allow you to add Ekiga.net, Ekiga Call Out, SIP and H.323 accounts and to register to them.
-An account describes the user login and password parameters to register to SIP and H.323 services. Those <emphasis>services</emphasis> can be an Internet Telephony Service provider (like ekiga.net), or an IPBX (like CISCO, Nortel, or Asterisk).
-</para>
+<para>Wählen Sie <menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Konten</guimenuitem></menuchoice>, um das Konten-Fenster zu öffnen. In diesem Fenster können Sie Konten für Ekiga.net, Ekiga »PC zu Telefon«, SIP und H.323 hinzufügen und sich bei diesen Diensten registrieren. Ein Konto beschreibt die Parameter zur Benutzeranmeldung und Passwort für SIP- und H.323-Dienste. Diese <emphasis>Dienste</emphasis> können Internet-Telefondienstanbieter sein, oder IPBX-Dienste, wie CISCO, Nortel, oder Asterisk.</para>
 </section>
 
 <section><title>Hinzufügen eines Ekiga.net-Kontos</title>
 
 <graphic fileref="figures/accounts_ekiga_net.png"/>
 
-<para>
-To add an Ekiga.net account, simply select Account -&gt; Add an Ekiga.net Account in the menu. A dialog will appear and allow you to enter several parameters:
-<itemizedlist>
-<listitem><para><emphasis>User:</emphasis> You can enter your login.</para></listitem>
-<listitem><para><emphasis>Password:</emphasis> You can enter your password.</para></listitem>
-</itemizedlist>
-</para>
+<para>Um ein neues Ekiga.net-Konto hinzuzufügen, wählen Sie <menuchoice><guimenu>Konto</guimenu><guimenuitem>Ekiga.net-Konto hinzufügen</guimenuitem></menuchoice>. Ein Dialog wird geöffnet, in welchem Sie verschiedene Parameter angeben können: <itemizedlist>
+<listitem><para><emphasis>Benutzer:</emphasis> Geben Sie Ihren Benutzernamen ein.</para></listitem>
+<listitem><para><emphasis>Passwort:</emphasis> Geben Sie Ihr Passwort ein.</para></listitem>
+</itemizedlist></para>
 
-<para>
-Ekiga.net is a free SIP services platform provided to <application>Ekiga</application> users.
-If you want to call other users and to be callable, you need a SIP address. You can get one from <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink>. 
-Ekiga.net also offers additional services like conference rooms, voice mail and online white pages. Please see <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink> for more information.
-</para>
+<para>Ekiga.net ist eine freie SIP Dienste-Plattform, die Benutzern von <application>Ekiga</application> zur Verfügung gestellt wird. Diese stellt für Sie eine SIP-Adresse bereit, über die Ihre Freunde und Familie Sie mit jeder SIP-konformen Soft- oder Hardware erreichen können. Eine solche Adresse erhalten Sie hier: <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink>. Ekiga.net bietet Ihnen außerdem zusätzliche Dienste wie Konferenzräume, Zustellung von Sprachnachrichten per Mail und ein Online-Telefonbuch. Weitere Informationen finden Sie unter <ulink url="http://www.ekiga.net" type="http">http://www.ekiga.net</ulink>.</para>
 </section>
 
-<section><title>Adding an Ekiga Call Out account</title>
+<section><title>Hinzufügen eines »PC zu Telefon«-Kontos in Ekiga</title>
 
 <graphic fileref="figures/accounts_ekiga_call_out.png"/>
 
-<para>
-To add an Ekiga Call Out account, simply select Account -&gt; Add an Ekiga Call Out Account in the menu. A dialog will appear and allow you to enter several parameters:
-<itemizedlist>
-<listitem><para><emphasis>Account ID:</emphasis> You can enter your account ID.</para></listitem>
-<listitem><para><emphasis>PIN Code:</emphasis> You can enter your PIN code.</para></listitem>
-</itemizedlist>
-</para>
+<para>Um ein »PC zu Telefon«-Konto in <application>Ekiga</application> hinzuzufügen, wählen Sie <menuchoice><guimenu>Konto</guimenu><guimenuitem>Ekiga »PC zu Telefon«-Konto hinzufügen</guimenuitem></menuchoice>. Ein Dialog wird geöffnet, in welchem Sie verschiedene Parameter angeben können: <itemizedlist>
+<listitem><para><emphasis>Konto-ID:</emphasis> Geben Sie die Kennung Ihres Kontos ein.</para></listitem>
+<listitem><para><emphasis>PIN Code:</emphasis> Geben Sie Ihren PIN Code ein.</para></listitem>
+</itemizedlist></para>
 
-<para>
-If you do not have an Ekiga Call Out account yet, you can subscribe for one using the 'Get an Ekiga.net Call Out account' link in the dialog.
-As described above, this service will allow you to call normal phones worldwide at interesting rates.
-Once the account has been added, you can recharge it, consult the balance history or the call history by selecting the appropriate menu item in the Account menu of the window when the account is highlighted.
-</para>
+<para>Falls Sie noch nicht über ein Ekiga »PC zu Telefon«-Konto verfügen, können Sie eines registrieren, indem Sie den Link <guilabel>»PC zu Telefon«-Konto für Ekiga erstellen</guilabel> anklicken. Wie oben beschrieben, ermöglicht Ihnen dieser Dienst weltweite Anrufe zu gewöhnlichen Telefonen zu günstigen Preisen. Sobald das Konto hinzugefügt wurde, können Sie es aufladen und den Verlauf des Kontostandes oder die Anrufchronik anzeigen. Wählen Sie hierzu den entsprechenden Eintrag im Menü <guimenu>Konto</guimenu> des Hauptfensters, wenn das Konto hervorgehoben ist.</para>
 </section>
 
 <section><title>Hinzufügen eines SIP-Kontos</title>
 
 <graphic fileref="figures/accounts_sip.png"/>
 
-<para>
-To add a SIP account, simply select Account -&gt; Add a SIP Account in the menu. A dialog will appear and allow you to enter several parameters:
-<itemizedlist>
+<para>Um ein SIP-Konto hinzuzufügen, wählen Sie <menuchoice><guimenu>Konto</guimenu><guimenuitem>SIP-Konto hinzufügen</guimenuitem></menuchoice> aus dem Menü. Ein Dialog wird geöffnet, in welchem Sie verschiedene Parameter angeben können: <itemizedlist>
 <listitem><para><emphasis>Name:</emphasis> Geben Sie hier den Namen des Kontos ein.</para></listitem>
-<listitem><para><emphasis>Registrar:</emphasis> The registrar to which you want to register. This is usually an IP address or an host name that will be given to you by your Internet Telephony Service Provider, or by your administrator if you are trying to register to a SIP IPBX.</para></listitem>
-<listitem><para><emphasis>User:</emphasis> You can enter your login.</para></listitem>
-<listitem><para><emphasis>Authentication User:</emphasis> If it is different from the user parameter you provided above. In that case, the user field will be used to control the outgoing identity for the account you are adding, while the login will be used during the authentication phase.</para></listitem>
-<listitem><para><emphasis>Password:</emphasis> You can enter your password.</para></listitem>
-<listitem><para><emphasis>Timeout:</emphasis> The timeout after which the registration should be refreshed.</para></listitem>
-</itemizedlist>
-</para>
+<listitem><para><emphasis>Registrar:</emphasis> Der Registrar, bei dem Sie sich registrieren. Dies ist üblicherweise eine IP-Adresse oder ein Rechnername, die oder den Sie von Ihrem Internet-Telefondienstanbieter erhalten haben, oder von Ihrem Systemverwalter, falls Sie sich bei einem SIP-IPBX registrieren wollen.</para></listitem>
+<listitem><para><emphasis>Benutzer:</emphasis> Geben Sie Ihren Benutzernamen ein.</para></listitem>
+<listitem><para><emphasis>Authentifizierungs-Name:</emphasis> Dieser unterscheidet sich vom bereits angegebenen Benutzer-Parameter. In diesem Fall wird das Benutzerfeld dazu verwendet, um die ausgehende Identität des hinzugefügten Kontos zu steuern, während der Benutzername während der Authentifizierungsphase benutzt wird.</para></listitem>
+<listitem><para><emphasis>Passwort:</emphasis> Geben Sie Ihr Passwort ein.</para></listitem>
+<listitem><para><emphasis>Zeitüberschreitung:</emphasis> Die Zeitspanne, nach deren Ablauf die Registrierung aufgefrischt werden sollte.</para></listitem>
+</itemizedlist></para>
 
 </section>
 
@@ -547,43 +455,40 @@
 
 <graphic fileref="figures/accounts_h323.png"/>
 
-<para>
-To add an H.323 account, simply select Account -&gt; Add an H.323 Account in the menu. A dialog will appear and allow you to enter several parameters:
-<itemizedlist>
+<para>Um ein SIP-Konto hinzuzufügen, wählen Sie <menuchoice><guimenu>Konto</guimenu><guimenuitem>H.323-Konto hinzufügen</guimenuitem></menuchoice> aus dem Menü. Ein Dialog wird geöffnet, in welchem Sie verschiedene Parameter angeben können: <itemizedlist>
 <listitem><para><emphasis>Name:</emphasis> Geben Sie hier den Namen des Kontos ein.</para></listitem>
-<listitem><para><emphasis>Gatekeeper:</emphasis> The gatekeeper to which you want to register. This is usually an IP address or a host name that will be given to you by your Internet Telephony Service Provider, or by your administrator if you are trying to register to an H.323 IPBX.</para></listitem>
-<listitem><para><emphasis>User:</emphasis> You can enter your login.</para></listitem>
-<listitem><para><emphasis>Authentication User:</emphasis> If it is different from the user parameter you provided above. In that case, the user field will be used to control the outgoing identity for the account you are adding, while the login will be used during the authentication phase.</para></listitem>
-<listitem><para><emphasis>Password:</emphasis> You can enter your password.</para></listitem>
-<listitem><para><emphasis>Registration Timeout:</emphasis> The timeout after which the registration should be updated.</para></listitem>
-</itemizedlist>
-</para>
+<listitem><para><emphasis>Gatekeeper:</emphasis> Der Gatekeeper, bei dem Sie sich registrieren wollen. Dies ist üblicherweise eine IP-Adresse oder ein Rechnername, die oder den Sie von Ihrem Internet-Telefondienstanbieter erhalten haben, oder von Ihrem Systemverwalter, falls Sie sich bei einem SIP-IPBX registrieren wollen.</para></listitem>
+<listitem><para><emphasis>Benutzer:</emphasis> Geben Sie Ihren Benutzernamen ein.</para></listitem>
+<listitem><para><emphasis>Authentifizierungs-Name:</emphasis> Dieser unterscheidet sich vom bereits angegebenen Benutzer-Parameter. In diesem Fall wird das Benutzerfeld dazu verwendet, um die ausgehende Identität des hinzugefügten Kontos zu steuern, während der Benutzername während der Authentifizierungsphase benutzt wird.</para></listitem>
+<listitem><para><emphasis>Passwort:</emphasis> Geben Sie Ihr Passwort ein.</para></listitem>
+<listitem><para><emphasis>Zeitlimit für Anmeldung:</emphasis> Die Zeitspanne, nach deren Ablauf die Registrierung aktualisiert werden sollte.</para></listitem>
+</itemizedlist></para>
 
 </section>
 
 </section>
 
 <section id="ekiga-uris">
-<title>Understanding URIs</title>
+<title>Erklärungen zu Adressen</title>
 
-<section><title>SIP-URIs</title>
+<section><title>SIP-Adressen</title>
 
-<para>SIP-URIs werden nach folgendem Muster formatiert: sip:user@[host[:port]]</para>
+<para>SIP-Adressen werden nach folgendem Muster formatiert: sip:user@[host[:port]]</para>
 
-<para>This permits you to call the given user or extension on the specified SIP proxy: <emphasis>sip:jonita@ekiga.net</emphasis></para>
+<para>Dies ermöglicht Ihnen, den angegebenen Benutzer oder die Erweiterung über den entsprechenden SIP-Proxy anzurufen: <emphasis>sip:jonita@ekiga.net</emphasis></para>
 </section>
 
 
-<section><title>H.323-URIs</title>
+<section><title>H.323-Adressen</title>
 
-<para>H.323 URIs are formatted as such "h323:[user@][host[:port]]"</para>
+<para>H.323-Adressen sind als »h323:[benutzer@][rechner[:port]]« formatiert.</para>
 
 <para>Dies erlaubt Ihnen: <itemizedlist>
-<listitem><para>Call a given host on a port different from the default port which is 1720: <emphasis>h323:seconix.com:1740</emphasis></para></listitem>
-<listitem><para>Call a given user using their respective alias if registered to a gatekeeper: <emphasis>h323:jonita</emphasis></para></listitem>
-<listitem><para>Call a given phone number if you are registered to a gatekeeper for a PC-To-Phone provider, or if that user has an ENUM record associated to an H.323 URI: <emphasis>h323:003210111222</emphasis></para></listitem>
-<listitem><para>Call a given user using their alias through a specific gateway or proxy: <emphasis>h323:jonita@gateway.seconix.com</emphasis></para></listitem>
-<listitem><para>Call an MCU and join a specific room: <emphasis>h323:myfriendsroom@mcu.seconix.com</emphasis></para></listitem>
+<listitem><para>Anruf zu einem angegebenen Rechner auf einem anderen Port als dem Standardport 1720: <emphasis>h323:seconix.com:1740</emphasis></para></listitem>
+<listitem><para>Anruf zu einem angegebenen Benutzer unter Benutzer seines Alias, falls dieser bei einem Gatekeeper registriert ist: <emphasis>h323:jonita</emphasis></para></listitem>
+<listitem><para>Anruf zu einer angegebenen Telefonnummer, falls Sie bei einem Gatekeeper für einen PC-zu-Telefon-Dienst registriert sind, oder wenn der Benutzer über einen einer H.323-Adresse zugeordneten ENUM-Eintrag verfügt: <emphasis>h323:003210111222</emphasis></para></listitem>
+<listitem><para>Anruf zu einem angegebenen Benutzer unter Verwendung dessen Alias über ein bestimmtes Gateway oder einen Proxy: <emphasis>h323:jonita@gateway.seconix.com</emphasis></para></listitem>
+<listitem><para>Anruf bei einem MCU und Betreten eines bestimmten Raums: <emphasis>h323:myfriendsroom@mcu.seconix.com</emphasis></para></listitem>
 </itemizedlist></para>
 </section>
 
@@ -593,22 +498,22 @@
 <section id="ekiga-video-bandwidth">
 <title>Ändern der Videobandbreite</title>
 
-<para><application>Ekiga</application> uses a best-effort algorithm to maintain a low bandwidth when transmitting video. You can adjust the video quality settings depending on whether you prefer to have a good frame rate, or a good picture quality. It will permit <application>Ekiga</application> to dynamically adjust the video bandwidth and the number of transmitted images per second during a call while trying to respect the requested video bandwidth.</para>
+<para><application>Ekiga</application> benutzt einen effektiven Algorithmus, um eine niedrige Bandbreite bei der Videoübertragung zu gewährleisten. Sie können die Video-Bildrate anpassen, je nachdem, ob Sie eine höhere Bildrate oder eine bessere Bildqualität bevorzugen. <application>Ekiga</application> wird angewiesen, die Video-Bandbreite und die Anzahl der pro Sekunde übertragenen Bilder anhand der geforderten Video-Bandbreite während eines Anrufs dynamisch anzupassen.</para>
 
-<para>Notice that the algorithm is a best-effort algorithm, which means that if your video bandwidth settings are too low, it can be impossible to respect them. However, if the video bandwidth permits to transmit with a better quality, or faster than the requested values, then <application>Ekiga</application> will dynamically increase them so that the quality and the framerate are always the best possible.</para>
+<para>Bedenken Sie, dass es sich um einen bestmöglich arbeitenden Algorithmus handelt. Das bedeutet, dass zu niedrig gewählte Video-Bandbreiteneinstellungen eventuell nicht berücksichtigt werden können. Wie auch immer, falls die Video-Bandbreite eine bessere Qualität oder eine höhere Bildrate ermöglicht, dann erhöht <application>Ekiga</application> die Werte dynamisch, um jederzeit die bestmögliche Bildrate und Bildqualität zu gewährleisten.</para>
 
-<para>Choosing a higher framerate and a lower quality will have the same result in terms of video bandwidth as choosing a higher quality with a lower framerate. The choice depends on if you prefer using your bandwidth to transmit more lower quality images or fewer high quality images.</para>
+<para>Die Wahl einer höheren Bildrate und einer niedrigeren Qualität erzeugt hinsichtlich der Videobandbreite die gleichen Ergebnisse wie die Wahl einer höheren Qualität mit einer niedrigeren Bildrate. Wofür Sie sich entscheiden, hängt davon ab, ob Sie die Ihnen zur Verfügung stehende Bandbreite lieber zur Übertragung von mehr Bildern minderer Qualität oder weniger Bildern höherer Qualität nutzen wollen.</para>
 </section>
 
 
 <section id="ekiga-monitoring-lines">
-<title>Monitoring lines</title>
+<title>Überwachen von Leitungen</title>
 
 <graphic fileref="figures/monitoring_lines.png"/>
 
-<para><application>Ekiga</application> can connect to PBX systems supporting the SIP protocol. In that case, it is able to indicate if the line associated with a user is in use or not. Please refer to the documentation of your PBX to enable that feature.</para>
+<para><application>Ekiga</application> kann unter Verwendung des SIP-Protokolls Verbindungen zu PBX-Telefonanlagen unterhalten. In diesem Fall ist es in der Lage festzustellen, ob die einem Benutzer zugeordnete Leitung in Benutzung ist oder nicht. Bitte ziehen Sie die Dokumentation Ihrer PBX-Telefonanlage zu Rate, um dieses Funktionsmerkmal zu aktivieren.</para>
 
-<para>To enable that feature on <application>Ekiga</application>, simply add the contact with his URI in the roster. If the server supports publishing presence information, <application>Ekiga</application> will automatically publish your own presence information and display the presence of contacts in your roster.</para>
+<para>Um dieses Funktionsmerkmal in <application>Ekiga</application> zu aktivieren, fügen Sie den Kontakt mit seiner Adresse zur Kontaktliste hinzu. Falls der Server das Veröffentlichen von Anwesenheitsinformationen unterstützt, dann veröffentlicht <application>Ekiga</application> Ihre eigenen Anwesenheitsinformationen automatisch und zeigt die Anwesenheit Ihrer Kontakte in der Kontaktliste an.</para>
 </section>
 
 <section id="ekiga-audio-codecs">
@@ -618,54 +523,46 @@
 
 <graphic fileref="figures/audio_codecs.png"/>
 
-<para>
-The <application>Ekiga</application> audio codecs table in the preferences permits you to change the codec order as well as disabling the codecs you don't want to use. Each codec has strong and weak points. For example, G.711 will give the best voice quality but will use the most bandwidth while SPEEX will give an average voice quality but requiring a very low bandwidth usage. Notice that there are two versions of SPEEX; one of them is SPEEX WideBand, which has a 16 kHz clock rate.</para>
+<para>Die Tabelle der Audio-Codecs in den Einstellungen von <application>Ekiga</application> ermöglicht Ihnen sowohl das Ändern der Codec-Reihenfolge als auch das Deaktivieren nicht benutzter Codecs. Jeder der Codecs hat Stärken und Schwächen. Beispielsweise liefert G.711 die beste Sprachqualität, benötigt aber die größte Bandbreite, während SPEEX durchschnittliche Sprachqualität bietet, aber mit einer sehr geringen Bandbreite auskommt. Beachten Sie, dass SPEEX in zwei Versionen verfügbar ist, eine davon ist SPEEX WideBand mit einer Samplingfrequenz von 16 kHz.</para>
 </section>
 
 <section><title>Video-Codecs</title>
 
 <graphic fileref="figures/video_codecs.png"/>
 
-<para>
-The <application>Ekiga</application> video codecs table in the preferences permits you to change the codec order as well as disabling the codecs you don't want to use. <application>Ekiga</application> supports codecs like H.261, H.263+, H.264, MPEG-4 or Theora.</para>
+<para>Die Tabelle der Audio-Codecs in den Einstellungen von <application>Ekiga</application> ermöglicht Ihnen sowohl das Ändern der Codec-Reihenfolge als auch das Deaktivieren nicht benutzter Codecs. <application>Ekiga</application> unterstützt Codecs wie H.261, H.263+, H.264, MPEG-4 oder Theora.</para>
 </section>
 
 
 <section><title>Codec-Rangfolge ändern</title>
-<para>
-When you reorder the codecs, you are reordering the local capabilities table, ie the codecs you will use for sending. You will always transmit audio and video using the first codec in the corresponding table that is in common with the remote user. The remote user will transmit audio and video using the first codec in his table that is common with you.</para>
+<para>Wenn Sie die Codec-Reihenfolge ändern, dann ändern Sie die Tabelle der lokalen Fähigkeiten, das heißt, die zum Senden verwendeten Codecs. Sie werden Video und Audio immer mit dem obersten Codec in Ihrer Liste senden, der mit einem der Codecs in der Liste des entfernten Benutzers übereinstimmt. Ebenso sendet der entfernte Benutzer Video und Audio immer mit dem obersten Codec in seiner Liste, der mit einem der Codecs in Ihrer Liste übereinstimmt.</para>
 </section>
 
 <section><title>Bestimmte Codecs erzwingen</title>
-<para>
-You can force the use of a specific codec by disabling all other codecs, but it will result in failed calls if the remote user doesn't support that specific codec. The best approach is to put your preferred codecs at the top of the list so that you always transmit with them if the remote user allows it and to disable the codecs that you don't want to use for transmission and reception.</para>
+<para>Sie können die Benutzung eines bestimmten Codecs erzwingen, indem Sie alle anderen Codecs deaktivieren. Dadurch könnten allerdings Verbindungen scheitern, wenn der entfernte Benutzer diesen bestimmten Codec nicht unterstützt. Der beste Kompromiss ist, dass Sie Ihre bevorzugten Codecs in den oberen Bereich der Liste setzen, so dass sie immer mit übertragen werden, wenn der entfernte Benutzer es ermöglicht, und diejenigen Codecs zu deaktivieren, die Sie nicht für Übertragung und Empfang nutzen wollen.</para>
 </section>
 
-<section><title>Adjusting the jitter buffer</title>
-<para>
-You can adjust the delay to wait before playing the sound buffers that you have received using the jitter buffer adjustment. If there is too much packet loss, the delay required to have received all packets could be so important that it will exceed the jitter buffer. In such a case, the sound you are receiving will be of bad quality. A solution to that problem would be to increase the maximum limit of the jitter buffer to a few seconds, resulting in a big delay but in an improved voice quality. Notice that the jitter buffer will readapt itself to the lowest delay allowing for optimum transmission, and that a bad voice quality in reception is not due to a too low jitter buffer value, but to bad internet connection quality.
-</para>
+<section><title>Anpassen des Jitter-Puffers</title>
+<para>Sie können mit den Jitter-Puffer-Einstellungen die Verzögerung festlegen, bevor die empfangenen Klangpuffer wiedergegeben werden. Falls zu viele Pakete verloren gehen, könnte die zum Empfang aller Pakete erforderliche Verzögerung die Größe des Jitter-Puffers überschreiten. In einem solchen Fall wird der empfangene Klang von schlechter Qualität sein. Eine Lösung des Problems könnte die Erhöhung der Obergrenze des Jitter-Puffers bis hin zu einigen Sekunden sein, was sich in einer starken Verzögerung äußert, aber die Sprachqualität deutlich verbessert. Beachten Sie, dass der Jitter-Puffer selbsttätig immer wieder auf einen für optimale Übertragung nötigen Verzögerungswert zurückfällt. Die schlechte Sprachqualität des Empfangs ist daher oft nicht auf einen zu niedrig gewählten Wert des Jitter-Puffers zurückzuführen, sondern auf die schlechte Qualität der Internetverbindung.</para>
 </section>
 
 </section>
 
 
 <section id="ekiga-defining-ports">
-<title>Changing Ports</title>
+<title>Ändern von Ports</title>
 
-<section><title>The listen ports</title>
-<para>
-The main port used to listen for incoming connections in <application>Ekiga</application> for SIP is port 5060 (UDP), while 1720 (TCP) is used by H.323. To change those ports you need to load "gconf-editor". Open gconf-editor, select apps from the left hand side menu and then select <application>Ekiga</application>, Protocols. Then select "sip" or "h323", it should give you a list in the corresponding window to your right. Select listen_port and change it to your desired value. You can also change the UDP/RTP port ranges.
-</para>
+<section><title>Die überwachten Ports</title>
+<para>Der hauptsächlich in <application>Ekiga</application> zum Lauschen nach eingehenden SIP-Verbindungen benutzte Port ist der Port 5060 (UDP). Analog dazu wird für H.323-Verbindungen der Port 1720 (TCP) benutzt. Diese Ports lassen sich im Konfigurationseditor ändern. Rufen Sie <command>gconf-editor</command> auf und wählen Sie im Menü in der linken Seitenleiste <menuchoice><guimenu>apps</guimenu><guisubmenu>ekiga</guisubmenu><guimenuitem>protocols</guimenuitem></menuchoice>. Dann wählen Sie <guilabel>sip</guilabel> oder <guilabel>h.323</guilabel>. Daraufhin erhalten Sie eine Liste im rechten Teilfenster. Wählen Sie <guilabel>listen_port</guilabel> und geben Sie hier den gewünschten Wert ein. Sie können hier auch die Bereiche für die UDP/RTP-Ports ändern.</para>
 </section>
 
-<section><title>Explanation of the port ranges</title>
+<section><title>Erklärung der Portbereiche</title>
 
-<para>1. The "listen_port" value is the port <application>Ekiga</application> will use to listen for incoming connections. It is different for SIP and H.323.</para>
+<para>1. Der Wert »listen_port« ist der von <application>Ekiga</application> zum Lauschen nach eingehenden Verbindungen benutzte Port. Die Werte für SIP und H.323 unterscheiden sich hierbei.</para>
 
-<para>2. The "udp_port_range" value is the range of UDP ports that <application>Ekiga</application> will use for SIP signalling or when registering to H.323 gatekeepers. It is also used for RTP (audio and video communication channels).</para>
+<para>2. Der Wert »udp_port_range« ist der Bereich der UDP-Ports, die von <application>Ekiga</application> für SIP-Signalisierungen oder zum Registrieren von H.323-Gatekeepers verwendet wird. Er wird auch für RTP verwendet (Audio- und Video-Kommunikationskanäle).</para>
 
-<para>3. The "tcp_port_range" value is the range of TCP ports beside the listen_port that <application>Ekiga</application> will use for the H.245 channel with the H.323 protocol. That port range is not used by SIP. It is also not used when H.245 Tunneling is enabled, which is generally the case, except when calling old H.323 implementations like Netmeeting.</para>
+<para>3. Der Wert »tcp_port_range« ist neben dem listen_port der Bereich der TCP-Ports, die <application>Ekiga</application> für den H.245-Kanal mit dem H.323-Protokoll verwendet. Dieser Portbereich wird von SIP nicht benutzt. Außerdem nicht bei aktiviertem H.245-Tunneling, was generell der Fall ist, außer beim Anrufen älterer H.323-Implementationen, wie beispielsweise NetMeeting.</para>
 </section>
 </section>
 
@@ -673,14 +570,14 @@
 <section id="controlling-sip-h323-settings">
 <title>Ändern der Einstellungen für SIP und H.323</title>
 <section id="ekiga-sip">
-<title>Änern der SIP-Einstellungen</title>
+<title>Ändern der SIP-Einstellungen</title>
 
-<section><title>Misc Settings</title>
-<para><emphasis>Outbound Proxy</emphasis></para>
-<para>The outbound proxy is the SIP proxy that will relay your calls. The behavior of a SIP proxy is similar to the behavior of an HTTP proxy, i.e. some entity that issues the requests on your behalf and proxies the streams.</para>
+<section><title>Verschiedene Einstellungen</title>
+<para><emphasis>Proxy für ausgehende Verbindungen</emphasis></para>
+<para>Der Proxy für ausgehende Verbindungen ist der SIP-Proxy, der Ihre Anrufe weitergibt. Das Verhalten eines SIP-Proxy ähnelt dem eines HTTP-Proxys, d.h. es handelt sich um eine Stelle, die Anfragen stellvertretend entgegennimmt und Datenströme weiterleitet.</para>
 
-<para><emphasis>Forward URI</emphasis></para>
-<para>The URI to which SIP incoming calls should be forwarded if configured in the preferences.</para>
+<para><emphasis>Weiterleitungsadresse</emphasis></para>
+<para>Die Adresse, an die eingehende SIP-Anrufe weitergeleitet werden, falls dies in den Einstellungen festgelegt wurde.</para>
 
 </section>
 </section>
@@ -688,26 +585,26 @@
 <section id="ekiga-h323">
 <title>Ändern der Einstellungen für H.323</title>
 
-<section><title>Misc Settings</title>
-<para><emphasis>Forward URI</emphasis></para>
-<para>The URI to which H.323 incoming calls should be forwarded if configured in the preferences.</para>
+<section><title>Verschiedene Einstellungen</title>
+<para><emphasis>Weiterleitungsadresse</emphasis></para>
+<para>Die Adresse, an die eingehende H.323-Anrufe weitergeleitet werden, falls dies in den Einstellungen festgelegt wurde.</para>
 
 </section>
 
 <section><title>Erweiterte Einstellungen</title>
-<para><application>Ekiga</application> permits a fine control of the H.323 settings in the Advanced H.323 Settings section of the preferences. You can enable H.245 Tunneling, Early H.245 and Fast Start.</para>
+<para><application>Ekiga</application> ermöglicht eine Feineinstellung der H.323-Parameter im Abschnitt <guilabel>Erweiterte H.323-Einstellungen</guilabel> des Einstellungsdialogs. Sie können H.245-Tunneling, frühzeitiges Verwenden von H.245 und Schnellstart einstellen.</para>
 
 <para><emphasis>H.245-Tunnelung</emphasis></para>
 
-<para>H.245 Tunneling is the encapsulation of H.245 messages within H.225/Q.931 messages (H.245 Tunneling). If you have a firewall and enable H.245 Tunneling, there is one less TCP port that you need to allow for incoming connections.</para>
+<para>H.245-Tunneling ist das Einschließen von H.245-Meldungen innerhalb von H.225/Q.931-Meldungen. Falls Sie über eine Firewall verfügen und H.245-Tunneling aktiviert haben, müssen Sie noch einen TCP-Port für eingehende Verbindungen festlegen.</para>
 
 <para><emphasis>Frühzeitiges H.245</emphasis></para>
 
-<para>This enables H.245 early in the setup and permits achieving faster call initiation.</para>
+<para>Dies aktiviert H.245 frühzeitig während der Einrichtung und führt zu einer schnelleren Initiierung eines Anrufs.</para>
 
 <para><emphasis>Schnelles Starten</emphasis></para>
 
-<para>Fast Connect is a new method of call setup that bypasses some usual steps in order to make it faster. In addition to the speed improvement, Fast Connect allows the media channels to be operational before the CONNECT message is sent, which is a requirement for certain billing procedures. It was introduced in H.323 version 2.</para>
+<para>Der Schnellstart ist eine neue Methode der Einrichtung eines Anrufs. Einige der üblichen Schritte werden dabei umgangen, um die Geschwindigkeit zu erhöhen. Zusätzlich zum Geschwindigkeitsgewinn erlaubt der Schnellstart das Funktionieren der Medienkanäle, bevor die CONNECT-Meldung gesendet wird, was für einige Abrechnungsmodi erforderlich ist. Dieses Funktionsmerkmal wurde in H.323 Version 2 eingeführt.</para>
 </section>
 
 </section>
@@ -715,7 +612,7 @@
 </section>
 
 <section id="ekiga-about">
-<title>Über <application>Ekiga</application></title>
+<title>Info zu <application>Ekiga</application></title>
 <para><application>Ekiga</application> wurde von Damien Sandras (<email>dsandras@seconix.com</email>) geschrieben. Um weitere Informationen über <application>Ekiga</application> zu erhalten, besuchen Sie bitte die <ulink url="http://www.ekiga.org" type="http"><application>Ekiga</application> Home Page</ulink>.</para>
 
 <para>Um Fehler zu melden oder einen Vorschlag zu dieser Anwendung oder zu diesem Handbuch zu machen, folgen Sie den Anweisungen in diesem <ulink url="ghelp:usr-guide?feedback" type="help">Dokument</ulink>."</para>
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/accounts_d1.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/accounts_d1.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/accounts_h323.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/accounts_h323.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/accounts_sip.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/accounts_sip.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/audio_codecs.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/audio_codecs.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/config_d1.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/config_d1.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/config_d2.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/config_d2.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/config_d3.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/config_d3.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/config_d4.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/config_d4.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/config_d5.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/config_d5.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/config_d6.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/config_d6.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/config_d7.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/config_d7.png differ
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/help/de/figures/config_d8.png and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/help/de/figures/config_d8.png differ
diff -Nru ekiga-3.2.5/help/Makefile.in ekiga-3.2.6~ppa~karmic1/help/Makefile.in
--- ekiga-3.2.5/help/Makefile.in	2009-07-06 20:10:36.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/help/Makefile.in	2009-09-22 15:36:21.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -39,8 +40,9 @@
 ################################################################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -66,6 +68,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -178,6 +181,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -271,6 +275,7 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(DOC_LINGUAS))
 
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_ABS_SRCDIR = @abs_srcdir@
+@HAVE_GNOME_DOC_UTILS_TRUE@_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
 @ENABLE_SK_TRUE@@HAVE_GNOME_DOC_UTILS_TRUE@_ENABLE_SK = true
 
 ################################################################################
@@ -304,14 +309,16 @@
 
 ################################################################################
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
+@HAVE_GNOME_DOC_UTILS_TRUE@_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_C_DOCS = \
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_C_ENTITIES)	$(_DOC_C_INCLUDES)			\
-@HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_C_MODULE)
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_C_PAGES)		$(_DOC_C_MODULE)
 
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_C_DOCS_NOENT = \
-@HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)			\
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_C_PAGES)
 
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(foreach fig,$(DOC_FIGURES),C/$(fig)),				\
@@ -327,12 +334,16 @@
 
 
 ###############################################################################
-@HAVE_GNOME_DOC_UTILS_TRUE@_DOC_POFILES = $(if $(DOC_MODULE),						\
+@HAVE_GNOME_DOC_UTILS_TRUE@_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
 
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_LC_MODULES = $(if $(DOC_MODULE),						\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
 
+@HAVE_GNOME_DOC_UTILS_TRUE@_DOC_LC_PAGES = \
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),	\
+@HAVE_GNOME_DOC_UTILS_TRUE@		$(lc)/$(notdir $(page)) ))
+
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_LC_INCLUDES = \
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES),	\
 @HAVE_GNOME_DOC_UTILS_TRUE@		$(lc)/$(notdir $(inc)) ))
@@ -344,7 +355,7 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@		$(lc)/$(notdir $(doc)) ))
 
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_LC_DOCS = \
-@HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)				\
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)	$(_DOC_LC_PAGES)	\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
 
 @HAVE_GNOME_DOC_UTILS_TRUE@_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS),				\
@@ -364,7 +375,8 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
 @HAVE_GNOME_DOC_UTILS_TRUE@_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
 @HAVE_GNOME_DOC_UTILS_TRUE@_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-@HAVE_GNOME_DOC_UTILS_TRUE@_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
+@HAVE_GNOME_DOC_UTILS_TRUE@_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
+@HAVE_GNOME_DOC_UTILS_TRUE@_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
 
 # Keeping PACKAGE_NAME to be able to install stable and snapshot in parallel
 DOC_MODULE = @PACKAGE_NAME@
@@ -398,9 +410,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  help/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  help/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu help/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -418,6 +430,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -447,13 +460,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -484,6 +501,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -508,6 +526,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -516,18 +536,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -624,6 +654,10 @@
 
 @HAVE_GNOME_DOC_UTILS_TRUE@DOC_MODULE ?=
 
+@HAVE_GNOME_DOC_UTILS_TRUE@DOC_ID ?=
+
+@HAVE_GNOME_DOC_UTILS_TRUE@DOC_PAGES ?=
+
 @HAVE_GNOME_DOC_UTILS_TRUE@DOC_ENTITIES ?=
 
 @HAVE_GNOME_DOC_UTILS_TRUE@DOC_INCLUDES ?=
@@ -640,6 +674,7 @@
 
 @HAVE_GNOME_DOC_UTILS_TRUE@_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
 @HAVE_GNOME_DOC_UTILS_TRUE@_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+@HAVE_GNOME_DOC_UTILS_TRUE@_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
 @HAVE_GNOME_DOC_UTILS_TRUE@_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
 @HAVE_GNOME_DOC_UTILS_TRUE@_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
 @HAVE_GNOME_DOC_UTILS_TRUE@_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
@@ -684,16 +719,16 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@	done; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	if ! test -f $@; then \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  echo "(cd $(dir $@) && \
-@HAVE_GNOME_DOC_UTILS_TRUE@	    $(_xml2po) -e $$docs > $(notdir $@).tmp && \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
 @HAVE_GNOME_DOC_UTILS_TRUE@	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  (cd $(dir $@) && \
-@HAVE_GNOME_DOC_UTILS_TRUE@	    $(_xml2po) -e $$docs > $(notdir $@).tmp && \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
 @HAVE_GNOME_DOC_UTILS_TRUE@	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
 @HAVE_GNOME_DOC_UTILS_TRUE@	else \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  echo "(cd $(dir $@) && \
-@HAVE_GNOME_DOC_UTILS_TRUE@	    $(_xml2po) -e -u $(notdir $@) $$docs)"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  (cd $(dir $@) && \
-@HAVE_GNOME_DOC_UTILS_TRUE@	    $(_xml2po) -e -u $(notdir $@) $$docs); \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
 @HAVE_GNOME_DOC_UTILS_TRUE@	fi
 
 # FIXME: fix the dependancy
@@ -702,15 +737,16 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
 @HAVE_GNOME_DOC_UTILS_TRUE@	if ! test -d $(dir $@); then mkdir $(dir $@); fi
 @HAVE_GNOME_DOC_UTILS_TRUE@	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	(cd $(dir $@) && \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  $(_xml2po) -e -p \
-@HAVE_GNOME_DOC_UTILS_TRUE@	    "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
 @HAVE_GNOME_DOC_UTILS_TRUE@	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
 @HAVE_GNOME_DOC_UTILS_TRUE@	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
 @HAVE_GNOME_DOC_UTILS_TRUE@.PHONY: pot
 @HAVE_GNOME_DOC_UTILS_TRUE@pot: $(_DOC_POT)
 @HAVE_GNOME_DOC_UTILS_TRUE@$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-@HAVE_GNOME_DOC_UTILS_TRUE@	$(_xml2po) -e -o $@ $^
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
 
 @HAVE_GNOME_DOC_UTILS_TRUE@$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
 @HAVE_GNOME_DOC_UTILS_TRUE@	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
@@ -722,6 +758,8 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_OMF_ALL)		$(_DOC_DSK_ALL)		\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
 
+################################################################################
+
 @HAVE_GNOME_DOC_UTILS_TRUE@.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
 
 @HAVE_GNOME_DOC_UTILS_TRUE@clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
@@ -763,10 +801,12 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(_clean_omf)		$(_clean_dsk)		\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(_clean_lc)		$(_clean_dir)
 
-@HAVE_GNOME_DOC_UTILS_TRUE@.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
-@HAVE_GNOME_DOC_UTILS_TRUE@doc-dist-hook: 					\
-@HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(DOC_MODULE),dist-doc-docs)	\
-@HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_C_FIGURES),dist-doc-figs)	\
+################################################################################
+
+@HAVE_GNOME_DOC_UTILS_TRUE@.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
+@HAVE_GNOME_DOC_UTILS_TRUE@doc-dist-hook: 						\
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)	\
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_C_FIGURES),dist-doc-figs)		\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_OMF_IN),dist-doc-omf)
 #	$(if $(_DOC_DSK_IN),dist-doc-dsk)
 
@@ -812,9 +852,12 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@	echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
 
+################################################################################
+
 @HAVE_GNOME_DOC_UTILS_TRUE@.PHONY: check-doc-docs check-doc-omf
 @HAVE_GNOME_DOC_UTILS_TRUE@check:							\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(DOC_MODULE),check-doc-docs)		\
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(DOC_ID),check-doc-pages)			\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_OMF_IN),check-doc-omf)
 
 @HAVE_GNOME_DOC_UTILS_TRUE@check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
@@ -830,15 +873,33 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	done
 
+@HAVE_GNOME_DOC_UTILS_TRUE@check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
+@HAVE_GNOME_DOC_UTILS_TRUE@	for lc in C $(_DOC_REAL_LINGUAS); do \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  if test -f "$$lc"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    then d=; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    xmlpath="$$lc"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  else \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    d="$(srcdir)/"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    xmlpath="$$lc:$(srcdir)/$$lc"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  fi; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  for page in $(DOC_PAGES); do \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  done; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	done
+
 @HAVE_GNOME_DOC_UTILS_TRUE@check-doc-omf: $(_DOC_OMF_ALL)
 @HAVE_GNOME_DOC_UTILS_TRUE@	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	done
 
+################################################################################
+
 @HAVE_GNOME_DOC_UTILS_TRUE@.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
+
 @HAVE_GNOME_DOC_UTILS_TRUE@install-data-local:					\
-@HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(DOC_MODULE),install-doc-docs)		\
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)	\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_HTML_ALL),install-doc-html)		\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_OMF_IN),install-doc-omf)
@@ -846,19 +907,19 @@
 
 @HAVE_GNOME_DOC_UTILS_TRUE@install-doc-docs:
 @HAVE_GNOME_DOC_UTILS_TRUE@	@for lc in C $(_DOC_REAL_LINGUAS); do \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	done
 @HAVE_GNOME_DOC_UTILS_TRUE@	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  if ! test -d "$$docdir"; then \
 @HAVE_GNOME_DOC_UTILS_TRUE@	    echo "$(mkinstalldirs) $$docdir"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	    $(mkinstalldirs) "$$docdir"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  fi; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	done
 
 @HAVE_GNOME_DOC_UTILS_TRUE@install-doc-figs:
@@ -873,7 +934,7 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@	      figsymlink=true; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	    fi; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	    if ! test -d "$$figdir"; then \
 @HAVE_GNOME_DOC_UTILS_TRUE@	      echo "$(mkinstalldirs) $$figdir"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	      $(mkinstalldirs) "$$figdir"; \
@@ -893,22 +954,24 @@
 @HAVE_GNOME_DOC_UTILS_TRUE@	echo install-html
 
 @HAVE_GNOME_DOC_UTILS_TRUE@install-doc-omf:
-@HAVE_GNOME_DOC_UTILS_TRUE@	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
 @HAVE_GNOME_DOC_UTILS_TRUE@	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	done
 @HAVE_GNOME_DOC_UTILS_TRUE@	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	fi;
 
 @HAVE_GNOME_DOC_UTILS_TRUE@install-doc-dsk:
 @HAVE_GNOME_DOC_UTILS_TRUE@	echo install-dsk
 
+################################################################################
+
 @HAVE_GNOME_DOC_UTILS_TRUE@.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
 @HAVE_GNOME_DOC_UTILS_TRUE@uninstall-local:					\
-@HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(DOC_MODULE),uninstall-doc-docs)		\
+@HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs)	\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
 @HAVE_GNOME_DOC_UTILS_TRUE@	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
@@ -916,27 +979,28 @@
 
 @HAVE_GNOME_DOC_UTILS_TRUE@uninstall-doc-docs:
 @HAVE_GNOME_DOC_UTILS_TRUE@	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	done
 
 @HAVE_GNOME_DOC_UTILS_TRUE@uninstall-doc-figs:
 @HAVE_GNOME_DOC_UTILS_TRUE@	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	done;
 
 @HAVE_GNOME_DOC_UTILS_TRUE@uninstall-doc-omf:
 @HAVE_GNOME_DOC_UTILS_TRUE@	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
-@HAVE_GNOME_DOC_UTILS_TRUE@	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	  fi; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-@HAVE_GNOME_DOC_UTILS_TRUE@	  rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+@HAVE_GNOME_DOC_UTILS_TRUE@	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
 @HAVE_GNOME_DOC_UTILS_TRUE@	done
 
 dist-hook: doc-dist-hook
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/install-sh ekiga-3.2.6~ppa~karmic1/install-sh
--- ekiga-3.2.5/install-sh	2009-07-06 20:10:36.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/install-sh	2009-09-22 15:36:21.000000000 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -Nru ekiga-3.2.5/lib/engine/account/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/account/Makefile.in
--- ekiga-3.2.5/lib/engine/account/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/account/Makefile.in	2009-09-22 15:36:22.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libaccount_la_LIBADD =
 am_libaccount_la_OBJECTS = account-core.lo
@@ -52,6 +55,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -184,6 +188,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -298,9 +303,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/account/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/account/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/account/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/account/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -318,6 +323,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -340,31 +346,31 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 account-core.lo: $(account_dir)/account-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT account-core.lo -MD -MP -MF $(DEPDIR)/account-core.Tpo -c -o account-core.lo `test -f '$(account_dir)/account-core.cpp' || echo '$(srcdir)/'`$(account_dir)/account-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/account-core.Tpo $(DEPDIR)/account-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT account-core.lo -MD -MP -MF $(DEPDIR)/account-core.Tpo -c -o account-core.lo `test -f '$(account_dir)/account-core.cpp' || echo '$(srcdir)/'`$(account_dir)/account-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/account-core.Tpo $(DEPDIR)/account-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(account_dir)/account-core.cpp' object='account-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o account-core.lo `test -f '$(account_dir)/account-core.cpp' || echo '$(srcdir)/'`$(account_dir)/account-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o account-core.lo `test -f '$(account_dir)/account-core.cpp' || echo '$(srcdir)/'`$(account_dir)/account-core.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -384,7 +390,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -392,29 +398,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -435,13 +446,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -469,6 +484,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -490,6 +506,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -498,18 +516,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -547,6 +575,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/addressbook/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/addressbook/Makefile.in
--- ekiga-3.2.5/lib/engine/addressbook/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/addressbook/Makefile.in	2009-09-22 15:36:22.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmaddressbook_la_LIBADD =
 am_libgmaddressbook_la_OBJECTS = contact-core.lo
@@ -52,6 +55,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -184,6 +188,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -299,9 +304,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/addressbook/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/addressbook/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/addressbook/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/addressbook/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -319,6 +324,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -341,31 +347,31 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 contact-core.lo: $(addressbook_dir)/contact-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT contact-core.lo -MD -MP -MF $(DEPDIR)/contact-core.Tpo -c -o contact-core.lo `test -f '$(addressbook_dir)/contact-core.cpp' || echo '$(srcdir)/'`$(addressbook_dir)/contact-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/contact-core.Tpo $(DEPDIR)/contact-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT contact-core.lo -MD -MP -MF $(DEPDIR)/contact-core.Tpo -c -o contact-core.lo `test -f '$(addressbook_dir)/contact-core.cpp' || echo '$(srcdir)/'`$(addressbook_dir)/contact-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/contact-core.Tpo $(DEPDIR)/contact-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(addressbook_dir)/contact-core.cpp' object='contact-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o contact-core.lo `test -f '$(addressbook_dir)/contact-core.cpp' || echo '$(srcdir)/'`$(addressbook_dir)/contact-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o contact-core.lo `test -f '$(addressbook_dir)/contact-core.cpp' || echo '$(srcdir)/'`$(addressbook_dir)/contact-core.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -385,7 +391,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -393,29 +399,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -436,13 +447,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -470,6 +485,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -491,6 +507,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -499,18 +517,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -548,6 +576,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/audioinput/audioinput-core.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/audioinput/audioinput-core.cpp
--- ekiga-3.2.5/lib/engine/audioinput/audioinput-core.cpp	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/audioinput/audioinput-core.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -327,6 +327,8 @@
 
   PTRACE(4, "AudioInputCore\tStarting stream " << channels << "x" << samplerate << "/" << bits_per_sample);
 
+  internal_set_manager(desired_device);  /* make sure it is set */
+
   if (preview_config.active || stream_config.active) {
     PTRACE(1, "AudioInputCore\tTrying to start stream in wrong state");
   }
diff -Nru ekiga-3.2.5/lib/engine/audioinput/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/audioinput/Makefile.in
--- ekiga-3.2.5/lib/engine/audioinput/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/audioinput/Makefile.in	2009-09-22 15:36:22.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmaudioinput_la_LIBADD =
 am_libgmaudioinput_la_OBJECTS = audioinput-core.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -303,9 +308,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/audioinput/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/audioinput/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/audioinput/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/audioinput/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -323,6 +328,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -346,38 +352,38 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 audioinput-core.lo: $(audioinput_dir)/audioinput-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-core.lo -MD -MP -MF $(DEPDIR)/audioinput-core.Tpo -c -o audioinput-core.lo `test -f '$(audioinput_dir)/audioinput-core.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audioinput-core.Tpo $(DEPDIR)/audioinput-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-core.lo -MD -MP -MF $(DEPDIR)/audioinput-core.Tpo -c -o audioinput-core.lo `test -f '$(audioinput_dir)/audioinput-core.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audioinput-core.Tpo $(DEPDIR)/audioinput-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(audioinput_dir)/audioinput-core.cpp' object='audioinput-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-core.lo `test -f '$(audioinput_dir)/audioinput-core.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-core.lo `test -f '$(audioinput_dir)/audioinput-core.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-core.cpp
 
 audioinput-gmconf-bridge.lo: $(audioinput_dir)/audioinput-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/audioinput-gmconf-bridge.Tpo -c -o audioinput-gmconf-bridge.lo `test -f '$(audioinput_dir)/audioinput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audioinput-gmconf-bridge.Tpo $(DEPDIR)/audioinput-gmconf-bridge.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/audioinput-gmconf-bridge.Tpo -c -o audioinput-gmconf-bridge.lo `test -f '$(audioinput_dir)/audioinput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-gmconf-bridge.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audioinput-gmconf-bridge.Tpo $(DEPDIR)/audioinput-gmconf-bridge.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(audioinput_dir)/audioinput-gmconf-bridge.cpp' object='audioinput-gmconf-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-gmconf-bridge.lo `test -f '$(audioinput_dir)/audioinput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-gmconf-bridge.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-gmconf-bridge.lo `test -f '$(audioinput_dir)/audioinput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-gmconf-bridge.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -397,7 +403,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -405,29 +411,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -448,13 +459,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -482,6 +497,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -503,6 +519,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -511,18 +529,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -560,6 +588,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/audiooutput/audiooutput-core.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/audiooutput/audiooutput-core.cpp
--- ekiga-3.2.5/lib/engine/audiooutput/audiooutput-core.cpp	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/audiooutput/audiooutput-core.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -248,6 +248,8 @@
     return;
   }
 
+  internal_set_manager(primary, desired_primary_device);    /* may be left undetermined after the last call */
+
   average_level = 0;
   internal_open(primary, channels, samplerate, bits_per_sample);
   current_primary_config.active = true;
diff -Nru ekiga-3.2.5/lib/engine/audiooutput/audiooutput-scheduler.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/audiooutput/audiooutput-scheduler.cpp
--- ekiga-3.2.5/lib/engine/audiooutput/audiooutput-scheduler.cpp	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/audiooutput/audiooutput-scheduler.cpp	2009-09-01 10:18:48.000000000 +0100
@@ -37,6 +37,9 @@
 #include "audiooutput-scheduler.h"
 #include "audiooutput-core.h"
 #include "config.h"
+#ifdef WIN32
+#include "platform/winpaths.h"
+#endif
 
 using namespace Ekiga;
 
diff -Nru ekiga-3.2.5/lib/engine/audiooutput/Makefile.am ekiga-3.2.6~ppa~karmic1/lib/engine/audiooutput/Makefile.am
--- ekiga-3.2.5/lib/engine/audiooutput/Makefile.am	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/audiooutput/Makefile.am	2009-09-22 15:27:35.000000000 +0100
@@ -5,6 +5,7 @@
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/audiooutput \
diff -Nru ekiga-3.2.5/lib/engine/audiooutput/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/audiooutput/Makefile.in
--- ekiga-3.2.5/lib/engine/audiooutput/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/audiooutput/Makefile.in	2009-09-22 15:36:22.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmaudiooutput_la_LIBADD =
 am_libgmaudiooutput_la_OBJECTS = audiooutput-scheduler.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -275,6 +280,7 @@
 audiooutput_dir = $(top_srcdir)/lib/engine/audiooutput
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 INCLUDES = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/audiooutput \
@@ -304,9 +310,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/audiooutput/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/audiooutput/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/audiooutput/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/audiooutput/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -324,6 +330,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -348,45 +355,45 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 audiooutput-scheduler.lo: $(audiooutput_dir)/audiooutput-scheduler.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-scheduler.lo -MD -MP -MF $(DEPDIR)/audiooutput-scheduler.Tpo -c -o audiooutput-scheduler.lo `test -f '$(audiooutput_dir)/audiooutput-scheduler.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-scheduler.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audiooutput-scheduler.Tpo $(DEPDIR)/audiooutput-scheduler.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-scheduler.lo -MD -MP -MF $(DEPDIR)/audiooutput-scheduler.Tpo -c -o audiooutput-scheduler.lo `test -f '$(audiooutput_dir)/audiooutput-scheduler.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-scheduler.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audiooutput-scheduler.Tpo $(DEPDIR)/audiooutput-scheduler.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(audiooutput_dir)/audiooutput-scheduler.cpp' object='audiooutput-scheduler.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-scheduler.lo `test -f '$(audiooutput_dir)/audiooutput-scheduler.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-scheduler.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-scheduler.lo `test -f '$(audiooutput_dir)/audiooutput-scheduler.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-scheduler.cpp
 
 audiooutput-core.lo: $(audiooutput_dir)/audiooutput-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-core.lo -MD -MP -MF $(DEPDIR)/audiooutput-core.Tpo -c -o audiooutput-core.lo `test -f '$(audiooutput_dir)/audiooutput-core.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audiooutput-core.Tpo $(DEPDIR)/audiooutput-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-core.lo -MD -MP -MF $(DEPDIR)/audiooutput-core.Tpo -c -o audiooutput-core.lo `test -f '$(audiooutput_dir)/audiooutput-core.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audiooutput-core.Tpo $(DEPDIR)/audiooutput-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(audiooutput_dir)/audiooutput-core.cpp' object='audiooutput-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-core.lo `test -f '$(audiooutput_dir)/audiooutput-core.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-core.lo `test -f '$(audiooutput_dir)/audiooutput-core.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-core.cpp
 
 audiooutput-gmconf-bridge.lo: $(audiooutput_dir)/audiooutput-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/audiooutput-gmconf-bridge.Tpo -c -o audiooutput-gmconf-bridge.lo `test -f '$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audiooutput-gmconf-bridge.Tpo $(DEPDIR)/audiooutput-gmconf-bridge.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/audiooutput-gmconf-bridge.Tpo -c -o audiooutput-gmconf-bridge.lo `test -f '$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audiooutput-gmconf-bridge.Tpo $(DEPDIR)/audiooutput-gmconf-bridge.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp' object='audiooutput-gmconf-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-gmconf-bridge.lo `test -f '$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-gmconf-bridge.lo `test -f '$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-gmconf-bridge.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -406,7 +413,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -414,29 +421,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -457,13 +469,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -491,6 +507,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -512,6 +529,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -520,18 +539,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -569,6 +598,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/chat/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/chat/Makefile.in
--- ekiga-3.2.5/lib/engine/chat/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/chat/Makefile.in	2009-09-22 15:36:23.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmchat_la_LIBADD =
 am_libgmchat_la_OBJECTS = chat-core.lo
@@ -52,6 +55,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -184,6 +188,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -300,9 +305,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/chat/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/chat/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/chat/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/chat/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -320,6 +325,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -342,31 +348,31 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 chat-core.lo: $(chat_dir)/chat-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat-core.lo -MD -MP -MF $(DEPDIR)/chat-core.Tpo -c -o chat-core.lo `test -f '$(chat_dir)/chat-core.cpp' || echo '$(srcdir)/'`$(chat_dir)/chat-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/chat-core.Tpo $(DEPDIR)/chat-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat-core.lo -MD -MP -MF $(DEPDIR)/chat-core.Tpo -c -o chat-core.lo `test -f '$(chat_dir)/chat-core.cpp' || echo '$(srcdir)/'`$(chat_dir)/chat-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/chat-core.Tpo $(DEPDIR)/chat-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(chat_dir)/chat-core.cpp' object='chat-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chat-core.lo `test -f '$(chat_dir)/chat-core.cpp' || echo '$(srcdir)/'`$(chat_dir)/chat-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chat-core.lo `test -f '$(chat_dir)/chat-core.cpp' || echo '$(srcdir)/'`$(chat_dir)/chat-core.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -386,7 +392,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -394,29 +400,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -437,13 +448,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -471,6 +486,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -492,6 +508,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -500,18 +518,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -549,6 +577,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/avahi/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/avahi/Makefile.in
--- ekiga-3.2.5/lib/engine/components/avahi/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/avahi/Makefile.in	2009-09-22 15:36:23.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmavahi_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/presence/libgmpresence.la
@@ -54,6 +57,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -186,6 +190,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -305,9 +310,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/avahi/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/avahi/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/avahi/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/avahi/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -325,6 +330,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -349,45 +355,45 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 avahi-heap.lo: $(avahi_dir)/avahi-heap.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-heap.lo -MD -MP -MF $(DEPDIR)/avahi-heap.Tpo -c -o avahi-heap.lo `test -f '$(avahi_dir)/avahi-heap.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-heap.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/avahi-heap.Tpo $(DEPDIR)/avahi-heap.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-heap.lo -MD -MP -MF $(DEPDIR)/avahi-heap.Tpo -c -o avahi-heap.lo `test -f '$(avahi_dir)/avahi-heap.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-heap.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/avahi-heap.Tpo $(DEPDIR)/avahi-heap.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(avahi_dir)/avahi-heap.cpp' object='avahi-heap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-heap.lo `test -f '$(avahi_dir)/avahi-heap.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-heap.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-heap.lo `test -f '$(avahi_dir)/avahi-heap.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-heap.cpp
 
 avahi-cluster.lo: $(avahi_dir)/avahi-cluster.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-cluster.lo -MD -MP -MF $(DEPDIR)/avahi-cluster.Tpo -c -o avahi-cluster.lo `test -f '$(avahi_dir)/avahi-cluster.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-cluster.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/avahi-cluster.Tpo $(DEPDIR)/avahi-cluster.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-cluster.lo -MD -MP -MF $(DEPDIR)/avahi-cluster.Tpo -c -o avahi-cluster.lo `test -f '$(avahi_dir)/avahi-cluster.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-cluster.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/avahi-cluster.Tpo $(DEPDIR)/avahi-cluster.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(avahi_dir)/avahi-cluster.cpp' object='avahi-cluster.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-cluster.lo `test -f '$(avahi_dir)/avahi-cluster.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-cluster.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-cluster.lo `test -f '$(avahi_dir)/avahi-cluster.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-cluster.cpp
 
 avahi-main.lo: $(avahi_dir)/avahi-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-main.lo -MD -MP -MF $(DEPDIR)/avahi-main.Tpo -c -o avahi-main.lo `test -f '$(avahi_dir)/avahi-main.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/avahi-main.Tpo $(DEPDIR)/avahi-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-main.lo -MD -MP -MF $(DEPDIR)/avahi-main.Tpo -c -o avahi-main.lo `test -f '$(avahi_dir)/avahi-main.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/avahi-main.Tpo $(DEPDIR)/avahi-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(avahi_dir)/avahi-main.cpp' object='avahi-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-main.lo `test -f '$(avahi_dir)/avahi-main.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-main.lo `test -f '$(avahi_dir)/avahi-main.cpp' || echo '$(srcdir)/'`$(avahi_dir)/avahi-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -407,7 +413,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -415,29 +421,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -458,13 +469,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -492,6 +507,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -513,6 +529,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -521,18 +539,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -570,6 +598,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/avahi-publisher/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/avahi-publisher/Makefile.in
--- ekiga-3.2.5/lib/engine/components/avahi-publisher/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/avahi-publisher/Makefile.in	2009-09-22 15:36:23.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libavahipublisher_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/account/libaccount.la \
@@ -56,6 +59,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -188,6 +192,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -309,9 +314,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/avahi-publisher/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/avahi-publisher/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/avahi-publisher/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/avahi-publisher/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -329,6 +334,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -352,38 +358,38 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 avahi-publisher-main.lo: $(avahi_publisher_dir)/avahi-publisher-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-publisher-main.lo -MD -MP -MF $(DEPDIR)/avahi-publisher-main.Tpo -c -o avahi-publisher-main.lo `test -f '$(avahi_publisher_dir)/avahi-publisher-main.cpp' || echo '$(srcdir)/'`$(avahi_publisher_dir)/avahi-publisher-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/avahi-publisher-main.Tpo $(DEPDIR)/avahi-publisher-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-publisher-main.lo -MD -MP -MF $(DEPDIR)/avahi-publisher-main.Tpo -c -o avahi-publisher-main.lo `test -f '$(avahi_publisher_dir)/avahi-publisher-main.cpp' || echo '$(srcdir)/'`$(avahi_publisher_dir)/avahi-publisher-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/avahi-publisher-main.Tpo $(DEPDIR)/avahi-publisher-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(avahi_publisher_dir)/avahi-publisher-main.cpp' object='avahi-publisher-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-publisher-main.lo `test -f '$(avahi_publisher_dir)/avahi-publisher-main.cpp' || echo '$(srcdir)/'`$(avahi_publisher_dir)/avahi-publisher-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-publisher-main.lo `test -f '$(avahi_publisher_dir)/avahi-publisher-main.cpp' || echo '$(srcdir)/'`$(avahi_publisher_dir)/avahi-publisher-main.cpp
 
 avahi-publisher.lo: $(avahi_publisher_dir)/avahi-publisher.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-publisher.lo -MD -MP -MF $(DEPDIR)/avahi-publisher.Tpo -c -o avahi-publisher.lo `test -f '$(avahi_publisher_dir)/avahi-publisher.cpp' || echo '$(srcdir)/'`$(avahi_publisher_dir)/avahi-publisher.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/avahi-publisher.Tpo $(DEPDIR)/avahi-publisher.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT avahi-publisher.lo -MD -MP -MF $(DEPDIR)/avahi-publisher.Tpo -c -o avahi-publisher.lo `test -f '$(avahi_publisher_dir)/avahi-publisher.cpp' || echo '$(srcdir)/'`$(avahi_publisher_dir)/avahi-publisher.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/avahi-publisher.Tpo $(DEPDIR)/avahi-publisher.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(avahi_publisher_dir)/avahi-publisher.cpp' object='avahi-publisher.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-publisher.lo `test -f '$(avahi_publisher_dir)/avahi-publisher.cpp' || echo '$(srcdir)/'`$(avahi_publisher_dir)/avahi-publisher.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o avahi-publisher.lo `test -f '$(avahi_publisher_dir)/avahi-publisher.cpp' || echo '$(srcdir)/'`$(avahi_publisher_dir)/avahi-publisher.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -403,7 +409,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -411,29 +417,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -454,13 +465,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -488,6 +503,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -509,6 +525,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -517,18 +535,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -566,6 +594,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/call-history/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/call-history/Makefile.in
--- ekiga-3.2.5/lib/engine/components/call-history/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/call-history/Makefile.in	2009-09-22 15:36:23.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libcall_history_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
@@ -54,6 +57,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -186,6 +190,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -308,9 +313,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/call-history/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/call-history/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/call-history/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/call-history/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -328,6 +333,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -353,52 +359,52 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 history-contact.lo: $(call_history_dir)/history-contact.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT history-contact.lo -MD -MP -MF $(DEPDIR)/history-contact.Tpo -c -o history-contact.lo `test -f '$(call_history_dir)/history-contact.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-contact.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/history-contact.Tpo $(DEPDIR)/history-contact.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT history-contact.lo -MD -MP -MF $(DEPDIR)/history-contact.Tpo -c -o history-contact.lo `test -f '$(call_history_dir)/history-contact.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-contact.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/history-contact.Tpo $(DEPDIR)/history-contact.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(call_history_dir)/history-contact.cpp' object='history-contact.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o history-contact.lo `test -f '$(call_history_dir)/history-contact.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-contact.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o history-contact.lo `test -f '$(call_history_dir)/history-contact.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-contact.cpp
 
 history-book.lo: $(call_history_dir)/history-book.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT history-book.lo -MD -MP -MF $(DEPDIR)/history-book.Tpo -c -o history-book.lo `test -f '$(call_history_dir)/history-book.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-book.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/history-book.Tpo $(DEPDIR)/history-book.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT history-book.lo -MD -MP -MF $(DEPDIR)/history-book.Tpo -c -o history-book.lo `test -f '$(call_history_dir)/history-book.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-book.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/history-book.Tpo $(DEPDIR)/history-book.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(call_history_dir)/history-book.cpp' object='history-book.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o history-book.lo `test -f '$(call_history_dir)/history-book.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-book.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o history-book.lo `test -f '$(call_history_dir)/history-book.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-book.cpp
 
 history-source.lo: $(call_history_dir)/history-source.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT history-source.lo -MD -MP -MF $(DEPDIR)/history-source.Tpo -c -o history-source.lo `test -f '$(call_history_dir)/history-source.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-source.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/history-source.Tpo $(DEPDIR)/history-source.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT history-source.lo -MD -MP -MF $(DEPDIR)/history-source.Tpo -c -o history-source.lo `test -f '$(call_history_dir)/history-source.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-source.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/history-source.Tpo $(DEPDIR)/history-source.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(call_history_dir)/history-source.cpp' object='history-source.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o history-source.lo `test -f '$(call_history_dir)/history-source.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-source.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o history-source.lo `test -f '$(call_history_dir)/history-source.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-source.cpp
 
 history-main.lo: $(call_history_dir)/history-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT history-main.lo -MD -MP -MF $(DEPDIR)/history-main.Tpo -c -o history-main.lo `test -f '$(call_history_dir)/history-main.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/history-main.Tpo $(DEPDIR)/history-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT history-main.lo -MD -MP -MF $(DEPDIR)/history-main.Tpo -c -o history-main.lo `test -f '$(call_history_dir)/history-main.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/history-main.Tpo $(DEPDIR)/history-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(call_history_dir)/history-main.cpp' object='history-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o history-main.lo `test -f '$(call_history_dir)/history-main.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o history-main.lo `test -f '$(call_history_dir)/history-main.cpp' || echo '$(srcdir)/'`$(call_history_dir)/history-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -418,7 +424,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -426,29 +432,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -469,13 +480,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -503,6 +518,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -524,6 +540,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -532,18 +550,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -581,6 +609,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/dx-videooutput/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/dx-videooutput/Makefile.in
--- ekiga-3.2.5/lib/engine/components/dx-videooutput/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/dx-videooutput/Makefile.in	2009-09-22 15:36:23.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmvideooutput_dx_la_LIBADD =
 am_libgmvideooutput_dx_la_OBJECTS = videooutput-manager-common.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -304,9 +309,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/dx-videooutput/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/dx-videooutput/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/dx-videooutput/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/dx-videooutput/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -324,6 +329,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -348,45 +354,45 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 videooutput-manager-common.lo: $(common_dir)/videooutput-manager-common.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-manager-common.lo -MD -MP -MF $(DEPDIR)/videooutput-manager-common.Tpo -c -o videooutput-manager-common.lo `test -f '$(common_dir)/videooutput-manager-common.cpp' || echo '$(srcdir)/'`$(common_dir)/videooutput-manager-common.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videooutput-manager-common.Tpo $(DEPDIR)/videooutput-manager-common.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-manager-common.lo -MD -MP -MF $(DEPDIR)/videooutput-manager-common.Tpo -c -o videooutput-manager-common.lo `test -f '$(common_dir)/videooutput-manager-common.cpp' || echo '$(srcdir)/'`$(common_dir)/videooutput-manager-common.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videooutput-manager-common.Tpo $(DEPDIR)/videooutput-manager-common.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(common_dir)/videooutput-manager-common.cpp' object='videooutput-manager-common.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-manager-common.lo `test -f '$(common_dir)/videooutput-manager-common.cpp' || echo '$(srcdir)/'`$(common_dir)/videooutput-manager-common.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-manager-common.lo `test -f '$(common_dir)/videooutput-manager-common.cpp' || echo '$(srcdir)/'`$(common_dir)/videooutput-manager-common.cpp
 
 videooutput-manager-dx.lo: $(videooutput_dir)/videooutput-manager-dx.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-manager-dx.lo -MD -MP -MF $(DEPDIR)/videooutput-manager-dx.Tpo -c -o videooutput-manager-dx.lo `test -f '$(videooutput_dir)/videooutput-manager-dx.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-manager-dx.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videooutput-manager-dx.Tpo $(DEPDIR)/videooutput-manager-dx.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-manager-dx.lo -MD -MP -MF $(DEPDIR)/videooutput-manager-dx.Tpo -c -o videooutput-manager-dx.lo `test -f '$(videooutput_dir)/videooutput-manager-dx.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-manager-dx.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videooutput-manager-dx.Tpo $(DEPDIR)/videooutput-manager-dx.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videooutput_dir)/videooutput-manager-dx.cpp' object='videooutput-manager-dx.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-manager-dx.lo `test -f '$(videooutput_dir)/videooutput-manager-dx.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-manager-dx.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-manager-dx.lo `test -f '$(videooutput_dir)/videooutput-manager-dx.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-manager-dx.cpp
 
 videooutput-main-dx.lo: $(videooutput_dir)/videooutput-main-dx.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-main-dx.lo -MD -MP -MF $(DEPDIR)/videooutput-main-dx.Tpo -c -o videooutput-main-dx.lo `test -f '$(videooutput_dir)/videooutput-main-dx.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-main-dx.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videooutput-main-dx.Tpo $(DEPDIR)/videooutput-main-dx.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-main-dx.lo -MD -MP -MF $(DEPDIR)/videooutput-main-dx.Tpo -c -o videooutput-main-dx.lo `test -f '$(videooutput_dir)/videooutput-main-dx.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-main-dx.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videooutput-main-dx.Tpo $(DEPDIR)/videooutput-main-dx.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videooutput_dir)/videooutput-main-dx.cpp' object='videooutput-main-dx.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-main-dx.lo `test -f '$(videooutput_dir)/videooutput-main-dx.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-main-dx.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-main-dx.lo `test -f '$(videooutput_dir)/videooutput-main-dx.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-main-dx.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -406,7 +412,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -414,29 +420,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -457,13 +468,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -491,6 +506,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -512,6 +528,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -520,18 +538,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -569,6 +597,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/echo/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/echo/Makefile.in
--- ekiga-3.2.5/lib/engine/components/echo/Makefile.in	2009-07-06 20:10:38.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/echo/Makefile.in	2009-09-22 15:36:24.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmechochat_la_LIBADD =
 am_libgmechochat_la_OBJECTS = echo-presentity.lo echo-simple.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -303,9 +308,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/echo/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/echo/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/echo/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/echo/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -323,6 +328,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -348,52 +354,52 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 echo-presentity.lo: $(echochat_dir)/echo-presentity.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT echo-presentity.lo -MD -MP -MF $(DEPDIR)/echo-presentity.Tpo -c -o echo-presentity.lo `test -f '$(echochat_dir)/echo-presentity.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-presentity.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/echo-presentity.Tpo $(DEPDIR)/echo-presentity.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT echo-presentity.lo -MD -MP -MF $(DEPDIR)/echo-presentity.Tpo -c -o echo-presentity.lo `test -f '$(echochat_dir)/echo-presentity.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-presentity.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/echo-presentity.Tpo $(DEPDIR)/echo-presentity.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(echochat_dir)/echo-presentity.cpp' object='echo-presentity.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o echo-presentity.lo `test -f '$(echochat_dir)/echo-presentity.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-presentity.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o echo-presentity.lo `test -f '$(echochat_dir)/echo-presentity.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-presentity.cpp
 
 echo-simple.lo: $(echochat_dir)/echo-simple.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT echo-simple.lo -MD -MP -MF $(DEPDIR)/echo-simple.Tpo -c -o echo-simple.lo `test -f '$(echochat_dir)/echo-simple.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-simple.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/echo-simple.Tpo $(DEPDIR)/echo-simple.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT echo-simple.lo -MD -MP -MF $(DEPDIR)/echo-simple.Tpo -c -o echo-simple.lo `test -f '$(echochat_dir)/echo-simple.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-simple.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/echo-simple.Tpo $(DEPDIR)/echo-simple.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(echochat_dir)/echo-simple.cpp' object='echo-simple.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o echo-simple.lo `test -f '$(echochat_dir)/echo-simple.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-simple.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o echo-simple.lo `test -f '$(echochat_dir)/echo-simple.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-simple.cpp
 
 echo-dialect.lo: $(echochat_dir)/echo-dialect.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT echo-dialect.lo -MD -MP -MF $(DEPDIR)/echo-dialect.Tpo -c -o echo-dialect.lo `test -f '$(echochat_dir)/echo-dialect.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-dialect.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/echo-dialect.Tpo $(DEPDIR)/echo-dialect.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT echo-dialect.lo -MD -MP -MF $(DEPDIR)/echo-dialect.Tpo -c -o echo-dialect.lo `test -f '$(echochat_dir)/echo-dialect.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-dialect.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/echo-dialect.Tpo $(DEPDIR)/echo-dialect.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(echochat_dir)/echo-dialect.cpp' object='echo-dialect.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o echo-dialect.lo `test -f '$(echochat_dir)/echo-dialect.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-dialect.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o echo-dialect.lo `test -f '$(echochat_dir)/echo-dialect.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-dialect.cpp
 
 echo-main.lo: $(echochat_dir)/echo-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT echo-main.lo -MD -MP -MF $(DEPDIR)/echo-main.Tpo -c -o echo-main.lo `test -f '$(echochat_dir)/echo-main.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/echo-main.Tpo $(DEPDIR)/echo-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT echo-main.lo -MD -MP -MF $(DEPDIR)/echo-main.Tpo -c -o echo-main.lo `test -f '$(echochat_dir)/echo-main.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/echo-main.Tpo $(DEPDIR)/echo-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(echochat_dir)/echo-main.cpp' object='echo-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o echo-main.lo `test -f '$(echochat_dir)/echo-main.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o echo-main.lo `test -f '$(echochat_dir)/echo-main.cpp' || echo '$(srcdir)/'`$(echochat_dir)/echo-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -413,7 +419,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -421,29 +427,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -464,13 +475,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -498,6 +513,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -519,6 +535,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -527,18 +545,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -576,6 +604,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/evolution/evolution-book.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/evolution/evolution-book.cpp
--- ekiga-3.2.5/lib/engine/components/evolution/evolution-book.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/evolution/evolution-book.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -254,8 +254,6 @@
 {
   if (book != NULL)
     g_object_unref (book);
-  if (view != NULL)
-    g_object_unref (view);
 }
 
 const std::string
diff -Nru ekiga-3.2.5/lib/engine/components/evolution/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/evolution/Makefile.in
--- ekiga-3.2.5/lib/engine/components/evolution/Makefile.in	2009-07-06 20:10:38.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/evolution/Makefile.in	2009-09-22 15:36:24.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmevolution_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
@@ -54,6 +57,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -186,6 +190,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -306,9 +311,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/evolution/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/evolution/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/evolution/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/evolution/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -326,6 +331,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -351,52 +357,52 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 evolution-contact.lo: $(evolution_dir)/evolution-contact.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT evolution-contact.lo -MD -MP -MF $(DEPDIR)/evolution-contact.Tpo -c -o evolution-contact.lo `test -f '$(evolution_dir)/evolution-contact.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-contact.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/evolution-contact.Tpo $(DEPDIR)/evolution-contact.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT evolution-contact.lo -MD -MP -MF $(DEPDIR)/evolution-contact.Tpo -c -o evolution-contact.lo `test -f '$(evolution_dir)/evolution-contact.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-contact.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/evolution-contact.Tpo $(DEPDIR)/evolution-contact.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(evolution_dir)/evolution-contact.cpp' object='evolution-contact.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o evolution-contact.lo `test -f '$(evolution_dir)/evolution-contact.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-contact.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o evolution-contact.lo `test -f '$(evolution_dir)/evolution-contact.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-contact.cpp
 
 evolution-book.lo: $(evolution_dir)/evolution-book.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT evolution-book.lo -MD -MP -MF $(DEPDIR)/evolution-book.Tpo -c -o evolution-book.lo `test -f '$(evolution_dir)/evolution-book.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-book.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/evolution-book.Tpo $(DEPDIR)/evolution-book.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT evolution-book.lo -MD -MP -MF $(DEPDIR)/evolution-book.Tpo -c -o evolution-book.lo `test -f '$(evolution_dir)/evolution-book.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-book.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/evolution-book.Tpo $(DEPDIR)/evolution-book.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(evolution_dir)/evolution-book.cpp' object='evolution-book.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o evolution-book.lo `test -f '$(evolution_dir)/evolution-book.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-book.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o evolution-book.lo `test -f '$(evolution_dir)/evolution-book.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-book.cpp
 
 evolution-source.lo: $(evolution_dir)/evolution-source.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT evolution-source.lo -MD -MP -MF $(DEPDIR)/evolution-source.Tpo -c -o evolution-source.lo `test -f '$(evolution_dir)/evolution-source.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-source.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/evolution-source.Tpo $(DEPDIR)/evolution-source.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT evolution-source.lo -MD -MP -MF $(DEPDIR)/evolution-source.Tpo -c -o evolution-source.lo `test -f '$(evolution_dir)/evolution-source.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-source.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/evolution-source.Tpo $(DEPDIR)/evolution-source.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(evolution_dir)/evolution-source.cpp' object='evolution-source.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o evolution-source.lo `test -f '$(evolution_dir)/evolution-source.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-source.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o evolution-source.lo `test -f '$(evolution_dir)/evolution-source.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-source.cpp
 
 evolution-main.lo: $(evolution_dir)/evolution-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT evolution-main.lo -MD -MP -MF $(DEPDIR)/evolution-main.Tpo -c -o evolution-main.lo `test -f '$(evolution_dir)/evolution-main.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/evolution-main.Tpo $(DEPDIR)/evolution-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT evolution-main.lo -MD -MP -MF $(DEPDIR)/evolution-main.Tpo -c -o evolution-main.lo `test -f '$(evolution_dir)/evolution-main.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/evolution-main.Tpo $(DEPDIR)/evolution-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(evolution_dir)/evolution-main.cpp' object='evolution-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o evolution-main.lo `test -f '$(evolution_dir)/evolution-main.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o evolution-main.lo `test -f '$(evolution_dir)/evolution-main.cpp' || echo '$(srcdir)/'`$(evolution_dir)/evolution-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -416,7 +422,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -424,29 +430,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -467,13 +478,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -501,6 +516,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -522,6 +538,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -530,18 +548,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -579,6 +607,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/gmconf-personal-details/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/gmconf-personal-details/Makefile.in
--- ekiga-3.2.5/lib/engine/components/gmconf-personal-details/Makefile.in	2009-07-06 20:10:38.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/gmconf-personal-details/Makefile.in	2009-09-22 15:36:24.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmconfpersonaldetails_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/framework/libgmframework.la
@@ -56,6 +59,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -188,6 +192,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -304,9 +309,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/gmconf-personal-details/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/gmconf-personal-details/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/gmconf-personal-details/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/gmconf-personal-details/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -324,6 +329,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -347,38 +353,38 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 gmconf-personal-details.lo: $(gmconf_personal_details_dir)/gmconf-personal-details.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gmconf-personal-details.lo -MD -MP -MF $(DEPDIR)/gmconf-personal-details.Tpo -c -o gmconf-personal-details.lo `test -f '$(gmconf_personal_details_dir)/gmconf-personal-details.cpp' || echo '$(srcdir)/'`$(gmconf_personal_details_dir)/gmconf-personal-details.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gmconf-personal-details.Tpo $(DEPDIR)/gmconf-personal-details.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gmconf-personal-details.lo -MD -MP -MF $(DEPDIR)/gmconf-personal-details.Tpo -c -o gmconf-personal-details.lo `test -f '$(gmconf_personal_details_dir)/gmconf-personal-details.cpp' || echo '$(srcdir)/'`$(gmconf_personal_details_dir)/gmconf-personal-details.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gmconf-personal-details.Tpo $(DEPDIR)/gmconf-personal-details.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmconf_personal_details_dir)/gmconf-personal-details.cpp' object='gmconf-personal-details.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gmconf-personal-details.lo `test -f '$(gmconf_personal_details_dir)/gmconf-personal-details.cpp' || echo '$(srcdir)/'`$(gmconf_personal_details_dir)/gmconf-personal-details.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gmconf-personal-details.lo `test -f '$(gmconf_personal_details_dir)/gmconf-personal-details.cpp' || echo '$(srcdir)/'`$(gmconf_personal_details_dir)/gmconf-personal-details.cpp
 
 gmconf-personal-details-main.lo: $(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gmconf-personal-details-main.lo -MD -MP -MF $(DEPDIR)/gmconf-personal-details-main.Tpo -c -o gmconf-personal-details-main.lo `test -f '$(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp' || echo '$(srcdir)/'`$(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gmconf-personal-details-main.Tpo $(DEPDIR)/gmconf-personal-details-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gmconf-personal-details-main.lo -MD -MP -MF $(DEPDIR)/gmconf-personal-details-main.Tpo -c -o gmconf-personal-details-main.lo `test -f '$(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp' || echo '$(srcdir)/'`$(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gmconf-personal-details-main.Tpo $(DEPDIR)/gmconf-personal-details-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp' object='gmconf-personal-details-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gmconf-personal-details-main.lo `test -f '$(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp' || echo '$(srcdir)/'`$(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gmconf-personal-details-main.lo `test -f '$(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp' || echo '$(srcdir)/'`$(gmconf_personal_details_dir)/gmconf-personal-details-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -398,7 +404,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -406,29 +412,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -449,13 +460,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -483,6 +498,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -504,6 +520,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -512,18 +530,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -561,6 +589,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/gnome-session/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/gnome-session/Makefile.in
--- ekiga-3.2.5/lib/engine/components/gnome-session/Makefile.in	2009-07-06 20:10:38.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/gnome-session/Makefile.in	2009-09-22 15:36:24.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmgnomesession_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/protocol/libgmprotocol.la
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -299,9 +304,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/gnome-session/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/gnome-session/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/gnome-session/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/gnome-session/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -319,6 +324,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -341,31 +347,31 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 gnome-session-main.lo: $(gnomesession_dir)/gnome-session-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnome-session-main.lo -MD -MP -MF $(DEPDIR)/gnome-session-main.Tpo -c -o gnome-session-main.lo `test -f '$(gnomesession_dir)/gnome-session-main.cpp' || echo '$(srcdir)/'`$(gnomesession_dir)/gnome-session-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gnome-session-main.Tpo $(DEPDIR)/gnome-session-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnome-session-main.lo -MD -MP -MF $(DEPDIR)/gnome-session-main.Tpo -c -o gnome-session-main.lo `test -f '$(gnomesession_dir)/gnome-session-main.cpp' || echo '$(srcdir)/'`$(gnomesession_dir)/gnome-session-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gnome-session-main.Tpo $(DEPDIR)/gnome-session-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gnomesession_dir)/gnome-session-main.cpp' object='gnome-session-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnome-session-main.lo `test -f '$(gnomesession_dir)/gnome-session-main.cpp' || echo '$(srcdir)/'`$(gnomesession_dir)/gnome-session-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnome-session-main.lo `test -f '$(gnomesession_dir)/gnome-session-main.cpp' || echo '$(srcdir)/'`$(gnomesession_dir)/gnome-session-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -385,7 +391,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -393,29 +399,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -436,13 +447,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -470,6 +485,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -491,6 +507,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -499,18 +517,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -548,6 +576,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/gstreamer/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/gstreamer/Makefile.in
--- ekiga-3.2.5/lib/engine/components/gstreamer/Makefile.in	2009-07-06 20:10:38.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/gstreamer/Makefile.in	2009-09-22 15:36:24.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmgstreamer_la_LIBADD =
 am_libgmgstreamer_la_OBJECTS = gst-main.lo gst-videoinput.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -307,9 +312,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/gstreamer/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/gstreamer/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/gstreamer/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/gstreamer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -327,6 +332,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -352,52 +358,52 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 gst-main.lo: $(gstreamer_dir)/gst-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gst-main.lo -MD -MP -MF $(DEPDIR)/gst-main.Tpo -c -o gst-main.lo `test -f '$(gstreamer_dir)/gst-main.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gst-main.Tpo $(DEPDIR)/gst-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gst-main.lo -MD -MP -MF $(DEPDIR)/gst-main.Tpo -c -o gst-main.lo `test -f '$(gstreamer_dir)/gst-main.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gst-main.Tpo $(DEPDIR)/gst-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gstreamer_dir)/gst-main.cpp' object='gst-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gst-main.lo `test -f '$(gstreamer_dir)/gst-main.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gst-main.lo `test -f '$(gstreamer_dir)/gst-main.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-main.cpp
 
 gst-videoinput.lo: $(gstreamer_dir)/gst-videoinput.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gst-videoinput.lo -MD -MP -MF $(DEPDIR)/gst-videoinput.Tpo -c -o gst-videoinput.lo `test -f '$(gstreamer_dir)/gst-videoinput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-videoinput.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gst-videoinput.Tpo $(DEPDIR)/gst-videoinput.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gst-videoinput.lo -MD -MP -MF $(DEPDIR)/gst-videoinput.Tpo -c -o gst-videoinput.lo `test -f '$(gstreamer_dir)/gst-videoinput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-videoinput.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gst-videoinput.Tpo $(DEPDIR)/gst-videoinput.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gstreamer_dir)/gst-videoinput.cpp' object='gst-videoinput.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gst-videoinput.lo `test -f '$(gstreamer_dir)/gst-videoinput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-videoinput.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gst-videoinput.lo `test -f '$(gstreamer_dir)/gst-videoinput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-videoinput.cpp
 
 gst-audioinput.lo: $(gstreamer_dir)/gst-audioinput.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gst-audioinput.lo -MD -MP -MF $(DEPDIR)/gst-audioinput.Tpo -c -o gst-audioinput.lo `test -f '$(gstreamer_dir)/gst-audioinput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-audioinput.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gst-audioinput.Tpo $(DEPDIR)/gst-audioinput.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gst-audioinput.lo -MD -MP -MF $(DEPDIR)/gst-audioinput.Tpo -c -o gst-audioinput.lo `test -f '$(gstreamer_dir)/gst-audioinput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-audioinput.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gst-audioinput.Tpo $(DEPDIR)/gst-audioinput.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gstreamer_dir)/gst-audioinput.cpp' object='gst-audioinput.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gst-audioinput.lo `test -f '$(gstreamer_dir)/gst-audioinput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-audioinput.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gst-audioinput.lo `test -f '$(gstreamer_dir)/gst-audioinput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-audioinput.cpp
 
 gst-audiooutput.lo: $(gstreamer_dir)/gst-audiooutput.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gst-audiooutput.lo -MD -MP -MF $(DEPDIR)/gst-audiooutput.Tpo -c -o gst-audiooutput.lo `test -f '$(gstreamer_dir)/gst-audiooutput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-audiooutput.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gst-audiooutput.Tpo $(DEPDIR)/gst-audiooutput.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gst-audiooutput.lo -MD -MP -MF $(DEPDIR)/gst-audiooutput.Tpo -c -o gst-audiooutput.lo `test -f '$(gstreamer_dir)/gst-audiooutput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-audiooutput.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gst-audiooutput.Tpo $(DEPDIR)/gst-audiooutput.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gstreamer_dir)/gst-audiooutput.cpp' object='gst-audiooutput.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gst-audiooutput.lo `test -f '$(gstreamer_dir)/gst-audiooutput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-audiooutput.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gst-audiooutput.lo `test -f '$(gstreamer_dir)/gst-audiooutput.cpp' || echo '$(srcdir)/'`$(gstreamer_dir)/gst-audiooutput.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -417,7 +423,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -425,29 +431,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -468,13 +479,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -502,6 +517,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -523,6 +539,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -531,18 +549,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -580,6 +608,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/hal-dbus/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/hal-dbus/Makefile.in
--- ekiga-3.2.5/lib/engine/components/hal-dbus/Makefile.in	2009-07-06 20:10:38.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/hal-dbus/Makefile.in	2009-09-22 15:36:25.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -46,6 +48,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmhal_dbus_la_LIBADD =
 am__libgmhal_dbus_la_SOURCES_DIST = $(hal_dir)/hal-manager-dbus.h \
@@ -64,6 +67,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -197,6 +201,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -320,9 +325,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/hal-dbus/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/hal-dbus/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/hal-dbus/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/hal-dbus/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -340,6 +345,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -365,73 +371,73 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 hal-v4l-helper.lo: $(hal_dir)/hal-v4l-helper.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hal-v4l-helper.lo -MD -MP -MF $(DEPDIR)/hal-v4l-helper.Tpo -c -o hal-v4l-helper.lo `test -f '$(hal_dir)/hal-v4l-helper.c' || echo '$(srcdir)/'`$(hal_dir)/hal-v4l-helper.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/hal-v4l-helper.Tpo $(DEPDIR)/hal-v4l-helper.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hal-v4l-helper.lo -MD -MP -MF $(DEPDIR)/hal-v4l-helper.Tpo -c -o hal-v4l-helper.lo `test -f '$(hal_dir)/hal-v4l-helper.c' || echo '$(srcdir)/'`$(hal_dir)/hal-v4l-helper.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/hal-v4l-helper.Tpo $(DEPDIR)/hal-v4l-helper.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(hal_dir)/hal-v4l-helper.c' object='hal-v4l-helper.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hal-v4l-helper.lo `test -f '$(hal_dir)/hal-v4l-helper.c' || echo '$(srcdir)/'`$(hal_dir)/hal-v4l-helper.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hal-v4l-helper.lo `test -f '$(hal_dir)/hal-v4l-helper.c' || echo '$(srcdir)/'`$(hal_dir)/hal-v4l-helper.c
 
 hal-marshal.lo: $(hal_builddir)/hal-marshal.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hal-marshal.lo -MD -MP -MF $(DEPDIR)/hal-marshal.Tpo -c -o hal-marshal.lo `test -f '$(hal_builddir)/hal-marshal.c' || echo '$(srcdir)/'`$(hal_builddir)/hal-marshal.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/hal-marshal.Tpo $(DEPDIR)/hal-marshal.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hal-marshal.lo -MD -MP -MF $(DEPDIR)/hal-marshal.Tpo -c -o hal-marshal.lo `test -f '$(hal_builddir)/hal-marshal.c' || echo '$(srcdir)/'`$(hal_builddir)/hal-marshal.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/hal-marshal.Tpo $(DEPDIR)/hal-marshal.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(hal_builddir)/hal-marshal.c' object='hal-marshal.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hal-marshal.lo `test -f '$(hal_builddir)/hal-marshal.c' || echo '$(srcdir)/'`$(hal_builddir)/hal-marshal.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hal-marshal.lo `test -f '$(hal_builddir)/hal-marshal.c' || echo '$(srcdir)/'`$(hal_builddir)/hal-marshal.c
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 hal-manager-dbus.lo: $(hal_dir)/hal-manager-dbus.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hal-manager-dbus.lo -MD -MP -MF $(DEPDIR)/hal-manager-dbus.Tpo -c -o hal-manager-dbus.lo `test -f '$(hal_dir)/hal-manager-dbus.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-manager-dbus.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/hal-manager-dbus.Tpo $(DEPDIR)/hal-manager-dbus.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hal-manager-dbus.lo -MD -MP -MF $(DEPDIR)/hal-manager-dbus.Tpo -c -o hal-manager-dbus.lo `test -f '$(hal_dir)/hal-manager-dbus.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-manager-dbus.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hal-manager-dbus.Tpo $(DEPDIR)/hal-manager-dbus.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(hal_dir)/hal-manager-dbus.cpp' object='hal-manager-dbus.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hal-manager-dbus.lo `test -f '$(hal_dir)/hal-manager-dbus.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-manager-dbus.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hal-manager-dbus.lo `test -f '$(hal_dir)/hal-manager-dbus.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-manager-dbus.cpp
 
 hal-main-dbus.lo: $(hal_dir)/hal-main-dbus.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hal-main-dbus.lo -MD -MP -MF $(DEPDIR)/hal-main-dbus.Tpo -c -o hal-main-dbus.lo `test -f '$(hal_dir)/hal-main-dbus.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-main-dbus.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/hal-main-dbus.Tpo $(DEPDIR)/hal-main-dbus.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hal-main-dbus.lo -MD -MP -MF $(DEPDIR)/hal-main-dbus.Tpo -c -o hal-main-dbus.lo `test -f '$(hal_dir)/hal-main-dbus.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-main-dbus.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hal-main-dbus.Tpo $(DEPDIR)/hal-main-dbus.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(hal_dir)/hal-main-dbus.cpp' object='hal-main-dbus.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hal-main-dbus.lo `test -f '$(hal_dir)/hal-main-dbus.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-main-dbus.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hal-main-dbus.lo `test -f '$(hal_dir)/hal-main-dbus.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-main-dbus.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -451,7 +457,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -459,29 +465,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -502,13 +513,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -539,6 +554,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -561,6 +577,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -569,18 +587,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -603,7 +631,7 @@
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
@@ -624,6 +652,7 @@
 
 hal-marshal.c: hal-marshal.list
 	$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --body > $@.tmp && mv $@.tmp $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/kab/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/kab/Makefile.in
--- ekiga-3.2.5/lib/engine/components/kab/Makefile.in	2009-07-06 20:10:38.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/kab/Makefile.in	2009-09-22 15:36:25.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,14 +44,29 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 libgmkab_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
@@ -64,6 +81,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -196,6 +214,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -317,9 +336,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/kab/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/kab/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/kab/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/kab/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -337,23 +356,28 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -389,52 +413,52 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 kab-contact.lo: $(kab_dir)/kab-contact.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kab-contact.lo -MD -MP -MF $(DEPDIR)/kab-contact.Tpo -c -o kab-contact.lo `test -f '$(kab_dir)/kab-contact.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-contact.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kab-contact.Tpo $(DEPDIR)/kab-contact.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kab-contact.lo -MD -MP -MF $(DEPDIR)/kab-contact.Tpo -c -o kab-contact.lo `test -f '$(kab_dir)/kab-contact.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-contact.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kab-contact.Tpo $(DEPDIR)/kab-contact.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(kab_dir)/kab-contact.cpp' object='kab-contact.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kab-contact.lo `test -f '$(kab_dir)/kab-contact.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-contact.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kab-contact.lo `test -f '$(kab_dir)/kab-contact.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-contact.cpp
 
 kab-book.lo: $(kab_dir)/kab-book.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kab-book.lo -MD -MP -MF $(DEPDIR)/kab-book.Tpo -c -o kab-book.lo `test -f '$(kab_dir)/kab-book.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-book.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kab-book.Tpo $(DEPDIR)/kab-book.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kab-book.lo -MD -MP -MF $(DEPDIR)/kab-book.Tpo -c -o kab-book.lo `test -f '$(kab_dir)/kab-book.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-book.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kab-book.Tpo $(DEPDIR)/kab-book.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(kab_dir)/kab-book.cpp' object='kab-book.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kab-book.lo `test -f '$(kab_dir)/kab-book.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-book.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kab-book.lo `test -f '$(kab_dir)/kab-book.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-book.cpp
 
 kab-source.lo: $(kab_dir)/kab-source.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kab-source.lo -MD -MP -MF $(DEPDIR)/kab-source.Tpo -c -o kab-source.lo `test -f '$(kab_dir)/kab-source.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-source.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kab-source.Tpo $(DEPDIR)/kab-source.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kab-source.lo -MD -MP -MF $(DEPDIR)/kab-source.Tpo -c -o kab-source.lo `test -f '$(kab_dir)/kab-source.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-source.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kab-source.Tpo $(DEPDIR)/kab-source.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(kab_dir)/kab-source.cpp' object='kab-source.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kab-source.lo `test -f '$(kab_dir)/kab-source.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-source.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kab-source.lo `test -f '$(kab_dir)/kab-source.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-source.cpp
 
 kab-main.lo: $(kab_dir)/kab-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kab-main.lo -MD -MP -MF $(DEPDIR)/kab-main.Tpo -c -o kab-main.lo `test -f '$(kab_dir)/kab-main.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kab-main.Tpo $(DEPDIR)/kab-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kab-main.lo -MD -MP -MF $(DEPDIR)/kab-main.Tpo -c -o kab-main.lo `test -f '$(kab_dir)/kab-main.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kab-main.Tpo $(DEPDIR)/kab-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(kab_dir)/kab-main.cpp' object='kab-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kab-main.lo `test -f '$(kab_dir)/kab-main.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kab-main.lo `test -f '$(kab_dir)/kab-main.cpp' || echo '$(srcdir)/'`$(kab_dir)/kab-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -454,7 +478,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -462,29 +486,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -505,13 +534,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -542,6 +575,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -563,6 +597,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -571,18 +607,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -621,6 +667,7 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/kde/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/kde/Makefile.in
--- ekiga-3.2.5/lib/engine/components/kde/Makefile.in	2009-07-06 20:10:38.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/kde/Makefile.in	2009-09-22 15:36:25.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmkde_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/framework/libgmframework.la
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -296,9 +301,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/kde/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/kde/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/kde/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/kde/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -316,6 +321,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -338,31 +344,31 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 kde-main.lo: $(kde_dir)/kde-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kde-main.lo -MD -MP -MF $(DEPDIR)/kde-main.Tpo -c -o kde-main.lo `test -f '$(kde_dir)/kde-main.cpp' || echo '$(srcdir)/'`$(kde_dir)/kde-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kde-main.Tpo $(DEPDIR)/kde-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kde-main.lo -MD -MP -MF $(DEPDIR)/kde-main.Tpo -c -o kde-main.lo `test -f '$(kde_dir)/kde-main.cpp' || echo '$(srcdir)/'`$(kde_dir)/kde-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kde-main.Tpo $(DEPDIR)/kde-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(kde_dir)/kde-main.cpp' object='kde-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kde-main.lo `test -f '$(kde_dir)/kde-main.cpp' || echo '$(srcdir)/'`$(kde_dir)/kde-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kde-main.lo `test -f '$(kde_dir)/kde-main.cpp' || echo '$(srcdir)/'`$(kde_dir)/kde-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -382,7 +388,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -390,29 +396,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -433,13 +444,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -467,6 +482,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -488,6 +504,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -496,18 +514,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -545,6 +573,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/ldap/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/ldap/Makefile.in
--- ekiga-3.2.5/lib/engine/components/ldap/Makefile.in	2009-07-06 20:10:39.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/ldap/Makefile.in	2009-09-22 15:36:25.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmldap_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
@@ -54,6 +57,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -186,6 +190,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -307,9 +312,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/ldap/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/ldap/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/ldap/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/ldap/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -327,6 +332,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -352,52 +358,52 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 ldap-contact.lo: $(ldap_dir)/ldap-contact.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ldap-contact.lo -MD -MP -MF $(DEPDIR)/ldap-contact.Tpo -c -o ldap-contact.lo `test -f '$(ldap_dir)/ldap-contact.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-contact.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ldap-contact.Tpo $(DEPDIR)/ldap-contact.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ldap-contact.lo -MD -MP -MF $(DEPDIR)/ldap-contact.Tpo -c -o ldap-contact.lo `test -f '$(ldap_dir)/ldap-contact.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-contact.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/ldap-contact.Tpo $(DEPDIR)/ldap-contact.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ldap_dir)/ldap-contact.cpp' object='ldap-contact.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ldap-contact.lo `test -f '$(ldap_dir)/ldap-contact.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-contact.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ldap-contact.lo `test -f '$(ldap_dir)/ldap-contact.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-contact.cpp
 
 ldap-book.lo: $(ldap_dir)/ldap-book.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ldap-book.lo -MD -MP -MF $(DEPDIR)/ldap-book.Tpo -c -o ldap-book.lo `test -f '$(ldap_dir)/ldap-book.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-book.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ldap-book.Tpo $(DEPDIR)/ldap-book.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ldap-book.lo -MD -MP -MF $(DEPDIR)/ldap-book.Tpo -c -o ldap-book.lo `test -f '$(ldap_dir)/ldap-book.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-book.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/ldap-book.Tpo $(DEPDIR)/ldap-book.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ldap_dir)/ldap-book.cpp' object='ldap-book.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ldap-book.lo `test -f '$(ldap_dir)/ldap-book.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-book.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ldap-book.lo `test -f '$(ldap_dir)/ldap-book.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-book.cpp
 
 ldap-source.lo: $(ldap_dir)/ldap-source.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ldap-source.lo -MD -MP -MF $(DEPDIR)/ldap-source.Tpo -c -o ldap-source.lo `test -f '$(ldap_dir)/ldap-source.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-source.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ldap-source.Tpo $(DEPDIR)/ldap-source.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ldap-source.lo -MD -MP -MF $(DEPDIR)/ldap-source.Tpo -c -o ldap-source.lo `test -f '$(ldap_dir)/ldap-source.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-source.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/ldap-source.Tpo $(DEPDIR)/ldap-source.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ldap_dir)/ldap-source.cpp' object='ldap-source.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ldap-source.lo `test -f '$(ldap_dir)/ldap-source.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-source.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ldap-source.lo `test -f '$(ldap_dir)/ldap-source.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-source.cpp
 
 ldap-main.lo: $(ldap_dir)/ldap-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ldap-main.lo -MD -MP -MF $(DEPDIR)/ldap-main.Tpo -c -o ldap-main.lo `test -f '$(ldap_dir)/ldap-main.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ldap-main.Tpo $(DEPDIR)/ldap-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ldap-main.lo -MD -MP -MF $(DEPDIR)/ldap-main.Tpo -c -o ldap-main.lo `test -f '$(ldap_dir)/ldap-main.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/ldap-main.Tpo $(DEPDIR)/ldap-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ldap_dir)/ldap-main.cpp' object='ldap-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ldap-main.lo `test -f '$(ldap_dir)/ldap-main.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ldap-main.lo `test -f '$(ldap_dir)/ldap-main.cpp' || echo '$(srcdir)/'`$(ldap_dir)/ldap-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -417,7 +423,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -425,29 +431,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -468,13 +479,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -502,6 +517,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -523,6 +539,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -531,18 +549,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -580,6 +608,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/libnotify/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/libnotify/Makefile.in
--- ekiga-3.2.5/lib/engine/components/libnotify/Makefile.in	2009-07-06 20:10:39.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/libnotify/Makefile.in	2009-09-22 15:36:25.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmlibnotify_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/framework/libgmframework.la \
@@ -54,6 +57,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -186,6 +190,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -301,9 +306,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/libnotify/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/libnotify/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/libnotify/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/libnotify/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -321,6 +326,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -343,31 +349,31 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 libnotify-main.lo: $(libnotify_dir)/libnotify-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnotify-main.lo -MD -MP -MF $(DEPDIR)/libnotify-main.Tpo -c -o libnotify-main.lo `test -f '$(libnotify_dir)/libnotify-main.cpp' || echo '$(srcdir)/'`$(libnotify_dir)/libnotify-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libnotify-main.Tpo $(DEPDIR)/libnotify-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libnotify-main.lo -MD -MP -MF $(DEPDIR)/libnotify-main.Tpo -c -o libnotify-main.lo `test -f '$(libnotify_dir)/libnotify-main.cpp' || echo '$(srcdir)/'`$(libnotify_dir)/libnotify-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libnotify-main.Tpo $(DEPDIR)/libnotify-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(libnotify_dir)/libnotify-main.cpp' object='libnotify-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnotify-main.lo `test -f '$(libnotify_dir)/libnotify-main.cpp' || echo '$(srcdir)/'`$(libnotify_dir)/libnotify-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libnotify-main.lo `test -f '$(libnotify_dir)/libnotify-main.cpp' || echo '$(srcdir)/'`$(libnotify_dir)/libnotify-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -387,7 +393,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -395,29 +401,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -438,13 +449,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -472,6 +487,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -493,6 +509,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -501,18 +519,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -550,6 +578,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/local-roster/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/local-roster/Makefile.in
--- ekiga-3.2.5/lib/engine/components/local-roster/Makefile.in	2009-07-06 20:10:39.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/local-roster/Makefile.in	2009-09-22 15:36:26.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 liblocal_roster_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la \
@@ -55,6 +58,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -187,6 +191,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -313,9 +318,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/local-roster/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/local-roster/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/local-roster/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/local-roster/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -333,6 +338,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -359,59 +365,59 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 local-presentity.lo: $(local_roster_dir)/local-presentity.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-presentity.lo -MD -MP -MF $(DEPDIR)/local-presentity.Tpo -c -o local-presentity.lo `test -f '$(local_roster_dir)/local-presentity.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-presentity.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/local-presentity.Tpo $(DEPDIR)/local-presentity.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-presentity.lo -MD -MP -MF $(DEPDIR)/local-presentity.Tpo -c -o local-presentity.lo `test -f '$(local_roster_dir)/local-presentity.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-presentity.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/local-presentity.Tpo $(DEPDIR)/local-presentity.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(local_roster_dir)/local-presentity.cpp' object='local-presentity.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-presentity.lo `test -f '$(local_roster_dir)/local-presentity.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-presentity.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-presentity.lo `test -f '$(local_roster_dir)/local-presentity.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-presentity.cpp
 
 local-heap.lo: $(local_roster_dir)/local-heap.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-heap.lo -MD -MP -MF $(DEPDIR)/local-heap.Tpo -c -o local-heap.lo `test -f '$(local_roster_dir)/local-heap.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-heap.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/local-heap.Tpo $(DEPDIR)/local-heap.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-heap.lo -MD -MP -MF $(DEPDIR)/local-heap.Tpo -c -o local-heap.lo `test -f '$(local_roster_dir)/local-heap.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-heap.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/local-heap.Tpo $(DEPDIR)/local-heap.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(local_roster_dir)/local-heap.cpp' object='local-heap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-heap.lo `test -f '$(local_roster_dir)/local-heap.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-heap.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-heap.lo `test -f '$(local_roster_dir)/local-heap.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-heap.cpp
 
 local-cluster.lo: $(local_roster_dir)/local-cluster.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-cluster.lo -MD -MP -MF $(DEPDIR)/local-cluster.Tpo -c -o local-cluster.lo `test -f '$(local_roster_dir)/local-cluster.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-cluster.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/local-cluster.Tpo $(DEPDIR)/local-cluster.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-cluster.lo -MD -MP -MF $(DEPDIR)/local-cluster.Tpo -c -o local-cluster.lo `test -f '$(local_roster_dir)/local-cluster.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-cluster.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/local-cluster.Tpo $(DEPDIR)/local-cluster.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(local_roster_dir)/local-cluster.cpp' object='local-cluster.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-cluster.lo `test -f '$(local_roster_dir)/local-cluster.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-cluster.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-cluster.lo `test -f '$(local_roster_dir)/local-cluster.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-cluster.cpp
 
 local-roster-main.lo: $(local_roster_dir)/local-roster-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-roster-main.lo -MD -MP -MF $(DEPDIR)/local-roster-main.Tpo -c -o local-roster-main.lo `test -f '$(local_roster_dir)/local-roster-main.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-roster-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/local-roster-main.Tpo $(DEPDIR)/local-roster-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-roster-main.lo -MD -MP -MF $(DEPDIR)/local-roster-main.Tpo -c -o local-roster-main.lo `test -f '$(local_roster_dir)/local-roster-main.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-roster-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/local-roster-main.Tpo $(DEPDIR)/local-roster-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(local_roster_dir)/local-roster-main.cpp' object='local-roster-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-roster-main.lo `test -f '$(local_roster_dir)/local-roster-main.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-roster-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-roster-main.lo `test -f '$(local_roster_dir)/local-roster-main.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-roster-main.cpp
 
 local-roster-bridge.lo: $(local_roster_dir)/local-roster-bridge.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-roster-bridge.lo -MD -MP -MF $(DEPDIR)/local-roster-bridge.Tpo -c -o local-roster-bridge.lo `test -f '$(local_roster_dir)/local-roster-bridge.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-roster-bridge.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/local-roster-bridge.Tpo $(DEPDIR)/local-roster-bridge.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT local-roster-bridge.lo -MD -MP -MF $(DEPDIR)/local-roster-bridge.Tpo -c -o local-roster-bridge.lo `test -f '$(local_roster_dir)/local-roster-bridge.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-roster-bridge.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/local-roster-bridge.Tpo $(DEPDIR)/local-roster-bridge.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(local_roster_dir)/local-roster-bridge.cpp' object='local-roster-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-roster-bridge.lo `test -f '$(local_roster_dir)/local-roster-bridge.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-roster-bridge.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o local-roster-bridge.lo `test -f '$(local_roster_dir)/local-roster-bridge.cpp' || echo '$(srcdir)/'`$(local_roster_dir)/local-roster-bridge.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -431,7 +437,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -439,29 +445,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -482,13 +493,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -516,6 +531,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -537,6 +553,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -545,18 +563,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -594,6 +622,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/Makefile.in
--- ekiga-3.2.5/lib/engine/components/Makefile.in	2009-07-06 20:10:37.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/Makefile.in	2009-09-22 15:36:23.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -41,6 +43,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -52,6 +55,9 @@
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = call-history echo gmconf-personal-details local-roster \
@@ -60,6 +66,31 @@
 	libnotify evolution ldap kab dx-videooutput x-videooutput xcap \
 	resource-list
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
@@ -169,6 +200,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -302,9 +334,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -322,6 +354,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -353,7 +386,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -387,16 +420,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -411,7 +444,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -423,7 +456,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -432,29 +465,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -475,29 +513,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -527,6 +580,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -545,6 +599,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -553,18 +609,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -585,8 +651,8 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -602,6 +668,7 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/mlogo-videoinput/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/mlogo-videoinput/Makefile.in
--- ekiga-3.2.5/lib/engine/components/mlogo-videoinput/Makefile.in	2009-07-06 20:10:39.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/mlogo-videoinput/Makefile.in	2009-09-22 15:36:26.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmvideoinput_mlogo_la_LIBADD =
 am_libgmvideoinput_mlogo_la_OBJECTS = videoinput-manager-mlogo.lo \
@@ -55,6 +58,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -187,6 +191,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -305,9 +310,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/mlogo-videoinput/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/mlogo-videoinput/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/mlogo-videoinput/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/mlogo-videoinput/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -325,6 +330,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -348,38 +354,38 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 videoinput-manager-mlogo.lo: $(videoinput_dir)/videoinput-manager-mlogo.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-manager-mlogo.lo -MD -MP -MF $(DEPDIR)/videoinput-manager-mlogo.Tpo -c -o videoinput-manager-mlogo.lo `test -f '$(videoinput_dir)/videoinput-manager-mlogo.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-manager-mlogo.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videoinput-manager-mlogo.Tpo $(DEPDIR)/videoinput-manager-mlogo.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-manager-mlogo.lo -MD -MP -MF $(DEPDIR)/videoinput-manager-mlogo.Tpo -c -o videoinput-manager-mlogo.lo `test -f '$(videoinput_dir)/videoinput-manager-mlogo.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-manager-mlogo.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videoinput-manager-mlogo.Tpo $(DEPDIR)/videoinput-manager-mlogo.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videoinput_dir)/videoinput-manager-mlogo.cpp' object='videoinput-manager-mlogo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-manager-mlogo.lo `test -f '$(videoinput_dir)/videoinput-manager-mlogo.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-manager-mlogo.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-manager-mlogo.lo `test -f '$(videoinput_dir)/videoinput-manager-mlogo.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-manager-mlogo.cpp
 
 videoinput-main-mlogo.lo: $(videoinput_dir)/videoinput-main-mlogo.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-main-mlogo.lo -MD -MP -MF $(DEPDIR)/videoinput-main-mlogo.Tpo -c -o videoinput-main-mlogo.lo `test -f '$(videoinput_dir)/videoinput-main-mlogo.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-main-mlogo.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videoinput-main-mlogo.Tpo $(DEPDIR)/videoinput-main-mlogo.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-main-mlogo.lo -MD -MP -MF $(DEPDIR)/videoinput-main-mlogo.Tpo -c -o videoinput-main-mlogo.lo `test -f '$(videoinput_dir)/videoinput-main-mlogo.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-main-mlogo.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videoinput-main-mlogo.Tpo $(DEPDIR)/videoinput-main-mlogo.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videoinput_dir)/videoinput-main-mlogo.cpp' object='videoinput-main-mlogo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-main-mlogo.lo `test -f '$(videoinput_dir)/videoinput-main-mlogo.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-main-mlogo.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-main-mlogo.lo `test -f '$(videoinput_dir)/videoinput-main-mlogo.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-main-mlogo.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -399,7 +405,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -407,29 +413,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -450,13 +461,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -484,6 +499,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -505,6 +521,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -513,18 +531,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -562,6 +590,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/null-audioinput/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/null-audioinput/Makefile.in
--- ekiga-3.2.5/lib/engine/components/null-audioinput/Makefile.in	2009-07-06 20:10:39.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/null-audioinput/Makefile.in	2009-09-22 15:36:26.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmaudioinput_null_la_LIBADD =
 am_libgmaudioinput_null_la_OBJECTS = audioinput-manager-null.lo \
@@ -55,6 +58,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -187,6 +191,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -304,9 +309,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/null-audioinput/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/null-audioinput/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/null-audioinput/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/null-audioinput/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -324,6 +329,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -347,38 +353,38 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 audioinput-manager-null.lo: $(audioinput_dir)/audioinput-manager-null.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-manager-null.lo -MD -MP -MF $(DEPDIR)/audioinput-manager-null.Tpo -c -o audioinput-manager-null.lo `test -f '$(audioinput_dir)/audioinput-manager-null.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-manager-null.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audioinput-manager-null.Tpo $(DEPDIR)/audioinput-manager-null.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-manager-null.lo -MD -MP -MF $(DEPDIR)/audioinput-manager-null.Tpo -c -o audioinput-manager-null.lo `test -f '$(audioinput_dir)/audioinput-manager-null.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-manager-null.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audioinput-manager-null.Tpo $(DEPDIR)/audioinput-manager-null.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(audioinput_dir)/audioinput-manager-null.cpp' object='audioinput-manager-null.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-manager-null.lo `test -f '$(audioinput_dir)/audioinput-manager-null.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-manager-null.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-manager-null.lo `test -f '$(audioinput_dir)/audioinput-manager-null.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-manager-null.cpp
 
 audioinput-main-null.lo: $(audioinput_dir)/audioinput-main-null.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-main-null.lo -MD -MP -MF $(DEPDIR)/audioinput-main-null.Tpo -c -o audioinput-main-null.lo `test -f '$(audioinput_dir)/audioinput-main-null.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-main-null.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audioinput-main-null.Tpo $(DEPDIR)/audioinput-main-null.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-main-null.lo -MD -MP -MF $(DEPDIR)/audioinput-main-null.Tpo -c -o audioinput-main-null.lo `test -f '$(audioinput_dir)/audioinput-main-null.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-main-null.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audioinput-main-null.Tpo $(DEPDIR)/audioinput-main-null.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(audioinput_dir)/audioinput-main-null.cpp' object='audioinput-main-null.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-main-null.lo `test -f '$(audioinput_dir)/audioinput-main-null.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-main-null.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-main-null.lo `test -f '$(audioinput_dir)/audioinput-main-null.cpp' || echo '$(srcdir)/'`$(audioinput_dir)/audioinput-main-null.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -398,7 +404,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -406,29 +412,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -449,13 +460,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -483,6 +498,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -504,6 +520,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -512,18 +530,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -561,6 +589,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/null-audiooutput/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/null-audiooutput/Makefile.in
--- ekiga-3.2.5/lib/engine/components/null-audiooutput/Makefile.in	2009-07-06 20:10:39.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/null-audiooutput/Makefile.in	2009-09-22 15:36:26.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmaudiooutput_null_la_LIBADD =
 am_libgmaudiooutput_null_la_OBJECTS = audiooutput-manager-null.lo \
@@ -55,6 +58,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -187,6 +191,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -303,9 +308,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/null-audiooutput/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/null-audiooutput/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/null-audiooutput/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/null-audiooutput/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -323,6 +328,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -346,38 +352,38 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 audiooutput-manager-null.lo: $(audiooutput_dir)/audiooutput-manager-null.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-manager-null.lo -MD -MP -MF $(DEPDIR)/audiooutput-manager-null.Tpo -c -o audiooutput-manager-null.lo `test -f '$(audiooutput_dir)/audiooutput-manager-null.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-manager-null.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audiooutput-manager-null.Tpo $(DEPDIR)/audiooutput-manager-null.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-manager-null.lo -MD -MP -MF $(DEPDIR)/audiooutput-manager-null.Tpo -c -o audiooutput-manager-null.lo `test -f '$(audiooutput_dir)/audiooutput-manager-null.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-manager-null.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audiooutput-manager-null.Tpo $(DEPDIR)/audiooutput-manager-null.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(audiooutput_dir)/audiooutput-manager-null.cpp' object='audiooutput-manager-null.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-manager-null.lo `test -f '$(audiooutput_dir)/audiooutput-manager-null.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-manager-null.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-manager-null.lo `test -f '$(audiooutput_dir)/audiooutput-manager-null.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-manager-null.cpp
 
 audiooutput-main-null.lo: $(audiooutput_dir)/audiooutput-main-null.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-main-null.lo -MD -MP -MF $(DEPDIR)/audiooutput-main-null.Tpo -c -o audiooutput-main-null.lo `test -f '$(audiooutput_dir)/audiooutput-main-null.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-main-null.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audiooutput-main-null.Tpo $(DEPDIR)/audiooutput-main-null.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-main-null.lo -MD -MP -MF $(DEPDIR)/audiooutput-main-null.Tpo -c -o audiooutput-main-null.lo `test -f '$(audiooutput_dir)/audiooutput-main-null.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-main-null.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audiooutput-main-null.Tpo $(DEPDIR)/audiooutput-main-null.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(audiooutput_dir)/audiooutput-main-null.cpp' object='audiooutput-main-null.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-main-null.lo `test -f '$(audiooutput_dir)/audiooutput-main-null.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-main-null.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-main-null.lo `test -f '$(audiooutput_dir)/audiooutput-main-null.cpp' || echo '$(srcdir)/'`$(audiooutput_dir)/audiooutput-main-null.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -397,7 +403,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -405,29 +411,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -448,13 +459,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -482,6 +497,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -503,6 +519,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -511,18 +529,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -560,6 +588,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/opal/h323-endpoint.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/h323-endpoint.cpp
--- ekiga-3.2.5/lib/engine/components/opal/h323-endpoint.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/h323-endpoint.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -252,7 +252,7 @@
 bool
 Opal::H323::EndPoint::subscribe (const Opal::Account & account)
 {
-  if (account.get_protocol_name () != "H323" || account.is_active ())
+  if (account.get_protocol_name () != "H323")
     return false;
 
   new subscriber (account, *this);
@@ -264,7 +264,7 @@
 bool
 Opal::H323::EndPoint::unsubscribe (const Opal::Account & account)
 {
-  if (account.get_protocol_name () != "H323" || !account.is_active ())
+  if (account.get_protocol_name () != "H323")
     return false;
 
   new subscriber (account, *this);
diff -Nru ekiga-3.2.5/lib/engine/components/opal/Makefile.am ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/Makefile.am
--- ekiga-3.2.5/lib/engine/components/opal/Makefile.am	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/Makefile.am	2009-09-22 15:27:35.000000000 +0100
@@ -52,7 +52,6 @@
 	$(opal_dir)/h323-endpoint.cpp
 endif
 
-if HAVE_SIP
 libgmopal_la_SOURCES += \
 	$(opal_dir)/sip-chat-simple.h \
 	$(opal_dir)/sip-chat-simple.cpp \
@@ -60,6 +59,5 @@
 	$(opal_dir)/sip-dialect.cpp \
 	$(opal_dir)/sip-endpoint.h \
 	$(opal_dir)/sip-endpoint.cpp
-endif
 
 libgmopal_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS)
diff -Nru ekiga-3.2.5/lib/engine/components/opal/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/Makefile.in
--- ekiga-3.2.5/lib/engine/components/opal/Makefile.in	2009-07-06 20:10:39.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/Makefile.in	2009-09-22 15:36:26.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -37,14 +39,6 @@
 @HAVE_H323_TRUE@	$(opal_dir)/h323-endpoint.h \
 @HAVE_H323_TRUE@	$(opal_dir)/h323-endpoint.cpp
 
-@HAVE_SIP_TRUE@am__append_2 = \
-@HAVE_SIP_TRUE@	$(opal_dir)/sip-chat-simple.h \
-@HAVE_SIP_TRUE@	$(opal_dir)/sip-chat-simple.cpp \
-@HAVE_SIP_TRUE@	$(opal_dir)/sip-dialect.h \
-@HAVE_SIP_TRUE@	$(opal_dir)/sip-dialect.cpp \
-@HAVE_SIP_TRUE@	$(opal_dir)/sip-endpoint.h \
-@HAVE_SIP_TRUE@	$(opal_dir)/sip-endpoint.cpp
-
 subdir = lib/engine/components/opal
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -54,6 +48,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmopal_la_LIBADD =
 am__libgmopal_la_SOURCES_DIST = $(opal_dir)/opal-call-manager.h \
@@ -74,13 +69,12 @@
 	$(opal_dir)/sip-dialect.cpp $(opal_dir)/sip-endpoint.h \
 	$(opal_dir)/sip-endpoint.cpp
 @HAVE_H323_TRUE@am__objects_1 = h323-endpoint.lo
-@HAVE_SIP_TRUE@am__objects_2 = sip-chat-simple.lo sip-dialect.lo \
-@HAVE_SIP_TRUE@	sip-endpoint.lo
 am_libgmopal_la_OBJECTS = opal-call-manager.lo pcss-endpoint.lo \
 	opal-account.lo opal-bank.lo opal-call.lo \
 	opal-codec-description.lo opal-gmconf-bridge.lo opal-main.lo \
 	opal-audio.lo opal-videoinput.lo opal-videooutput.lo \
-	$(am__objects_1) $(am__objects_2)
+	$(am__objects_1) sip-chat-simple.lo sip-dialect.lo \
+	sip-endpoint.lo
 libgmopal_la_OBJECTS = $(am_libgmopal_la_OBJECTS)
 libgmopal_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -88,6 +82,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -220,6 +215,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -341,7 +337,9 @@
 	$(opal_dir)/opal-audio.cpp $(opal_dir)/opal-videoinput.h \
 	$(opal_dir)/opal-videoinput.cpp $(opal_dir)/opal-videooutput.h \
 	$(opal_dir)/opal-videooutput.cpp $(am__append_1) \
-	$(am__append_2)
+	$(opal_dir)/sip-chat-simple.h $(opal_dir)/sip-chat-simple.cpp \
+	$(opal_dir)/sip-dialect.h $(opal_dir)/sip-dialect.cpp \
+	$(opal_dir)/sip-endpoint.h $(opal_dir)/sip-endpoint.cpp
 libgmopal_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS)
 all: all-am
 
@@ -356,9 +354,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/opal/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/opal/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/opal/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/opal/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -376,6 +374,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -412,129 +411,129 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 opal-call-manager.lo: $(opal_dir)/opal-call-manager.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-call-manager.lo -MD -MP -MF $(DEPDIR)/opal-call-manager.Tpo -c -o opal-call-manager.lo `test -f '$(opal_dir)/opal-call-manager.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-call-manager.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-call-manager.Tpo $(DEPDIR)/opal-call-manager.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-call-manager.lo -MD -MP -MF $(DEPDIR)/opal-call-manager.Tpo -c -o opal-call-manager.lo `test -f '$(opal_dir)/opal-call-manager.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-call-manager.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-call-manager.Tpo $(DEPDIR)/opal-call-manager.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-call-manager.cpp' object='opal-call-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-call-manager.lo `test -f '$(opal_dir)/opal-call-manager.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-call-manager.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-call-manager.lo `test -f '$(opal_dir)/opal-call-manager.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-call-manager.cpp
 
 pcss-endpoint.lo: $(opal_dir)/pcss-endpoint.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pcss-endpoint.lo -MD -MP -MF $(DEPDIR)/pcss-endpoint.Tpo -c -o pcss-endpoint.lo `test -f '$(opal_dir)/pcss-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/pcss-endpoint.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/pcss-endpoint.Tpo $(DEPDIR)/pcss-endpoint.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pcss-endpoint.lo -MD -MP -MF $(DEPDIR)/pcss-endpoint.Tpo -c -o pcss-endpoint.lo `test -f '$(opal_dir)/pcss-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/pcss-endpoint.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/pcss-endpoint.Tpo $(DEPDIR)/pcss-endpoint.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/pcss-endpoint.cpp' object='pcss-endpoint.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pcss-endpoint.lo `test -f '$(opal_dir)/pcss-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/pcss-endpoint.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pcss-endpoint.lo `test -f '$(opal_dir)/pcss-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/pcss-endpoint.cpp
 
 opal-account.lo: $(opal_dir)/opal-account.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-account.lo -MD -MP -MF $(DEPDIR)/opal-account.Tpo -c -o opal-account.lo `test -f '$(opal_dir)/opal-account.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-account.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-account.Tpo $(DEPDIR)/opal-account.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-account.lo -MD -MP -MF $(DEPDIR)/opal-account.Tpo -c -o opal-account.lo `test -f '$(opal_dir)/opal-account.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-account.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-account.Tpo $(DEPDIR)/opal-account.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-account.cpp' object='opal-account.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-account.lo `test -f '$(opal_dir)/opal-account.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-account.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-account.lo `test -f '$(opal_dir)/opal-account.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-account.cpp
 
 opal-bank.lo: $(opal_dir)/opal-bank.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-bank.lo -MD -MP -MF $(DEPDIR)/opal-bank.Tpo -c -o opal-bank.lo `test -f '$(opal_dir)/opal-bank.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-bank.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-bank.Tpo $(DEPDIR)/opal-bank.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-bank.lo -MD -MP -MF $(DEPDIR)/opal-bank.Tpo -c -o opal-bank.lo `test -f '$(opal_dir)/opal-bank.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-bank.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-bank.Tpo $(DEPDIR)/opal-bank.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-bank.cpp' object='opal-bank.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-bank.lo `test -f '$(opal_dir)/opal-bank.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-bank.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-bank.lo `test -f '$(opal_dir)/opal-bank.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-bank.cpp
 
 opal-call.lo: $(opal_dir)/opal-call.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-call.lo -MD -MP -MF $(DEPDIR)/opal-call.Tpo -c -o opal-call.lo `test -f '$(opal_dir)/opal-call.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-call.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-call.Tpo $(DEPDIR)/opal-call.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-call.lo -MD -MP -MF $(DEPDIR)/opal-call.Tpo -c -o opal-call.lo `test -f '$(opal_dir)/opal-call.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-call.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-call.Tpo $(DEPDIR)/opal-call.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-call.cpp' object='opal-call.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-call.lo `test -f '$(opal_dir)/opal-call.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-call.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-call.lo `test -f '$(opal_dir)/opal-call.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-call.cpp
 
 opal-codec-description.lo: $(opal_dir)/opal-codec-description.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-codec-description.lo -MD -MP -MF $(DEPDIR)/opal-codec-description.Tpo -c -o opal-codec-description.lo `test -f '$(opal_dir)/opal-codec-description.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-codec-description.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-codec-description.Tpo $(DEPDIR)/opal-codec-description.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-codec-description.lo -MD -MP -MF $(DEPDIR)/opal-codec-description.Tpo -c -o opal-codec-description.lo `test -f '$(opal_dir)/opal-codec-description.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-codec-description.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-codec-description.Tpo $(DEPDIR)/opal-codec-description.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-codec-description.cpp' object='opal-codec-description.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-codec-description.lo `test -f '$(opal_dir)/opal-codec-description.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-codec-description.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-codec-description.lo `test -f '$(opal_dir)/opal-codec-description.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-codec-description.cpp
 
 opal-gmconf-bridge.lo: $(opal_dir)/opal-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/opal-gmconf-bridge.Tpo -c -o opal-gmconf-bridge.lo `test -f '$(opal_dir)/opal-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-gmconf-bridge.Tpo $(DEPDIR)/opal-gmconf-bridge.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/opal-gmconf-bridge.Tpo -c -o opal-gmconf-bridge.lo `test -f '$(opal_dir)/opal-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-gmconf-bridge.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-gmconf-bridge.Tpo $(DEPDIR)/opal-gmconf-bridge.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-gmconf-bridge.cpp' object='opal-gmconf-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-gmconf-bridge.lo `test -f '$(opal_dir)/opal-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-gmconf-bridge.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-gmconf-bridge.lo `test -f '$(opal_dir)/opal-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-gmconf-bridge.cpp
 
 opal-main.lo: $(opal_dir)/opal-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-main.lo -MD -MP -MF $(DEPDIR)/opal-main.Tpo -c -o opal-main.lo `test -f '$(opal_dir)/opal-main.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-main.Tpo $(DEPDIR)/opal-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-main.lo -MD -MP -MF $(DEPDIR)/opal-main.Tpo -c -o opal-main.lo `test -f '$(opal_dir)/opal-main.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-main.Tpo $(DEPDIR)/opal-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-main.cpp' object='opal-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-main.lo `test -f '$(opal_dir)/opal-main.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-main.lo `test -f '$(opal_dir)/opal-main.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-main.cpp
 
 opal-audio.lo: $(opal_dir)/opal-audio.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-audio.lo -MD -MP -MF $(DEPDIR)/opal-audio.Tpo -c -o opal-audio.lo `test -f '$(opal_dir)/opal-audio.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-audio.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-audio.Tpo $(DEPDIR)/opal-audio.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-audio.lo -MD -MP -MF $(DEPDIR)/opal-audio.Tpo -c -o opal-audio.lo `test -f '$(opal_dir)/opal-audio.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-audio.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-audio.Tpo $(DEPDIR)/opal-audio.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-audio.cpp' object='opal-audio.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-audio.lo `test -f '$(opal_dir)/opal-audio.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-audio.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-audio.lo `test -f '$(opal_dir)/opal-audio.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-audio.cpp
 
 opal-videoinput.lo: $(opal_dir)/opal-videoinput.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-videoinput.lo -MD -MP -MF $(DEPDIR)/opal-videoinput.Tpo -c -o opal-videoinput.lo `test -f '$(opal_dir)/opal-videoinput.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-videoinput.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-videoinput.Tpo $(DEPDIR)/opal-videoinput.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-videoinput.lo -MD -MP -MF $(DEPDIR)/opal-videoinput.Tpo -c -o opal-videoinput.lo `test -f '$(opal_dir)/opal-videoinput.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-videoinput.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-videoinput.Tpo $(DEPDIR)/opal-videoinput.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-videoinput.cpp' object='opal-videoinput.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-videoinput.lo `test -f '$(opal_dir)/opal-videoinput.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-videoinput.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-videoinput.lo `test -f '$(opal_dir)/opal-videoinput.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-videoinput.cpp
 
 opal-videooutput.lo: $(opal_dir)/opal-videooutput.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-videooutput.lo -MD -MP -MF $(DEPDIR)/opal-videooutput.Tpo -c -o opal-videooutput.lo `test -f '$(opal_dir)/opal-videooutput.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-videooutput.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/opal-videooutput.Tpo $(DEPDIR)/opal-videooutput.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opal-videooutput.lo -MD -MP -MF $(DEPDIR)/opal-videooutput.Tpo -c -o opal-videooutput.lo `test -f '$(opal_dir)/opal-videooutput.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-videooutput.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/opal-videooutput.Tpo $(DEPDIR)/opal-videooutput.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/opal-videooutput.cpp' object='opal-videooutput.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-videooutput.lo `test -f '$(opal_dir)/opal-videooutput.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-videooutput.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opal-videooutput.lo `test -f '$(opal_dir)/opal-videooutput.cpp' || echo '$(srcdir)/'`$(opal_dir)/opal-videooutput.cpp
 
 h323-endpoint.lo: $(opal_dir)/h323-endpoint.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT h323-endpoint.lo -MD -MP -MF $(DEPDIR)/h323-endpoint.Tpo -c -o h323-endpoint.lo `test -f '$(opal_dir)/h323-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/h323-endpoint.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/h323-endpoint.Tpo $(DEPDIR)/h323-endpoint.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT h323-endpoint.lo -MD -MP -MF $(DEPDIR)/h323-endpoint.Tpo -c -o h323-endpoint.lo `test -f '$(opal_dir)/h323-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/h323-endpoint.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/h323-endpoint.Tpo $(DEPDIR)/h323-endpoint.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/h323-endpoint.cpp' object='h323-endpoint.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o h323-endpoint.lo `test -f '$(opal_dir)/h323-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/h323-endpoint.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o h323-endpoint.lo `test -f '$(opal_dir)/h323-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/h323-endpoint.cpp
 
 sip-chat-simple.lo: $(opal_dir)/sip-chat-simple.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sip-chat-simple.lo -MD -MP -MF $(DEPDIR)/sip-chat-simple.Tpo -c -o sip-chat-simple.lo `test -f '$(opal_dir)/sip-chat-simple.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-chat-simple.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sip-chat-simple.Tpo $(DEPDIR)/sip-chat-simple.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sip-chat-simple.lo -MD -MP -MF $(DEPDIR)/sip-chat-simple.Tpo -c -o sip-chat-simple.lo `test -f '$(opal_dir)/sip-chat-simple.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-chat-simple.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sip-chat-simple.Tpo $(DEPDIR)/sip-chat-simple.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/sip-chat-simple.cpp' object='sip-chat-simple.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sip-chat-simple.lo `test -f '$(opal_dir)/sip-chat-simple.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-chat-simple.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sip-chat-simple.lo `test -f '$(opal_dir)/sip-chat-simple.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-chat-simple.cpp
 
 sip-dialect.lo: $(opal_dir)/sip-dialect.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sip-dialect.lo -MD -MP -MF $(DEPDIR)/sip-dialect.Tpo -c -o sip-dialect.lo `test -f '$(opal_dir)/sip-dialect.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-dialect.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sip-dialect.Tpo $(DEPDIR)/sip-dialect.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sip-dialect.lo -MD -MP -MF $(DEPDIR)/sip-dialect.Tpo -c -o sip-dialect.lo `test -f '$(opal_dir)/sip-dialect.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-dialect.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sip-dialect.Tpo $(DEPDIR)/sip-dialect.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/sip-dialect.cpp' object='sip-dialect.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sip-dialect.lo `test -f '$(opal_dir)/sip-dialect.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-dialect.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sip-dialect.lo `test -f '$(opal_dir)/sip-dialect.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-dialect.cpp
 
 sip-endpoint.lo: $(opal_dir)/sip-endpoint.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sip-endpoint.lo -MD -MP -MF $(DEPDIR)/sip-endpoint.Tpo -c -o sip-endpoint.lo `test -f '$(opal_dir)/sip-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-endpoint.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/sip-endpoint.Tpo $(DEPDIR)/sip-endpoint.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sip-endpoint.lo -MD -MP -MF $(DEPDIR)/sip-endpoint.Tpo -c -o sip-endpoint.lo `test -f '$(opal_dir)/sip-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-endpoint.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sip-endpoint.Tpo $(DEPDIR)/sip-endpoint.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(opal_dir)/sip-endpoint.cpp' object='sip-endpoint.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sip-endpoint.lo `test -f '$(opal_dir)/sip-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-endpoint.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sip-endpoint.lo `test -f '$(opal_dir)/sip-endpoint.cpp' || echo '$(srcdir)/'`$(opal_dir)/sip-endpoint.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -554,7 +553,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -562,29 +561,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -605,13 +609,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -639,6 +647,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -660,6 +669,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -668,18 +679,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -717,6 +738,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/opal/opal-account.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-account.cpp
--- ekiga-3.2.5/lib/engine/components/opal/opal-account.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-account.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -122,6 +122,8 @@
   else
     type = Account::H323;
 
+  limited = (name.find ("%limit") != std::string::npos);
+
   registration_event.connect (sigc::mem_fun (this, &Opal::Account::on_registration_event));
 }
 
@@ -145,7 +147,10 @@
   protocol_name = (t == H323) ? "H323" : "SIP";
   host = _host;
   username = _username;
-  auth_username = _auth_username;
+  if (!_auth_username.empty())
+    auth_username = _auth_username;
+  else
+    auth_username = _username;
   password = _password;
   timeout = _timeout;
   type = t;
@@ -192,7 +197,10 @@
 {
   std::stringstream str;
 
-  str << (protocol_name == "SIP" ? "sip:" : "h323:") << username << "@" << host;
+  str << (protocol_name == "SIP" ? "sip:" : "h323:") << username;
+
+  if (username.find ("@") == string::npos)
+    str << "@" << host;
 
   return str.str ();
 }
@@ -274,6 +282,12 @@
 }
 
 
+bool Opal::Account::is_limited () const
+{
+  return limited;
+}
+
+
 bool Opal::Account::is_active () const
 {
   return active;
@@ -427,7 +441,8 @@
     password = new_password;
     timeout = new_timeout;
     enabled = new_enabled;
-    enable ();
+    if (enabled)
+      enable ();
 
     updated.emit ();
     trigger_saving.emit ();
diff -Nru ekiga-3.2.5/lib/engine/components/opal/opal-account.h ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-account.h
--- ekiga-3.2.5/lib/engine/components/opal/opal-account.h	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-account.h	2009-09-22 15:27:35.000000000 +0100
@@ -122,6 +122,8 @@
 
     bool is_enabled () const;
 
+    bool is_limited () const;
+
     bool is_active () const;
 
     void remove ();
@@ -145,6 +147,7 @@
     bool dead;
     bool active;
     bool enabled;
+    bool limited;
     unsigned timeout;
     std::string aid;
     std::string name;
diff -Nru ekiga-3.2.5/lib/engine/components/opal/opal-call.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-call.cpp
--- ekiga-3.2.5/lib/engine/components/opal/opal-call.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-call.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -141,17 +141,8 @@
 void
 Opal::Call::transfer (std::string uri)
 {
-  PSafePtr<OpalConnection> connection = NULL;
-
-  int i = 0;
-
-  do {
-
-    connection = GetConnection (i);
-    i++;
-  }  while (PIsDescendant(&(*connection), OpalPCSSConnection));
-
-  if (connection)
+  PSafePtr<OpalConnection> connection = get_remote_connection ();
+  if (connection != NULL)
     connection->TransferConnection (uri);
 }
 
@@ -159,18 +150,9 @@
 void
 Opal::Call::toggle_hold ()
 {
-  PSafePtr<OpalConnection> connection = NULL;
-
   bool on_hold = false;
-  int i = 0;
-
-  do {
-
-    connection = GetConnection (i);
-    i++;
-  }  while (PIsDescendant(&(*connection), OpalPCSSConnection));
-
-  if (connection) {
+  PSafePtr<OpalConnection> connection = get_remote_connection ();
+  if (connection != NULL) {
 
     on_hold = connection->IsConnectionOnHold ();
     if (!on_hold)
@@ -185,20 +167,12 @@
 Opal::Call::toggle_stream_pause (StreamType type)
 {
   OpalMediaStreamPtr stream = NULL;
-  PSafePtr<OpalConnection> connection = NULL;
   PString codec_name;
   std::string stream_name;
 
   bool paused = false;
 
-  int i = 0;
-
-  do {
-
-    connection = GetConnection (i);
-    i++;
-  }  while (PIsDescendant(&(*connection), OpalPCSSConnection));
-
+  PSafePtr<OpalConnection> connection = get_remote_connection ();
   if (connection != NULL) {
 
     stream = connection->GetMediaStream ((type == Audio) ? OpalMediaType::Audio () : OpalMediaType::Video (), false);
@@ -221,18 +195,10 @@
 void
 Opal::Call::send_dtmf (const char dtmf)
 {
-  PSafePtr<OpalConnection> connection = NULL;
-
-  int i = 0;
-
-  do {
-
-    connection = GetConnection (i);
-    i++;
-  }  while (PIsDescendant(&(*connection), OpalPCSSConnection));
-
-  if (connection != NULL)
+  PSafePtr<OpalConnection> connection = get_remote_connection ();
+  if (connection != NULL) {
     connection->SendUserInputTone (dtmf, 180);
+  }
 }
 
 
@@ -667,19 +633,12 @@
 Opal::Call::OnNoAnswerTimeout (PTimer &,
                                INT) 
 {
-  PSafePtr<OpalConnection> connection = NULL;
-  int i = 0;
-
   if (!is_outgoing ()) {
 
     if (!forward_uri.empty ()) {
 
-      do {
-        connection = GetConnection (i);
-        i++;
-      }  while (PIsDescendant(&(*connection), OpalPCSSConnection));
-
-      if (!PIsDescendant(&(*connection), OpalPCSSConnection)) 
+      PSafePtr<OpalConnection> connection = get_remote_connection ();
+      if (connection != NULL)
         connection->ForwardCall (forward_uri);
     }
     else
diff -Nru ekiga-3.2.5/lib/engine/components/opal/opal-call.h ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-call.h
--- ekiga-3.2.5/lib/engine/components/opal/opal-call.h	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-call.h	2009-09-22 15:27:35.000000000 +0100
@@ -195,6 +195,20 @@
      */
     void parse_info (OpalConnection & connection);
 
+    PSafePtr<OpalConnection> get_remote_connection ()
+    {
+      PSafePtr<OpalConnection> connection;
+      for (PSafePtr<OpalConnection> iterConn (connectionsActive, PSafeReference); iterConn != NULL; ++iterConn) {
+        if (PSafePtrCast<OpalConnection, OpalPCSSConnection> (iterConn) == NULL) {
+          connection = iterConn;
+          if (!connection.SetSafetyMode(PSafeReadWrite))
+            connection.SetNULL();
+          break;
+        }
+      }
+      return connection;
+    }
+
     /*
      *
      */
diff -Nru ekiga-3.2.5/lib/engine/components/opal/opal-gmconf-bridge.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-gmconf-bridge.cpp
--- ekiga-3.2.5/lib/engine/components/opal/opal-gmconf-bridge.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-gmconf-bridge.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -44,9 +44,7 @@
 #include "opal-gmconf-bridge.h"
 #include "opal-call-manager.h"
 
-#ifdef HAVE_SIP
 #include "sip-endpoint.h"
-#endif 
 
 #ifdef HAVE_H323
 #include "h323-endpoint.h"
@@ -262,7 +260,6 @@
   //
   // SIP related keys
   // 
-#ifdef HAVE_SIP
   else if (key.find (SIP_KEY) != string::npos) {
 
     gmref_ptr<Opal::Sip::EndPoint> sip_manager = manager.get_protocol_manager ("sip");
@@ -290,7 +287,6 @@
       }
     }
   }
-#endif
 
   //
   // H.323 keys
diff -Nru ekiga-3.2.5/lib/engine/components/opal/opal-main.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-main.cpp
--- ekiga-3.2.5/lib/engine/components/opal/opal-main.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/opal-main.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -48,10 +48,8 @@
 #include "opal-bank.h"
 #include "opal-call-manager.h"
 
-#ifdef HAVE_SIP
 #include "sip-endpoint.h"
 #define SIP_KEY "/apps/" PACKAGE_NAME "/protocols/sip/"
-#endif
 
 #ifdef HAVE_H323
 #include "h323-endpoint.h"
@@ -73,10 +71,8 @@
     return true;
 #endif
 
-#ifdef HAVE_SIP
   if (uri.find ("sip:") == 0)
     return true;
-#endif
 
   return false;
 }
@@ -112,7 +108,6 @@
       core.add (bank);
       call_manager->ready.connect (sigc::mem_fun (&*bank, &Opal::Bank::call_manager_ready));
 
-#ifdef HAVE_SIP
       unsigned sip_port = gm_conf_get_int (SIP_KEY "listen_port");
       gmref_ptr<Sip::EndPoint> sip_manager (new Sip::EndPoint (*call_manager, core, sip_port));
       call_manager->add_protocol_manager (sip_manager);
@@ -121,7 +116,6 @@
       presence_core->add_presentity_decorator (sip_manager);
       presence_core->add_presence_fetcher (sip_manager);
       presence_core->add_presence_publisher (sip_manager);
-#endif
 
 #ifdef HAVE_H323
       unsigned h323_port = gm_conf_get_int (H323_KEY "listen_port");
diff -Nru ekiga-3.2.5/lib/engine/components/opal/sip-endpoint.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/sip-endpoint.cpp
--- ekiga-3.2.5/lib/engine/components/opal/sip-endpoint.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/sip-endpoint.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -82,6 +82,7 @@
 			    account.get_authentication_username (),
 			    account.get_password (),
 			    account.is_enabled (),
+			    account.is_limited (),
 			    account.get_timeout ());
 	} else {
 
@@ -123,6 +124,10 @@
   dialect = gmref_ptr<SIP::Dialect>(new SIP::Dialect (core, sigc::mem_fun (this, &Opal::Sip::EndPoint::send_message)));
   chat_core->add_dialect (dialect);
 
+  bank->account_added.connect (sigc::mem_fun (this, &Opal::Sip::EndPoint::on_bank_updated));
+  bank->account_removed.connect (sigc::mem_fun (this, &Opal::Sip::EndPoint::on_bank_updated));
+  bank->account_updated.connect (sigc::mem_fun (this, &Opal::Sip::EndPoint::on_bank_updated));
+
   /* Timeouts */
   SetAckTimeout (PTimeInterval (0, 32));
   SetPduCleanUpTimeout (PTimeInterval (0, 1));
@@ -177,9 +182,8 @@
 {
   bool populated = false;
 
-
   std::list<std::string> uris;
-  std::list<std::string> accounts;
+  std::list<std::string> accounts_list;
 
   if (!(uri.find ("sip:") == 0 || uri.find (":") == string::npos))
     return false;
@@ -211,15 +215,15 @@
 	uristr << "@" << (*it)->get_host ();
 
 	uris.push_back (uristr.str ());
-	accounts.push_back ((*it)->get_name ());
+	accounts_list.push_back ((*it)->get_name ());
       }
     }
   } else {
     uris.push_back (uri);
-    accounts.push_back ("");
+    accounts_list.push_back ("");
   }
 
-  std::list<std::string>::iterator ita = accounts.begin ();
+  std::list<std::string>::iterator ita = accounts_list.begin ();
   for (std::list<std::string>::iterator it = uris.begin ();
        it != uris.end ();
        it++) {
@@ -245,7 +249,7 @@
     ita++;
   }
 
-  ita = accounts.begin ();
+  ita = accounts_list.begin ();
   for (std::list<std::string>::iterator it = uris.begin ();
        it != uris.end ();
        it++) {
@@ -269,94 +273,76 @@
 
 
 void
-Opal::Sip::EndPoint::fetch (const std::string _uri)
+Opal::Sip::EndPoint::fetch (const std::string uri)
 {
-  PWaitAndSignal mut(listsMutex);
-  std::string::size_type loc = _uri.find ("@", 0);
-  std::string domain;
-
-  if (loc != string::npos)
-    domain = _uri.substr (loc+1);
-
-  // It is not in the list of uris for which a subscribe is active
-  if (std::find (subscribed_uris.begin (), subscribed_uris.end (), _uri) == subscribed_uris.end ()) {
-
-    // The account is active
-    if (std::find (active_domains.begin (), active_domains.end (), domain) != active_domains.end ()) {
-
-      Subscribe (SIPSubscribe::Presence, 300, PString (_uri.c_str ()));
-      Subscribe (SIPSubscribe::Dialog, 300, PString (_uri.c_str ()));
-      subscribed_uris.push_back (_uri);
-    }
-    else {
-
-      to_subscribe_uris.push_back (_uri);
-    }
-  }
+  Subscribe (SIPSubscribe::Presence, 300, uri);
+  Subscribe (SIPSubscribe::Dialog, 300, uri);
 }
 
 
 void
 Opal::Sip::EndPoint::unfetch (const std::string uri)
 {
-  PWaitAndSignal mut(listsMutex);
-  if (std::find (subscribed_uris.begin (), subscribed_uris.end (), uri) != subscribed_uris.end ()) {
-
-    Subscribe (SIPSubscribe::Presence, 0, PString (uri.c_str ()));
-    Subscribe (SIPSubscribe::Dialog, 0, PString (uri.c_str ()));
-    subscribed_uris.remove (uri);
-  }
+  Subscribe (SIPSubscribe::Presence, 0, uri);
+  Subscribe (SIPSubscribe::Dialog, 0, uri);
 }
 
 
 void
 Opal::Sip::EndPoint::publish (const Ekiga::PersonalDetails & details)
 {
-  PWaitAndSignal mut(listsMutex);
+  std::map<std::string, PString> publishing;
   std::string hostname = (const char *) PIPSocket::GetHostName ();
   std::string presence = ((Ekiga::PersonalDetails &) (details)).get_presence ();
   std::string status = ((Ekiga::PersonalDetails &) (details)).get_status ();
 
-  for (std::list<std::string>::iterator it = aors.begin ();
-       it != aors.end ();
-       it++) {
-    std::string to = it->substr (4);
-    PString data;
-    data += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n";
-
-    data += "<presence xmlns=\"urn:ietf:params:xml:ns:pidf\" entity=\"pres:";
-    data += to;
-    data += "\">\r\n";
-
-    data += "<tuple id=\"";
-    data += to;
-    data += "_on_";
-    data += hostname;
-    data += "\">\r\n";
-
-    data += "<note>";
-    data += presence.c_str ();
-    if (!status.empty ()) {
-      data += " - ";
-      data += status.c_str ();
-    }
-    data += "</note>\r\n";
+  for (PSafePtr<SIPHandler> handler = activeSIPHandlers.GetFirstHandler(); handler != NULL; ++handler) {
 
-    data += "<status>\r\n";
-    data += "<basic>";
-    data += "open";
-    data += "</basic>\r\n";
-    data += "</status>\r\n";
-
-    data += "<contact priority=\"1\">sip:";
-    data += to;
-    data += "</contact>\r\n";
+    if (handler->GetMethod() == SIP_PDU::Method_REGISTER) {
 
-    data += "</tuple>\r\n";
-    data += "</presence>\r\n";
+      PString data;
+      std::string to = handler->GetAddressOfRecord ().AsString ().Mid (4);
+      data += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n";
+
+      data += "<presence xmlns=\"urn:ietf:params:xml:ns:pidf\" entity=\"pres:";
+      data += to;
+      data += "\">\r\n";
+
+      data += "<tuple id=\"sip:";
+      data += to;
+      data += "_on_";
+      data += hostname;
+      data += "\">\r\n";
+
+      data += "<note>";
+      data += presence.c_str ();
+      if (!status.empty ()) {
+        data += " - ";
+        data += status.c_str ();
+      }
+      data += "</note>\r\n";
 
-    Publish (to, data, 500); // TODO: allow to change the 500
+      data += "<status>\r\n";
+      data += "<basic>";
+      data += "open";
+      data += "</basic>\r\n";
+      data += "</status>\r\n";
+
+      data += "<contact priority=\"1\">";
+      data += to; 
+      data += "</contact>\r\n";
+
+      data += "</tuple>\r\n";
+      data += "</presence>\r\n";
+
+      publishing[to]=data;
+    }
   }
+
+  for (std::map<std::string, PString>::const_iterator iter = publishing.begin ();
+       iter != publishing.end ();
+       ++iter)
+    Publish (iter->first, iter->second, 500); // TODO: allow to change the 500
 }
 
 
@@ -574,9 +560,9 @@
 			       const std::string auth_username,
 			       const std::string password,
 			       bool is_enabled,
+			       bool is_limited,
 			       unsigned timeout)
 {
-  PWaitAndSignal mut(listsMutex);
   PString _aor;
   std::stringstream aor;
   std::string host(host_);
@@ -591,21 +577,15 @@
 
   SIPRegister::Params params;
   params.m_addressOfRecord = aor.str ();
-  params.m_registrarAddress = host;
+  params.m_registrarAddress = host_;
+  if (is_limited)
+    params.m_compatibility = SIPRegister::e_CannotRegisterMultipleContacts;
   params.m_authID = auth_username;
   params.m_password = password;
   params.m_expire = is_enabled ? timeout : 0;
   params.m_minRetryTime = 0;
   params.m_maxRetryTime = 0;
 
-  // Update the list of active domains
-  std::string domain = Opal::Sip::EndPoint::get_aor_domain (aor.str ());
-  bool found = (std::find (active_domains.begin (), active_domains.end (), domain) != active_domains.end ());
-  if (is_enabled && !found)
-    active_domains.push_back (domain);
-  else if (!is_enabled && found)
-    active_domains.remove (domain);
-
   // Register the given aor to the give registrar
   if (!SIPEndPoint::Register (params, _aor))
     OnRegistrationFailed (aor.str (), SIP_PDU::MaxStatusCode, is_enabled);
@@ -616,11 +596,7 @@
 Opal::Sip::EndPoint::OnRegistered (const PString & _aor,
 				   bool was_registering)
 {
-  PWaitAndSignal mut(listsMutex);
   std::string aor = (const char *) _aor;
-  std::string::size_type found;
-  std::string::size_type loc = aor.find ("@", 0);
-  std::string server;
   std::stringstream strm;
 
   if (aor.find (uri_prefix) == std::string::npos)
@@ -628,66 +604,12 @@
   else
     strm << aor;
 
-  std::list<std::string>::iterator it = find (aors.begin (), aors.end (), aor);
-
-  if (was_registering) {
-
-    if (it == aors.end ())
-      aors.push_back (strm.str ());
-  }
-  else {
-
-    if (it != aors.end ())
-      aors.remove (strm.str ());
-  }
-
-  if (loc != string::npos) {
-
-    server = get_aor_domain (aor);
-    if (server.empty ())
-      return;
-
-    if (was_registering) {
-      for (std::list<std::string>::const_iterator iter = to_subscribe_uris.begin ();
-           iter != to_subscribe_uris.end () ; ) {
-
-        found = (*iter).find (server, 0);
-        if (found != string::npos) {
-
-          Subscribe (SIPSubscribe::Presence, 300, PString ((*iter).c_str ()));
-          Subscribe (SIPSubscribe::Dialog, 300, PString ((*iter).c_str ()));
-          subscribed_uris.push_back (*iter);
-          to_subscribe_uris.remove (*iter++);
-        }
-        else
-          ++iter;
-      }
-    }
-    else {
-      for (std::list<std::string>::const_iterator iter = subscribed_uris.begin ();
-           iter != subscribed_uris.end () ; ) {
-
-        found = (*iter).find (server, 0);
-        if (found != string::npos) {
-
-          Unsubscribe (SIPSubscribe::Presence, PString ((*iter).c_str ()));
-          Unsubscribe (SIPSubscribe::Dialog, PString ((*iter).c_str ()));
-          to_subscribe_uris.push_back (*iter);
-          subscribed_uris.remove (*iter++);
-        }
-        else
-          iter++;
-      }
-    }
-  }
-
   /* Subscribe for MWI */
   if (!IsSubscribed (SIPSubscribe::MessageSummary, aor))
     Subscribe (SIPSubscribe::MessageSummary, 3600, aor);
 
   /* Signal */
-  Ekiga::Runtime::run_in_main (sigc::bind (sigc::mem_fun (this,
-							  &Opal::Sip::EndPoint::registration_event_in_main),
+  Ekiga::Runtime::run_in_main (sigc::bind (sigc::mem_fun (this, &Opal::Sip::EndPoint::registration_event_in_main),
 					   strm.str (),
 					   was_registering ? Ekiga::Account::Registered : Ekiga::Account::Unregistered,
 					   std::string ()));
@@ -1034,43 +956,16 @@
 
 
 SIPURL
-Opal::Sip::EndPoint::GetRegisteredPartyName (const SIPURL & host,
+Opal::Sip::EndPoint::GetRegisteredPartyName (const SIPURL & aor,
 					     const OpalTransport & transport)
 {
-  PString local_address;
-  PIPSocket::Address address;
-  WORD port;
-  PString url;
-  SIPURL registration_address;
-
-  /* If we are registered to an account corresponding to host, use it.
-   */
-  PSafePtr<SIPHandler> info = activeSIPHandlers.FindSIPHandlerByDomain(host.GetHostName (), SIP_PDU::Method_REGISTER, PSafeReadOnly);
-  if (info != NULL) {
+  PWaitAndSignal m(aorMutex);
+  std::string local_aor = accounts[(const char*) aor.GetHostName ()];
 
-    return SIPURL ("\"" + GetDefaultDisplayName () + "\" <" + info->GetAddressOfRecord ().AsString () + ">");
-  }
-  else {
+  if (!local_aor.empty ())
+    return local_aor.c_str ();
 
-    /* If we are not registered to host,
-     * then use the default account as outgoing identity.
-     * If we are exchanging messages with a peer on our network,
-     * then do not use the default account as outgoing identity.
-     */
-    if (host.GetHostAddress ().GetIpAndPort (address, port) && !manager.IsLocalAddress (address)) {
-
-      /* FIXME: this is the only place where we use the bank in a thread
-       * can't we just return GetDefaultDisplayName () ?
-       */
-      AccountPtr account = bank->find_account ("Ekiga.net");
-
-      if (account)
-        return SIPURL ("\"" + GetDefaultDisplayName () + "\" <" + PString(account->get_aor ()) + ">");
-    }
-  }
-
-  /* As a last resort, ie not registered to host, no default account or
-   * dialog with a local peer, then use the local address
+  /* As a last resort, use the local address
    */
   return GetDefaultRegisteredPartyName (transport);
 }
@@ -1088,12 +983,15 @@
   std::string presence = "unknown";
   std::string status;
 
-  if (!basic.IsEmpty () && !note.IsEmpty ()) {
+  if (!basic.IsEmpty ()) {
 
     if (b.Find ("Open") != P_MAX_INDEX)
       presence = "online";
     else
       presence = "offline";
+  }
+
+  if (!note.IsEmpty ()) {
 
     if (s.Find ("Away") != P_MAX_INDEX)
       presence = "away";
@@ -1199,6 +1097,26 @@
       connection->TransferConnection (uri);
 }
 
+
+void
+Opal::Sip::EndPoint::on_bank_updated (Ekiga::AccountPtr /*account*/)
+{
+  bank->visit_accounts (sigc::mem_fun (this, &Opal::Sip::EndPoint::visit_accounts));
+}
+
+
+bool
+Opal::Sip::EndPoint::visit_accounts (Ekiga::AccountPtr account_)
+{
+  Opal::AccountPtr account = account_;
+
+  PWaitAndSignal m(aorMutex);
+  accounts[account->get_host ()] = account->get_aor ();
+
+  return true;
+}
+
+
 void
 Opal::Sip::EndPoint::registration_event_in_main (const std::string aor,
 						 Ekiga::Account::RegistrationState state,
@@ -1206,10 +1124,8 @@
 {
   AccountPtr account = bank->find_account (aor);
 
-  if (account) {
-
+  if (account) 
     account->registration_event.emit (state, msg);
-  }
 }
 
 
diff -Nru ekiga-3.2.5/lib/engine/components/opal/sip-endpoint.h ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/sip-endpoint.h
--- ekiga-3.2.5/lib/engine/components/opal/sip-endpoint.h	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/opal/sip-endpoint.h	2009-09-22 15:27:35.000000000 +0100
@@ -153,6 +153,7 @@
 		     const std::string auth_username,
 		     const std::string password,
 		     bool is_enabled,
+		     bool is_limited,
 		     unsigned timeout);
 
       void OnRegistered (const PString & aor,
@@ -193,6 +194,10 @@
 		       std::string name);
       void on_transfer (std::string uri);
 
+      void on_bank_updated (Ekiga::AccountPtr account);
+
+      bool visit_accounts (Ekiga::AccountPtr account);
+
       void registration_event_in_main (const std::string aor,
 				       Ekiga::Account::RegistrationState state,
 				       const std::string msg);
@@ -215,12 +220,11 @@
       PMutex msgDataMutex;
       msgDict msgData;
 
+      PMutex aorMutex;
+      std::map<std::string, std::string> accounts;
+
       CallManager & manager;
 
-      PMutex listsMutex;
-      std::list<std::string> to_subscribe_uris;  // List of uris to subscribe
-      std::list<std::string> subscribed_uris;    // List of subscribed uris
-      std::list<std::string> aors;               // List of registered aor
       Ekiga::ServiceCore & core;
       Opal::Bank* bank;
 
@@ -235,7 +239,6 @@
 
       gmref_ptr<SIP::Dialect> dialect;
 
-      domain_list active_domains;   // List of active domains
       uri_info_map presence_infos;  // List of uri presences
       uri_info_map dialog_infos;    // List of uri dialog informations
     };
diff -Nru ekiga-3.2.5/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
--- ekiga-3.2.5/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -77,12 +77,9 @@
 
       for (PINDEX j = 0; devices_array[j] != NULL; j++) {
 
-#ifdef WIN32
-        device.name = devices_array[j];
-#else
-        // linux USB subsystem uses latin-1 encoding, while ekiga uses utf-8
+        /* linux USB subsystem uses latin-1 encoding, Windows codepage,
+           while ekiga uses utf-8 */
         device.name = latin2utf (devices_array[j]);
-#endif
         devices.push_back(device);
       }
       free (devices_array);
@@ -113,11 +110,7 @@
   current_state.bits_per_sample = bits_per_sample;
 
   input_device = PSoundChannel::CreateOpenedChannel (current_state.device.source,
-#ifdef WIN32
-                                                     current_state.device.name,
-#else
-                                                     utf2latin (current_state.device.name),  // reencode back to latin-1
-#endif
+                                                     utf2latin (current_state.device.name),  // reencode back to latin-1 or codepage
                                                      PSoundChannel::Recorder,
                                                      channels,
                                                      samplerate,
@@ -183,12 +176,11 @@
       bytes_read = input_device->GetLastReadCount();
     }
     if (bytes_read != size) {
-      PTRACE(1, "GMAudioInputManager_ptlib\tEncountered error while trying to read data");
-      Ekiga::Runtime::run_in_main (sigc::bind (sigc::mem_fun (this, &GMAudioInputManager_ptlib::device_error_in_main), current_state.device, Ekiga::AI_ERROR_READ));
+      PTRACE(1, "GMAudioInputManager_ptlib\tRead " << bytes_read << " instead of " << size);
     }
   }
 
-  return (ret || bytes_read == size);
+  return (ret);
 }
 
 void GMAudioInputManager_ptlib::set_volume (unsigned volume)
diff -Nru ekiga-3.2.5/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
--- ekiga-3.2.5/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -77,12 +77,9 @@
 
       for (PINDEX j = 0; devices_array[j] != NULL; j++) {
 
-#ifdef WIN32
-        device.name = devices_array[j];
-#else
-        // linux USB subsystem uses latin-1 encoding, while ekiga uses utf-8
+        /* linux USB subsystem uses latin-1 encoding, Windows codepage,
+           while ekiga uses utf-8 */
         device.name = latin2utf (devices_array[j]);
-#endif
         devices.push_back(device);
       }
       free (devices_array);
@@ -113,11 +110,7 @@
   current_state[ps].bits_per_sample = bits_per_sample;
 
   output_device[ps] = PSoundChannel::CreateOpenedChannel (current_state[ps].device.source,
-#ifdef WIN32
-                                                          current_state[ps].device.name,
-#else
-                                                          utf2latin (current_state[ps].device.name),  // reencode back to latin-1
-#endif
+                                                          utf2latin (current_state[ps].device.name),  // reencode back to latin-1 or codepage
                                                           PSoundChannel::Player,
                                                           channels,
                                                           samplerate,
diff -Nru ekiga-3.2.5/lib/engine/components/ptlib/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/Makefile.in
--- ekiga-3.2.5/lib/engine/components/ptlib/Makefile.in	2009-07-06 20:10:39.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/Makefile.in	2009-09-22 15:36:27.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmptlib_la_LIBADD =
 am_libgmptlib_la_OBJECTS = utils.lo audioinput-manager-ptlib.lo \
@@ -55,6 +58,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -187,6 +191,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -316,9 +321,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/ptlib/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/ptlib/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/ptlib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/ptlib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -336,6 +341,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -364,73 +370,73 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 utils.lo: $(ptlib_dir)/utils.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utils.lo -MD -MP -MF $(DEPDIR)/utils.Tpo -c -o utils.lo `test -f '$(ptlib_dir)/utils.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/utils.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/utils.Tpo $(DEPDIR)/utils.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utils.lo -MD -MP -MF $(DEPDIR)/utils.Tpo -c -o utils.lo `test -f '$(ptlib_dir)/utils.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/utils.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/utils.Tpo $(DEPDIR)/utils.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ptlib_dir)/utils.cpp' object='utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utils.lo `test -f '$(ptlib_dir)/utils.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/utils.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utils.lo `test -f '$(ptlib_dir)/utils.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/utils.cpp
 
 audioinput-manager-ptlib.lo: $(ptlib_dir)/audioinput-manager-ptlib.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-manager-ptlib.lo -MD -MP -MF $(DEPDIR)/audioinput-manager-ptlib.Tpo -c -o audioinput-manager-ptlib.lo `test -f '$(ptlib_dir)/audioinput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audioinput-manager-ptlib.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audioinput-manager-ptlib.Tpo $(DEPDIR)/audioinput-manager-ptlib.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-manager-ptlib.lo -MD -MP -MF $(DEPDIR)/audioinput-manager-ptlib.Tpo -c -o audioinput-manager-ptlib.lo `test -f '$(ptlib_dir)/audioinput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audioinput-manager-ptlib.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audioinput-manager-ptlib.Tpo $(DEPDIR)/audioinput-manager-ptlib.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ptlib_dir)/audioinput-manager-ptlib.cpp' object='audioinput-manager-ptlib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-manager-ptlib.lo `test -f '$(ptlib_dir)/audioinput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audioinput-manager-ptlib.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-manager-ptlib.lo `test -f '$(ptlib_dir)/audioinput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audioinput-manager-ptlib.cpp
 
 audioinput-main-ptlib.lo: $(ptlib_dir)/audioinput-main-ptlib.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-main-ptlib.lo -MD -MP -MF $(DEPDIR)/audioinput-main-ptlib.Tpo -c -o audioinput-main-ptlib.lo `test -f '$(ptlib_dir)/audioinput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audioinput-main-ptlib.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audioinput-main-ptlib.Tpo $(DEPDIR)/audioinput-main-ptlib.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audioinput-main-ptlib.lo -MD -MP -MF $(DEPDIR)/audioinput-main-ptlib.Tpo -c -o audioinput-main-ptlib.lo `test -f '$(ptlib_dir)/audioinput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audioinput-main-ptlib.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audioinput-main-ptlib.Tpo $(DEPDIR)/audioinput-main-ptlib.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ptlib_dir)/audioinput-main-ptlib.cpp' object='audioinput-main-ptlib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-main-ptlib.lo `test -f '$(ptlib_dir)/audioinput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audioinput-main-ptlib.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audioinput-main-ptlib.lo `test -f '$(ptlib_dir)/audioinput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audioinput-main-ptlib.cpp
 
 videoinput-manager-ptlib.lo: $(ptlib_dir)/videoinput-manager-ptlib.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-manager-ptlib.lo -MD -MP -MF $(DEPDIR)/videoinput-manager-ptlib.Tpo -c -o videoinput-manager-ptlib.lo `test -f '$(ptlib_dir)/videoinput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/videoinput-manager-ptlib.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videoinput-manager-ptlib.Tpo $(DEPDIR)/videoinput-manager-ptlib.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-manager-ptlib.lo -MD -MP -MF $(DEPDIR)/videoinput-manager-ptlib.Tpo -c -o videoinput-manager-ptlib.lo `test -f '$(ptlib_dir)/videoinput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/videoinput-manager-ptlib.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videoinput-manager-ptlib.Tpo $(DEPDIR)/videoinput-manager-ptlib.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ptlib_dir)/videoinput-manager-ptlib.cpp' object='videoinput-manager-ptlib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-manager-ptlib.lo `test -f '$(ptlib_dir)/videoinput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/videoinput-manager-ptlib.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-manager-ptlib.lo `test -f '$(ptlib_dir)/videoinput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/videoinput-manager-ptlib.cpp
 
 videoinput-main-ptlib.lo: $(ptlib_dir)/videoinput-main-ptlib.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-main-ptlib.lo -MD -MP -MF $(DEPDIR)/videoinput-main-ptlib.Tpo -c -o videoinput-main-ptlib.lo `test -f '$(ptlib_dir)/videoinput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/videoinput-main-ptlib.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videoinput-main-ptlib.Tpo $(DEPDIR)/videoinput-main-ptlib.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-main-ptlib.lo -MD -MP -MF $(DEPDIR)/videoinput-main-ptlib.Tpo -c -o videoinput-main-ptlib.lo `test -f '$(ptlib_dir)/videoinput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/videoinput-main-ptlib.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videoinput-main-ptlib.Tpo $(DEPDIR)/videoinput-main-ptlib.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ptlib_dir)/videoinput-main-ptlib.cpp' object='videoinput-main-ptlib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-main-ptlib.lo `test -f '$(ptlib_dir)/videoinput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/videoinput-main-ptlib.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-main-ptlib.lo `test -f '$(ptlib_dir)/videoinput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/videoinput-main-ptlib.cpp
 
 audiooutput-manager-ptlib.lo: $(ptlib_dir)/audiooutput-manager-ptlib.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-manager-ptlib.lo -MD -MP -MF $(DEPDIR)/audiooutput-manager-ptlib.Tpo -c -o audiooutput-manager-ptlib.lo `test -f '$(ptlib_dir)/audiooutput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audiooutput-manager-ptlib.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audiooutput-manager-ptlib.Tpo $(DEPDIR)/audiooutput-manager-ptlib.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-manager-ptlib.lo -MD -MP -MF $(DEPDIR)/audiooutput-manager-ptlib.Tpo -c -o audiooutput-manager-ptlib.lo `test -f '$(ptlib_dir)/audiooutput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audiooutput-manager-ptlib.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audiooutput-manager-ptlib.Tpo $(DEPDIR)/audiooutput-manager-ptlib.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ptlib_dir)/audiooutput-manager-ptlib.cpp' object='audiooutput-manager-ptlib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-manager-ptlib.lo `test -f '$(ptlib_dir)/audiooutput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audiooutput-manager-ptlib.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-manager-ptlib.lo `test -f '$(ptlib_dir)/audiooutput-manager-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audiooutput-manager-ptlib.cpp
 
 audiooutput-main-ptlib.lo: $(ptlib_dir)/audiooutput-main-ptlib.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-main-ptlib.lo -MD -MP -MF $(DEPDIR)/audiooutput-main-ptlib.Tpo -c -o audiooutput-main-ptlib.lo `test -f '$(ptlib_dir)/audiooutput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audiooutput-main-ptlib.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/audiooutput-main-ptlib.Tpo $(DEPDIR)/audiooutput-main-ptlib.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audiooutput-main-ptlib.lo -MD -MP -MF $(DEPDIR)/audiooutput-main-ptlib.Tpo -c -o audiooutput-main-ptlib.lo `test -f '$(ptlib_dir)/audiooutput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audiooutput-main-ptlib.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/audiooutput-main-ptlib.Tpo $(DEPDIR)/audiooutput-main-ptlib.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ptlib_dir)/audiooutput-main-ptlib.cpp' object='audiooutput-main-ptlib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-main-ptlib.lo `test -f '$(ptlib_dir)/audiooutput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audiooutput-main-ptlib.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audiooutput-main-ptlib.lo `test -f '$(ptlib_dir)/audiooutput-main-ptlib.cpp' || echo '$(srcdir)/'`$(ptlib_dir)/audiooutput-main-ptlib.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -450,7 +456,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -458,29 +464,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -501,13 +512,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -535,6 +550,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -556,6 +572,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -564,18 +582,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -613,6 +641,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/ptlib/utils.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/utils.cpp
--- ekiga-3.2.5/lib/engine/components/ptlib/utils.cpp	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/utils.cpp	2009-07-27 14:50:42.000000000 +0100
@@ -44,9 +44,17 @@
   gchar *utf8_str;
   std::string result;
 
+#ifdef WIN32
+  utf8_str = g_locale_to_utf8 (str.c_str (), -1,
+                               NULL, NULL, NULL);
+#else
   utf8_str = g_convert (str.c_str (), -1,
                         "UTF-8", "ISO-8859-1",
                         NULL, NULL, NULL);
+#endif
+  g_warn_if_fail (utf8_str != NULL);
+  if (utf8_str == NULL)  /* conversion error */
+    return "";
   result = std::string (utf8_str);
   g_free (utf8_str);
   return result;
@@ -60,9 +68,17 @@
   std::string result;
 
   g_warn_if_fail (g_utf8_validate (str.c_str (), -1, NULL));
+#ifdef WIN32
+  latin_str = g_locale_from_utf8 (str.c_str (), -1,
+                                  NULL, NULL, NULL);
+#else
   latin_str = g_convert (str.c_str (), -1,
                          "ISO-8859-1", "UTF-8",
                          NULL, NULL, NULL);
+#endif
+  g_warn_if_fail (latin_str != NULL);
+  if (latin_str == NULL)  /* conversion error */
+    return "";
   result = std::string (latin_str);
   g_free (latin_str);
   return result;
diff -Nru ekiga-3.2.5/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
--- ekiga-3.2.5/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -79,12 +79,9 @@
 
       for (PINDEX j = 0; devices_array[j] != NULL; j++) {
 
-#ifdef WIN32
-        device.name = devices_array[j];
-#else
-        // linux USB subsystem uses latin-1 encoding, while ekiga uses utf-8
+        /* linux USB subsystem uses latin-1 encoding, Windows codepage,
+           while ekiga uses utf-8 */
         device.name = latin2utf (devices_array[j]);
-#endif
         devices.push_back(device);
       }
       free (devices_array);
@@ -120,11 +117,7 @@
   expectedFrameSize = (width * height * 3) >> 1;
 
   pvideo_format = (PVideoDevice::VideoFormat)current_state.format;
-#ifdef WIN32
-  input_device = PVideoInputDevice::CreateOpenedDevice (current_state.device.source, current_state.device.name, FALSE);
-#else
-  input_device = PVideoInputDevice::CreateOpenedDevice (current_state.device.source, utf2latin (current_state.device.name), FALSE);  // reencode back to latin-1
-#endif
+  input_device = PVideoInputDevice::CreateOpenedDevice (current_state.device.source, utf2latin (current_state.device.name), FALSE);  // reencode back to latin-1 or codepage
 
   Ekiga::VideoInputErrorCodes error_code = Ekiga::VI_ERROR_NONE;
   if (!input_device)
diff -Nru ekiga-3.2.5/lib/engine/components/resource-list/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/resource-list/Makefile.in
--- ekiga-3.2.5/lib/engine/components/resource-list/Makefile.in	2009-07-06 20:10:39.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/resource-list/Makefile.in	2009-09-22 15:36:27.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmresource_list_la_LIBADD =
 am_libgmresource_list_la_OBJECTS = resource-list-main.lo \
@@ -54,6 +57,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -186,6 +190,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -312,9 +317,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/resource-list/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/resource-list/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/resource-list/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/resource-list/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -332,6 +337,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -360,73 +366,73 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 resource-list-main.lo: $(resource_list_dir)/resource-list-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource-list-main.lo -MD -MP -MF $(DEPDIR)/resource-list-main.Tpo -c -o resource-list-main.lo `test -f '$(resource_list_dir)/resource-list-main.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/resource-list-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/resource-list-main.Tpo $(DEPDIR)/resource-list-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource-list-main.lo -MD -MP -MF $(DEPDIR)/resource-list-main.Tpo -c -o resource-list-main.lo `test -f '$(resource_list_dir)/resource-list-main.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/resource-list-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/resource-list-main.Tpo $(DEPDIR)/resource-list-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(resource_list_dir)/resource-list-main.cpp' object='resource-list-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource-list-main.lo `test -f '$(resource_list_dir)/resource-list-main.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/resource-list-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource-list-main.lo `test -f '$(resource_list_dir)/resource-list-main.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/resource-list-main.cpp
 
 rl-presentity.lo: $(resource_list_dir)/rl-presentity.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-presentity.lo -MD -MP -MF $(DEPDIR)/rl-presentity.Tpo -c -o rl-presentity.lo `test -f '$(resource_list_dir)/rl-presentity.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-presentity.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/rl-presentity.Tpo $(DEPDIR)/rl-presentity.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-presentity.lo -MD -MP -MF $(DEPDIR)/rl-presentity.Tpo -c -o rl-presentity.lo `test -f '$(resource_list_dir)/rl-presentity.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-presentity.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rl-presentity.Tpo $(DEPDIR)/rl-presentity.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(resource_list_dir)/rl-presentity.cpp' object='rl-presentity.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-presentity.lo `test -f '$(resource_list_dir)/rl-presentity.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-presentity.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-presentity.lo `test -f '$(resource_list_dir)/rl-presentity.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-presentity.cpp
 
 rl-entry.lo: $(resource_list_dir)/rl-entry.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-entry.lo -MD -MP -MF $(DEPDIR)/rl-entry.Tpo -c -o rl-entry.lo `test -f '$(resource_list_dir)/rl-entry.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-entry.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/rl-entry.Tpo $(DEPDIR)/rl-entry.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-entry.lo -MD -MP -MF $(DEPDIR)/rl-entry.Tpo -c -o rl-entry.lo `test -f '$(resource_list_dir)/rl-entry.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-entry.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rl-entry.Tpo $(DEPDIR)/rl-entry.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(resource_list_dir)/rl-entry.cpp' object='rl-entry.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-entry.lo `test -f '$(resource_list_dir)/rl-entry.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-entry.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-entry.lo `test -f '$(resource_list_dir)/rl-entry.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-entry.cpp
 
 rl-entry-ref.lo: $(resource_list_dir)/rl-entry-ref.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-entry-ref.lo -MD -MP -MF $(DEPDIR)/rl-entry-ref.Tpo -c -o rl-entry-ref.lo `test -f '$(resource_list_dir)/rl-entry-ref.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-entry-ref.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/rl-entry-ref.Tpo $(DEPDIR)/rl-entry-ref.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-entry-ref.lo -MD -MP -MF $(DEPDIR)/rl-entry-ref.Tpo -c -o rl-entry-ref.lo `test -f '$(resource_list_dir)/rl-entry-ref.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-entry-ref.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rl-entry-ref.Tpo $(DEPDIR)/rl-entry-ref.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(resource_list_dir)/rl-entry-ref.cpp' object='rl-entry-ref.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-entry-ref.lo `test -f '$(resource_list_dir)/rl-entry-ref.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-entry-ref.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-entry-ref.lo `test -f '$(resource_list_dir)/rl-entry-ref.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-entry-ref.cpp
 
 rl-list.lo: $(resource_list_dir)/rl-list.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-list.lo -MD -MP -MF $(DEPDIR)/rl-list.Tpo -c -o rl-list.lo `test -f '$(resource_list_dir)/rl-list.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-list.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/rl-list.Tpo $(DEPDIR)/rl-list.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-list.lo -MD -MP -MF $(DEPDIR)/rl-list.Tpo -c -o rl-list.lo `test -f '$(resource_list_dir)/rl-list.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-list.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rl-list.Tpo $(DEPDIR)/rl-list.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(resource_list_dir)/rl-list.cpp' object='rl-list.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-list.lo `test -f '$(resource_list_dir)/rl-list.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-list.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-list.lo `test -f '$(resource_list_dir)/rl-list.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-list.cpp
 
 rl-heap.lo: $(resource_list_dir)/rl-heap.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-heap.lo -MD -MP -MF $(DEPDIR)/rl-heap.Tpo -c -o rl-heap.lo `test -f '$(resource_list_dir)/rl-heap.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-heap.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/rl-heap.Tpo $(DEPDIR)/rl-heap.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-heap.lo -MD -MP -MF $(DEPDIR)/rl-heap.Tpo -c -o rl-heap.lo `test -f '$(resource_list_dir)/rl-heap.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-heap.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rl-heap.Tpo $(DEPDIR)/rl-heap.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(resource_list_dir)/rl-heap.cpp' object='rl-heap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-heap.lo `test -f '$(resource_list_dir)/rl-heap.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-heap.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-heap.lo `test -f '$(resource_list_dir)/rl-heap.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-heap.cpp
 
 rl-cluster.lo: $(resource_list_dir)/rl-cluster.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-cluster.lo -MD -MP -MF $(DEPDIR)/rl-cluster.Tpo -c -o rl-cluster.lo `test -f '$(resource_list_dir)/rl-cluster.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-cluster.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/rl-cluster.Tpo $(DEPDIR)/rl-cluster.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rl-cluster.lo -MD -MP -MF $(DEPDIR)/rl-cluster.Tpo -c -o rl-cluster.lo `test -f '$(resource_list_dir)/rl-cluster.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-cluster.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rl-cluster.Tpo $(DEPDIR)/rl-cluster.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(resource_list_dir)/rl-cluster.cpp' object='rl-cluster.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-cluster.lo `test -f '$(resource_list_dir)/rl-cluster.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-cluster.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rl-cluster.lo `test -f '$(resource_list_dir)/rl-cluster.cpp' || echo '$(srcdir)/'`$(resource_list_dir)/rl-cluster.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -446,7 +452,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -454,29 +460,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -497,13 +508,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -531,6 +546,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -552,6 +568,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -560,18 +578,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -609,6 +637,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/xcap/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/xcap/Makefile.in
--- ekiga-3.2.5/lib/engine/components/xcap/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/xcap/Makefile.in	2009-09-22 15:36:27.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmxcap_la_LIBADD =
 am_libgmxcap_la_OBJECTS = xcap-path.lo xcap-core.lo xcap-main.lo
@@ -52,6 +55,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -184,6 +188,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -298,9 +303,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/xcap/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/xcap/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/xcap/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/xcap/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -318,6 +323,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -342,45 +348,45 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 xcap-path.lo: $(xcap_dir)/xcap-path.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xcap-path.lo -MD -MP -MF $(DEPDIR)/xcap-path.Tpo -c -o xcap-path.lo `test -f '$(xcap_dir)/xcap-path.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-path.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xcap-path.Tpo $(DEPDIR)/xcap-path.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xcap-path.lo -MD -MP -MF $(DEPDIR)/xcap-path.Tpo -c -o xcap-path.lo `test -f '$(xcap_dir)/xcap-path.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-path.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xcap-path.Tpo $(DEPDIR)/xcap-path.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(xcap_dir)/xcap-path.cpp' object='xcap-path.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xcap-path.lo `test -f '$(xcap_dir)/xcap-path.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-path.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xcap-path.lo `test -f '$(xcap_dir)/xcap-path.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-path.cpp
 
 xcap-core.lo: $(xcap_dir)/xcap-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xcap-core.lo -MD -MP -MF $(DEPDIR)/xcap-core.Tpo -c -o xcap-core.lo `test -f '$(xcap_dir)/xcap-core.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xcap-core.Tpo $(DEPDIR)/xcap-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xcap-core.lo -MD -MP -MF $(DEPDIR)/xcap-core.Tpo -c -o xcap-core.lo `test -f '$(xcap_dir)/xcap-core.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xcap-core.Tpo $(DEPDIR)/xcap-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(xcap_dir)/xcap-core.cpp' object='xcap-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xcap-core.lo `test -f '$(xcap_dir)/xcap-core.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xcap-core.lo `test -f '$(xcap_dir)/xcap-core.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-core.cpp
 
 xcap-main.lo: $(xcap_dir)/xcap-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xcap-main.lo -MD -MP -MF $(DEPDIR)/xcap-main.Tpo -c -o xcap-main.lo `test -f '$(xcap_dir)/xcap-main.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xcap-main.Tpo $(DEPDIR)/xcap-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xcap-main.lo -MD -MP -MF $(DEPDIR)/xcap-main.Tpo -c -o xcap-main.lo `test -f '$(xcap_dir)/xcap-main.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xcap-main.Tpo $(DEPDIR)/xcap-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(xcap_dir)/xcap-main.cpp' object='xcap-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xcap-main.lo `test -f '$(xcap_dir)/xcap-main.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xcap-main.lo `test -f '$(xcap_dir)/xcap-main.cpp' || echo '$(srcdir)/'`$(xcap_dir)/xcap-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -400,7 +406,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -408,29 +414,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -451,13 +462,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -485,6 +500,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -506,6 +522,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -514,18 +532,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -563,6 +591,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/components/xcap/xcap-core.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/components/xcap/xcap-core.cpp
--- ekiga-3.2.5/lib/engine/components/xcap/xcap-core.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/xcap/xcap-core.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -233,7 +233,7 @@
 
   /* all of this is freed in the result callback */
   session = soup_session_async_new_with_options ("user-agent", "ekiga", NULL);
-  message = soup_message_new (SOUP_METHOD_GET, path->to_uri ().c_str ());
+  message = soup_message_new ("GET", path->to_uri ().c_str ());
   data = new cb_read_data;
   data->core = this;
   data->path = path;
@@ -262,7 +262,7 @@
 
   /* all of this is freed in the result callback */
   session = soup_session_async_new_with_options ("user-agent", "ekiga", NULL);
-  message = soup_message_new (SOUP_METHOD_PUT, path->to_uri ().c_str ());
+  message = soup_message_new ("PUT", path->to_uri ().c_str ());
   soup_message_set_request (message, content_type.c_str (),
 			    SOUP_MEMORY_COPY,
 			    content.c_str (), content.length ());
@@ -293,7 +293,7 @@
 
   /* all of this is freed in the result callback */
   session = soup_session_async_new_with_options ("user-agent", "ekiga", NULL);
-  message = soup_message_new (SOUP_METHOD_DELETE, path->to_uri ().c_str ());
+  message = soup_message_new ("DELETE", path->to_uri ().c_str ());
   data = new cb_other_data;
   data->core = this;
   data->path = path;
diff -Nru ekiga-3.2.5/lib/engine/components/x-videooutput/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/components/x-videooutput/Makefile.in
--- ekiga-3.2.5/lib/engine/components/x-videooutput/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/components/x-videooutput/Makefile.in	2009-09-22 15:36:27.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmvideooutput_x_la_LIBADD =
 am_libgmvideooutput_x_la_OBJECTS = videooutput-manager-common.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -304,9 +309,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/components/x-videooutput/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/components/x-videooutput/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/components/x-videooutput/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/components/x-videooutput/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -324,6 +329,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -348,45 +354,45 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 videooutput-manager-common.lo: $(common_dir)/videooutput-manager-common.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-manager-common.lo -MD -MP -MF $(DEPDIR)/videooutput-manager-common.Tpo -c -o videooutput-manager-common.lo `test -f '$(common_dir)/videooutput-manager-common.cpp' || echo '$(srcdir)/'`$(common_dir)/videooutput-manager-common.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videooutput-manager-common.Tpo $(DEPDIR)/videooutput-manager-common.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-manager-common.lo -MD -MP -MF $(DEPDIR)/videooutput-manager-common.Tpo -c -o videooutput-manager-common.lo `test -f '$(common_dir)/videooutput-manager-common.cpp' || echo '$(srcdir)/'`$(common_dir)/videooutput-manager-common.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videooutput-manager-common.Tpo $(DEPDIR)/videooutput-manager-common.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(common_dir)/videooutput-manager-common.cpp' object='videooutput-manager-common.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-manager-common.lo `test -f '$(common_dir)/videooutput-manager-common.cpp' || echo '$(srcdir)/'`$(common_dir)/videooutput-manager-common.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-manager-common.lo `test -f '$(common_dir)/videooutput-manager-common.cpp' || echo '$(srcdir)/'`$(common_dir)/videooutput-manager-common.cpp
 
 videooutput-manager-x.lo: $(videooutput_dir)/videooutput-manager-x.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-manager-x.lo -MD -MP -MF $(DEPDIR)/videooutput-manager-x.Tpo -c -o videooutput-manager-x.lo `test -f '$(videooutput_dir)/videooutput-manager-x.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-manager-x.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videooutput-manager-x.Tpo $(DEPDIR)/videooutput-manager-x.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-manager-x.lo -MD -MP -MF $(DEPDIR)/videooutput-manager-x.Tpo -c -o videooutput-manager-x.lo `test -f '$(videooutput_dir)/videooutput-manager-x.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-manager-x.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videooutput-manager-x.Tpo $(DEPDIR)/videooutput-manager-x.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videooutput_dir)/videooutput-manager-x.cpp' object='videooutput-manager-x.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-manager-x.lo `test -f '$(videooutput_dir)/videooutput-manager-x.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-manager-x.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-manager-x.lo `test -f '$(videooutput_dir)/videooutput-manager-x.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-manager-x.cpp
 
 videooutput-main-x.lo: $(videooutput_dir)/videooutput-main-x.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-main-x.lo -MD -MP -MF $(DEPDIR)/videooutput-main-x.Tpo -c -o videooutput-main-x.lo `test -f '$(videooutput_dir)/videooutput-main-x.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-main-x.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videooutput-main-x.Tpo $(DEPDIR)/videooutput-main-x.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-main-x.lo -MD -MP -MF $(DEPDIR)/videooutput-main-x.Tpo -c -o videooutput-main-x.lo `test -f '$(videooutput_dir)/videooutput-main-x.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-main-x.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videooutput-main-x.Tpo $(DEPDIR)/videooutput-main-x.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videooutput_dir)/videooutput-main-x.cpp' object='videooutput-main-x.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-main-x.lo `test -f '$(videooutput_dir)/videooutput-main-x.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-main-x.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-main-x.lo `test -f '$(videooutput_dir)/videooutput-main-x.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-main-x.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -406,7 +412,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -414,29 +420,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -457,13 +468,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -491,6 +506,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -512,6 +528,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -520,18 +538,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -569,6 +597,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/framework/form-builder.cpp ekiga-3.2.6~ppa~karmic1/lib/engine/framework/form-builder.cpp
--- ekiga-3.2.5/lib/engine/framework/form-builder.cpp	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/framework/form-builder.cpp	2009-08-31 14:29:36.000000000 +0100
@@ -148,6 +148,8 @@
        iter++)
     if (iter->name == name)
       return iter->value;
+
+  return ""; // shouldn't happen
 }
 
 bool
diff -Nru ekiga-3.2.5/lib/engine/framework/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/framework/Makefile.in
--- ekiga-3.2.5/lib/engine/framework/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/framework/Makefile.in	2009-09-22 15:36:27.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmframework_la_LIBADD =
 am_libgmframework_la_OBJECTS = form.lo robust-xml.lo gmconf-bridge.lo \
@@ -55,6 +58,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -187,6 +191,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -334,9 +339,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/framework/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/framework/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/framework/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/framework/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -354,6 +359,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -387,108 +393,108 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 form.lo: $(framework_dir)/form.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form.lo -MD -MP -MF $(DEPDIR)/form.Tpo -c -o form.lo `test -f '$(framework_dir)/form.cpp' || echo '$(srcdir)/'`$(framework_dir)/form.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/form.Tpo $(DEPDIR)/form.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form.lo -MD -MP -MF $(DEPDIR)/form.Tpo -c -o form.lo `test -f '$(framework_dir)/form.cpp' || echo '$(srcdir)/'`$(framework_dir)/form.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/form.Tpo $(DEPDIR)/form.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/form.cpp' object='form.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form.lo `test -f '$(framework_dir)/form.cpp' || echo '$(srcdir)/'`$(framework_dir)/form.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form.lo `test -f '$(framework_dir)/form.cpp' || echo '$(srcdir)/'`$(framework_dir)/form.cpp
 
 robust-xml.lo: $(framework_dir)/robust-xml.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT robust-xml.lo -MD -MP -MF $(DEPDIR)/robust-xml.Tpo -c -o robust-xml.lo `test -f '$(framework_dir)/robust-xml.cpp' || echo '$(srcdir)/'`$(framework_dir)/robust-xml.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/robust-xml.Tpo $(DEPDIR)/robust-xml.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT robust-xml.lo -MD -MP -MF $(DEPDIR)/robust-xml.Tpo -c -o robust-xml.lo `test -f '$(framework_dir)/robust-xml.cpp' || echo '$(srcdir)/'`$(framework_dir)/robust-xml.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/robust-xml.Tpo $(DEPDIR)/robust-xml.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/robust-xml.cpp' object='robust-xml.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o robust-xml.lo `test -f '$(framework_dir)/robust-xml.cpp' || echo '$(srcdir)/'`$(framework_dir)/robust-xml.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o robust-xml.lo `test -f '$(framework_dir)/robust-xml.cpp' || echo '$(srcdir)/'`$(framework_dir)/robust-xml.cpp
 
 gmconf-bridge.lo: $(framework_dir)/gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/gmconf-bridge.Tpo -c -o gmconf-bridge.lo `test -f '$(framework_dir)/gmconf-bridge.cpp' || echo '$(srcdir)/'`$(framework_dir)/gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gmconf-bridge.Tpo $(DEPDIR)/gmconf-bridge.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/gmconf-bridge.Tpo -c -o gmconf-bridge.lo `test -f '$(framework_dir)/gmconf-bridge.cpp' || echo '$(srcdir)/'`$(framework_dir)/gmconf-bridge.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gmconf-bridge.Tpo $(DEPDIR)/gmconf-bridge.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/gmconf-bridge.cpp' object='gmconf-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gmconf-bridge.lo `test -f '$(framework_dir)/gmconf-bridge.cpp' || echo '$(srcdir)/'`$(framework_dir)/gmconf-bridge.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gmconf-bridge.lo `test -f '$(framework_dir)/gmconf-bridge.cpp' || echo '$(srcdir)/'`$(framework_dir)/gmconf-bridge.cpp
 
 menu-builder.lo: $(framework_dir)/menu-builder.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu-builder.lo -MD -MP -MF $(DEPDIR)/menu-builder.Tpo -c -o menu-builder.lo `test -f '$(framework_dir)/menu-builder.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-builder.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/menu-builder.Tpo $(DEPDIR)/menu-builder.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu-builder.lo -MD -MP -MF $(DEPDIR)/menu-builder.Tpo -c -o menu-builder.lo `test -f '$(framework_dir)/menu-builder.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-builder.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/menu-builder.Tpo $(DEPDIR)/menu-builder.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/menu-builder.cpp' object='menu-builder.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu-builder.lo `test -f '$(framework_dir)/menu-builder.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-builder.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu-builder.lo `test -f '$(framework_dir)/menu-builder.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-builder.cpp
 
 menu-builder-tools.lo: $(framework_dir)/menu-builder-tools.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu-builder-tools.lo -MD -MP -MF $(DEPDIR)/menu-builder-tools.Tpo -c -o menu-builder-tools.lo `test -f '$(framework_dir)/menu-builder-tools.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-builder-tools.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/menu-builder-tools.Tpo $(DEPDIR)/menu-builder-tools.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu-builder-tools.lo -MD -MP -MF $(DEPDIR)/menu-builder-tools.Tpo -c -o menu-builder-tools.lo `test -f '$(framework_dir)/menu-builder-tools.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-builder-tools.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/menu-builder-tools.Tpo $(DEPDIR)/menu-builder-tools.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/menu-builder-tools.cpp' object='menu-builder-tools.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu-builder-tools.lo `test -f '$(framework_dir)/menu-builder-tools.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-builder-tools.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu-builder-tools.lo `test -f '$(framework_dir)/menu-builder-tools.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-builder-tools.cpp
 
 form-builder.lo: $(framework_dir)/form-builder.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form-builder.lo -MD -MP -MF $(DEPDIR)/form-builder.Tpo -c -o form-builder.lo `test -f '$(framework_dir)/form-builder.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-builder.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/form-builder.Tpo $(DEPDIR)/form-builder.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form-builder.lo -MD -MP -MF $(DEPDIR)/form-builder.Tpo -c -o form-builder.lo `test -f '$(framework_dir)/form-builder.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-builder.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/form-builder.Tpo $(DEPDIR)/form-builder.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/form-builder.cpp' object='form-builder.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form-builder.lo `test -f '$(framework_dir)/form-builder.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-builder.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form-builder.lo `test -f '$(framework_dir)/form-builder.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-builder.cpp
 
 form-dumper.lo: $(framework_dir)/form-dumper.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form-dumper.lo -MD -MP -MF $(DEPDIR)/form-dumper.Tpo -c -o form-dumper.lo `test -f '$(framework_dir)/form-dumper.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-dumper.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/form-dumper.Tpo $(DEPDIR)/form-dumper.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form-dumper.lo -MD -MP -MF $(DEPDIR)/form-dumper.Tpo -c -o form-dumper.lo `test -f '$(framework_dir)/form-dumper.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-dumper.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/form-dumper.Tpo $(DEPDIR)/form-dumper.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/form-dumper.cpp' object='form-dumper.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form-dumper.lo `test -f '$(framework_dir)/form-dumper.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-dumper.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form-dumper.lo `test -f '$(framework_dir)/form-dumper.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-dumper.cpp
 
 form-request-simple.lo: $(framework_dir)/form-request-simple.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form-request-simple.lo -MD -MP -MF $(DEPDIR)/form-request-simple.Tpo -c -o form-request-simple.lo `test -f '$(framework_dir)/form-request-simple.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-request-simple.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/form-request-simple.Tpo $(DEPDIR)/form-request-simple.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form-request-simple.lo -MD -MP -MF $(DEPDIR)/form-request-simple.Tpo -c -o form-request-simple.lo `test -f '$(framework_dir)/form-request-simple.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-request-simple.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/form-request-simple.Tpo $(DEPDIR)/form-request-simple.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/form-request-simple.cpp' object='form-request-simple.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form-request-simple.lo `test -f '$(framework_dir)/form-request-simple.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-request-simple.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form-request-simple.lo `test -f '$(framework_dir)/form-request-simple.cpp' || echo '$(srcdir)/'`$(framework_dir)/form-request-simple.cpp
 
 runtime-glib.lo: $(framework_dir)/runtime-glib.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT runtime-glib.lo -MD -MP -MF $(DEPDIR)/runtime-glib.Tpo -c -o runtime-glib.lo `test -f '$(framework_dir)/runtime-glib.cpp' || echo '$(srcdir)/'`$(framework_dir)/runtime-glib.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/runtime-glib.Tpo $(DEPDIR)/runtime-glib.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT runtime-glib.lo -MD -MP -MF $(DEPDIR)/runtime-glib.Tpo -c -o runtime-glib.lo `test -f '$(framework_dir)/runtime-glib.cpp' || echo '$(srcdir)/'`$(framework_dir)/runtime-glib.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/runtime-glib.Tpo $(DEPDIR)/runtime-glib.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/runtime-glib.cpp' object='runtime-glib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o runtime-glib.lo `test -f '$(framework_dir)/runtime-glib.cpp' || echo '$(srcdir)/'`$(framework_dir)/runtime-glib.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o runtime-glib.lo `test -f '$(framework_dir)/runtime-glib.cpp' || echo '$(srcdir)/'`$(framework_dir)/runtime-glib.cpp
 
 services.lo: $(framework_dir)/services.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT services.lo -MD -MP -MF $(DEPDIR)/services.Tpo -c -o services.lo `test -f '$(framework_dir)/services.cpp' || echo '$(srcdir)/'`$(framework_dir)/services.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/services.Tpo $(DEPDIR)/services.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT services.lo -MD -MP -MF $(DEPDIR)/services.Tpo -c -o services.lo `test -f '$(framework_dir)/services.cpp' || echo '$(srcdir)/'`$(framework_dir)/services.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/services.Tpo $(DEPDIR)/services.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/services.cpp' object='services.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o services.lo `test -f '$(framework_dir)/services.cpp' || echo '$(srcdir)/'`$(framework_dir)/services.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o services.lo `test -f '$(framework_dir)/services.cpp' || echo '$(srcdir)/'`$(framework_dir)/services.cpp
 
 menu-xml.lo: $(framework_dir)/menu-xml.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu-xml.lo -MD -MP -MF $(DEPDIR)/menu-xml.Tpo -c -o menu-xml.lo `test -f '$(framework_dir)/menu-xml.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-xml.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/menu-xml.Tpo $(DEPDIR)/menu-xml.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu-xml.lo -MD -MP -MF $(DEPDIR)/menu-xml.Tpo -c -o menu-xml.lo `test -f '$(framework_dir)/menu-xml.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-xml.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/menu-xml.Tpo $(DEPDIR)/menu-xml.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/menu-xml.cpp' object='menu-xml.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu-xml.lo `test -f '$(framework_dir)/menu-xml.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-xml.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu-xml.lo `test -f '$(framework_dir)/menu-xml.cpp' || echo '$(srcdir)/'`$(framework_dir)/menu-xml.cpp
 
 kickstart.lo: $(framework_dir)/kickstart.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kickstart.lo -MD -MP -MF $(DEPDIR)/kickstart.Tpo -c -o kickstart.lo `test -f '$(framework_dir)/kickstart.cpp' || echo '$(srcdir)/'`$(framework_dir)/kickstart.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kickstart.Tpo $(DEPDIR)/kickstart.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT kickstart.lo -MD -MP -MF $(DEPDIR)/kickstart.Tpo -c -o kickstart.lo `test -f '$(framework_dir)/kickstart.cpp' || echo '$(srcdir)/'`$(framework_dir)/kickstart.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kickstart.Tpo $(DEPDIR)/kickstart.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(framework_dir)/kickstart.cpp' object='kickstart.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kickstart.lo `test -f '$(framework_dir)/kickstart.cpp' || echo '$(srcdir)/'`$(framework_dir)/kickstart.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o kickstart.lo `test -f '$(framework_dir)/kickstart.cpp' || echo '$(srcdir)/'`$(framework_dir)/kickstart.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -508,7 +514,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -516,29 +522,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -559,13 +570,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -593,6 +608,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -614,6 +630,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -622,18 +640,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -671,6 +699,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/gui/gtk-core/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/gui/gtk-core/Makefile.in
--- ekiga-3.2.5/lib/engine/gui/gtk-core/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/gui/gtk-core/Makefile.in	2009-09-22 15:36:28.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmgtk_core_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/gui/libgmwidgets.la \
@@ -57,6 +60,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -189,6 +193,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -317,9 +322,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/gui/gtk-core/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/gui/gtk-core/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/gui/gtk-core/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/gui/gtk-core/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -337,6 +342,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -363,59 +369,59 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 toolbar-builder-gtk.lo: $(gtk_core_dir)/toolbar-builder-gtk.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT toolbar-builder-gtk.lo -MD -MP -MF $(DEPDIR)/toolbar-builder-gtk.Tpo -c -o toolbar-builder-gtk.lo `test -f '$(gtk_core_dir)/toolbar-builder-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/toolbar-builder-gtk.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/toolbar-builder-gtk.Tpo $(DEPDIR)/toolbar-builder-gtk.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT toolbar-builder-gtk.lo -MD -MP -MF $(DEPDIR)/toolbar-builder-gtk.Tpo -c -o toolbar-builder-gtk.lo `test -f '$(gtk_core_dir)/toolbar-builder-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/toolbar-builder-gtk.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/toolbar-builder-gtk.Tpo $(DEPDIR)/toolbar-builder-gtk.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_core_dir)/toolbar-builder-gtk.cpp' object='toolbar-builder-gtk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o toolbar-builder-gtk.lo `test -f '$(gtk_core_dir)/toolbar-builder-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/toolbar-builder-gtk.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o toolbar-builder-gtk.lo `test -f '$(gtk_core_dir)/toolbar-builder-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/toolbar-builder-gtk.cpp
 
 menu-builder-gtk.lo: $(gtk_core_dir)/menu-builder-gtk.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu-builder-gtk.lo -MD -MP -MF $(DEPDIR)/menu-builder-gtk.Tpo -c -o menu-builder-gtk.lo `test -f '$(gtk_core_dir)/menu-builder-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/menu-builder-gtk.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/menu-builder-gtk.Tpo $(DEPDIR)/menu-builder-gtk.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu-builder-gtk.lo -MD -MP -MF $(DEPDIR)/menu-builder-gtk.Tpo -c -o menu-builder-gtk.lo `test -f '$(gtk_core_dir)/menu-builder-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/menu-builder-gtk.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/menu-builder-gtk.Tpo $(DEPDIR)/menu-builder-gtk.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_core_dir)/menu-builder-gtk.cpp' object='menu-builder-gtk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu-builder-gtk.lo `test -f '$(gtk_core_dir)/menu-builder-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/menu-builder-gtk.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu-builder-gtk.lo `test -f '$(gtk_core_dir)/menu-builder-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/menu-builder-gtk.cpp
 
 form-dialog-gtk.lo: $(gtk_core_dir)/form-dialog-gtk.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form-dialog-gtk.lo -MD -MP -MF $(DEPDIR)/form-dialog-gtk.Tpo -c -o form-dialog-gtk.lo `test -f '$(gtk_core_dir)/form-dialog-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/form-dialog-gtk.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/form-dialog-gtk.Tpo $(DEPDIR)/form-dialog-gtk.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT form-dialog-gtk.lo -MD -MP -MF $(DEPDIR)/form-dialog-gtk.Tpo -c -o form-dialog-gtk.lo `test -f '$(gtk_core_dir)/form-dialog-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/form-dialog-gtk.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/form-dialog-gtk.Tpo $(DEPDIR)/form-dialog-gtk.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_core_dir)/form-dialog-gtk.cpp' object='form-dialog-gtk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form-dialog-gtk.lo `test -f '$(gtk_core_dir)/form-dialog-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/form-dialog-gtk.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o form-dialog-gtk.lo `test -f '$(gtk_core_dir)/form-dialog-gtk.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/form-dialog-gtk.cpp
 
 gtk-core.lo: $(gtk_core_dir)/gtk-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtk-core.lo -MD -MP -MF $(DEPDIR)/gtk-core.Tpo -c -o gtk-core.lo `test -f '$(gtk_core_dir)/gtk-core.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/gtk-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gtk-core.Tpo $(DEPDIR)/gtk-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtk-core.lo -MD -MP -MF $(DEPDIR)/gtk-core.Tpo -c -o gtk-core.lo `test -f '$(gtk_core_dir)/gtk-core.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/gtk-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gtk-core.Tpo $(DEPDIR)/gtk-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_core_dir)/gtk-core.cpp' object='gtk-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtk-core.lo `test -f '$(gtk_core_dir)/gtk-core.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/gtk-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtk-core.lo `test -f '$(gtk_core_dir)/gtk-core.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/gtk-core.cpp
 
 gtk-core-main.lo: $(gtk_core_dir)/gtk-core-main.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtk-core-main.lo -MD -MP -MF $(DEPDIR)/gtk-core-main.Tpo -c -o gtk-core-main.lo `test -f '$(gtk_core_dir)/gtk-core-main.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/gtk-core-main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gtk-core-main.Tpo $(DEPDIR)/gtk-core-main.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtk-core-main.lo -MD -MP -MF $(DEPDIR)/gtk-core-main.Tpo -c -o gtk-core-main.lo `test -f '$(gtk_core_dir)/gtk-core-main.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/gtk-core-main.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gtk-core-main.Tpo $(DEPDIR)/gtk-core-main.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_core_dir)/gtk-core-main.cpp' object='gtk-core-main.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtk-core-main.lo `test -f '$(gtk_core_dir)/gtk-core-main.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/gtk-core-main.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtk-core-main.lo `test -f '$(gtk_core_dir)/gtk-core-main.cpp' || echo '$(srcdir)/'`$(gtk_core_dir)/gtk-core-main.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -435,7 +441,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -443,29 +449,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -486,13 +497,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -520,6 +535,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -541,6 +557,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -549,18 +567,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -598,6 +626,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/gui/gtk-frontend/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/gui/gtk-frontend/Makefile.in
--- ekiga-3.2.5/lib/engine/gui/gtk-frontend/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/gui/gtk-frontend/Makefile.in	2009-09-22 15:36:28.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmgtk_frontend_la_DEPENDENCIES =  \
 	$(top_builddir)/lib/gui/libgmwidgets.la \
@@ -60,6 +63,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -192,6 +196,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -337,9 +342,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/gui/gtk-frontend/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/gui/gtk-frontend/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/gui/gtk-frontend/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/gui/gtk-frontend/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -357,6 +362,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -388,94 +394,94 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 addressbook-window.lo: $(gtk_frontend_dir)/addressbook-window.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT addressbook-window.lo -MD -MP -MF $(DEPDIR)/addressbook-window.Tpo -c -o addressbook-window.lo `test -f '$(gtk_frontend_dir)/addressbook-window.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/addressbook-window.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/addressbook-window.Tpo $(DEPDIR)/addressbook-window.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT addressbook-window.lo -MD -MP -MF $(DEPDIR)/addressbook-window.Tpo -c -o addressbook-window.lo `test -f '$(gtk_frontend_dir)/addressbook-window.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/addressbook-window.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/addressbook-window.Tpo $(DEPDIR)/addressbook-window.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/addressbook-window.cpp' object='addressbook-window.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o addressbook-window.lo `test -f '$(gtk_frontend_dir)/addressbook-window.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/addressbook-window.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o addressbook-window.lo `test -f '$(gtk_frontend_dir)/addressbook-window.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/addressbook-window.cpp
 
 book-view-gtk.lo: $(gtk_frontend_dir)/book-view-gtk.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT book-view-gtk.lo -MD -MP -MF $(DEPDIR)/book-view-gtk.Tpo -c -o book-view-gtk.lo `test -f '$(gtk_frontend_dir)/book-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/book-view-gtk.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/book-view-gtk.Tpo $(DEPDIR)/book-view-gtk.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT book-view-gtk.lo -MD -MP -MF $(DEPDIR)/book-view-gtk.Tpo -c -o book-view-gtk.lo `test -f '$(gtk_frontend_dir)/book-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/book-view-gtk.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/book-view-gtk.Tpo $(DEPDIR)/book-view-gtk.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/book-view-gtk.cpp' object='book-view-gtk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o book-view-gtk.lo `test -f '$(gtk_frontend_dir)/book-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/book-view-gtk.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o book-view-gtk.lo `test -f '$(gtk_frontend_dir)/book-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/book-view-gtk.cpp
 
 roster-view-gtk.lo: $(gtk_frontend_dir)/roster-view-gtk.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT roster-view-gtk.lo -MD -MP -MF $(DEPDIR)/roster-view-gtk.Tpo -c -o roster-view-gtk.lo `test -f '$(gtk_frontend_dir)/roster-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/roster-view-gtk.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/roster-view-gtk.Tpo $(DEPDIR)/roster-view-gtk.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT roster-view-gtk.lo -MD -MP -MF $(DEPDIR)/roster-view-gtk.Tpo -c -o roster-view-gtk.lo `test -f '$(gtk_frontend_dir)/roster-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/roster-view-gtk.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/roster-view-gtk.Tpo $(DEPDIR)/roster-view-gtk.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/roster-view-gtk.cpp' object='roster-view-gtk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o roster-view-gtk.lo `test -f '$(gtk_frontend_dir)/roster-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/roster-view-gtk.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o roster-view-gtk.lo `test -f '$(gtk_frontend_dir)/roster-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/roster-view-gtk.cpp
 
 call-history-view-gtk.lo: $(gtk_frontend_dir)/call-history-view-gtk.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT call-history-view-gtk.lo -MD -MP -MF $(DEPDIR)/call-history-view-gtk.Tpo -c -o call-history-view-gtk.lo `test -f '$(gtk_frontend_dir)/call-history-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/call-history-view-gtk.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/call-history-view-gtk.Tpo $(DEPDIR)/call-history-view-gtk.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT call-history-view-gtk.lo -MD -MP -MF $(DEPDIR)/call-history-view-gtk.Tpo -c -o call-history-view-gtk.lo `test -f '$(gtk_frontend_dir)/call-history-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/call-history-view-gtk.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/call-history-view-gtk.Tpo $(DEPDIR)/call-history-view-gtk.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/call-history-view-gtk.cpp' object='call-history-view-gtk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o call-history-view-gtk.lo `test -f '$(gtk_frontend_dir)/call-history-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/call-history-view-gtk.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o call-history-view-gtk.lo `test -f '$(gtk_frontend_dir)/call-history-view-gtk.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/call-history-view-gtk.cpp
 
 presentity-view.lo: $(gtk_frontend_dir)/presentity-view.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT presentity-view.lo -MD -MP -MF $(DEPDIR)/presentity-view.Tpo -c -o presentity-view.lo `test -f '$(gtk_frontend_dir)/presentity-view.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/presentity-view.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/presentity-view.Tpo $(DEPDIR)/presentity-view.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT presentity-view.lo -MD -MP -MF $(DEPDIR)/presentity-view.Tpo -c -o presentity-view.lo `test -f '$(gtk_frontend_dir)/presentity-view.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/presentity-view.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/presentity-view.Tpo $(DEPDIR)/presentity-view.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/presentity-view.cpp' object='presentity-view.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o presentity-view.lo `test -f '$(gtk_frontend_dir)/presentity-view.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/presentity-view.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o presentity-view.lo `test -f '$(gtk_frontend_dir)/presentity-view.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/presentity-view.cpp
 
 chat-area.lo: $(gtk_frontend_dir)/chat-area.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat-area.lo -MD -MP -MF $(DEPDIR)/chat-area.Tpo -c -o chat-area.lo `test -f '$(gtk_frontend_dir)/chat-area.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/chat-area.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/chat-area.Tpo $(DEPDIR)/chat-area.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat-area.lo -MD -MP -MF $(DEPDIR)/chat-area.Tpo -c -o chat-area.lo `test -f '$(gtk_frontend_dir)/chat-area.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/chat-area.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/chat-area.Tpo $(DEPDIR)/chat-area.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/chat-area.cpp' object='chat-area.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chat-area.lo `test -f '$(gtk_frontend_dir)/chat-area.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/chat-area.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chat-area.lo `test -f '$(gtk_frontend_dir)/chat-area.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/chat-area.cpp
 
 simple-chat-page.lo: $(gtk_frontend_dir)/simple-chat-page.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT simple-chat-page.lo -MD -MP -MF $(DEPDIR)/simple-chat-page.Tpo -c -o simple-chat-page.lo `test -f '$(gtk_frontend_dir)/simple-chat-page.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/simple-chat-page.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/simple-chat-page.Tpo $(DEPDIR)/simple-chat-page.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT simple-chat-page.lo -MD -MP -MF $(DEPDIR)/simple-chat-page.Tpo -c -o simple-chat-page.lo `test -f '$(gtk_frontend_dir)/simple-chat-page.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/simple-chat-page.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/simple-chat-page.Tpo $(DEPDIR)/simple-chat-page.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/simple-chat-page.cpp' object='simple-chat-page.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o simple-chat-page.lo `test -f '$(gtk_frontend_dir)/simple-chat-page.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/simple-chat-page.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o simple-chat-page.lo `test -f '$(gtk_frontend_dir)/simple-chat-page.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/simple-chat-page.cpp
 
 multiple-chat-page.lo: $(gtk_frontend_dir)/multiple-chat-page.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT multiple-chat-page.lo -MD -MP -MF $(DEPDIR)/multiple-chat-page.Tpo -c -o multiple-chat-page.lo `test -f '$(gtk_frontend_dir)/multiple-chat-page.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/multiple-chat-page.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/multiple-chat-page.Tpo $(DEPDIR)/multiple-chat-page.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT multiple-chat-page.lo -MD -MP -MF $(DEPDIR)/multiple-chat-page.Tpo -c -o multiple-chat-page.lo `test -f '$(gtk_frontend_dir)/multiple-chat-page.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/multiple-chat-page.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/multiple-chat-page.Tpo $(DEPDIR)/multiple-chat-page.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/multiple-chat-page.cpp' object='multiple-chat-page.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o multiple-chat-page.lo `test -f '$(gtk_frontend_dir)/multiple-chat-page.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/multiple-chat-page.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o multiple-chat-page.lo `test -f '$(gtk_frontend_dir)/multiple-chat-page.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/multiple-chat-page.cpp
 
 chat-window.lo: $(gtk_frontend_dir)/chat-window.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat-window.lo -MD -MP -MF $(DEPDIR)/chat-window.Tpo -c -o chat-window.lo `test -f '$(gtk_frontend_dir)/chat-window.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/chat-window.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/chat-window.Tpo $(DEPDIR)/chat-window.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT chat-window.lo -MD -MP -MF $(DEPDIR)/chat-window.Tpo -c -o chat-window.lo `test -f '$(gtk_frontend_dir)/chat-window.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/chat-window.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/chat-window.Tpo $(DEPDIR)/chat-window.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/chat-window.cpp' object='chat-window.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chat-window.lo `test -f '$(gtk_frontend_dir)/chat-window.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/chat-window.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o chat-window.lo `test -f '$(gtk_frontend_dir)/chat-window.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/chat-window.cpp
 
 gtk-frontend.lo: $(gtk_frontend_dir)/gtk-frontend.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtk-frontend.lo -MD -MP -MF $(DEPDIR)/gtk-frontend.Tpo -c -o gtk-frontend.lo `test -f '$(gtk_frontend_dir)/gtk-frontend.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/gtk-frontend.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gtk-frontend.Tpo $(DEPDIR)/gtk-frontend.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtk-frontend.lo -MD -MP -MF $(DEPDIR)/gtk-frontend.Tpo -c -o gtk-frontend.lo `test -f '$(gtk_frontend_dir)/gtk-frontend.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/gtk-frontend.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gtk-frontend.Tpo $(DEPDIR)/gtk-frontend.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gtk_frontend_dir)/gtk-frontend.cpp' object='gtk-frontend.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtk-frontend.lo `test -f '$(gtk_frontend_dir)/gtk-frontend.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/gtk-frontend.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtk-frontend.lo `test -f '$(gtk_frontend_dir)/gtk-frontend.cpp' || echo '$(srcdir)/'`$(gtk_frontend_dir)/gtk-frontend.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -495,7 +501,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -503,29 +509,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -546,13 +557,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -580,6 +595,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -601,6 +617,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -609,18 +627,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -658,6 +686,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/gui/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/gui/Makefile.in
--- ekiga-3.2.5/lib/engine/gui/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/gui/Makefile.in	2009-09-22 15:36:28.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -41,6 +43,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -52,10 +55,38 @@
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
@@ -165,6 +196,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -264,9 +296,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/gui/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/gui/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/gui/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -284,6 +316,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -315,7 +348,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -349,16 +382,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -373,7 +406,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -385,7 +418,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -394,29 +427,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -437,29 +475,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -489,6 +542,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -507,6 +561,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -515,18 +571,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -547,8 +613,8 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -564,6 +630,7 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/hal/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/hal/Makefile.in
--- ekiga-3.2.5/lib/engine/hal/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/hal/Makefile.in	2009-09-22 15:36:28.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmhal_la_LIBADD =
 am_libgmhal_la_OBJECTS = hal-core.lo
@@ -52,6 +55,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -184,6 +188,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -296,9 +301,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/hal/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/hal/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/hal/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/hal/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -316,6 +321,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -338,31 +344,31 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 hal-core.lo: $(hal_dir)/hal-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hal-core.lo -MD -MP -MF $(DEPDIR)/hal-core.Tpo -c -o hal-core.lo `test -f '$(hal_dir)/hal-core.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/hal-core.Tpo $(DEPDIR)/hal-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hal-core.lo -MD -MP -MF $(DEPDIR)/hal-core.Tpo -c -o hal-core.lo `test -f '$(hal_dir)/hal-core.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hal-core.Tpo $(DEPDIR)/hal-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(hal_dir)/hal-core.cpp' object='hal-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hal-core.lo `test -f '$(hal_dir)/hal-core.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hal-core.lo `test -f '$(hal_dir)/hal-core.cpp' || echo '$(srcdir)/'`$(hal_dir)/hal-core.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -382,7 +388,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -390,29 +396,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -433,13 +444,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -467,6 +482,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -488,6 +504,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -496,18 +514,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -545,6 +573,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/Makefile.in
--- ekiga-3.2.5/lib/engine/Makefile.in	2009-07-06 20:10:36.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/Makefile.in	2009-09-22 15:36:22.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -92,6 +94,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -132,6 +135,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -161,10 +165,38 @@
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
@@ -274,6 +306,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -461,9 +494,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -481,6 +514,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -503,21 +537,21 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -552,7 +586,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -586,16 +620,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -610,7 +644,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -622,7 +656,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -631,29 +665,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -674,29 +713,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -726,6 +780,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -747,6 +802,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -755,18 +812,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -789,8 +856,8 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -809,6 +876,7 @@
 
 
 #### End
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/notification/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/notification/Makefile.in
--- ekiga-3.2.5/lib/engine/notification/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/notification/Makefile.in	2009-09-22 15:36:28.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libnotification_la_LIBADD =
 am_libnotification_la_OBJECTS = notification-dummy.lo
@@ -52,6 +55,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -184,6 +188,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -295,9 +300,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/notification/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/notification/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/notification/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/notification/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -315,6 +320,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -337,31 +343,31 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 notification-dummy.lo: $(notification_dir)/notification-dummy.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT notification-dummy.lo -MD -MP -MF $(DEPDIR)/notification-dummy.Tpo -c -o notification-dummy.lo `test -f '$(notification_dir)/notification-dummy.cpp' || echo '$(srcdir)/'`$(notification_dir)/notification-dummy.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/notification-dummy.Tpo $(DEPDIR)/notification-dummy.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT notification-dummy.lo -MD -MP -MF $(DEPDIR)/notification-dummy.Tpo -c -o notification-dummy.lo `test -f '$(notification_dir)/notification-dummy.cpp' || echo '$(srcdir)/'`$(notification_dir)/notification-dummy.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/notification-dummy.Tpo $(DEPDIR)/notification-dummy.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(notification_dir)/notification-dummy.cpp' object='notification-dummy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o notification-dummy.lo `test -f '$(notification_dir)/notification-dummy.cpp' || echo '$(srcdir)/'`$(notification_dir)/notification-dummy.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o notification-dummy.lo `test -f '$(notification_dir)/notification-dummy.cpp' || echo '$(srcdir)/'`$(notification_dir)/notification-dummy.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -381,7 +387,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -389,29 +395,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -432,13 +443,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -466,6 +481,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -487,6 +503,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -495,18 +513,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -544,6 +572,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/plugin/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/plugin/Makefile.in
--- ekiga-3.2.5/lib/engine/plugin/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/plugin/Makefile.in	2009-09-22 15:36:29.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libplugin_la_LIBADD =
 am_libplugin_la_OBJECTS = plugin-core.lo
@@ -52,6 +55,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -184,6 +188,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -295,9 +300,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/plugin/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/plugin/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/plugin/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/plugin/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -315,6 +320,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -337,31 +343,31 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 plugin-core.lo: $(plugin_dir)/plugin-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin-core.lo -MD -MP -MF $(DEPDIR)/plugin-core.Tpo -c -o plugin-core.lo `test -f '$(plugin_dir)/plugin-core.cpp' || echo '$(srcdir)/'`$(plugin_dir)/plugin-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/plugin-core.Tpo $(DEPDIR)/plugin-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin-core.lo -MD -MP -MF $(DEPDIR)/plugin-core.Tpo -c -o plugin-core.lo `test -f '$(plugin_dir)/plugin-core.cpp' || echo '$(srcdir)/'`$(plugin_dir)/plugin-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/plugin-core.Tpo $(DEPDIR)/plugin-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(plugin_dir)/plugin-core.cpp' object='plugin-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin-core.lo `test -f '$(plugin_dir)/plugin-core.cpp' || echo '$(srcdir)/'`$(plugin_dir)/plugin-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin-core.lo `test -f '$(plugin_dir)/plugin-core.cpp' || echo '$(srcdir)/'`$(plugin_dir)/plugin-core.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -381,7 +387,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -389,29 +395,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -432,13 +443,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -466,6 +481,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -487,6 +503,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -495,18 +513,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -544,6 +572,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/presence/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/presence/Makefile.in
--- ekiga-3.2.5/lib/engine/presence/Makefile.in	2009-07-06 20:10:40.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/presence/Makefile.in	2009-09-22 15:36:29.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmpresence_la_LIBADD =
 am_libgmpresence_la_OBJECTS = proxy-presentity.lo uri-presentity.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -306,9 +311,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/presence/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/presence/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/presence/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/presence/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -326,6 +331,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -350,45 +356,45 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 proxy-presentity.lo: $(presence_dir)/proxy-presentity.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT proxy-presentity.lo -MD -MP -MF $(DEPDIR)/proxy-presentity.Tpo -c -o proxy-presentity.lo `test -f '$(presence_dir)/proxy-presentity.cpp' || echo '$(srcdir)/'`$(presence_dir)/proxy-presentity.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/proxy-presentity.Tpo $(DEPDIR)/proxy-presentity.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT proxy-presentity.lo -MD -MP -MF $(DEPDIR)/proxy-presentity.Tpo -c -o proxy-presentity.lo `test -f '$(presence_dir)/proxy-presentity.cpp' || echo '$(srcdir)/'`$(presence_dir)/proxy-presentity.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/proxy-presentity.Tpo $(DEPDIR)/proxy-presentity.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(presence_dir)/proxy-presentity.cpp' object='proxy-presentity.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o proxy-presentity.lo `test -f '$(presence_dir)/proxy-presentity.cpp' || echo '$(srcdir)/'`$(presence_dir)/proxy-presentity.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o proxy-presentity.lo `test -f '$(presence_dir)/proxy-presentity.cpp' || echo '$(srcdir)/'`$(presence_dir)/proxy-presentity.cpp
 
 uri-presentity.lo: $(presence_dir)/uri-presentity.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT uri-presentity.lo -MD -MP -MF $(DEPDIR)/uri-presentity.Tpo -c -o uri-presentity.lo `test -f '$(presence_dir)/uri-presentity.cpp' || echo '$(srcdir)/'`$(presence_dir)/uri-presentity.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/uri-presentity.Tpo $(DEPDIR)/uri-presentity.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT uri-presentity.lo -MD -MP -MF $(DEPDIR)/uri-presentity.Tpo -c -o uri-presentity.lo `test -f '$(presence_dir)/uri-presentity.cpp' || echo '$(srcdir)/'`$(presence_dir)/uri-presentity.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/uri-presentity.Tpo $(DEPDIR)/uri-presentity.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(presence_dir)/uri-presentity.cpp' object='uri-presentity.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o uri-presentity.lo `test -f '$(presence_dir)/uri-presentity.cpp' || echo '$(srcdir)/'`$(presence_dir)/uri-presentity.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o uri-presentity.lo `test -f '$(presence_dir)/uri-presentity.cpp' || echo '$(srcdir)/'`$(presence_dir)/uri-presentity.cpp
 
 presence-core.lo: $(presence_dir)/presence-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT presence-core.lo -MD -MP -MF $(DEPDIR)/presence-core.Tpo -c -o presence-core.lo `test -f '$(presence_dir)/presence-core.cpp' || echo '$(srcdir)/'`$(presence_dir)/presence-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/presence-core.Tpo $(DEPDIR)/presence-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT presence-core.lo -MD -MP -MF $(DEPDIR)/presence-core.Tpo -c -o presence-core.lo `test -f '$(presence_dir)/presence-core.cpp' || echo '$(srcdir)/'`$(presence_dir)/presence-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/presence-core.Tpo $(DEPDIR)/presence-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(presence_dir)/presence-core.cpp' object='presence-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o presence-core.lo `test -f '$(presence_dir)/presence-core.cpp' || echo '$(srcdir)/'`$(presence_dir)/presence-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o presence-core.lo `test -f '$(presence_dir)/presence-core.cpp' || echo '$(srcdir)/'`$(presence_dir)/presence-core.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -408,7 +414,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -416,29 +422,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -459,13 +470,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -493,6 +508,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -514,6 +530,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -522,18 +540,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -571,6 +599,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/protocol/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/protocol/Makefile.in
--- ekiga-3.2.5/lib/engine/protocol/Makefile.in	2009-07-06 20:10:41.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/protocol/Makefile.in	2009-09-22 15:36:29.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmprotocol_la_LIBADD =
 am_libgmprotocol_la_OBJECTS = call-manager.lo call-core.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -301,9 +306,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/protocol/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/protocol/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/protocol/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/protocol/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -321,6 +326,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -345,45 +351,45 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 call-manager.lo: $(protocol_dir)/call-manager.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT call-manager.lo -MD -MP -MF $(DEPDIR)/call-manager.Tpo -c -o call-manager.lo `test -f '$(protocol_dir)/call-manager.cpp' || echo '$(srcdir)/'`$(protocol_dir)/call-manager.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/call-manager.Tpo $(DEPDIR)/call-manager.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT call-manager.lo -MD -MP -MF $(DEPDIR)/call-manager.Tpo -c -o call-manager.lo `test -f '$(protocol_dir)/call-manager.cpp' || echo '$(srcdir)/'`$(protocol_dir)/call-manager.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/call-manager.Tpo $(DEPDIR)/call-manager.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(protocol_dir)/call-manager.cpp' object='call-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o call-manager.lo `test -f '$(protocol_dir)/call-manager.cpp' || echo '$(srcdir)/'`$(protocol_dir)/call-manager.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o call-manager.lo `test -f '$(protocol_dir)/call-manager.cpp' || echo '$(srcdir)/'`$(protocol_dir)/call-manager.cpp
 
 call-core.lo: $(protocol_dir)/call-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT call-core.lo -MD -MP -MF $(DEPDIR)/call-core.Tpo -c -o call-core.lo `test -f '$(protocol_dir)/call-core.cpp' || echo '$(srcdir)/'`$(protocol_dir)/call-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/call-core.Tpo $(DEPDIR)/call-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT call-core.lo -MD -MP -MF $(DEPDIR)/call-core.Tpo -c -o call-core.lo `test -f '$(protocol_dir)/call-core.cpp' || echo '$(srcdir)/'`$(protocol_dir)/call-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/call-core.Tpo $(DEPDIR)/call-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(protocol_dir)/call-core.cpp' object='call-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o call-core.lo `test -f '$(protocol_dir)/call-core.cpp' || echo '$(srcdir)/'`$(protocol_dir)/call-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o call-core.lo `test -f '$(protocol_dir)/call-core.cpp' || echo '$(srcdir)/'`$(protocol_dir)/call-core.cpp
 
 codec-description.lo: $(protocol_dir)/codec-description.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT codec-description.lo -MD -MP -MF $(DEPDIR)/codec-description.Tpo -c -o codec-description.lo `test -f '$(protocol_dir)/codec-description.cpp' || echo '$(srcdir)/'`$(protocol_dir)/codec-description.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/codec-description.Tpo $(DEPDIR)/codec-description.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT codec-description.lo -MD -MP -MF $(DEPDIR)/codec-description.Tpo -c -o codec-description.lo `test -f '$(protocol_dir)/codec-description.cpp' || echo '$(srcdir)/'`$(protocol_dir)/codec-description.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/codec-description.Tpo $(DEPDIR)/codec-description.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(protocol_dir)/codec-description.cpp' object='codec-description.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o codec-description.lo `test -f '$(protocol_dir)/codec-description.cpp' || echo '$(srcdir)/'`$(protocol_dir)/codec-description.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o codec-description.lo `test -f '$(protocol_dir)/codec-description.cpp' || echo '$(srcdir)/'`$(protocol_dir)/codec-description.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -403,7 +409,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -411,29 +417,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -454,13 +465,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -488,6 +503,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -509,6 +525,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -517,18 +535,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -566,6 +594,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/videoinput/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/videoinput/Makefile.in
--- ekiga-3.2.5/lib/engine/videoinput/Makefile.in	2009-07-06 20:10:41.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/videoinput/Makefile.in	2009-09-22 15:36:29.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmvideoinput_la_LIBADD =
 am_libgmvideoinput_la_OBJECTS = videoinput-core.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -303,9 +308,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/videoinput/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/videoinput/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/videoinput/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/videoinput/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -323,6 +328,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -346,38 +352,38 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 videoinput-core.lo: $(videoinput_dir)/videoinput-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-core.lo -MD -MP -MF $(DEPDIR)/videoinput-core.Tpo -c -o videoinput-core.lo `test -f '$(videoinput_dir)/videoinput-core.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videoinput-core.Tpo $(DEPDIR)/videoinput-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-core.lo -MD -MP -MF $(DEPDIR)/videoinput-core.Tpo -c -o videoinput-core.lo `test -f '$(videoinput_dir)/videoinput-core.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videoinput-core.Tpo $(DEPDIR)/videoinput-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videoinput_dir)/videoinput-core.cpp' object='videoinput-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-core.lo `test -f '$(videoinput_dir)/videoinput-core.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-core.lo `test -f '$(videoinput_dir)/videoinput-core.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-core.cpp
 
 videoinput-gmconf-bridge.lo: $(videoinput_dir)/videoinput-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/videoinput-gmconf-bridge.Tpo -c -o videoinput-gmconf-bridge.lo `test -f '$(videoinput_dir)/videoinput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videoinput-gmconf-bridge.Tpo $(DEPDIR)/videoinput-gmconf-bridge.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videoinput-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/videoinput-gmconf-bridge.Tpo -c -o videoinput-gmconf-bridge.lo `test -f '$(videoinput_dir)/videoinput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-gmconf-bridge.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videoinput-gmconf-bridge.Tpo $(DEPDIR)/videoinput-gmconf-bridge.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videoinput_dir)/videoinput-gmconf-bridge.cpp' object='videoinput-gmconf-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-gmconf-bridge.lo `test -f '$(videoinput_dir)/videoinput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-gmconf-bridge.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videoinput-gmconf-bridge.lo `test -f '$(videoinput_dir)/videoinput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(videoinput_dir)/videoinput-gmconf-bridge.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -397,7 +403,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -405,29 +411,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -448,13 +459,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -482,6 +497,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -503,6 +519,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -511,18 +529,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -560,6 +588,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/engine/videooutput/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/engine/videooutput/Makefile.in
--- ekiga-3.2.5/lib/engine/videooutput/Makefile.in	2009-07-06 20:10:41.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/engine/videooutput/Makefile.in	2009-09-22 15:36:29.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmvideooutput_la_LIBADD =
 am_libgmvideooutput_la_OBJECTS = videooutput-core.lo \
@@ -53,6 +56,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -301,9 +306,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/engine/videooutput/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/engine/videooutput/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/engine/videooutput/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/engine/videooutput/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -321,6 +326,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -344,38 +350,38 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 videooutput-core.lo: $(videooutput_dir)/videooutput-core.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-core.lo -MD -MP -MF $(DEPDIR)/videooutput-core.Tpo -c -o videooutput-core.lo `test -f '$(videooutput_dir)/videooutput-core.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-core.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videooutput-core.Tpo $(DEPDIR)/videooutput-core.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-core.lo -MD -MP -MF $(DEPDIR)/videooutput-core.Tpo -c -o videooutput-core.lo `test -f '$(videooutput_dir)/videooutput-core.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-core.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videooutput-core.Tpo $(DEPDIR)/videooutput-core.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videooutput_dir)/videooutput-core.cpp' object='videooutput-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-core.lo `test -f '$(videooutput_dir)/videooutput-core.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-core.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-core.lo `test -f '$(videooutput_dir)/videooutput-core.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-core.cpp
 
 videooutput-gmconf-bridge.lo: $(videooutput_dir)/videooutput-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/videooutput-gmconf-bridge.Tpo -c -o videooutput-gmconf-bridge.lo `test -f '$(videooutput_dir)/videooutput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-gmconf-bridge.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/videooutput-gmconf-bridge.Tpo $(DEPDIR)/videooutput-gmconf-bridge.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT videooutput-gmconf-bridge.lo -MD -MP -MF $(DEPDIR)/videooutput-gmconf-bridge.Tpo -c -o videooutput-gmconf-bridge.lo `test -f '$(videooutput_dir)/videooutput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-gmconf-bridge.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/videooutput-gmconf-bridge.Tpo $(DEPDIR)/videooutput-gmconf-bridge.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(videooutput_dir)/videooutput-gmconf-bridge.cpp' object='videooutput-gmconf-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-gmconf-bridge.lo `test -f '$(videooutput_dir)/videooutput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-gmconf-bridge.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o videooutput-gmconf-bridge.lo `test -f '$(videooutput_dir)/videooutput-gmconf-bridge.cpp' || echo '$(srcdir)/'`$(videooutput_dir)/videooutput-gmconf-bridge.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -395,7 +401,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -403,29 +409,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -446,13 +457,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -480,6 +495,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -501,6 +517,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -509,18 +527,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -558,6 +586,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/gmconf/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/gmconf/Makefile.in
--- ekiga-3.2.5/lib/gmconf/Makefile.in	2009-07-06 20:10:41.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/gmconf/Makefile.in	2009-09-22 15:36:30.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -44,6 +46,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmconf_la_LIBADD =
 am__libgmconf_la_SOURCES_DIST = gmconf.h gmconf-gconf.c gmconf-glib.c
@@ -57,6 +60,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -180,6 +184,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -287,9 +292,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/gmconf/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/gmconf/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/gmconf/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/gmconf/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -307,6 +312,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -330,21 +336,21 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -367,7 +373,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -375,29 +381,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -418,13 +429,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -452,6 +467,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -473,6 +489,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -481,18 +499,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -530,6 +558,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/gui/gmpreferences.c ekiga-3.2.6~ppa~karmic1/lib/gui/gmpreferences.c
--- ekiga-3.2.5/lib/gui/gmpreferences.c	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/gui/gmpreferences.c	2009-08-02 11:52:26.000000000 +0100
@@ -729,7 +729,6 @@
   GtkTreeIter iter;
 
   gchar *conf_string = NULL;
-  gchar *options_string = NULL;
   
   int history = -1;
   int cpt = 0;
@@ -748,17 +747,15 @@
   cpt = 0;
   while (options [cpt]) {
 
-    options_string = g_locale_to_utf8 (options [cpt], -1, NULL, NULL, NULL);
     if (conf_string && !strcmp (options [cpt], conf_string)) 
       history = cpt;
 
     gtk_list_store_append (GTK_LIST_STORE (model), &iter);
     gtk_list_store_set (GTK_LIST_STORE (model), &iter, 
                         COLUMN_STRING_RAW, options [cpt],
-                        COLUMN_STRING_TRANSLATED, options_string,
+                        COLUMN_STRING_TRANSLATED, options [cpt],
                         COLUMN_SENSITIVE, TRUE, 
                         -1);
-    g_free (options_string);
     cpt++;
   }
 
@@ -791,14 +788,12 @@
 {
   GtkTreeModel *model = NULL;
   GtkTreeIter iter;
-  gchar *option_string = NULL;
   gboolean found = FALSE;
 
   if (!option)
     return;
 
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (option_menu));
-  option_string = g_locale_to_utf8 (option, -1, NULL, NULL, NULL);
 
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter)) {
 
@@ -824,13 +819,12 @@
     gtk_list_store_append (GTK_LIST_STORE (model), &iter);
     gtk_list_store_set (GTK_LIST_STORE (model), &iter, 
                         COLUMN_STRING_RAW, option,
-                        COLUMN_STRING_TRANSLATED, option_string, 
+                        COLUMN_STRING_TRANSLATED, option, 
                         COLUMN_SENSITIVE, TRUE,
                         -1);
   }
   if (active == TRUE)
     gtk_combo_box_set_active_iter (GTK_COMBO_BOX (option_menu), &iter);
-  g_free (option_string);
 }
 
 
@@ -979,7 +973,6 @@
   gpw->notebook = gtk_notebook_new ();
   gtk_notebook_set_show_tabs (GTK_NOTEBOOK (gpw->notebook), FALSE);
   gtk_notebook_set_show_border (GTK_NOTEBOOK (gpw->notebook), FALSE);
-  gtk_notebook_popup_enable (GTK_NOTEBOOK (gpw->notebook));
 
   pixmap =  gtk_image_new_from_file (logo_name);
 
diff -Nru ekiga-3.2.5/lib/gui/gm-text-smiley.c ekiga-3.2.6~ppa~karmic1/lib/gui/gm-text-smiley.c
--- ekiga-3.2.5/lib/gui/gm-text-smiley.c	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/gui/gm-text-smiley.c	2009-09-02 21:45:00.000000000 +0100
@@ -78,6 +78,10 @@
   char* found = NULL;
   gint found_start = 0;
 
+  /* all smileys are checked, and the one chosen is:
+     - the one which starts the soonest;
+     - in case of equality, the one which is the longest.
+  */
   for (smiley = 0;
        smileys[smiley] != NULL;
        smiley = smiley + 2) {
@@ -87,7 +91,8 @@
 
       found_start = found - full_text;
       if ((best_smiley == -1)
-	  || ((found_start <= best_start)
+          || (found_start < best_start)
+	  || ((found_start == best_start)
 	      && (strlen (smileys[smiley]) > strlen (smileys[best_smiley])))) {
 
 	best_smiley = smiley;
diff -Nru ekiga-3.2.5/lib/gui/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/gui/Makefile.in
--- ekiga-3.2.5/lib/gui/Makefile.in	2009-07-06 20:10:41.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/gui/Makefile.in	2009-09-22 15:36:30.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -55,6 +57,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -112,6 +115,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -141,10 +145,38 @@
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
@@ -254,6 +286,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -393,9 +426,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/gui/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/gui/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/gui/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -413,6 +446,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -458,213 +492,213 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 gm-smileys.lo: $(gui_dir)/gm-smileys.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-smileys.lo -MD -MP -MF $(DEPDIR)/gm-smileys.Tpo -c -o gm-smileys.lo `test -f '$(gui_dir)/gm-smileys.c' || echo '$(srcdir)/'`$(gui_dir)/gm-smileys.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gm-smileys.Tpo $(DEPDIR)/gm-smileys.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-smileys.lo -MD -MP -MF $(DEPDIR)/gm-smileys.Tpo -c -o gm-smileys.lo `test -f '$(gui_dir)/gm-smileys.c' || echo '$(srcdir)/'`$(gui_dir)/gm-smileys.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gm-smileys.Tpo $(DEPDIR)/gm-smileys.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gm-smileys.c' object='gm-smileys.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-smileys.lo `test -f '$(gui_dir)/gm-smileys.c' || echo '$(srcdir)/'`$(gui_dir)/gm-smileys.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-smileys.lo `test -f '$(gui_dir)/gm-smileys.c' || echo '$(srcdir)/'`$(gui_dir)/gm-smileys.c
 
 gmwindow.lo: $(gui_dir)/gmwindow.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmwindow.lo -MD -MP -MF $(DEPDIR)/gmwindow.Tpo -c -o gmwindow.lo `test -f '$(gui_dir)/gmwindow.c' || echo '$(srcdir)/'`$(gui_dir)/gmwindow.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmwindow.Tpo $(DEPDIR)/gmwindow.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmwindow.lo -MD -MP -MF $(DEPDIR)/gmwindow.Tpo -c -o gmwindow.lo `test -f '$(gui_dir)/gmwindow.c' || echo '$(srcdir)/'`$(gui_dir)/gmwindow.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmwindow.Tpo $(DEPDIR)/gmwindow.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmwindow.c' object='gmwindow.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmwindow.lo `test -f '$(gui_dir)/gmwindow.c' || echo '$(srcdir)/'`$(gui_dir)/gmwindow.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmwindow.lo `test -f '$(gui_dir)/gmwindow.c' || echo '$(srcdir)/'`$(gui_dir)/gmwindow.c
 
 gmconfwidgets.lo: $(gui_dir)/gmconfwidgets.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmconfwidgets.lo -MD -MP -MF $(DEPDIR)/gmconfwidgets.Tpo -c -o gmconfwidgets.lo `test -f '$(gui_dir)/gmconfwidgets.c' || echo '$(srcdir)/'`$(gui_dir)/gmconfwidgets.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmconfwidgets.Tpo $(DEPDIR)/gmconfwidgets.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmconfwidgets.lo -MD -MP -MF $(DEPDIR)/gmconfwidgets.Tpo -c -o gmconfwidgets.lo `test -f '$(gui_dir)/gmconfwidgets.c' || echo '$(srcdir)/'`$(gui_dir)/gmconfwidgets.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmconfwidgets.Tpo $(DEPDIR)/gmconfwidgets.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmconfwidgets.c' object='gmconfwidgets.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmconfwidgets.lo `test -f '$(gui_dir)/gmconfwidgets.c' || echo '$(srcdir)/'`$(gui_dir)/gmconfwidgets.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmconfwidgets.lo `test -f '$(gui_dir)/gmconfwidgets.c' || echo '$(srcdir)/'`$(gui_dir)/gmconfwidgets.c
 
 gmconnectbutton.lo: $(gui_dir)/gmconnectbutton.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmconnectbutton.lo -MD -MP -MF $(DEPDIR)/gmconnectbutton.Tpo -c -o gmconnectbutton.lo `test -f '$(gui_dir)/gmconnectbutton.c' || echo '$(srcdir)/'`$(gui_dir)/gmconnectbutton.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmconnectbutton.Tpo $(DEPDIR)/gmconnectbutton.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmconnectbutton.lo -MD -MP -MF $(DEPDIR)/gmconnectbutton.Tpo -c -o gmconnectbutton.lo `test -f '$(gui_dir)/gmconnectbutton.c' || echo '$(srcdir)/'`$(gui_dir)/gmconnectbutton.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmconnectbutton.Tpo $(DEPDIR)/gmconnectbutton.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmconnectbutton.c' object='gmconnectbutton.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmconnectbutton.lo `test -f '$(gui_dir)/gmconnectbutton.c' || echo '$(srcdir)/'`$(gui_dir)/gmconnectbutton.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmconnectbutton.lo `test -f '$(gui_dir)/gmconnectbutton.c' || echo '$(srcdir)/'`$(gui_dir)/gmconnectbutton.c
 
 gmdialog.lo: $(gui_dir)/gmdialog.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmdialog.lo -MD -MP -MF $(DEPDIR)/gmdialog.Tpo -c -o gmdialog.lo `test -f '$(gui_dir)/gmdialog.c' || echo '$(srcdir)/'`$(gui_dir)/gmdialog.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmdialog.Tpo $(DEPDIR)/gmdialog.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmdialog.lo -MD -MP -MF $(DEPDIR)/gmdialog.Tpo -c -o gmdialog.lo `test -f '$(gui_dir)/gmdialog.c' || echo '$(srcdir)/'`$(gui_dir)/gmdialog.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmdialog.Tpo $(DEPDIR)/gmdialog.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmdialog.c' object='gmdialog.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmdialog.lo `test -f '$(gui_dir)/gmdialog.c' || echo '$(srcdir)/'`$(gui_dir)/gmdialog.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmdialog.lo `test -f '$(gui_dir)/gmdialog.c' || echo '$(srcdir)/'`$(gui_dir)/gmdialog.c
 
 gmentrydialog.lo: $(gui_dir)/gmentrydialog.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmentrydialog.lo -MD -MP -MF $(DEPDIR)/gmentrydialog.Tpo -c -o gmentrydialog.lo `test -f '$(gui_dir)/gmentrydialog.c' || echo '$(srcdir)/'`$(gui_dir)/gmentrydialog.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmentrydialog.Tpo $(DEPDIR)/gmentrydialog.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmentrydialog.lo -MD -MP -MF $(DEPDIR)/gmentrydialog.Tpo -c -o gmentrydialog.lo `test -f '$(gui_dir)/gmentrydialog.c' || echo '$(srcdir)/'`$(gui_dir)/gmentrydialog.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmentrydialog.Tpo $(DEPDIR)/gmentrydialog.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmentrydialog.c' object='gmentrydialog.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmentrydialog.lo `test -f '$(gui_dir)/gmentrydialog.c' || echo '$(srcdir)/'`$(gui_dir)/gmentrydialog.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmentrydialog.lo `test -f '$(gui_dir)/gmentrydialog.c' || echo '$(srcdir)/'`$(gui_dir)/gmentrydialog.c
 
 gmlevelmeter.lo: $(gui_dir)/gmlevelmeter.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmlevelmeter.lo -MD -MP -MF $(DEPDIR)/gmlevelmeter.Tpo -c -o gmlevelmeter.lo `test -f '$(gui_dir)/gmlevelmeter.c' || echo '$(srcdir)/'`$(gui_dir)/gmlevelmeter.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmlevelmeter.Tpo $(DEPDIR)/gmlevelmeter.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmlevelmeter.lo -MD -MP -MF $(DEPDIR)/gmlevelmeter.Tpo -c -o gmlevelmeter.lo `test -f '$(gui_dir)/gmlevelmeter.c' || echo '$(srcdir)/'`$(gui_dir)/gmlevelmeter.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmlevelmeter.Tpo $(DEPDIR)/gmlevelmeter.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmlevelmeter.c' object='gmlevelmeter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmlevelmeter.lo `test -f '$(gui_dir)/gmlevelmeter.c' || echo '$(srcdir)/'`$(gui_dir)/gmlevelmeter.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmlevelmeter.lo `test -f '$(gui_dir)/gmlevelmeter.c' || echo '$(srcdir)/'`$(gui_dir)/gmlevelmeter.c
 
 gmmenuaddon.lo: $(gui_dir)/gmmenuaddon.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmmenuaddon.lo -MD -MP -MF $(DEPDIR)/gmmenuaddon.Tpo -c -o gmmenuaddon.lo `test -f '$(gui_dir)/gmmenuaddon.c' || echo '$(srcdir)/'`$(gui_dir)/gmmenuaddon.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmmenuaddon.Tpo $(DEPDIR)/gmmenuaddon.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmmenuaddon.lo -MD -MP -MF $(DEPDIR)/gmmenuaddon.Tpo -c -o gmmenuaddon.lo `test -f '$(gui_dir)/gmmenuaddon.c' || echo '$(srcdir)/'`$(gui_dir)/gmmenuaddon.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmmenuaddon.Tpo $(DEPDIR)/gmmenuaddon.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmmenuaddon.c' object='gmmenuaddon.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmmenuaddon.lo `test -f '$(gui_dir)/gmmenuaddon.c' || echo '$(srcdir)/'`$(gui_dir)/gmmenuaddon.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmmenuaddon.lo `test -f '$(gui_dir)/gmmenuaddon.c' || echo '$(srcdir)/'`$(gui_dir)/gmmenuaddon.c
 
 gmpreferences.lo: $(gui_dir)/gmpreferences.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmpreferences.lo -MD -MP -MF $(DEPDIR)/gmpreferences.Tpo -c -o gmpreferences.lo `test -f '$(gui_dir)/gmpreferences.c' || echo '$(srcdir)/'`$(gui_dir)/gmpreferences.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmpreferences.Tpo $(DEPDIR)/gmpreferences.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmpreferences.lo -MD -MP -MF $(DEPDIR)/gmpreferences.Tpo -c -o gmpreferences.lo `test -f '$(gui_dir)/gmpreferences.c' || echo '$(srcdir)/'`$(gui_dir)/gmpreferences.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmpreferences.Tpo $(DEPDIR)/gmpreferences.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmpreferences.c' object='gmpreferences.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmpreferences.lo `test -f '$(gui_dir)/gmpreferences.c' || echo '$(srcdir)/'`$(gui_dir)/gmpreferences.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmpreferences.lo `test -f '$(gui_dir)/gmpreferences.c' || echo '$(srcdir)/'`$(gui_dir)/gmpreferences.c
 
 gmstatusbar.lo: $(gui_dir)/gmstatusbar.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmstatusbar.lo -MD -MP -MF $(DEPDIR)/gmstatusbar.Tpo -c -o gmstatusbar.lo `test -f '$(gui_dir)/gmstatusbar.c' || echo '$(srcdir)/'`$(gui_dir)/gmstatusbar.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmstatusbar.Tpo $(DEPDIR)/gmstatusbar.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmstatusbar.lo -MD -MP -MF $(DEPDIR)/gmstatusbar.Tpo -c -o gmstatusbar.lo `test -f '$(gui_dir)/gmstatusbar.c' || echo '$(srcdir)/'`$(gui_dir)/gmstatusbar.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmstatusbar.Tpo $(DEPDIR)/gmstatusbar.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmstatusbar.c' object='gmstatusbar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmstatusbar.lo `test -f '$(gui_dir)/gmstatusbar.c' || echo '$(srcdir)/'`$(gui_dir)/gmstatusbar.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmstatusbar.lo `test -f '$(gui_dir)/gmstatusbar.c' || echo '$(srcdir)/'`$(gui_dir)/gmstatusbar.c
 
 gmstockicons.lo: $(gui_dir)/gmstockicons.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmstockicons.lo -MD -MP -MF $(DEPDIR)/gmstockicons.Tpo -c -o gmstockicons.lo `test -f '$(gui_dir)/gmstockicons.c' || echo '$(srcdir)/'`$(gui_dir)/gmstockicons.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmstockicons.Tpo $(DEPDIR)/gmstockicons.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmstockicons.lo -MD -MP -MF $(DEPDIR)/gmstockicons.Tpo -c -o gmstockicons.lo `test -f '$(gui_dir)/gmstockicons.c' || echo '$(srcdir)/'`$(gui_dir)/gmstockicons.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmstockicons.Tpo $(DEPDIR)/gmstockicons.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmstockicons.c' object='gmstockicons.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmstockicons.lo `test -f '$(gui_dir)/gmstockicons.c' || echo '$(srcdir)/'`$(gui_dir)/gmstockicons.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmstockicons.lo `test -f '$(gui_dir)/gmstockicons.c' || echo '$(srcdir)/'`$(gui_dir)/gmstockicons.c
 
 gmpowermeter.lo: $(gui_dir)/gmpowermeter.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmpowermeter.lo -MD -MP -MF $(DEPDIR)/gmpowermeter.Tpo -c -o gmpowermeter.lo `test -f '$(gui_dir)/gmpowermeter.c' || echo '$(srcdir)/'`$(gui_dir)/gmpowermeter.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmpowermeter.Tpo $(DEPDIR)/gmpowermeter.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmpowermeter.lo -MD -MP -MF $(DEPDIR)/gmpowermeter.Tpo -c -o gmpowermeter.lo `test -f '$(gui_dir)/gmpowermeter.c' || echo '$(srcdir)/'`$(gui_dir)/gmpowermeter.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmpowermeter.Tpo $(DEPDIR)/gmpowermeter.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmpowermeter.c' object='gmpowermeter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmpowermeter.lo `test -f '$(gui_dir)/gmpowermeter.c' || echo '$(srcdir)/'`$(gui_dir)/gmpowermeter.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmpowermeter.lo `test -f '$(gui_dir)/gmpowermeter.c' || echo '$(srcdir)/'`$(gui_dir)/gmpowermeter.c
 
 gmcellrendererexpander.lo: $(gui_dir)/gmcellrendererexpander.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmcellrendererexpander.lo -MD -MP -MF $(DEPDIR)/gmcellrendererexpander.Tpo -c -o gmcellrendererexpander.lo `test -f '$(gui_dir)/gmcellrendererexpander.c' || echo '$(srcdir)/'`$(gui_dir)/gmcellrendererexpander.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gmcellrendererexpander.Tpo $(DEPDIR)/gmcellrendererexpander.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gmcellrendererexpander.lo -MD -MP -MF $(DEPDIR)/gmcellrendererexpander.Tpo -c -o gmcellrendererexpander.lo `test -f '$(gui_dir)/gmcellrendererexpander.c' || echo '$(srcdir)/'`$(gui_dir)/gmcellrendererexpander.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gmcellrendererexpander.Tpo $(DEPDIR)/gmcellrendererexpander.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gmcellrendererexpander.c' object='gmcellrendererexpander.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmcellrendererexpander.lo `test -f '$(gui_dir)/gmcellrendererexpander.c' || echo '$(srcdir)/'`$(gui_dir)/gmcellrendererexpander.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gmcellrendererexpander.lo `test -f '$(gui_dir)/gmcellrendererexpander.c' || echo '$(srcdir)/'`$(gui_dir)/gmcellrendererexpander.c
 
 gm-cell-renderer-bitext.lo: $(gui_dir)/gm-cell-renderer-bitext.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-cell-renderer-bitext.lo -MD -MP -MF $(DEPDIR)/gm-cell-renderer-bitext.Tpo -c -o gm-cell-renderer-bitext.lo `test -f '$(gui_dir)/gm-cell-renderer-bitext.c' || echo '$(srcdir)/'`$(gui_dir)/gm-cell-renderer-bitext.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gm-cell-renderer-bitext.Tpo $(DEPDIR)/gm-cell-renderer-bitext.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-cell-renderer-bitext.lo -MD -MP -MF $(DEPDIR)/gm-cell-renderer-bitext.Tpo -c -o gm-cell-renderer-bitext.lo `test -f '$(gui_dir)/gm-cell-renderer-bitext.c' || echo '$(srcdir)/'`$(gui_dir)/gm-cell-renderer-bitext.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gm-cell-renderer-bitext.Tpo $(DEPDIR)/gm-cell-renderer-bitext.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gm-cell-renderer-bitext.c' object='gm-cell-renderer-bitext.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-cell-renderer-bitext.lo `test -f '$(gui_dir)/gm-cell-renderer-bitext.c' || echo '$(srcdir)/'`$(gui_dir)/gm-cell-renderer-bitext.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-cell-renderer-bitext.lo `test -f '$(gui_dir)/gm-cell-renderer-bitext.c' || echo '$(srcdir)/'`$(gui_dir)/gm-cell-renderer-bitext.c
 
 gm-text-buffer-enhancer-helper-iface.lo: $(gui_dir)/gm-text-buffer-enhancer-helper-iface.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-buffer-enhancer-helper-iface.lo -MD -MP -MF $(DEPDIR)/gm-text-buffer-enhancer-helper-iface.Tpo -c -o gm-text-buffer-enhancer-helper-iface.lo `test -f '$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gm-text-buffer-enhancer-helper-iface.Tpo $(DEPDIR)/gm-text-buffer-enhancer-helper-iface.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-buffer-enhancer-helper-iface.lo -MD -MP -MF $(DEPDIR)/gm-text-buffer-enhancer-helper-iface.Tpo -c -o gm-text-buffer-enhancer-helper-iface.lo `test -f '$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gm-text-buffer-enhancer-helper-iface.Tpo $(DEPDIR)/gm-text-buffer-enhancer-helper-iface.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c' object='gm-text-buffer-enhancer-helper-iface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-buffer-enhancer-helper-iface.lo `test -f '$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-buffer-enhancer-helper-iface.lo `test -f '$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-buffer-enhancer-helper-iface.c
 
 gm-text-anchored-tag.lo: $(gui_dir)/gm-text-anchored-tag.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-anchored-tag.lo -MD -MP -MF $(DEPDIR)/gm-text-anchored-tag.Tpo -c -o gm-text-anchored-tag.lo `test -f '$(gui_dir)/gm-text-anchored-tag.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-anchored-tag.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gm-text-anchored-tag.Tpo $(DEPDIR)/gm-text-anchored-tag.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-anchored-tag.lo -MD -MP -MF $(DEPDIR)/gm-text-anchored-tag.Tpo -c -o gm-text-anchored-tag.lo `test -f '$(gui_dir)/gm-text-anchored-tag.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-anchored-tag.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gm-text-anchored-tag.Tpo $(DEPDIR)/gm-text-anchored-tag.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gm-text-anchored-tag.c' object='gm-text-anchored-tag.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-anchored-tag.lo `test -f '$(gui_dir)/gm-text-anchored-tag.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-anchored-tag.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-anchored-tag.lo `test -f '$(gui_dir)/gm-text-anchored-tag.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-anchored-tag.c
 
 gm-text-smiley.lo: $(gui_dir)/gm-text-smiley.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-smiley.lo -MD -MP -MF $(DEPDIR)/gm-text-smiley.Tpo -c -o gm-text-smiley.lo `test -f '$(gui_dir)/gm-text-smiley.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-smiley.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gm-text-smiley.Tpo $(DEPDIR)/gm-text-smiley.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-smiley.lo -MD -MP -MF $(DEPDIR)/gm-text-smiley.Tpo -c -o gm-text-smiley.lo `test -f '$(gui_dir)/gm-text-smiley.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-smiley.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gm-text-smiley.Tpo $(DEPDIR)/gm-text-smiley.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gm-text-smiley.c' object='gm-text-smiley.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-smiley.lo `test -f '$(gui_dir)/gm-text-smiley.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-smiley.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-smiley.lo `test -f '$(gui_dir)/gm-text-smiley.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-smiley.c
 
 gm-text-extlink.lo: $(gui_dir)/gm-text-extlink.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-extlink.lo -MD -MP -MF $(DEPDIR)/gm-text-extlink.Tpo -c -o gm-text-extlink.lo `test -f '$(gui_dir)/gm-text-extlink.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-extlink.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gm-text-extlink.Tpo $(DEPDIR)/gm-text-extlink.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-extlink.lo -MD -MP -MF $(DEPDIR)/gm-text-extlink.Tpo -c -o gm-text-extlink.lo `test -f '$(gui_dir)/gm-text-extlink.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-extlink.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gm-text-extlink.Tpo $(DEPDIR)/gm-text-extlink.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gm-text-extlink.c' object='gm-text-extlink.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-extlink.lo `test -f '$(gui_dir)/gm-text-extlink.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-extlink.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-extlink.lo `test -f '$(gui_dir)/gm-text-extlink.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-extlink.c
 
 gm-text-buffer-enhancer.lo: $(gui_dir)/gm-text-buffer-enhancer.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-buffer-enhancer.lo -MD -MP -MF $(DEPDIR)/gm-text-buffer-enhancer.Tpo -c -o gm-text-buffer-enhancer.lo `test -f '$(gui_dir)/gm-text-buffer-enhancer.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-buffer-enhancer.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gm-text-buffer-enhancer.Tpo $(DEPDIR)/gm-text-buffer-enhancer.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-text-buffer-enhancer.lo -MD -MP -MF $(DEPDIR)/gm-text-buffer-enhancer.Tpo -c -o gm-text-buffer-enhancer.lo `test -f '$(gui_dir)/gm-text-buffer-enhancer.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-buffer-enhancer.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gm-text-buffer-enhancer.Tpo $(DEPDIR)/gm-text-buffer-enhancer.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gm-text-buffer-enhancer.c' object='gm-text-buffer-enhancer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-buffer-enhancer.lo `test -f '$(gui_dir)/gm-text-buffer-enhancer.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-buffer-enhancer.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-text-buffer-enhancer.lo `test -f '$(gui_dir)/gm-text-buffer-enhancer.c' || echo '$(srcdir)/'`$(gui_dir)/gm-text-buffer-enhancer.c
 
 gm-smiley-chooser-button.lo: $(gui_dir)/gm-smiley-chooser-button.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-smiley-chooser-button.lo -MD -MP -MF $(DEPDIR)/gm-smiley-chooser-button.Tpo -c -o gm-smiley-chooser-button.lo `test -f '$(gui_dir)/gm-smiley-chooser-button.c' || echo '$(srcdir)/'`$(gui_dir)/gm-smiley-chooser-button.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gm-smiley-chooser-button.Tpo $(DEPDIR)/gm-smiley-chooser-button.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gm-smiley-chooser-button.lo -MD -MP -MF $(DEPDIR)/gm-smiley-chooser-button.Tpo -c -o gm-smiley-chooser-button.lo `test -f '$(gui_dir)/gm-smiley-chooser-button.c' || echo '$(srcdir)/'`$(gui_dir)/gm-smiley-chooser-button.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gm-smiley-chooser-button.Tpo $(DEPDIR)/gm-smiley-chooser-button.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(gui_dir)/gm-smiley-chooser-button.c' object='gm-smiley-chooser-button.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-smiley-chooser-button.lo `test -f '$(gui_dir)/gm-smiley-chooser-button.c' || echo '$(srcdir)/'`$(gui_dir)/gm-smiley-chooser-button.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gm-smiley-chooser-button.lo `test -f '$(gui_dir)/gm-smiley-chooser-button.c' || echo '$(srcdir)/'`$(gui_dir)/gm-smiley-chooser-button.c
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 codecsbox.lo: $(gui_dir)/codecsbox.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT codecsbox.lo -MD -MP -MF $(DEPDIR)/codecsbox.Tpo -c -o codecsbox.lo `test -f '$(gui_dir)/codecsbox.cpp' || echo '$(srcdir)/'`$(gui_dir)/codecsbox.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/codecsbox.Tpo $(DEPDIR)/codecsbox.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT codecsbox.lo -MD -MP -MF $(DEPDIR)/codecsbox.Tpo -c -o codecsbox.lo `test -f '$(gui_dir)/codecsbox.cpp' || echo '$(srcdir)/'`$(gui_dir)/codecsbox.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/codecsbox.Tpo $(DEPDIR)/codecsbox.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gui_dir)/codecsbox.cpp' object='codecsbox.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o codecsbox.lo `test -f '$(gui_dir)/codecsbox.cpp' || echo '$(srcdir)/'`$(gui_dir)/codecsbox.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o codecsbox.lo `test -f '$(gui_dir)/codecsbox.cpp' || echo '$(srcdir)/'`$(gui_dir)/codecsbox.cpp
 
 xwindow.lo: $(gui_dir)/xwindow.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xwindow.lo -MD -MP -MF $(DEPDIR)/xwindow.Tpo -c -o xwindow.lo `test -f '$(gui_dir)/xwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/xwindow.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xwindow.Tpo $(DEPDIR)/xwindow.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xwindow.lo -MD -MP -MF $(DEPDIR)/xwindow.Tpo -c -o xwindow.lo `test -f '$(gui_dir)/xwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/xwindow.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xwindow.Tpo $(DEPDIR)/xwindow.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gui_dir)/xwindow.cpp' object='xwindow.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xwindow.lo `test -f '$(gui_dir)/xwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/xwindow.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xwindow.lo `test -f '$(gui_dir)/xwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/xwindow.cpp
 
 xvwindow.lo: $(gui_dir)/xvwindow.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xvwindow.lo -MD -MP -MF $(DEPDIR)/xvwindow.Tpo -c -o xvwindow.lo `test -f '$(gui_dir)/xvwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/xvwindow.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xvwindow.Tpo $(DEPDIR)/xvwindow.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xvwindow.lo -MD -MP -MF $(DEPDIR)/xvwindow.Tpo -c -o xvwindow.lo `test -f '$(gui_dir)/xvwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/xvwindow.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xvwindow.Tpo $(DEPDIR)/xvwindow.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gui_dir)/xvwindow.cpp' object='xvwindow.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xvwindow.lo `test -f '$(gui_dir)/xvwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/xvwindow.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xvwindow.lo `test -f '$(gui_dir)/xvwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/xvwindow.cpp
 
 dxwindow.lo: $(gui_dir)/dxwindow.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dxwindow.lo -MD -MP -MF $(DEPDIR)/dxwindow.Tpo -c -o dxwindow.lo `test -f '$(gui_dir)/dxwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/dxwindow.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dxwindow.Tpo $(DEPDIR)/dxwindow.Plo
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dxwindow.lo -MD -MP -MF $(DEPDIR)/dxwindow.Tpo -c -o dxwindow.lo `test -f '$(gui_dir)/dxwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/dxwindow.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dxwindow.Tpo $(DEPDIR)/dxwindow.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gui_dir)/dxwindow.cpp' object='dxwindow.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dxwindow.lo `test -f '$(gui_dir)/dxwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/dxwindow.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dxwindow.lo `test -f '$(gui_dir)/dxwindow.cpp' || echo '$(srcdir)/'`$(gui_dir)/dxwindow.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -696,7 +730,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -730,16 +764,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -754,7 +788,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -766,7 +800,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -775,29 +809,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -818,29 +857,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -870,6 +924,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -891,6 +946,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -899,18 +956,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -933,8 +1000,8 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -951,6 +1018,7 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/Makefile.in
--- ekiga-3.2.5/lib/Makefile.in	2009-07-06 20:10:36.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/Makefile.in	2009-09-22 15:36:21.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -44,6 +46,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libekiga_la_DEPENDENCIES = gmconf/libgmconf.la gui/libgmwidgets.la \
 	toolbox/libtoolbox.la platform/libgmplatform.la \
@@ -56,6 +59,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -76,10 +80,38 @@
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = gmconf gui toolbox platform pixops engine
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
@@ -189,6 +221,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -308,9 +341,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -328,6 +361,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -350,21 +384,21 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -399,7 +433,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -433,16 +467,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -457,7 +491,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -469,7 +503,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -478,29 +512,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -521,29 +560,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -575,6 +629,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -597,6 +652,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -605,18 +662,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -639,8 +706,9 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+	ctags-recursive install install-am install-strip \
+	tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -663,6 +731,7 @@
 
 gmmarshallers.c: gmmarshallers.list
 	$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_marshal $^ --body > $@.tmp && mv $@.tmp $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/pixops/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/pixops/Makefile.in
--- ekiga-3.2.5/lib/pixops/Makefile.in	2009-07-06 20:10:41.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/pixops/Makefile.in	2009-09-22 15:36:30.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -44,6 +46,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libpixops_la_LIBADD =
 am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \
@@ -62,6 +65,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
 LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -190,6 +194,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -316,9 +321,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/pixops/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/pixops/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/pixops/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/pixops/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -336,6 +341,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -349,11 +355,13 @@
 	$(LINK)  $(libpixops_la_OBJECTS) $(libpixops_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES) 
 	@rm -f timescale$(EXEEXT)
 	$(LINK) $(timescale_OBJECTS) $(timescale_LDADD) $(LIBS)
@@ -373,42 +381,42 @@
 
 .S.o:
 @am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCCAS_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCCAS_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCCAS_FALSE@	$(CPPASCOMPILE) -c -o $@ $<
 
 .S.obj:
 @am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCCAS_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCCAS_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCCAS_FALSE@	$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .S.lo:
 @am__fastdepCCAS_TRUE@	$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCCAS_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCCAS_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCCAS_FALSE@	$(LTCPPASCOMPILE) -c -o $@ $<
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -431,7 +439,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -439,29 +447,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -482,13 +495,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -516,6 +533,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -537,6 +555,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -545,18 +565,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -595,6 +625,7 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/platform/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/platform/Makefile.in
--- ekiga-3.2.5/lib/platform/Makefile.in	2009-07-06 20:10:41.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/platform/Makefile.in	2009-09-22 15:36:30.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -44,6 +46,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgmplatform_la_LIBADD =
 am__libgmplatform_la_SOURCES_DIST = gm-platform.h platform-win32.c \
@@ -58,6 +61,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -181,6 +185,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -289,9 +294,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/platform/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/platform/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/platform/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/platform/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -309,6 +314,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -332,21 +338,21 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -369,7 +375,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -377,29 +383,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -420,13 +431,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -454,6 +469,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -475,6 +491,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -483,18 +501,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -532,6 +560,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/toolbox/Makefile.in ekiga-3.2.6~ppa~karmic1/lib/toolbox/Makefile.in
--- ekiga-3.2.5/lib/toolbox/Makefile.in	2009-07-06 20:10:41.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/toolbox/Makefile.in	2009-09-22 15:36:30.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -45,6 +47,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libtoolbox_la_LIBADD =
 am__libtoolbox_la_SOURCES_DIST = toolbox.h toolbox-common.c \
@@ -62,6 +65,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -185,6 +189,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -292,9 +297,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/toolbox/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/toolbox/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/toolbox/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lib/toolbox/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -312,6 +317,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -338,21 +344,21 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -375,7 +381,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -383,29 +389,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -426,13 +437,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -460,6 +475,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -481,6 +497,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -489,18 +507,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -538,6 +566,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/lib/toolbox/toolbox-gnome.c ekiga-3.2.6~ppa~karmic1/lib/toolbox/toolbox-gnome.c
--- ekiga-3.2.5/lib/toolbox/toolbox-gnome.c	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/lib/toolbox/toolbox-gnome.c	2009-08-08 16:49:30.000000000 +0100
@@ -38,7 +38,7 @@
 #include "toolbox-internal.h"
 
 #undef GTK_DISABLE_DEPRECATED
-#include <gnome.h>
+#include <libgnome/gnome-url.h>
 
 void
 gm_open_uri (const gchar *uri)
diff -Nru ekiga-3.2.5/Makefile.am ekiga-3.2.6~ppa~karmic1/Makefile.am
--- ekiga-3.2.5/Makefile.am	2009-07-04 14:46:06.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/Makefile.am	2009-09-22 15:27:35.000000000 +0100
@@ -50,7 +50,6 @@
         LICENSE                                                 \
         MAINTAINERS                                             \
 	$(SCHEMAS_FILE) 					\
-	gnome-doc-utils.make					\
 	lib/gmmarshallers.list					\
 	$(WIN32_DIST)
 
diff -Nru ekiga-3.2.5/Makefile.in ekiga-3.2.6~ppa~karmic1/Makefile.in
--- ekiga-3.2.5/Makefile.in	2009-07-06 20:10:42.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/Makefile.in	2009-09-22 15:36:31.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -52,6 +54,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = Doxyfile ekiga.schemas.in ekiga.desktop.in
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -66,14 +69,30 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(Applicationsdir)" \
 	"$(DESTDIR)$(schemasdir)"
-ApplicationsDATA_INSTALL = $(INSTALL_DATA)
-schemasDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(Applications_DATA) $(schemas_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = man sounds pixmaps lib src po help
@@ -81,9 +100,34 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
@@ -197,6 +241,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -322,7 +367,6 @@
         LICENSE                                                 \
         MAINTAINERS                                             \
 	$(SCHEMAS_FILE) 					\
-	gnome-doc-utils.make					\
 	lib/gmmarshallers.list					\
 	$(WIN32_DIST)
 
@@ -348,15 +392,15 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -372,9 +416,10 @@
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -386,7 +431,7 @@
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
@@ -410,37 +455,43 @@
 install-ApplicationsDATA: $(Applications_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(Applicationsdir)" || $(MKDIR_P) "$(DESTDIR)$(Applicationsdir)"
-	@list='$(Applications_DATA)'; for p in $$list; do \
+	@list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(ApplicationsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Applicationsdir)/$$f'"; \
-	  $(ApplicationsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Applicationsdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Applicationsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(Applicationsdir)" || exit $$?; \
 	done
 
 uninstall-ApplicationsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(Applications_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(Applicationsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(Applicationsdir)/$$f"; \
-	done
+	@list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(Applicationsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(Applicationsdir)" && rm -f $$files
 install-schemasDATA: $(schemas_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
-	@list='$(schemas_DATA)'; for p in $$list; do \
+	@list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(schemasDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemasdir)/$$f'"; \
-	  $(schemasDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemasdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemasdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(schemasdir)" || exit $$?; \
 	done
 
 uninstall-schemasDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(schemas_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(schemasdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(schemasdir)/$$f"; \
-	done
+	@list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(schemasdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -466,7 +517,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -500,16 +551,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -524,7 +575,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -536,7 +587,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -545,36 +596,41 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -590,38 +646,54 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@@ -634,6 +706,10 @@
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -662,6 +738,8 @@
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -673,9 +751,11 @@
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -697,13 +777,15 @@
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -748,6 +830,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -769,6 +852,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -778,18 +863,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -812,17 +907,17 @@
 
 uninstall-am: uninstall-ApplicationsDATA uninstall-schemasDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install \
-	install-ApplicationsDATA install-am install-data \
+	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-ApplicationsDATA install-am install-data \
 	install-data-am install-data-local install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
@@ -844,6 +939,7 @@
 
 @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: install-schemas 
 @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/man/Makefile.in ekiga-3.2.6~ppa~karmic1/man/Makefile.in
--- ekiga-3.2.5/man/Makefile.in	2009-07-06 20:10:41.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/man/Makefile.in	2009-09-22 15:36:31.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -41,8 +43,30 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
@@ -157,6 +181,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -257,9 +282,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  man/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -277,57 +302,51 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
 	done; \
-	for i in $$list; do \
-	  if test -f $$i; then file=$$i; \
-	  else file=$(srcdir)/$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
 tags: TAGS
 TAGS:
 
@@ -336,6 +355,19 @@
 
 
 distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -351,13 +383,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -388,6 +424,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -406,6 +443,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -414,18 +453,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man: install-man1
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -462,6 +511,7 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-man uninstall-man1
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/missing ekiga-3.2.6~ppa~karmic1/missing
--- ekiga-3.2.5/missing	2009-07-06 20:10:36.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/missing	2009-09-22 15:36:21.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
   tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
     ;;
@@ -106,15 +107,22 @@
 
 esac
 
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
-# the program).
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
 case $1 in
-  lex|yacc)
+  lex*|yacc*)
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar)
+  tar*)
     if test -n "$run"; then
        echo 1>&2 "ERROR: \`tar' requires --run"
        exit 1
@@ -138,7 +146,7 @@
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case $1 in
+case $program in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -148,7 +156,7 @@
     touch aclocal.m4
     ;;
 
-  autoconf)
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -157,7 +165,7 @@
     touch configure
     ;;
 
-  autoheader)
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -187,7 +195,7 @@
 	   while read f; do touch "$f"; done
     ;;
 
-  autom4te)
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -210,7 +218,7 @@
     fi
     ;;
 
-  bison|yacc)
+  bison*|yacc*)
     echo 1>&2 "\
 WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
@@ -240,7 +248,7 @@
     fi
     ;;
 
-  lex|flex)
+  lex*|flex*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
@@ -263,7 +271,7 @@
     fi
     ;;
 
-  help2man)
+  help2man*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
@@ -277,11 +285,11 @@
     else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit 1
+	exit $?
     fi
     ;;
 
-  makeinfo)
+  makeinfo*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
     touch $file
     ;;
 
-  tar)
+  tar*)
     shift
 
     # We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -Nru ekiga-3.2.5/mkinstalldirs ekiga-3.2.6~ppa~karmic1/mkinstalldirs
--- ekiga-3.2.5/mkinstalldirs	2009-07-06 20:10:42.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/mkinstalldirs	2009-09-22 15:36:31.000000000 +0100
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2006-05-11.19
+scriptversion=2009-04-28.21; # UTC
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -157,5 +157,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -Nru ekiga-3.2.5/NEWS ekiga-3.2.6~ppa~karmic1/NEWS
--- ekiga-3.2.5/NEWS	2009-07-06 20:09:33.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/NEWS	2009-09-22 15:27:35.000000000 +0100
@@ -1,4 +1,95 @@
                           -*- mode: outline -*-
+* Changes in ekiga 3.2.6 (2009-09-22)
+** User-visible fixes
+- Fixed crashes shown as assertion failed in /usr/include/ptlib/safecoll.h:813
+- Fixed crash when device list is empty or contains non-latin1 characters
+- Fixed crash when pressing shift-f10 (popup menu) in Preferences window
+- Fixed possible crash when garbage collecting REGISTER requests
+- Fixed possible segfault when receiving a NOTIFY
+- Fixed freeze by preventing SIP handlers retry timer from executing
+  during destruction
+- Fixed freeze during packet write
+- Fixed "Lockup after a day of idle" in publishing code
+- Fixed various deadlocks in the OPAL subscription code
+- Added "%limit" workaround for registrars which refuse several
+  contacts during registration
+- Fixed "Contacts never go offline"
+- Fixed "New SIP account mangles fields if Authentications User is empty"
+- Make sure the output device is set before a call
+- Fixed port handling when registering to a proxy with a non-standard port
+- Fixed "In some circumstances, smileys are not displayed graphically"
+- Improved audio latency when not collecting all of the audio data
+- Fixed the newmessage.wav file
+- Fixed "Accounts were automatically active after editing them"
+- Make possible to register e.g. user@a.b as user name as required by
+  some providers
+- Remove deprecated "Encoding" field from desktop file
+
+** Protocol fixes
+- Fixed problem with REGISTER IntervalTooBrief response handling not
+  using correct interface for new transaction
+- Fixed "480 Temporarily Unavailable" response handling
+- Fixed problem with doing DNS lookup when using explicit proxy or
+  presence agent
+- Fixed problem with PUBLISH using wrong expiry after Interval Too Brief
+  error
+- If we find no authentication information when subscribing, keep trying
+  as it could become available at a later stage
+- Changed so does not put both global and media specific connection
+  addresses in SDP if they are the same (needed for freephonie SIP
+  registrar)
+- Fixed support for unusual SIP "start with hold", that is an initial
+  offer INVITE with a connection address of 0.0.0.0
+- Fixed failure to retry (after a suitable period) REGISTER/SUBSCRIBE
+  if get transport level timeout
+- Added closing of our local media streams if remote sends a re-INVITE
+  and leaves out streams (e.g. video) that were there previously
+- Fixed problems when can not bind to any interface
+- Fixed various problems with some SDP options
+- Fixed regression where the username would be lost from the Contact
+  field
+- Fixed invalid request-uri in BYE request
+- Fixed issue with overlapping INVITEs
+- Fixed H.263-1998 plug in compilation, by asking latest avcodec
+- Fixed "OpalBitRateCalculator limits bitrates"
+- Fixed "SIP wrong response on a failed REFER-request"
+- Fixed "SIP: OK response to CANCEL incomplete"
+- Do not send "100 Trying" message when receiving a NOTIFY message
+- Fixed incorrect register/subscribe refresh timer calculation
+
+** Build fixes
+- Support building on kFreeBSD
+- Fixed problem with moving libsoup api
+- Various fixes for SIP and H323 configuration
+- Fixed "A build error when generating SunAudio ptlib plugin"
+- Fixed "The video convertor of YUY2toYUV420P in ptlib does not work"
+- Fixed "The absence of libv4l2 should not block V4L2 ptlib plugin"
+- and other minor changes
+
+** Windows port fixes
+- Thanks to Michael Rickmann's continuous work, Windows port has
+  reached a quality almost comparable to GNU/Linux version.  We invite
+  people to test it, see ekiga wiki.  Some improvements:
+  - shortened audio delay
+  - DirectX video input and output
+  - device name handling
+  - fixed audio volume
+  - fixed building with mingw
+  - made so the linker doesn't find main on win32
+  - Keep the output sound volume across calls
+
+** Distributor-visible changes
+- Changed default for AVC plug in to be disabled until someone fixes
+  the plug in
+- Note: Pulse audio server does not play nicely with ekiga, very high
+  latencies are noticed
+
+** Translation fixes
+- Updated translations: ar, bn, et, ga, hi, hu, ko, lt, ml, nb, sr,
+  sr@latin, uk, zh_HK, zh_TW
+- New translations: ca@valencia
+- Updated help translations: de
+
 * Changes in ekiga 3.2.5 (2009-07-06)
 - Fixed very low rate of sent images during video conversations
 - Fixed crash in LDAP
diff -Nru ekiga-3.2.5/pixmaps/Makefile.in ekiga-3.2.6~ppa~karmic1/pixmaps/Makefile.in
--- ekiga-3.2.5/pixmaps/Makefile.in	2009-07-06 20:10:42.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/pixmaps/Makefile.in	2009-09-22 15:36:31.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -43,6 +45,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -50,10 +53,23 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)"
-nobase_dist_iconDATA_INSTALL = $(install_sh_DATA)
-pixmapDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(nobase_dist_icon_DATA) $(noinst_DATA) $(pixmap_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -165,6 +181,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -368,9 +385,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pixmaps/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  pixmaps/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu pixmaps/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -388,6 +405,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -397,39 +415,46 @@
 install-nobase_dist_iconDATA: $(nobase_dist_icon_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
-	@$(am__vpath_adj_setup) \
-	list='$(nobase_dist_icon_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  $(am__vpath_adj) \
-	  echo " $(nobase_dist_iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
-	  $(nobase_dist_iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
+	@list='$(nobase_dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(icondir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(icondir)/$$dir"; }; \
+	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(icondir)/$$dir'"; \
+	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(icondir)/$$dir" || exit $$?; }; \
 	done
 
 uninstall-nobase_dist_iconDATA:
 	@$(NORMAL_UNINSTALL)
-	@$(am__vpath_adj_setup) \
-	list='$(nobase_dist_icon_DATA)'; for p in $$list; do \
-	  $(am__vpath_adj) \
-	  echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(icondir)/$$f"; \
-	done
+	@list='$(nobase_dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(icondir)" && rm -f $$files
 install-pixmapDATA: $(pixmap_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
-	@list='$(pixmap_DATA)'; for p in $$list; do \
+	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pixmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapdir)/$$f'"; \
-	  $(pixmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapdir)" || exit $$?; \
 	done
 
 uninstall-pixmapDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pixmap_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pixmapdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pixmapdir)/$$f"; \
-	done
+	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pixmapdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -453,13 +478,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -490,6 +519,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -509,6 +539,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -516,21 +548,30 @@
 install-data-am: install-nobase_dist_iconDATA install-pixmapDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -552,7 +593,6 @@
 uninstall-am: uninstall-nobase_dist_iconDATA uninstall-pixmapDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-
 .MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
@@ -585,6 +625,7 @@
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/po/ar.po ekiga-3.2.6~ppa~karmic1/po/ar.po
--- ekiga-3.2.5/po/ar.po	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/ar.po	2009-09-22 15:27:35.000000000 +0100
@@ -1,29 +1,28 @@
 # translation of ekiga.HEAD.ar.po to Arabic
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER.
-#
 # Ossama Khayat <okhayat@yahoo.com>, 2003.
 # Ossama M. Khayat <okhayat@yahoo.com>, 2003, 2004, 2007.
 # Djihed Afifi <djihed@gmail.com, 2006.
 # Mohamed Magdy <alnokta@yahoo.com>, 2006.
-# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2007, 2008.
+# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2007, 2008, 2009.
 # Anas Afif Emad <anas.e87@gmail.com>, 2008, 2009.
-#: ../lib/engine/components/resource-list/rl-entry.cpp:163
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
 "Project-Id-Version: ekiga.HEAD.ar\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=ekiga&component=general\n"
-"POT-Creation-Date: 2009-03-17 10:47+0000\n"
-"PO-Revision-Date: 2009-02-09 22:07+0300\n"
-"Last-Translator: Osama Khalid <osamak.wfm@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-21 20:17+0300\n"
+"PO-Revision-Date: 2009-08-21 20:18+0300\n"
+"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Generator: Virtaal 0.4.0\n"
 
 #: ../ekiga.desktop.in.in.h:1
 msgid "Ekiga Softphone"
@@ -122,7 +121,7 @@
 msgid "Disable video hardware acceleration"
 msgstr "تعطيل تسريع فيديو العتاد"
 
-#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3586
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3591
 msgid "Display images from your camera device"
 msgstr "أظهر الصور من جهاز كاميرتك"
 
@@ -372,7 +371,7 @@
 msgid "Show offline contacts"
 msgstr "أعرض المراسلين غير المتصلين"
 
-#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3215
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3220
 msgid "Show the call panel"
 msgstr "أظهر لوحة المكالمة"
 
@@ -728,7 +727,7 @@
 msgid "Video format"
 msgstr "تنسيق الفيديو"
 
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1155
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr "جهاز دخل الفيديو"
 
@@ -749,34 +748,34 @@
 "إما الرغبة في دعم المعدل الاقصى للاطار أو التقليل منه ما أمكن من أجل الحفاظ "
 "على مستوى أدنى من الجودة لكل الأطر. 0:  أعلى جودة دنيا، 31: أقل جودة دنيا"
 
-#: ../lib/engine/addressbook/contact-core.cpp:58
+#: ../lib/engine/addressbook/contact-core.cpp:60
 msgid "_Find"
 msgstr "ا_بحث"
 
 #: ../lib/engine/components/avahi/avahi-heap.cpp:125
-#: ../lib/engine/components/avahi/avahi-heap.cpp:306
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
 msgid "Neighbours"
 msgstr "جيران"
 
-#: ../lib/engine/components/call-history/history-book.cpp:140
+#: ../lib/engine/components/call-history/history-book.cpp:137
 #: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
 msgid "Clear List"
 msgstr "امسح القائمة"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:153
+#: ../lib/engine/components/call-history/history-contact.cpp:155
 msgid "Received"
 msgstr "مستلمة"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:156
+#: ../lib/engine/components/call-history/history-contact.cpp:158
 msgid "Placed"
 msgstr "موضوع"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:159
+#: ../lib/engine/components/call-history/history-contact.cpp:161
 msgid "Missed"
 msgstr "مفقود"
 
 #: ../lib/engine/components/evolution/evolution-book.cpp:76
-#: ../lib/engine/components/ldap/ldap-book.cpp:909
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
 #, c-format
 msgid "%d user found"
 msgid_plural "%d users found"
@@ -787,88 +786,88 @@
 msgstr[4] "وجد %d مستخدمِ"
 msgstr[5] "وجد %d مستخدمِ"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:244
+#: ../lib/engine/components/evolution/evolution-book.cpp:283
 msgid "New _Contact"
 msgstr "مُ_راسل جديد"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:288
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
 #: ../lib/engine/components/local-roster/local-cluster.cpp:82
 #: ../lib/engine/components/local-roster/local-heap.cpp:117
 msgid "New contact"
 msgstr "مُراسل جديد"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:290
-#: ../lib/engine/components/evolution/evolution-contact.cpp:328
-#: ../lib/engine/components/opal/opal-account.cpp:351
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
 msgid "Please update the following fields:"
 msgstr "رجاء، حدث الحقول التالية:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:292
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
 msgid "_Name:"
 msgstr "الا_سم:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:293
-#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
 msgid "VoIP _URI:"
 msgstr "_مسار VoIP:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:294
-#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
 msgid "_Home phone:"
 msgstr "_هاتف المنزل:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:295
-#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
 msgid "_Office phone:"
 msgstr "هات_ف المكتب:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:296
-#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+#: ../lib/engine/components/evolution/evolution-book.cpp:327
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
 msgid "_Cell phone:"
 msgstr "الهاتف الم_حمول:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:297
-#: ../lib/engine/components/evolution/evolution-contact.cpp:343
+#: ../lib/engine/components/evolution/evolution-book.cpp:328
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
 msgid "_Pager:"
 msgstr "ج_هاز الاستدعاء:"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:234
-#: ../lib/engine/components/local-roster/local-presentity.cpp:197
-#: ../lib/engine/components/opal/opal-account.cpp:308
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:203
-#: ../src/gui/main.cpp:3173
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3178
 msgid "_Edit"
 msgstr "ح_رّر"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:236
-#: ../lib/engine/components/local-roster/local-presentity.cpp:199
-#: ../lib/engine/components/opal/opal-account.cpp:310
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:205
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
 msgid "_Remove"
 msgstr "أ_زل"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
 msgid "Edit contact"
 msgstr "حرر المراسل"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:330
-#: ../lib/engine/components/local-roster/local-presentity.cpp:224
-#: ../lib/engine/components/local-roster/local-heap.cpp:184
-#: ../lib/engine/components/local-roster/local-heap.cpp:364
-#: ../lib/engine/components/opal/opal-account.cpp:353
-#: ../lib/engine/components/opal/opal-bank.cpp:99
-#: ../lib/engine/components/opal/opal-bank.cpp:109
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:169
-#: ../lib/engine/components/resource-list/rl-heap.cpp:544
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:224
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
 msgid "Name:"
 msgstr "الاسم:"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:395
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
 msgid "Remove contact"
 msgstr "إزل المُراسل"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:397
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
 #, c-format
 msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr "أمتأكّد أنّك تريد حذف %s من دفتر العناوين؟"
@@ -886,30 +885,30 @@
 msgstr "فحص الفيديو"
 
 #. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Crazy"
 msgstr "مجنون"
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Screencast"
 msgstr "تصوير الشاشة"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:409
-#: ../lib/engine/components/resource-list/rl-entry.cpp:143
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:130
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
 msgid "_Refresh"
 msgstr "_حدّث"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:412
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
 msgid "_Remove addressbook"
 msgstr "أ_زل دفتر العناوين"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:414
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
 msgid "Addressbook _properties"
 msgstr "_خصائص دفتر العناوين"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:545
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
 msgid "LDAP SASL Interaction"
 msgstr "تفاعل LDAP SASL"
 
@@ -922,136 +921,136 @@
 #. * say about it. You might google for "challenge response
 #. * authentication" if you'd like more background context.
 #.
-#: ../lib/engine/components/ldap/ldap-book.cpp:587
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
 msgid "Challenge: "
 msgstr "استجواب:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:595
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
 msgid "Interact"
 msgstr "تفاعل"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:664
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
 msgid "Refreshing"
 msgstr "يُحدّث"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:670
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
 msgid "Could not initialize server"
 msgstr "تعذر بدء الخادم"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:684
-#: ../lib/engine/components/ldap/ldap-book.cpp:729
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
 msgid "LDAP Error: "
 msgstr "خطأ LDAP:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:738
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
 msgid "Contacted server"
 msgstr "الخادوم المتصل به"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:781
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
 msgid "Could not connect to server"
 msgstr "تعذر الاتصال بالخادم"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:829
-#: ../lib/engine/components/ldap/ldap-book.cpp:882
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
 msgid "Could not search"
 msgstr "تعذر البحث"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:837
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
 msgid "Waiting for search results"
 msgstr "في انتظار نتائج البحث"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:931
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
 msgid "Please edit the following fields"
 msgstr "رجاء، حرر الحقول التالية"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:933
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
 msgid "Book _Name"
 msgstr "ا_سم الكتاب"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:934
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
 msgid "Server _URI"
 msgstr "م_سار الخادوم"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:935
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
 msgid "_Base DN"
 msgstr "أ_ساس DN"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:941
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
 msgid "Subtree"
 msgstr "ال_شجرة الفرعية"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:942
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
 msgid "Single Level"
 msgstr "مستوى وحيد"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
 msgid "_Search Scope"
 msgstr "نطاق ال_بحث"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:952
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
 msgid "_DisplayName Attribute"
 msgstr "خاصية اسم ال_عرض"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:953
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
 msgid "Call _Attributes"
 msgstr "_خصائص الاتصال"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:955
-#: ../lib/engine/components/ldap/ldap-book.cpp:957
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
 msgid "_Filter Template"
 msgstr "_رشّح القوالب"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:959
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
 msgid "Bind _ID"
 msgstr "ال_هوية الموثقة"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:960
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
 msgid "_Password"
 msgstr "_كلمة السرّ:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:961
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
 msgid "Use TLS"
 msgstr "استخدم TLS"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:962
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
 msgid "Use SASL"
 msgstr "استخدم SASL"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:976
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
 msgid "SASL _Mechanism"
 msgstr "_آلية SASL"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:987
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
 msgid "Edit LDAP directory"
 msgstr "حرّر دليل LDAP"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1016
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
 msgid "Please provide a Book Name for this directory\n"
 msgstr "من فضلك قدّم اسم الكتاب لهذا الدليل\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1019
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
 msgid "Please provide a Server URI\n"
 msgstr "من فضلك قدّم مسار الخادوم\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1022
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
 msgid "Please provide a DisplayName Attribute\n"
 msgstr "من فضلك قدّم خاصية اسم العرض\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1025
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
 msgid "Please provide a Call Attribute\n"
 msgstr "من فضلك قدّم خاصية اتصال\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1028
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
 msgid "Invalid Server URI\n"
 msgstr "مسار خادوم غير صالح\n"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:127
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
 msgid "Add an LDAP Address Book"
 msgstr "أضِف دفتر عناوين LDAP"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:130
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
 msgid "Add the Ekiga.net Directory"
 msgstr "أ_ضف دليل Ekiga.net "
 
@@ -1063,45 +1062,45 @@
 msgid "Ekiga.net Directory"
 msgstr "دليل Ekiga.net"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:221
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
 msgid "Edit roster element"
 msgstr "حرّر عنصر القائمة"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:222
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
 msgstr "رجاء، املأ هذه الاستمارة لتغيير عنصر موجود من القائمة الداخلية لإكِجا"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:225
-#: ../lib/engine/components/local-roster/local-heap.cpp:193
-#: ../lib/engine/components/local-roster/local-heap.cpp:195
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:170
-#: ../lib/engine/components/resource-list/rl-heap.cpp:545
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
 msgid "Address:"
 msgstr "العنوان:"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:227
-#: ../lib/engine/components/resource-list/rl-heap.cpp:546
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
 msgid "Choose groups:"
 msgstr "اختر المجموعات:"
 
 #: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
-#: ../lib/engine/components/local-roster/local-heap.cpp:181
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
 msgid "Add to local roster"
 msgstr "أضِف إلى القائمة المحلية"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:92
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
 msgid "Services"
 msgstr "الخدمات"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
 msgid "Echo test"
 msgstr "اختبار الصدى"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:94
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
 msgid "Conference room"
 msgstr "غرفة المؤتمرات"
 
@@ -1113,128 +1112,143 @@
 msgid "Rename"
 msgstr "أعد التسّمية"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:160
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
 msgid "Family"
 msgstr "العائلة"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:161
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
 msgid "Friend"
 msgstr "الصديق"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:162
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
 msgid "Associate"
 msgstr "صاحب"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:163
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
 msgid "Assistant"
 msgstr "مساعد"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:164
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
 msgid "Supervisor"
 msgstr "المشرف"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:165
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
 msgid "Self"
 msgstr "ذاتي"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:182
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
 msgid ""
 "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr "رجاءً، عبأ هذه الاستمارة لإضافة مُراسل جديد إلى القائمة الداخلية لإكِجا "
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:199
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
 msgid "Put contact in groups:"
 msgstr "ضع المُراسل في مجموعات:"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:335
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
 msgid "You supplied an unsupported address"
 msgstr "لقد قدمت عنوانا غير مدعوم"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:337
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
 msgid "You already have a contact with this address!"
 msgstr "لديك مُراسل بهذا العنوان بالفعل!"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:362
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
 msgid "Rename group"
 msgstr "أعد تسمية مجموعة"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:363
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
 msgid "Please edit this group name"
 msgstr "رجاءً، حرّر اسم هذه المجموعة"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:143
-#: ../lib/engine/components/opal/sip-endpoint.cpp:257
-#: ../lib/engine/components/opal/sip-endpoint.cpp:261
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:230
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
 msgid "Call"
 msgstr "اتصل"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:146
-#: ../lib/engine/components/opal/sip-endpoint.cpp:258
-#: ../lib/engine/components/opal/sip-endpoint.cpp:262 ../src/gui/main.cpp:2947
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:231
+#: ../lib/engine/components/opal/sip-endpoint.cpp:235 ../src/gui/main.cpp:2952
 msgid "Transfer"
 msgstr "حوّل"
 
 #. Translators : The alias we are registering already exists : failure
-#: ../lib/engine/components/opal/h323-endpoint.cpp:310
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
 msgid "Duplicate alias"
 msgstr "كرر الكنية"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:313
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
 msgid "Bad username/password"
 msgstr "اسم مستخدم/كلمة سرّ سيّئة"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:316
-#: ../lib/engine/components/opal/sip-endpoint.cpp:896
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:911
 msgid "Transport error"
 msgstr "خطأ في التوصيل "
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:327
-#: ../lib/engine/components/opal/h323-endpoint.cpp:332
-#: ../lib/engine/components/opal/sip-endpoint.cpp:903
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:918
 msgid "Failed"
 msgstr "فشل"
 
-#: ../lib/engine/components/opal/opal-account.cpp:300
+#: ../lib/engine/components/opal/opal-account.cpp:303
 msgid "_Disable"
 msgstr "_عطّل"
 
-#: ../lib/engine/components/opal/opal-account.cpp:303
+#: ../lib/engine/components/opal/opal-account.cpp:306
 msgid "_Enable"
 msgstr "_مكّن"
 
-#: ../lib/engine/components/opal/opal-account.cpp:324
-#: ../src/gui/assistant.cpp:727
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
 msgid "Recharge the account"
 msgstr "أعِد شحن تحميل الحساب"
 
-#: ../lib/engine/components/opal/opal-account.cpp:329
-#: ../src/gui/assistant.cpp:739
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
 msgid "Consult the balance history"
 msgstr "راجع تاريخ التوازن"
 
-#: ../lib/engine/components/opal/opal-account.cpp:334
+#: ../lib/engine/components/opal/opal-account.cpp:337
 msgid "Consult the call history"
 msgstr "راجع تاريخ المكالمات"
 
-#: ../lib/engine/components/opal/opal-account.cpp:349
-#: ../lib/engine/components/opal/opal-bank.cpp:72
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
 msgid "Edit account"
 msgstr "حرّر الحساب"
 
-#: ../lib/engine/components/opal/opal-account.cpp:355
-#: ../lib/engine/components/opal/opal-bank.cpp:110
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
 msgid "Registrar:"
 msgstr "المسجل:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:357
-#: ../lib/engine/components/opal/opal-bank.cpp:100
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
 msgid "Gatekeeper:"
 msgstr "بوّاب:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:358
-#: ../lib/engine/components/opal/opal-bank.cpp:81
-#: ../lib/engine/components/opal/opal-bank.cpp:101
-#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:174
 msgid "User:"
 msgstr "المستخدم:"
@@ -1242,166 +1256,168 @@
 #. Translators:
 #. * SIP knows two usernames: The name for the client ("User") and the name
 #. * for the authentication procedure ("Authentication User")
-#: ../lib/engine/components/opal/opal-account.cpp:363
-#: ../lib/engine/components/opal/opal-bank.cpp:112
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
 msgid "Authentication User:"
 msgstr "استيثاق المستخدم:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:364
-#: ../lib/engine/components/opal/opal-bank.cpp:83
-#: ../lib/engine/components/opal/opal-bank.cpp:103
-#: ../lib/engine/components/opal/opal-bank.cpp:113
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:173
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:365
-#: ../lib/engine/components/opal/opal-bank.cpp:104
-#: ../lib/engine/components/opal/opal-bank.cpp:114
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
 msgid "Timeout:"
 msgstr "المهلة:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:366
-#: ../lib/engine/components/opal/opal-bank.cpp:117
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
 msgid "Enable Account"
 msgstr "مكّن الحساب"
 
-#: ../lib/engine/components/opal/opal-account.cpp:401
-#: ../lib/engine/components/opal/opal-bank.cpp:155
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
 msgid "You did not supply a name for that account."
 msgstr "لم تزود باسم لهذا المراسل."
 
-#: ../lib/engine/components/opal/opal-account.cpp:403
-#: ../lib/engine/components/opal/opal-bank.cpp:157
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
 msgid "You did not supply a host to register to."
 msgstr "لم تزود مستضيفاً ليتم التسجيل عليه."
 
-#: ../lib/engine/components/opal/opal-account.cpp:405
-#: ../lib/engine/components/opal/opal-bank.cpp:159
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
 msgid "You did not supply a user name for that account."
 msgstr "لم تزود اسم المستخدم لهذا المراسل."
 
-#: ../lib/engine/components/opal/opal-account.cpp:407
-#: ../lib/engine/components/opal/opal-bank.cpp:161
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
 msgid "The timeout should have a bigger value."
 msgstr "يجب أن تكون قيمة المهلة الزمنية أكبر."
 
-#: ../lib/engine/components/opal/opal-bank.cpp:53
+#: ../lib/engine/components/opal/opal-bank.cpp:75
 msgid "_Add an Ekiga.net Account"
 msgstr "أ_ضف حساب Ekiga.net "
 
-#: ../lib/engine/components/opal/opal-bank.cpp:55
+#: ../lib/engine/components/opal/opal-bank.cpp:77
 msgid "_Add an Ekiga Call Out Account"
 msgstr "أ_ضف حساب إكجا Call Out"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:57
+#: ../lib/engine/components/opal/opal-bank.cpp:79
 msgid "_Add a SIP Account"
 msgstr "أ_ضف حساب SIP"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:59
+#: ../lib/engine/components/opal/opal-bank.cpp:81
 msgid "_Add an H.323 Account"
 msgstr "أ_ضف حساب H.323"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:73
+#: ../lib/engine/components/opal/opal-bank.cpp:96
 msgid "Please update the following fields."
 msgstr "رجاءً، حدّث الحقول التالية:"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:607
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
 msgid "Get an Ekiga.net SIP account"
 msgstr "احصل على حساب Ekiga.net SIP"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:715
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
 msgid "Get an Ekiga Call Out account"
 msgstr "إحصل على حساب  Ekiga Call Out"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:92 ../src/gui/main.cpp:2701
-#: ../src/gui/main.cpp:2796
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2706
+#: ../src/gui/main.cpp:2801
 msgid "Account ID:"
 msgstr "مُعرّف الحساب:"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:94
+#: ../lib/engine/components/opal/opal-bank.cpp:117
 msgid "PIN Code:"
 msgstr "رمز التعريف الشخصي (PIN):"
 
-#: ../lib/engine/components/opal/opal-call.cpp:444
+#: ../lib/engine/components/opal/opal-call.cpp:404
 msgid "Local user cleared the call"
 msgstr "قطع المستخدم المحلي المكالمة"
 
-#: ../lib/engine/components/opal/opal-call.cpp:447
-#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:407
+#: ../lib/engine/components/opal/opal-call.cpp:410
 msgid "Local user rejected the call"
 msgstr "رفض المستخدم المحلي المكالمة"
 
-#: ../lib/engine/components/opal/opal-call.cpp:453
+#: ../lib/engine/components/opal/opal-call.cpp:413
 msgid "Remote user cleared the call"
 msgstr "قطع المستخدم البعيد المكالمة"
 
-#: ../lib/engine/components/opal/opal-call.cpp:456
+#: ../lib/engine/components/opal/opal-call.cpp:416
 msgid "Remote user rejected the call"
 msgstr "رفض المستخدم البعيد المكالمة"
 
-#: ../lib/engine/components/opal/opal-call.cpp:459
+#: ../lib/engine/components/opal/opal-call.cpp:419
 msgid "Remote user has stopped calling"
 msgstr "توقف المُتّصل عن الاتصال"
 
-#: ../lib/engine/components/opal/opal-call.cpp:462
+#: ../lib/engine/components/opal/opal-call.cpp:422
 msgid "Abnormal call termination"
 msgstr "قَطْع غير طبيعي للاتصال"
 
-#: ../lib/engine/components/opal/opal-call.cpp:465 ../src/gui/main.cpp:1491
+#: ../lib/engine/components/opal/opal-call.cpp:425 ../src/gui/main.cpp:1496
 msgid "Could not connect to remote host"
 msgstr "تعذّر الاتصال بالمستضيف البعيد"
 
-#: ../lib/engine/components/opal/opal-call.cpp:468
+#: ../lib/engine/components/opal/opal-call.cpp:428
 msgid "The Gatekeeper cleared the call"
 msgstr "قام البوّاب بقطع الاتصال"
 
-#: ../lib/engine/components/opal/opal-call.cpp:471
+#: ../lib/engine/components/opal/opal-call.cpp:431
 msgid "User not found"
 msgstr "لم يعثر على المستخدم"
 
-#: ../lib/engine/components/opal/opal-call.cpp:474
+#: ../lib/engine/components/opal/opal-call.cpp:434
 msgid "Insufficient bandwidth"
 msgstr "عرض الموجة غير كافي"
 
-#: ../lib/engine/components/opal/opal-call.cpp:477
+#: ../lib/engine/components/opal/opal-call.cpp:437
 msgid "No common codec"
 msgstr "لا يوجد مِرماز مشترك"
 
-#: ../lib/engine/components/opal/opal-call.cpp:480
+#: ../lib/engine/components/opal/opal-call.cpp:440
 msgid "Call forwarded"
 msgstr "تم تحويل المكالمة"
 
-#: ../lib/engine/components/opal/opal-call.cpp:483
+#: ../lib/engine/components/opal/opal-call.cpp:443
 msgid "Security check failed"
 msgstr "فشل الفحص الأمني"
 
-#: ../lib/engine/components/opal/opal-call.cpp:486
+#: ../lib/engine/components/opal/opal-call.cpp:446
 msgid "Local user is busy"
 msgstr "المستخدم المحلي مشغول"
 
-#: ../lib/engine/components/opal/opal-call.cpp:489
-#: ../lib/engine/components/opal/opal-call.cpp:495
+#: ../lib/engine/components/opal/opal-call.cpp:449
+#: ../lib/engine/components/opal/opal-call.cpp:455
 msgid "Congested link to remote party"
 msgstr "الوصلة إلى المشترك البعيد محتقنة"
 
-#: ../lib/engine/components/opal/opal-call.cpp:492
+#: ../lib/engine/components/opal/opal-call.cpp:452
 msgid "Remote user is busy"
 msgstr "المستخدم البعيد مشغول"
 
-#: ../lib/engine/components/opal/opal-call.cpp:498
+#: ../lib/engine/components/opal/opal-call.cpp:458
 msgid "Remote host is offline"
 msgstr "المستخدم البعيد ليس على الخط"
 
-#: ../lib/engine/components/opal/opal-call.cpp:504
+#: ../lib/engine/components/opal/opal-call.cpp:464
 msgid "User is not available"
 msgstr "المُستخدم غير مُتاح"
 
-#: ../lib/engine/components/opal/opal-call.cpp:516
+#: ../lib/engine/components/opal/opal-call.cpp:476
 msgid "Call completed"
 msgstr "انتهت المكالمة"
 
-#: ../lib/engine/components/opal/opal-call-manager.cpp:725
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
 msgid ""
 "Ekiga did not manage to configure your network settings automatically. You "
 "can still use it, but you need to configure your network settings manually.\n"
@@ -1415,216 +1431,216 @@
 "الرجاء أنظر http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
 "للمزيد من الملعلومات"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:282
-#: ../lib/engine/components/opal/sip-endpoint.cpp:284
+#: ../lib/engine/components/opal/sip-endpoint.cpp:255
+#: ../lib/engine/components/opal/sip-endpoint.cpp:257
 msgid "Message"
 msgstr "رسالة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:710
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
 msgid "Bad request"
 msgstr "طلب سيء"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:714
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
 msgid "Payment required"
 msgstr "الدفع مطلوب"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:718
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
 msgid "Unauthorized"
 msgstr "غير مخوّل"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:722
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
 msgid "Forbidden"
 msgstr "ممنوع"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:726
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
 msgid "Timeout"
 msgstr "المهلة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:730
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
 msgid "Conflict"
 msgstr "تضارب"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:734
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
 msgid "Temporarily unavailable"
 msgstr "غير متوفّر مؤقتا"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:738
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
 msgid "Not acceptable"
 msgstr "غير مقبول"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:742
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
 msgid "Illegal status code"
 msgstr "رمز حالة غير شرعي"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:746
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
 msgid "Multiple choices"
 msgstr "خيارات متعددة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:750
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
 msgid "Moved permanently"
 msgstr "انتقل بشكل دائم"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:754
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
 msgid "Moved temporarily"
 msgstr "انتقل بشكل مؤقت"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:758
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
 msgid "Use proxy"
 msgstr "استخدم وكيلاً"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:762
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
 msgid "Alternative service"
 msgstr "الخدمة البديلة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:766
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
 msgid "Not found"
 msgstr "غير موجود"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:770
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
 msgid "Method not allowed"
 msgstr "هذه الطريقة غير مسموحة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:774
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
 msgid "Proxy authentication required"
 msgstr "استيثاق الوكيل مطلوب"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:778
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
 msgid "Length required"
 msgstr "الطول مطلوب"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:782
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
 msgid "Request entity too big"
 msgstr "طلب الهوية كبير جداً"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:786
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
 msgid "Request URI too long"
 msgstr "طلب المسار طويل جداً"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:790
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
 msgid "Unsupported media type"
 msgstr "نوع وسائط غير مدعوم"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:794
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
 msgid "Unsupported URI scheme"
 msgstr "شكل مسار غير مدعوم"
 
 #. Translators : The extension we are trying to register does not exist
-#: ../lib/engine/components/opal/sip-endpoint.cpp:799
+#: ../lib/engine/components/opal/sip-endpoint.cpp:814
 msgid "Bad extension"
 msgstr "امتداد سيء"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:803
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
 msgid "Extension required"
 msgstr "الامتداد مطلوب"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:807
+#: ../lib/engine/components/opal/sip-endpoint.cpp:822
 msgid "Interval too brief"
 msgstr "الفترة الفاصلة صغيرة جداً"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:811
+#: ../lib/engine/components/opal/sip-endpoint.cpp:826
 msgid "Loop detected"
 msgstr "تم العثور على حلقة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:815
+#: ../lib/engine/components/opal/sip-endpoint.cpp:830
 msgid "Too many hops"
 msgstr "هناك العديد من القفزات"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:819
+#: ../lib/engine/components/opal/sip-endpoint.cpp:834
 msgid "Address incomplete"
 msgstr "العنوان غير كامل"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:823
+#: ../lib/engine/components/opal/sip-endpoint.cpp:838
 msgid "Ambiguous"
 msgstr "ملتبس"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:827
+#: ../lib/engine/components/opal/sip-endpoint.cpp:842
 msgid "Busy Here"
 msgstr "مشغول هنا"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:831
+#: ../lib/engine/components/opal/sip-endpoint.cpp:846
 msgid "Request terminated"
 msgstr "تم إنهاء الطلب"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:835
+#: ../lib/engine/components/opal/sip-endpoint.cpp:850
 msgid "Not acceptable here"
 msgstr "غير مقبول هنا"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:839
+#: ../lib/engine/components/opal/sip-endpoint.cpp:854
 msgid "Bad event"
 msgstr "حدث سيء"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:843
+#: ../lib/engine/components/opal/sip-endpoint.cpp:858
 msgid "Request pending"
 msgstr "الطلب معلّق"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:847
+#: ../lib/engine/components/opal/sip-endpoint.cpp:862
 msgid "Undecipherable"
 msgstr "غير قابل للتفسير"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:851
+#: ../lib/engine/components/opal/sip-endpoint.cpp:866
 msgid "Internal server error"
 msgstr "خطأ خادم داخلي"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:855
+#: ../lib/engine/components/opal/sip-endpoint.cpp:870
 msgid "Not implemented"
 msgstr "غير مطبّق"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:859
+#: ../lib/engine/components/opal/sip-endpoint.cpp:874
 msgid "Bad gateway"
 msgstr "بوابة سيئة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:863
+#: ../lib/engine/components/opal/sip-endpoint.cpp:878
 msgid "Service unavailable"
 msgstr "الخدمة غير متوفّرة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:867
+#: ../lib/engine/components/opal/sip-endpoint.cpp:882
 msgid "Server timeout"
 msgstr "نفاذ وقت الخادم"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:871
+#: ../lib/engine/components/opal/sip-endpoint.cpp:886
 msgid "SIP version not supported"
 msgstr "نسخة SIP غير مدعومة."
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:875
+#: ../lib/engine/components/opal/sip-endpoint.cpp:890
 msgid "Message too large"
 msgstr "الرسالة كبيرة جداً"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:879
+#: ../lib/engine/components/opal/sip-endpoint.cpp:894
 msgid "Busy everywhere"
 msgstr "مشغول في كل مكان"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:883
+#: ../lib/engine/components/opal/sip-endpoint.cpp:898
 msgid "Decline"
 msgstr "هبوط"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:887
+#: ../lib/engine/components/opal/sip-endpoint.cpp:902
 msgid "Does not exist anymore"
 msgstr "لم يعد يوجد إطلاقاً"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:891
+#: ../lib/engine/components/opal/sip-endpoint.cpp:906
 msgid "Globally not acceptable"
 msgstr "غير مقبول عالمياً"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1020
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1043
 msgid "Could not send message"
 msgstr "تعذر إرسال رسالة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1165
 #, c-format
 msgid "Incoming call from %s"
 msgstr "مكالمة واردة من %s"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1136
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1167
 #, c-format
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1142
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1173
 #, c-format
 msgid "In a call with %s"
 msgstr "في اتصال مع %s"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1144
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1175
 #, c-format
 msgid "In a call"
 msgstr "في اتصال"
@@ -1650,11 +1666,11 @@
 msgid "Username:"
 msgstr "اسم المستخدم:"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:103
-#: ../lib/engine/components/resource-list/rl-heap.cpp:144
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
 #: ../lib/engine/components/resource-list/rl-heap.cpp:178
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:133
-#: ../lib/engine/components/resource-list/rl-entry.cpp:130
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
 msgid "Unnamed"
 msgstr "غير مسمّى"
 
@@ -1670,74 +1686,74 @@
 msgid "Contact list _properties"
 msgstr "_خصائص قائمة المراسلين"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:467
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
 msgid "Edit contact list properties"
 msgstr "حرّر خصائص قائمة المراسلين"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
 msgid "Please edit the following fields (no identifier means global)"
 msgstr "رجاءً حرّر الحقول التالية (لا معرّف يعني عمومي)"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
 msgid "Contact list's name"
 msgstr "اسم قائمة المراسلين"
 
 #. "Document" used as a name -- uri point to the root of a document tree
-#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
 msgid "Document root"
 msgstr "m"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
 msgid "Identifier"
 msgstr "المعرّف"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:476
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
 msgid "Writable"
 msgstr "قابل للكتابة"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:477
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
 msgid "Server username"
 msgstr "اسم مستخدم الخادوم"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:478
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
 msgid "Server password"
 msgstr "كلمة سر الخادوم"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:530
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
 msgid "Add a remote contact"
 msgstr "أضف مراسلا بعيدا"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:531
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
 msgid "Please fill in this form to create a new contact on a remote server"
 msgstr "من فضلك عبّئ هذا النموذج لإنشاء مراسل جديد على خادوم بعيد"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:221
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
 msgid "Edit remote contact"
 msgstr "حرر المراسل البعيد"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
 msgid ""
 "Please fill in this form to change an existing contact on a remote server"
 msgstr "رجاءً عبئ هذه القائمة لتغيير مراسل موجود على خادوم خارجي"
 
-#: ../lib/engine/components/resource-list/rl-entry.cpp:186
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
 msgid "Invalid server data"
 msgstr "بيانات خادوم غير صالحة"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:51
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
 msgid "Click to fetch"
 msgstr "انقر للجلب"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:118
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
 msgid "Distant contact"
 msgstr "مراسل بعيد"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:181
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
 #, c-format
 msgid "%s / List #%d"
 msgstr "%s / قائمة #%d"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:185
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
 #, c-format
 msgid "List #%d"
 msgstr "القائمة #%d"
@@ -1751,7 +1767,7 @@
 msgstr "دفتر العناوين"
 
 #: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
-#: ../src/gui/main.cpp:3122
+#: ../src/gui/main.cpp:3127
 msgid "Address _Book"
 msgstr "دفتر الع_ناوين"
 
@@ -1765,7 +1781,7 @@
 msgstr "المجموعة"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
-#: ../src/gui/assistant.cpp:1379
+#: ../src/gui/assistant.cpp:1368
 msgid "Full Name"
 msgstr "الاسم الكامل"
 
@@ -1785,7 +1801,7 @@
 msgid "Copy link"
 msgstr "إنسخ الرابط"
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:904
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
 msgid "_Smile..."
 msgstr "_ابتسامة..."
 
@@ -1799,11 +1815,11 @@
 msgid "Unsorted"
 msgstr "غير مرتب"
 
-#: ../lib/gui/codecsbox.cpp:477
+#: ../lib/gui/codecsbox.cpp:478
 msgid "Move selected codec priority upwards"
 msgstr "ارفع أولية المِرماز المحدد"
 
-#: ../lib/gui/codecsbox.cpp:487
+#: ../lib/gui/codecsbox.cpp:488
 msgid "Move selected codec priority downwards"
 msgstr "اخفض أولويّة المِرماز المحدد"
 
@@ -1811,47 +1827,47 @@
 msgid "Do not show this dialog again"
 msgstr "لا تظهر هذا الحوار مجددًا"
 
-#: ../src/gui/accounts.cpp:229
+#: ../src/gui/accounts.cpp:230
 msgid "Registered"
 msgstr "مُسجّل"
 
-#: ../src/gui/accounts.cpp:233
+#: ../src/gui/accounts.cpp:234
 msgid "Unregistered"
 msgstr "غير مُسجّل"
 
-#: ../src/gui/accounts.cpp:237
+#: ../src/gui/accounts.cpp:238
 msgid "Could not unregister"
 msgstr "تعذر إلغاء التسجيل"
 
-#: ../src/gui/accounts.cpp:243
+#: ../src/gui/accounts.cpp:244
 msgid "Could not register"
 msgstr "تعذر التسجيل"
 
-#: ../src/gui/accounts.cpp:249
+#: ../src/gui/accounts.cpp:250
 msgid "Processing..."
 msgstr "يُعالج..."
 
-#: ../src/gui/accounts.cpp:632
+#: ../src/gui/accounts.cpp:636
 msgid "Account Name"
 msgstr "اسم الحساب"
 
-#: ../src/gui/accounts.cpp:633
+#: ../src/gui/accounts.cpp:637
 msgid "Voice Mails"
 msgstr "بريد صوتي"
 
-#: ../src/gui/accounts.cpp:634
+#: ../src/gui/accounts.cpp:638
 msgid "Status"
 msgstr "الحالة"
 
-#: ../src/gui/accounts.cpp:645 ../src/gui/accounts.cpp:688
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
 msgid "Accounts"
 msgstr "حسابات"
 
-#: ../src/gui/accounts.cpp:659 ../src/gui/main.cpp:3183
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3188
 msgid "_Accounts"
 msgstr "ال_حسابات"
 
-#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3266
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3271
 msgid "_Help"
 msgstr "_مساعدة"
 
@@ -1860,11 +1876,11 @@
 #. * description in the list of configured accounts, it shows if an account
 #. * is activated or not (a status the user can choose).
 #.
-#: ../src/gui/accounts.cpp:696 ../src/gui/preferences.cpp:586
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
 msgid "A"
 msgstr "ن"
 
-#: ../src/gui/assistant.cpp:325
+#: ../src/gui/assistant.cpp:321
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1878,21 +1894,20 @@
 "بعد إكمالك هذه الخطوات، يمكنك دائمًا تغيير هذه الإعدادات لاحقًا باختيار "
 "تفضيلات من قائمة تحرير."
 
-#: ../src/gui/assistant.cpp:333
-#, fuzzy
+#: ../src/gui/assistant.cpp:329
 msgid "Welcome to Ekiga"
 msgstr "مرحبا في إكِجا"
 
-#: ../src/gui/assistant.cpp:367 ../src/gui/preferences.cpp:454
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "المعلومات الشخصية"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:370
+#: ../src/gui/assistant.cpp:356
 msgid "Please enter your first name and your surname:"
 msgstr "أدخل اسمك الأول ولقبك:"
 
-#: ../src/gui/assistant.cpp:379
+#: ../src/gui/assistant.cpp:365
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
@@ -1900,19 +1915,19 @@
 "سوف يستخدم اسمك الأول ولقبك عند الاتصال ببرامج VoIP وبرامج المؤتمرات المرئية "
 "الأخرى."
 
-#: ../src/gui/assistant.cpp:570
+#: ../src/gui/assistant.cpp:559
 msgid "Ekiga.net Account"
 msgstr "حساب Ekiga.net"
 
-#: ../src/gui/assistant.cpp:572
+#: ../src/gui/assistant.cpp:561
 msgid "Please enter your username:"
 msgstr "رجاء أدخل اسم المستخدم:"
 
-#: ../src/gui/assistant.cpp:580
+#: ../src/gui/assistant.cpp:569
 msgid "Please enter your password:"
 msgstr "رجاء أدخل كلمة سرّ:"
 
-#: ../src/gui/assistant.cpp:590
+#: ../src/gui/assistant.cpp:579
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1928,23 +1943,23 @@
 "يمكنك تخطي هذه الخطوة إذا كنت تستخدم خدمة SIP بديلة أو تُفضل إعطاء معلومات "
 "الولوج فيما بعد."
 
-#: ../src/gui/assistant.cpp:617
+#: ../src/gui/assistant.cpp:606
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "لا أريد التسجيل في الخدمة المجانية من ekiga.net"
 
-#: ../src/gui/assistant.cpp:680
+#: ../src/gui/assistant.cpp:669
 msgid "Ekiga Call Out Account"
 msgstr "حساب Ekiga Call Out"
 
-#: ../src/gui/assistant.cpp:682
+#: ../src/gui/assistant.cpp:671
 msgid "Please enter your account ID:"
 msgstr "رجاءً أدخل معرّف حسابك:"
 
-#: ../src/gui/assistant.cpp:690
+#: ../src/gui/assistant.cpp:679
 msgid "Please enter your PIN code:"
 msgstr "رجاء أدخل الرمز الشخصي PIN الخاص بك:"
 
-#: ../src/gui/assistant.cpp:701
+#: ../src/gui/assistant.cpp:690
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1963,48 +1978,48 @@
 "الخدمة ستعمل فقط في حال استخدامك المسار الموجود فى صندوق الحوار هذا لعمل "
 "حسابك.\n"
 
-#: ../src/gui/assistant.cpp:751
+#: ../src/gui/assistant.cpp:740
 msgid "Consult the calls history"
 msgstr "راجع تاريخ المكالمات"
 
-#: ../src/gui/assistant.cpp:761
+#: ../src/gui/assistant.cpp:750
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr "لا أريد الاشتراك في خدمة Ekiga Call Out "
 
-#: ../src/gui/assistant.cpp:827 ../src/gui/assistant.cpp:1390
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
 msgid "Connection Type"
 msgstr "نوع الاتصال"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:830
+#: ../src/gui/assistant.cpp:819
 msgid "Please choose your connection type:"
 msgstr "رجاء اختر نوع اتصالك:"
 
-#: ../src/gui/assistant.cpp:847
+#: ../src/gui/assistant.cpp:836
 msgid "56k Modem"
 msgstr "مودم 56 ك.ب"
 
-#: ../src/gui/assistant.cpp:852
+#: ../src/gui/assistant.cpp:841
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:857
+#: ../src/gui/assistant.cpp:846
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "DSL/Cable (128 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:862
+#: ../src/gui/assistant.cpp:851
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "DSL/Cable (512 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:867
+#: ../src/gui/assistant.cpp:856
 msgid "LAN"
 msgstr "شبكة محلية"
 
-#: ../src/gui/assistant.cpp:872
+#: ../src/gui/assistant.cpp:861
 msgid "Keep current settings"
 msgstr "ابق الإعدادات الحالية"
 
-#: ../src/gui/assistant.cpp:877
+#: ../src/gui/assistant.cpp:866
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -2013,16 +2028,16 @@
 "سيسنح نوع الاتصال هذا بتحديد أفضل إعدادات الجودة التي سيستخدمها إكِجا في "
 "الاتصال. يمكنك تغيير الإعدادات فيما بعد على حِدة من نافذة التفضيلات."
 
-#: ../src/gui/assistant.cpp:971 ../src/gui/main.cpp:3012
-#: ../src/gui/main.cpp:3016 ../src/gui/preferences.cpp:760
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3017
+#: ../src/gui/main.cpp:3021 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "أجهزة الصوت"
 
-#: ../src/gui/assistant.cpp:973
+#: ../src/gui/assistant.cpp:962
 msgid "Please choose the audio ringing device:"
 msgstr "رجاء اختر جهاز صوت الرنين:"
 
-#: ../src/gui/assistant.cpp:993
+#: ../src/gui/assistant.cpp:982
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
@@ -2031,84 +2046,84 @@
 "المكالمات."
 
 #. ---
-#: ../src/gui/assistant.cpp:1004
+#: ../src/gui/assistant.cpp:993
 msgid "Please choose the audio output device:"
 msgstr "رجاءً اختر جهاز خرج الصّوت:"
 
-#: ../src/gui/assistant.cpp:1024
+#: ../src/gui/assistant.cpp:1013
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
 msgstr "جهاز خرج الصّوت هو الجهاز الذي سيستخدم لتشغيل الصّوت خلال المكالمات."
 
 #. ---
-#: ../src/gui/assistant.cpp:1035
+#: ../src/gui/assistant.cpp:1024
 msgid "Please choose the audio input device:"
 msgstr "رجاء اختر جهاز دخل الصوت:"
 
-#: ../src/gui/assistant.cpp:1055
+#: ../src/gui/assistant.cpp:1044
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
 msgstr "جهاز دخل الصوت هو الجهاز الذي سوف يستخدم لتسجيل صوتك خلال المكالمات."
 
-#: ../src/gui/assistant.cpp:1157
+#: ../src/gui/assistant.cpp:1146
 msgid "Please choose your video input device:"
 msgstr "رجاء اختر جهاز مدخل الفيديو:"
 
-#: ../src/gui/assistant.cpp:1177
+#: ../src/gui/assistant.cpp:1166
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
 msgstr ""
 "جهاز دخل الفيديو هو الجهاز الذي سيستخدم لالتقاط الفيديو خلال المكالمات."
 
-#: ../src/gui/assistant.cpp:1242 ../src/gui/assistant.cpp:1266
-#: ../src/gui/assistant.cpp:1290 ../src/gui/preferences.cpp:805
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
 #: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "لم يُعثر على أي جهاز"
 
-#: ../src/gui/assistant.cpp:1321
+#: ../src/gui/assistant.cpp:1310
 msgid "Configuration Complete"
 msgstr "اكتمل الإعداد"
 
-#: ../src/gui/assistant.cpp:1323
+#: ../src/gui/assistant.cpp:1312
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
 msgstr ""
 "لقد أتممت الآن إعدادات إكِجا. يمكن تغيير كل الإعدادات من تفضيلات إكِجا. استمتع"
 
-#: ../src/gui/assistant.cpp:1330
+#: ../src/gui/assistant.cpp:1319
 msgid "Configuration summary:"
 msgstr "ملخص الإعدادات:"
 
-#: ../src/gui/assistant.cpp:1400
+#: ../src/gui/assistant.cpp:1389
 msgid "Audio Ringing Device"
 msgstr "جهاز صوت الرنين"
 
-#: ../src/gui/assistant.cpp:1409
+#: ../src/gui/assistant.cpp:1398
 msgid "Audio Output Device"
 msgstr "جهاز خرج الصوت"
 
-#: ../src/gui/assistant.cpp:1418
+#: ../src/gui/assistant.cpp:1407
 msgid "Audio Input Device"
 msgstr "جهاز دخل الصوت"
 
-#: ../src/gui/assistant.cpp:1427
+#: ../src/gui/assistant.cpp:1416
 msgid "Video Input Device"
 msgstr "جهاز دخل الفيديو"
 
-#: ../src/gui/assistant.cpp:1440
+#: ../src/gui/assistant.cpp:1429
 msgid "SIP URI"
 msgstr "مسار SIP"
 
-#: ../src/gui/assistant.cpp:1452
+#: ../src/gui/assistant.cpp:1441
 msgid "Ekiga Call Out"
 msgstr "إكجا Call Out"
 
-#: ../src/gui/assistant.cpp:1496
+#: ../src/gui/assistant.cpp:1485
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr "مساعد إعدادات إكِجا (%Id مِن %Id)"
@@ -2230,67 +2245,67 @@
 msgstr "wxyz"
 
 #. Translators: Is displayed once an account "%s" is registered.
-#: ../src/gui/main.cpp:519
+#: ../src/gui/main.cpp:521
 #, c-format
 msgid "Registered %s"
 msgstr "مُسجَل  %s"
 
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:526
+#: ../src/gui/main.cpp:528
 #, c-format
 msgid "Unregistered %s"
 msgstr "غير مسجل %s"
 
-#: ../src/gui/main.cpp:531
+#: ../src/gui/main.cpp:533
 #, c-format
 msgid "Could not unregister %s"
 msgstr "تعذر إلغاء تسجيل %s"
 
-#: ../src/gui/main.cpp:535
+#: ../src/gui/main.cpp:537
 #, c-format
 msgid "Could not register %s"
 msgstr "تعذر تسجيل %s"
 
-#: ../src/gui/main.cpp:605
+#: ../src/gui/main.cpp:607
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr "ص:%I.1f/%I.1f   ف:%I.1f/%I.1f  إطار/ث:%Id/%Id"
 
-#: ../src/gui/main.cpp:651
+#: ../src/gui/main.cpp:653
 #, c-format
 msgid "Connected with %s"
 msgstr "متصل مع %s"
 
-#: ../src/gui/main.cpp:692 ../src/gui/main.cpp:3512
+#: ../src/gui/main.cpp:694 ../src/gui/main.cpp:3517
 msgid "Standby"
 msgstr "انتظر"
 
-#: ../src/gui/main.cpp:753
+#: ../src/gui/main.cpp:755
 msgid "Call on hold"
 msgstr "مكالمة في الانتظار"
 
-#: ../src/gui/main.cpp:764
+#: ../src/gui/main.cpp:766
 msgid "Call retrieved"
 msgstr "مكالمة مُستلمة"
 
-#: ../src/gui/main.cpp:780
+#: ../src/gui/main.cpp:782
 #, c-format
 msgid "Missed call from %s"
 msgstr "مكالمة فائتة مِن %s"
 
-#: ../src/gui/main.cpp:917
+#: ../src/gui/main.cpp:919
 msgid "Error"
 msgstr "خطأ"
 
-#: ../src/gui/main.cpp:982
+#: ../src/gui/main.cpp:984
 msgid "Error while initializing video output"
 msgstr "خطأ أثناء ابتداء مخرج فيديو"
 
-#: ../src/gui/main.cpp:983
+#: ../src/gui/main.cpp:985
 msgid "No video will be displayed during this call->"
 msgstr "لن يعرض فيديو أثناء هذا الاتصال->"
 
-#: ../src/gui/main.cpp:993
+#: ../src/gui/main.cpp:995
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that no other application is using the accelerated video output."
@@ -2298,7 +2313,7 @@
 "وجد خطأ أقناء فتح أو ابتداء مدخل الفيديو. رجاءً تحقق من عدم وجود تطبيق آخر "
 "يستخدم مخرج الفيديو الممكّن."
 
-#: ../src/gui/main.cpp:995
+#: ../src/gui/main.cpp:997
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that you are using a color depth of 24 or 32 bits per pixel."
@@ -2307,23 +2322,23 @@
 "أو 32 لكل بكسل."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1108
+#: ../src/gui/main.cpp:1110
 #, c-format
 msgid "Added video input device %s"
 msgstr "تم إضافة جهاز دخل الفيديو  %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1120
+#: ../src/gui/main.cpp:1122
 #, c-format
 msgid "Removed video input device %s"
 msgstr "تم إزالة جهاز دخل الفيديو  %s"
 
-#: ../src/gui/main.cpp:1137
+#: ../src/gui/main.cpp:1139
 #, c-format
 msgid "Error while accessing video device %s"
 msgstr "حدث خطأ خلال فتح جهاز الفيديو %s"
 
-#: ../src/gui/main.cpp:1140
+#: ../src/gui/main.cpp:1142
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
@@ -2332,7 +2347,7 @@
 "سيتم بث شعار متحرّك خلال المكالمات. لاحظ أنه يمكنك دائمًا بثّ صورة محددة أو هذا "
 "الشعار باختيار \"صورة\" كمُلحق فيديو و \"شعار متحرك\" أو \"صورة ثابتة\" كجهاز."
 
-#: ../src/gui/main.cpp:1144
+#: ../src/gui/main.cpp:1146
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
@@ -2343,15 +2358,15 @@
 "بفصل الجهاز ثم إعادة وصله، إذا لم يكن كذلك أو في حال بقائه غير قابل للوصول، "
 "الرجاء التحقق من صلاحياتك وتأكد من تحميل برنامج التعريف المناسب."
 
-#: ../src/gui/main.cpp:1148
+#: ../src/gui/main.cpp:1150
 msgid "Your video driver doesn't support the requested video format."
 msgstr "مُشغّل الفيديو لا يدعم تنسيق الفيديو المطلوب."
 
-#: ../src/gui/main.cpp:1152
+#: ../src/gui/main.cpp:1154
 msgid "Could not open the chosen channel."
 msgstr "تعذّر فتح القناة المحددة."
 
-#: ../src/gui/main.cpp:1156
+#: ../src/gui/main.cpp:1158
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2361,42 +2376,42 @@
 "يبدوا أن مشغلك لا يدعم أي من هيئات الألوان التي يدعمها إكِجا.\n"
 " من فضلك راجع وثائق النواة لترى أي لوحات الألوان مدعزمة"
 
-#: ../src/gui/main.cpp:1160
+#: ../src/gui/main.cpp:1162
 msgid "Error while setting the frame rate."
 msgstr "حدث خطأ خلال تحديد معدل الإطارات."
 
-#: ../src/gui/main.cpp:1164
+#: ../src/gui/main.cpp:1166
 msgid "Error while setting the frame size."
 msgstr "حدث خطأ خلال تحديد حجم الإطار."
 
-#: ../src/gui/main.cpp:1169 ../src/gui/main.cpp:1271 ../src/gui/main.cpp:1386
+#: ../src/gui/main.cpp:1171 ../src/gui/main.cpp:1273 ../src/gui/main.cpp:1388
 msgid "Unknown error."
 msgstr "خطأ مجهول"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1219
+#: ../src/gui/main.cpp:1221
 #, c-format
 msgid "Added audio input device %s"
 msgstr "تم إضافة جهاز دخل الصّوت %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1236
+#: ../src/gui/main.cpp:1238
 #, c-format
 msgid "Removed audio input device %s"
 msgstr "تم إزالة جهاز دخل الصّوت %s"
 
-#: ../src/gui/main.cpp:1253
+#: ../src/gui/main.cpp:1255
 #, c-format
 msgid "Error while opening audio input device %s"
 msgstr "حدث خطأ خلال فتح جهاز الصوت %s"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
-#: ../src/gui/main.cpp:1258
+#: ../src/gui/main.cpp:1260
 msgid "Only silence will be transmitted."
 msgstr "سيتم إرسال الصمت فقط"
 
-#: ../src/gui/main.cpp:1262
+#: ../src/gui/main.cpp:1264
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2408,7 +2423,7 @@
 "قابل للوصول، الرجاء التحقق إعداد الصوت، وصلاحياتك والتحقق من أن الجهاز ليس "
 "مشغولاً."
 
-#: ../src/gui/main.cpp:1266
+#: ../src/gui/main.cpp:1268
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2420,26 +2435,26 @@
 "إذا لم يكن كذلك أو في حال بقائه غير قابل للوصول، الرجاء التحقق من إعداد "
 "الصوت لديك."
 
-#: ../src/gui/main.cpp:1333
+#: ../src/gui/main.cpp:1335
 #, c-format
 msgid "Added audio output device %s"
 msgstr "تم إضافة جهاز خرج الصّوت %s"
 
-#: ../src/gui/main.cpp:1349
+#: ../src/gui/main.cpp:1351
 #, c-format
 msgid "Removed audio output device %s"
 msgstr "تم إزالة جهاز خرج الصّوت %s"
 
-#: ../src/gui/main.cpp:1370
+#: ../src/gui/main.cpp:1372
 #, c-format
 msgid "Error while opening audio output device %s"
 msgstr "حدث خطأ خلال فتح جهاز خرج الصوت %s"
 
-#: ../src/gui/main.cpp:1373
+#: ../src/gui/main.cpp:1375
 msgid "No incoming sound will be played."
 msgstr "لن يتم تشغيل أي صوت وارد"
 
-#: ../src/gui/main.cpp:1377
+#: ../src/gui/main.cpp:1379
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2451,7 +2466,7 @@
 "قابل للوصول، الرجاء التحقق من إعداد الصوت لديك، صلاحياتك وأن الجهاز غير "
 "مشغول."
 
-#: ../src/gui/main.cpp:1381
+#: ../src/gui/main.cpp:1383
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
@@ -2463,336 +2478,336 @@
 "وصله، إذا لم يكن كذلك أو في حال بقائه غير قابل للوصول، رجاءً التمس إعداد "
 "الصوت لديك."
 
-#: ../src/gui/main.cpp:1569
+#: ../src/gui/main.cpp:1574
 msgid "Video Settings"
 msgstr "إعدادات الفيديو"
 
-#: ../src/gui/main.cpp:1596
+#: ../src/gui/main.cpp:1601
 msgid "Adjust brightness"
 msgstr "اضبط السطوع"
 
-#: ../src/gui/main.cpp:1617
+#: ../src/gui/main.cpp:1622
 msgid "Adjust whiteness"
 msgstr "اضبط البياض"
 
-#: ../src/gui/main.cpp:1638
+#: ../src/gui/main.cpp:1643
 msgid "Adjust color"
 msgstr "اضبط الألوان"
 
-#: ../src/gui/main.cpp:1659
+#: ../src/gui/main.cpp:1664
 msgid "Adjust contrast"
 msgstr "اضبط التباين"
 
-#: ../src/gui/main.cpp:1705
+#: ../src/gui/main.cpp:1710
 msgid "Audio Settings"
 msgstr "إعدادات الصوت"
 
-#: ../src/gui/main.cpp:2316
+#: ../src/gui/main.cpp:2321
 msgid "_Retrieve Call"
 msgstr "ا_ستلم المكالمة"
 
-#: ../src/gui/main.cpp:2329
+#: ../src/gui/main.cpp:2334
 msgid "_Hold Call"
 msgstr "_علّق المكالمة"
 
-#: ../src/gui/main.cpp:2361 ../src/gui/main.cpp:3149
+#: ../src/gui/main.cpp:2366 ../src/gui/main.cpp:3154
 msgid "Suspend _Audio"
 msgstr "علّق ال_صوت"
 
-#: ../src/gui/main.cpp:2363 ../src/gui/main.cpp:3154
+#: ../src/gui/main.cpp:2368 ../src/gui/main.cpp:3159
 msgid "Suspend _Video"
 msgstr "علّق ال_فيديو"
 
-#: ../src/gui/main.cpp:2365
+#: ../src/gui/main.cpp:2370
 msgid "Resume _Audio"
 msgstr "استك_مل الصوت"
 
-#: ../src/gui/main.cpp:2367
+#: ../src/gui/main.cpp:2372
 msgid "Resume _Video"
 msgstr "استكمل ال_فيديو"
 
-#: ../src/gui/main.cpp:2650 ../src/gui/main.cpp:2802
+#: ../src/gui/main.cpp:2655 ../src/gui/main.cpp:2807
 msgid "Reject"
 msgstr "ارفض"
 
-#: ../src/gui/main.cpp:2652 ../src/gui/main.cpp:2801
+#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2806
 msgid "Accept"
 msgstr "اقبل"
 
-#: ../src/gui/main.cpp:2658 ../src/gui/main.cpp:2789
+#: ../src/gui/main.cpp:2663 ../src/gui/main.cpp:2794
 msgid "Incoming call from"
 msgstr "مكالمة واردة من"
 
-#: ../src/gui/main.cpp:2676 ../src/gui/main.cpp:2792
+#: ../src/gui/main.cpp:2681 ../src/gui/main.cpp:2797
 msgid "Remote URI:"
 msgstr "المسار البعيد:"
 
-#: ../src/gui/main.cpp:2688 ../src/gui/main.cpp:2794
+#: ../src/gui/main.cpp:2693 ../src/gui/main.cpp:2799
 msgid "Remote Application:"
 msgstr "التطبيق البعيد:"
 
-#: ../src/gui/main.cpp:2709
+#: ../src/gui/main.cpp:2714
 #, c-format
 msgid "Call from %s"
 msgstr "مكالمة من %s"
 
-#: ../src/gui/main.cpp:2915
+#: ../src/gui/main.cpp:2920
 #, c-format
 msgid "Call Duration: %s\n"
 msgstr "مدة المكالمة: %s\n"
 
-#: ../src/gui/main.cpp:2946
+#: ../src/gui/main.cpp:2951
 msgid "Transfer call to:"
 msgstr "حوّل المكالمة إلى:"
 
-#: ../src/gui/main.cpp:2998
+#: ../src/gui/main.cpp:3003
 msgid "No"
 msgstr "لا"
 
-#: ../src/gui/main.cpp:3000
+#: ../src/gui/main.cpp:3005
 msgid "Yes"
 msgstr "نعم"
 
-#: ../src/gui/main.cpp:3011
+#: ../src/gui/main.cpp:3016
 msgid "Detected new audio input device:"
 msgstr "تم اكتشاف جهاز دخل صوت جديد:"
 
-#: ../src/gui/main.cpp:3015
+#: ../src/gui/main.cpp:3020
 msgid "Detected new audio output device:"
 msgstr "تم اكتشاف جهاز خرج صوت جديد:"
 
-#: ../src/gui/main.cpp:3019
+#: ../src/gui/main.cpp:3024
 msgid "Detected new video input device:"
 msgstr "تم اكتشاف جهاز دخل فيديو جديد:"
 
-#: ../src/gui/main.cpp:3020 ../src/gui/preferences.cpp:921
+#: ../src/gui/main.cpp:3025 ../src/gui/preferences.cpp:921
 msgid "Video Devices"
 msgstr "أجهزة الفيديو"
 
-#: ../src/gui/main.cpp:3038
+#: ../src/gui/main.cpp:3043
 msgid "Do you want to use it as default device?"
 msgstr "هل تريد استخدامه كجاهز افتراضي؟"
 
-#: ../src/gui/main.cpp:3106
+#: ../src/gui/main.cpp:3111
 msgid "_Chat"
 msgstr "محا_دثة"
 
-#: ../src/gui/main.cpp:3108
+#: ../src/gui/main.cpp:3113
 msgid "Ca_ll"
 msgstr "اتّ_صل"
 
-#: ../src/gui/main.cpp:3108
+#: ../src/gui/main.cpp:3113
 msgid "Place a new call"
 msgstr "ضع مكالمة جديدة"
 
-#: ../src/gui/main.cpp:3111
+#: ../src/gui/main.cpp:3116
 msgid "_Hang up"
 msgstr "ا_قطع"
 
-#: ../src/gui/main.cpp:3112
+#: ../src/gui/main.cpp:3117
 msgid "Terminate the current call"
 msgstr "انهِ المكالمة الحالية"
 
-#: ../src/gui/main.cpp:3118
+#: ../src/gui/main.cpp:3123
 msgid "A_dd Contact"
 msgstr "أ_ضف مراسل"
 
-#: ../src/gui/main.cpp:3118
+#: ../src/gui/main.cpp:3123
 msgid "Add a contact to the roster"
 msgstr "أضِف مُراسل إلى القائمة"
 
-#: ../src/gui/main.cpp:3123
+#: ../src/gui/main.cpp:3128
 msgid "Find contacts"
 msgstr "ابحث عن المُراسلين"
 
-#: ../src/gui/main.cpp:3130
+#: ../src/gui/main.cpp:3135
 msgid "_Contact"
 msgstr "مُ_راسلون"
 
-#: ../src/gui/main.cpp:3131
+#: ../src/gui/main.cpp:3136
 msgid "Act on selected contact"
 msgstr "طبّق على المراسلين المحددين"
 
-#: ../src/gui/main.cpp:3137
+#: ../src/gui/main.cpp:3142
 msgid "H_old Call"
 msgstr "_علّق المكالمة"
 
-#: ../src/gui/main.cpp:3137 ../src/gui/main.cpp:3606
+#: ../src/gui/main.cpp:3142 ../src/gui/main.cpp:3611
 msgid "Hold the current call"
 msgstr "علّق المكالمة الحالية"
 
-#: ../src/gui/main.cpp:3141
+#: ../src/gui/main.cpp:3146
 msgid "_Transfer Call"
 msgstr "_حوّل المكالمة"
 
-#: ../src/gui/main.cpp:3142
+#: ../src/gui/main.cpp:3147
 msgid "Transfer the current call"
 msgstr "حوّل المكالمة الحالية"
 
-#: ../src/gui/main.cpp:3150
+#: ../src/gui/main.cpp:3155
 msgid "Suspend or resume the audio transmission"
 msgstr "علّق أو تابع البثّ الصوتي"
 
-#: ../src/gui/main.cpp:3155
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the video transmission"
 msgstr "علّق أو تابع البث المرئي"
 
-#: ../src/gui/main.cpp:3162
+#: ../src/gui/main.cpp:3167
 msgid "Close the Ekiga window"
 msgstr "أغلق نافذة إكِجا"
 
-#: ../src/gui/main.cpp:3169 ../src/gui/statusicon.cpp:406
+#: ../src/gui/main.cpp:3174 ../src/gui/statusicon.cpp:414
 msgid "Quit"
 msgstr "اخرج"
 
-#: ../src/gui/main.cpp:3175
+#: ../src/gui/main.cpp:3180
 msgid "_Configuration Assistant"
 msgstr "مُساعد الإ_عداد"
 
-#: ../src/gui/main.cpp:3176
+#: ../src/gui/main.cpp:3181
 msgid "Run the configuration assistant"
 msgstr "شغّل مساعد الإعداد"
 
-#: ../src/gui/main.cpp:3184
+#: ../src/gui/main.cpp:3189
 msgid "Edit your accounts"
 msgstr "حرّر حساباتك"
 
-#: ../src/gui/main.cpp:3190
+#: ../src/gui/main.cpp:3195
 msgid "Change your preferences"
 msgstr "غيّر تفضيلاتك"
 
-#: ../src/gui/main.cpp:3195
+#: ../src/gui/main.cpp:3200
 msgid "_View"
 msgstr "_عرض"
 
-#: ../src/gui/main.cpp:3197
+#: ../src/gui/main.cpp:3202
 msgid "Con_tacts"
 msgstr "ال_مراسلون"
 
-#: ../src/gui/main.cpp:3197
+#: ../src/gui/main.cpp:3202
 msgid "View the contacts list"
 msgstr "اعرض قائمة المراسلين"
 
-#: ../src/gui/main.cpp:3202
+#: ../src/gui/main.cpp:3207
 msgid "_Dialpad"
 msgstr "_لوح الاتصال"
 
-#: ../src/gui/main.cpp:3202
+#: ../src/gui/main.cpp:3207
 msgid "View the dialpad"
 msgstr "اعرض لوح الاتصال"
 
-#: ../src/gui/main.cpp:3207
+#: ../src/gui/main.cpp:3212
 msgid "_Call History"
 msgstr "_تاريخ المكالمات"
 
-#: ../src/gui/main.cpp:3207
+#: ../src/gui/main.cpp:3212
 msgid "View the call history"
 msgstr "أعرض تاريخ المكالمات"
 
-#: ../src/gui/main.cpp:3215
+#: ../src/gui/main.cpp:3220
 msgid "_Show Call Panel"
 msgstr "أ_ظهر لوحة المكالمة"
 
-#: ../src/gui/main.cpp:3223
+#: ../src/gui/main.cpp:3228
 msgid "_Local Video"
 msgstr "الفيديو ال_محلّي"
 
-#: ../src/gui/main.cpp:3224
+#: ../src/gui/main.cpp:3229
 msgid "Local video image"
 msgstr "صورة الفيديو المحلي"
 
-#: ../src/gui/main.cpp:3229
+#: ../src/gui/main.cpp:3234
 msgid "_Remote Video"
 msgstr "الفيديو ال_بعيد"
 
-#: ../src/gui/main.cpp:3230
+#: ../src/gui/main.cpp:3235
 msgid "Remote video image"
 msgstr "صورة الفيديو البعيد"
 
-#: ../src/gui/main.cpp:3235
+#: ../src/gui/main.cpp:3240
 msgid "_Picture-in-Picture"
 msgstr "_صورة-في-صورة"
 
-#: ../src/gui/main.cpp:3236 ../src/gui/main.cpp:3242
+#: ../src/gui/main.cpp:3241 ../src/gui/main.cpp:3247
 msgid "Both video images"
 msgstr "كلتا صورتي الفيديو"
 
-#: ../src/gui/main.cpp:3241
+#: ../src/gui/main.cpp:3246
 msgid "Picture-in-Picture in Separate _Window"
 msgstr "صورة-في-صورة في _نافذة مستقلة"
 
-#: ../src/gui/main.cpp:3249
+#: ../src/gui/main.cpp:3254
 msgid "Zoom in"
 msgstr "قرّب"
 
-#: ../src/gui/main.cpp:3253
+#: ../src/gui/main.cpp:3258
 msgid "Zoom out"
 msgstr "بعّد"
 
-#: ../src/gui/main.cpp:3257
+#: ../src/gui/main.cpp:3262
 msgid "Normal size"
 msgstr "الحجم الطبيعي"
 
-#: ../src/gui/main.cpp:3261
+#: ../src/gui/main.cpp:3266
 msgid "_Fullscreen"
 msgstr "_ملء الشاشة"
 
-#: ../src/gui/main.cpp:3261
+#: ../src/gui/main.cpp:3266
 msgid "Switch to fullscreen"
 msgstr "بدّل إلى ملء الشاشة"
 
-#: ../src/gui/main.cpp:3269 ../src/gui/statusicon.cpp:394
+#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:402
 msgid "Get help by reading the Ekiga manual"
 msgstr "احصل على مساعدة عن طريق قراءة دليل إكِجا"
 
-#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:399
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:407
 msgid "View information about Ekiga"
 msgstr "اعرض معلومات عنْ إكِجا"
 
-#: ../src/gui/main.cpp:3348
+#: ../src/gui/main.cpp:3353
 msgid ""
 "Enter a URI on the left, and click this button to place a call or to hangup"
 msgstr "أدخل عنوانا على اليسار، وانقر هذا الزر لوضع لتنفيذ اتصال أو قطع الخط"
 
-#: ../src/gui/main.cpp:3399
+#: ../src/gui/main.cpp:3404
 msgid "Contacts"
 msgstr "مُراسلون"
 
-#: ../src/gui/main.cpp:3422
+#: ../src/gui/main.cpp:3427
 msgid "Dialpad"
 msgstr "لوح الاتصال"
 
-#: ../src/gui/main.cpp:3441
+#: ../src/gui/main.cpp:3446
 msgid "Call history"
 msgstr "تاريخ المكالمات"
 
-#: ../src/gui/main.cpp:3544
+#: ../src/gui/main.cpp:3549
 msgid "Change the volume of your soundcard"
 msgstr "غير شدّة بطاقة الصوت"
 
-#: ../src/gui/main.cpp:3564
+#: ../src/gui/main.cpp:3569
 msgid "Change the color settings of your video device"
 msgstr "غيّر إعدادات ألوان جهاز الفيديو"
 
-#: ../src/gui/main.cpp:3675
+#: ../src/gui/main.cpp:3680
 msgid "Ekiga"
 msgstr "إكِجا"
 
 #. Translators:
 #. * TX is a common abbreviation for "transmit"
-#: ../src/gui/main.cpp:4282
+#: ../src/gui/main.cpp:4287
 #, c-format
 msgid "TX: %dx%d "
 msgstr "البث: %Id×%Id "
 
 #. Translators:
 #. * RX is a common abbreviation for "receive"
-#: ../src/gui/main.cpp:4287
+#: ../src/gui/main.cpp:4292
 #, c-format
 msgid "RX: %dx%d "
 msgstr "الاستقبال: %Id×%Id "
 
-#: ../src/gui/main.cpp:4289
+#: ../src/gui/main.cpp:4294
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2805,33 +2820,33 @@
 "حزم في غير ترتيبها: %I.1f %%\n"
 "صِوان الارتعاش: %Id ملي ثانية %s%s%s"
 
-#: ../src/gui/main.cpp:4406
+#: ../src/gui/main.cpp:4415
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr "يطبع رسائل التنقيح في سطر الأوامر (بين المستوى 1 و 5)"
 
-#: ../src/gui/main.cpp:4411
+#: ../src/gui/main.cpp:4420
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr "يطبع رسائل تنقيح لوح المستخدم في سطر الأوامر (بين المستوى 1 و 4)"
 
-#: ../src/gui/main.cpp:4416
+#: ../src/gui/main.cpp:4425
 msgid "Makes Ekiga call the given URI"
 msgstr "يجعل إكِجا يتصل بالمسار المعطى"
 
-#: ../src/gui/main.cpp:4525
+#: ../src/gui/main.cpp:4544
 msgid "No usable audio plugin detected"
 msgstr "لم يُعثر على مدير صوت قابل للاستخدام"
 
-#: ../src/gui/main.cpp:4526
+#: ../src/gui/main.cpp:4545
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
 msgstr "لم يعثر إكِجا على أي مدير صوت يمكن استخدامه. تأكّد من أن تثبيتك صحيح."
 
-#: ../src/gui/main.cpp:4529
+#: ../src/gui/main.cpp:4548
 msgid "No usable audio codecs detected"
 msgstr "لم يُعثر على مِرمازات قابلة للاستخدام"
 
-#: ../src/gui/main.cpp:4530
+#: ../src/gui/main.cpp:4549
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
@@ -3185,7 +3200,7 @@
 msgid "Video"
 msgstr "الفيديو"
 
-#: ../src/gui/statusicon.cpp:305
+#: ../src/gui/statusicon.cpp:306
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
diff -Nru ekiga-3.2.5/po/bn.po ekiga-3.2.6~ppa~karmic1/po/bn.po
--- ekiga-3.2.5/po/bn.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/bn.po	2009-08-31 14:29:36.000000000 +0100
@@ -1,4223 +1,3462 @@
-# Bengali translation of Gnomemeeting.
+# Bengali translation for ekiga
 # Copyright (C) 2003 Free Software Foundation.
 # This file is distributed under the same license as the Gnomemeeting package.
+#
 # INDRANIL DAS GUPTA <indradg@cal.vsnl.net.in>, 2003.
+# Sankarshan Mukhopadhyay <sankarshan@randomink.org>, 2008.
+# Runa Bhattacharjee <runab@redhat.com>, 2008, 2009.
+# Maruf Ovee <maruf@ankur.org.bd>, 2009.
 #
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
-"Project-Id-Version: Gnomemeeting gnome-2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-02 02:17-0500\n"
-"PO-Revision-Date: 2003-09-07 13:05+0530\n"
-"Last-Translator: INDRANIL DAS GUPTA <indradg@cal.vsnl.net.in>\n"
-"Language-Team: Ankur Bangla <gnome-translation@bengalinux.org>\n"
+"Project-Id-Version: ekiga\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=ekiga&component=general\n"
+"POT-Creation-Date: 2009-08-30 12:07+0000\n"
+"PO-Revision-Date: 2009-07-27 11:13+0700\n"
+"Last-Translator: Maruf Ovee <maruf@ankur.org.bd>\n"
+"Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Add the window icon and title
-#: gnomemeeting.desktop.in.h:1 src/main_window.cpp:1163
-msgid "GnomeMeeting"
-msgstr "গুহ্‌নোম-মিটিং"
-
-#: gnomemeeting.desktop.in.h:2
-msgid "Talk to people over the internet"
-msgstr "ইন্টারনেট মারফত লোকজনের সঙ্গে আলাপচারিতা"
-
-#: gnomemeeting.desktop.in.h:3
-msgid "Video Conferencing"
-msgstr "ভিডিও সম্মেলন"
-
-#: gnomemeeting.schemas.in.in.h:1
-msgid "1: 56Kbps, 2: ISDN, 3:DSL, 4: LAN, 5: Custom"
-msgstr "১: ৫৬ কে-বি-পি-এস, ২: আই-এস-ডি-এন, ৩: ডি-এস-এল, ৪: ল্যান, ৫: অন্য"
+#: ../ekiga.desktop.in.in.h:1
+msgid "Ekiga Softphone"
+msgstr "Ekiga Softphone"
 
-#: gnomemeeting.schemas.in.in.h:2
-msgid "Always forward calls to the given host"
-msgstr "সব সময়ই নির্দিশ্ট হোস্টে কল এগিয়ে দেওয়া হবে"
+#: ../ekiga.desktop.in.in.h:2
+msgid "IP Telephony, VoIP and Video Conferencing"
+msgstr "IP টেলিফোনি, VoIP ও ভিডিও সম্মেলন"
 
-#: gnomemeeting.schemas.in.in.h:3
-msgid "Audio input device"
-msgstr "অডিও ইনপুট ডিভাইস"
+#: ../ekiga.desktop.in.in.h:3
+msgid "Talk to people over the Internet"
+msgstr "ইন্টারনেট-এর সাহায্যে লোকজনের সাথে কথা বলুন"
 
-#: gnomemeeting.schemas.in.in.h:4
-msgid "Audio output device"
-msgstr "অডিও আউটপুট ডিভাইস"
+#: ../ekiga.schemas.in.in.h:1
+msgid "0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: Custom"
+msgstr "০: ৫৬ Kbps, ১: ISDN, ২: DSL, ৩: LAN, ৪: স্বনির্বাচিত"
+
+#: ../ekiga.schemas.in.in.h:2
+msgid ""
+"Allow Ekiga to fall back to software scaling the picture-in-picture if "
+"hardware support is not available. If this is set to false, Ekiga will not "
+"try to open the PIP if hardware support is not available."
+msgstr ""
+"হার্ডওয়্যার দ্বারা সমর্থন বিদ্যমান না থাকলে, ছবির-মধ্যে-ছবির মাপ নির্ধারণের জন্য "
+"Ekiga দ্বারা সফ্টওয়্যার প্রয়োগ করা হবে। এই বৈশিষ্ট্যের মান সত্য নয় নির্ধারিত হলে, "
+"হার্ডওয়্যার সমর্থন ছাড়া Ekiga দ্বারা PIP আরম্ভের প্রচেষ্টা করা হবে না।"
 
-#: gnomemeeting.schemas.in.in.h:5
-msgid "Audio plugin"
-msgstr "অডিও প্লাগইন"
+#: ../ekiga.schemas.in.in.h:3
+msgid "Allow picture-in-picture software scaling"
+msgstr "picture-in-picture সফ্টওয়ার স্কেলিং এ অনুমতি দিন"
 
-#: gnomemeeting.schemas.in.in.h:6
-msgid "Automatic echo cancellation"
-msgstr "স্বয়ংক্রিয় প্রতিধ্বনি বাতিল ব্যবস্থা"
+#: ../ekiga.schemas.in.in.h:4
+msgid "Alternative audio output device"
+msgstr "বিকল্প অডিও আউটপুট ডিভাইস"
 
-#: gnomemeeting.schemas.in.in.h:7 src/pref_window.cpp:943
-msgid "Automatically clear the text chat at the end of calls"
-msgstr "কলের শেষে টেকস্ট চ্যাট নিজের থেকে মুছে ফেলা হবে"
+#: ../ekiga.schemas.in.in.h:5
+msgid "Always forward calls to the given host"
+msgstr "সব সময়ই নির্দিষ্ট হোস্টে কল এগিয়ে দেওয়া হবে"
 
-#: gnomemeeting.schemas.in.in.h:8
-msgid "Change the control panel section"
-msgstr "কন্ট্রোল প্যানেল বিভাগে পরিবর্তন করা"
+#: ../ekiga.schemas.in.in.h:6
+msgid "Audio input device"
+msgstr "অডিও ইনপুট ডিভাইস"
 
-#: gnomemeeting.schemas.in.in.h:9
-msgid ""
-"Change the control panel section (4 means that the control panel is off)"
-msgstr "কন্ট্রোল প্যানেল বিভাগে পরিবর্তন করা (4 মানে কন্ট্রোল প্যানেল বন্ধ আছে)"
+#: ../ekiga.schemas.in.in.h:7
+msgid "Audio output device"
+msgstr "অডিও আউটপুট ডিভাইস"
 
-#: gnomemeeting.schemas.in.in.h:10 src/pref_window.cpp:1639
+#: ../ekiga.schemas.in.in.h:8 ../src/gui/preferences.cpp:516
 msgid ""
-"Choose the number of blocks (that have not changed) transmitted with each "
-"frame. These blocks fill in the background."
+"Automatically reject or forward incoming calls if no answer is given after "
+"the specified amount of time (in seconds)"
 msgstr ""
-"প্রতি ফ্রেমে পাঠানো ব্লকের (যাতে কোন পরিবর্তন হয়নি) সংখ্যা নির্দিষ্ট করুন।  এগুলি "
-"পশ্চাদপটটি ভরিয়ে রাখে"
+"চিহ্নিত সময়ের মধ্যে (সেকেন্ডে ধার্য) কোনো উত্তর না পাওয়া গেলে, আগত কলগুলো "
+"স্বয়ংক্রিয়ভাবে প্রত্যাখ্যান অথবা ফরওয়ার্ড করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:11
-#, fuzzy
-msgid "Clear inactive calls"
-msgstr "আপনার পাওয়া কলগুলি"
+#: ../ekiga.schemas.in.in.h:9
+msgid "Calls history"
+msgstr "কলের ইতিহাস"
 
-#: gnomemeeting.schemas.in.in.h:12 src/ldap_window.cpp:2984
-msgid "Comment"
-msgstr "মন্তব্য"
+#: ../ekiga.schemas.in.in.h:10
+msgid "Change the main window panel section"
+msgstr "প্রধান উইন্ডো প্যানেল ভাগে পরিবর্তন করুন"
 
-#: gnomemeeting.schemas.in.in.h:13
+#: ../ekiga.schemas.in.in.h:11
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
-"Netmeeting and using both Fast Start and H.245 Tunnelling can crash some "
-"versions of Netmeeting."
+"Netmeeting and using both Fast Start and H.245 Tunneling can crash some "
+"versions of Netmeeting"
 msgstr ""
-"জলদি শুরু পদ্ধতিতে সংযোগ স্থাপিত হবে। জলদি শুরু পদ্ধতিতে আরও কম সময়ে কল সংযোগ স্থাপন "
-"করা সম্ভব।  এই পদ্ধতিটি এইচ.৩২৩-র ২য় সংস্করণে যোগ করা হয়েছে। এটি নেটমিটিংর "
-"দ্বারা সর্মথিত নয় এবং একই সঙ্গে জলদি শুরু ও এইচ.২৪৫ টানেলিংর ব্যবহার নেটমিটিংর বেশ "
-"কিছু সংস্করণকে ক্রাশ করাতে পারে"
-
-#: gnomemeeting.schemas.in.in.h:14
-msgid "Country code"
-msgstr "ক্যান্ট্রি কোড"
-
-#: gnomemeeting.schemas.in.in.h:15
-msgid "Display a popup window when receiving a call"
-msgstr "নতুন কল এলে একটি পপ্‌-আপ উইন্ডো দেখানো হবে"
-
-#: gnomemeeting.schemas.in.in.h:16
-msgid "E-mail address"
-msgstr "ই-মেইল ঠিকানা"
+"ফাস্ট স্টার্ট উপায় যোগাযোগ স্থাপন করা হবে। H.245 টানেলিং প্রণালী H.323v2-এ প্রথম "
+"উপলব্ধ করা হয়েছিল ও  Netmeeting দ্বারা এটি সমর্থিত নয়। ফাস্ট স্টার্ট ও H.245 "
+"টানেলিং একযোগে ব্যবহারে Netmeeting-র কিছু সংস্করণ বিকল হতে পারে।"
 
-#: gnomemeeting.schemas.in.in.h:17
-msgid "Enable 'Fast Start'"
-msgstr "'জলদি শুরু' সক্রিয়"
+#: ../ekiga.schemas.in.in.h:12
+msgid "Contact long status"
+msgstr "সংযোগের অবস্থা"
 
-#: gnomemeeting.schemas.in.in.h:18
-msgid "Enable H.245 tunnelling"
-msgstr "এইচ.২৪৫ টানেলিং১ সক্রিয়"
+#: ../ekiga.schemas.in.in.h:13
+msgid "Contact short status"
+msgstr "পরিচিতির অবস্থার সংক্ষিপ্ত সূচনা"
 
-#: gnomemeeting.schemas.in.in.h:19
-msgid "Enable IP checking"
-msgstr "আইপি চেকিং সক্রিয়"
+#: ../ekiga.schemas.in.in.h:14
+msgid "DTMF sending"
+msgstr "DTMF প্রেরণ করা হচ্ছে"
 
-#: gnomemeeting.schemas.in.in.h:20
-msgid "Enable IP translation"
-msgstr "আইপি ট্রান্সলেশন সক্রিয়"
+#: ../ekiga.schemas.in.in.h:15
+msgid "Disable STUN network detection"
+msgstr "STUN নেটওয়ার্ক সনাক্তরণ ব্যবস্থা নিষ্ক্রিয় করুন"
 
-#: gnomemeeting.schemas.in.in.h:21
-msgid "Enable bilinear filtering on displayed video"
-msgstr "প্রদর্শিত ভিডিওয়ে বাইলিনিয়ার ফিল্টারিং সক্রিয়"
+#: ../ekiga.schemas.in.in.h:16 ../src/gui/preferences.cpp:492
+#, fuzzy
+msgid "Disable the automatic network setup resulting from the STUN test"
+msgstr "STUN পরীক্ষার ফলে স্বয়ংক্রিয়ভাবে নেটওয়ার্ক নির্ধারণ ব্যবস্থা নিষ্ক্রিয় করুন"
 
-#: gnomemeeting.schemas.in.in.h:22
-msgid "Enable early H.245"
-msgstr ""
+#: ../ekiga.schemas.in.in.h:17
+msgid "Disable video hardware acceleration"
+msgstr "ভিডিও হার্ডওয়ার অ্যাক্সিলারেশন নিষ্ক্রয় করুন"
 
-#: gnomemeeting.schemas.in.in.h:23
-msgid ""
-"Enable or disable bilinear interpolation when rendering video images (this "
-"has no effect in fullscreen mode)."
-msgstr ""
-"ভিডিও প্রদর্শনের সময় বাইলিনিয়ার ইন্টারপোলেশন সক্রিয় বা নিস্ক্রিয় থাকবে (উল্লেখ্য  - "
-"পুরো স্ক্রীন জুড়ে প্রদর্শনির র সময়ে এর কোন প্রভাব থাকে না)"
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3596
+msgid "Display images from your camera device"
+msgstr "ক্যামেরা ডিভাইস থেকে ছবি প্রদর্শন করা হবে"
+
+#: ../ekiga.schemas.in.in.h:19
+msgid "Enable 'Fast Start'"
+msgstr "'তাড়াতাড়ি শুরু' সক্রিয় করুন"
+
+#: ../ekiga.schemas.in.in.h:20
+msgid "Enable H.245 tunneling"
+msgstr "H.245 টানেলিং সক্রিয় করুন"
 
-#: gnomemeeting.schemas.in.in.h:24
-msgid "Enable registering"
-msgstr "নথিভুক্তকরণ সক্রিয়"
+#: ../ekiga.schemas.in.in.h:21
+msgid "Enable early H.245"
+msgstr "শীঘ্রই H.245 সক্রিয় করুন"
+
+#: ../ekiga.schemas.in.in.h:22
+msgid "Enable echo cancelation"
+msgstr "প্রতিধ্বনি বাতিল করা সক্রিয় করুন"
 
-#: gnomemeeting.schemas.in.in.h:25
+#: ../ekiga.schemas.in.in.h:23
 msgid "Enable silence detection"
 msgstr "নৈশব্দ সন্ধান সক্রিয়"
 
-#: gnomemeeting.schemas.in.in.h:26
-msgid "Enable video reception"
-msgstr "ভিডিও সংকেত গ্রহণ সক্রিয়"
-
-#: gnomemeeting.schemas.in.in.h:27
-msgid "Enable video transmission"
-msgstr "ভিডিও সংকেত প্রেরণ সক্রিয়"
-
-#: gnomemeeting.schemas.in.in.h:28
-msgid "Enter a comment about yourself for the user directory."
-msgstr "ইউজার ডিরেক্টরিতে আপনার নিজের সম্বন্ধে মন্তব্য যোগ করুন"
-
-#: gnomemeeting.schemas.in.in.h:29 src/pref_window.cpp:1270
-msgid ""
-"Enter the public IP of your NAT/PAT router if you want to use IP "
-"translation. If you are registered to ils.seconix.com, GnomeMeeting will "
-"automatically fetch the public IP using the ILS service."
-msgstr ""
-"আইপি ট্রান্সলেশন ব্যবহার করতে চাইলে আপনার ন্যাট/প্যাট রাউটরের পাব্লিক আইপিটি "
-"লিখুন।  যদি ils.seconix.com-এ নথিভুক্ত থাকেন, তাহলে গুহ্‌নোমমিটিং ILS সার্ভিস "
-"ব্যবহার করে স্বয়ংক্রিয় পদ্ধতিতে পাব্লিক আইপিটি টেনে নেবে"
-
-#: gnomemeeting.schemas.in.in.h:30 src/pref_window.cpp:882
-msgid "Enter your e-mail address."
-msgstr "আপনার এ-মেইল ঠিকানা লিখুন"
+#: ../ekiga.schemas.in.in.h:24
+msgid ""
+"Enter the number of seconds after which Ekiga should try refreshing the NAT "
+"binding when STUN is being used"
+msgstr ""
+"STUN ব্যবহারকালে Ekiga দ্বারা NAT বাইন্ডিং পুনরায় প্রচেষ্টার পূর্বে যে সংখ্যক সেকেন্ড "
+"অপেক্ষা করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:31 src/pref_window.cpp:868
-msgid "Enter your first name."
+#: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
+msgid "Enter your full name"
 msgstr "আপনার নাম লিখুন"
 
-#: gnomemeeting.schemas.in.in.h:32
-msgid "Enter your last name."
-msgstr "আপনার পদবী লিখুন"
-
-#: gnomemeeting.schemas.in.in.h:33
-msgid "Enter your location (country or city) for the user directory."
-msgstr "ইউজার ডিরেক্টরির জন্য আপনার অবস্থান (দেশ বা শহর) লিখুন"
-
-#: gnomemeeting.schemas.in.in.h:34
-msgid "First name"
-msgstr "নাম"
-
-#: gnomemeeting.schemas.in.in.h:35
+#: ../ekiga.schemas.in.in.h:26
 msgid "Forward calls to host"
 msgstr "সব কল হোস্টে পাঠানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:36
+#: ../ekiga.schemas.in.in.h:27
 msgid "Forward calls to the given host if busy"
 msgstr "ব্যস্ত থাকলে কল নির্দিস্ট হোস্টে পাঠানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:37
+#: ../ekiga.schemas.in.in.h:28
 msgid "Forward calls to the given host if no answer"
 msgstr "উত্তর না পেলে কল নির্দিস্ট হোস্টে পাঠানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:38
-msgid "Fullscreen height"
-msgstr "পুরো স্ক্রীনের উচ্চতা"
-
-#: gnomemeeting.schemas.in.in.h:39
-msgid "Fullscreen width"
-msgstr "পুরো স্ক্রীনের প্রস্ত"
-
-#: gnomemeeting.schemas.in.in.h:40 src/pref_window.cpp:1225
-msgid "Gatekeeper ID"
-msgstr "গেটকিপার পরিচিতি"
-
-#: gnomemeeting.schemas.in.in.h:41
-msgid "Gatekeeper alias"
-msgstr "গেটকিপার ডাকনাম"
-
-#: gnomemeeting.schemas.in.in.h:42
-#, fuzzy
-msgid "Gatekeeper alias as primary alias"
-msgstr "গেটকিপার ডাকনাম"
-
-#: gnomemeeting.schemas.in.in.h:43 src/pref_window.cpp:1224
-msgid "Gatekeeper host"
-msgstr "গেটকিপার হোস্ট"
+#: ../ekiga.schemas.in.in.h:29 ../src/gui/preferences.cpp:1018
+msgid "Frame Rate"
+msgstr "ফ্রেমের হার"
 
-#: gnomemeeting.schemas.in.in.h:44
-msgid "Gatekeeper password"
-msgstr "গেটকিপার পাসওয়ার্ড"
+#: ../ekiga.schemas.in.in.h:30
+msgid "Full name"
+msgstr "পুরো নাম"
 
-#: gnomemeeting.schemas.in.in.h:45 src/pref_window.cpp:924
+#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:477
 msgid ""
-"If enabled, GnomeMeeting will start hidden provided that the notification "
-"area is present in the GNOME panel."
-msgstr "এটি সক্রিয় করলে গুহ্‌নোমমিটিং লুকিয়ে শুরু হবে যদি গুহ্‌নোম প্যানেল এর নোটিফিকেসন সক্রিয় থাকে"
+"If enabled, Ekiga will start hidden provided that the notification area is "
+"present in the GNOME panel"
+msgstr ""
+"এটি সক্রিয় করলে, Ekiga লুকিয়ে চালু হবে যদি GNOME প্যানেল-এর সতর্ক স্থান উপস্থিত থাকে"
 
-#: gnomemeeting.schemas.in.in.h:46
+#: ../ekiga.schemas.in.in.h:32
 msgid ""
-"If enabled, a popup window will be displayed when receiving an incoming call."
-msgstr "এটি সক্রিয় হলে কোন কল গ্রহণ করলে একটি পপ্‌আপ উইন্ডো দেখানো হবে"
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the field below"
+msgstr ""
+"সক্রিয় থাকলে, নিম্নলিখিত ক্ষেত্রের বৈশিষ্ট্য অনুযায়ী নির্ধারিত হোস্টে সকল কল ফরওয়ার্ড "
+"করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:47
+#: ../ekiga.schemas.in.in.h:33
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you already are in a call or if you are in "
-"Do Not Disturb mode."
+"Do Not Disturb mode"
 msgstr ""
-"এটি সক্রিয় হলে আপনি কোন কলে ব্যস্ত বা 'বিরক্ত করো না' থাকা অবস্থায়ে আসা সমস্ত কলই "
-"নিম্নোক্ত হোস্টে পাঠিয়ে দেওয়া হবে "
+"সক্রিয় থাকলে, কোনো কলে ব্যস্ত থাকলে অথবা 'বিঘ্নিত করা হবে না' মোডে চিহ্নিত থাকলে "
+"নিম্নলিখিত ক্ষেত্রের বৈশিষ্ট্য অনুযায়ী নির্ধারিত হোস্টে সকল কল ফরওয়ার্ড করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:48
+#: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
-"specified in the field below if you do not answer the call."
+"specified in the field below if you do not answer the call"
 msgstr ""
 "এটি সক্রিয় হলে যে সমস্ত কলগুলির আপনি উত্তর দেবেন না তা সবই নিম্নোক্ত হোস্টটিতে "
 "পাঠিয়ে দেওয়া হবে"
 
-#: gnomemeeting.schemas.in.in.h:49
-msgid ""
-"If enabled, all incoming calls will be forwarded to the host that is "
-"specified in the field below."
-msgstr "এটি সক্রিয় হলে সমস্ত কলগুলি নিম্নোক্ত হোস্টটিতে পাঠিয়ে দেওয়া হবে "
-
-#: gnomemeeting.schemas.in.in.h:50 src/pref_window.cpp:1615
-msgid "If enabled, allows video to be received during a call."
-msgstr "এটি সক্রিয় হলে কোন কল চলাকালীন ভিডিও গ্রহণ করা সম্ভব"
-
-#: gnomemeeting.schemas.in.in.h:51 src/pref_window.cpp:1023
-msgid ""
-"If enabled, calls for which no audio and video has been received in the last "
-"30 seconds are automatically cleared."
-msgstr ""
-
-#: gnomemeeting.schemas.in.in.h:52 src/pref_window.cpp:967
-msgid "If enabled, register with the selected user directory."
-msgstr "এটি সক্রিয় হলে, নির্দিস্ট ইউজার ডিরেক্টরিতে নথিভুক্ত করা হবে"
-
-#: gnomemeeting.schemas.in.in.h:53 src/pref_window.cpp:922
-msgid ""
-"If enabled, the splash screen will be displayed when GnomeMeeting starts."
-msgstr "এটি সক্রিয় হলে গুহ্‌নোমমিটিং চালু হবার সময়ে স্প্ল্যাস স্ক্রীনটি দেখানো হবে"
-
-#: gnomemeeting.schemas.in.in.h:54 src/pref_window.cpp:943
-msgid ""
-"If enabled, the text chat will automatically be cleared at the end of calls."
-msgstr "এটি সক্রিয় হলে কলের শেষে টেকস্ট চ্যাট মুছে ফেলা হবে"
-
-#: gnomemeeting.schemas.in.in.h:55 src/pref_window.cpp:1591
-msgid "If enabled, use silence detection with the GSM and G.711 codecs."
-msgstr ""
-"এটি সক্রিয় হলে জি-এস-এম ও জি.৭১১ কোডেকের ক্ষেত্রে নৈশব্দ সন্ধান পদ্ধতি ব্যবহার করুন"
-
-#: gnomemeeting.schemas.in.in.h:56 src/pref_window.cpp:1613
-msgid "If enabled, video is transmitted during a call."
-msgstr "এটি সক্রিয় হলে কল চলাকালীন ভিডিও পাঠানো হবে"
-
-#: gnomemeeting.schemas.in.in.h:57 src/pref_window.cpp:969
-msgid ""
-"If enabled, your details are shown to people browsing the user directory. If "
-"disabled, you are not visible to users browsing the user directory, but they "
-"can still use the callto URL to call you."
-msgstr ""
-"এটি সক্রিয় হলে ইউজার ডিরেক্টরি ব্রাউজ করার সময় অন্যরা আপনার বিবরণী দেখতে পারবেন। "
-"নিস্ক্রিয় করা হলে অন্যদের কাছে আপনি দৃশ্যমান হবেন না, তবে তারা সবসময়ই কলটু ইউ-আর-"
-"এল-র দ্বারা আপনার সঙ্গে যোগাযোগ করতে পারবেন"
-
-#: gnomemeeting.schemas.in.in.h:58
-#, fuzzy
-msgid "Incoming call mode"
-msgstr "কল আসছে"
+#: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
+msgid "If enabled, offline contacts will be shown in the roster"
+msgstr "সক্রিয় হলে, অফ-লাইন পরিচিতদের নাম পরিচিতি তালিকা প্রদর্শিত হবে"
+
+#: ../ekiga.schemas.in.in.h:36
+msgid "If enabled, use echo cancelation"
+msgstr "সক্রিয় হলে, স্বয়ংক্রিয় প্রতিধ্বনি বাতিল ব্যবস্থা প্রয়োগ করা হবে"
+
+#: ../ekiga.schemas.in.in.h:37
+msgid "If enabled, use silence detection with the codecs supporting it"
+msgstr "সক্রিয় হলে, সমর্থনকারী কোডেকের ক্ষেত্রে নিঃশব্দ অবস্থা সনাক্ত করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:59
+#: ../ekiga.schemas.in.in.h:38
 msgid "Kind of network selected in the druid"
 msgstr "ড্রুইডের দ্বারা বেছে নেওয়া নেটওয়ার্কের ধরণ"
 
-#: gnomemeeting.schemas.in.in.h:60
-msgid "Last name"
-msgstr "পদবী"
-
-#: gnomemeeting.schemas.in.in.h:61
-msgid "Listen Port"
-msgstr "এই পোর্টে শোনা হবে"
-
-#: gnomemeeting.schemas.in.in.h:62
-msgid "Local video window height"
-msgstr "স্থানীয় ভিডিও উইন্ডো উচ্চতা"
-
-#: gnomemeeting.schemas.in.in.h:63
-msgid "Local video window width"
-msgstr "স্থানীয় ভিডিও উইন্ডো প্রস্ত"
-
-#: gnomemeeting.schemas.in.in.h:64 src/ldap_window.cpp:2997
-msgid "Location"
-msgstr "অবস্থান"
+#: ../ekiga.schemas.in.in.h:39
+msgid "LDAP servers"
+msgstr "LDAP সার্ভার"
+
+#: ../ekiga.schemas.in.in.h:40
+msgid "List of configured LDAP servers"
+msgstr "প্রস্তুত করা LDAP সার্ভার-এর তালিকা"
+
+#: ../ekiga.schemas.in.in.h:41
+msgid "List of folded groups in the roster"
+msgstr "রোস্টার-এ অন্তর্ভুক্ত ফোল্ডেড গ্রুপ-এর তালিকা"
+
+#: ../ekiga.schemas.in.in.h:42
+msgid "Listen port"
+msgstr "অপেক্ষার জন্য ব্যবহৃত পোর্ট"
+
+#: ../ekiga.schemas.in.in.h:43
+msgid "Local video window size"
+msgstr "স্থানীয় ভিডিও প্রদর্শনের জন্য উইন্ডো মাপ"
+
+#: ../ekiga.schemas.in.in.h:44
+msgid "Maximum RX video bitrate"
+msgstr "RX ভিডিওর সর্বাধিক বিটের মাত্রা"
+
+#: ../ekiga.schemas.in.in.h:45
+msgid "Maximum TX video bitrate"
+msgstr "TX ভিডিওর সর্বাধিক বিটের মাত্রা"
 
-#: gnomemeeting.schemas.in.in.h:65
+#: ../ekiga.schemas.in.in.h:46
 msgid "Maximum jitter buffer"
 msgstr "সর্বাধিক জিট্টার বাফার"
 
-#: gnomemeeting.schemas.in.in.h:66
-msgid "Maximum video bandwidth"
-msgstr "সর্বাধিক ভিডিও ব্যান্ডহুইত্‌"
-
-#: gnomemeeting.schemas.in.in.h:67
-msgid "Minimum jitter buffer"
-msgstr "ন্যনতম জিট্টার বাফার"
-
-#: gnomemeeting.schemas.in.in.h:68
-msgid "Minimum transmitted FPS"
-msgstr "ন্যনতম এফ-পি-এস প্রেরিত"
-
-#: gnomemeeting.schemas.in.in.h:69
-msgid "Minimum transmitted video quality"
-msgstr "প্রেরিত ভিডিও-র ন্যনতম মান"
-
-#: gnomemeeting.schemas.in.in.h:70
-#, fuzzy
-msgid "Missed calls history"
-msgstr "কলের ইতিহাস দেখানো হবে"
-
-#: gnomemeeting.schemas.in.in.h:71
-msgid "Number of entries to store in history boxes"
-msgstr "ইতিহাস তালিকাকে সংরক্ষিত এন্ট্রির সংখ্যা"
-
-#: gnomemeeting.schemas.in.in.h:72
-msgid "Number of frames for G.711"
-msgstr "জি.৭১১-এর জন্য ফ্রেমের সংখ্যা"
+#: ../ekiga.schemas.in.in.h:47
+msgid "NAT Binding Timeout"
+msgstr "NAT Binding এর সময়সীমা পার হয়ে গেছে"
+
+#: ../ekiga.schemas.in.in.h:48
+msgid "No answer timeout"
+msgstr "প্রত্যুত্তোর বিনা সময়সীমা"
+
+#: ../ekiga.schemas.in.in.h:49
+msgid "Outbound Proxy"
+msgstr "বাহির্মূখী প্রক্সি"
+
+#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
+msgid "Place windows displaying video above other windows during calls"
+msgstr "কল চলাকালে, ভিডিওর উইন্ডোগুলো অন্যান্য উইন্ডোর উপরে প্রদর্শন করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:73
-msgid "Number of frames for GSM"
-msgstr "জি-এস-এম-এর জন্য ফ্রেমের সংখ্যা"
-
-#: gnomemeeting.schemas.in.in.h:74
-msgid "Number of frames transmitted in each packet for the G.711 codec."
-msgstr "জি.৭১১ কোডেকের প্রতিটি প্যাকেটে প্রেরিত ফ্রেমের সংখ্যা"
+#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
+msgid "Play busy tone"
+msgstr "ব্যস্ত চিহ্নকারী শব্দ বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:75
-msgid "Number of frames transmitted in each packet for the GSM codec."
-msgstr "জী-এস-এম কোডেকের প্রতিটি প্যাকেটে প্রেরিত ফ্রেমের সংখ্যা"
+#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:361
+msgid "Play ring tone"
+msgstr "রিং টোন বাজান"
 
-#: gnomemeeting.schemas.in.in.h:76
-msgid "Output device type"
-msgstr ""
+#: ../ekiga.schemas.in.in.h:53 ../src/gui/preferences.cpp:351
+msgid "Play sound on incoming calls"
+msgstr "কল প্রাপ্ত হলে শব্দ বাজিয়ে সূচিত করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:77 src/pref_window.cpp:937
-msgid "Place windows displaying video above other windows during calls."
-msgstr ""
+#: ../ekiga.schemas.in.in.h:54
+msgid "Play sound on new message"
+msgstr "বার্তা প্রাপ্ত হলে শব্দ বাজিয়ে সূচিত করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:78
-#, fuzzy
-msgid "Placed calls history"
-msgstr "কলের ইতিহাস দেখানো হবে"
+#: ../ekiga.schemas.in.in.h:55
+msgid "Play sound on new voice mail"
+msgstr "ভয়েস-মেইল প্রাপ্ত হলে শব্দ বাজিয়ে সূচিত করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:79
-msgid "Play or not the busy tone sound"
-msgstr ""
+#: ../ekiga.schemas.in.in.h:56
+msgid "Position of the local video window"
+msgstr "স্থানীয় ভিডিও উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:80
-#, fuzzy
-msgid "Play or not the incoming call sound"
-msgstr "কল এলে শব্দ করে জানাও"
+#: ../ekiga.schemas.in.in.h:57
+msgid "Position on the screen of the address book window"
+msgstr "অ্যাড্রেস বুক উইন্ডোর স্ক্রীনে স্থান"
 
-#: gnomemeeting.schemas.in.in.h:81
-msgid "Play or not the ring tone sound"
-msgstr ""
+#: ../ekiga.schemas.in.in.h:58
+msgid "Position on the screen of the audio settings window"
+msgstr "পর্দার মধ্যে অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:82
-msgid "Position on the screen of the address book window"
-msgstr ""
+#: ../ekiga.schemas.in.in.h:59
+msgid "Position on the screen of the chat window"
+msgstr "পর্দার মধ্যে আলাপন উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:83
-msgid "Position on the screen of the calls history window"
-msgstr ""
+#: ../ekiga.schemas.in.in.h:60
+msgid "Position on the screen of the druid window"
+msgstr "পর্দার মধ্যে druid উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:84
-msgid "Position on the screen of the general history window"
-msgstr ""
+#: ../ekiga.schemas.in.in.h:61
+msgid "Position on the screen of the log window"
+msgstr "পর্দার মধ্যে লগ উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:85
-#, fuzzy
+#: ../ekiga.schemas.in.in.h:62
 msgid "Position on the screen of the main window"
-msgstr "চ্যাট উইন্ডো মূল উইন্ডোর মধ্যে দেখাও"
+msgstr "পর্দার মধ্যে প্রধান উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:86
+#: ../ekiga.schemas.in.in.h:63
 msgid "Position on the screen of the preferences window"
-msgstr ""
+msgstr "পছন্দসই বৈশিষ্ট্য স্ক্রীনের উপর রাখুন"
 
-#: gnomemeeting.schemas.in.in.h:87
-msgid "Public IP of the NAT/PAT router"
-msgstr "ন্যাট/প্যাট রাউটরের পাব্লিক আই-পি"
-
-#: gnomemeeting.schemas.in.in.h:88
-msgid "Received Video Quality Hint"
-msgstr "প্রাপ্ত ভিডিও-র মানের ইঙ্গিত"
+#: ../ekiga.schemas.in.in.h:64
+msgid "Position on the screen of the video settings window"
+msgstr "পর্দার মধ্যে ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:89
-#, fuzzy
-msgid "Received calls history"
-msgstr "আপনার পাওয়া কলগুলি"
+#: ../ekiga.schemas.in.in.h:65
+msgid "Remote video window position"
+msgstr "দূরবর্তী ভিডিও উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:90
-msgid "Registering method"
-msgstr "নথিভুক্তিকরণের পদ্ধতি"
-
-#: gnomemeeting.schemas.in.in.h:91 src/pref_window.cpp:1246
-msgid "Registering method to use"
-msgstr "নথিভুক্তিকরণের পদ্ধতি ব্যবহৃত হবে"
-
-#: gnomemeeting.schemas.in.in.h:92
-msgid "Remote video window height"
-msgstr "দূরবর্তী ভিডিও উইন্ডোর উচ্চতা"
-
-#: gnomemeeting.schemas.in.in.h:93
-msgid "Remote video window width"
-msgstr "দূরবর্তী ভিডিও উইন্ডোর প্রস্ত"
-
-#: gnomemeeting.schemas.in.in.h:94
-msgid "Revision of the schema file"
-msgstr "স্কীমা ফাইলের নতুন সংস্করণ"
+#: ../ekiga.schemas.in.in.h:66
+msgid "Remote video window size"
+msgstr "দূরবর্তী ভিডিও উইন্ডোর মাপ"
 
-#: gnomemeeting.schemas.in.in.h:95 src/pref_window.cpp:1328
-#, fuzzy
-msgid "Select the audio input device to use."
-msgstr "ব্যবহারের জন্য অডিও প্লেয়ার ডিভাইস বেছে নিন"
+#: ../ekiga.schemas.in.in.h:67
+msgid "Select an alternative audio output device to use for sound events."
+msgstr "শব্দ সহ ইভেন্টের জন্য বিকল্প অডিও আউটপুট ডিভাইস নির্বাচন করুন।"
 
-#: gnomemeeting.schemas.in.in.h:96 src/pref_window.cpp:1322
-#, fuzzy
-msgid "Select the audio output device to use."
-msgstr "ব্যবহারের জন্য অডিও প্লেয়ার ডিভাইস বেছে নিন"
+#: ../ekiga.schemas.in.in.h:68 ../src/gui/preferences.cpp:777
+msgid "Select the audio input device to use"
+msgstr "ব্যবহারের জন্য অডিও ইনপুট ডিভাইস নির্বাচন করুন"
 
-#: gnomemeeting.schemas.in.in.h:97 src/pref_window.cpp:1407
+#: ../ekiga.schemas.in.in.h:69 ../src/gui/preferences.cpp:770
+msgid "Select the audio output device to use"
+msgstr "ব্যবহারের জন্য অডিও আউটপুট ডিভাইস নির্বাচন করুন"
+
+#: ../ekiga.schemas.in.in.h:70 ../src/gui/preferences.cpp:936
 msgid ""
-"Select the format for video cameras. (Does not apply to most USB cameras)."
-msgstr ""
-"ভিডিও ক্যামেরার ধরণ বেছে নিন (অধিকাংশ ইউ-এস-বি ক্যামেরার ক্ষেত্রে প্রযোজ্য নয়)"
+"Select the format for video cameras (does not apply to most USB cameras)"
+msgstr "ভিডিও ক্যামেরার বিন্যাস বেছে নিন (অধিকাংশ USB ক্যামেরার ক্ষেত্রে প্রযোজ্য নয়)"
 
-#: gnomemeeting.schemas.in.in.h:98 src/pref_window.cpp:1405
+#: ../ekiga.schemas.in.in.h:71
 msgid ""
 "Select the transmitted video size: Small (QCIF 176x144) or Large (CIF "
-"352x288)."
-msgstr "প্রেরিত ভিডিওরে আকার বাছাই: ছোট (QCIF ১৭৬x১৪৪) অথবা বড় (CIF ৩৫২x২৮৮)"
+"352x288)"
+msgstr ""
+"সম্প্রচার করা ভিডিও মাপ নির্বাচন করুন: ছোট (QCIF 176x144) অথবা বড় (CIF 352x288)"
 
-#: gnomemeeting.schemas.in.in.h:99
-#, fuzzy
+#: ../ekiga.schemas.in.in.h:72 ../src/gui/preferences.cpp:928
 msgid ""
-"Select the video input device to use. Using an invalid video device or "
-"\"Picture\" for video transmission will transmit a test picture."
+"Select the video input device to use. If an error occurs when using this "
+"device a test picture will be transmitted."
 msgstr ""
-"ব্যবহৃত ভিডিও ডিভাইস বাছাই করা।  বেঠিক ভিডিও ডিভাইস বা \"ছবি\" ব্যবহার করলে "
-"ভিডিও প্ররণের জন্য একটি পরীক্ষামূলক ছবি ব্যবহার করা হবে"
+"ব্যবহারযোগ্য ভিডিও ইনপুট ডিভাইস নির্বাচন করুন। এই ডিভাইস ব্যবহারকালে কোনো ধরনের "
+"ত্রুটি উৎপন্ন হলে একটি পরীক্ষামূলক ছবি সম্প্রচার করা হবে।"
 
-#: gnomemeeting.schemas.in.in.h:100
-msgid "Show a status bar at the bottom of the main window"
-msgstr "মূল উইন্ডোর নিচে স্টাটাস বার দেখানো হবে"
+#: ../ekiga.schemas.in.in.h:73
+msgid "Show offline contacts"
+msgstr "অনুপস্থিত কন্ট্যাক্টদের প্রদর্শন করুন"
 
-#: gnomemeeting.schemas.in.in.h:101
-msgid "Show chat window"
-msgstr "চ্যাট উইন্ডো দেখানো হবে"
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3225
+msgid "Show the call panel"
+msgstr "কলের প্যানেল প্রদর্শন করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:102
-msgid "Show my details to other registered users"
-msgstr "নথিভুক্ত ব্যবহারকারীরা আমার বিবরণ দেখতে পারবে"
+#: ../ekiga.schemas.in.in.h:75
+msgid "Size of the address book window"
+msgstr "ঠিকানা বইয়ের উইন্ডোর মাপ"
 
-#: gnomemeeting.schemas.in.in.h:103
-msgid "Show splash screen"
-msgstr "স্প্ল্যাস স্ক্রীন দেখাও"
+#: ../ekiga.schemas.in.in.h:76
+msgid "Size of the audio settings window"
+msgstr "অডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ"
 
-#: gnomemeeting.schemas.in.in.h:104
-msgid "Show status bar"
-msgstr "স্টাটাস বার দেখাও"
+#: ../ekiga.schemas.in.in.h:77
+msgid "Size of the chat window"
+msgstr "আড্ডা উইন্ডোর মাপ"
 
-#: gnomemeeting.schemas.in.in.h:105
-msgid "Show the chat window in the main window"
-msgstr "চ্যাট উইন্ডো মূল উইন্ডোর মধ্যে দেখাও"
+#: ../ekiga.schemas.in.in.h:78
+msgid "Size of the druid window"
+msgstr "druid উইন্ডোর মাপ"
 
-#: gnomemeeting.schemas.in.in.h:106
-#, fuzzy
-msgid "Size of the address book window"
-msgstr "ঠিকানার খাতা খোলা হবে"
+#: ../ekiga.schemas.in.in.h:79
+msgid "Size of the preferences window"
+msgstr "পছন্দসই বৈশিষ্ট্যের উইন্ডোর মাপ"
 
-#: gnomemeeting.schemas.in.in.h:107
-#, fuzzy
-msgid "Size of the calls history window"
-msgstr "কলের ইতিহাস দেখানো হবে"
+#: ../ekiga.schemas.in.in.h:80
+msgid "Size of the video settings window"
+msgstr "ভিডিও সংক্রান্ত বৈশিষ্ট্যের উইন্ডোর মাপ"
 
-#: gnomemeeting.schemas.in.in.h:108
-#, fuzzy
-msgid "Size of the general history window"
-msgstr "স্থানীয় ভিডিও উইন্ডোর প্রস্ত"
+#: ../ekiga.schemas.in.in.h:81
+msgid "Specify the software scaling algorithm"
+msgstr "সফ্টওয়ার স্কেলিং-এর অ্যালগরিদম নির্ধারন করুন"
 
-#: gnomemeeting.schemas.in.in.h:109
-#, fuzzy
-msgid "Size of the preferences window"
-msgstr "দূরবর্তী ভিডিও উইন্ডোর প্রস্ত"
+# retaining the algorithm names in english
+#: ../ekiga.schemas.in.in.h:82
+msgid ""
+"Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest "
+"neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
+"Does not apply on windows systems."
+msgstr ""
+"ছবির মাপ পরিবর্তনের জন্য অ্যালগোরিদম নির্ধারণ করুন: ০: nearest neighbor, ১: "
+"nearest neighbor with box filter , ২: bilinear filtering , ৩: hyperbolic "
+"filtering। windows সিস্টেমের ক্ষেত্রে প্রযোজ্য নয়।"
 
-#: gnomemeeting.schemas.in.in.h:110
+#: ../ekiga.schemas.in.in.h:83
 msgid "Start hidden"
-msgstr "লুকিয়ে রেখে শুরু কর"
+msgstr "লুকিয়ে রেখে শুরু করুন"
 
-#: gnomemeeting.schemas.in.in.h:111 src/menu.cpp:518 src/menu.cpp:634
-msgid "Switch to fullscreen"
-msgstr "পুরো স্ক্রীন জুড়ে দেখাও"
-
-#: gnomemeeting.schemas.in.in.h:112
-msgid "Switch to fullscreen for images displayed in the main GUI."
-msgstr "মূল জী-উ-ই-তে প্রদর্শিত ছবি পুরো স্ক্রীন জুড়ে দেখাও"
+#: ../ekiga.schemas.in.in.h:84
+msgid "TCP port range"
+msgstr "TCP পোর্টের সীমা"
 
-#: gnomemeeting.schemas.in.in.h:113
-msgid "TCP Port Range"
-msgstr "টি-সি-পি পোর্টয়ের সীমা"
+#: ../ekiga.schemas.in.in.h:85
+msgid "Temporal Spatial Trade Off"
+msgstr "অস্থায়ী বিশেষ ট্রেড অফ"
 
-#: gnomemeeting.schemas.in.in.h:114
+#: ../ekiga.schemas.in.in.h:86
 msgid "The Audio Codecs List"
 msgstr "অডিও কোডেকের তালিকা"
 
-#: gnomemeeting.schemas.in.in.h:115 src/pref_window.cpp:1336
-msgid ""
-"The Automatic Echo Cancellation level: Off, Low, Medium, High, Automatic "
-"Gain Compensation. Choosing Automatic Gain Compensation modulates the volume "
-"for best quality."
-msgstr ""
-"স্বয়ংক্রিয় প্রতিধ্বনি বাতিলের মাত্রা: Off, Low, Medium, High, Automatic Gain "
-"Compensation।  Automatic Gain Compensation বাছলে তা সর্বশ্রেষ্ঠ মানের শব্দের "
-"মাত্রা (ভল্যুম) ঠিক করে নেবে"
+#: ../ekiga.schemas.in.in.h:87 ../src/gui/preferences.cpp:727
+msgid "The SIP Outbound Proxy to use for outgoing calls"
+msgstr "যে সকল কল বাইরে যাচ্ছে তাতে ব্যবহৃত SIP Outbound Proxy নির্বাচন করুন"
 
-#: gnomemeeting.schemas.in.in.h:116 src/pref_window.cpp:1238
+#: ../ekiga.schemas.in.in.h:88
+msgid "The STUN Server"
+msgstr "STUN সার্ভার"
+
+#: ../ekiga.schemas.in.in.h:89
 msgid ""
-"The Gatekeeper alias to use when registering (string, or E164 ID if only "
-"0123456789#)."
+"The STUN server to use for STUN Support. STUN is a technology that permits "
+"passage through some types of NAT gateway"
 msgstr ""
-"নথিভুক্তিকালীন যে গেটকিপার ডাকনামের ব্যবহার হবে (স্ট্রিং, বা E164 একমাত্র যদি "
-"0123456789# হয়)"
+"STUN সমর্থনে ব্যবহৃত STUN সার্ভার। STUN প্রযুক্তির সাহায্যে কিছু প্রকার NAT গেটওয়ের "
+"মধ্যে পথ প্রস্তুত করা সম্ভব"
 
-#: gnomemeeting.schemas.in.in.h:117 src/pref_window.cpp:1236
-msgid "The Gatekeeper host to register with."
-msgstr "যে গেটকিপার হোস্টে নথিভুক্ত করা হবে"
+#: ../ekiga.schemas.in.in.h:90
+msgid "The Video Codecs List"
+msgstr "ভিডিও কোডেকের তালিকা"
 
-#: gnomemeeting.schemas.in.in.h:118 src/pref_window.cpp:1234
-msgid "The Gatekeeper identifier to register with."
-msgstr "যে পরিচয় নিয়ে গেটকিপারে নথিভুক্ত করা হবে"
+#: ../ekiga.schemas.in.in.h:91
+msgid "The accounts list"
+msgstr "অ্যাকাউন্ট তালিকা"
 
-#: gnomemeeting.schemas.in.in.h:119 src/pref_window.cpp:1241
-msgid ""
-"The Gatekeeper password to use for H.235 authentication to the Gatekeeper."
-msgstr "গেটকিপারে এইচ.২৩৫ অনুমদনের উদ্দেশ্যে ব্যবহৃত গেটকিপার পাসওয়ার্ডটি"
+#: ../ekiga.schemas.in.in.h:92
+msgid "The audio codecs list"
+msgstr "অডিও কোডেকের তালিকা"
 
-#: gnomemeeting.schemas.in.in.h:120
-msgid "The Video Quality to request to the remote"
-msgstr "যে মানের ভিডিও পাঠানোর আবেদন জানানো হবে"
+#: ../ekiga.schemas.in.in.h:93
+msgid "The busy tone sound"
+msgstr "ব্যস্ত টোন ধ্বনি"
 
-#: gnomemeeting.schemas.in.in.h:121 src/pref_window.cpp:1310
+#: ../ekiga.schemas.in.in.h:94
 msgid ""
-"The audio plugin that will be used to detect the devices and manage them."
+"The chosen sound will be played at the end of calls or calling somebody who "
+"is busy, if enabled"
 msgstr ""
+"যদি সক্রিয় করা থাকে, তাহলে নির্বাচিত ধ্বনি কলের শেষে অথবা কোন ব্যস্ত সংযোগস্থাপনের "
+"সময় বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:122
-msgid "The busy tone sound"
-msgstr ""
+#: ../ekiga.schemas.in.in.h:95
+msgid "The chosen sound will be played on incoming calls, if enabled"
+msgstr "সক্রিয় থাকলে কল গ্রহণ করার সময় এই ধ্বনি বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:123
+#: ../ekiga.schemas.in.in.h:96
 msgid ""
-"The chosen sound will be played at the end of calls or calling somebody who "
-"is busy, if enabled."
-msgstr ""
+"The chosen sound will be played when a new instant message is received, if "
+"enabled"
+msgstr "সক্রিয় থাকলে নতুন বার্তা গ্রহণ করার সময় এই ধ্বনি বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:124
-msgid "The chosen sound will be played on incoming calls, if enabled."
-msgstr ""
+#: ../ekiga.schemas.in.in.h:97
+msgid ""
+"The chosen sound will be played when a new voice mail is received, if enabled"
+msgstr "সক্রিয় হলে, নতুন ভয়েস মেইল পেলে নির্বাচিত শব্দ বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:125
-msgid "The chosen sound will be played when calling somebody, if enabled."
-msgstr ""
+#: ../ekiga.schemas.in.in.h:98
+msgid "The chosen sound will be played when calling somebody, if enabled"
+msgstr "সক্রিয় হলে, কোনো কল করার সময় নির্বাচিত শব্দ বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:126
+#: ../ekiga.schemas.in.in.h:99
 msgid "The default video view"
 msgstr "ডিফল্ট ভিডিও দর্শনের ধরণ"
 
-#: gnomemeeting.schemas.in.in.h:127
+#: ../ekiga.schemas.in.in.h:100
 msgid ""
-"The default video view (0: Local, 1: Remote, 2: Both incrusted, 3: Both with "
+"The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with "
 "local video in a separate window, 4: Both)"
 msgstr ""
-"ডিফল্ট ভিডিও দর্শনের ধরণ (0: স্থানীয়, 1: দূরবর্তী, 2: দুটিই ইনক্রাস্টেড, 3: দুটিই তবে "
-"স্থানীয় ভিডিও আলাদা উইন্ডোতে, 4: দুটিই)"
+"ডিফল্ট ভিডিও দর্শনের ধরণ (০: স্থানীয়, ১: দূরবর্তী, ২: দুটিই ইনক্রাস্টেড, ৩: দুটিই তবে "
+"স্থানীয় ভিডিও আলাদা উইন্ডোতে, ৪: দুটিই)"
 
-#: gnomemeeting.schemas.in.in.h:128
-msgid "The height of the local video window"
-msgstr "স্থানীয় ভিডিও উইন্ডোর উচ্চতা"
-
-#: gnomemeeting.schemas.in.in.h:129
-msgid "The height of the remote video window"
-msgstr "দূরবর্তী ভিডিও উইন্ডোর উচ্চতা"
+#: ../ekiga.schemas.in.in.h:101
+msgid "The dial tone sound"
+msgstr "ডায়াল টোন ধ্বনি"
+
+#: ../ekiga.schemas.in.in.h:102
+msgid "The history of the 100 last calls"
+msgstr "পূর্ববর্তী ১০০-টি কল সম্পর্কিত তথ্য"
+
+#: ../ekiga.schemas.in.in.h:103 ../src/gui/preferences.cpp:676
+#: ../src/gui/preferences.cpp:730
+msgid "The host where calls should be forwarded if call forwarding is enabled"
+msgstr "ওপরে উল্লেখিত ক্ষেত্রসমূহ নির্বাচিত হলে যে হোস্টে সব কল পাঠিয়ে দেওয়া হবে"
 
-#: gnomemeeting.schemas.in.in.h:130
-msgid "The history of the last 100 missed calls."
-msgstr ""
+#: ../ekiga.schemas.in.in.h:104
+msgid "The incoming call sound"
+msgstr "কল গ্রহণ করার ধ্বনি"
 
-#: gnomemeeting.schemas.in.in.h:131
-msgid "The history of the last 100 placed calls."
-msgstr ""
+#: ../ekiga.schemas.in.in.h:105
+msgid "The list of accounts to which Ekiga should register"
+msgstr "Ekiga দ্বারা যে সমস্ত অ্যাকাউন্টের সাথে নিবন্ধন করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:132
-msgid "The history of the last 100 received calls."
-msgstr ""
+#: ../ekiga.schemas.in.in.h:106
+msgid "The long status information"
+msgstr "যোগাযোগ সংক্রান্ত তথ্যাদি সম্পাদন"
 
-#: gnomemeeting.schemas.in.in.h:133 src/pref_window.cpp:991
+#: ../ekiga.schemas.in.in.h:107
 msgid ""
-"The host where calls should be forwarded to in the cases selected above."
-msgstr "ওপরে উল্লেখিত ক্ষেত্রসমূহ নির্বাচিত হলে যে হোস্টে সব কল পাঠিয়ে দেওয়া হবে"
-
-#: gnomemeeting.schemas.in.in.h:134 src/pref_window.cpp:934
-msgid "The image height for fullscreen."
-msgstr "পুরো স্ক্রীনের ক্ষেত্রে ছবির উচ্চতা"
+"The maximum RX video bitrate in kbit/s. This value will be signaled to the "
+"peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
+"above the signaled value"
+msgstr ""
+"কিলোবিট/সেকেন্ড অনুযায়ী সর্বাধিক RX ভিডিওর বিটের হার। সমতূল্য প্রান্তিক সমাপ্তিস্থলে "
+"এই মান প্রেরিত হবে এবং (বৈশিষ্ট্য সমর্থিত হলে) সেটির TX বিটের হার বেশি হলে তা "
+"যথাযতভাবে পরিবর্তিত হবে।"
 
-#: gnomemeeting.schemas.in.in.h:135 src/pref_window.cpp:1410
+#: ../ekiga.schemas.in.in.h:108
 msgid ""
-"The image to transmit if \"Picture\" is selected for the video device or if "
-"the opening of the device fails. Leave blank to use the default GnomeMeeting "
-"logo."
+"The maximum TX video bitrate in kbit/s. The video quality and the number of "
+"transmitted frames per second (depends on selected codec) will be "
+"dynamically adjusted above their minimum during calls to try to minimize the "
+"bandwidth to the given value"
 msgstr ""
-"ভিডিওর ক্ষেত্রে \"ছবি\" নির্বাচন করলে বা ডিভাইসটি খোলার চেষ্টা ব্যর্থ হলে ভিডিওতে "
-"এই ছবিটি পাঠানো হবে।  এটি ফাঁকা রাখলে গুহ্‌নোমমিটিং-র ডিফল্ট লোগো ব্যবহার করা হবে"
-
-#: gnomemeeting.schemas.in.in.h:136 src/pref_window.cpp:934
-msgid "The image width for fullscreen."
-msgstr "পুরো স্ক্রীনের ক্ষেত্রে ছবির প্রস্ত"
-
-#: gnomemeeting.schemas.in.in.h:137
-#, fuzzy
-msgid "The incoming call sound"
-msgstr "আসা কলের উত্তর দেওয়া হচ্ছে"
-
-#: gnomemeeting.schemas.in.in.h:138
-msgid "The list of called URLs"
-msgstr "কলটু ইউ-আর-এল-র তালিকা"
-
-#: gnomemeeting.schemas.in.in.h:139
-msgid "The list of groups"
-msgstr "গ্রূপের তালিকা"
+"কিলোবাইট/সেকেন্ডে ধার্য TX ভিডিওর সর্বাধিক বিটের হার। কল চলাকালীন ব্যান্ডউইর্থের "
+"সুনির্দিষ্ট মান বজায় রাখার জন্য ভিডিও গুনমান ও প্রতি সেকেন্ডে পরিবাহিত ফ্রেমের "
+"সংখ্যাগুলি তৎক্ষনাৎ পরিবর্তন করা হবে (নির্বাচিত কোডেকের উপর নির্ভরশীল) ও সর্বনিম্ন "
+"পরিমাণের চেয়ে বেশি মাপে ধার্য করা হবে।"
 
-#: gnomemeeting.schemas.in.in.h:140 src/pref_window.cpp:1589
-msgid "The maximum jitter buffer size for audio reception (in ms)."
-msgstr "অডিও গ্রহণের উদ্দেশ্যে জিটার বাফারের সর্বাধিক আয়তন (মি-সেক-য়ে)"
+#: ../ekiga.schemas.in.in.h:109
+msgid "The maximum jitter buffer size for audio reception (in ms)"
+msgstr "অডিও গ্রহণের উদ্দেশ্যে jitter বাফারের সর্বাধিক মাপ (মিলিসেকেন্ডে ধার্য)"
 
-#: gnomemeeting.schemas.in.in.h:141 src/pref_window.cpp:1623
+#: ../ekiga.schemas.in.in.h:110
 msgid ""
-"The maximum video bandwidth in kbytes/s. The video quality and the number of "
-"transmitted frames per second will be dynamically adjusted above their "
-"minimum during calls to try to minimize the bandwidth to the given value."
+"The maximum transmitted frame rate in frames/s. This rate may not be reached "
+"in case a minimum quality was configure via a TSTO value smaller than 31 and "
+"the bitrate selected is not sufficient to support this minimum quality"
 msgstr ""
-"কে-বি/সেক পরিমাপে সর্বাধিক ভিডিও ব্যান্ডহুইডত্‌।  ভিডিওর মান ও প্রতি সেকেন্ডে প্রেরিত "
-"ফ্রেমের সংখ্যা কল চলাকালীন ব্যান্ডহুইডত্‌-এর ব্যবহার সংকোচনের দিকে নজর রেখে নিয়ন্ত্রণ "
-"করা হবে নির্দিষ্ট মানের অনুসারে"
+"ফ্রেম/সেকেন্ড অনুযায়ী পরিবাহিত সর্বাধিক ফ্রেমের হার। সর্বনিম্ন গুণমান চিহ্নকারী মান, "
+"TSTO-র মাধ্যমে ৩১-এর কম কোনো সংখ্যায় ধার্য করা হলে ও সর্বনিম্ন এই মান সমর্থনের জন্য "
+"নির্বাচিত বিটের হার পর্যাপত না হলে এই মাত্রা স্পর্শ সম্ভব না হতে পারে।"
 
-#: gnomemeeting.schemas.in.in.h:142 src/pref_window.cpp:1589
-msgid "The minimum jitter buffer size for audio reception (in ms)."
-msgstr "অডিও গ্রহণের জন্য প্রয়োজনীয় ন্যনতম জিটার বাফারের আয়তন (মি-সেক-য়ে)"
+#: ../ekiga.schemas.in.in.h:111
+msgid "The new instant message sound"
+msgstr "নতুন ইনস্ট্যান্ট বার্তার জন্য চিহ্নিত শব্দ"
 
-#: gnomemeeting.schemas.in.in.h:143 src/pref_window.cpp:1635
-msgid ""
-"The minimum number of video frames to transmit each second when trying to "
-"minimize the bandwidth."
-msgstr ""
-"ব্যান্ডহুইডত্‌-এর ব্যবহার সংকোচনের উদ্দেশ্যে প্রতি সেকেন্ডে প্রেরিত ফ্রেমের সংখ্যার ন্যুনতম "
-"মান"
+#: ../ekiga.schemas.in.in.h:112
+msgid "The new voice mail sound"
+msgstr "প্রাপ্ত নতুন ভয়েস মেইলের শব্দ"
 
-#: gnomemeeting.schemas.in.in.h:145
-#, no-c-format
+#: ../ekiga.schemas.in.in.h:113
 msgid ""
-"The minimum transmitted video quality to keep when trying to minimize the "
-"used bandwidth: choose 100% on a LAN for the best quality, 1% being the "
-"worst quality."
+"The port to listen to for incoming connections. Ekiga needs to be restarted "
+"for the new value to take effect"
 msgstr ""
-"ব্যান্ডহুইডত্‌-এর ব্যবহার সংকোচনের সময় প্রেরিত ভিডিওর যে ন্যুনতম মান রাখা হবে: ল্যানে "
-"সর্বোচ্চ মানের জন্য ১০০% ব্যবহার করুন, ১% য়ে সবচেয়ে নিকৃষ্ট মান ব্যবহার করা হবে"
+"আগমনকারী সংযোগের জন্য অপেক্ষামান পোর্ট। নতুন মান প্রয়োগ করার জন্য Ekiga পুনরায় আরম্ভ "
+"করা আবশ্যক"
 
-#: gnomemeeting.schemas.in.in.h:146 src/pref_window.cpp:1338
+#: ../ekiga.schemas.in.in.h:114
 msgid ""
-"The output device type is the type of device connected to your Quicknet "
-"card. It can be either a POTS (plain old telephone set) or a headset."
+"The port to listen to for incoming connections. Ekiga needs to be restarted "
+"for the new value to take effect."
 msgstr ""
+"আগমনকারী সংযোগের জন্য অপেক্ষামান পোর্ট। নতুন মান প্রয়োগ করার জন্য Ekiga পুনরায় আরম্ভ "
+"করা আবশ্যক।"
 
-#: gnomemeeting.schemas.in.in.h:147
-msgid ""
-"The port to listen to for incoming connections. GnomeMeeting needs to be "
-"restarted for the new value to take effect."
-msgstr ""
-"আসা সংযোগের জন্য যে পোর্টটিকে শোনা হবে।  গুহ্‌নোমমিটিং-কে পুনরায় চালু করতে হবে নতুন "
-"মানের ব্যবহারের জন্য"
+#: ../ekiga.schemas.in.in.h:115
+msgid "The position of the local video window"
+msgstr "স্থানীয় ভিডিও উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:148
-msgid ""
-"The prefix that will be used to save pictures of the conversation. That "
-"prefix is followed by the snapshot number."
-msgstr ""
-"যে প্রিফিক্সটি আলাপচারিতার সময়কালীন ছবিগুলির সংরক্ষণের ক্ষেত্রে ব্যবহার করা হবে। ওই "
-"প্রিফিক্সটির পরে স্ন্যাপশট নম্বর থাকবে"
+#: ../ekiga.schemas.in.in.h:116
+msgid "The position of the remote video window"
+msgstr "দূরবর্তী ভিডিও উইন্ডোর অবস্থান"
 
-#: gnomemeeting.schemas.in.in.h:149
+#: ../ekiga.schemas.in.in.h:117
 msgid ""
-"The range of TCP ports beside the listen_port that GnomeMeeting will use for "
-"the H.245 channel. You can change the TCP port range if you are using IP "
-"translation and if you need to have several GnomeMeeting running behind your "
-"NAT/PAT router. GnomeMeeting needs to be restarted for the new values to "
-"take effect. This port range has no effect if both participants to the "
-"conference are using H.245 Tunneling."
+"The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
+"port range has no effect if both participants to the conference are using "
+"H.245 Tunneling."
 msgstr ""
-"লিস্টেন_পোর্ট ছাড়া অন্য যে সব টি-সি-পি পোর্টের সারি এইচ.২৪৫ চ্যানেলের জন্য "
-"গুহ্‌নোমমিটিং ব্যবহার করতে পারে। আপনি যদি আই-পি ট্রান্সলেশন ব্যবহার করেন বা যদি "
-"আপনার ন্যাট/প্যাট রাউটরের পেছন অনেকগুলি গুহ্‌নোমমিটিং চলে থাকে তাহলে আপনি টি-সি-পি "
-"পোর্টের সারি বদলাতে পারেন।  গুহ্‌নোমমিটিং-কে পুনরায় চালু করতে হবে নতুন মানের "
-"ব্যবহারের জন্য।  তবে সম্মেলনে অংশগ্রহণকারী দুজনেই যদি এইচ.২৪৫ টানেলিং ব্যবহার করেন "
-"তাহলে এই পোর্টের  সারির কোন তাত্‌পর্য্য থাকে না। "
+"H.323 H.245 চ্যানেলের জন্য Ekiga দ্বারা ব্যবহৃত TCP পোর্টের সীমা। কনফারেন্সের সকল "
+"অংশগ্রহকারী দ্বারা H.245 টানেলিং ব্যবহার করা হলে পোর্টের এই সীমা দ্বারা কোনো "
+"প্রভাব সৃষ্টি হবে না।"
 
-#: gnomemeeting.schemas.in.in.h:150
-msgid ""
-"The range of UDP ports that GnomeMeeting will use for RTP (audio and video "
-"communication channels). You can change the UDP port range if you are using "
-"IP translation and if you need to have several GnomeMeeting running behind "
-"your NAT/PAT router. GnomeMeeting needs to be restarted for the new values "
-"to take effect."
-msgstr ""
-"আর-টি-পি-র (অডিও ও ভিডিও সংযোগ চ্যানেল) জন্য গুহ্‌নোমমিটিং যে ইউ-ডি-পি পোর্টের "
-"সারি ব্যবহার করতে পারে।  আপনি যদি আই-পি ট্রান্সলেশন ব্যবহার করেন বা যদি আপনার "
-"ন্যাট/প্যাট রাউটরের পেছন অনেকগুলি গুহ্‌নোমমিটিং চলে থাকে তাহলে আপনি ইউ-ডি-পি "
-"পোর্টের সারি বদলাতে পারেন।  গুহ্‌নোমমিটিং-কে পুনরায় চালু করতে হবে নতুন মানের "
-"ব্যবহারের জন্য। "
+#: ../ekiga.schemas.in.in.h:118
+msgid "The range of UDP ports that Ekiga will use."
+msgstr "Ekiga দ্বারা ব্যবহারযোগ্য UDP পোর্টের সীমা।"
 
-#: gnomemeeting.schemas.in.in.h:151
-msgid ""
-"The range of UDP ports that GnomeMeeting will use when registering to "
-"gatekeepers. You can change the UDP port range if you are using IP "
-"translation and if you need to have several GnomeMeeting running behind your "
-"NAT/PAT router. GnomeMeeting needs to be restarted for the new values to "
-"take effect. This port range has no effect if you are not registering to a "
-"gatekeeper."
-msgstr ""
-"গেটকিপারের সঙ্গে নথিভুক্তকরণের সময়ের গুহ্‌নোমমিটিং যে ইউ-ডি-পি পোর্টের সারি ব্যবহার "
-"করতে পারে।  আপনি যদি আই-পি ট্রান্সলেশন ব্যবহার করেন বা যদি আপনার ন্যাট/প্যাট "
-"রাউটরের পেছন অনেকগুলি গুহ্‌নোমমিটিং চলে থাকে তাহলে আপনি ইউ-ডি-পি পোর্টের সারি "
-"বদলাতে পারেন।  গুহ্‌নোমমিটিং-কে পুনরায় চালু করতে হবে নতুন মানের ব্যবহারের জন্য।  যদি "
-"আপনি কোন গেটকিপার ব্যবহার না করেন তাহলে এই পোর্টের  সারির কোন তাত্‌পর্য্য থাকে না। "
+#: ../ekiga.schemas.in.in.h:119
+msgid "The short status information"
+msgstr "অবস্থা সম্পর্কিত সংক্ষিপ্ত সূচনা"
 
-#: gnomemeeting.schemas.in.in.h:152
-msgid "The ring tone sound"
-msgstr ""
+#: ../ekiga.schemas.in.in.h:120
+msgid "The size of the local video window"
+msgstr "স্থানীয় ভিডিও উইন্ডোর মাপ"
 
-#: gnomemeeting.schemas.in.in.h:153
-msgid "The save prefix"
-msgstr "সংরক্ষণে ব্যবহৃত প্রিফিক্স"
+#: ../ekiga.schemas.in.in.h:121
+msgid "The size of the remote video window"
+msgstr "দূরবর্তী ভিডিও উইন্ডোর মাপ"
 
-#: gnomemeeting.schemas.in.in.h:154
+#: ../ekiga.schemas.in.in.h:122
 msgid ""
 "The sound that will be played at the end of calls or when calling somebody "
-"who is busy, if enabled."
+"who is busy, if enabled"
 msgstr ""
+"বৈশিষ্ট্য সক্রিয় করা হলে, কলের সমাপ্তির পরে অথবা কল করা ব্যক্তি ব্যস্ত থাকলে চিহ্নিত "
+"শব্দ বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:155
-msgid "The sound that will be played on incoming calls, if enabled."
-msgstr ""
+#: ../ekiga.schemas.in.in.h:123
+msgid "The sound that will be played on incoming calls, if enabled"
+msgstr "সক্রিয় হলে‌, আগত কলের জন্য যে শব্দ বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:156
-msgid "The sound that will be played when calling somebody, if enabled."
-msgstr ""
+#: ../ekiga.schemas.in.in.h:124
+msgid "The sound that will be played when calling somebody, if enabled"
+msgstr "সক্রিয় হলে‌, কোনো ব্যক্তিকে কল করার সময় যে শব্দ বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:157 src/pref_window.cpp:1341
+#: ../ekiga.schemas.in.in.h:125
 msgid ""
-"The two-letter country code of your country (e.g.: BE, UK, FR, DE, ...)."
-msgstr "আপনার দেশের দুই অক্ষরের কান্ট্রি কোড (যেমন: BE, UK, FR, DE, ...)"
+"The sound that will be played when there is a new instant message, if enabled"
+msgstr "সক্রিয় হলে‌, নতুন ইন্সট্যান্ট বার্তা প্রাপ্ত হলে যে শব্দ বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:158 src/pref_window.cpp:965
-msgid "The user directory server to register with."
-msgstr "যে ইউজার ডিরেক্টরি সার্ভারে নথিভুক্ত করা হবে"
-
-#: gnomemeeting.schemas.in.in.h:159 src/pref_window.cpp:1403
+#: ../ekiga.schemas.in.in.h:126
 msgid ""
-"The video channel number to use (to select camera, tv or other sources)."
-msgstr "যে ভিডিও চ্যানেল নম্বর ব্যবহৃত হবে (ক্যামেরা, টিভি বা অন্য কিছু বাছুন)"
+"The sound that will be played when there is a new voice mail, if enabled"
+msgstr "সক্রিয় হলে‌, নতুন ভয়েস মেইল প্রাপ্ত হলে যে শব্দ বাজানো হবে"
 
-#: gnomemeeting.schemas.in.in.h:160 src/pref_window.cpp:1388
-msgid ""
-"The video plugin that will be used to detect the devices and manage them."
+#: ../ekiga.schemas.in.in.h:127 ../src/gui/preferences.cpp:932
+msgid "The video channel number to use (to select camera, tv or other sources)"
 msgstr ""
+"ব্যবহারযোগ্য ভিডিও চ্যানেলের সংখ্যা (ক্যামেরা, টিভি অথবা অন্যান্য উৎস নির্বাচনের জন্য)"
 
-#: gnomemeeting.schemas.in.in.h:161
-msgid ""
-"The way to react to incoming calls: 0 displays a popup, 1 automatically "
-"answers the call, 2 automatically rejects the call and 3 forwards the call "
-"to the given URL, if any."
-msgstr ""
+#: ../ekiga.schemas.in.in.h:128
+msgid "The video codecs list"
+msgstr "ভিডিও কোডেকের তালিকা"
 
-#: gnomemeeting.schemas.in.in.h:162
-msgid "The width of the local video window"
-msgstr "স্থানীয় ভিডিও উইন্ডোর প্রস্ত"
+#: ../ekiga.schemas.in.in.h:129
+msgid "The video view before having switched to fullscreen"
+msgstr "পূর্ণ পর্দা জুড়ে প্রদর্শনের পূর্বে ভিডিও প্রদর্শনের ক্ষেত্র"
 
-#: gnomemeeting.schemas.in.in.h:163
-msgid "The width of the remote video window"
-msgstr "দূরবর্তী ভিডিও উইন্ডোর প্রস্ত"
+#: ../ekiga.schemas.in.in.h:130
+msgid ""
+"The video view before having switched to fullscreen (same values as "
+"video_view)"
+msgstr ""
+"পূর্ণ পর্দা জুড়ে প্রদর্শনের পূর্বে ভিডিও প্রদর্শনের ক্ষেত্র (video_view-র সমান মাপ)"
 
-#: gnomemeeting.schemas.in.in.h:164
+#: ../ekiga.schemas.in.in.h:131
 msgid "The zoom value"
 msgstr "ছোট/বড় করে দেখানোর মাত্রা"
 
-#: gnomemeeting.schemas.in.in.h:165
+#: ../ekiga.schemas.in.in.h:132
 msgid ""
-"The zoom value to apply to images displayed in the main GUI (can be 0.50, "
-"1.00, or 2.00)."
-msgstr ""
-"মূল জি-ইউ-আই-এ প্রদর্শিত ছবির ছোট/বড় করে দেখানোর মাত্রা (যেমন ০.৫০, ১.০০, বা "
-"২.০০)"
-
-#: gnomemeeting.schemas.in.in.h:166
-msgid ""
-"This enables H.245 Tunnelling mode. In H.245 Tunnelling mode H.245 messages "
-"are encapsulated into the the H.225 channel (port 1720). This saves one TCP "
-"connection during calls. H.245 Tunnelling was introduced in H.323v2 and "
-"Netmeeting does not support it. Using both Fast Start and H.245 Tunnelling "
-"can crash some versions of Netmeeting."
+"The zoom value in percent to apply to images displayed in the main GUI (can "
+"be 50, 100, or 200)"
 msgstr ""
-"এটি এইচ.২৪৫ টানেলিং সক্রিয় করে।  এই অবস্থায় এইচ.২৪৫ বার্তাসমূহ এইচ.২২৫ চ্যানেলের "
-"(পোর্ট ১৭২০) মধ্যে এনক্যাপসুলেট করে পাঠানো হবে।  এতে কল চলাকালীন একটি টি-সি-পি "
-"সংযোগ কম লাগে।  এইচ.২৪৫ টানেলিং এইচ.৩২৩v২ থেকে বর্তমান, তবে নেটমিটিং-য়ে এর "
-"সমর্থন নেই।  একই সঙ্গে জলদি শুরু ও এইচ.২৪৫ টানেলিং-র ব্যবহ্বার নেটমিটিং-য়ের কয়েকটি "
-"সংস্করণকে ক্রাশ করায়"
+"প্রধান GUI-র মধ্যে প্রদর্শিত ছবির মাপ, শতাংশে ধার্য (যেমন ৫০, ১০০, অথবা ২০০)"
 
-#: gnomemeeting.schemas.in.in.h:167 src/pref_window.cpp:1198
-msgid "This enables H.245 early in the setup."
-msgstr ""
-
-#: gnomemeeting.schemas.in.in.h:168
+#: ../ekiga.schemas.in.in.h:133
 msgid ""
-"This enables IP checking from dyndns.org and fills the IP in the public IP "
-"of the NAT/PAT gateway field of GnomeMeeting. The returned IP is only used "
-"when IP Translation is enabled. If you disable IP checking, you will have to "
-"manually enter the IP of your gateway in the GnomeMeeting preferences."
+"This allows you to set the mode for sending DTMFs. The values can be "
+"\"RFC2833\" (0), \"INFO\" (1)"
 msgstr ""
+"এর সাহায্যে DTMF প্রেরণের মোড নির্ধারণ করা যাবে। সম্ভাব্য মান হল \"RFC2833\" (0), "
+"\"INFO\" (1)"
 
-#: gnomemeeting.schemas.in.in.h:169 src/pref_window.cpp:1268
+#: ../ekiga.schemas.in.in.h:134
 msgid ""
-"This enables IP translation. IP translation is useful if GnomeMeeting is "
-"running behind a NAT/PAT router. You have to put the public IP of the router "
-"in the field below. If you are registered to ils.seconix.com, GnomeMeeting "
-"will automatically fetch the public IP using the ILS service. If your router "
-"natively supports H.323, you can disable this."
+"This allows you to set the mode for sending DTMFs. The values can be \"String"
+"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
+"\"). Choosing other values than \"String\" disables the Text Chat"
 msgstr ""
-"এটি আই-পি ট্রান্সলেশন সক্রিয় করে।  ন্যাট/প্যাট রাউটরের পেছনে বসে গুহ্‌নোমমিটিং "
-"চালাতে হলে আই-পি ট্রান্সলেশন সাহায্য করে।  রাউটরের পাব্লিক আই-পি নিচে লিখুন আপনি "
-"যদি ils.seconix.com-য়ে নথিভুক্ত থাকেন, তাহলে গুহ্‌নোমমিটিং ILS সার্ভিস দ্বারা "
-"স্বয়ংক্রিয় পদ্ধতিতে পাব্লিক আই-পি তুলে আনবে।  যদি আপনার রাউটরে এইচ.৩২৩ সমর্থিত হয় "
-"তাহলে আপনি এটি নিস্ক্রিয় করে দিতে পারেন"
+"এর সাহায্যে DTMF প্রেরণের মোড নির্ধারণ করা যাবে। সম্ভাব্য মান \"String\" (0), "
+"\"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (ডিফল্ট মান হল \"String\")। "
+"\"String\" ভিন্ন অন্য কোনো মান নির্ধারিত হলে টেক্স চ্যাট নিষ্ক্রিয় হবে"
 
-#: gnomemeeting.schemas.in.in.h:170
+#: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
 msgid ""
-"This permits to set the mode for User Input Capabilities. The values can be "
-"\"All\" (0), \"None\" (1), \"rfc2833\" (2), \"Signal\" (3) or \"String\" (4) "
-"(default is \"All\"). Choosing other values than \"All\", \"String\" or "
-"\"rfc2833\" disables the Text Chat."
+"This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
+"are encapsulated into the H.225 channel (port 1720). This saves one TCP "
+"connection during calls. H.245 Tunneling was introduced in H.323v2 and "
+"Netmeeting does not support it. Using both Fast Start and H.245 Tunneling "
+"can crash some versions of Netmeeting."
 msgstr ""
-"এটি ব্যবহারকারী ইনপুট পদ্ধতিসমূহের ধরন নির্ধারণ করতে সাহায্য করে।  মূল্যমানগুলি হল "
-"\"সব\" (0), \"কোন তাই নয়\" (1), \"আর-এফ-সি ২৮৩৩\" (2), \"সিগনাল\" (3) বা "
-"\"স্ট্রিং\" (4) (ডিফল্ট মান \"সব\")।  \"সব\", \"স্ট্রিং\" বা \"আর-এফ-সি ২৮৩৩\" "
-"ছাড়া অন্য মূল্যমানের ব্যবহার টেকস্ট আড্ডাকে নিস্ক্রিয় করে দেয়"
+"এর ফলে H.245 টানেলিং মোড সক্রিয় করা হবে। H.245 টানেলিং মোডের অধীন, H.245 "
+"বার্তাগুলি H.225 চ্যানেলে (পোর্ট ১৭২০) আবদ্ধ করা হয় ও কল চলাকালীন একটি TCP সংযোগ "
+"ব্যবহার করার প্রয়োজন হবে না। H.245 টানেলিং প্রণালী H.323v2-এ প্রথম উপলব্ধ করা "
+"হয়েছিল ও  Netmeeting দ্বারা এটি সমর্থিত নয়। ফাস্ট স্টার্ট ও H.245 টানেলিং একযোগে "
+"ব্যবহারে Netmeeting-র কিছু সংস্করণ বিকল হতে পারে।"
 
-#: gnomemeeting.schemas.in.in.h:171
-msgid "Transmitted background blocks"
-msgstr "প্রেরিত পশ্চাদপট ব্লক"
+#: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:690
+msgid "This enables H.245 early in the setup"
+msgstr "এর ফলে, প্রস্তুতির প্রারম্ভিক ধাপে H.245 সক্রিয় করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:172
-msgid "UDP Port Range"
-msgstr "ইউ-ডি-পি পোর্ট রেঞ্জ"
-
-#: gnomemeeting.schemas.in.in.h:173 src/pref_window.cpp:1244
+#: ../ekiga.schemas.in.in.h:137
 msgid ""
-"Use this option to ensure the above alias is used as the primary alias when "
-"registering with a gatekeeper. This may be required if your gatekeeper can "
-"only perform authentication using the first alias in the list."
+"This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
+"acceleration"
 msgstr ""
+"এই কি-র ফলে, DirectX (win32-র ক্ষেত্রে) ও XVideo (Linux-র ক্ষেত্রে) ভিডিও "
+"হার্ডওয়্যার গতিবর্ধন ব্যবস্থা নিষ্ক্রিয় করা হবে"
 
-#: gnomemeeting.schemas.in.in.h:174
-msgid "User Input Capabilities type"
-msgstr "ব্যবহারকারীর ইনপুট পদ্ধতিসমূহের ধরন"
-
-#: gnomemeeting.schemas.in.in.h:175
-msgid "User directory"
-msgstr "ইউজার ডিরেক্টরি"
+#: ../ekiga.schemas.in.in.h:138
+msgid "UDP port range"
+msgstr "UDP পোর্টের সীমা"
 
-#: gnomemeeting.schemas.in.in.h:176 src/ldap_window.cpp:3021
-msgid "Version"
-msgstr "সংস্করণ"
-
-#: gnomemeeting.schemas.in.in.h:177
+#: ../ekiga.schemas.in.in.h:139
 msgid "Video channel"
 msgstr "ভিডিও চ্যানেল"
 
-#: gnomemeeting.schemas.in.in.h:178
+#: ../ekiga.schemas.in.in.h:140
 msgid "Video format"
-msgstr "ভিডিও-র ধরণ"
-
-#: gnomemeeting.schemas.in.in.h:179
-msgid "Video image"
-msgstr "ভিডিও ছবি"
+msgstr "ভিডিও-এর বিন্যাস"
 
-#: gnomemeeting.schemas.in.in.h:180
-#, fuzzy
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
-msgstr "ভিডিও ডিভাইস"
+msgstr "ভিডিও ইনপুট ডিভাইস"
 
-#: gnomemeeting.schemas.in.in.h:181
-#, fuzzy
-msgid "Video plugin"
-msgstr "ভিডিও প্রদর্শন"
-
-#: gnomemeeting.schemas.in.in.h:182
-#, fuzzy
+#: ../ekiga.schemas.in.in.h:142
 msgid "Video preview"
-msgstr "ভিডিও প্রাকদর্শন"
+msgstr "ভিডিও-এর প্রাকদর্শন"
 
-#: gnomemeeting.schemas.in.in.h:183
+#: ../ekiga.schemas.in.in.h:143
 msgid "Video size"
-msgstr "ভিডিও-র আকার"
+msgstr "ভিডিও-এর আকার"
 
-#: lib/dialog.c:192
-msgid "Do not show this dialog again"
-msgstr "এই ডায়লগটি আর দেখিও না"
-
-#: src/callbacks.cpp:84
-msgid "_Retrieve Call"
-msgstr "কল বাজিয়ে শোনা (_শ)"
+#: ../ekiga.schemas.in.in.h:144
+msgid ""
+"Whether to prefer to sustain the max. frame rate or lower it possibly in "
+"order to keep a minimum level of (spatial) quality for all frames. 0: "
+"Highest minimal quality, 31: lowest minimal quality"
+msgstr ""
+"ফ্রেমের সর্বাধিক হার জারি রাখা হবে নাকি সকল ফ্রেমের জন্য সর্বনিম্ন গুণমান "
+"(স্পেশিয়াল) বজায় রাখার প্রচেষ্টায় হারের মাত্রা হ্রাস করা হবে। 0: সর্বনিম্ন গুণমানের "
+"সর্বাধিক পরিমাণ, 31: সর্বনিম্ন গুণমানের সর্বনিম্ন পরিমাণ"
 
-#: src/callbacks.cpp:97 src/menu.cpp:350
-msgid "_Hold Call"
-msgstr "কল হোল্ড (_হ)"
+#: ../lib/engine/addressbook/contact-core.cpp:60
+msgid "_Find"
+msgstr "অনুসন্ধান (_F)"
 
-#: src/callbacks.cpp:140 src/ldap_window.cpp:734
-msgid "Edit the contact information"
-msgstr "যোগাযোগ সংক্রান্ত তথ্যাদি সম্পাদন"
+#: ../lib/engine/components/avahi/avahi-heap.cpp:125
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
+msgid "Neighbours"
+msgstr "প্রতিবেশি"
+
+#: ../lib/engine/components/call-history/history-book.cpp:137
+#: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
+msgid "Clear List"
+msgstr "তালিকা মুছে ফেলুন"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:155
+msgid "Received"
+msgstr "প্রাপ্ত"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:158
+msgid "Placed"
+msgstr "সম্পন্ন কল"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:161
+msgid "Missed"
+msgstr "জবাববিহীন"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:76
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
+#, c-format
+msgid "%d user found"
+msgid_plural "%d users found"
+msgstr[0] "%d-জন ব্যবহারকারী সনাক্ত"
+msgstr[1] "%d-জন ব্যবহারকারী সনাক্ত"
 
-#: src/callbacks.cpp:143 src/menu.cpp:353
-msgid "_Transfer Call"
-msgstr "কল স্থানান্তর (_স)"
+#: ../lib/engine/components/evolution/evolution-book.cpp:283
+msgid "New _Contact"
+msgstr "নতুন পরিচিতি (_C)"
 
-#: src/callbacks.cpp:164
-msgid "Forward call to:"
-msgstr "কল এগিয়ে দেওয়া:"
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
+#: ../lib/engine/components/local-roster/local-cluster.cpp:82
+#: ../lib/engine/components/local-roster/local-heap.cpp:117
+msgid "New contact"
+msgstr "নতুন পরিচিতি"
 
-#: src/callbacks.cpp:260 src/menu.cpp:360
-msgid "Suspend _Audio"
-msgstr "অডিও সাময়িক বন্ধ (_অ)"
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
+msgid "Please update the following fields:"
+msgstr "অনুগ্রহ করে নিম্নলিখিত ক্ষেত্রগুলো হালনাগাদ করুন:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
+msgid "_Name:"
+msgstr "নাম: (_N)"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
+msgid "VoIP _URI:"
+msgstr "VoIP _URI:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+msgid "_Home phone:"
+msgstr "বাড়ির ফোন: (_H)"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+msgid "_Office phone:"
+msgstr "কর্মস্থলের ফোন: (_O)"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:327
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+msgid "_Cell phone:"
+msgstr "মোবাইল ফোন: (_C)"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:328
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+msgid "_Pager:"
+msgstr "পেজার: (_P)"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:234
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3183
+msgid "_Edit"
+msgstr "সম্পাদনা (_E)"
 
-#: src/callbacks.cpp:261
-msgid "Resume _Audio"
-msgstr "অডিও পুনরায় চালু (_অ)"
+#: ../lib/engine/components/evolution/evolution-contact.cpp:236
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
+msgid "_Remove"
+msgstr "সরিয়ে ফেলুন (_R)"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
+msgid "Edit contact"
+msgstr "পরিচিতির তথ্য সম্পাদনা"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:169
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+msgid "Name:"
+msgstr "নাম:"
 
-#: src/callbacks.cpp:262
-msgid "Audio transmission: suspended"
-msgstr "অডিও প্রেরণ: সাময়িক ভাবে বন্ধ"
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
+msgid "Remove contact"
+msgstr "পরিচিতি সরিয়ে ফেলুন"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
+#, c-format
+msgid "Are you sure you want to remove %s from the addressbook?"
+msgstr "আপনি কি নিশ্চিতরূপে %s-কে ঠিকানাবই থেকে সরিয়ে ফেলতে ইচ্ছুক?"
+
+#: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
+msgid "Audio test"
+msgstr "অডিও পরীক্ষা"
+
+#: ../lib/engine/components/gstreamer/gst-audiooutput.cpp:320
+msgid "Silent"
+msgstr "নিঃশব্দ"
+
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
+msgid "Video test"
+msgstr "ভিডিও পরীক্ষা"
+
+#. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Crazy"
+msgstr "এলোমেলো"
+
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Screencast"
+msgstr "স্ক্রিন-কাস্ট"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
+msgid "_Refresh"
+msgstr "নতুন করে প্রদর্শন (_R)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
+msgid "_Remove addressbook"
+msgstr "ঠিকানা বই মুছে ফেলুন (_R)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
+msgid "Addressbook _properties"
+msgstr "ঠিকানা-বইয়ের বৈশিষ্ট্য (_p)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
+msgid "LDAP SASL Interaction"
+msgstr "LDAP SASL ইন্টারেকশন"
+
+#. Translators, Howard explained : "Challenge" is a generic term
+#. * in authentication. It's a prompt from the authentication mechanism
+#. * for some type of credential. Exactly what kind of challenge and
+#. * what kind of credential depends on the specific authentication
+#. * mechanism. Since SASL is a generic interface, and can dynamically
+#. * load arbitrary mechanisms, there's not much more specific you can
+#. * say about it. You might google for "challenge response
+#. * authentication" if you'd like more background context.
+#.
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
+msgid "Challenge: "
+msgstr "পরিচয়ের অনুরোধ: "
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
+msgid "Interact"
+msgstr "ইন্টারেক্ট করুন"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
+msgid "Refreshing"
+msgstr "নতুন করে প্রদর্শন করা হচ্ছে"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
+msgid "Could not initialize server"
+msgstr "সার্ভার আরম্ভ করতে ব্যর্থ"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
+msgid "LDAP Error: "
+msgstr "LDAP ত্রুটি: "
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
+msgid "Contacted server"
+msgstr "সার্ভারের সাথে সংযোগ স্থাপিত হয়েছে"
+
+#. patience == 0
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
+msgid "Could not connect to server"
+msgstr "সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ"
+
+#. patience == 0
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
+msgid "Could not search"
+msgstr "অনুসন্ধান করতে ব্যর্থ"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
+msgid "Waiting for search results"
+msgstr "অনুসন্ধানের ফলাফলের অপেক্ষা করা হচ্ছে"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
+msgid "Please edit the following fields"
+msgstr "অনুগ্রহ করে নিম্নলিখিত ক্ষেত্রগুলি সম্পাদনা করুন"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
+msgid "Book _Name"
+msgstr "বইয়ের নাম (_N)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
+msgid "Server _URI"
+msgstr "সার্ভারের URI (_U)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
+msgid "_Base DN"
+msgstr "বেস DN (_B)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
+msgid "Subtree"
+msgstr "সাবট্রি"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
+msgid "Single Level"
+msgstr "একটি স্তর"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
+msgid "_Search Scope"
+msgstr "অনুসন্ধানের পরিধি (_S)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
+msgid "_DisplayName Attribute"
+msgstr "DisplayName বৈশিষ্ট্যাবলী (_D)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
+msgid "Call _Attributes"
+msgstr "কলের বৈশিষ্ট্য (_A)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
+msgid "_Filter Template"
+msgstr "ফর্মা পরিশোধক করুন (_F)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
+msgid "Bind _ID"
+msgstr "বাইন্ড ID (_I)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
+msgid "_Password"
+msgstr "পাসওয়ার্ড (_P)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
+msgid "Use TLS"
+msgstr "TLS ব্যবহার করা হবে"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
+msgid "Use SASL"
+msgstr "SASL ব্যবহার করা হবে"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
+msgid "SASL _Mechanism"
+msgstr "SASL পদ্ধতি (_M)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
+msgid "Edit LDAP directory"
+msgstr "LDAP ডিরেক্টরি সম্পাদনা করুন"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
+msgid "Please provide a Book Name for this directory\n"
+msgstr "অনুগ্রহ করে এই ডিরেক্টরির জন্য একটি বইয়ের নাম নির্ধারণ করুন\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
+msgid "Please provide a Server URI\n"
+msgstr "অনুগ্রহ করে একটি সার্ভারের URI নির্ধারণ করুন\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
+msgid "Please provide a DisplayName Attribute\n"
+msgstr "অনুগ্রহ করে DisplayName অ্যাট্রিবিউট নির্ধারণ করুন\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
+msgid "Please provide a Call Attribute\n"
+msgstr "অনুগ্রহ করে একটি Call অ্যাট্রিবিউট নির্ধারণ করুন\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
+msgid "Invalid Server URI\n"
+msgstr "সার্ভারের URI বৈধ নয়\n"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
+msgid "Add an LDAP Address Book"
+msgstr "LDAP ঠিকানা বই যোগ করুন"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
+msgid "Add the Ekiga.net Directory"
+msgstr "Ekiga.net ডিরেক্টরিটি যোগ করুন"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:152
+msgid "Create LDAP directory"
+msgstr "LDAP ডিরেক্টরি নির্মাণ করুন"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:167
+msgid "Ekiga.net Directory"
+msgstr "Ekiga.net ডিরেক্টরি"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
+msgid "Edit roster element"
+msgstr "রস্টারের বস্তু সম্পাদন করুন"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
+msgid ""
+"Please fill in this form to change an existing element of ekiga's internal "
+"roster"
+msgstr ""
+"ekiga-এর অভ্যন্তরীণ তালিকার মধ্যে উপস্থিত কোনো সামগ্রীর তথ্য পরিবর্তন করার জন্য "
+"অনুগ্রহ করে এই ফর্মটি পূরণ করুন"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:170
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
+msgid "Address:"
+msgstr "ঠিকানা:"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
+msgid "Choose groups:"
+msgstr "দল নির্বাচন করুন:"
+
+#: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
+msgid "Add to local roster"
+msgstr "স্থানীয় তালিকায় যোগ করুন"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
+msgid "Services"
+msgstr "পরিসেবা"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
+msgid "Echo test"
+msgstr "প্রতিধ্বনির পরীক্ষা"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
+msgid "Conference room"
+msgstr "বৈঠকের ঘর"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:110
+msgid "Local roster"
+msgstr "স্থানীয় তালিকা"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:127
+msgid "Rename"
+msgstr "নাম পরিবর্তন"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
+msgid "Family"
+msgstr "পরিবার"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
+msgid "Friend"
+msgstr "বন্ধু"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
+msgid "Associate"
+msgstr "সহকর্মী"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
+msgid "Assistant"
+msgstr "সহযোগী"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
+msgid "Supervisor"
+msgstr "পর্যবেক্ষক"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
+msgid "Self"
+msgstr "স্বয়ং"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
+msgid ""
+"Please fill in this form to add a new contact to ekiga's internal roster"
+msgstr ""
+"ekiga-এর অভ্যন্তরীণ তালিকার মধ্যে নতুন পরিচিতির তথ্য সংযোজন করার জন্য অনুগ্রহ করে এই "
+"ফর্মটি পূরণ করুন"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
+msgid "Put contact in groups:"
+msgstr "পরিচিতদের দলভুক্ত করুন:"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
+msgid "You supplied an unsupported address"
+msgstr "একটি অসমর্থিত ঠিকানা উল্লিখিত হয়েছে"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
+msgid "You already have a contact with this address!"
+msgstr "এই ঠিকানা সহ একজন পরিচিতি বর্তমানে উপস্থিত রয়েছেন!"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
+msgid "Rename group"
+msgstr "দলের নাম পরিবর্তন করুন"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
+msgid "Please edit this group name"
+msgstr "অনুগ্রহ করে চিহ্নিত দলের নাম পরিবর্তন করুন"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:230
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
+msgid "Call"
+msgstr "কল করুন"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:231
+#: ../lib/engine/components/opal/sip-endpoint.cpp:235 ../src/gui/main.cpp:2957
+msgid "Transfer"
+msgstr "বদলি"
+
+#. Translators : The alias we are registering already exists : failure
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
+msgid "Duplicate alias"
+msgstr "অ্যালায়েসের প্রতিলিপি"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
+msgid "Bad username/password"
+msgstr "ব্যবহারকারী নাম/পাসওয়ার্ড সঠিক নয়"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:911
+msgid "Transport error"
+msgstr "সম্প্রচার করতে সমস্যা"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:918
+msgid "Failed"
+msgstr "বিফল"
+
+#: ../lib/engine/components/opal/opal-account.cpp:303
+msgid "_Disable"
+msgstr "নিষ্ক্রিয় (_D)"
+
+#: ../lib/engine/components/opal/opal-account.cpp:306
+msgid "_Enable"
+msgstr "সক্রিয় (_E)"
+
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
+msgid "Recharge the account"
+msgstr "অ্যাকাউন্ট রি-চার্জ করুন"
+
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
+msgid "Consult the balance history"
+msgstr "অবশিষ্ট পরিমাণের তথ্য যাচাই করুন"
+
+#: ../lib/engine/components/opal/opal-account.cpp:337
+msgid "Consult the call history"
+msgstr "কলের সংক্রান্ত পূর্ববর্তী তথ্য যাচাই করা হবে"
+
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
+msgid "Edit account"
+msgstr "অ্যাকউন্ট সংক্রান্ত তথ্য সম্পাদনা করুন"
+
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
+msgid "Registrar:"
+msgstr "নিবন্ধনকারী:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
+msgid "Gatekeeper:"
+msgstr "গেট-কিপার:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:174
+msgid "User:"
+msgstr "ব্যবহারকারী:"
+
+#. Translators:
+#. * SIP knows two usernames: The name for the client ("User") and the name
+#. * for the authentication procedure ("Authentication User")
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
+msgid "Authentication User:"
+msgstr "অনুমোদনের নাম:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:173
+msgid "Password:"
+msgstr "পাসওয়ার্ড:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
+msgid "Timeout:"
+msgstr "সময়সীমা:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
+msgid "Enable Account"
+msgstr "অ্যাকাউন্ট সক্রিয় করুন"
+
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
+msgid "You did not supply a name for that account."
+msgstr "চিহ্নিত অ্যাকাউন্টের নাম উল্লেখ করা হয়নি।"
+
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
+msgid "You did not supply a host to register to."
+msgstr "নিবন্ধনের জন্য কোনো হোস্ট উল্লেখ করা হয়নি।"
+
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
+msgid "You did not supply a user name for that account."
+msgstr "চিহ্নিত অ্যাকাউন্টের জন্য কোনো ব্যবহারকারীর নাম উল্লেখ করা হয়নি।"
+
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
+msgid "The timeout should have a bigger value."
+msgstr "সময়সীমার মান বেশি হওয়া উচিত।"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:75
+msgid "_Add an Ekiga.net Account"
+msgstr "একটি Ekiga.net অ্যাকাউন্ট যোগ করুন (_A)"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:77
+msgid "_Add an Ekiga Call Out Account"
+msgstr "Ekiga-এর একটি কল-আউট অ্যাকাউন্ট যোগ করুন (_A)"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:79
+msgid "_Add a SIP Account"
+msgstr "একটি SIP অ্যাকাউন্ট যোগ করুন (_A)"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:81
+msgid "_Add an H.323 Account"
+msgstr "একটি H.323 অ্যাকাউন্ট যোগ করুন (_A)"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:96
+msgid "Please update the following fields."
+msgstr "অনুগ্রহ করে নিম্নলিখিত ক্ষেত্রে মান পূরণ করুন।"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
+msgid "Get an Ekiga.net SIP account"
+msgstr "একটি Ekiga.net SIP অ্যাকাউন্ট প্রাপ্ত করুন"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
+msgid "Get an Ekiga Call Out account"
+msgstr "একটি Ekiga কল-আউট অ্যাকাউন্ট যোগ করুন"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2711
+#: ../src/gui/main.cpp:2806
+msgid "Account ID:"
+msgstr "অ্যাকাউন্টের ID:"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:117
+msgid "PIN Code:"
+msgstr "PIN কোড:"
 
-#: src/callbacks.cpp:263
-msgid "Audio transmission: resumed"
-msgstr "অডিও প্রেরণ: পুনরায় চালু"
+#: ../lib/engine/components/opal/opal-call.cpp:404
+msgid "Local user cleared the call"
+msgstr "স্থানীয় ব্যবহারকারী দ্বারা কল অনুমোদন করা হয়েছে"
 
-#: src/callbacks.cpp:274 src/menu.cpp:365
-msgid "Suspend _Video"
-msgstr "ভিডিও সাময়িক বন্ধ (_ভ)"
+#: ../lib/engine/components/opal/opal-call.cpp:407
+#: ../lib/engine/components/opal/opal-call.cpp:410
+msgid "Local user rejected the call"
+msgstr "স্থানীয় ব্যবহারকারী দ্বারা কল প্রত্যাখ্যান করা হয়েছে"
 
-#: src/callbacks.cpp:275
-msgid "Resume _Video"
-msgstr "ভিডিও পুনরায় চালু (_ভ)"
+#: ../lib/engine/components/opal/opal-call.cpp:413
+msgid "Remote user cleared the call"
+msgstr "দূরবর্তী ব্যবহারকারী দ্বারা কল অনুমোদন করা হয়েছে"
 
-#: src/callbacks.cpp:276
-msgid "Video transmission: suspended"
-msgstr "ভিডিও প্রেরণ: সাময়িক ভাবে বন্ধ"
+#: ../lib/engine/components/opal/opal-call.cpp:416
+msgid "Remote user rejected the call"
+msgstr "দূরবর্তী ব্যবহারকারী দ্বারা কল প্রত্যাখ্যান করা হয়েছে"
 
-#: src/callbacks.cpp:277
-msgid "Video transmission: resumed"
-msgstr "ভিডিও প্রেরণ: পুনরায় চালু"
+#: ../lib/engine/components/opal/opal-call.cpp:419
+msgid "Remote user has stopped calling"
+msgstr "দূরবর্তী ব্যবহারকারী কলটি থামিয়ে দিয়েছেন"
 
-#: src/callbacks.cpp:407
-msgid "Code Contributors:"
-msgstr "কোডিং-য়ে অবদান রয়েছে:"
+#: ../lib/engine/components/opal/opal-call.cpp:422
+msgid "Abnormal call termination"
+msgstr "অস্বাভাবিক ভাবে কলের সমাপ্তি"
 
-#: src/callbacks.cpp:417
-msgid "Artwork:"
-msgstr "চিত্রণ:"
+#: ../lib/engine/components/opal/opal-call.cpp:425 ../src/gui/main.cpp:1501
+msgid "Could not connect to remote host"
+msgstr "দূরবর্তী হোস্টের সঙ্গে সংযোগের চেষ্ঠা ব্যর্থ"
 
-#: src/callbacks.cpp:420
-msgid "Contributors:"
-msgstr "অবদান রয়েছে:"
+#: ../lib/engine/components/opal/opal-call.cpp:428
+msgid "The Gatekeeper cleared the call"
+msgstr "গেটকিপার কলটি অনুমদন করেছে"
 
-#. Translators: Please write translator credits here, and
-#. * seperate names with \n
-#: src/callbacks.cpp:454
-msgid "translator_credits"
-msgstr "অঙ্কুর প্রকল্পের পক্ষে ইন্দ্রনীল দাশ গুপ্ত <indradg@ilug-cal.org>"
+#: ../lib/engine/components/opal/opal-call.cpp:431
+msgid "User not found"
+msgstr "ব্যবহারকারীকে খুঁজে পাওয়া যায়নি"
 
-#. Translators: Please test to see if your translation
-#. * looks OK and fits within the box
-#: src/callbacks.cpp:465
-msgid ""
-"GnomeMeeting is full-featured H.323 compatible videoconferencing, VoIP and "
-"IP-Telephony application that allows you to make audio and video calls to "
-"remote users with H.323 hardware or software."
-msgstr ""
+#: ../lib/engine/components/opal/opal-call.cpp:434
+msgid "Insufficient bandwidth"
+msgstr "অপর্যাপ্ত ব্যান্ডউইন্ডত"
 
-#: src/chat_window.cpp:260
-msgid "Open URI"
-msgstr ""
+#: ../lib/engine/components/opal/opal-call.cpp:437
+msgid "No common codec"
+msgstr "কোন পরিচিত কোডেক নেই"
 
-#: src/chat_window.cpp:263 src/chat_window.cpp:280
-#, fuzzy
-msgid "Copy Link Location"
-msgstr "অবস্থান"
+#: ../lib/engine/components/opal/opal-call.cpp:440
+msgid "Call forwarded"
+msgstr "কল এগিয়ে দেওয়া হয়েছে"
 
-#: src/chat_window.cpp:268 src/chat_window.cpp:285
-msgid "Couldn't compile http/ftp regex!"
-msgstr ""
+#: ../lib/engine/components/opal/opal-call.cpp:443
+msgid "Security check failed"
+msgstr "নিরাপত্তা পরীক্ষা বিফল হয়েছে"
 
-#: src/chat_window.cpp:276
-#, fuzzy
-msgid "Connect to"
-msgstr "সংযোগ (_য)"
+#: ../lib/engine/components/opal/opal-call.cpp:446
+msgid "Local user is busy"
+msgstr "স্থানীয় ব্যবহারকারী ব্যস্ত আছেন"
 
-#: src/chat_window.cpp:278
-#, fuzzy
-msgid "Add to adressbook"
-msgstr "%s-কে ঠিকানার খাতায়ে যোগ করা"
+#: ../lib/engine/components/opal/opal-call.cpp:449
+#: ../lib/engine/components/opal/opal-call.cpp:455
+msgid "Congested link to remote party"
+msgstr "দূরবর্তী ব্যবহারকারীর সঙ্গে সংযোগপথ ভিড়াক্রান্ত"
 
-#: src/chat_window.cpp:294
-msgid "Couldn't compile smiley regex!"
-msgstr ""
+#: ../lib/engine/components/opal/opal-call.cpp:452
+msgid "Remote user is busy"
+msgstr "দূরবর্তী ব্যবহারকারী ব্যস্ত আছেন"
 
-#: src/chat_window.cpp:302
-#, fuzzy
-msgid "Copy equation"
-msgstr "কলের স্থায়িত্ব"
+#: ../lib/engine/components/opal/opal-call.cpp:458
+msgid "Remote host is offline"
+msgstr "দূরবর্তী হোস্ট অফলাইন"
 
-#: src/chat_window.cpp:305
-msgid "Couldn't compile latex regex!"
-msgstr ""
+#: ../lib/engine/components/opal/opal-call.cpp:464
+msgid "User is not available"
+msgstr "ব্যবহারকারী উপস্থিত নয়"
 
-#: src/chat_window.cpp:318
-msgid "Send Message:"
-msgstr "বার্তা পাঠানো:"
+#: ../lib/engine/components/opal/opal-call.cpp:476
+msgid "Call completed"
+msgstr "কল সমাপ্তি"
 
-#: src/codec_info.h:53
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
 msgid ""
-"iLBC-13k3 (internet Low Bitrate Codec) is a free speech codec suitable for "
-"robust voice communication over IP. The codec is designed for narrow band "
-"speech and results in a payload bit rate of 13.33 kbit/s with an encoding "
-"frame length of 30 ms. The iLBC codec enables graceful speech quality "
-"degradation in the case of lost frames, which occurs in connection with lost "
-"or delayed IP packets."
+"Ekiga did not manage to configure your network settings automatically. You "
+"can still use it, but you need to configure your network settings manually.\n"
+"\n"
+"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"for instructions"
 msgstr ""
+"Ekiga দ্বারা স্বয়ংক্রিয়ভাবে নেটওয়ার্কের বৈশিষ্ট্য কনফিগার করা সম্ভব হয়নি। Ekiga "
+"ব্যবহার করা সম্ভব হলে, ব্যবহারকারীকে নেটওয়ার্ক সংক্রান্ত বৈশিষ্ট্যগুলি স্বয়ং কনফিগার "
+"করতে হবে।\n"
+"\n"
+"অধিক বিবরণের জন্য অনুগ্রহ করে http://wiki.ekiga.org/index.php/"
+"Enable_port_forwarding_manually দেখুন।"
 
-#: src/codec_info.h:53 src/codec_info.h:55 src/codec_info.h:57
-#: src/codec_info.h:63 src/codec_info.h:65 src/codec_info.h:69
-#: src/codec_info.h:71
-msgid "Excellent"
-msgstr "অতি উত্তম"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:255
+#: ../lib/engine/components/opal/sip-endpoint.cpp:257
+msgid "Message"
+msgstr "বার্তা"
 
-#: src/codec_info.h:53
-msgid "13.33 Kbps"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
+msgid "Bad request"
+msgstr "অনুরোধ সঠিক নয়"
 
-#: src/codec_info.h:55
-msgid ""
-"iLBC-15k2 (internet Low Bitrate Codec) is a free speech codec suitable for "
-"robust voice communication over IP. The codec is designed for narrow band "
-"speech and results in a payload bitrate of 15.20 kbps with an encoding "
-"length of 20 ms. The iLBC codec enables graceful speech quality degradation "
-"in the case of lost frames, which occurs in connection with lost or delayed "
-"IP packets."
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
+msgid "Payment required"
+msgstr "মূল্য প্রদান করা আবশ্যক"
 
-#: src/codec_info.h:55
-msgid "15.2 Kbps"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
+msgid "Unauthorized"
+msgstr "অনুমোদিত নয়"
 
-#: src/codec_info.h:57
-msgid ""
-"Speex is an Open Source/Free Software patent-free audio compression format "
-"designed for speech. The Speex Project aims to lower the barrier of entry "
-"for voice applications by providing a free alternative to expensive "
-"proprietary speech codecs. Moreover, Speex is well-adapted to Internet "
-"applications and provides useful features that are not present in most other "
-"codecs. Finally, Speex is part of the GNU Project and is available under the "
-"Xiph.org variant of the BSD license. SpeexNarrow-15k is based on CELP and is "
-"designed to compress voice at a payload bitrate of 15 kbps."
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
+msgid "Forbidden"
+msgstr "নিষিদ্ধ"
 
-#: src/codec_info.h:57
-msgid "15 Kbps"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
+msgid "Timeout"
+msgstr "সময়সীমা"
 
-#: src/codec_info.h:59
-msgid ""
-"Speex is an Open Source/Free Software patent-free audio compression format "
-"designed for speech. The Speex Project aims to lower the barrier of entry "
-"for voice applications by providing a free alternative to expensive "
-"proprietary speech codecs. Moreover, Speex is well-adapted to Internet "
-"applications and provides useful features that are not present in most other "
-"codecs. Finally, Speex is part of the GNU Project and is available under the "
-"Xiph.org variant of the BSD license. SpeexNarrow-8k is based on CELP and is "
-"designed to compress voice at a payload bitrate of 8 kbps."
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
+msgid "Conflict"
+msgstr "দ্বন্দ্ব"
 
-#: src/codec_info.h:59 src/codec_info.h:61 src/codec_info.h:67
-msgid "Good"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
+msgid "Temporarily unavailable"
+msgstr "সাময়িকরূপে উপলব্ধ নয়"
 
-#: src/codec_info.h:59
-msgid "8 Kbps"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
+msgid "Not acceptable"
+msgstr "গ্রহণযোগ্য নয়"
 
-#: src/codec_info.h:61
-msgid ""
-"MS-GSM is the Microsoft version of GSM 06.10. GSM 06.10 is a standardized "
-"lossy speech compression employed by most European wireless telephones. It "
-"uses RPE/LTP (residual pulse excitation/long term prediction) coding to "
-"compress frames of 160 13-bit samples with a frame rate of 50 Hz into 260 "
-"bits.  Microsoft's GSM 06.10 codec is not compatible with the standard frame "
-"format, they use 65-byte-frames (2 x 32 1/2) rather than rounding to 33, and "
-"they number the bits in their bytes from the other end."
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
+msgid "Illegal status code"
+msgstr "অবস্থাসূচক কোড বৈধ নয়"
 
-#: src/codec_info.h:61
-msgid "13 Kbps"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
+msgid "Multiple choices"
+msgstr "একাধিক নির্বাচিত মান"
 
-#: src/codec_info.h:63
-msgid ""
-"G.711 is the international standard for encoding telephone audio on 64 kbps "
-"channel. It is a pulse code modulation (PCM) scheme operating at 8 kHz "
-"sample rate, with 8 bits per sample, fully meeting ITU-T recommendations. "
-"This standard has two forms, A-Law and u-Law. A-Law G.711 PCM encoder "
-"converts 13 bit linear PCM samples into 8 bit compressed PCM (logarithmic "
-"form) samples, and the decoder does the conversion vice versa."
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
+msgid "Moved permanently"
+msgstr "স্থায়ীরূপে স্থানান্তর করা হয়েছে"
 
-#: src/codec_info.h:63 src/codec_info.h:65
-msgid "64 Kbps"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
+msgid "Moved temporarily"
+msgstr "সাময়িকভাবে স্থানান্তর করা হয়েছে"
 
-#: src/codec_info.h:65
-msgid ""
-"G.711 is the international standard for encoding telephone audio on 64 kbps "
-"channel. It is a pulse code modulation (PCM) scheme operating at 8 kHz "
-"sample rate, with 8 bits per sample, fully meeting ITU-T recommendations. "
-"This standard has two forms, A-Law and u-Law. u-Law G.711 PCM encoder "
-"converts 14 bit linear PCM samples into 8 bit compressed PCM (logarithmic "
-"form) samples, and the decoder does the conversion vice versa."
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
+msgid "Use proxy"
+msgstr "প্রক্সি ব্যবহার করা হবে"
 
-#: src/codec_info.h:67
-msgid ""
-"GSM 06.10 is a standardized lossy speech compression employed by first "
-"generation of digital mobile phones in Europe. It uses RPE/LTP (residual "
-"pulse excitation/long term prediction) coding to compress frames of 20 ms, "
-"achieving a bitrate of 13kbps."
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
+msgid "Alternative service"
+msgstr "বিকল্প পরিসেবা"
 
-#: src/codec_info.h:67
-msgid "16.5 Kbps"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
+msgid "Not found"
+msgstr "পাওয়া যায়নি"
 
-#: src/codec_info.h:69
-msgid ""
-"G.726 conforms to ITU-T G.726 recommendation that specifies speech "
-"compression and decompression at rates of 16, 24, 32 and 40 Kbps based on "
-"Adaptive Differential Pulse Code Modulation (ADPCM)."
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
+msgid "Method not allowed"
+msgstr "পদ্ধতির ব্যবহার অনুমোদিত নয়"
 
-#: src/codec_info.h:69
-msgid "32 Kbps"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
+msgid "Proxy authentication required"
+msgstr "প্রক্সি অনুমোদন প্রয়োজন"
 
-#: src/codec_info.h:71
-msgid ""
-"G.723.1 conforms to ITU-T G.723.1 recommendation. It was designed for video "
-"conferencing / telephony over standard phone lines, and is optimized for "
-"realtime encode and decode. That codec is only available in GnomeMeeting "
-"when using Quicknet cards due to patents restrictions."
-msgstr ""
-
-#: src/codec_info.h:71
-msgid "6.3 or 5.7 Kbps"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
+msgid "Length required"
+msgstr "দৈর্ঘ্য আবশ্যক"
 
-#: src/config-tool-i18n.h:1
-msgid "YES"
-msgstr "হ্যা"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
+msgid "Request entity too big"
+msgstr "অনুরোধ করা স্বত্ত্বা অত্যন্ত বড়"
 
-#: src/config-tool-i18n.h:2
-msgid "Sorry, this script won't work while GnomeMeeting is running"
-msgstr "গুহ্‌নোমমিটিং চালাকালীন এই স্ক্রিপ্টটি চলবে না, দুঃখিত!"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
+msgid "Request URI too long"
+msgstr "অনুরোধ করা URI অত্যাধিক লম্বা"
 
-#: src/config-tool-i18n.h:3
-msgid "  WARNING!!!"
-msgstr "  সতর্কবার্তা !!!"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
+msgid "Unsupported media type"
+msgstr "মিডিয়ার ধরন সমর্থিত নয়"
 
-#: src/config-tool-i18n.h:4
-msgid ""
-"  This script will delete all user GnomeMeeting configuration,\n"
-"  including preferences that may be important! \n"
-"  The GConf daemon will be shut down, so make sure you have no\n"
-"  applications depending on it running.\n"
-"\n"
-"  Do you really want to do this?\n"
-"\n"
-"  If so, say \"YES\".\n"
-"\n"
-msgstr ""
-"  এই স্ক্রিপ্টটি সব ব্যবহারকারীর গুহ্‌নোমমিটিং কনফিগারেশন মুছে ফেলবে\n"
-"  গুরুত্বপূর্ণ কোন কিছু থাকলে তাও মুছে যাবে! \n"
-"  জী-কোন্‌ফ ডেমনকে এই জন্য বন্ধ করা হবে, তাই নিশ্চিত করুন যে তার ওপর\n"
-"  নির্ভরশীল কোন প্রোগ্রাম যেন চালু না থাকে\n"
-"\n"
-"  আপনি কি সত্যি এটি করতে চান?\n"
-"\n"
-"  যদি চান তাহলে \"হ্যা\"-য়ে ক্লিক করুন\n"
-"\n"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
+msgid "Unsupported URI scheme"
+msgstr "অসমর্থিত URI স্কিম"
 
-#: src/config-tool-i18n.h:5
-msgid "Removing $HOME/.gconf/apps/gnomemeeting"
-msgstr "$HOME/.gconf/apps/gnomemeeting-কে মুছে ফেলা হচ্ছে"
-
-#: src/config-tool-i18n.h:6 src/config-tool-i18n.h:11
-#: src/config-tool-i18n.h:13
-msgid "Shutting down GConf daemon"
-msgstr "জী-কোন্‌ফ ডেমনটি বন্ধ করা হচ্ছে"
-
-#: src/config-tool-i18n.h:7
-msgid "...Done."
-msgstr "... হয়ে গেছে"
-
-#: src/config-tool-i18n.h:8
-msgid "Leaving configuration alone."
-msgstr "কনফিগারেশনে হাত দেওয়া হচ্ছে না"
-
-#: src/config-tool-i18n.h:9
-msgid "Have a nice day."
-msgstr "আনন্দে থাকুন"
+#. Translators : The extension we are trying to register does not exist
+#: ../lib/engine/components/opal/sip-endpoint.cpp:814
+msgid "Bad extension"
+msgstr "ত্রুটিপূর্ণ এক্সটেনশন"
 
-#: src/config-tool-i18n.h:10
-msgid ""
-"  The GConf daemon will be shut down, so make sure you have no\n"
-"  applications depending on it running.\n"
-"\n"
-"  Do you really want to do this?\n"
-"\n"
-"  If so, say \"YES\".\n"
-"\n"
-msgstr ""
-"  জী-কোন্‌ফ ডেমনকে বন্ধ করা হবে, তাই নিশ্চিত করুন যে তার ওপর\n"
-"  নির্ভরশীল কোন প্রোগ্রাম যেন চালু না থাকে\n"
-"\n"
-"আপনি কি সত্যি এটি করতে চান?\n"
-"\n"
-"  যদি চান তাহলে \"হ্যা\"-য়ে ক্লিক করুন\n"
-"\n"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
+msgid "Extension required"
+msgstr "এক্সটেনশন আবশ্যক"
 
-#: src/config-tool-i18n.h:12
-msgid "Removing schemas"
-msgstr "স্কীমা মুছে ফেলা হচ্ছে"
-
-#: src/config-tool-i18n.h:14
-msgid "Installing schemas"
-msgstr "স্কীমাসমূহ ইনস্টল করা হচ্ছে"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:822
+msgid "Interval too brief"
+msgstr "অত্যন্ত স্বল্প বিরতিকাল"
 
-#: src/config-tool-i18n.h:15
-msgid ""
-"CRITICAL ERROR -- Schema installation failed.\n"
-"Most probably you have the GConf daemon running as root.\n"
-"\n"
-"Run \"gnomemeeting-config-tool --install-schemas\" as root.\n"
-msgstr ""
-"অতি গুরুতর ত্রুটি -- স্কীমাসমূহ ইনস্টলের প্রচেষ্টা ব্যর্থ\n"
-"খুব সম্ভবত আপনি জী-কোনফ্‌ ডেমনটিকে রুট হিসেবে চালাছেন\n"
-"\n"
-"রুট হয়ে \"gnomemeeting-config-tool --install-schemas\" চালান\n"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:826
+msgid "Loop detected"
+msgstr "লুপ সনাক্ত হয়েছে"
 
-#: src/config-tool-i18n.h:16
-msgid "Usage:  gnomemeeting-config-tool OPTION"
-msgstr "ব্যবহার পদ্ধতি: gnomemeeting-config-tool OPTION"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:830
+msgid "Too many hops"
+msgstr "অত্যাধিক সংখ্যক হপ"
 
-#: src/config-tool-i18n.h:17
-msgid "Fixes problems with the GnomeMeeting settings"
-msgstr "গুহ্‌নোমমিটিং-এর মান সংক্রান্ত সমস্যাগুলির সমাধান করে"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:834
+msgid "Address incomplete"
+msgstr "ঠিকানার সম্পূর্ণ নয়"
 
-#: src/config-tool-i18n.h:18
-msgid "  --clean                remove all user settings"
-msgstr "  --clean                ব্যবহারকারী সংক্রান্ত সব মান মুছে ফেলা হবে"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:838
+msgid "Ambiguous"
+msgstr "দ্ব্যর্থক"
 
-#: src/config-tool-i18n.h:19
-msgid ""
-"  --install-schemas      install schemas with default settings (run as root)"
-msgstr ""
-"  --install-schemas      ডিফল্ট মান সহকারে স্কীমা ইনস্টল করবে (রুট হয়ে চালান)"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:842
+msgid "Busy Here"
+msgstr "এখানে ব্যস্ত"
 
-#: src/config-tool-i18n.h:20
-msgid ""
-"  --clean-schemas        remove schemas with default settings (run as root)"
-msgstr ""
-"  --clean-schemas        ডিফল্ট মানের সমস্ত স্কীমা মুছে ফেলা হবে (রুট হয়ে চালান)"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:846
+msgid "Request terminated"
+msgstr "অনুরোধ সমাপ্ত হয়েছে"
 
-#: src/config-tool-i18n.h:21
-msgid ""
-"  --fix-permissions      fix permissions of GConf repository (run as root)"
-msgstr ""
-"  --fix-permissions      জী-কোনফ্‌ রিপসিটরির অনুমতি ঠিক করুন (রুট হয়ে চালান)"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:850
+msgid "Not acceptable here"
+msgstr "এইস্থানে গ্রহণযোগ্য নয়"
 
-#: src/config.cpp:299 src/config.cpp:553
-msgid "Changing this setting will only affect new calls"
-msgstr "এই মানের পরিবর্তন শুধুমাত্র নতুন কলের ক্ষেত্রেই প্রযোজ্য"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:854
+msgid "Bad event"
+msgstr "ঘটনা সঠিক নয়"
 
-#: src/config.cpp:299 src/config.cpp:553
-msgid ""
-"You have changed a setting that doesn't permit to GnomeMeeting to apply the "
-"new change to the current call. Your new setting will only take effect for "
-"the next call."
-msgstr ""
-"আপনি এমন একটি মানের পরিবর্তন করেছেন যা গুহ্‌নোমমিটিং-কে বর্তমান কলের ক্ষেত্রে তা "
-"প্রয়োগের অনুমতি দেয় না।  আপনার নির্দিষ্ট এই মানটি পরবর্তী নতুন কলের থেকেই প্রযোজ্য "
-"হবে"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:858
+msgid "Request pending"
+msgstr "অনুরোধ সম্পূর্ণ হয়নি"
 
-#: src/config.cpp:400
-#, fuzzy
-msgid "H.245 Tunneling disabled"
-msgstr "এইচ.২৪৫ টানেলিং নিস্ক্রিয়"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:862
+msgid "Undecipherable"
+msgstr "বোধগম্য নয়"
 
-#: src/config.cpp:401
-#, fuzzy
-msgid "H.245 Tunneling enabled"
-msgstr "এইচ.২৪৫ টানেলিং সক্রিয়"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:866
+msgid "Internal server error"
+msgstr "সার্ভারের অভ্যন্তরীণ সমস্যা"
 
-#: src/config.cpp:431
-#, fuzzy
-msgid "Early H.245 disabled"
-msgstr "এইচ.২৪৫ টানেলিং নিস্ক্রিয়"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:870
+msgid "Not implemented"
+msgstr "বাস্তবায়িত হয়নি"
 
-#: src/config.cpp:432
-#, fuzzy
-msgid "Early H.245 enabled"
-msgstr "এইচ.২৪৫ টানেলিং সক্রিয়"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:874
+msgid "Bad gateway"
+msgstr "গেটওয়ে সঠিক নয়"
 
-#: src/config.cpp:462
-#, fuzzy
-msgid "Fast Start disabled"
-msgstr "জলদি শুরু নিস্ক্রিয়"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:878
+msgid "Service unavailable"
+msgstr "পরিসেবা উপলব্ধ নয়"
 
-#: src/config.cpp:463
-#, fuzzy
-msgid "Fast Start enabled"
-msgstr "জলদি শুরু সক্রিয়"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:882
+msgid "Server timeout"
+msgstr "সার্ভারের সময়সীমা"
 
-#: src/config.cpp:613
-msgid "Disabled Silence Detection"
-msgstr "নৈশব্দ সন্ধান নিস্ক্রিয় করা হয়েছে"
-
-#: src/config.cpp:619
-msgid "Enabled Silence Detection"
-msgstr "নৈশব্দ সন্ধান সক্রিয় করা হয়েছে"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:886
+msgid "SIP version not supported"
+msgstr "SIP-এর সংস্করণ সমর্থিত"
 
-#: src/config.cpp:1066
-#, fuzzy
-msgid "Failed to restart the video channel"
-msgstr "ডিভাইস ব্যবহারে ব্যর্থ"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:890
+msgid "Message too large"
+msgstr "বার্তা অত্যাধিক বড়"
 
-#: src/config.cpp:1066
-msgid ""
-"You have changed a video device related setting during a call. That requires "
-"to restart the video transmission channel, but it failed."
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:894
+msgid "Busy everywhere"
+msgstr "সর্বত্র ব্যস্ত"
 
-#: src/config.cpp:1332
-msgid "Forward URL not specified"
-msgstr ""
+#: ../lib/engine/components/opal/sip-endpoint.cpp:898
+msgid "Decline"
+msgstr "প্রত্যাখ্যান করুন"
 
-#: src/config.cpp:1333
-#, fuzzy
-msgid ""
-"You need to specify an URL where to forward calls in the call forwarding "
-"section of the preferences!\n"
-"\n"
-"Disabling forwarding."
-msgstr ""
-"যে হোস্টে কল এগিয়ে দেওয়া হবে তা নির্দিষ্ট করা আবশ্যক!\n"
-"কল এগিয়ে দেওয়া নিস্ক্রিয় করা হয়েছে"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:902
+msgid "Does not exist anymore"
+msgstr "বর্তমানে উপস্থিত নয়"
 
-#: src/config.cpp:1609
-msgid ""
-"An error has happened in the configuration backend.\n"
-"Maybe some of your settings won't be saved."
-msgstr ""
-"কনফিগারেশন ব্যাকএন্ডে কোন ত্রুটি ঘটেছে\n"
-"আপনার কিছু মানের সঠিক সংরক্ষণ নাও হতে পারে"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:906
+msgid "Globally not acceptable"
+msgstr "সার্বজনীন রূপে গ্রহণযোগ্য নয়"
 
-#: src/connection.cpp:154
-#, fuzzy, c-format
-msgid "Opened codec %s for transmission"
-msgstr "ভিডিও সংকেত প্রেরণ সক্রিয়"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1043
+msgid "Could not send message"
+msgstr "বার্তা পাঠাতে ব্যর্থ"
 
-#: src/connection.cpp:157
-#, fuzzy, c-format
-msgid "Closed codec %s which was opened for transmission"
-msgstr "অডিও প্ররণের উদ্দেশ্যে অডিও চ্যানেল খোলার প্রচেশ্টা ব্যর্থ"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1165
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s থেকে প্রাপ্ত কল"
 
-#: src/connection.cpp:161
-#, fuzzy, c-format
-msgid "Opened codec %s for reception"
-msgstr "ভিডিও সংকেত গ্রহণ সক্রিয়"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1167
+#, c-format
+msgid "Incoming call"
+msgstr "আগত কল"
 
-#: src/connection.cpp:164
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1173
 #, c-format
-msgid "Closed codec %s which was opened for reception"
-msgstr ""
+msgid "In a call with %s"
+msgstr "%s-এর সাথে কল চলমান"
 
-#: src/connection.cpp:201
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1175
 #, c-format
-msgid "Failure opening %s for %s, will try with next common codec"
-msgstr ""
+msgid "In a call"
+msgstr "কল চলমান"
 
-#: src/connection.cpp:204
-#, fuzzy
-msgid "transmission"
-msgstr "ভিডিও সংকেত প্রেরণ সক্রিয়"
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:102
+msgid "New resource list"
+msgstr "নতুন রিসোর্সের তালিকা"
 
-#: src/connection.cpp:204
-#, fuzzy
-msgid "reception"
-msgstr "বিভাগ"
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:166
+msgid "Add new resource-list"
+msgstr "নতুন রিসোর্স তালিকা যোগ করুন"
 
-#: src/connection.cpp:324 src/connection.cpp:325 src/urlhandler.cpp:76
-#: src/urlhandler.cpp:77
-msgid "Call transfer failed"
-msgstr "কল এগিয়ে দেওয়া ব্যর্থ"
-
-#: src/connection.cpp:324
-msgid ""
-"The remote user tried to transfer your call to another user, but it failed."
-msgstr "দূরবর্তী ব্যবহারকারী আপনার কলটি আর একজনের কাছে এগিয়ে দেওয়ার প্রচেষ্টা ব্যর্থ"
-
-#: src/druid.cpp:265 src/druid.cpp:651 src/druid.cpp:668 src/druid.cpp:706
-#: src/endpoint.cpp:1672 src/gnomemeeting.cpp:326 src/gnomemeeting.cpp:328
-#: src/gnomemeeting.cpp:330 src/sound_handling.cpp:565
-#: src/sound_handling.cpp:566 src/videograbber.cpp:296
-#: src/videograbber.cpp:552
-msgid "No device found"
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:167
+msgid ""
+"Please fill in this form to add a new contact list to ekiga's remote roster"
 msgstr ""
+"ekiga-এর দূরবর্তী তালিকার মধ্যে নতুন পরিচিতির তথ্য সংযোজন করার জন্য অনুগ্রহ করে এই "
+"ফর্মটি পূরণ করুন"
 
-#: src/druid.cpp:545
-#, fuzzy
-msgid "56k Modem"
-msgstr "৫৬কে মোডেম"
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:171
+msgid "Writable:"
+msgstr "লিখনযোগ্য:"
 
-#: src/druid.cpp:546
-msgid "ISDN"
-msgstr "আই-এস-ডি-এন"
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:172
+msgid "Username:"
+msgstr "ব্যবহারকারীর নাম:"
 
-#: src/druid.cpp:547
-msgid "xDSL/Cable"
-msgstr "এক্স-ডি-এস-এল/কেবল"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
+#: ../lib/engine/components/resource-list/rl-heap.cpp:178
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
+msgid "Unnamed"
+msgstr "নামবিহীন"
 
-#: src/druid.cpp:548
-msgid "T1/LAN"
-msgstr "টি১/ল্যান"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:200
+msgid "_Add a new contact"
+msgstr "নতুন পরিচিতি যোগ করুন (_A)"
 
-#: src/druid.cpp:549
-#, fuzzy
-msgid "Keep current settings"
-msgstr "বর্তমান সংযোগটি বিচ্ছিন্ন করা"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:202
+msgid "_Refresh contact list"
+msgstr "পরিচিতদের তালিকা নতুন করে প্রদর্শন করা হবে (_R)"
 
-#: src/druid.cpp:731
-#, fuzzy, c-format
-msgid ""
-"You have now finished the GnomeMeeting configuration. All the settings can "
-"be changed in the GnomeMeeting preferences. Enjoy!\n"
-"\n"
-"\n"
-"Configuration Summary:\n"
-"\n"
-"Username:  %s\n"
-"Connection type:  %s\n"
-"Audio manager: %s\n"
-"Audio player:  %s\n"
-"Audio recorder:  %s\n"
-"Video Manager: %s\n"
-"Video player: %s\n"
-"My Callto URL: %s\n"
-msgstr ""
-"আপনার গুহ্‌নোমমিটিং কনফিগারেশন শেষ হয়েছে।  এই সমস্ত মান গুহ্‌নোমমিটিং \"পছন্দ\"থেকে "
-"যে কোন সময় পরিবর্তন করা সম্ভব।  এবার ইচ্ছেমত ব্যবহার করুন!\n"
-"\n"
-"\n"
-"কনফিগারেশন সার সংক্ষেপ\n"
-"পরিচয়:  %s %s\n"
-"সংযোগ ব্যবস্থা:  %s\n"
-"অডিও শোনাবে:  %s\n"
-"অডিও রেকর্ড করবে:  %s\n"
-"ভিডিও দেখাবে:  %s\n"
-"আমার কলটু ইউ-আর-এল:  %s\n"
-"পি-সি-টু-ফোন কল:  %s"
-
-#: src/druid.cpp:731 src/pref_window.cpp:1181
-msgid "None"
-msgstr "কোন তাই নয়"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:204
+msgid "Contact list _properties"
+msgstr "পরিচিতদের তালিকার বৈশিষ্ট্য (_p)"
 
-#: src/druid.cpp:760
-#, c-format
-msgid "Personal Information - page %d/%d"
-msgstr "ব্যক্তিগত তথ্য - পৃষ্ঠা %d/%d"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
+msgid "Edit contact list properties"
+msgstr "পরিচিতির তালিকার বৈশিষ্ট্য সম্পাদনা"
 
-#. The user fields
-#: src/druid.cpp:773
-msgid "Please enter your firstname and your surname:"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
+msgid "Please edit the following fields (no identifier means global)"
 msgstr ""
+"অনুগ্রহ করে নিম্নলিখিত ক্ষেত্র পরিবর্তন করুন (কোনো আইডেন্টিফায়ার উল্লিখিত না হলে "
+"গ্লোবাল ধার্য করা হবে)"
 
-#: src/druid.cpp:781
-msgid ""
-"Your firstname and surname will be used when connecting to other VoIP and "
-"videoconferencing software."
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+msgid "Contact list's name"
+msgstr "পরিচিতদের তালিকার নাম"
 
-#: src/druid.cpp:824
-#, fuzzy, c-format
-msgid "Callto URL - page %d/%d"
-msgstr "কনফিগারেশন ড্রুইড - পৃষ্ঠা %d/%d"
+#. "Document" used as a name -- uri point to the root of a document tree
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
+msgid "Document root"
+msgstr "নথিপত্রের root"
 
-#: src/druid.cpp:835
-#, fuzzy
-msgid "Please enter your e-mail address:"
-msgstr "আপনার এ-মেইল ঠিকানা লিখুন"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+msgid "Identifier"
+msgstr "আইডেন্টিফায়ার"
 
-#: src/druid.cpp:843
-msgid ""
-"Your e-mail address is used when registering to the GnomeMeeting users "
-"directory. It is used to create a callto address permitting your contacts to "
-"easily call you wherever you are."
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
+msgid "Writable"
+msgstr "লিখনযোগ্য"
 
-#: src/druid.cpp:852
-msgid ""
-"I don't want to register to the GnomeMeeting users directory and get a "
-"callto address"
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+msgid "Server username"
+msgstr "সার্ভারে ব্যবহারকারীর নাম"
 
-#: src/druid.cpp:902
-#, fuzzy, c-format
-msgid "Connection Type - page %d/%d"
-msgstr "নেটওয়ার্ক সংযোগ - পৄষ্টা %d/%d"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+msgid "Server password"
+msgstr "সার্ভারের পাসওয়ার্ড"
 
-#. The connection type
-#: src/druid.cpp:914
-#, fuzzy
-msgid "Please choose your connection type:"
-msgstr "বর্তমান সংযোগটি বিচ্ছিন্ন করা"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
+msgid "Add a remote contact"
+msgstr "দূরবর্তী পরিচিতি যোগ করুন"
 
-#: src/druid.cpp:922
-msgid ""
-"The connection type will permit determining the best quality settings that "
-"GnomeMeeting will use during calls. You can later change the settings "
-"individually in the preferences window."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
+msgid "Please fill in this form to create a new contact on a remote server"
 msgstr ""
+"দূরবর্তী সার্ভারের মধ্যে নতুন পরিচিতি যোগ করার জন্য অনুগ্রহ করে এই ফর্মের মধ্যে তথ্য "
+"পূরণ করুন"
 
-#: src/druid.cpp:961
-#, fuzzy, c-format
-msgid "Audio Manager - page %d/%d"
-msgstr "অডিও ডিভাইস - পৃষ্ঠা %d/%d"
-
-#. The Audio devices
-#: src/druid.cpp:973
-#, fuzzy
-msgid "Please choose your audio manager:"
-msgstr "ভিডিওর জন্য ছবি বেছে নিন"
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+msgid "Edit remote contact"
+msgstr "দূরবর্তী পরিচিতির তথ্য সম্পাদনা"
 
-#: src/druid.cpp:981
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
 msgid ""
-"The audio manager is the plugin that will manage your audio devices, ALSA is "
-"probably the best choice when available."
+"Please fill in this form to change an existing contact on a remote server"
 msgstr ""
+"দূরবর্তী সার্ভারের মধ্যে উপস্থিত পরিচিতি যোগ করার জন্য অনুগ্রহ করে এই ফর্মের মধ্যে তথ্য "
+"পূরণ করুন"
 
-#: src/druid.cpp:1022
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
+msgid "Invalid server data"
+msgstr "সার্ভারের তথ্য বৈধ নয়"
+
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
+msgid "Click to fetch"
+msgstr "প্রাপ্ত করার জন্য ক্লিক করুন"
+
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
+msgid "Distant contact"
+msgstr "দূরবর্তী পরিচিতি"
+
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
 #, c-format
-msgid "Audio Devices - page %d/%d"
-msgstr "অডিও ডিভাইস - পৃষ্ঠা %d/%d"
+msgid "%s / List #%d"
+msgstr "%1$s / তালিকা #%2$d"
 
-#. The Audio devices
-#: src/druid.cpp:1034
-#, fuzzy
-msgid "Please choose the audio output device:"
-msgstr "ভিডিওর জন্য ছবি বেছে নিন"
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
+#, c-format
+msgid "List #%d"
+msgstr "তালিকা #%d"
 
-#: src/druid.cpp:1042
-msgid ""
-"The audio output device is the device managed by the audio manager that will "
-"be used to play audio."
-msgstr ""
+#: ../lib/engine/gui/gtk-core/form-dialog-gtk.cpp:660
+msgid "Advanced"
+msgstr "উন্নত"
 
-#: src/druid.cpp:1052
-#, fuzzy
-msgid "Please choose the audio input device:"
-msgstr "ভিডিওর জন্য ছবি বেছে নিন"
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:659
+msgid "Address Book"
+msgstr "ঠিকানা বই"
 
-#: src/druid.cpp:1060
-msgid ""
-"The audio input device is the device managed by the audio manager that will "
-"be used to record your voice."
-msgstr ""
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
+#: ../src/gui/main.cpp:3132
+msgid "Address _Book"
+msgstr "ঠিকানা বই (_B)"
 
-#: src/druid.cpp:1073 src/druid.cpp:1211
-#, fuzzy
-msgid "Test those settings"
-msgstr "ভিডিও মানসমূহ দেখানো হবে"
+#. This will add static and dynamic actions
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:684
+msgid "_Action"
+msgstr "কর্ম (_A)"
+
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:729
+msgid "Category"
+msgstr "শ্রেণী"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
+#: ../src/gui/assistant.cpp:1368
+msgid "Full Name"
+msgstr "সম্পূর্ণ নাম"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:601
+msgid "_Search Filter:"
+msgstr "অনুসন্ধানের পরিশোধক (_S):"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:247
+msgid "says:"
+msgstr "বলছেন:"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:370
+msgid "Open link in browser"
+msgstr "ব্রাউজারের মধ্যে লিংক খুলুন"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:376
+msgid "Copy link"
+msgstr "লিঙ্ক কপি করুন"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
+msgid "_Smile..."
+msgstr "হাস্যমুখ...(_S)"
+
+#. we can't do much here since we get the Chat as reference...
+#: ../lib/engine/gui/gtk-frontend/chat-window.cpp:432
+msgid "Chat Window"
+msgstr "আলাপনের উইন্ডো"
+
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:989
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1024
+msgid "Unsorted"
+msgstr "অবিন্যস্ত"
+
+#: ../lib/gui/codecsbox.cpp:478
+msgid "Move selected codec priority upwards"
+msgstr "নির্বাচিত codec-এর গুরুত্ব বৃদ্ধি করা হবে"
+
+#: ../lib/gui/codecsbox.cpp:488
+msgid "Move selected codec priority downwards"
+msgstr "নির্বাচিত codec-এর গুরুত্ব হ্রাস করা হবে"
 
-#: src/druid.cpp:1119
-#, fuzzy, c-format
-msgid "Video Manager - page %d/%d"
-msgstr "ভিডিও ডিভাইস - পৃষ্ঠা %d/%d"
+#: ../lib/gui/gmdialog.c:462
+msgid "Do not show this dialog again"
+msgstr "এই ডায়লগটি পুনরায় প্রদর্শন করা হবে না"
 
-#. The Audio devices
-#: src/druid.cpp:1131
-#, fuzzy
-msgid "Please choose your video manager:"
-msgstr "ভিডিওর জন্য ছবি বেছে নিন"
+#: ../src/gui/accounts.cpp:230
+msgid "Registered"
+msgstr "নিবন্ধিত"
 
-#: src/druid.cpp:1139
-msgid ""
-"The video manager is the plugin that will manage your video devices, "
-"Video4Linux is the most common choice if you own a webcam."
-msgstr ""
+#: ../src/gui/accounts.cpp:234
+msgid "Unregistered"
+msgstr "নিবন্ধিত নয়"
 
-#: src/druid.cpp:1179
-#, c-format
-msgid "Video Devices - page %d/%d"
-msgstr "ভিডিও ডিভাইস - পৃষ্ঠা %d/%d"
+#: ../src/gui/accounts.cpp:238
+msgid "Could not unregister"
+msgstr "নিবন্ধন বাতিল করতে ব্যর্থ"
 
-#. The Video devices
-#: src/druid.cpp:1191
-#, fuzzy
-msgid "Please choose the video input device:"
-msgstr "ভিডিওর জন্য ছবি বেছে নিন"
+#: ../src/gui/accounts.cpp:244
+msgid "Could not register"
+msgstr "নিবন্ধন করতে ব্যর্থ"
 
-#: src/druid.cpp:1199
-msgid ""
-"The video input device is the device managed by the video manager that will "
-"be used to capture video."
-msgstr ""
+#: ../src/gui/accounts.cpp:250
+msgid "Processing..."
+msgstr "প্রসেস করা হচ্ছে..."
 
-#: src/druid.cpp:1243
-msgid "First Time Configuration Druid"
-msgstr "প্রাথমিক কনফিগারেশন ড্রুইড"
+#: ../src/gui/accounts.cpp:636
+msgid "Account Name"
+msgstr "অ্যাকাউন্টের নাম"
 
-#: src/druid.cpp:1250
-#, c-format
-msgid "Configuration Druid - page %d/%d"
-msgstr "কনফিগারেশন ড্রুইড - পৃষ্ঠা %d/%d"
+#: ../src/gui/accounts.cpp:637
+msgid "Voice Mails"
+msgstr "ভয়েস মেইল"
+
+#: ../src/gui/accounts.cpp:638
+msgid "Status"
+msgstr "অবস্থা"
+
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
+msgid "Accounts"
+msgstr "অ্যাকাউন্ট"
+
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3193
+msgid "_Accounts"
+msgstr "অ্যাকাউন্ট (_A)"
+
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3276
+msgid "_Help"
+msgstr "সাহায্য (_H)"
 
-#: src/druid.cpp:1253
+#. Translators:
+#. * The following string "A" means "activated" or "active". It's a column
+#. * description in the list of configured accounts, it shows if an account
+#. * is activated or not (a status the user can choose).
+#.
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
+msgid "A"
+msgstr "A"
+
+#: ../src/gui/assistant.cpp:321
 msgid ""
-"This is the GnomeMeeting general configuration druid. The following steps "
-"will set up GnomeMeeting by asking a few simple questions.\n"
+"This is the Ekiga general configuration assistant. The following steps will "
+"set up Ekiga by asking a few simple questions.\n"
 "\n"
 "Once you have completed these steps, you can always change them later by "
 "selecting Preferences in the Edit menu."
 msgstr ""
-"এটি গুহ্‌নোম-মিটিং-এর সাধারণ কনফিগারেশন ড্রুইড।  পরবর্তী ধাপগুলিতে কিছু সহজ প্রশ্নের "
-"মাধ্যমে আপনার জন্য গুহ্‌নোম-মিটিং সেটআপ করে দেবে\n"
-"\n"
-"এই ধাপগুলি শেষ করার পরে, যে কোন সময়ই আপনি ইচ্ছে অনুযায়ী এর বদল করতে পারবেন "
-"সম্পাদন মেনুর \"পছন্দ\" অপশনটি ব্যবহার করে"
+"এটি মূলত Ekiga-র সাধারণ কনফিগারেশন সহায়ক ব্যবস্থা। পরবর্তী ধাপগুলিতে কয়েকটি "
+"সাধারণ প্রশ্নের উত্তর জানার অনুরোধ করা হবে ও সেগুলোর সাহায্যে Ekiga কনফিগারে করা "
+"হবে।\n"
+"\n"
+"এই ধাপগুলো সমাপ্তির পরে, কোনো বৈশিষ্ট্য পরিবর্তনের জন্য 'সম্পাদনা' শীর্ষক মেনু থেকে "
+"'পছন্দ' নির্বাচন করুন।"
+
+#: ../src/gui/assistant.cpp:329
+msgid "Welcome to Ekiga"
+msgstr "Ekiga-এ স্বাগতম"
 
-#: src/druid.cpp:1293
-#, c-format
-msgid "Configuration complete - page %d/%d"
-msgstr "কনফিগারেশন সমাপ্ত - পৃশ্ঠা %d/%d"
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
+msgid "Personal Information"
+msgstr "ব্যক্তিগত তথ্যাদি"
 
-#. Update the history and status bar
-#: src/endpoint.cpp:726
-#, fuzzy, c-format
-msgid "Call from %s"
-msgstr "কল আছে %s থেকে %s ব্যবহৃত"
+#. The user fields
+#: ../src/gui/assistant.cpp:356
+msgid "Please enter your first name and your surname:"
+msgstr "অনুগ্রহ করে আপনার নাম ও পদবি লিখুন:"
 
-#: src/endpoint.cpp:738
-#, c-format
-msgid "Forwarding call from %s to %s (Forward all calls)"
-msgstr "%s থেকে %s-য়ে কল এগিয়ে দেওয়া হচ্ছে (সব কলের ক্ষেত্রেই)"
+#: ../src/gui/assistant.cpp:365
+msgid ""
+"Your first name and surname will be used when connecting to other VoIP and "
+"videoconferencing software."
+msgstr ""
+"অন্যান্য VoIP ও ভিডিও-কনফারেন্স সফ্টওয়্যারের সাথে সংযোগ করার সময় আপনার নাম ও পদবি "
+"ব্যবহার করা হবে।"
 
-#. there is no forwarding, so reject the call
-#: src/endpoint.cpp:745 src/endpoint.cpp:766
-#, fuzzy, c-format
-msgid "Rejecting call from %s (Busy)"
-msgstr "%s থেকে আসা কল স্বয়ংক্রিয় ভাবে বাতিল করা হচ্ছে (ব্যস্ত)"
+#: ../src/gui/assistant.cpp:559
+msgid "Ekiga.net Account"
+msgstr "Ekiga.net অ্যাকাউন্ট"
+
+#: ../src/gui/assistant.cpp:561
+msgid "Please enter your username:"
+msgstr "অনুগ্রহ করে আপনার অ্যাকাউন্টের ব্যবহারকারীর নাম লিখুন:"
+
+#: ../src/gui/assistant.cpp:569
+msgid "Please enter your password:"
+msgstr "অনুগ্রহ করে আপনার পাসওয়ার্ড লিখুন:"
+
+#: ../src/gui/assistant.cpp:579
+msgid ""
+"The username and password are used to login to your existing account at the "
+"ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
+"you may first create an account below. This will provide a SIP address that "
+"allows people to call you.\n"
+"\n"
+"You may skip this step if you use an alternative SIP service, or if you "
+"would prefer to specify the login details later."
+msgstr ""
+"বিন্যামূল্যে বিদ্যমান ekiga.net SIP পরিসেবার অ্যাকাউন্টে লগ-ইন করার জন্য, "
+"ব্যবহারকারীর নাম ও পাসওয়ার্ড প্রয়োগ করা আবশ্যক। ekiga.net SIP ঠিকানা উপস্থিত না "
+"থাকলে, প্রথমে নীচে একটি অ্যাকাউন্ট নির্মাণ করুন। এর ফলে আপনার জন্য একটি SIP ঠিকানা "
+"ধার্য করা হবে এবং এর সাহায্যে আপনাকে কল করা যাবে।\n"
+"\n"
+"অন্য কোনো SIP পরিসেবা ব্যবহার করে থাকলে অথবা লগ-ইন সংক্রান্ত বিবরণ পরে পূরণ করতে "
+"ইচ্ছুক হলে এই ধাপটি উপেক্ষা করা যাবে।"
+
+#: ../src/gui/assistant.cpp:606
+msgid "I do not want to sign up for the ekiga.net free service"
+msgstr "বিনামূল্যের ekiga.net পরিসেবা ব্যবহার করতে আমি ইচ্ছুক নই"
+
+#: ../src/gui/assistant.cpp:669
+msgid "Ekiga Call Out Account"
+msgstr "Ekiga কল-আউট অ্যাকাউন্ট"
+
+#: ../src/gui/assistant.cpp:671
+msgid "Please enter your account ID:"
+msgstr "অনুগ্রহ করে আপনার অ্যাকাউন্টের ID লিখুন:"
+
+#: ../src/gui/assistant.cpp:679
+msgid "Please enter your PIN code:"
+msgstr "অনুগ্রহ করে আপনার PIN কোড লিখুন:"
+
+#: ../src/gui/assistant.cpp:690
+msgid ""
+"You can make calls to regular phones and cell numbers worldwide using "
+"Ekiga.\n"
+"\n"
+"To enable this, you need to do two things:\n"
+"- First buy an account at the URL below.\n"
+"- Then enter your account ID and PIN code.\n"
+"The service will work only if your account is created using the URL in this "
+"dialog.\n"
+msgstr ""
+"Ekiga-এর মাধ্যমে সারা বিশ্বের যে কোনো স্থানে আপনি স্বাভাবিক ফোন ও সেল ফোনে কল "
+"করতে পারবেন।\n"
+"\n"
+"এই ব্যবস্থা সক্রিয় করার জন্য দুটি ধাপ পালন করা আবশ্যক:\n"
+"- প্রথমত, নিম্নলিখিত URL-এ গিয়ে একটি অ্যাকাউন্ট কিনুন\n"
+"- এর পরে, আপনার অ্যাকাউন্টের ID ও PIN কোড লিখুন।\n"
+"উল্লেখ্য, শুধুমাত্র এই ডায়লগে প্রদর্শিত নিম্নলিখিত URL-এর মাধ্যমে অ্যাকাউন্ট নির্মিত হলে "
+"এই পরিসেবা ব্যবহার করা সম্ভব হবে।\n"
+
+#: ../src/gui/assistant.cpp:740
+msgid "Consult the calls history"
+msgstr "কল সংক্রান্ত পূর্ববর্তী তথ্য যাচাই করা হবে"
+
+#: ../src/gui/assistant.cpp:750
+msgid "I do not want to sign up for the Ekiga Call Out service"
+msgstr "Ekiga Call Out পরিসেবা ব্যবহার করতে আমি ইচ্ছুক নই"
+
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
+msgid "Connection Type"
+msgstr "সংযোগের ধরণ"
 
-#: src/endpoint.cpp:757
-#, c-format
-msgid "Forwarding call from %s to %s (Busy)"
-msgstr "%s থেকে %s-য়ে কল এগিয়ে দেওয়া হচ্ছে (ব্যস্ত)"
+#. The connection type
+#: ../src/gui/assistant.cpp:819
+msgid "Please choose your connection type:"
+msgstr "অনুগ্রহ করে সংযোগের ধরন নির্বাচন করুন:"
 
-#: src/endpoint.cpp:775
-#, c-format
-msgid "Accepting call from %s (Free For Chat)"
-msgstr ""
+#: ../src/gui/assistant.cpp:836
+msgid "56k Modem"
+msgstr "৫৬ কিলেবাইট মোডেম"
 
-#: src/endpoint.cpp:799
-#, fuzzy
-msgid "Call rejected"
-msgstr "কল সমাপ্তি"
+#: ../src/gui/assistant.cpp:841
+msgid "ISDN"
+msgstr "ISDN"
 
-#: src/endpoint.cpp:808 src/endpoint.cpp:1181 src/endpoint.cpp:2129
-msgid "Call forwarded"
-msgstr "কল এগিয়ে দেওয়া হয়েছে"
+#: ../src/gui/assistant.cpp:846
+msgid "DSL/Cable (128 kbit/s uplink)"
+msgstr "DSL/কেবল (১২৮ কিলোবাইট/সেকেন্ড আপলিঙ্ক)"
 
-#: src/endpoint.cpp:817
-#, fuzzy
-msgid "Call automatically answered"
-msgstr "সব কলে স্বয়ংক্রিয় পদ্ধতিতে উত্তর দেওয়া"
+#: ../src/gui/assistant.cpp:851
+msgid "DSL/Cable (512 kbit/s uplink)"
+msgstr "DSL/কেবল (৫১২ কিলোবাইট/সেকেন্ড আপলিঙ্ক)"
 
-#: src/endpoint.cpp:886
-#, fuzzy, c-format
-msgid "Forwarding call to %s"
-msgstr "কল এগিয়ে দেওয়া:"
-
-#: src/endpoint.cpp:897
-#, fuzzy, c-format
-msgid "Error while forwarding call to %s"
-msgstr "%s-য়ে নথিভুক্তিকরণে ত্রুটি"
+#: ../src/gui/assistant.cpp:856
+msgid "LAN"
+msgstr "LAN"
 
-#: src/endpoint.cpp:900
-#, fuzzy
-msgid "There was an error when forwarding the call to the given host."
-msgstr "সব সময়ই নির্দিশ্ট হোস্টে কল এগিয়ে দেওয়া হবে"
+#: ../src/gui/assistant.cpp:861
+msgid "Keep current settings"
+msgstr "বর্তমান বৈশিষ্ট্য পরিবর্তন করা হবে না"
 
-#: src/endpoint.cpp:957
-#, c-format
-msgid "Connected with %s using %s"
-msgstr "%s-য়ের সঙ্গে সংযোগ %s দ্বারা স্থাপিত"
+#: ../src/gui/assistant.cpp:866
+msgid ""
+"The connection type will permit determining the best quality settings that "
+"Ekiga will use during calls. You can later change the settings individually "
+"in the preferences window."
+msgstr ""
+"সংযোগের ধরনের ভিত্তিতে, কল চলাকালীন Ekiga দ্বারা ব্যবহারযোগ্য বৈশিষ্ট্যের গুণমান "
+"নির্ধারণ করা হবে। পছন্দের মান নির্ধারণের উইন্ডোর মাধ্যমে এই বৈশিষ্ট্যগুলো স্বতন্ত্রভাবে "
+"পরে পরিবর্তন করা যাবে।"
 
-#: src/endpoint.cpp:959
-msgid "Connected"
-msgstr "সংযোগ স্থাপিত"
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3022
+#: ../src/gui/main.cpp:3026 ../src/gui/preferences.cpp:760
+msgid "Audio Devices"
+msgstr "অডিও ডিভাইস"
 
-#: src/endpoint.cpp:1145
-msgid "Local user cleared the call"
-msgstr "স্থানীয় ব্যবহারকারী কলটি অনুমদন করেছেন"
+#: ../src/gui/assistant.cpp:962
+msgid "Please choose the audio ringing device:"
+msgstr "অনুগ্রহ করে অডিও রিংয়ের ডিভাইস নির্বাচন করুন:"
+
+#: ../src/gui/assistant.cpp:982
+msgid ""
+"The audio ringing device is the device that will be used to play the ringing "
+"sound on incoming calls."
+msgstr "অডিও রিংয়ের ডিভাইসটি আগমনকারী কলের সংকেত ধ্বনির জন্য ব্যবহার করা হবে।"
 
-#: src/endpoint.cpp:1148
-msgid "Remote user cleared the call"
-msgstr "দূরবর্তী ব্যবহারকারী কলটি অনুমদন করেছেন"
+#. ---
+#: ../src/gui/assistant.cpp:993
+msgid "Please choose the audio output device:"
+msgstr "অনুগ্রহ করে অডিও আউটপুট ডিভাইস নির্বাচন করুন:"
 
-#: src/endpoint.cpp:1151
-msgid "Remote user did not accept the call"
-msgstr "দূরবর্তী ব্যবহারকারী কলটি অনুমদন করেননি"
+#: ../src/gui/assistant.cpp:1013
+msgid ""
+"The audio output device is the device that will be used to play audio during "
+"calls."
+msgstr "অডিও আউটপুট ডিভাইসটি কল চলাকালীন অডিও ধ্বনির জন্য ব্যবহার করা হবে।"
 
-#: src/endpoint.cpp:1154 src/endpoint.cpp:1157
-msgid "Local user did not accept the call"
-msgstr "স্থানীয় ব্যবহারকারী কলটি অনুমদন করেননি"
+#. ---
+#: ../src/gui/assistant.cpp:1024
+msgid "Please choose the audio input device:"
+msgstr "অনুগ্রহ করে অডিও ইনপুট ডিভাইস নির্বাচন করুন:"
 
-#: src/endpoint.cpp:1160
-msgid "The Gatekeeper cleared the call"
-msgstr "গেটকিপার কলটি অনুমদন করেছে"
+#: ../src/gui/assistant.cpp:1044
+msgid ""
+"The audio input device is the device that will be used to record your voice "
+"during calls."
+msgstr ""
+"অডিও ইনপুট ডিভাইসটি কল চলাকালীন আপনার কন্ঠস্বর রেকর্ড করার জন্য ব্যবহার করা হবে।"
 
-#: src/endpoint.cpp:1163
-msgid "Call not answered in the required time"
-msgstr "কলটি নির্ধারিত সময়ের মধ্যে উত্তর দেওয়া হয়নি"
+#: ../src/gui/assistant.cpp:1146
+msgid "Please choose your video input device:"
+msgstr "অনুগ্রহ করে অডিও আউটপুট ডিভাইস নির্বাচন করুন:"
 
-#: src/endpoint.cpp:1166
-msgid "Remote user has stopped calling"
-msgstr "দূরবর্তী ব্যবহারকারী কলটি থামিয়ে দিয়েছেন"
+#: ../src/gui/assistant.cpp:1166
+msgid ""
+"The video input device is the device that will be used to capture video "
+"during calls."
+msgstr "ভিডিও ইনপুট ডিভাইসটি কল চলাকালীন ভিডিও গ্রহণ করার জন্য ব্যবহার করা হবে।"
 
-#: src/endpoint.cpp:1169
-msgid "Abnormal call termination"
-msgstr "অস্বাভাবিক ভাবে কলের সমাপ্তি"
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
+#: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
+msgid "No device found"
+msgstr "কোনো ডিভাইস পাওয়া যায়নি"
 
-#: src/endpoint.cpp:1172
-msgid "Could not connect to remote host"
-msgstr "দূরবর্তী হোস্টের সঙ্গে সংযোগের চেষ্ঠা ব্যর্থ"
+#: ../src/gui/assistant.cpp:1310
+msgid "Configuration Complete"
+msgstr "কনফিগারেশন সমাপ্ত"
 
-#: src/endpoint.cpp:1175
-msgid "Insufficient bandwidth"
-msgstr "অপর্যাপ্ত ব্যান্ডহুইডত্‌"
+#: ../src/gui/assistant.cpp:1312
+msgid ""
+"You have now finished the Ekiga configuration. All the settings can be "
+"changed in the Ekiga preferences. Enjoy!"
+msgstr ""
+"Ekiga-এর কনফিগারেশন সম্পূর্ণ হয়েছে। এই সকল বৈশিষ্ট্যগুলির মান Ekiga-এর পছন্দ তালিকা "
+"থেকে পরিবর্তন করা যাবে!"
 
-#: src/endpoint.cpp:1178
-msgid "No common codec"
-msgstr "কোন চেনা কোডেক নেই"
+#: ../src/gui/assistant.cpp:1319
+msgid "Configuration summary:"
+msgstr "কনফিগারেশনের সংক্ষিপ্ত তথ্য:"
 
-#: src/endpoint.cpp:1184
-msgid "Security check Failed"
-msgstr "সুরক্ষার পরীক্ষা ব্যর্থ"
+#: ../src/gui/assistant.cpp:1389
+msgid "Audio Ringing Device"
+msgstr "অডিও রিংয়ের ডিভাইস"
 
-#: src/endpoint.cpp:1187
-msgid "Local user is busy"
-msgstr "স্থানীয় ব্যবহারকারী ব্যস্ত আছেন"
+#: ../src/gui/assistant.cpp:1398
+msgid "Audio Output Device"
+msgstr "অডিও আউটপুট ডিভাইস"
 
-#: src/endpoint.cpp:1190
-msgid "Remote user is busy"
-msgstr "দূরবর্তী ব্যবহারকারী ব্যস্ত আছেন"
+#: ../src/gui/assistant.cpp:1407
+msgid "Audio Input Device"
+msgstr "অডিও ইনপুট ডিভাইস"
 
-#: src/endpoint.cpp:1193 src/endpoint.cpp:1196
-msgid "Congested link to remote party"
-msgstr "দূরবর্তী ব্যবহারকারীর সঙ্গে সংযোগপথ ভিড়াক্রান্ত"
+#: ../src/gui/assistant.cpp:1416
+msgid "Video Input Device"
+msgstr "ভিডিও ইনপুট ডিভাইস"
 
-#: src/endpoint.cpp:1199
-msgid "Remote user is unreachable"
-msgstr "দূরবর্তী ব্যবহারকারীর সঙ্গে যোগাযোগ অসম্ভব"
-
-#: src/endpoint.cpp:1202
-msgid "Remote user is not running GnomeMeeting"
-msgstr "দূরবর্তী ব্যবহারকারী গুহ্‌নোমমিটিং ব্যবহার করছেন না"
+#: ../src/gui/assistant.cpp:1429
+msgid "SIP URI"
+msgstr "SIP URI"
 
-#: src/endpoint.cpp:1205
-msgid "Remote host is offline"
-msgstr "দূরবর্তী হোস্ট অফলাইন"
+#: ../src/gui/assistant.cpp:1441
+msgid "Ekiga Call Out"
+msgstr "Ekiga কল-আউট"
+
+#: ../src/gui/assistant.cpp:1485
+#, c-format
+msgid "Ekiga Configuration Assistant (%d of %d)"
+msgstr "Ekiga কনফিগারেশন সহায়ক ব্যবস্থা (%1$d, সর্বমোট %2$d)"
 
-#: src/endpoint.cpp:1208
-msgid "Temporary failure"
-msgstr "সাময়িক ত্রুটি"
+#: ../src/gui/callbacks.cpp:131
+msgid "Contributors:"
+msgstr "অবদান রয়েছে:"
 
-#: src/endpoint.cpp:1211 src/urlhandler.cpp:380 src/urlhandler.cpp:386
-msgid "User not found"
-msgstr "ব্যবহারকারীকে খুঁজে পাওয়া যায়নি"
+#: ../src/gui/callbacks.cpp:143
+msgid "Artwork:"
+msgstr "চিত্রণ:"
 
-#: src/endpoint.cpp:1215
-msgid "Call completed"
-msgstr "কল সমাপ্তি"
+#: ../src/gui/callbacks.cpp:151
+msgid "See AUTHORS file for full credits"
+msgstr "সম্পূর্ণ স্বীকৃতি তালিকা AUTHORS ফাইলের মধ্যে উপস্থিত রয়েছে"
+
+#: ../src/gui/callbacks.cpp:167
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version. "
+msgstr ""
+"এই প্রোগ্রামটি একটি মুক্ত সফটওয়্যার; মুক্ত সফটওয়্যার ফাউন্ডেশন কর্তৃক প্রকাশিত GNU "
+"সাধারণ পাবলিক লাইসেন্সের শর্ত মেনে আপনি একে পুনঃবিতরণ এবং/অথবা পরিবর্তন করতে "
+"পারেন; এক্ষেত্রে উল্লিখিত লাইসেন্সের ২য় বা তার পরবর্তী কোন সংস্করণ (আপনার "
+"ইচ্ছানুসারে) অনুসরণ করতে হবে।"
+
+#: ../src/gui/callbacks.cpp:171
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details. You should have received a copy of the GNU General Public "
+"License along with this program; if not, write to the Free Software "
+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"এই প্রোগ্রামটি এই আশায় বিতরণ করা হচ্ছে যে এটি আপনার উপকারে আসবে, তবে এ ব্যাপারে "
+"কোন নিশ্চয়তা দেওয়া হচ্ছে না; এক্ষেত্রে এমনকি এর বিক্রয়যোগ্যতা বা নির্দিষ্ট কোন কাজের "
+"উপযোগীতা সম্পর্কেও কোন নিশ্চয়তা দেওয়া হচ্ছে না। বিস্তারিত জানার জন্য GNU সাধারণ "
+"পাবলিক লাইসেন্স দেখুন। আপনার এই প্রোগ্রামের সাথে GNU সাধারণ পাবলিক লাইসেন্সের "
+"একটি অনুলিপি গ্রহণ করতে হবে; যদি তা না হয় তবে Free Software Foundation, Inc., "
+"51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA এই ঠিকানায় লিখুন।"
+
+#: ../src/gui/callbacks.cpp:178
+#, fuzzy
+msgid ""
+"Ekiga is licensed under the GPL license and as a special exception, you have "
+"permission to link or otherwise combine this program with the programs OPAL, "
+"OpenH323 and PWLIB, and distribute the combination, without applying the "
+"requirements of the GNU GPL to the OPAL, OpenH323 and PWLIB programs, as "
+"long as you do follow the requirements of the GNU GPL for all the rest of "
+"the software thus combined."
+msgstr ""
+"Ekiga is licensed under the GPL license and as a special exception, you have "
+"permission to link or otherwise combine this program with the programs OPAL, "
+"OpenH323 and PWLIB, and distribute the combination, without applying the "
+"requirements of the GNU GPL to the OPAL, OpenH323 and PWLIB programs, as "
+"long as you do follow the requirements of the GNU GPL for all the rest of "
+"the software thus combined."
 
-#: src/endpoint.cpp:1312 src/main_window.cpp:1250
-msgid ""
-"Lost packets:\n"
-"Late packets:\n"
-"Round-trip delay:\n"
-"Jitter buffer:"
+#. Translators: Please write translator credits here, and
+#. * separate names with \n
+#: ../src/gui/callbacks.cpp:190
+msgid "translator-credits"
 msgstr ""
-"হারানো প্যাকেট:\n"
-"দেরিতে আসা প্যাকেট:\n"
-"রাউন্ড-ট্রিপ বিলম্ব:\n"
-"জিট্টার বাফার:"
-
-#: src/endpoint.cpp:1527
-msgid "Error while starting the listener"
-msgstr "লিস্টনর চালু করার সময়ে ত্রুটি ঘটেছে"
+"অঙ্কুর প্রকল্পের পক্ষে ইন্দ্রনীল দাশ গুপ্ত <indradg@ilug-cal.org>\n"
+"সঙ্কর্ষণ মুখোপাধ্যায় <sankarshan@randomink.org>\n"
+"রুণা ভট্টাচার্য্য <runab@redhat.com>"
 
-#: src/endpoint.cpp:1527
+#: ../src/gui/callbacks.cpp:195
 msgid ""
-"You will not be able to receive incoming calls. Please check that no other "
-"program is already running on the port used by GnomeMeeting."
+"Ekiga is full-featured SIP and H.323 compatible VoIP, IP-Telephony and "
+"Videoconferencing application that allows you to make audio and video calls "
+"to remote users with SIP and H.323 hardware or software."
 msgstr ""
-"আপনি কাছে আসা কোন কলই আপনি নিতে পারবেন না।  পরীক্ষা করে দেখুন যে অন্য কোন "
-"প্রোগ্রাম গুহ্‌নোমমিটিং-এর জন্য নির্দিষ্ট পোর্ট আগের থেকেই ব্যবহার করছে কিনা"
+"SIP-র সর্বধরনের বৈশিষ্ট্য বিশিষ্ট ও H.323-র সাথে সুসংগত, Ekiga মূলত VoIP, IP-"
+"টেলিফোনি ও ভিডিও-কনফারেন্সিংয়ের অ্যাপ্লিকেশন। এর সাহায্যে SIP ও H.323 হার্ডওয়্যার "
+"অথবা সফ্টওয়্যারের মাধ্যমে দূরবর্তী ব্যবহারকারীদের সাথে অডিও ও ভিডিও কল করা যাবে।"
 
-#: src/endpoint.cpp:1656
-msgid "Attaching lid hardware to codec"
-msgstr "কোডেকের সঙ্গে লিড হার্ডওয়ার যুক্ত করা হচ্ছে"
+#: ../src/gui/callbacks.cpp:269
+msgid "Help display is not supported by your GTK+ version"
+msgstr "ব্যবহৃত GTK+ সংস্করণ দ্বারা সহায়তার তথ্য প্রদর্শন করা সম্ভব নয়"
 
-#. Translators : the full sentence is "Opening %s for playing with
-#. plugin %s" or "Opening %s for recording with plugin"
-#: src/endpoint.cpp:1689
-#, c-format
-msgid "Opened %s for %s with plugin %s"
-msgstr ""
+#: ../src/gui/callbacks.cpp:277
+msgid "Unable to open help file."
+msgstr "সাহায্যের ফাইল খুলতে ব্যর্থ।"
 
-#: src/endpoint.cpp:1691
-#, fuzzy
-msgid "recording"
-msgstr "রেকর্ডিংয়ে ব্যবহৃত মিক্সার:"
+#: ../src/gui/dialpad.cpp:55
+msgid "abc"
+msgstr "abc"
 
-#: src/endpoint.cpp:1691
-msgid "playing"
-msgstr ""
+#: ../src/gui/dialpad.cpp:56
+msgid "def"
+msgstr "def"
 
-#: src/endpoint.cpp:1728
-msgid "Could not open audio channel for audio transmission"
-msgstr "অডিও প্ররণের উদ্দেশ্যে অডিও চ্যানেল খোলার প্রচেশ্টা ব্যর্থ"
+#: ../src/gui/dialpad.cpp:57
+msgid "ghi"
+msgstr "ghi"
 
-#: src/endpoint.cpp:1728
-msgid ""
-"An error occured while trying to record from the soundcard for the audio "
-"transmission. Please check that your soundcard is not busy and that your "
-"driver supports full-duplex.\n"
-"The audio transmission has been disabled."
-msgstr ""
-"অডিও প্রেরণের উদ্দেশ্যে সাউন্ডকার্ডের থেকে রেকর্ড করার সময়ে একটি ত্রুটি ঘটেছে ।  "
-"অনুগ্রহ করে দেখুন যেন আপনার সাউন্ডকার্ডটি ব্যস্ত না থাকে এবং আপনার ড্রাইভারটির যেন "
-"সর্ম্পূণ ডুপ্লেক্স সামর্থ্য থাকে\n"
-"অডিও প্রেরণ ব্যবস্থা নিস্ক্রিয় করা হয়েছে"
+#: ../src/gui/dialpad.cpp:58
+msgid "jkl"
+msgstr "jkl"
 
-#: src/endpoint.cpp:1733
-msgid "Could not open audio channel for audio reception"
-msgstr "অডিও প্রাপ্তির উদ্দেশ্যে অডিও চ্যানেল খোলার প্রচেশ্টা ব্যর্থ"
+#: ../src/gui/dialpad.cpp:59
+msgid "mno"
+msgstr "mno"
 
-#: src/endpoint.cpp:1733
-msgid ""
-"An error occured while trying to play audio to the soundcard for the audio "
-"reception. Please check that your soundcard is not busy and that your driver "
-"supports full-duplex.\n"
-"The audio reception has been disabled."
-msgstr ""
-"অডিও সংকেত গ্রহণের উদ্দেশ্যে সাউন্ডকার্ডের থেকে রেকর্ড করার সময়ে একটি ত্রুটি ঘটেছে "
-"।  অনুগ্রহ করে দেখুন যেন আপনার সাউন্ডকার্ডটি ব্যস্ত না থাকে এবং আপনার ড্রাইভারটির "
-"যেন সর্ম্পূণ ডুপ্লেক্স সামর্থ্য থাকে\n"
-"অডিও সংকেত গ্রহণ ব্যবস্থা নিস্ক্রিয় করা হয়েছে"
+#: ../src/gui/dialpad.cpp:60
+msgid "pqrs"
+msgstr "pqrs"
 
-#: src/endpoint.cpp:1962
-#, c-format
-msgid "%.2ld:%.2ld:%.2ld  A:%.2f/%.2f   V:%.2f/%.2f"
-msgstr "%.2ld:%.2ld:%.2ld  অ:%.2f/%.2f   ভি:%.2f/%.2f"
+#: ../src/gui/dialpad.cpp:61
+msgid "tuv"
+msgstr "tuv"
 
-#: src/endpoint.cpp:2004
-#, c-format
-msgid ""
-"Lost packets: %.1f %%\n"
-"Late packets: %.1f %%\n"
-"Round-trip delay: %d ms\n"
-"Jitter buffer: %d ms"
-msgstr ""
-"হারানো প্যাকেট: %.1f %%\n"
-"দেরীতে আসা প্যাকেট: %.1f %%\n"
-"রাউন্ড-ট্রিপ বিলম্ব: %d মি-সেক\n"
-"জিটার বাফার: %d মি-সেক"
+#: ../src/gui/dialpad.cpp:62
+msgid "wxyz"
+msgstr "wxyz"
 
-#: src/endpoint.cpp:2125
+#. Translators: Is displayed once an account "%s" is registered.
+#: ../src/gui/main.cpp:526
 #, c-format
-msgid "Forwarding Call to %s (No Answer)"
-msgstr "কলটি %s এগিয়ে দেওয়া হচ্ছে (উত্তর নেই)"
+msgid "Registered %s"
+msgstr "%s নিবন্ধিত হয়েছে"
 
-#: src/gatekeeper.cpp:127
+#. Translators: Is displayed once an account "%s" is unregistered.
+#: ../src/gui/main.cpp:533
 #, c-format
-msgid "Unregistered from gatekeeper %s"
-msgstr "গেটকিপার %s থেকে সংযোগ বিচ্ছিন্ন"
+msgid "Unregistered %s"
+msgstr "%s নিবন্ধনমুক্ত হয়েছে"
 
-#: src/gatekeeper.cpp:141
-msgid "Invalid gatekeeper hostname"
-msgstr "বেঠিক গেটকিপার হোস্টের নাম"
+#: ../src/gui/main.cpp:538
+#, c-format
+msgid "Could not unregister %s"
+msgstr "%s নিবন্ধনমুক্ত করতে ব্যর্থ"
 
-#: src/gatekeeper.cpp:141
-msgid ""
-"Please provide a hostname to use for the gatekeeper.\n"
-"Disabling registering."
-msgstr ""
-"গেটকিপারের জন্য একটি হোস্টের নাম দেওয়া আবশ্যক\n"
-"নথিভুক্তকরণ নিস্ক্রিয় করা হচ্ছে"
+#: ../src/gui/main.cpp:542
+#, c-format
+msgid "Could not register %s"
+msgstr "%s নিবন্ধন করতে ব্যর্থ"
 
-#: src/gatekeeper.cpp:149
-msgid "Invalid gatekeeper ID"
-msgstr "বেঠিক গেটকিপার পরিচিতি"
+#: ../src/gui/main.cpp:612
+#, c-format
+msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
+msgstr "A:%1$.1f/%2$.1f   V:%3$.1f/%4$.1f   FPS:%5$d/%6$d"
 
-#: src/gatekeeper.cpp:149
-msgid ""
-"Please provide a valid ID for the gatekeeper.\n"
-"Disabling registering."
-msgstr ""
-"অনুগ্রহ করে একটি সঠিক গেটকিপার পরিচিতি দিন\n"
-"নথিভুক্তকরণ নিস্ক্রিয় করা হচ্ছে"
+#: ../src/gui/main.cpp:658
+#, c-format
+msgid "Connected with %s"
+msgstr "%s-এর সংযুক্ত"
 
-#: src/gatekeeper.cpp:196
-msgid ""
-"Another user already exists with the same alias, please use another alias."
-msgstr "এই ডাকনামটি অন্য কেউ ব্যবহার করছেন, অনুগ্রহ করে অন্য কোন ডাকনাম ব্যবহার করুন"
+#: ../src/gui/main.cpp:699 ../src/gui/main.cpp:3522
+msgid "Standby"
+msgstr "মুলতুবি"
 
-#: src/gatekeeper.cpp:199
-msgid ""
-"You are not allowed to register to the gatekeeper. Please check your login, "
-"password and firewall."
-msgstr ""
-"গেটকিপারে নথিভুক্তকরণের জন্য আপনার অনুমতি নেই।  অনুগ্রহ করে আপনার লগিন, পাসওয়ার্ড "
-"এবং ফায়ারওয়াল পরীক্ষা করে দেখুন"
+#: ../src/gui/main.cpp:760
+msgid "Call on hold"
+msgstr "ধরে থাকা কল"
 
-#: src/gatekeeper.cpp:202
-msgid "There was a transport error."
-msgstr "একটি ট্রান্সপোর্ট ত্রুটি ঘটেছে"
+#: ../src/gui/main.cpp:771
+msgid "Call retrieved"
+msgstr "কল পুনরুদ্ধার করা হয়েছে"
 
-#: src/gatekeeper.cpp:205 src/gatekeeper.cpp:210
-msgid "No gatekeeper corresponding to your options has been found."
-msgstr "আপনার নির্দেশিত গেটকিপারের কোন খোঁজ পাওয়া যায়নি"
+#: ../src/gui/main.cpp:787
+#, c-format
+msgid "Missed call from %s"
+msgstr "%s থেকে প্রাপ্ত কলের জবাব দেওয়া হয়নি"
 
-#: src/gatekeeper.cpp:212
-msgid "Error while registering with gatekeeper"
-msgstr "গেটকিপারের সঙ্গে নথিভুক্তকরণের সময়ে ত্রুটি ঘটেছে"
+#: ../src/gui/main.cpp:924
+msgid "Error"
+msgstr "ত্রুটি"
 
-#: src/gatekeeper.cpp:228
-#, c-format
-msgid "Gatekeeper set to %s"
-msgstr "%s-কে গেটকিপার নির্ধারিত হয়েছে"
+#: ../src/gui/main.cpp:989
+msgid "Error while initializing video output"
+msgstr "ভিডিও আউটপুট ডিভাইস আরম্ভ করতে সমস্যা"
 
-#: src/gnomemeeting.cpp:86
-msgid "Notification area not detected"
-msgstr "নোটিফিকেশন ক্ষেত্রের সন্ধান পাওয়া যায়নি"
+#: ../src/gui/main.cpp:990
+msgid "No video will be displayed during this call->"
+msgstr "এই কলের সময় কোনো ভিডিও প্রদর্শন করা হবে না"
 
-#: src/gnomemeeting.cpp:86
+#: ../src/gui/main.cpp:1000
 msgid ""
-"You have chosen to start GnomeMeeting hidden, however the notification area "
-"is not present in your panel, GnomeMeeting can thus not start hidden."
+"There was an error opening or initializing the video output. Please verify "
+"that no other application is using the accelerated video output."
 msgstr ""
-"আপনি গুহ্‌নোমমিটিং লুকিয়ে শুরু করতে চেয়েছেন, কিন্তু আপনার প্যানেলে নোটিফিকেশন ক্ষেত্র "
-"না থাকায় গুহ্‌নোমমিটিং-কে লুকিয়ে শুরু করা সম্ভব নয়"
-
-#: src/gnomemeeting.cpp:190
-msgid "Answering incoming call"
-msgstr "আসা কলের উত্তর দেওয়া হচ্ছে"
+"ভিডিও আউটপুট খুলতে অথবা আরম্ভ করতে সমস্যা দেখা দিয়েছে। অনুগ্রহ করে পরীক্ষা করুন, অন্য "
+"কোনো অ্যাপ্লিকেশন দ্বারা দ্রুত গতির ভিডিও আউটপুট ব্যবহার করা হচ্ছে কি না।"
 
-#: src/gnomemeeting.cpp:241
-msgid "Trying to stop calling"
-msgstr "কলটি বাতিল করার চেষ্টা হচ্ছে"
-
-#: src/gnomemeeting.cpp:253
-msgid "Stopping current call"
-msgstr "বর্তমান কল স্থগিত করা হচ্ছে"
+#: ../src/gui/main.cpp:1002
+msgid ""
+"There was an error opening or initializing the video output. Please verify "
+"that you are using a color depth of 24 or 32 bits per pixel."
+msgstr ""
+"ভিডিও আউটপুট খুলতে অথবা আরম্ভ করে ত্রুটি দেখা দিয়েছে। অনুগ্রহ করে পরীক্ষা করুন রংয়ের "
+"গভীরতা ২৪ অথবা ৩২ বিট প্রতি পিক্সেল মাপেনির্ধারিত হয়েছে কি না।"
 
-#: src/gnomemeeting.cpp:264
-msgid "Refusing Incoming call"
-msgstr "আসা কল নিতে অস্বীকার করা হচ্ছে"
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1115
+#, c-format
+msgid "Added video input device %s"
+msgstr "ভিডিও ইনপুট ডিভাইস %s যোগ করা হয়েছে"
 
-#. GM is started
-#: src/gnomemeeting.cpp:493
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1127
 #, c-format
-msgid "Started GnomeMeeting V%d.%d for %s\n"
-msgstr "গুহ্‌নোমমিটিং চালু হল - ভি %d.%d জন্য %s\n"
+msgid "Removed video input device %s"
+msgstr "ভিডিও ইনপুট ডিভাইস %s সরিয়ে ফেলা হয়েছে"
 
-#: src/ils.cpp:110
-msgid "Invalid parameters"
-msgstr "বেঠিক মানসমূহ"
+#: ../src/gui/main.cpp:1144
+#, c-format
+msgid "Error while accessing video device %s"
+msgstr "ভিডিও ডিভাইস %s খোলার সময়ে ত্রুটি"
 
-#: src/ils.cpp:110
+#: ../src/gui/main.cpp:1147
 msgid ""
-"Please provide your first name and e-mail in the Personal Data section in "
-"order to be able to register to the user directory."
+"A moving logo will be transmitted during calls. Notice that you can always "
+"transmit a given image or the moving logo by choosing \"Picture\" as video "
+"plugin and \"Moving logo\" or \"Static picture\" as device."
 msgstr ""
-"ইউজার ডিরেক্টরিতে নথিভুক্ত হতে চাইলে ব্যক্তিগত তথ্য বিভাগে আপনার নাম এবং ই-মেইল "
-"লিখুন"
-
-#: src/ils.cpp:145
-msgid "Invalid user directory"
-msgstr "বেঠিক ইউজার ডিরেক্টরি"
-
-#: src/ils.cpp:145
-msgid "Operation impossible since there is no user directory specified."
-msgstr "এই কাজটি করা অসম্ভব কারণ কোন ইউজার ডিরেক্টরিই নির্দিষ্ট করা হয়েনি"
+"কল চলাকালে এটি ভ্রাম্যমান লোগো পরিবহন করা হবে। উল্লেখ্য, কোনো সুনির্দিষ্ট ছবি অথবা "
+"ভ্রাম্যমান লোগো পরিবহনের জন্য যথাক্রমে ভিডিও প্লাগ-ইন রূপপ \"Picture\" (ছবি) ও "
+"ডিভাইস রূপে \"Moving logo\" (ভ্রাম্যমান লোগো) অথবা \"Static picture\" (স্থায়ী "
+"ছবি) নির্বাচন করুন।"
 
-#: src/ils.cpp:226
-msgid "Failed to parse XML file"
-msgstr "এক্স-এম-এল ফাইল পার্স করতে ব্যর্থ"
-
-#: src/ils.cpp:226
+#: ../src/gui/main.cpp:1151
 msgid ""
-"There was an error while parsing the XML file. Please make sure that it is "
-"correctly installed in your system."
+"There was an error while opening the device. In case it is a pluggable "
+"device it may be sufficient to reconnect it. If not, or if it still is not "
+"accessible, please check your permissions and make sure that the appropriate "
+"driver is loaded."
 msgstr ""
-"এক্স-এম-এল ফাইল পার্স করার সময় ত্রুটি ঘটেছে।  ফাইলটি সঠিক ভাবে আপনার সিস্টেমে "
-"ইনস্টল করা আছে কিনা দেখে নিন"
-
-#: src/ils.cpp:237
-msgid "Bad information"
-msgstr "ভুল তথ্য"
+"ডিভাইস খুলতে সমস্যা দেখা দিয়েছে। প্লাগ করে ব্যবহারযোগ্য কোনো ডিভাইসের ক্ষেত্রে "
+"পুনরায় সেটি সংযুক্ত করলে সমস্যা মিটে যেতে পারে। যদি তথাপি এটি ব্যবহার করা সম্ভব না "
+"হয়, তাহলে ব্যবহারের অনুমতি পরীক্ষা করুন ও যথাযত ড্রাইভার লোড করা হয়েছে কি না দেখুন।"
 
-#: src/ils.cpp:237
-#, c-format
-msgid "Bad ldap information from XML file: %s."
-msgstr "বেঠিক এল-ড্যাপ তথ্য এক্স-এম-এল ফাইলে : %s"
+#: ../src/gui/main.cpp:1155
+msgid "Your video driver doesn't support the requested video format."
+msgstr "আপনার ভিডিও ড্রাইভারটি প্রয়োজনীয় ভিডিও ধরণটিকে সমর্থন করে না"
 
-#: src/ils.cpp:246
-#, fuzzy
-msgid "Cannot contact the users directory"
-msgstr "ইউজার ডিরেক্টরির সঙ্গে সংযোগ করা সম্ভব নয়"
+#: ../src/gui/main.cpp:1159
+msgid "Could not open the chosen channel."
+msgstr "নির্বাচিত চ্যানেল খুলতে ব্যর্থ।"
 
-#: src/ils.cpp:246
-#, c-format
+#: ../src/gui/main.cpp:1163
 msgid ""
-"Failed to contact the users directory %s:%d. The directory is probably "
-"currently overloaded, try again later."
+"Your driver doesn't seem to support any of the color formats supported by "
+"Ekiga.\n"
+" Please check your kernel driver documentation in order to determine which "
+"Palette is supported."
 msgstr ""
+"Ekiga দ্বারা সমর্থিত রংয়ের বিন্যাস সম্ভবত ব্যবহৃত ড্রাইভার দ্বারা সমর্থিত নয়।\n"
+" সমর্থিত প্যালেট জানার জন্য অনুগ্রহ করে কার্নেল ড্রাইভারের নথিপত্র যাচাই করুন।"
 
-#: src/ils.cpp:256 src/ils.cpp:265
-msgid "Cannot contact the user directory"
-msgstr "ইউজার ডিরেক্টরির সঙ্গে সংযোগ করা সম্ভব নয়"
-
-#: src/ils.cpp:256
-msgid "Failed to set a time limit on operations."
-msgstr "অপারেশনের জন্য সময় সীমা ধার্য করতে ব্যর্থ"
+#: ../src/gui/main.cpp:1167
+msgid "Error while setting the frame rate."
+msgstr "ফ্রেমের মাত্রা নির্ধারণের ক্ষেত্রে ত্রুটি"
 
-#: src/ils.cpp:265
-#, c-format
-msgid "Failed to bind to user directory: %s."
-msgstr "ইউজার ডিরেক্টরির সঙ্গে বাইন্ড ব্যর্থ: %s"
+#: ../src/gui/main.cpp:1171
+msgid "Error while setting the frame size."
+msgstr "ফ্রেমের আয়তন নির্ধারণের ক্ষেত্রে ত্রুটি"
 
-#: src/ils.cpp:289
-#, fuzzy, c-format
-msgid "Updated information on the users directory %s."
-msgstr "%s সংক্রান্ত তথ্য নবায়িত"
-
-#: src/ils.cpp:293
-#, fuzzy, c-format
-msgid "Unregistered from the users directory %s."
-msgstr "গেটকিপার %s থেকে সংযোগ বিচ্ছিন্ন"
+#: ../src/gui/main.cpp:1176 ../src/gui/main.cpp:1278 ../src/gui/main.cpp:1393
+msgid "Unknown error."
+msgstr "অজানা ত্রুটি।"
 
-#: src/ils.cpp:315
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1226
 #, c-format
-msgid "Error while registering to %s."
-msgstr "%s-য়ে নথিভুক্তিকরণে ত্রুটি"
+msgid "Added audio input device %s"
+msgstr "অডিও ইনপুট ডিভাইস %s যোগ করা হয়েছে"
 
-#: src/ils.cpp:674
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1243
 #, c-format
-msgid "Failed to contact LDAP server %s:%d."
-msgstr "এল-ড্যাপ সার্ভারের সঙ্গে যোগাযোগ ব্যর্থ %s:%d"
-
-#: src/ils.cpp:687
-msgid "Failed to set time limit on LDAP operations."
-msgstr "এল-ড্যাপ অপারেশনের সময় সীমা ধার্য করতে ব্যর্থ"
+msgid "Removed audio input device %s"
+msgstr "অডিও ইনপুট ডিভাইস %s সরিয়ে ফেলা হয়েছে"
 
-#: src/ils.cpp:697
+#: ../src/gui/main.cpp:1260
 #, c-format
-msgid "Failed to contact to LDAP server %s: %s."
-msgstr "সংযোগের চেষ্টা ব্যর্থ এল-ড্যাপ সার্ভার %s সঙ্গে: %s"
+msgid "Error while opening audio input device %s"
+msgstr "অডিও ইনপুট ডিভাইস %s খোলার সময়ে ত্রুটি"
 
-#: src/ils.cpp:707
-#, c-format
-msgid "Fetching online users list from %s."
-msgstr "অনলাইন ব্যক্তিদের তালিকা আনা হচ্ছে %s থেকে"
+#. Translators: This happens when there is an error with audio input:
+#. * Nothing ("silence") will be transmitted
+#: ../src/gui/main.cpp:1265
+msgid "Only silence will be transmitted."
+msgstr "কোনো শব্দ পরিবহন করা হবে না।"
 
-#: src/ils.cpp:725
-msgid "Could not fetch online users list."
-msgstr "অনলাইন ব্যক্তিদের তালিকা আনা সম্ভব হয়নি"
+#: ../src/gui/main.cpp:1269
+msgid ""
+"Unable to open the selected audio device for recording. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
+msgstr ""
+"রেকর্ড করার জন্য নির্বাচিত অডিও ডিভাইস খুলতে ব্যর্থ। প্লাগ করে ব্যবহারযোগ্য কোনো "
+"ডিভাইসের ক্ষেত্রে পুনরায় সেটি সংযুক্ত করলে সমস্যা মিটে যেতে পারে। যদি তথাপি এটি "
+"ব্যবহার করা সম্ভব না হয়, তাহলে অডিওর বৈশিষ্ট্য, ব্যবহারের অনুমতি পরীক্ষা করুন ও "
+"ডিভাইসটি ব্যস্ত কি না দেখুন।"
 
-#: src/ils.cpp:741
-#, c-format
-msgid "Connection to %s lost..."
-msgstr "%s-য়ের সঙ্গে সংযোগ বিচ্ছিন..."
+#: ../src/gui/main.cpp:1273
+msgid ""
+"The selected audio device was successfully opened but it is impossible to "
+"read data from this device. In case it is a pluggable device it may be "
+"sufficient to reconnect it. If not, or if it still is not accessible, please "
+"check your audio setup."
+msgstr ""
+"নির্বাচিত অডিও ডিভাইস সাফল্যের সাথে খোলা হয়েছে কিন্তু এটি থেকে তথ্য পড়া সম্ভব নয়। "
+"প্লাগ করে ব্যবহারযোগ্য কোনো ডিভাইসের ক্ষেত্রে পুনরায় সেটি সংযুক্ত করলে সমস্যা মিটে "
+"যেতে পারে। যদি তথাপি এটি ব্যবহার করা সম্ভব না হয়, তাহলে অডিও সংক্রান্ত "
+"বৈশিষ্ট্যগুলি যাচাই করুন।"
 
-#: src/ils.cpp:958
+#: ../src/gui/main.cpp:1340
 #, c-format
-msgid "Search completed: %d user(s) listed on a total of %d user(s) from %s."
-msgstr "খোঁজ সমাপ্ত: %d জন ব্যক্তি তালিকাভুক্ত, সর্বমোট  %d জন ব্যক্তি %s থেকে"
+msgid "Added audio output device %s"
+msgstr "অডিও আউটপুট ডিভাইস %s যোগ করা হয়েছে"
 
-#: src/ils.cpp:963
+#: ../src/gui/main.cpp:1356
 #, c-format
-msgid "Search completed: %d user(s) found on %s."
-msgstr "খোঁজ সমাপ্ত: %d জন ব্যক্তিকে %s-য়ে পাওয়া গেছে"
-
-#: src/ldap_window.cpp:751
-msgid "Name:"
-msgstr "নাম:"
-
-#: src/ldap_window.cpp:771
-msgid "URL:"
-msgstr "ইউ-আর-এল:"
+msgid "Removed audio output device %s"
+msgstr "অডিও আউটপুট ডিভাইস %s সরিয়ে ফেলা হয়েছে"
 
-#: src/ldap_window.cpp:798
-msgid "Speed Dial:"
-msgstr "দ্রুত ডায়েল:"
+#: ../src/gui/main.cpp:1377
+#, c-format
+msgid "Error while opening audio output device %s"
+msgstr "অডিও আউটপুট ডিভাইস %s খোলার সময়ে ত্রুটি"
 
-#: src/ldap_window.cpp:822
-msgid "Groups:"
-msgstr "গোষ্ঠী:"
+#: ../src/gui/main.cpp:1380
+msgid "No incoming sound will be played."
+msgstr "আগত কোনো শব্দ বাজানো হবে না।"
 
-#: src/ldap_window.cpp:939
-msgid "Invalid user name or URL"
-msgstr "বেঠিক পরিচিতি বা ইউ-আর-এল"
+#: ../src/gui/main.cpp:1384
+msgid ""
+"Unable to open the selected audio device for playing. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
+msgstr ""
+"শব্দ বাজানোর উদ্দেশ্যে নির্বাচিত অডিও ডিভাইস খুলতে ব্যর্থ। প্লাগ করে ব্যবহারযোগ্য কোনো "
+"ডিভাইসের ক্ষেত্রে পুনরায় সেটি সংযুক্ত করলে সমস্যা মিটে যেতে পারে। যদি তথাপি এটি "
+"ব্যবহার করা সম্ভব না হয়, তাহলে অডিওর বৈশিষ্ট্য, ব্যবহারের অনুমতি পরীক্ষা করুন ও "
+"ডিভাইসটি ব্যস্ত কি না দেখুন।"
 
-#: src/ldap_window.cpp:939
+#: ../src/gui/main.cpp:1388
 msgid ""
-"Please provide a valid name and URL for the contact you want to add to the "
-"address book."
+"The selected audio device was successfully opened but it is impossible to "
+"write data to this device. In case it is a pluggable device it may be "
+"sufficient to reconnect it. If not, or if it still is not accessible, please "
+"check your audio setup."
 msgstr ""
-"নতুন কোন পরিচয় আপনার ঠিকানার খাতায়ে যোগ করে চাইলে তার জন্য একটি সঠিক নাম ও ইউ-"
-"আর-এল লিখুন"
+"শব্দ বাজানোর উদ্দেশ্যে নির্বাচিত অডিও ডিভাইস সাফল্যের সাথে খোলা হলেও এটির মধ্যে "
+"কিছু লেখা সম্ভব নয়। প্লাগ করে ব্যবহারযোগ্য কোনো ডিভাইসের ক্ষেত্রে পুনরায় সেটি সংযুক্ত "
+"করলে সমস্যা মিটে যেতে পারে। যদি তথাপি এটি ব্যবহার করা সম্ভব না হয়, তাহলে অডিওর "
+"বৈশিষ্ট্য পরীক্ষা করুন।"
 
-#: src/ldap_window.cpp:947
-msgid "Invalid group"
-msgstr "বেঠিক গোষ্ঠী"
+#: ../src/gui/main.cpp:1579
+msgid "Video Settings"
+msgstr "ভিডিও সংক্রান্ত বৈশিষ্ট্য"
 
-#: src/ldap_window.cpp:947
-msgid "You have to select a group to which you want to add your contact."
-msgstr "নতুন পরিচয়টি যোগ করার জন্য আগে আপনাকে একটি গোষ্ঠী বেছে নিতে হবে"
+#: ../src/gui/main.cpp:1606
+msgid "Adjust brightness"
+msgstr "ঔজ্জ্বল্যে মাত্রা নিয়ন্ত্রণ"
 
-#: src/ldap_window.cpp:961
-msgid "Invalid speed dial"
-msgstr "বেঠিক দ্রুত ডায়েল"
+#: ../src/gui/main.cpp:1627
+msgid "Adjust whiteness"
+msgstr "সাদার মাত্রা নিয়ন্ত্রণ"
 
-#: src/ldap_window.cpp:961
-msgid ""
-"Another contact with the same speed dial already exists in the address book."
-msgstr "আপনার ঠিকানার খাতায়ে এই একই নামের আরেকটি দ্রুত ডায়েল পরিচিতি বর্তমান"
-
-#: src/ldap_window.cpp:973
-msgid "Invalid URL"
-msgstr "বেঠিক ইউ-আর-এল"
-
-#: src/ldap_window.cpp:973
-msgid "Another contact with the same URL already exists in the address book."
-msgstr "আপনার ঠিকানার খাতায়ে এই একই ইউ-আর-এল আরেকটি বর্তমান"
-
-#: src/ldap_window.cpp:1010
-#, fuzzy, c-format
-msgid "Are you sure you want to remove %s [%s] from this group?"
-msgstr "আপনি কি নিশ্চিত সার্ভার %s-কে মুছে ফেলতে?"
-
-#: src/ldap_window.cpp:1116
-#, c-format
-msgid "Add %s to Address Book"
-msgstr "%s-কে ঠিকানার খাতায়ে যোগ করা"
-
-#: src/ldap_window.cpp:1142 src/ldap_window.cpp:2663
-msgid "C_all Contact"
-msgstr "একে কল কর (_ক)"
-
-#: src/ldap_window.cpp:1148 src/ldap_window.cpp:2666
-msgid "_Tranfer Call to Contact"
-msgstr "কলটি এই ব্যক্তির কাছে পাঠাও (_থ)"
-
-#: src/ldap_window.cpp:1160 src/ldap_window.cpp:2683
-msgid "Contact _Properties"
-msgstr "পরিচিতির বৈশিষ্ঠ (_ব)"
-
-#: src/ldap_window.cpp:1166
-msgid "Copy URL to the clipboard"
-msgstr ""
-
-#: src/ldap_window.cpp:1172 src/ldap_window.cpp:1617 src/ldap_window.cpp:2645
-msgid "_Delete"
-msgstr "মুছে ফেলা হোক (_ম)"
-
-#: src/ldap_window.cpp:1274
-msgid "Add a new server"
-msgstr "নতুন সার্ভার যোগ"
-
-#: src/ldap_window.cpp:1275
-msgid "Enter the server name:"
-msgstr "সার্ভারের নাম লিখুন:"
-
-#: src/ldap_window.cpp:1276 src/ldap_window.cpp:1389
-msgid ""
-"Sorry but there is already a server with the same name in the address book."
-msgstr "দুঃখিত! একই নামের আর একটি সার্ভার আপনার ঠিকানার খাতায়ে আগের থেকেই বর্তমান"
-
-#: src/ldap_window.cpp:1280
-msgid "Add a new group"
-msgstr "নতুন গোষ্ঠী যোগ"
-
-#: src/ldap_window.cpp:1281
-msgid "Enter the group name:"
-msgstr "গোষ্ঠীর নাম লিখুন:"
-
-#: src/ldap_window.cpp:1282 src/ldap_window.cpp:1400
-msgid ""
-"Sorry but there is already a group with the same name in the address book."
-msgstr "দুঃখিত! একই নামের আর একটি গোষ্ঠী আপনার ঠিকানার খাতায়ে আগের থেকেই বর্তমান"
-
-#: src/ldap_window.cpp:1316 src/ldap_window.cpp:1449
-msgid "Invalid server or group name"
-msgstr "বেঠিক সার্ভার বা গোষ্ঠীর নাম"
-
-#: src/ldap_window.cpp:1385
-#, c-format
-msgid "Please enter a new name for server %s:"
-msgstr ""
-
-#: src/ldap_window.cpp:1387
-#, c-format
-msgid "Are you sure you want to delete server %s?"
-msgstr "আপনি কি নিশ্চিত সার্ভার %s-কে মুছে ফেলতে?"
-
-#: src/ldap_window.cpp:1396
-#, c-format
-msgid "Please enter a new name for group %s:"
-msgstr ""
-
-#: src/ldap_window.cpp:1398
-#, c-format
-msgid "Are you sure you want to delete group %s and all its contacts?"
-msgstr "আপনি কি নিশ্চিত গোষ্ঠী %s ও তার সংশ্লিণ্ট সব পরিচিতি মুছে ফেলতে?"
-
-#: src/ldap_window.cpp:1585
-msgid "New server"
-msgstr "নতুন সার্ভার"
-
-#: src/ldap_window.cpp:1595
-msgid "New group"
-msgstr "নতুন গোষ্ঠী"
-
-#: src/ldap_window.cpp:1605
-msgid "_Find"
-msgstr "খোঁজ করা (_খ)"
-
-#: src/ldap_window.cpp:1612 src/ldap_window.cpp:1634 src/ldap_window.cpp:2649
-#, fuzzy
-msgid "_Rename"
-msgstr "পদবী (_প):"
-
-#: src/ldap_window.cpp:1627
-msgid "New contact"
-msgstr "নতুন পরিচিতি"
-
-#: src/ldap_window.cpp:1639
-msgid "Delete"
-msgstr "মুছে ফেলা"
-
-#: src/ldap_window.cpp:2614
-msgid "GnomeMeeting Address Book"
-msgstr "গুহ্‌নোমমিটিং-এর ঠিকানার খাতা"
-
-#: src/ldap_window.cpp:2632
-msgid "_File"
-msgstr "ফাইল (_ফ)"
-
-#: src/ldap_window.cpp:2634
-msgid "New _Server"
-msgstr "নতুন সার্ভার (_স)"
-
-#: src/ldap_window.cpp:2638
-msgid "New _Group"
-msgstr "নতুন গোষ্ঠী (_গ)"
-
-#: src/ldap_window.cpp:2656 src/menu.cpp:380
-msgid "_Close"
-msgstr "বন্ধ (_ব)"
-
-#: src/ldap_window.cpp:2661
-msgid "C_ontact"
-msgstr "পরিচিতি (_র)"
-
-#: src/ldap_window.cpp:2672
-msgid "New _Contact"
-msgstr "নতুন পরিচিতি (_প)"
-
-#: src/ldap_window.cpp:2676
-msgid "Add Contact to _Address Book"
-msgstr "পরিচিতিটি ঠিকানার খাতায়ে যোগ (_ঠ)"
-
-#. Translators: This is "S" as in "Status"
-#: src/ldap_window.cpp:2942
-msgid "S"
-msgstr "এস"
-
-#. Translators: This is "A" as in "Audio"
-#: src/ldap_window.cpp:2952 src/pref_window.cpp:1092 src/pref_window.cpp:1496
-msgid "A"
-msgstr "অ"
-
-#. Translators: This is "V" as in "Video"
-#: src/ldap_window.cpp:2962
-msgid "V"
-msgstr "ভি"
-
-#: src/ldap_window.cpp:2971 src/ldap_window.cpp:3045 src/pref_window.cpp:1510
-msgid "Name"
-msgstr "নাম"
-
-#: src/ldap_window.cpp:3009 src/ldap_window.cpp:3057 src/tools.cpp:332
-msgid "URL"
-msgstr "ইউ-আর-এল"
-
-#: src/ldap_window.cpp:3032
-msgid "IP"
-msgstr "আই-পি"
-
-#: src/ldap_window.cpp:3070
-msgid "Speed Dial"
-msgstr "দ্রুত ডায়েল"
-
-#: src/ldap_window.cpp:3123
-msgid "Find all contacts"
-msgstr "সব পরিচিতির মধ্যে খোঁজ করা"
-
-#: src/ldap_window.cpp:3128
-msgid "First name contains"
-msgstr "নামের মধ্যে আছে"
-
-#: src/ldap_window.cpp:3132
-msgid "Last name contains"
-msgstr "পদবীর মধ্যে আছে"
-
-#: src/ldap_window.cpp:3136
-msgid "E-mail contains"
-msgstr "ই-মেইলের মধ্যে আছে"
-
-#: src/ldap_window.cpp:3322
-msgid "Servers"
-msgstr "সার্ভারসমূহ"
-
-#: src/ldap_window.cpp:3368
-msgid "Groups"
-msgstr "গোষ্ঠীসমূহ"
-
-#: src/lid.cpp:133
-#, fuzzy, c-format
-msgid "Opened Quicknet device %s"
-msgstr "কুইকনেট ডিভাইস %s ব্যবহৃত"
-
-#: src/lid.cpp:158
-msgid "Error while opening the Quicknet device."
-msgstr "কুইকনেট ডিভাইসটি খোলার সময় ত্রুটি ঘটেছে"
-
-#: src/lid.cpp:158
-msgid ""
-"Please check that your driver is correctly installed and that the device is "
-"working correctly."
-msgstr ""
-"আপনার ড্রাইভারটি সঠিক ভাবে ইনস্টল করা এবং এই ডিভাইসটি ঠিক ভাবে কাজ করছে কি তা "
-"পরীক্ষা করে দেখুন"
-
-#: src/lid.cpp:184
-#, fuzzy, c-format
-msgid "Closed Quicknet device %s"
-msgstr "কুইকনেট ডিভাইস %s ব্যবহৃত"
-
-#: src/lid.cpp:279 src/lid.cpp:280
-msgid "Phone is off hook"
-msgstr "ফোনটি নামানো আছে"
-
-#: src/lid.cpp:315 src/lid.cpp:316
-msgid "Phone is on hook"
-msgstr "ফোনটি যথাস্থানে রাখা আছে"
-
-#: src/main_window.cpp:334
-#, c-format
-msgid "Total: %.2f MB"
-msgstr "মোট: %.2f এম-বি"
-
-#: src/main_window.cpp:458
-msgid "Cannot run GnomeMeeting"
-msgstr "গুহ্‌নোমমিটিং চালাতে অক্ষম"
-
-#: src/main_window.cpp:458
-#, fuzzy
-msgid ""
-"GnomeMeeting is already running, if you want it to call a given callto or "
-"h323 URL, please use \"gnomemeeting -c URL\"."
-msgstr ""
-"গুহ্‌নোমমিটিং বর্তমানে চালু আছে, যদি কোন কলটু ইউ-আর-এলে কল করতে চান, তাহলে "
-"\"gnomemeeting -c URL\" এভাবে করুন"
-
-#: src/main_window.cpp:511
-msgid ""
-"It appears that you do not have gnomemeeting.server installed in a valid "
-"location. Factory mode disabled.\n"
-msgstr ""
-"আপাতত মনে হচ্ছে যে গুহ্‌নোমমিটিং সার্ভার কোন সঠিক অবস্থানে ইনস্টল করা নেই।  ফ্যাক্টরি "
-"মোড নিস্ক্রিয়\n"
-
-#: src/main_window.cpp:515
-msgid ""
-"Error registering GnomeMeeting with the activation service; factory mode "
-"disabled.\n"
-msgstr ""
-"গুহ্‌নোমমিটিং-কে অ্যাক্টিভেশন সার্ভিসের সঙ্গে নথিভুক্তিকরণে ত্রুটি; ফ্যাক্টরি মোড "
-"নিস্ক্রিয়\n"
-
-#: src/main_window.cpp:555
-msgid "Failed to retrieve gnomemeeting server from activation server\n"
-msgstr "অ্যাক্টিভেশন সার্ভার থেকে গুহ্‌নোমমিটিং সার্ভার খোঁজের চেষ্টা ব্যর্থ\n"
-
-#: src/main_window.cpp:842
-#, c-format
-msgid "Sent dtmf %c"
-msgstr ""
-
-#: src/main_window.cpp:1117 src/menu.cpp:470 src/menu.cpp:586
-msgid "Local Video"
-msgstr "স্থানীয় ভিডিও"
-
-#: src/main_window.cpp:1123 src/menu.cpp:476 src/menu.cpp:592
-msgid "Remote Video"
-msgstr "দূরবর্তী ভিডিও"
-
-#: src/main_window.cpp:1255 src/menu.cpp:431
-msgid "Statistics"
-msgstr "পরিসংখ্যান"
-
-#: src/main_window.cpp:1311
-msgid "Dialpad"
-msgstr "ডায়েল প্যাড"
-
-#: src/main_window.cpp:1366
-msgid "Adjust brightness"
-msgstr "ঔজ্জ্বল্যে মাত্রা নিয়ন্ত্রণ"
-
-#: src/main_window.cpp:1388
-msgid "Adjust whiteness"
-msgstr "শ্বত মাত্রা নিয়ন্ত্রণ"
-
-#: src/main_window.cpp:1410
+#: ../src/gui/main.cpp:1648
 msgid "Adjust color"
 msgstr "রংয়ের মাত্রা নিয়ন্ত্রণ"
 
-#: src/main_window.cpp:1432
+#: ../src/gui/main.cpp:1669
 msgid "Adjust contrast"
-msgstr "রংয়ের অসামন্জস্যতা নিয়ন্ত্রণ"
-
-#: src/main_window.cpp:1440
-msgid "Video"
-msgstr "ভিডিও"
-
-#: src/main_window.cpp:1516
-msgid "Audio"
-msgstr "অডিও"
-
-#: src/main_window.cpp:1566
-msgid "Prints debug messages in the console (level between 1 and 6)"
-msgstr "ডিবাগ বার্তা কনসোলে লিখে দেখাবে (মাত্রা ১ থেকে ৬ মধ্যে)"
-
-#: src/main_window.cpp:1569
-msgid "Makes GnomeMeeting call the given URL"
-msgstr "নির্দিষ্ট ইউ-আর-এলটি গুহ্‌নোমমিটিং কল করবে"
-
-#: src/main_window.cpp:1620
-#, fuzzy
-msgid "No usable audio manager detected"
-msgstr "ব্যবহারযোগ্য অডিও ডিভাইস পাওয়া যায়নি"
-
-#: src/main_window.cpp:1620
-msgid ""
-"GnomeMeeting didn't find any usable sound manager. Make sure that your "
-"installation is correct."
-msgstr ""
-
-#: src/main_window.cpp:1640
-#, fuzzy, c-format
-msgid ""
-"GnomeMeeting got an invalid value for the GConf key %s.\n"
-"\n"
-"It probably means that your GConf schemas have not been correctly installed "
-"or the that permissions are not correct.\n"
-"\n"
-"Please check the FAQ (http://www.gnomemeeting.org/faq.php), the "
-"throubleshoot section of the GConf site (http://www.gnome.org/projects/"
-"gconf/) or the mailing list archives for more information (http://mail.gnome."
-"org) about this problem."
-msgstr ""
-"গুহ্‌নোমমিটিং জী-কোনফ্‌ কী \"/apps/gnomemeeting/gconf_test_age\"-তে বেঠিক মান খুঁজে "
-"পেয়েছে\n"
-"\n"
-"এর সম্ভাব্য অর্থ হল যে হয় আপনার জী-কোনফ্‌ স্কীমাসমূহ সঠিক ভাবে ইনস্টল হয়নি অথবা এর "
-"আনুসাঙ্গিক অনুমতিসমূহ ঠিক নেই\n"
-"\n"
-"সমস্যা সমাধানের উদ্দেশ্যে এফ-এ-কিউ (http://www.gnomemeeting.org/faq.php), জী-"
-"কোনফ্‌ সাইটের (http://www.gnome.org/projects/gconf/) সমস্যা সমাধান সংক্রান্ত "
-"বিভাগ অথবা আরও তথ্যের জন্য মেইল লিস্ট আর্কাইভ (http://mail.gnome.org) পড়ে দেখুন।"
-
-#: src/main_window.cpp:1643
-msgid "Gconf key error"
-msgstr "জী-কোনফ্‌ কী ত্রুটি"
-
-#: src/menu.cpp:309
-msgid "C_all"
-msgstr "কল (_ল)"
-
-#: src/menu.cpp:311
-msgid "C_onnect"
-msgstr "সংযোগ (_য)"
-
-#: src/menu.cpp:311 src/menu.cpp:664
-msgid "Create a new connection"
-msgstr "নতুন সংযোগ স্থাপন করা"
-
-#: src/menu.cpp:314 src/menu.cpp:667
-msgid "_Disconnect"
-msgstr "সংযোগ বিচ্ছেদ (_ব)"
-
-#: src/menu.cpp:315 src/menu.cpp:668
-msgid "Close the current connection"
-msgstr "বর্তমান সংযোগটি বিচ্ছিন্ন করা"
-
-#: src/menu.cpp:321 src/menu.cpp:674
-msgid "_Available"
-msgstr ""
-
-#: src/menu.cpp:322 src/menu.cpp:675
-#, fuzzy
-msgid "Display a popup to accept the call"
-msgstr "নতুন কল এলে একটি পপ্‌-আপ উইন্ডো দেখানো হবে"
-
-#: src/menu.cpp:327 src/menu.cpp:680
-msgid "Free for Cha_t"
-msgstr ""
-
-#: src/menu.cpp:328 src/menu.cpp:681
-#, fuzzy
-msgid "Auto answer calls"
-msgstr "সব কলে স্বয়ংক্রিয় পদ্ধতিতে উত্তর দেওয়া"
-
-#: src/menu.cpp:333 src/menu.cpp:686
-msgid "_Busy"
-msgstr ""
-
-#: src/menu.cpp:333 src/menu.cpp:686
-#, fuzzy
-msgid "Reject calls"
-msgstr "আপনার পাওয়া কলগুলি"
-
-#: src/menu.cpp:338 src/menu.cpp:691
-#, fuzzy
-msgid "_Forward"
-msgstr "কল এগিয়ে দেওয়া হয়েছে"
+msgstr "বৈসাদৃশ্য নিয়ন্ত্রণ"
 
-#: src/menu.cpp:338 src/menu.cpp:691
-#, fuzzy
-msgid "Forward calls"
-msgstr "কল এগিয়ে দেওয়া:"
-
-#: src/menu.cpp:346
-#, fuzzy
-msgid "Speed dials"
-msgstr "দ্রুত ডায়েল"
-
-#: src/menu.cpp:350
-msgid "Hold the current call"
-msgstr "বর্তমান কলটিকে না কেটে সাময়িক ভাবে স্থগিত রাখা"
-
-#: src/menu.cpp:354
-msgid "Transfer the current call"
-msgstr "বর্তমান কলটিকে স্থানান্তর করা"
-
-#: src/menu.cpp:361
-msgid "Suspend or resume the audio transmission"
-msgstr "অডিও প্রেরণ সাময়িক ভাবে স্থগিত রাখা বা পুনরায় চালু করা"
-
-#: src/menu.cpp:366
-msgid "Suspend or resume the video transmission"
-msgstr "ভিডিও প্রেরণ সাময়িক ভাবে স্থগিত রাখা বা পুনরায় চালু করা"
-
-#: src/menu.cpp:373
-msgid "_Save Current Picture"
-msgstr "বর্তমান ছবি সংরক্ষন (_স)"
-
-#: src/menu.cpp:374
-msgid "Save a snapshot of the current video"
-msgstr "বর্তমান ভিডিওর ছবি তুলে রাখা"
-
-#: src/menu.cpp:380
-#, fuzzy
-msgid "Close the GnomeMeeting window"
-msgstr "গুহ্‌নোমমিটিং সম্বন্ধে (_স)"
-
-#: src/menu.cpp:387 src/menu.cpp:737
-msgid "_Quit"
-msgstr "প্রস্থান (_প)"
-
-#: src/menu.cpp:387 src/menu.cpp:737
-msgid "Quit GnomeMeeting"
-msgstr "গুহ্‌নোমমিটিং থেকে প্রস্থান"
-
-#: src/menu.cpp:391
-msgid "_Edit"
-msgstr "সম্পাদন (_ম)"
-
-#: src/menu.cpp:394 src/menu.cpp:400
-msgid "Configuration Druid"
-msgstr "কনফিগারেশন ড্রুইড"
-
-#: src/menu.cpp:395 src/menu.cpp:401
-msgid "Run the configuration druid"
-msgstr "কনফিগারেশন ড্রুইড চালানো হবে"
+#: ../src/gui/main.cpp:1715
+msgid "Audio Settings"
+msgstr "অডিও সংক্রান্ত বৈশিষ্ট্য"
 
-#: src/menu.cpp:408 src/menu.cpp:715
-msgid "_Preferences..."
-msgstr "পচ্ছন্দ... (_প)"
-
-#: src/menu.cpp:409 src/menu.cpp:716
-msgid "Change your preferences"
-msgstr "আপনার পচ্ছন্দসমূহের অদলবদল"
-
-#: src/menu.cpp:414
-msgid "_View"
-msgstr "দৃশ্য (_দ)"
-
-#: src/menu.cpp:416 src/pref_window.cpp:941
-msgid "Text Chat"
-msgstr "টেকস্ট আড্ডা"
-
-#: src/menu.cpp:417
-msgid "View/Hide the text chat window"
-msgstr "টেকস্ট আড্ডার উইন্ডো দেখানো/লুকোনো"
-
-#: src/menu.cpp:422
-msgid "Status Bar"
-msgstr "স্টেটাস বার"
-
-#: src/menu.cpp:423
-msgid "View/Hide the status bar"
-msgstr "স্টেটাস বার দেখানো/লুকোনো"
-
-#: src/menu.cpp:429
-msgid "Control Panel"
-msgstr "কন্ট্রোল প্যানেল"
-
-#: src/menu.cpp:432
-msgid "View audio/video transmission and reception statistics"
-msgstr "অডিও/ভিডিও প্রেরণ ও গ্রহণ সংক্রান্ত তথ্যাদি দেখানো হবে"
-
-#: src/menu.cpp:437
-msgid "_Dialpad"
-msgstr "ডায়েল প্যাড (_ড)"
-
-#: src/menu.cpp:437
-msgid "View the dialpad"
-msgstr "ডায়েল প্যাড দেখানো হবে"
-
-#: src/menu.cpp:442
-msgid "_Audio Settings"
-msgstr "অডিও মানসমূহ (_অ)"
-
-#: src/menu.cpp:443
-msgid "View audio settings"
-msgstr "অডিও মানসমূহ দেখানো হবে"
-
-#: src/menu.cpp:448
-msgid "_Video Settings"
-msgstr "ভিডিও মানসমূহ (_ভ)"
-
-#: src/menu.cpp:449
-msgid "View video settings"
-msgstr "ভিডিও মানসমূহ দেখানো হবে"
-
-#: src/menu.cpp:454 src/pref_window.cpp:1289
-msgid "Off"
-msgstr "বন্ধ"
-
-#: src/menu.cpp:454
-msgid "Hide the control panel"
-msgstr "কন্ট্রোল প্যানেল লুকিয়ে ফেলা হবে"
-
-#: src/menu.cpp:462
-msgid "_Clear text chat"
-msgstr "টেকস্ট আড্ডা মোছা (_ম)"
-
-#: src/menu.cpp:463
-msgid "Clear the text chat"
-msgstr "টেকস্ট আড্ডা মুছে ফেলা হোক"
-
-#: src/menu.cpp:471 src/menu.cpp:587
-msgid "Local video image"
-msgstr "স্থানীয় ভিডিও ছবি"
-
-#: src/menu.cpp:477 src/menu.cpp:593
-msgid "Remote video image"
-msgstr "দূরবর্তী ভিডিও ছবি"
-
-#: src/menu.cpp:482 src/menu.cpp:598
-msgid "Both (Local Video Incrusted)"
-msgstr "দুটিই (স্থানীয় ভিডিও ইনক্রাস্টেড)"
-
-#: src/menu.cpp:483 src/menu.cpp:490 src/menu.cpp:497 src/menu.cpp:599
-#: src/menu.cpp:606 src/menu.cpp:613
-msgid "Both video images"
-msgstr "দুটি ভিডিও-র ক্ষেত্রেই"
-
-#: src/menu.cpp:489 src/menu.cpp:605
-msgid "Both (Local Video in New Window)"
-msgstr "দুটিই (স্থানীয় ভিডিও নতুন উইন্ডোতে)"
-
-#: src/menu.cpp:496 src/menu.cpp:612
-msgid "Both (Both in New Windows)"
-msgstr "দুটিই (দুটিই নতুন উইন্ডোতে)"
-
-#: src/menu.cpp:505 src/menu.cpp:621
-msgid "Zoom In"
-msgstr "বড় করে দেখানো"
-
-#: src/menu.cpp:505 src/menu.cpp:621
-msgid "Zoom in"
-msgstr "বড় করে দেখানো হবে"
-
-#: src/menu.cpp:509 src/menu.cpp:625
-msgid "Zoom Out"
-msgstr "ছোট করে দেখানো"
-
-#: src/menu.cpp:509 src/menu.cpp:625
-msgid "Zoom out"
-msgstr "ছোট করে দেখানো হবে"
-
-#: src/menu.cpp:513 src/menu.cpp:629
-msgid "Normal Size"
-msgstr "সাধারণ আকার"
-
-#: src/menu.cpp:513 src/menu.cpp:629
-msgid "Normal size"
-msgstr "সাধারণ আকারে দেখানো হবে"
-
-#: src/menu.cpp:518 src/menu.cpp:634
-msgid "Fullscreen"
-msgstr "পুরো স্ক্রীন জুড়ে"
-
-#: src/menu.cpp:523
-msgid "_Tools"
-msgstr "যন্ত্রপাতি (_য)"
-
-#: src/menu.cpp:525 src/menu.cpp:699
-msgid "Address _Book"
-msgstr "ঠিকানার খাতা (_খ)"
-
-#: src/menu.cpp:526 src/menu.cpp:700
-msgid "Open the address book"
-msgstr "ঠিকানার খাতা খোলা হবে"
-
-#: src/menu.cpp:533 src/tools.cpp:431
-msgid "General History"
-msgstr "সাধারণ ইতিহাস"
-
-#: src/menu.cpp:534
-msgid "View the operations history"
-msgstr "অপারেশনসমূহের ইতিহাস দেখানো হবে"
-
-#: src/menu.cpp:538 src/menu.cpp:707 src/tools.cpp:279
-msgid "Calls History"
-msgstr "কলের ইতিহাস"
-
-#: src/menu.cpp:539 src/menu.cpp:708
-msgid "View the calls history"
-msgstr "কলের ইতিহাস দেখানো হবে"
-
-#: src/menu.cpp:544
-msgid "Consult MicroTelco Account"
-msgstr "মাইক্রোটেলকো অ্যাকাউন্ট সংক্রান্ত"
-
-#: src/menu.cpp:545
-msgid "View the details of your account"
-msgstr "আপনার অ্যাকাউন্ট সংক্রান্ত তথ্যাদি দেখানো হবে"
+#: ../src/gui/main.cpp:2326
+msgid "_Retrieve Call"
+msgstr "কল পুনরুদ্ধার করুন (_R)"
 
-#: src/menu.cpp:549
-msgid "_Help"
-msgstr "সাহায্য (_স)"
+#: ../src/gui/main.cpp:2339
+msgid "_Hold Call"
+msgstr "কল ধরে থাকুন (_H)"
 
-#: src/menu.cpp:552 src/menu.cpp:558 src/menu.cpp:724 src/menu.cpp:730
-msgid "_About GnomeMeeting"
-msgstr "গুহ্‌নোমমিটিং সম্বন্ধে (_স)"
+#: ../src/gui/main.cpp:2371 ../src/gui/main.cpp:3159
+msgid "Suspend _Audio"
+msgstr "অডিও মুলতুবি করুন (_A)"
 
-#: src/menu.cpp:553 src/menu.cpp:559 src/menu.cpp:725 src/menu.cpp:731
-msgid "View information about GnomeMeeting"
-msgstr "গুহ্‌নোমমিটিং সম্বন্ধে আরও খোঁজখবর"
+#: ../src/gui/main.cpp:2373 ../src/gui/main.cpp:3164
+msgid "Suspend _Video"
+msgstr "ভিডিও মুলতুবি করুন (_V)"
 
-#: src/menu.cpp:664
-msgid "_Connect"
-msgstr "সংযোগ (_স)"
+#: ../src/gui/main.cpp:2375
+msgid "Resume _Audio"
+msgstr "অডিও পুনরায় আরম্ভ করা হবে (_A)"
 
-#: src/misc.cpp:190
-#, fuzzy
-msgid "Generic error"
-msgstr "জী-কোনফ্‌ কী ত্রুটি"
+#: ../src/gui/main.cpp:2377
+msgid "Resume _Video"
+msgstr "ভিডিও পুনরায় আরম্ভ করা হবে (_V)"
 
-#: src/misc.cpp:238
+#: ../src/gui/main.cpp:2660 ../src/gui/main.cpp:2812
 msgid "Reject"
 msgstr "বাতিল"
 
-#: src/misc.cpp:240
+#: ../src/gui/main.cpp:2662 ../src/gui/main.cpp:2811
 msgid "Accept"
 msgstr "গৃহিত"
 
-#: src/misc.cpp:247
-#, fuzzy
+#: ../src/gui/main.cpp:2668 ../src/gui/main.cpp:2799
 msgid "Incoming call from"
-msgstr "কল আসছে"
+msgstr "কলের উৎসস্থল"
 
-#: src/misc.cpp:260
-#, fuzzy
-msgid "Remote URL:"
-msgstr "দূরবর্তী ব্যবহারকারী"
+#: ../src/gui/main.cpp:2686 ../src/gui/main.cpp:2802
+msgid "Remote URI:"
+msgstr "দূরবর্তী URI:"
 
-#: src/misc.cpp:272
+#: ../src/gui/main.cpp:2698 ../src/gui/main.cpp:2804
 msgid "Remote Application:"
-msgstr ""
-
-#: src/pref_window.cpp:362
-#, fuzzy
-msgid "Codec Information"
-msgstr "ভুল তথ্য"
-
-#: src/pref_window.cpp:400
-msgid "Please choose the video image"
-msgstr "ভিডিওর জন্য ছবি বেছে নিন"
-
-#: src/pref_window.cpp:701
-#, fuzzy
-msgid "Play sound on incoming calls"
-msgstr "কল এলে শব্দ করে জানাও"
-
-#: src/pref_window.cpp:710
-#, fuzzy
-msgid "Play ring tone"
-msgstr "বাজানোয়ে ব্যবহৃত মিক্সার:"
-
-#: src/pref_window.cpp:719
-msgid "Play busy tone"
-msgstr ""
-
-#: src/pref_window.cpp:862
-msgid "Personal Information"
-msgstr "ব্যক্তিগত তথ্যাদি"
-
-#: src/pref_window.cpp:866
-msgid "_First name:"
-msgstr "নাম (_ন):"
-
-#: src/pref_window.cpp:873
-msgid "Sur_name:"
-msgstr "পদবী (_দ):"
-
-#: src/pref_window.cpp:875
-#, fuzzy
-msgid "Enter your surname."
-msgstr "আপনার পদবী লিখুন"
-
-#: src/pref_window.cpp:880
-msgid "E-_mail address:"
-msgstr "ই-মেইল ঠিকানা (_ম):"
-
-#: src/pref_window.cpp:887
-msgid "_Comment:"
-msgstr "মন্তব্য (_ম):"
-
-#: src/pref_window.cpp:889
-#, fuzzy
-msgid "Enter a comment about yourself."
-msgstr "ইউজার ডিরেক্টরিতে আপনার নিজের সম্বন্ধে মন্তব্য যোগ করুন"
-
-#: src/pref_window.cpp:894
-msgid "_Location:"
-msgstr "অবস্থান (_অ):"
-
-#: src/pref_window.cpp:896
-#, fuzzy
-msgid "Enter your country or city."
-msgstr "ইউজার ডিরেক্টরির জন্য আপনার অবস্থান (দেশ বা শহর) লিখুন"
-
-#. Add the update button
-#: src/pref_window.cpp:902 src/pref_window.cpp:1248
-msgid "_Apply"
-msgstr "প্রয়োগ কর (_প)"
-
-#: src/pref_window.cpp:902
-msgid ""
-"Click here to update the user directory you are registered to with the new "
-"First Name, Last Name, E-Mail, Comment and Location or to update your alias "
-"on the Gatekeeper."
-msgstr ""
-"আপনার নথিভুক্তিকৃত ইউজার ডিরেক্টরিতে নতুন নাম, পদবী, ই-মেইল, মন্তব্য এবং অবস্থান "
-"নবায়ণের উদ্দেশ্যে অথবা গেটকিপারে আপনার পরিচিতি নবায়ণের উদ্দেশ্যে এখানে ক্লিক করুন  "
-
-#: src/pref_window.cpp:920
-msgid "GnomeMeeting GUI"
-msgstr "গুহ্‌নোমমিটিং জি-ইউ-আই"
-
-#: src/pref_window.cpp:922
-msgid "_Show splash screen"
-msgstr "স্প্ল্যাস স্ক্রীন দেখাও (_দ)"
-
-#: src/pref_window.cpp:924
-msgid "Start _hidden"
-msgstr "লুকিয়ে শুরু (_ল)"
-
-#: src/pref_window.cpp:929
-msgid "Video Display"
-msgstr "ভিডিও প্রদর্শন"
-
-#. Translators: the full sentence is Use a fullscreen size
-#. of X by Y pixels
-#: src/pref_window.cpp:934
-msgid "Use a fullscreen size of"
-msgstr "পুরো স্ক্রীনের আয়তন হোক"
-
-#: src/pref_window.cpp:934
-msgid "by"
-msgstr "বাই"
-
-#: src/pref_window.cpp:934
-msgid "pixels"
-msgstr "পিক্সেল"
-
-#: src/pref_window.cpp:937
-msgid "Place windows displaying video _above other windows"
-msgstr ""
-
-#: src/pref_window.cpp:961
-msgid "User Directory"
-msgstr "ইউজার ডিরেক্টরি"
-
-#. Add all the fields
-#: src/pref_window.cpp:965
-msgid "User directory:"
-msgstr "ইউজার ডিরেক্টরি:"
-
-#: src/pref_window.cpp:967
-msgid "Enable _registering"
-msgstr "নথিভুক্তিকরণ সক্রিয় (_ন)"
-
-#: src/pref_window.cpp:969
-#, fuzzy
-msgid "_Publish my details in the users directory when registering"
-msgstr "ইউজার ডিরেক্টরিতে আমার বিবরণ প্রকাশ কর (_প)"
-
-#: src/pref_window.cpp:986 src/pref_window.cpp:1720
-msgid "Call Forwarding"
-msgstr "কল এগিয়ে দেওয়া"
-
-#: src/pref_window.cpp:991
-msgid "Forward calls to _host:"
-msgstr "কল হোস্টে এগিয়ে দেওয়া হবে (_হ):"
-
-#: src/pref_window.cpp:996
-msgid "_Always forward calls to the given host"
-msgstr "সব সময়ই কল নির্দিষ্ট হোস্টে এগিয়ে দেওয়া হবে (_স)"
-
-#: src/pref_window.cpp:996
-#, fuzzy
-msgid ""
-"If enabled, all incoming calls will be forwarded to the host that is "
-"specified in the field above."
-msgstr "এটি সক্রিয় হলে সমস্ত কলগুলি নিম্নোক্ত হোস্টটিতে পাঠিয়ে দেওয়া হবে "
-
-#: src/pref_window.cpp:998
-msgid "Forward calls to the given host if _no answer"
-msgstr "উত্তর না পেলে নির্দিষ্ট হোস্টে কল এগিয়ে দেওয়া হবে (_ন)"
-
-#: src/pref_window.cpp:998
-#, fuzzy
-msgid ""
-"If enabled, all incoming calls will be forwarded to the host that is "
-"specified in the field above if you do not answer the call."
-msgstr ""
-"এটি সক্রিয় হলে যে সমস্ত কলগুলির আপনি উত্তর দেবেন না তা সবই নিম্নোক্ত হোস্টটিতে "
-"পাঠিয়ে দেওয়া হবে"
-
-#: src/pref_window.cpp:1000
-msgid "Forward calls to the given host if _busy"
-msgstr "ব্যস্ত থাকলে নির্দিষ্ট হোস্টে কল এগিয়ে দেওয়া হবে (_ব)"
-
-#: src/pref_window.cpp:1000
-#, fuzzy
-msgid ""
-"If enabled, all incoming calls will be forwarded to the host that is "
-"specified in the field above if you already are in a call or if you are in "
-"Do Not Disturb mode."
-msgstr ""
-"এটি সক্রিয় হলে আপনি কোন কলে ব্যস্ত বা 'বিরক্ত করো না' থাকা অবস্থায়ে আসা সমস্ত কলই "
-"নিম্নোক্ত হোস্টে পাঠিয়ে দেওয়া হবে "
-
-#: src/pref_window.cpp:1019
-#, fuzzy
-msgid "Calls Clearing"
-msgstr "কল এগিয়ে দেওয়া"
-
-#. Add all the fields
-#: src/pref_window.cpp:1023
-#, fuzzy
-msgid "Automatically _clear calls after 30 seconds of inactivity"
-msgstr "কলের শেষে টেকস্ট চ্যাট নিজের থেকে মুছে ফেলা হবে"
-
-#: src/pref_window.cpp:1055
-#, fuzzy
-msgid "GnomeMeeting Sound Events"
-msgstr "গুহ্‌নোমমিটিং মানসমূহ"
-
-#: src/pref_window.cpp:1104 src/pref_window.cpp:1113 src/pref_window.cpp:1122
-msgid "Event"
-msgstr ""
-
-#: src/pref_window.cpp:1133
-#, fuzzy
-msgid "Sound to play:"
-msgstr "অডিও বাজানোর ব্যবস্থা:"
-
-#: src/pref_window.cpp:1146
-msgid "Play"
-msgstr ""
-
-#: src/pref_window.cpp:1180
-msgid "All"
-msgstr "সব"
-
-#: src/pref_window.cpp:1182
-msgid "rfc2833"
-msgstr "আর-এফ-সি ২৮৩৩"
-
-#: src/pref_window.cpp:1183
-msgid "Signal"
-msgstr "সিগনাল"
-
-#: src/pref_window.cpp:1184
-msgid "String"
-msgstr "স্ট্রিং"
-
-#: src/pref_window.cpp:1193
-msgid "H.323 Version 2 Settings"
-msgstr "এইচ.৩২৩ ২য় সংস্করণের মানসমূহ"
-
-#. The toggles
-#: src/pref_window.cpp:1196
-#, fuzzy
-msgid "Enable H.245 _tunneling"
-msgstr "এইচ.২৪৫ টানেলিং সক্রিয় (_ট)"
-
-#: src/pref_window.cpp:1196
-#, fuzzy
-msgid ""
-"This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
-"are encapsulated into the the H.225 channel (port 1720). This saves one TCP "
-"connection during calls. H.245 Tunneling was introduced in H.323v2 and "
-"Netmeeting does not support it. Using both Fast Start and H.245 Tunneling "
-"can crash some versions of Netmeeting."
-msgstr ""
-"এটি এইচ.২৪৫ টানেলিং সক্রিয় করে।  এই অবস্থায় এইচ.২৪৫ বার্তাসমূহ এইচ.২২৫ চ্যানেলের "
-"(পোর্ট ১৭২০) মধ্যে এনক্যাপসুলেট করে পাঠানো হবে।  এতে কল চলাকালীন একটি টি-সি-পি "
-"সংযোগ কম লাগে।  এইচ.২৪৫ টানেলিং এইচ.৩২৩v২ থেকে বর্তমান, তবে নেটমিটিং-য়ে এর "
-"সমর্থন নেই।  একই সঙ্গে জলদি শুরু ও এইচ.২৪৫ টানেলিং-র ব্যবহ্বার নেটমিটিং-য়ের কয়েকটি "
-"সংস্করণকে ক্রাশ করায়"
-
-#: src/pref_window.cpp:1198
-msgid "Enable _early H.245"
-msgstr ""
-
-#: src/pref_window.cpp:1200
-msgid "Enable fast _start procedure"
-msgstr "জলদি শুরু পদ্ধতি সক্রিয় (_শ)"
-
-#: src/pref_window.cpp:1200
-#, fuzzy
-msgid ""
-"Connection will be established in Fast Start mode. Fast Start is a new way "
-"to start calls faster that was introduced in H.323v2. It is not supported by "
-"Netmeeting and using both Fast Start and H.245 Tunneling can crash some "
-"versions of Netmeeting."
-msgstr ""
-"জলদি শুরু পদ্ধতিতে সংযোগ স্থাপিত হবে। জলদি শুরু পদ্ধতিতে আরও কম সময়ে কল সংযোগ স্থাপন "
-"করা সম্ভব।  এই পদ্ধতিটি এইচ.৩২৩-র ২য় সংস্করণে যোগ করা হয়েছে। এটি নেটমিটিংর "
-"দ্বারা সর্মথিত নয় এবং একই সঙ্গে জলদি শুরু ও এইচ.২৪৫ টানেলিংর ব্যবহার নেটমিটিংর বেশ "
-"কিছু সংস্করণকে ক্রাশ করাতে পারে"
-
-#: src/pref_window.cpp:1206
-#, fuzzy
-msgid "DTMF Sending"
-msgstr "%s প্রেরণ ঘটছে"
-
-#: src/pref_window.cpp:1208
-msgid "_Send DTMF as:"
-msgstr ""
-
-#: src/pref_window.cpp:1208
-msgid ""
-"This permits to set the mode for User Input Capabilities. The values can be "
-"\"All\", \"None\", \"rfc2833\", \"Signal\" or \"String\" (default is \"All"
-"\"). Choosing other values than \"All\", \"String\" or \"rfc2833\" disables "
-"the Text Chat."
-msgstr ""
-"এটি ব্যবহারকারী ইনপুট পদ্ধতিসমূহের ধরন নির্ধারণ করতে সাহায্য করে।  মূল্যমানগুলি হল "
-"\"সব\", \"কোন তাই নয়\", \"আর-এফ-সি ২৮৩৩\", \"সিগনাল\" বা \"স্ট্রিং\" (ডিফল্ট "
-"মান \"সব\")।  \"সব\", \"স্ট্রিং\" বা \"আর-এফ-সি ২৮৩৩\" ছাড়া অন্য মূল্যমানের "
-"ব্যবহার টেকস্ট আড্ডাকে নিস্ক্রিয় করে দেয়"
-
-#: src/pref_window.cpp:1223
-msgid "Do not register"
-msgstr "নথিভুক্ত কর না"
-
-#: src/pref_window.cpp:1226
-msgid "Automatically discover"
-msgstr "স্বয়ংক্রিয় ভাবে আবিষ্কৃত হবে"
-
-#: src/pref_window.cpp:1232
-msgid "Gatekeeper"
-msgstr "গেটকিপার"
-
-#: src/pref_window.cpp:1234
-msgid "Gatekeeper _ID:"
-msgstr "গেটকিপার পরিচিতি (_প):"
-
-#: src/pref_window.cpp:1236
-msgid "Gatekeeper _host:"
-msgstr "গেটকিপার হোস্ট (_হ):"
-
-#: src/pref_window.cpp:1238
-msgid "Gatekeeper _alias:"
-msgstr "গেটকিপার ডাকনাম (_ড):"
+msgstr "দূরবর্তী অ্যাপ্লিকেশন:"
 
-#: src/pref_window.cpp:1241
-msgid "Gatekeeper _password:"
-msgstr "গেটকিপার পাসওয়ার্ড (_প):"
-
-#: src/pref_window.cpp:1244
-msgid "Register this alias as the primary alias with the gatekeeper"
-msgstr ""
-
-#: src/pref_window.cpp:1246
-msgid "Registering method:"
-msgstr "নথিভুক্তিকরণের পদ্ধতি:"
-
-#: src/pref_window.cpp:1248
-msgid "Click here to update your Gatekeeper settings."
-msgstr "আপনার গেটকিপার মান নবায়ণের উদ্দেশ্যে এখানে ক্লিক করুন"
-
-#: src/pref_window.cpp:1266
-msgid "NAT/PAT Router Support"
-msgstr "ন্যাট/প্যাট রাউটর সমর্থন"
-
-#: src/pref_window.cpp:1268
-msgid "Enable IP _translation"
-msgstr "আই-পি ট্রান্সলেশন সক্রিয় (_ট)"
-
-#: src/pref_window.cpp:1270
-msgid "Public _IP of the NAT/PAT router:"
-msgstr "ন্যাট/প্যাট রাউটরের পাব্লিক আই-পি (_আ):"
-
-#: src/pref_window.cpp:1290
-msgid "Low"
-msgstr "নিচু"
+#: ../src/gui/main.cpp:2719
+#, c-format
+msgid "Call from %s"
+msgstr "%s থেকে প্রাপ্ত কল"
 
-#: src/pref_window.cpp:1291
-msgid "Medium"
-msgstr "মধ্যম"
+#: ../src/gui/main.cpp:2925
+#, c-format
+msgid "Call Duration: %s\n"
+msgstr "কলের অবকাল: %s\n"
 
-#: src/pref_window.cpp:1292
-msgid "High"
-msgstr "উচুঁ"
+#: ../src/gui/main.cpp:2956
+msgid "Transfer call to:"
+msgstr "উদ্দিষ্ট স্থানে কল বদলি করা হবে:"
 
-#: src/pref_window.cpp:1293
-msgid "AGC"
-msgstr "এ-জি-সি"
+#: ../src/gui/main.cpp:3008
+msgid "No"
+msgstr "না"
 
-#: src/pref_window.cpp:1296
-msgid "POTS"
-msgstr ""
+#: ../src/gui/main.cpp:3010
+msgid "Yes"
+msgstr "হ্যাঁ"
 
-#: src/pref_window.cpp:1297
-msgid "headset"
-msgstr ""
+#: ../src/gui/main.cpp:3021
+msgid "Detected new audio input device:"
+msgstr "নতুন অডিও ইনপুট ডিভাইস সনাক্ত হয়েছে:"
 
-#: src/pref_window.cpp:1306
-msgid "Audio Plugin"
-msgstr ""
+#: ../src/gui/main.cpp:3025
+msgid "Detected new audio output device:"
+msgstr "নতুন অডিও আউটপুট ডিভাইস সনাক্ত হয়েছে:"
 
-#: src/pref_window.cpp:1310
-#, fuzzy
-msgid "Audio plugin:"
-msgstr "অডিও বাজানোর ব্যবস্থা:"
+#: ../src/gui/main.cpp:3029
+msgid "Detected new video input device:"
+msgstr "নতুন ভিডিও ইনপুট ডিভাইস সনাক্ত হয়েছে:"
 
-#: src/pref_window.cpp:1316 src/pref_window.cpp:1744
-msgid "Audio Devices"
-msgstr "অডিও ডিভাইস"
+#: ../src/gui/main.cpp:3030 ../src/gui/preferences.cpp:921
+msgid "Video Devices"
+msgstr "ভিডিও ডিভাইস"
 
-#: src/pref_window.cpp:1322
-#, fuzzy
-msgid "Output device:"
-msgstr "ডিভাইস অনুসন্ধান (_অ)"
+#: ../src/gui/main.cpp:3048
+msgid "Do you want to use it as default device?"
+msgstr "এটি কি ডিফল্ট ডিভাইস রূপে নির্ধারণ করতে ইচ্ছুক?"
 
-#: src/pref_window.cpp:1328 src/pref_window.cpp:1399
-#, fuzzy
-msgid "Input device:"
-msgstr "বাজানোয়ে ব্যবহৃত ডিভাইস:"
+#: ../src/gui/main.cpp:3116
+msgid "_Chat"
+msgstr "আড্ডা (_C)"
 
-#: src/pref_window.cpp:1334
-#, fuzzy
-msgid "Quicknet Hardware"
-msgstr "কুইকনেট ডিভাইস"
+#: ../src/gui/main.cpp:3118
+msgid "Ca_ll"
+msgstr "কল করুন (_l)"
 
-#: src/pref_window.cpp:1336
-msgid "Echo _cancellation:"
-msgstr "ইকো বাতিল করা:"
+#: ../src/gui/main.cpp:3118
+msgid "Place a new call"
+msgstr "নতুন কল আরম্ভ করুন"
 
-#: src/pref_window.cpp:1338
-msgid "Output device type:"
-msgstr ""
+#: ../src/gui/main.cpp:3121
+msgid "_Hang up"
+msgstr "কেটে দিন (_H)"
 
-#: src/pref_window.cpp:1341
-msgid "Country _code:"
-msgstr "কান্ট্রি কোড (_ক):"
+#: ../src/gui/main.cpp:3122
+msgid "Terminate the current call"
+msgstr "বর্তমান কল কেটি দিন"
 
-#. That button will refresh the devices list
-#: src/pref_window.cpp:1348 src/pref_window.cpp:1424
-msgid "_Detect devices"
-msgstr "ডিভাইস অনুসন্ধান (_অ)"
+#: ../src/gui/main.cpp:3128
+msgid "A_dd Contact"
+msgstr "পরিচিত যোগ করুন (_d)"
 
-#: src/pref_window.cpp:1348 src/pref_window.cpp:1424
-msgid "Click here to refresh the devices list."
-msgstr "ডিভাইস তালিকা পুনঃপ্রদর্শন করতে এখানে ক্লিক করুন"
+#: ../src/gui/main.cpp:3128
+msgid "Add a contact to the roster"
+msgstr "পরিচিতি তালিকায় পরিচিতি যোগ করুন"
 
-#: src/pref_window.cpp:1369
-msgid "Small"
-msgstr "ছোট"
+#: ../src/gui/main.cpp:3133
+msgid "Find contacts"
+msgstr "পরিচিতি অনুসন্ধান করুন"
 
-#: src/pref_window.cpp:1370
-msgid "Large"
-msgstr "বড়"
+#: ../src/gui/main.cpp:3140
+#, fuzzy
+msgid "_Contact"
+msgstr "পরিচিতি (_C)"
 
-#: src/pref_window.cpp:1372
-msgid "PAL (Europe)"
-msgstr "প্যাল (ইউরোপ)"
+#: ../src/gui/main.cpp:3141
+msgid "Act on selected contact"
+msgstr "নির্বাচিত পরিচিতির ক্ষেত্রে"
 
-#: src/pref_window.cpp:1373
-msgid "NTSC (America)"
-msgstr "এন-টি-এস-সি (আমেরিকা)"
+#: ../src/gui/main.cpp:3147
+msgid "H_old Call"
+msgstr "কল ধরে থাকুন (_o)"
 
-#: src/pref_window.cpp:1374
-msgid "SECAM (France)"
-msgstr "সেক্যাম (ফ্রান্স)"
+#: ../src/gui/main.cpp:3147 ../src/gui/main.cpp:3616
+msgid "Hold the current call"
+msgstr "বর্তমান কলটি ধরে রাখুন"
 
-#: src/pref_window.cpp:1375
-msgid "Auto"
-msgstr "স্বয়ংক্রিয়"
+#: ../src/gui/main.cpp:3151
+msgid "_Transfer Call"
+msgstr "কল স্থানান্তর করুন (_T)"
 
-#: src/pref_window.cpp:1385
-#, fuzzy
-msgid "Video Plugin"
-msgstr "ভিডিও প্রাকদর্শন"
+#: ../src/gui/main.cpp:3152
+msgid "Transfer the current call"
+msgstr "বর্তমান কলটিকে স্থানান্তর করা"
 
-#: src/pref_window.cpp:1388
-#, fuzzy
-msgid "Video plugin:"
-msgstr "ভিডিও-র আয়তন:"
+#: ../src/gui/main.cpp:3160
+msgid "Suspend or resume the audio transmission"
+msgstr "অডিও প্রেরণ সাময়িক ভাবে স্থগিত রাখা বা পুনরায় চালু করা"
 
-#: src/pref_window.cpp:1394 src/pref_window.cpp:1748
-msgid "Video Devices"
-msgstr "ভিডিও ডিভাইস"
+#: ../src/gui/main.cpp:3165
+msgid "Suspend or resume the video transmission"
+msgstr "ভিডিও প্রেরণ সাময়িক ভাবে স্থগিত রাখা বা পুনরায় চালু করা"
 
-#: src/pref_window.cpp:1399
-msgid ""
-"Select the video device to use. Using an invalid video device or \"Picture\" "
-"for video transmission will transmit a test picture."
-msgstr ""
-"ব্যবহৃত ভিডিও ডিভাইস বাছাই করা।  বেঠিক ভিডিও ডিভাইস বা \"ছবি\" ব্যবহার করলে "
-"ভিডিও প্ররণের জন্য একটি পরীক্ষামূলক ছবি ব্যবহার করা হবে"
+#: ../src/gui/main.cpp:3172
+msgid "Close the Ekiga window"
+msgstr "Ekiga উইন্ডো বন্ধ করুন"
+
+#: ../src/gui/main.cpp:3179 ../src/gui/statusicon.cpp:414
+msgid "Quit"
+msgstr "প্রস্থান"
+
+#: ../src/gui/main.cpp:3185
+msgid "_Configuration Assistant"
+msgstr "কনফিগারেশনের সহায়ক ব্যবস্থা (_C)"
+
+#: ../src/gui/main.cpp:3186
+msgid "Run the configuration assistant"
+msgstr "কনফিগারেশনের সহায়ক ব্যবস্থা সঞ্চালন করা হবে"
+
+#: ../src/gui/main.cpp:3194
+msgid "Edit your accounts"
+msgstr "অ্যাকাউন্টের তথ্য সম্পাদনা করুন"
 
-#. Video Channel
-#: src/pref_window.cpp:1403
-#, fuzzy
-msgid "Channel:"
-msgstr "ভিডিও চ্যানেল:"
+#: ../src/gui/main.cpp:3200
+msgid "Change your preferences"
+msgstr "আপনার পছন্দসমূহের অদলবদল"
 
-#: src/pref_window.cpp:1405
-msgid "Size:"
-msgstr ""
+#: ../src/gui/main.cpp:3205
+msgid "_View"
+msgstr "প্রদর্শন (_V)"
 
-#: src/pref_window.cpp:1407
-#, fuzzy
-msgid "Format:"
-msgstr "রং-এর ধরণ"
+#: ../src/gui/main.cpp:3207
+msgid "Con_tacts"
+msgstr "পরিচিতি তালিকা (_t)"
 
-#: src/pref_window.cpp:1410
-msgid "Image:"
-msgstr ""
+#: ../src/gui/main.cpp:3207
+msgid "View the contacts list"
+msgstr "পরিচিতদের তালিকা প্রদর্শন করা হবে"
 
-#: src/pref_window.cpp:1464
-msgid "Available Audio Codecs"
-msgstr "উপস্থিত অডিও কোডেকসমূহ"
+#: ../src/gui/main.cpp:3212
+msgid "_Dialpad"
+msgstr "ডায়েল প্যাড (_D)"
 
-#: src/pref_window.cpp:1521
-msgid "Info"
-msgstr "তথ্য"
+#: ../src/gui/main.cpp:3212
+msgid "View the dialpad"
+msgstr "ডায়েল প্যাড দেখানো হবে"
 
-#: src/pref_window.cpp:1533
-msgid "Bandwidth"
-msgstr "ব্যান্ডহুইডত্‌"
+#: ../src/gui/main.cpp:3217
+msgid "_Call History"
+msgstr "কল সংক্রান্ত পূর্ববর্তী তথ্য (_C)"
+
+#: ../src/gui/main.cpp:3217
+msgid "View the call history"
+msgstr "কল সংক্রান্ত পূর্ববর্তী তথ্য প্রদর্শন করা হবে"
+
+#: ../src/gui/main.cpp:3225
+msgid "_Show Call Panel"
+msgstr "কল প্যানেল প্রদর্শন করা হবে (_S)"
+
+#: ../src/gui/main.cpp:3233
+msgid "_Local Video"
+msgstr "স্থানীয় ভিডিও (_L)"
 
-#: src/pref_window.cpp:1585
-msgid "Audio Codecs Settings"
-msgstr "অডিও কোডেকের মান"
+#: ../src/gui/main.cpp:3234
+msgid "Local video image"
+msgstr "স্থানীয় ভিডিও ছবি"
 
-#. Translators: the full sentence is Automatically adjust jitter buffer
-#. between X and Y ms
-#: src/pref_window.cpp:1589
-msgid "Automatically adjust _jitter buffer between"
-msgstr "জিটার বাফার স্বয়ংক্রিয় পদ্ধতিতে নির্ধারিত হোক"
-
-#: src/pref_window.cpp:1589
-msgid "and"
-msgstr "এবং"
-
-#: src/pref_window.cpp:1589
-msgid "ms"
-msgstr "মি-সেক-এর মধ্যে"
+#: ../src/gui/main.cpp:3239
+msgid "_Remote Video"
+msgstr "দূরবর্তী ভিডিও (_R)"
 
-#: src/pref_window.cpp:1591
-msgid "Enable silence _detection"
-msgstr "নৈশব্দ সন্ধান সক্রিয় (_স)"
+#: ../src/gui/main.cpp:3240
+msgid "Remote video image"
+msgstr "দূরবর্তী ভিডিও ছবি"
 
-#: src/pref_window.cpp:1609 src/pref_window.cpp:1696
-msgid "General Settings"
-msgstr "সাধারণ মানসমূহ"
+#: ../src/gui/main.cpp:3245
+msgid "_Picture-in-Picture"
+msgstr "ছবির-মধ্যে-ছবি (_P)"
 
-#. Add fields
-#: src/pref_window.cpp:1613
-msgid "Enable video _transmission"
-msgstr "ভিডিও প্রেরণ সক্রিয় (_প)"
-
-#: src/pref_window.cpp:1615
-msgid "Enable video _reception"
-msgstr "ভিডিও গ্রহণ সক্রিয় (_গ)"
-
-#: src/pref_window.cpp:1620
-msgid "Bandwidth Control"
-msgstr "ব্যান্ডহুইডত্‌ নিয়ন্ত্রণ"
-
-#. Translators: the full sentence is Maximum video bandwidth of X KB/s
-#: src/pref_window.cpp:1623
-msgid "Maximum video _bandwidth of"
-msgstr "সর্বোচ্চ ভিডিও ব্যান্ডহুইডত্‌ (_ভ)"
-
-#: src/pref_window.cpp:1623
-msgid "KB/s"
-msgstr "কে-বি/সেক"
+#: ../src/gui/main.cpp:3246 ../src/gui/main.cpp:3252
+msgid "Both video images"
+msgstr "দুটি ভিডিও-এর ক্ষেত্রেই"
 
-#: src/pref_window.cpp:1629
-msgid "Advanced Quality Settings"
-msgstr "জটিলতর মানসমূহ"
+#: ../src/gui/main.cpp:3251
+msgid "Picture-in-Picture in Separate _Window"
+msgstr "পৃথক উইন্ডোর মধ্যে প্রদর্শিত ছবির-মধ্যে-ছবি (_W)"
 
-#. Translators: the full sentence is Keep a minimum video quality of X %
-#: src/pref_window.cpp:1632
-msgid "Keep a minimum video _quality of"
-msgstr "বজায় রাখা ন্যুনতম ভিডিও-র মান হোক"
-
-#: src/pref_window.cpp:1632
-msgid ""
-"The minimum transmitted video quality to keep when trying to minimize the "
-"used bandwidth:  choose 100% on a LAN for the best quality, 1% being the "
-"worst quality."
-msgstr ""
-"ব্যান্ডহুইডত্‌-র ন্যুনতম ব্যবহার চাইলে প্রেরিত ভিডিও-র ন্যুনতম মান এভাবে ঠিক করা হোক:  "
-"ল্যানের ক্ষেত্রে সর্বশ্রেষ্ঠ মানের জন্য ১০০% নির্বাচন করুন, সর্বনিকৃষ্ট মানের জন্যে ১% "
-"ব্যবহার করুন"
-
-#: src/pref_window.cpp:1632
-msgid "%"
-msgstr "%"
-
-#. Translators: the full sentence is Transmit at least X frames per second
-#: src/pref_window.cpp:1635
-msgid "Transmit at least"
-msgstr "প্রেরণের ক্ষেত্রে অন্তত"
-
-#: src/pref_window.cpp:1635
-msgid "_frames per second"
-msgstr "-টি ফ্রেম প্রতি সেকেন্ডে (_ফ)"
-
-#. Translators: the full sentence is Transmit X background blocks with each
-#. frame
-#: src/pref_window.cpp:1639
-msgid "Transmit"
-msgstr "প্রেরণ কর"
-
-#: src/pref_window.cpp:1639
-msgid "background _blocks with each frame"
-msgstr "প্রতি ফ্রেমে পাঠানো পশ্চাদপটর ব্লক (_ব)"
+#: ../src/gui/main.cpp:3259
+msgid "Zoom in"
+msgstr "বড় করে দেখানো হবে"
 
-#: src/pref_window.cpp:1690
-msgid "General"
-msgstr "সাধারণ"
+#: ../src/gui/main.cpp:3263
+msgid "Zoom out"
+msgstr "ছোট করে দেখানো হবে"
 
-#: src/pref_window.cpp:1691
-msgid "Personal Data"
-msgstr "ব্যক্তিগত তথ্যাদি"
+#: ../src/gui/main.cpp:3267
+msgid "Normal size"
+msgstr "সাধারণ আকারে দেখানো হবে"
 
-#: src/pref_window.cpp:1701
-msgid "Directory Settings"
-msgstr "ডিরেক্টরি মানসমূহ"
+#: ../src/gui/main.cpp:3271
+msgid "_Fullscreen"
+msgstr "সম্পূর্ণ পর্দায় প্রদর্শন (_F)"
 
-#: src/pref_window.cpp:1705
-#, fuzzy
-msgid "Call Options"
-msgstr "কলের স্থায়িত্ব"
+#: ../src/gui/main.cpp:3271
+msgid "Switch to fullscreen"
+msgstr "পুরো স্ক্রীন জুড়ে দেখান"
 
-#: src/pref_window.cpp:1710
-msgid "Sound Events"
-msgstr ""
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:402
+msgid "Get help by reading the Ekiga manual"
+msgstr "Ekiga-এর সহায়ক নথিপত্র পড়ে সাহায্যে প্রাপ্ত করুন"
 
-#: src/pref_window.cpp:1714
-msgid "H.323 Settings"
-msgstr "এইচ.৩২৩ মানসমূহ"
+#: ../src/gui/main.cpp:3284 ../src/gui/statusicon.cpp:407
+msgid "View information about Ekiga"
+msgstr "Ekiga সংক্রান্ত তথ্য দেখুন"
 
-#: src/pref_window.cpp:1716
-msgid "Advanced Settings"
-msgstr "জটিলতর মানসমূহ"
+#: ../src/gui/main.cpp:3358
+msgid ""
+"Enter a URI on the left, and click this button to place a call or to hangup"
+msgstr "বাঁদিকে URI লিখে, এই বাটনে ক্লিক করে কল আরম্ভ করুন অথবা সমাপ্ত করুন"
 
-#: src/pref_window.cpp:1725
-msgid "Gatekeeper Settings"
-msgstr "গেটকিপার মানসমূহ"
-
-#: src/pref_window.cpp:1729
-msgid "NAT Settings"
-msgstr "ন্যাট মানসমূহ"
+#: ../src/gui/main.cpp:3409
+msgid "Contacts"
+msgstr "পরিচিতদের তালিকা"
 
-#: src/pref_window.cpp:1733
-msgid "Codecs"
-msgstr "কোডেকসমূহ"
+#: ../src/gui/main.cpp:3432
+msgid "Dialpad"
+msgstr "ডায়েল প্যাড"
 
-#: src/pref_window.cpp:1735
-msgid "Audio Codecs"
-msgstr "অডিও কোডেকসমূহ"
-
-#: src/pref_window.cpp:1739
-msgid "Video Codecs"
-msgstr "ভিডিও কোডেকসমূহ"
+#: ../src/gui/main.cpp:3451
+msgid "Call history"
+msgstr "কল সংক্রান্ত পূর্ববর্তী তথ্য"
 
-#: src/pref_window.cpp:1743
-msgid "Devices"
-msgstr "ডিভাইসসমূহ"
+#: ../src/gui/main.cpp:3554
+msgid "Change the volume of your soundcard"
+msgstr "সাউন্ডকার্ডের শব্দের মাত্রা পরিবর্তন করুন"
 
-#: src/sound_handling.cpp:328
-#, fuzzy
-msgid "Opening device for playing"
-msgstr "ভিডিও ডিভাইস খোলা হচ্ছে"
+#: ../src/gui/main.cpp:3574
+msgid "Change the color settings of your video device"
+msgstr "ভিডিও ডিভাইসের রঙের বৈশিষ্ট্য পরিবর্তন করুন"
 
-#: src/sound_handling.cpp:330
-msgid "Opening device for recording"
-msgstr ""
+#: ../src/gui/main.cpp:3685
+msgid "Ekiga"
+msgstr "Ekiga"
 
-#: src/sound_handling.cpp:342 src/sound_handling.cpp:344
-#: src/videograbber.cpp:674
-msgid "Failed to open the device"
-msgstr "ডিভাইস ব্যবহারে ব্যর্থ"
+#. Translators:
+#. * TX is a common abbreviation for "transmit"
+#: ../src/gui/main.cpp:4297
+#, c-format
+msgid "TX: %dx%d "
+msgstr "TX: %1$dx%2$d "
 
-#: src/sound_handling.cpp:342
+#. Translators:
+#. * RX is a common abbreviation for "receive"
+#: ../src/gui/main.cpp:4302
 #, c-format
-msgid ""
-"Impossible to open the selected audio device (%s) for recording. Please "
-"check your audio setup, the permissions and that the device is not busy."
-msgstr ""
-"রেকর্ডিংয়ের উদ্দেশ্যে নির্বাচিত অডিও ডিভাইসটির (%s) ব্যবহার অসম্ভব।  অনুগ্রহ করে "
-"আপনার অডিও সেটআপ, আনুসাঙ্গিক অনুমতি এবং ডিভাইসটি ব্যস্ত কিনা পরীক্ষা করুন"
+msgid "RX: %dx%d "
+msgstr "RX: %1$dx%2$d "
 
-#: src/sound_handling.cpp:344
+#: ../src/gui/main.cpp:4304
 #, c-format
 msgid ""
-"Impossible to open the selected audio device (%s) for playing. Please check "
-"your audio setup, the permissions and that the device is not busy."
+"Lost packets: %.1f %%\n"
+"Late packets: %.1f %%\n"
+"Out of order packets: %.1f %%\n"
+"Jitter buffer: %d ms%s%s%s"
 msgstr ""
-"বাজানোর উদ্দেশ্যে নির্বাচিত অডিও ডিভাইসটির (%s) ব্যবহার অসম্ভব।  অনুগ্রহ করে আপনার "
-"অডিও সেটআপ, আনুসাঙ্গিক অনুমতি এবং ডিভাইসটি ব্যস্ত কিনা পরীক্ষা করুন"
+"নিরুদ্দেশ প্যাকেট: %.1f %%\n"
+"বিলম্বিত প্যাকেট: %.1f %%\n"
+"অবিন্যস্ত প্যাকেট: %.1f %%\n"
+"জিটার বাফার: %d ms%s%s%s"
 
-#: src/sound_handling.cpp:381 src/sound_handling.cpp:457
-msgid "Cannot use the audio device"
-msgstr "অডিও ডিভাইসের ব্যবহার সম্ভব নয়"
+#: ../src/gui/main.cpp:4425
+msgid "Prints debug messages in the console (level between 1 and 5)"
+msgstr "ডিবাগ বার্তা কনসোলে প্রদর্শিত হবে (মাত্রা ১ থেকে ৫-র মধ্যে)"
 
-#: src/sound_handling.cpp:381
-#, c-format
-msgid ""
-"The selected audio device (%s) was successfully opened but it is impossible "
-"to read data from this device. Please check your audio setup."
+#: ../src/gui/main.cpp:4430
+msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr ""
-"নির্বাচিত অডিও ডিভাইসটি (%s) খোলার চেষ্টা সফল হয়েছে, তবে তার থেকে ডাটা পড়া "
-"অসম্ভব।  অনুগ্রহ করে আপনার অডিও সেটআপ পরীক্ষা করুন"
+"ব্যবহারকারীর স্তরের ডিবাগ বার্তা কনসোলে প্রদর্শন করা হবে (১ থেকে ৪ সংখ্যক স্তরে)"
 
-#: src/sound_handling.cpp:390
-#, fuzzy
-msgid "Recording your voice"
-msgstr "রেকর্ডিংয়ে ব্যবহৃত ডিভাইস:"
+#: ../src/gui/main.cpp:4435
+msgid "Makes Ekiga call the given URI"
+msgstr "Ekiga দ্বারা নির্দিষ্ট URI কল করতে ব্যবহার করা হবে"
 
-#: src/sound_handling.cpp:432
-#, fuzzy
-msgid "Recording and playing back"
-msgstr "রেকর্ডিংয়ে ব্যবহৃত ডিভাইস:"
+#: ../src/gui/main.cpp:4554
+msgid "No usable audio plugin detected"
+msgstr "ব্যবহারযোগ্য অডিও প্লাগ-ইন পাওয়া যায়নি"
 
-#: src/sound_handling.cpp:457
-#, c-format
+#: ../src/gui/main.cpp:4555
 msgid ""
-"The selected audio device (%s) was successfully opened but it is impossible "
-"to write data to this device. Please check your audio setup."
+"Ekiga didn't find any usable audio plugin. Make sure that your installation "
+"is correct."
 msgstr ""
-"নির্বাচিত অডিও ডিভাইসটি (%s) খোলার চেষ্টা সফল হয়েছে, তবে তাতে ডাটা পাঠানো "
-"অসম্ভব।  অনুগ্রহ করে আপনার অডিও সেটআপ পরীক্ষা করুন"
+"Ekiga দ্বারা ব্যবহারযোগ্য কোনো অডিও প্লাগ-ইন সনাক্ত হয়নি। অনুগ্রহ করে পরীক্ষা করুন "
+"সঠিকভাবে ইনস্টলেশন করা হয়েছে কি না।"
 
-#: src/sound_handling.cpp:584
-#, fuzzy, c-format
-msgid ""
-"GnomeMeeting is now recording from %s and playing back to %s. Please say \"1 "
-"2 3\" in your microphone, you should hear yourself back into the speakers "
-"with a 4 seconds delay."
-msgstr ""
-"গুহ্‌নোমমিটিং %s থেকে রেকর্ড করে %s-য়ে বাজিয়ে শোনাতে প্রস্তুত।  অনুগ্রহ করে আপনার "
-"মাইক্রোফোনে \"১ ২ ৩\" বলুন।  ৫ সেকেন্ডের মধ্যে আপনার স্পিকার থেকে আপনার বলা "
-"কথাগুলি শুনতে পাওয়ার কথা \n"
-"\n"
-"রেকর্ড করা হচ্ছে... কথা বলুন"
+#: ../src/gui/main.cpp:4558
+msgid "No usable audio codecs detected"
+msgstr "ব্যবহারযোগ্য অডিও কোডেক পাওয়া যায়নি"
 
-#: src/toolbar.cpp:177
+#: ../src/gui/main.cpp:4559
 msgid ""
-"Enter an URL to call on the left, and click on this button to connect to the "
-"given URL."
+"Ekiga didn't find any usable audio codec. Make sure that your installation "
+"is correct."
 msgstr ""
-"যে কলটি করতে চান তার ইউ-আর-এলটি বাঁ দিকে লিখুন এবং কল সংযোগের উদ্দেশ্যে এই "
-"বোতামে ক্লিক করুন"
-
-#: src/toolbar.cpp:223
-msgid "Open text chat."
-msgstr "টেকস্ট চ্যাট খোলো"
-
-#: src/toolbar.cpp:234
-msgid "Open control panel"
-msgstr "কন্ট্রোল প্যানেল খোলো"
-
-#: src/toolbar.cpp:246
-msgid "Open address book"
-msgstr "ঠিকানার খাতা খোলো"
+"Ekiga দ্বারা ব্যবহারযোগ্য কোনো কোডেক সনাক্ত হয়নি। অনুগ্রহ করে পরীক্ষা করুন সঠিকভাবে "
+"ইনস্টলেশন করা হয়েছে কি না।"
 
-#: src/toolbar.cpp:270
-msgid "Display images from your camera device."
-msgstr "আপনার ক্যামেরার ছবি সহ দেখানো হবে"
+#: ../src/gui/preferences.cpp:381
+msgid "Play sound for new voice mails"
+msgstr "নতুন ভয়েস মেইল প্রাপ্ত হলে শব্দ বাজানো হবে"
 
-#: src/toolbar.cpp:292
-msgid ""
-"Audio transmission status. During a call, click here to suspend or resume "
-"the audio transmission."
-msgstr ""
-"অডিও প্রেরণের অবস্থা।  কল চলাকালীন অডিও প্রেরণ সাময়িকভাবে থামাতে বা পুনরায় শুরু "
-"করতে এখানে ক্লিক করুন"
+#: ../src/gui/preferences.cpp:391
+msgid "Play sound for new instant messages"
+msgstr "নতুন ইনস্ট্যান্ট বার্তার জন্য শব্দ বাজানো হবে"
 
-#: src/toolbar.cpp:312
-msgid ""
-"Video transmission status. During a call, click here to suspend or resume "
-"the video transmission."
-msgstr ""
-"ভিডিও প্রেরণের অবস্থা।  কল চলাকালীন ভিডিও প্রেরণ সাময়িকভাবে থামাতে বা পুনরায় শুরু "
-"করতে এখানে ক্লিক করুন"
+#: ../src/gui/preferences.cpp:457
+msgid "_Full name:"
+msgstr "সম্পূর্ণ নাম: (_F)"
 
-#: src/tools.cpp:263
-#, fuzzy
-msgid "Received Calls"
-msgstr "আপনার পাওয়া কলগুলি"
+#: ../src/gui/preferences.cpp:475
+msgid "User Interface"
+msgstr "ইউজার ইন্টারফেস"
 
-#: src/tools.cpp:263
-#, fuzzy
-msgid "Placed Calls"
-msgstr "কল হোল্ড (_হ)"
+#: ../src/gui/preferences.cpp:477
+msgid "Start _hidden"
+msgstr "প্রারম্ভে আড়াল করা হবে (_h)"
 
-#: src/tools.cpp:263
-#, fuzzy
-msgid "Unanswered Calls"
-msgstr "উত্তর-না-করা কলের তালিকা"
+#: ../src/gui/preferences.cpp:479
+msgid "Show offline _contacts"
+msgstr "অফ-লাইন পরিচিতদের তথ্য প্রদর্শন করা হবে (_c)"
 
-#: src/tools.cpp:315
-msgid "Date"
-msgstr "তারিখ"
+#: ../src/gui/preferences.cpp:484
+msgid "Video Display"
+msgstr "ভিডিও প্রদর্শন"
 
-#: src/tools.cpp:323
-#, fuzzy
-msgid "Remote User"
-msgstr "দূরবর্তী ব্যবহারকারী"
+#: ../src/gui/preferences.cpp:486
+msgid "Place windows displaying video _above other windows"
+msgstr "ভিডিও প্রদর্শনকারী উইন্ডোগুলো অন্যান্য উইন্ডোর উপরে স্থাপিত হবে (_a)"
 
-#: src/tools.cpp:341
-#, fuzzy
-msgid "Call Duration"
-msgstr "কলের স্থায়িত্ব"
+#: ../src/gui/preferences.cpp:490
+msgid "Network Settings"
+msgstr "নেটওয়ার্ক সংক্রান্ত বৈশিষ্ট্য"
 
-#: src/tools.cpp:351
-#, fuzzy
-msgid "Call End Reason"
-msgstr "কলের স্থায়িত্ব"
+#: ../src/gui/preferences.cpp:492
+msgid "Disable network _detection"
+msgstr "নেটওয়ার্ক সনাক্তকরণ নিষ্ক্রিয় করুন (_d)"
 
-#: src/tools.cpp:360
-msgid "Software"
-msgstr "সফটওয়ার"
+#: ../src/gui/preferences.cpp:503
+msgid "Call Forwarding"
+msgstr "কল এগিয়ে দেওয়া"
 
-#: src/tray.cpp:182
-msgid "GnomeMeeting Tray Icon"
-msgstr "গুহ্‌নোমমিটিং ট্রে আইকন"
+#: ../src/gui/preferences.cpp:505
+msgid "_Always forward calls to the given host"
+msgstr "সর্বদা উল্লিখিত হোস্টে কল ফরওয়ার্ড করা হবে (_A)"
 
-#: src/urlhandler.cpp:76
+#: ../src/gui/preferences.cpp:505
 msgid ""
-"The call transfer failed, the user was either unreachable, or simply busy "
-"when he received the call transfer request."
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the protocol settings"
 msgstr ""
-"কল স্থানান্তরের চেষ্টা ব্যর্থ।  হয় এ ব্যক্তিটিকে খুঁজে পাওয়া যায়নি অথবা যখন তিনি কল "
-"স্থানান্তরের অনুরোধটি পান তখন ব্যস্ত ছিলেন"
-
-#: src/urlhandler.cpp:284
-#, c-format
-msgid "No contact with speed dial %s# found, will call number %s instead"
-msgstr "%s# দ্রুত ডায়েলের জন্য কোন নাম না পাওয়ায় %s নম্বরটি কল করা হবে"
+"সক্রিয় থাকলে, প্রোটোকলের বৈশিষ্ট্য অনুযায়ী নির্ধারিত হোস্টে সকল কল ফরওয়ার্ড করা হবে"
 
-#: src/urlhandler.cpp:302
-msgid "Invalid URL handler"
-msgstr "বেঠিক ইউ-আর-এল হ্যান্ডলার"
+#: ../src/gui/preferences.cpp:507
+msgid "Forward calls to the given host if _no answer"
+msgstr "জবাব না দিলে চিহ্নিত হোস্টে কল ফরওয়ার্ড করা হবে (_n)"
 
-#: src/urlhandler.cpp:302
+#: ../src/gui/preferences.cpp:507
 msgid ""
-"Please specify a valid URL handler. Currently both h323: and callto: are "
-"supported."
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the protocol settings if you do not answer the call"
 msgstr ""
-"সঠিক ইউ-আর-এল হ্যান্ডলার নির্দেশ করুন।  বর্তমানে h323: এবং callto: দুটি-ই সমর্থিত"
-
-#: src/urlhandler.cpp:334
-#, c-format
-msgid "Calling %s"
-msgstr "%s-কে কল করা হচ্ছে"
+"সক্রিয় থাকলে, আপনার জবাব না দেওয়া কলগুলি প্রোটোকলের বৈশিষ্ট্য অনুযায়ী নির্ধারিত "
+"হোস্টে ফরওয়ার্ড করা হবে"
 
-#: src/urlhandler.cpp:338
-#, c-format
-msgid "Transferring call to %s"
-msgstr "%s-য়ে কলটি স্থানান্তরিত করা হচ্ছে"
-
-#: src/videograbber.cpp:304
-#, fuzzy, c-format
-msgid "Opening video device %s with plugin %s"
-msgstr "ভিডিও ডিভাইস খোলা হচ্ছে"
-
-#: src/videograbber.cpp:329
-#, c-format
-msgid "Successfully opened video device %s, channel %d"
-msgstr "ভিডিও ডিভাইস %s, চ্যানেল %d খোলার চেষ্টা সফল"
-
-#: src/videograbber.cpp:338
-#, c-format
-msgid "Error while opening video device %s"
-msgstr "ভিডিও ডিভাইস %s খোলার সময়ে ত্রুটি"
+#: ../src/gui/preferences.cpp:509
+msgid "Forward calls to the given host if _busy"
+msgstr "ব্যস্ত থাকলে, চিহ্নিত হোস্টে কল ফরওয়ার্ড করা হবে (_b)"
 
-#. Translators: Do not translate MovingLogo and Picture
-#: src/videograbber.cpp:342
-#, fuzzy
+#: ../src/gui/preferences.cpp:509
 msgid ""
-"A moving GnomeMeeting logo will be transmitted during calls. Notice that you "
-"can always transmit a given image or the moving GnomeMeeting logo by "
-"choosing \"Picture\" as video plugin and \"MovingLogo\" or \"StaticPicture\" "
-"as device."
-msgstr ""
-"আপনার নির্বাচিত ভিডিওর ছবিটি কল চলাকালীন পাঠানো হবে। কোন ছবি নির্দিশ্ট না করে "
-"থাকলে, গুহ্‌নোমমিটিংয়ের লোগোর ছবি পাঠানো হবে। যে কোন সময়ই \"ছবি\" ভিডিও ডিভাইস "
-"হিসেবে বেছে নিলে আপনি আপনার পচ্ছন্দমত কোন ছবি বা গুহ্‌নোমমিটিংয়ের লোগোটির পাঠাতে "
-"পারেবেন"
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the protocol settings if you already are in a call or if you "
+"are in Do Not Disturb mode"
+msgstr ""
+"সক্রিয় থাকলে, কোনো কলে ব্যস্ত থাকলে অথবা 'বিঘ্নিত করা হবে না' মোডে চিহ্নিত থাকলে "
+"প্রোটোকলের বৈশিষ্ট্য অনুযায়ী নির্ধারিত হোস্টে সকল কল ফরওয়ার্ড করা হবে"
 
-#: src/videograbber.cpp:344
-#, fuzzy
-msgid "Couldn't open the video device"
-msgstr "ভিডিও ডিভাইস খোলা যায়নি"
+#: ../src/gui/preferences.cpp:513 ../src/gui/preferences.cpp:1361
+msgid "Call Options"
+msgstr "কল সংক্রান্ত অপশন"
 
-#: src/videograbber.cpp:348
-msgid ""
-"There was an error while opening the device. Please check your permissions "
-"and make sure that the appropriate driver is loaded."
+#. Add all the fields
+#: ../src/gui/preferences.cpp:516
+msgid "Timeout to reject or forward unanswered incoming calls (in seconds):"
 msgstr ""
-"ডিভাইসটি খোলার সময়ে ত্রুটি ঘটেছে।  এর আনুসাঙ্গিক সমস্ত অনুমতি এবং সঠিক ড্রাইভার "
-"ব্যবহৃত হচ্ছে কিনা তা পরীক্ষা করে দেখুন"
-
-#: src/videograbber.cpp:352 src/videograbber.cpp:652
-msgid "Your video driver doesn't support the requested video format."
-msgstr "আপনার ভিডিও ড্রাইভারটি প্রয়োজনীয় ভিডিও ধরণটিকে সমর্থন করে না"
+"জবাব না দেওয়া আগত কলগুলি প্রত্যাখ্যান অথবা ফরওয়ার্ডের সময় সীমা (সেকেন্ডে ধার্য):"
 
-#: src/videograbber.cpp:356
-#, fuzzy
-msgid "Could not open the chosen channel."
-msgstr "নির্বাচিত ভিডিও-র ধরণ সহকারে নির্বাচিত চ্যানেলটির ব্যবহার সম্ভব হয়েনি"
+#: ../src/gui/preferences.cpp:548
+msgid "Ekiga Sound Events"
+msgstr "Ekiga-এর সাউন্ড ইভেন্ট"
 
-#: src/videograbber.cpp:360
-#, fuzzy
-msgid ""
-"Your driver doesn't seem to support any of the colour formats supported by "
-"GnomeMeeting.\n"
-" Please check your kernel driver documentation in order to determine which "
-"Palette is supported."
-msgstr ""
-"মনে হচ্ছে যে গুহ্‌নোমমিটিংর দ্বারা সমর্থিত রংয়ের ধরণের কোনটাই আপনার ড্রাইভার দ্বারা "
-"সমর্থিত নয়\n"
-"আপনার কার্নেল ড্রাইভারের নির্দেশিকা দেখে ঠিক করে নিন কোন প্যালেটটি সমর্থিত সেই "
-"অনুসারে নিম্নক্ত কম্যান্ডের দ্বারা গুহ্‌নোমমিটিংকে নির্দেশ করুন:\n"
-" gconftool --set \"/apps/gnomemeeting/devices/color_format\" YOURPALETTE --"
-"type string"
+#: ../src/gui/preferences.cpp:598
+msgid "Event"
+msgstr "ইভেন্ট"
 
-#: src/videograbber.cpp:364
-msgid "Error while setting the frame rate."
-msgstr "ফ্রেমের মাত্রা (রেট) নির্ধারণের ক্ষেত্রে ত্রুটি"
+#: ../src/gui/preferences.cpp:610
+msgid "Choose a sound"
+msgstr "একটি শব্দ নির্বাচন করুন"
 
-#: src/videograbber.cpp:368
-msgid "Error while setting the frame size."
-msgstr "ফ্রেমের আয়তন নির্ধারণের ক্ষেত্রে ত্রুটি"
+#: ../src/gui/preferences.cpp:615
+msgid "Wavefiles"
+msgstr "Wavefiles"
 
-#: src/videograbber.cpp:407
-msgid "Opened the video device using the \"Picture\" video plugin"
-msgstr ""
+#: ../src/gui/preferences.cpp:624 ../src/gui/preferences.cpp:643
+msgid "Play"
+msgstr "বাজানো হবে"
 
-#: src/videograbber.cpp:553
-msgid "Picture"
-msgstr "ছবি"
+#: ../src/gui/preferences.cpp:664
+msgid "String"
+msgstr "স্ট্রিং"
 
-#: src/videograbber.cpp:565
-#, c-format
-msgid ""
-"GnomeMeeting is now testing the %s video device. If you experience machine "
-"crashes, then report a bug to the video driver author."
-msgstr ""
+#: ../src/gui/preferences.cpp:665
+msgid "Tone"
+msgstr "টোন"
+
+#: ../src/gui/preferences.cpp:666 ../src/gui/preferences.cpp:715
+msgid "RFC2833"
+msgstr "RFC2833"
+
+#: ../src/gui/preferences.cpp:667
+msgid "Q.931"
+msgstr "Q.931"
+
+#: ../src/gui/preferences.cpp:673 ../src/gui/preferences.cpp:725
+msgid "Misc Settings"
+msgstr "বিবিধ বৈশিষ্ট্যের মান"
+
+#: ../src/gui/preferences.cpp:676 ../src/gui/preferences.cpp:730
+msgid "Forward _URI:"
+msgstr "ফরওয়ার্ডের URI: (_U)"
 
-#: src/videograbber.cpp:626
-#, c-format
-msgid "Test %d done"
-msgstr "পরীক্ষা %d সমাপ্ত"
+#: ../src/gui/preferences.cpp:685
+msgid "Advanced Settings"
+msgstr "জটিলতর মানসমূহ"
 
-#: src/videograbber.cpp:628
-#, fuzzy, c-format
-msgid "Test %d failed"
-msgstr "পরীক্ষা %d সমাপ্ত"
+#. The toggles
+#: ../src/gui/preferences.cpp:688
+msgid "Enable H.245 _tunneling"
+msgstr "H.245 টানেল ব্যবস্থা সক্রিয় করা হবে (_t)"
 
-#: src/videograbber.cpp:647
-#, c-format
-msgid "Error while opening %s."
-msgstr "%s খোলার সময়ে ত্রুটি ঘটেছে"
+#: ../src/gui/preferences.cpp:690
+msgid "Enable _early H.245"
+msgstr "শীঘ্র H.245 সক্রিয় করা হবে (_e)"
 
-#: src/videograbber.cpp:656
-msgid "Could not open the chosen channel with the chosen video format."
-msgstr "নির্বাচিত ভিডিও-র ধরণ সহকারে নির্বাচিত চ্যানেলটির ব্যবহার সম্ভব হয়েনি"
+#: ../src/gui/preferences.cpp:692
+msgid "Enable fast _start procedure"
+msgstr "দ্রুত প্রারম্ভের প্রক্রিয়া সক্রিয় করা হবে (_s)"
 
-#: src/videograbber.cpp:660
-#, fuzzy
+#: ../src/gui/preferences.cpp:692
 msgid ""
-"Your driver doesn't support any of the color formats tried by GnomeMeeting"
-msgstr "আপনার ড্রাইভার YUV420P রংয়ের ধরনটি সমর্থন করে না"
-
-#: src/videograbber.cpp:664
-msgid "Error with the frame rate."
-msgstr "ফ্রেমের মাত্রায়ে (রেটে) ত্রুটি"
+"Connection will be established in Fast Start mode. Fast Start is a new way "
+"to start calls faster that was introduced in H.323v2. It is not supported by "
+"Netmeeting and using both Fast Start and H.245 Tunneling can crash some "
+"versions of Netmeeting."
+msgstr ""
+"ফাস্ট স্টার্ট উপায় যোগাযোগ স্থাপন করা হবে। H.245 টানেলিং প্রণালী H.323v2-এ প্রথম "
+"বিদ্যমান করা হয়েছিল ও  Netmeeting দ্বারা এটি সমর্থিত নয়। ফাস্ট স্টার্ট ও H.245 "
+"টানেলিং একযোগে ব্যবহারে Netmeeting-এর কিছু সংস্করণ বিকল হতে পারে।"
+
+#: ../src/gui/preferences.cpp:698 ../src/gui/preferences.cpp:738
+msgid "DTMF Mode"
+msgstr "DTMF মোড"
 
-#: src/videograbber.cpp:668
-msgid "Error with the frame size."
-msgstr "ফ্রেমের আয়তনে ত্রুটি"
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
+msgid "_Send DTMF as:"
+msgstr "DTMF প্রেরণের রূপ: (_S)"
 
-#~ msgid "Audio player mixer"
-#~ msgstr "অডিও প্লেয়ার মিক্সার"
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
+msgid "This allows you to set the mode for DTMFs sending."
+msgstr "এর সাহায্যে DTMF প্রেরণের মোড নির্ধারণ করা হবে।"
 
-#~ msgid "Audio recorder"
-#~ msgstr "অডিও রের্কডার"
+#: ../src/gui/preferences.cpp:716
+msgid "INFO"
+msgstr "INFO"
 
-#~ msgid "Audio recorder mixer"
-#~ msgstr "অডিও রের্কডার মিক্সার"
+#: ../src/gui/preferences.cpp:727
+msgid "_Outbound Proxy:"
+msgstr "বাহিরমূখী প্রক্সি: (_O)"
 
-#~ msgid "Color Format for the video palette"
-#~ msgstr "ভিডিও প্যালেটের জন্য রং-এর ধরণ"
+#: ../src/gui/preferences.cpp:768
+msgid "Ringing Device"
+msgstr "রিংয়ের জন্য ব্যবহৃত ডিভাইস"
 
-#~ msgid "Do not disturb"
-#~ msgstr "বিরক্ত করবেন না"
+#: ../src/gui/preferences.cpp:768
+msgid "Select the ringing audio device to use"
+msgstr "রিংয়ের জন্য ব্যবহারযোগ্য অডির ডিভাইস নির্বাচন করুন"
 
-#~ msgid ""
-#~ "If enabled, GnomeMeeting will play a sound when receiving an incoming "
-#~ "call (the sound to play is chosen in the Gnome Control Center)."
-#~ msgstr ""
-#~ "এটি সক্রিয় হলে, গুহ্‌নোমমিটিং কল এলে শব্দ সহকারে আপনাকে জানাবে (নির্দিশ্ট শব্দটি "
-#~ "গুহ্‌নোম কন্ট্রোল সেন্টার থেকে বেছে নেওয়া হবে)"
+#: ../src/gui/preferences.cpp:770
+msgid "Output device:"
+msgstr "আউটপুট ডিভাইস:"
 
-#~ msgid "If enabled, incoming calls will be automatically answered."
-#~ msgstr "এটি সক্রিয় হলে, আসা সব কলই স্বয়ংক্রিয় ভাবে গ্রহণ করা হবে"
+#: ../src/gui/preferences.cpp:777 ../src/gui/preferences.cpp:928
+msgid "Input device:"
+msgstr "ইনপুট ডিভাইস:"
 
-#~ msgid "If enabled, incoming calls will be automatically refused."
-#~ msgstr "এটি সক্রিয় হলে, আসা সব কলই স্বয়ংক্রিয় ভাবে অগ্রাহ্য করা হবে"
+#. That button will refresh the device list
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
+msgid "_Detect devices"
+msgstr "ডিভাইস সনাক্ত করা হবে (_D)"
 
-#~ msgid "Select the audio recorder device to use."
-#~ msgstr "ব্যবহারের জন্য অডিও রেকর্ডার ডিভাইস বেছে নিন"
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
+msgid "Click here to refresh the device list."
+msgstr "ডিভাইস তালিকা নতুন করে প্রদর্শনের জন্য এখানে ক্লিক করুন।"
 
-#~ msgid "Select the mixer to use to change the volume of the audio player."
-#~ msgstr "অডিও প্লেয়ারের ক্ষেত্রে শব্দের মাত্রা নির্ধারক মিক্সার বেছে নিন"
+#: ../src/gui/preferences.cpp:906
+msgid "PAL (Europe)"
+msgstr "প্যাল (ইউরোপ)"
 
-#~ msgid "Select the mixer to use to change the volume of the audio recorder."
-#~ msgstr "অডিও রেকর্ডারের ক্ষেত্রে শব্দের মাত্রা নির্ধারক মিক্সার বেছে নিন"
+#: ../src/gui/preferences.cpp:907
+msgid "NTSC (America)"
+msgstr "NTSC (আমেরিকা)"
 
-#~ msgid "gnomemeeting"
-#~ msgstr "গুহ্‌নোমমিটিং"
+#: ../src/gui/preferences.cpp:908
+msgid "SECAM (France)"
+msgstr "সেক্যাম (ফ্রান্স)"
 
-#~ msgid "Internationalisation Maintainer:"
-#~ msgstr "ইন্টারন্যশানালাইজেশনের দেখাশোনায়:"
+#: ../src/gui/preferences.cpp:909
+msgid "Auto"
+msgstr "স্বয়ংক্রিয়"
 
-#~ msgid ""
-#~ "GnomeMeeting is a full-featured H.323\n"
-#~ "video conferencing application."
-#~ msgstr ""
-#~ "গুহ্‌নোমমিটিং একটি সম্পূর্ণ এইচ.৩২৩ সমর্থিত\n"
-#~ "ভিডিও সম্মেলক অ্যাপ্লিকেশন"
+#. Video Channel
+#: ../src/gui/preferences.cpp:932
+msgid "Channel:"
+msgstr "চ্যানেল:"
 
-#~ msgid "Started New Logical Channel..."
-#~ msgstr "নতুন লজিক্যাল চ্যানেল চালু করা হচ্ছে..."
+#: ../src/gui/preferences.cpp:934
+msgid "Size:"
+msgstr "মাপ:"
 
-#~ msgid "Enabled silence detection for %s"
-#~ msgstr "%s-য়ের জন্য নৈশব্দ সন্ধান সক্রিয়"
+#: ../src/gui/preferences.cpp:934
+msgid "Select the transmitted video size"
+msgstr "সম্প্রচার করা ভিডিওর মাপ নির্বাচন করুন"
 
-#~ msgid "Disabled silence detection for %s"
-#~ msgstr "%s-য়ের জন্য নৈশব্দ সন্ধান নিস্ক্রিয়"
+#: ../src/gui/preferences.cpp:936
+msgid "Format:"
+msgstr "বিন্যাস:"
 
-#~ msgid "Receiving %s"
-#~ msgstr "%s প্রাপ্তি ঘটছে"
+#: ../src/gui/preferences.cpp:963 ../src/gui/preferences.cpp:1002
+#: ../src/gui/preferences.cpp:1386 ../src/gui/preferences.cpp:1396
+msgid "Codecs"
+msgstr "কোডেকসমূহ"
 
-#~ msgid "Requesting remote to send video quality: %d%%"
-#~ msgstr "দূরবর্তী ভিডিও প্রেরণে মানের অনুরোধ: %d%%"
+#: ../src/gui/preferences.cpp:976 ../src/gui/preferences.cpp:1015
+msgid "Settings"
+msgstr "বিবিধ বৈশিষ্ট্য"
 
-#~ msgid "Request ok"
-#~ msgstr "অনুরোধ ঠিক আছে"
+#. Translators: the full sentence is Automatically adjust jitter buffer
+#. between X and Y ms
+#: ../src/gui/preferences.cpp:980
+msgid "Enable silence _detection"
+msgstr "নৈশব্দ সন্ধান সক্রিয় (_d)"
 
-#~ msgid "Auto Answering Incoming Call"
-#~ msgstr "আসা কলের স্বয়ংক্রিয় উত্তর প্রদান"
+#: ../src/gui/preferences.cpp:980
+msgid "If enabled, use silence detection with the codecs supporting it."
+msgstr ""
+"সক্রিয় করা হলে, কোডেক দ্বারা সমর্থিত হলে নিঃশব্দ অবস্থার সনাক্তকরণ ব্যবস্থা প্রয়োগ "
+"করা হবে।"
 
-#~ msgid "Other"
-#~ msgstr "অন্য"
+#: ../src/gui/preferences.cpp:982
+msgid "Enable echo can_celation"
+msgstr "প্রতিধ্বনি বাতিল করার ব্যবস্থা সক্রিয় করা হবে (_c)"
 
-#~ msgid "Enabled"
-#~ msgstr "সক্রিয়"
+#: ../src/gui/preferences.cpp:982
+msgid "If enabled, use echo cancelation."
+msgstr "সক্রিয় হলে,  প্রতিধ্বনি বাতিল করার ব্যবস্থা প্রয়োগ করা হবে।"
 
-#~ msgid "Disabled"
-#~ msgstr "নিস্ক্রিয়"
+#: ../src/gui/preferences.cpp:984
+msgid "Maximum _jitter buffer (in ms):"
+msgstr "সর্বাধিক jitter বাফার (মিলিসেকেন্ডে ধার্য) (_j):"
 
-#~ msgid ""
-#~ "Please enter your first name and surname, they will be used when "
-#~ "connecting to other audio/video conferencing software.\n"
-#~ "\n"
-#~ "Your e-mail address is used to provide you with a callto address that "
-#~ "your friends can use to call you without knowing your IP address.\n"
-#~ "\n"
-#~ "No information is made public unless you allow it to be published on the "
-#~ "directory of online GnomeMeeting users."
-#~ msgstr ""
-#~ "অনুগ্রহ করে আপনার নাম ও পদবী লিখুন, অন্য অডিও/ভিডিও সম্মেলন সফটওয়ারের সঙ্গে "
-#~ "সংযোগের সময়ে এগুলি ব্যবহৃত হবে\n"
-#~ "\n"
-#~ "আপনার ই-মেইল ঠিকানা থেকে আপনাকে একটি কল-টু ঠিকানা প্রদান করা হবে, এটির "
-#~ "সাহায্যে আপনার বন্ধুরা আই-পি অ্যাড্রেস না জেনেও আপনাকে কল করতে পারেন\n"
-#~ "\n"
-#~ "আপনার সংক্রান্ত কোন তথ্যই প্রকাশ করা হবে না, যদি আপনি তা গুহ্‌নোমমিটিং অনলাইন "
-#~ "ইউজার ডিরেক্টরিতে প্রকাশ না করেন"
-
-#~ msgid "First _name:"
-#~ msgstr "নাম (_ন):"
+#: ../src/gui/preferences.cpp:984
+msgid "The maximum jitter buffer size for audio reception (in ms)."
+msgstr "অডিও গ্রহণের উদ্দেশ্যে জিটার বাফারের সর্বাধিক আয়তন (মিলিসেকেন্ডে)।"
 
-#~ msgid "Callto URL"
-#~ msgstr "কল-টু ইউ-আর-এল"
+#. Translators: the full sentence is Keep a minimum video quality of X %
+#: ../src/gui/preferences.cpp:1018
+msgid "Picture Quality"
+msgstr "ছবির গুণমান"
 
-#~ msgid "Directory of Online GnomeMeeting Users"
-#~ msgstr "অনলাইন গুহ্‌নোমমিটিং ব্যবহারকারীদের ডিরেক্টরি"
+#: ../src/gui/preferences.cpp:1018
+msgid ""
+"Choose if you want to guarantee a minimum image quality (possibly leading to "
+"dropped frames in order not to surpass the bitrate limit) or if you prefer "
+"to keep the frame rate."
+msgstr ""
+"ছবির সর্বনিম্ন গুণমানের মাত্রা নির্ধারিত হবে (এর ফলে, বিটের হারের সীমা অতিক্রম না "
+"করার প্রচেষ্টায় কিছু ফ্রেম পরিত্যাগ করা হবে) নাকি ফ্রেমের গতি বজায় রাখতো আপনি ইচ্ছুক।"
 
-#~ msgid "Publish my information on the directory of online GnomeMeeting users"
-#~ msgstr "অনলাইন গুহ্‌নোমমিটিং ব্যবহারকারীদের ডিরেক্টরিতে আমার তথ্য প্রকাশ কর"
+#: ../src/gui/preferences.cpp:1020
+msgid "Maximum video _bitrate (in kbits/s):"
+msgstr "ভিডিওর সর্বাধিক বিটের মাত্রা (কিলোবাইট/সেকেন্ড) (_b):"
 
-#~ msgid ""
-#~ "Please select your network connection type. This is used to set default "
-#~ "video settings for your bandwidth. It is possible to change these "
-#~ "defaults later."
-#~ msgstr ""
-#~ "আপনার নেটওয়ার্কের ধরণ বেছে নিন।  এর সাহায্যে বর্তমান ব্যান্ডহুইডত্‌ অনুসারে ডিফল্ট "
-#~ "ভিডিও-র মান নির্ধারণ করা হবে ।  পরে যে কোন সময়ই আপনার পছন্দ মতো এর পরিবর্তন "
-#~ "করতে পারেন"
+#: ../src/gui/preferences.cpp:1020
+msgid ""
+"The maximum video bitrate in kbits/s. The video quality and the effective "
+"frame rate will be dynamically adjusted to keep the bitrate at the given "
+"value."
+msgstr ""
+"কিলোবাইট/সেকেন্ডে ধার্য ভিডিওর সর্বাধিক বিটের হার। সুনির্দিষ্ট বিটের হার বজায় "
+"রাখার জন্য ভিডিও গুনমান ও ফ্রেমের হার সংখ্যাগুলো তৎক্ষনাৎ পরিবর্তন করা হবে।"
 
-#~ msgid "Connection Type"
-#~ msgstr "সংযোগের ধরণ"
+#: ../src/gui/preferences.cpp:1333
+msgid "Ekiga Preferences"
+msgstr "Ekiga সংক্রান্ত পছন্দসই মান"
 
-#~ msgid "DSL/Cable"
-#~ msgstr "ডি-এস-এল/কেবল"
+#: ../src/gui/preferences.cpp:1351
+msgid "General"
+msgstr "সাধারণ"
 
-#~ msgid ""
-#~ "Please choose the audio devices to use during the GnomeMeeting session. "
-#~ "You can also choose to use a Quicknet device instead of the soundcard, "
-#~ "but the \"Test Audio\" button will only work for soundcards. Notice that "
-#~ "some webcams models have an internal microphone that can be used with "
-#~ "GnomeMeeting."
-#~ msgstr ""
-#~ "গুহ্‌নোমমিটিং সেশন চলাকালীন ব্যবহৃত অডিও ডিভাইস বেছে নিন।  চাইলে একটি কুইকনেট "
-#~ "ডিভাইসও বাছতে পারেন সাউন্ডকার্ডের বদলে, তবে \"অডিও পরীক্ষা করুন\" বোতামটি "
-#~ "শুধুমাত্র সাউন্ডকার্ডের সঙ্গেই কাজ করবে।  খেয়াল রাখবেন যে কিছু কিছু ওয়েবক্যামের "
-#~ "মধ্যেই মাইক্রোফোন থেকে থাকে যা গুহ্‌নোমমিটিং-এর সঙ্গে ব্যবহার করা সম্ভব "
+#: ../src/gui/preferences.cpp:1352
+msgid "Personal Data"
+msgstr "ব্যক্তিগত তথ্যাদি"
 
-#~ msgid "Audio player mixer:"
-#~ msgstr "অডিও বাজানোর মিক্সার:"
+#: ../src/gui/preferences.cpp:1357
+msgid "General Settings"
+msgstr "সাধারণ মানসমূহ"
 
-#~ msgid "Audio recorder:"
-#~ msgstr "অডিও রেকর্ডার:"
+#: ../src/gui/preferences.cpp:1366
+msgid "Sound Events"
+msgstr "শব্দ সংক্রান্ত ঘটনা"
 
-#~ msgid "Audio recorder mixer:"
-#~ msgstr "অডিও রেকর্ডার মিক্সার:"
+#: ../src/gui/preferences.cpp:1370
+msgid "Protocols"
+msgstr "প্রোটোকল"
 
-#~ msgid "Click here to test your audio devices:"
-#~ msgstr "অডিও ডিভাইস পরীক্ষার জন্যে এখানে ক্লিক করুন:"
+#: ../src/gui/preferences.cpp:1372
+msgid "SIP Settings"
+msgstr "SIP সংক্রান্ত বৈশিষ্ট্য"
 
-#~ msgid "Test Audio"
-#~ msgstr "অডিও পরীক্ষা করুন"
+#: ../src/gui/preferences.cpp:1377
+msgid "H.323 Settings"
+msgstr "এইচ.৩২৩ সেটিংস"
 
-#~ msgid ""
-#~ "Please choose the video device to use during the GnomeMeeting session. "
-#~ "Click on the \"Test Video\" button to check if your setup is correct and "
-#~ "if your driver is supported by GnomeMeeting. You can only test the "
-#~ "correctness of your driver if the selected device is not already in use."
-#~ msgstr ""
-#~ "গুহ্‌নোমমিটিং সেশন চলাকালীন ব্যবহৃত ভিডিও ডিভাইস বেছে নিন।  \"ভিডিও পরীক্ষা করুন"
-#~ "\" বোতামে ক্লিক করে দেখে নিন আপনার সেটআপ ঠিক আছে কিনা এবং আপনার ড্রাইভারটি "
-#~ "গুহ্‌নোমমিটিং-এর দ্বারা সমর্থিত কিনা।  আপনার নির্বাচিত ড্রাইভারটি বর্তমানে "
-#~ "ব্যবহারের মধ্যে না থাকলে তবেই ড্রাইভারের সঠিকতা পরীক্ষা করা সম্ভর"
+#: ../src/gui/preferences.cpp:1381
+msgid "Audio"
+msgstr "অডিও"
 
-#~ msgid "Video device:"
-#~ msgstr "ভিডিও ডিভাইস:"
+#: ../src/gui/preferences.cpp:1382 ../src/gui/preferences.cpp:1392
+msgid "Devices"
+msgstr "ডিভাইসসমূহ"
 
-#~ msgid ""
-#~ "Enter the video device to use. Using an invalid video device for video "
-#~ "transmission will transmit a test picture."
-#~ msgstr ""
-#~ "ব্যবহারের জন্য ভিডিও ডিভাইস বেছে নিন।  বেঠিক ভিডিও ডিভাইসের ব্যবহার হলে "
-#~ "ভিডিও প্রেরণের ক্ষেত্রে গুহ্‌নোমমিটিং-এর লোগো পাথানো হবে"
+#: ../src/gui/preferences.cpp:1391
+msgid "Video"
+msgstr "ভিডিও"
 
-#~ msgid "Test Video"
-#~ msgstr "ভিডিও পরীক্ষা করুন"
+#: ../src/gui/statusicon.cpp:306
+#, c-format
+msgid "You have %d message"
+msgid_plural "You have %d messages"
+msgstr[0] "%d-টি বার্তা প্রাপ্ত হয়েছে"
+msgstr[1] "%d-টি বার্তা প্রাপ্ত হয়েছে"
 
-#~ msgid "PC-To-Phone Setup - page %d/%d"
-#~ msgstr "পি-সি থেকে ফোন যোগাযোগ ব্যবস্থা - পৃষ্ঠা %d/%d"
+#: ../src/gui/statusmenu.cpp:87
+msgid "Online"
+msgstr "অন-লাইন"
 
-#~ msgid ""
-#~ "You can make calls to regular phones and cell numbers worldwide using "
-#~ "GnomeMeeting and the MicroTelco service from Quicknet Technologies. To "
-#~ "enable this you need to enter your MicroTelco Account number and PIN "
-#~ "below, then enable registering to the MicroTelco service. Please visit "
-#~ "the GnomeMeeting website for more information."
-#~ msgstr ""
-#~ "গুহ্‌নোমমিটিং এবং কুইকনেট টেকনোলজিস-এর মাইক্রোটেলকো পরিসেবার মাধ্যমে পৃথিবীর যে "
-#~ "কোন প্রান্তের সাধারণ ফোন বা সেল-ফোনে আপনি ফোন করতে পারেন।  এটি ব্যবহারের জন্য "
-#~ "আপনার মাইক্রোটেলকো অ্যাকাউন্ট ও পিন নম্বরটি নিচে লিখুন, এবং তারপর মাইক্রোটেলকো "
-#~ "পরিসেবার সঙ্গে নথিভুক্তকরণ সক্রিয় করুন।  এ বিষয়ে বিশদে জানতে হলে গুহ্‌নোমমিটিং-"
-#~ "এরওয়েবসাইটের চলে যান"
-
-#~ msgid "PC-To-Phone Setup"
-#~ msgstr "পি-সি থেকে ফোনে যোগাযোগ ব্যবস্থা"
+#: ../src/gui/statusmenu.cpp:88
+msgid "Away"
+msgstr "অনুপস্থিত"
 
-#~ msgid "Account number:"
-#~ msgstr "অ্যাকাউন্ট নম্বর:"
+#: ../src/gui/statusmenu.cpp:89
+msgid "Do Not Disturb"
+msgstr "বিঘ্নিত করা হবে না"
 
-#~ msgid "Password:"
-#~ msgstr "পাসওয়ার্ড:"
+#: ../src/gui/statusmenu.cpp:387
+msgid "Custom message..."
+msgstr "স্বনির্ধারিত বার্তা..."
 
-#~ msgid "Register to the MicroTelco service"
-#~ msgstr "মাইক্রোটেলকো পরিসেবায়ে যোগদান"
+#: ../src/gui/statusmenu.cpp:430
+msgid "Clear"
+msgstr "মুছে ফেলুন"
 
-#~ msgid ""
-#~ "Click on one of the following links to get more information about your "
-#~ "existing MicroTelco account, or to create a new account."
-#~ msgstr ""
-#~ "নিম্নস্থিত লিন্কের যে কোনটিতে ক্লিক করুন আপনার মাইক্রোটেলকো অ্যাকাউন্ট সম্বন্ধে "
-#~ "বিশদে জানতে অথবা নতুন অ্যাকাউন্ট তৈরী করার জন্য"
+#. Build the dialog
+#: ../src/gui/statusmenu.cpp:521 ../src/gui/statusmenu.cpp:671
+msgid "Custom Message"
+msgstr "স্বনির্ধারিত বার্তা"
 
-#~ msgid "Get an account"
-#~ msgstr "নতুন অ্যাকাউন্ট তৈরী করুন"
+#: ../src/gui/statusmenu.cpp:537
+msgid "Delete custom messages:"
+msgstr "স্বনির্ধারিত বার্তা মুছে ফেলুন:"
 
-#~ msgid "Buy a card"
-#~ msgstr "কার্ড কিনুন"
+#: ../src/gui/statusmenu.cpp:692
+msgid "Define a custom message:"
+msgstr "একটি স্বনির্ধারিত বার্তা নির্ধারণ করুন:"
 
-#~ msgid "Set Audio player device to %s"
-#~ msgstr "%s অডিও প্লেয়ার ডিভাইস হিসেবে নির্দিশ্ট"
+#~| msgid "Authentication User:"
+#~ msgid "Automatic answer"
+#~ msgstr "স্বয়ংক্রিয় উত্তর:"
 
-#~ msgid "Set Audio recorder device to %s"
-#~ msgstr "%s অডিও রেকর্ডার ডিভাইস হিসেবে নির্দিশ্ট"
+#~ msgid "If enabled, automatically answer incoming calls"
+#~ msgstr "যদি সক্রিয় থাকে। স্বয়ংক্রিয়ভাবে আগত কলের জবাব দিবে"
 
-#~ msgid "Enabling H.245 Tunnelling"
-#~ msgstr "এইচ.২৪৫ টানেলিং সক্রিয় করা হচ্ছে"
+#~ msgid "Call in progress"
+#~ msgstr "কল অগ্রগতির দিকে"
 
-#~ msgid "Disabling H.245 Tunnelling"
-#~ msgstr "এইচ.২৪৫ টানেলিং নিস্ক্রিয় করা হচ্ছে"
+#~| msgid "Add a remote contact"
+#~ msgid "Is a preferred contact"
+#~ msgstr "পছন্দনীয় পরিচিতি"
 
-#~ msgid "Enabling Fast Start"
-#~ msgstr "জলদি শুরু সক্রিয় করা হচ্ছে"
+#~ msgid "inactive"
+#~ msgstr "নিস্ক্রিয়"
 
-#~ msgid "Disabling Fast Start"
-#~ msgstr "জলদি শুরু নিস্ক্রিয় করা হচ্ছে"
+#~ msgid "error connecting (%s)"
+#~ msgstr "সংযোগে ত্রুটি (%s)"
 
-#~ msgid "Auto rejecting incoming call from %s (Do not disturb)"
-#~ msgstr "%s থেকে আসা কল স্বয়ংক্রিয় ভাবে বাতিল করা হচ্ছে (বিরক্ত কর না)"
+#~| msgid "Connection Type"
+#~ msgid "connecting"
+#~ msgstr "সংযোগ করা হচ্ছে"
 
-#~ msgid "Auto Rejected"
-#~ msgstr "স্বয়ংক্রিয় ভাবে বাতিল করা হয়েছে"
+#~| msgid "Authentication User:"
+#~ msgid "authenticating"
+#~ msgstr "অনুমোদনের নাম:"
 
-#~ msgid "Parse error"
-#~ msgstr "পার্স ত্রুটি"
+#~ msgid "error connecting"
+#~ msgstr "সংযোগে ত্রুটি"
 
-#~ msgid ""
-#~ "There was an error while processing the registering to the user "
-#~ "directory: %d %s."
-#~ msgstr "ইউজার ডিরেক্টরিতে নথিভুক্তকরণের সময় একটি ত্রুটি ঘটেছে: %d %s "
+#~ msgid "disconnected"
+#~ msgstr "সংযোগ বিছিন্ন করা"
 
-#~ msgid "Contacting %s..."
-#~ msgstr "সংযোগ করা হচ্ছে %s..."
+#~| msgid "Connected with %s"
+#~ msgid "connected"
+#~ msgstr "সংযুক্ত"
 
-#~ msgid "Failed to contact the user directory %s:%d."
-#~ msgstr "ইউজার ডিরেক্টরির সঙ্গে সংযোগের চেষ্টা ব্যর্থ %s:%d"
+#~ msgid "error authenticating loudmouth account"
+#~ msgstr "লাউডমাউথ অ্যাকাউন্ট প্রমাণীকরণে ত্রুটি"
 
-#~ msgid "Successfully registered to %s."
-#~ msgstr "%s-য়ে নথিভুক্তিকরণ সফল"
+#~| msgid "Server _URI"
+#~ msgid "Server:"
+#~ msgstr "সার্ভার:"
 
-#~ msgid "Successfully unregistered from %s."
-#~ msgstr "%s-য়ে থেকে অনথিভুক্তিকরণ সফল"
+#~ msgid "Resource:"
+#~ msgstr "সম্পদ:"
 
-#~ msgid "Error while unregistering from %s."
-#~ msgstr "%s-য়ের থেকে অনথিভুক্তিকালীন ত্রুটি"
+#~| msgid "Enable Account"
+#~ msgid "Enable account"
+#~ msgstr "অ্যাকাউন্ট সক্রিয় করুন"
 
-#~ msgid ""
-#~ "GnomeMeeting didn't find any usable sound devices. You need to install "
-#~ "and setup a soundcard or a Quicknet card in order to be able to use "
-#~ "GnomeMeeting. Please check your driver settings and permissions."
-#~ msgstr ""
-#~ "গুহ্‌নোমমিটিং ব্যবহারযোগ্য কোন সাউন্ড ডিভাইস পায়নি।  গুহ্‌নোমমিটিং ব্যবহারের জন্য "
-#~ "সাউন্ডকার্ড অথবা কুইকনেট কার্ড ইনস্টল ও সেটআপ করা আবশ্যক।  আপনার ড্রাইভারের "
-#~ "মানসমূহ এবং আনুসাঙ্গিক অনুমতি পরীক্ষা করে দেখুন"
+#~| msgid "_Edit"
+#~ msgid "Edit"
+#~ msgstr "সম্পাদনা"
 
-#~ msgid "Do _Not Disturb"
-#~ msgstr "বিরক্ত কর না (_ন)"
+#~| msgid "_Add a SIP Account"
+#~ msgid "_Add a jabber/XMPP account"
+#~ msgstr "একটি jabber/XMPP অ্যাকাউন্ট যোগ করুন (_A)"
 
-#~ msgid "Aut_o Answer"
-#~ msgstr "স্বয়ং উত্তর (_উ)"
+#~ msgid "Authorization to see your presence"
+#~ msgstr "আপনার উপস্থিতি দেখার প্রমাণীকরণ"
 
-#~ msgid "Auto answer incoming call"
-#~ msgstr "কল এলে স্বয়ংক্রিয় ভাবে উত্তর করা"
+#~ msgid "%s asks the permission to see your presence, saying: \"%s\"."
+#~ msgstr "\"%s\" বলছে যে, %s আপনার উপস্থিতি দেখার জন্য অনুমতি চাচ্ছে।"
 
-#~ msgid "Local Video Image"
-#~ msgstr "স্থানীয় ভিডিওর ছবি"
+#~ msgid "%s asks the permission to see your presence."
+#~ msgstr "%s আপনার উপস্থিতি দেখার জন্য অনুমতি চাচ্ছে।"
 
-#~ msgid "Remote Video Image"
-#~ msgstr "দূরবর্তী ভিডিওর ছবি"
+#~ msgid "grant him/her the permission to see your presence"
+#~ msgstr "তাকে আপনার উপস্থিতি দেখার জন্য অনুমতি দিন"
 
-#~ msgid "Both Video Images"
-#~ msgstr "দুটি ভিডিওর ছবি"
+#~ msgid "refuse him/her the permission to see your presence"
+#~ msgstr "তাকে আপনার উপস্থিতি দেখার জন্য অনুমতি দিবেন না"
 
-#~ msgid "Both (Local and Remote Video in New Windows)"
-#~ msgstr "দুটিই (স্থানীয় এবং দূরবর্তী দু'ই নতুন উইন্ডোতে)"
+#~ msgid "decide later (also close or cancel this dialog)"
+#~ msgstr "পরে সিদ্ধান্ত নেওয়া হবে ( এই ডায়ালগটি বন্ধ করুন অথবা বাতিল করে দিন)"
 
-#~ msgid "Do not disturb (reject incoming calls)"
-#~ msgstr "বিরক্ত কর না (কল এলে বাতিল করা হবে)"
+#~| msgid "No answer timeout"
+#~ msgid "Your answer is: "
+#~ msgstr "আপনার উত্তর:"
 
-#~ msgid "Error: %s\n"
-#~ msgstr "ত্রুটি: %s\n"
+#~| msgid "Edit roster element"
+#~ msgid "Add a roster element"
+#~ msgstr "রস্টারের উপাদান যোগ করুন"
 
-#~ msgid ""
-#~ "Call from %s\n"
-#~ "using %s"
+#~| msgid ""
+#~| "Please fill in this form to add a new contact list to ekiga's remote "
+#~| "roster"
+#~ msgid "Please fill in this form to add a newelement to the remote roster"
 #~ msgstr ""
-#~ "%s থেকে কল\n"
-#~ "%s ব্যবহৃত"
-
-#~ msgid "Okay"
-#~ msgstr "ঠিক আছে"
-
-#~ msgid "Good Quality"
-#~ msgstr "উত্তম মানের"
+#~ "দূরবর্তী রোস্টারের মধ্যে নতুন উপাদান সংযোজন করার জন্য অনুগ্রহ করে এই ফর্মটি পূরণ করুন"
 
-#~ msgid "Excellent Quality"
-#~ msgstr "অতি উত্তম মানের"
+#~| msgid "Identifier"
+#~ msgid "Identifier:"
+#~ msgstr "আইডেন্টিফায়ার:"
 
-#~ msgid "Behavior"
-#~ msgstr "আচরণ"
+#~| msgid "Identifier"
+#~ msgid "identifier@server"
+#~ msgstr "identifier@server"
 
-#~ msgid "_Automatically answer calls"
-#~ msgstr "কলের স্বয়ংক্রিয় উত্তর (_য়)"
+#~ msgid "Ask him/her to see his/her status"
+#~ msgstr "উনাকে তার নিজের অবস্থা দেখতে বলুন"
 
-#~ msgid "Do _not disturb"
-#~ msgstr "বিরক্ত কর না (_ন)"
+#~ msgid "Forbid him/her to see my status"
+#~ msgstr "উনাকে আমার অবস্থা দেখতে বাধা দিন"
 
-#~ msgid "Display a po_pup window when receiving a call"
-#~ msgstr "কল নেওয়ার সময় একটি পপ্‌আপ উইন্ডো দেখানো হবে"
+#~ msgid "Ask him/her to see his/her status (pending)"
+#~ msgstr "উনাকে তার নিজের অবস্থা দেখতে বলুন (মূলতবি)"
 
-#~ msgid "Enable bilinear _filtering on displayed video"
-#~ msgstr "প্রদর্শিত ভিডিওর ক্ষেত্রে বাইলিনিয়ার ফিল্টারিং সক্রিয়"
+#~ msgid "Stop getting his/her status"
+#~ msgstr "তার অবস্থা দেখা বন্ধ করুন"
 
-#~ msgid "User Input Capabilities"
-#~ msgstr "ব্যবহারকারী ইনপুট পদ্ধতিসমূহ"
+#~| msgid "Start hidden"
+#~ msgid "Start chat"
+#~ msgstr "আড্ডা শুরু করুন"
 
-#~ msgid "User Input Capabilities _type:"
-#~ msgstr "ব্যবহারকারী ইনপুট পদ্ধতিসমূহের ধরন (_ধ):"
-
-#~ msgid "Video format:"
-#~ msgstr "ভিডিওর ধরণ:"
+#~| msgid ""
+#~| "Please fill in this form to change an existing element of ekiga's "
+#~| "internal roster"
+#~ msgid ""
+#~ "Please fill in this form to change an existing element of the remote "
+#~ "roster"
+#~ msgstr ""
+#~ "দূরবর্তী রোস্টারের মধ্যে উপস্থিত কোনো সামগ্রীর তথ্য পরিবর্তন করার জন্য অনুগ্রহ করে "
+#~ "এই ফর্মটি পূরণ করুন"
 
-#~ msgid "Video image:"
-#~ msgstr "ভিডিও ছবি:"
+#~ msgid "%s (with %d voicemail message)"
+#~ msgid_plural "%s (with %d voicemail messages)"
+#~ msgstr[0] "%s (%d ভয়েস মেইল বার্তা সহ)"
+#~ msgstr[1] "%s (%d ভয়েস মেইল বার্তা সহ)"
+
+#~| msgid "User:"
+#~ msgid "_User:"
+#~ msgstr "ব্যবহারকারী (_U):"
+
+#~| msgid "_Password"
+#~ msgid "_Password:"
+#~ msgstr "পাসওয়ার্ড (_P):"
+
+#~| msgid "Account ID:"
+#~ msgid "_Account ID:"
+#~ msgstr "অ্যাকাউন্টের ID (_A):"
+
+#~| msgid "Gatekeeper:"
+#~ msgid "_Gatekeeper:"
+#~ msgstr "গেট-কিপার (_G):"
+
+#~| msgid "Timeout:"
+#~ msgid "_Timeout:"
+#~ msgstr "সময়সীমা (_T):"
+
+#~| msgid "Registrar:"
+#~ msgid "_Registrar:"
+#~ msgstr "নিবন্ধনকারী (_R):"
+
+#~| msgid "Authentication User:"
+#~ msgid "_Authentication User:"
+#~ msgstr "অনুমোদনের নাম (_A):"
 
-#~ msgid "Choose a picture"
-#~ msgstr "কোন একটি ছবি বেছে নিন"
+#~ msgid "Forbidden, please check that username and password are correct"
+#~ msgstr ""
+#~ "নিষিদ্ধ, অনুগ্রহ করে পরীক্ষা করুন যে ব্যবহারকারীর নাম এবং পাসওয়ার্ড সঠিক কিনা"
 
-#~ msgid "Failed to open the audio device"
-#~ msgstr "অডিও ডিভাইস ব্যবহারে ব্যর্থ"
+#~| msgid "Remote host is offline"
+#~ msgid "Remote party host is offline"
+#~ msgstr "দূরবর্তী হোস্ট অফলাইন"
 
-#~ msgid ""
-#~ "GnomeMeeting is now playing what it is recording with a 5 seconds delay. "
-#~ "If you don't hear yourself with the delay, you will have to fix your "
-#~ "audio setup and probably install a full-duplex driver before calling "
-#~ "other GnomeMeeting users.\n"
-#~ "\n"
-#~ "Recording and playing... Please talk."
-#~ msgstr ""
-#~ "গুহ্‌নোমমিটিং ৫ সেকেন্ডের বিলম্বে যা রেকর্ড করছে তা বাজিয়ে শোনাচ্ছে। বিলম্বের পর "
-#~ "যদি আপনার রেকর্ড করা কথা শুনতে না পান , তাহলে আপনার অডিও সেটআপটি ঠিক করুন, "
-#~ "এবং সম্ভব হলে অন্য গুহ্‌নোমমিটিং ব্যবহারকারীকে কল করার আগে একটি ফুল-ডুল্পেক্স "
-#~ "ড্রাইভার ইনস্টল করুন\n"
-#~ "\n"
-#~ "রেকর্ড করা হচ্ছে... কথা বলুন"
-
-#~ msgid "Given calls"
-#~ msgstr "আপনার করা কলগুলি"
+#~| msgid "_Action"
+#~ msgid "Active"
+#~ msgstr "সক্রিয়"
 
-#~ msgid "Video Device Opened"
-#~ msgstr "ভিডিও ডিভাইস খোলা হয়েছে"
+#~| msgid "_Enable"
+#~ msgid "Enable"
+#~ msgstr "সক্রিয়"
 
-#~ msgid "Video Device Closed"
-#~ msgstr "ভিডিও ডিভাইস বন্ধ করা হয়েছে"
+#~| msgid "_Disable"
+#~ msgid "Disable"
+#~ msgstr "নিষ্ক্রিয়"
+
+#~| msgid "_Remove"
+#~ msgid "Remove"
+#~ msgstr "সরিয়ে ফেলুন"
+
+#~| msgid "No video will be displayed during this call->"
+#~ msgid "A moving logo will be transmitted during calls."
+#~ msgstr "এই কলের সময় একটি চলমান লোগো স্থানান্তরিত হবে।"
 
-#~ msgid "Tests OK!"
-#~ msgstr "পরীক্ষাগুলি সফল"
+#~ msgid "_Automatically answer incoming calls"
+#~ msgstr "স্বয়ংক্রিয়ভাবে আহত কলের জবাব দেয় (_A)"
diff -Nru ekiga-3.2.5/po/ca@valencia.po ekiga-3.2.6~ppa~karmic1/po/ca@valencia.po
--- ekiga-3.2.5/po/ca@valencia.po	1970-01-01 01:00:00.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/ca@valencia.po	2009-09-22 15:27:35.000000000 +0100
@@ -0,0 +1,3329 @@
+# translation of ekiga.gnome-2-26.po to catalan
+# Translation of ekiga to Catalan.
+# Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Ekiga package.
+#
+# Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>, 2002-2006.
+# David Planella Molas <david.planella@gmail.com>, 2008, 2009.
+# Carles Ferrando Garcia <carles.ferrando@gmail.com>, 2009.
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
+msgid ""
+msgstr ""
+"Project-Id-Version: ekiga.gnome-2-26\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-09 11:14+0200\n"
+"PO-Revision-Date: 2009-08-07 08:43+0200\n"
+"Last-Translator: Carles Ferrando Garcia <carles.ferrando@gmail.com>\n"
+"Language-Team: catalan <tradgnome@softcatala.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: ../ekiga.desktop.in.in.h:1
+msgid "Ekiga Softphone"
+msgstr "Telèfon per programari Ekiga"
+
+#: ../ekiga.desktop.in.in.h:2
+msgid "IP Telephony, VoIP and Video Conferencing"
+msgstr "Telefonia IP, VoIP i videoconferència"
+
+#: ../ekiga.desktop.in.in.h:3
+msgid "Talk to people over the Internet"
+msgstr "Parleu amb gent arreu d'Internet"
+
+#: ../ekiga.schemas.in.in.h:1
+msgid "0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: Custom"
+msgstr "0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: Personalitzat"
+
+#: ../ekiga.schemas.in.in.h:2
+msgid ""
+"Allow Ekiga to fall back to software scaling the picture-in-picture if "
+"hardware support is not available. If this is set to false, Ekiga will not "
+"try to open the PIP if hardware support is not available."
+msgstr ""
+"Permet que l'Ekiga utilitze l'escalat per programari per a la imatge-en-"
+"imatge com a última alternativa en cas que no estiga implementat per "
+"maquinari. Si ho establiu com a fals, l'Ekiga no intentarà obrir la PIP "
+"(imatge-en-imatge) si no està implementat per maquinari."
+
+#: ../ekiga.schemas.in.in.h:3
+msgid "Allow picture-in-picture software scaling"
+msgstr "Permet l'escalat per programari de la imatge-en-imatge"
+
+#: ../ekiga.schemas.in.in.h:4
+msgid "Alternative audio output device"
+msgstr "Dispositiu d'àudio d'eixida alternatiu"
+
+#: ../ekiga.schemas.in.in.h:5
+msgid "Always forward calls to the given host"
+msgstr "Desvia sempre les trucades a un ordinador en concret"
+
+#: ../ekiga.schemas.in.in.h:6
+msgid "Audio input device"
+msgstr "Dispositiu d'àudio d'entrada"
+
+#: ../ekiga.schemas.in.in.h:7
+msgid "Audio output device"
+msgstr "Dispositiu d'àudio d'eixida"
+
+#: ../ekiga.schemas.in.in.h:8 ../src/gui/preferences.cpp:516
+msgid ""
+"Automatically reject or forward incoming calls if no answer is given after "
+"the specified amount of time (in seconds)"
+msgstr ""
+"Rebutja o desvia automàticament les trucades entrants si no es contesta dins "
+"el marge de temps especificat (en segons)"
+
+#: ../ekiga.schemas.in.in.h:9
+msgid "Calls history"
+msgstr "Historial de trucades"
+
+#: ../ekiga.schemas.in.in.h:10
+msgid "Change the main window panel section"
+msgstr "Canvia la secció del quadre de la finestra principal"
+
+#: ../ekiga.schemas.in.in.h:11
+msgid ""
+"Connection will be established in Fast Start mode. Fast Start is a new way "
+"to start calls faster that was introduced in H.323v2. It is not supported by "
+"Netmeeting and using both Fast Start and H.245 Tunneling can crash some "
+"versions of Netmeeting"
+msgstr ""
+"La connexió s'establirà en el mode d'Arrencada Ràpida. Esta és una nova "
+"manera d'iniciar les trucades que va introduir-se en l'H.323v2. El "
+"Netmeeting no ho implementa, de manera que si utilitzeu l'arrencada ràpida i "
+"la tunelització H.245 al mateix temps, vos podeu trobar que algunes versions "
+"del Netmeeting es pengen"
+
+#: ../ekiga.schemas.in.in.h:12
+msgid "Contact long status"
+msgstr "Estat detallat del contacte"
+
+#: ../ekiga.schemas.in.in.h:13
+msgid "Contact short status"
+msgstr "Estat resumit del contacte"
+
+#: ../ekiga.schemas.in.in.h:14
+msgid "DTMF sending"
+msgstr "S'està enviant DTMF"
+
+#: ../ekiga.schemas.in.in.h:15
+msgid "Disable STUN network detection"
+msgstr "Inhabilita la detecció de xarxa STUN"
+
+#: ../ekiga.schemas.in.in.h:16 ../src/gui/preferences.cpp:492
+msgid "Disable the automatic network setup resulting from the STUN test"
+msgstr ""
+"Inhabilita la configuració automàtica de la xarxa resultant de la "
+"comprovació de l'STUN"
+
+#: ../ekiga.schemas.in.in.h:17
+msgid "Disable video hardware acceleration"
+msgstr "Inhabilita l'acceleració del vídeo per maquinari"
+
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3591
+msgid "Display images from your camera device"
+msgstr "Mostra imatges de la càmera"
+
+#: ../ekiga.schemas.in.in.h:19
+msgid "Enable 'Fast Start'"
+msgstr "Habilita l'arrencada ràpida"
+
+#: ../ekiga.schemas.in.in.h:20
+msgid "Enable H.245 tunneling"
+msgstr "Habilita la tunelització H.245"
+
+#: ../ekiga.schemas.in.in.h:21
+msgid "Enable early H.245"
+msgstr "Habilita H.245 a l'inici"
+
+#: ../ekiga.schemas.in.in.h:22
+msgid "Enable echo cancelation"
+msgstr "Habilita la cancel·lació automàtica de l'eco"
+
+#: ../ekiga.schemas.in.in.h:23
+msgid "Enable silence detection"
+msgstr "Habilita la detecció de silenci"
+
+#: ../ekiga.schemas.in.in.h:24
+msgid ""
+"Enter the number of seconds after which Ekiga should try refreshing the NAT "
+"binding when STUN is being used"
+msgstr ""
+"Entreu el nombre de segons que l'Ekiga ha d'esperar abans d'intentar "
+"actualitzar la vinculació NAT quan es faça servir STUN"
+
+#: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
+msgid "Enter your full name"
+msgstr "Introduïu el vostre nom i cognoms"
+
+#: ../ekiga.schemas.in.in.h:26
+msgid "Forward calls to host"
+msgstr "Desvia trucades a l'ordinador"
+
+#: ../ekiga.schemas.in.in.h:27
+msgid "Forward calls to the given host if busy"
+msgstr "Desvia les trucades a un ordinador en concret quan estiga ocupat"
+
+#: ../ekiga.schemas.in.in.h:28
+msgid "Forward calls to the given host if no answer"
+msgstr "Desvia les trucades a un ordinador en concret si no contesto"
+
+#: ../ekiga.schemas.in.in.h:29 ../src/gui/preferences.cpp:1018
+msgid "Frame Rate"
+msgstr "Velocitat dels quadres"
+
+#: ../ekiga.schemas.in.in.h:30
+msgid "Full name"
+msgstr "Nom complet"
+
+#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:477
+msgid ""
+"If enabled, Ekiga will start hidden provided that the notification area is "
+"present in the GNOME panel"
+msgstr ""
+"Si s'habilita, l'Ekiga s'iniciarà amagat, suposant que l'àrea de notificació "
+"estiga habilitada"
+
+#: ../ekiga.schemas.in.in.h:32
+msgid ""
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the field below"
+msgstr ""
+"Si s'habilita, totes les trucades entrants es desviaran a l'ordinador indicat"
+
+#: ../ekiga.schemas.in.in.h:33
+msgid ""
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the field below if you already are in a call or if you are in "
+"Do Not Disturb mode"
+msgstr ""
+"Si s'activa, totes les trucades entrants que rebeu mentre estigueu en una "
+"trucada, o en mode «no molesteu», es desviaran a l'ordinador indicat"
+
+#: ../ekiga.schemas.in.in.h:34
+msgid ""
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the field below if you do not answer the call"
+msgstr ""
+"Si s'habilita, les trucades entrants que no contesteu es desviaran cap a "
+"l'ordinador indicat"
+
+#: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
+msgid "If enabled, offline contacts will be shown in the roster"
+msgstr "Si s'activa, els contactes fora de línia es mostraran a la llista"
+
+#: ../ekiga.schemas.in.in.h:36
+msgid "If enabled, use echo cancelation"
+msgstr "Si s'habilita, utilitza la cancel·lació de l'eco"
+
+#: ../ekiga.schemas.in.in.h:37
+msgid "If enabled, use silence detection with the codecs supporting it"
+msgstr ""
+"Si s'habilita, es farà servir la detecció de silenci per als còdecs que ho "
+"permeten"
+
+#: ../ekiga.schemas.in.in.h:38
+msgid "Kind of network selected in the druid"
+msgstr "Tipus de xarxa seleccionada en l'auxiliar"
+
+#: ../ekiga.schemas.in.in.h:39
+msgid "LDAP servers"
+msgstr "Servidors LDAP"
+
+#: ../ekiga.schemas.in.in.h:40
+msgid "List of configured LDAP servers"
+msgstr "Llista de servidors LDAP configurats"
+
+#: ../ekiga.schemas.in.in.h:41
+msgid "List of folded groups in the roster"
+msgstr "Llista dels grups plegats a la llista"
+
+#: ../ekiga.schemas.in.in.h:42
+msgid "Listen port"
+msgstr "Port on escoltar"
+
+#: ../ekiga.schemas.in.in.h:43
+msgid "Local video window size"
+msgstr "Mida de la finestra del vídeo local"
+
+#: ../ekiga.schemas.in.in.h:44
+msgid "Maximum RX video bitrate"
+msgstr "Taxa de bits màxima per a la recepció del vídeo"
+
+#: ../ekiga.schemas.in.in.h:45
+msgid "Maximum TX video bitrate"
+msgstr "Taxa de bits màxima per a la transmissió del vídeo"
+
+#: ../ekiga.schemas.in.in.h:46
+msgid "Maximum jitter buffer"
+msgstr "Memòria intermèdia màxima per al jitter"
+
+#: ../ekiga.schemas.in.in.h:47
+msgid "NAT Binding Timeout"
+msgstr "S'ha excedit el temps d'espera de la vinculació NAT"
+
+#: ../ekiga.schemas.in.in.h:48
+msgid "No answer timeout"
+msgstr "S'ha excedit el temps d'espera"
+
+#: ../ekiga.schemas.in.in.h:49
+msgid "Outbound Proxy"
+msgstr "Servidor intermediari d'eixida"
+
+#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
+msgid "Place windows displaying video above other windows during calls"
+msgstr ""
+"Disposa les finestres que mostren vídeo per sobre de les altres finestres "
+"durant una trucada"
+
+#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
+msgid "Play busy tone"
+msgstr "Reprodueix el so d'ocupat"
+
+#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:361
+msgid "Play ring tone"
+msgstr "Reprodueix el so del marcat"
+
+#: ../ekiga.schemas.in.in.h:53 ../src/gui/preferences.cpp:351
+msgid "Play sound on incoming calls"
+msgstr "Reprodueix un so per a trucades entrants"
+
+#: ../ekiga.schemas.in.in.h:54
+msgid "Play sound on new message"
+msgstr "Reprodueix un so quan hi haja nous missatges"
+
+#: ../ekiga.schemas.in.in.h:55
+msgid "Play sound on new voice mail"
+msgstr "Reprodueix un so quan hi haja nous correus de veu"
+
+#: ../ekiga.schemas.in.in.h:56
+msgid "Position of the local video window"
+msgstr "Posició de la finestra del vídeo local"
+
+#: ../ekiga.schemas.in.in.h:57
+msgid "Position on the screen of the address book window"
+msgstr "Posició en pantalla de la finestra de la llibreta d'adreces"
+
+#: ../ekiga.schemas.in.in.h:58
+msgid "Position on the screen of the audio settings window"
+msgstr "Posició en pantalla de la finestra de paràmetres d'àudio"
+
+#: ../ekiga.schemas.in.in.h:59
+msgid "Position on the screen of the chat window"
+msgstr "Posició en pantalla de la finestra de xat"
+
+#: ../ekiga.schemas.in.in.h:60
+msgid "Position on the screen of the druid window"
+msgstr "Posició en pantalla de la finestra de l'auxiliar de configuració"
+
+#: ../ekiga.schemas.in.in.h:61
+msgid "Position on the screen of the log window"
+msgstr "Posició en pantalla de la finestra del registre"
+
+#: ../ekiga.schemas.in.in.h:62
+msgid "Position on the screen of the main window"
+msgstr "Posició en pantalla de la finestra principal"
+
+#: ../ekiga.schemas.in.in.h:63
+msgid "Position on the screen of the preferences window"
+msgstr "Posició en pantalla de la finestra de preferències"
+
+#: ../ekiga.schemas.in.in.h:64
+msgid "Position on the screen of the video settings window"
+msgstr "Posició en pantalla de la finestra de paràmetres de vídeo"
+
+#: ../ekiga.schemas.in.in.h:65
+msgid "Remote video window position"
+msgstr "Posició de la finestra del vídeo remot"
+
+#: ../ekiga.schemas.in.in.h:66
+msgid "Remote video window size"
+msgstr "Mida de la finestra del vídeo remot"
+
+#: ../ekiga.schemas.in.in.h:67
+msgid "Select an alternative audio output device to use for sound events."
+msgstr ""
+"Seleccioneu el dispositiu d'àudio d'eixida alternatiu per al so de les "
+"incidències."
+
+#: ../ekiga.schemas.in.in.h:68 ../src/gui/preferences.cpp:777
+msgid "Select the audio input device to use"
+msgstr "Seleccioneu el dispositiu d'àudio d'entrada que vulgueu utilitzar"
+
+#: ../ekiga.schemas.in.in.h:69 ../src/gui/preferences.cpp:770
+msgid "Select the audio output device to use"
+msgstr "Seleccioneu el dispositiu d'àudio d'eixida que vulgueu utilitzar"
+
+#: ../ekiga.schemas.in.in.h:70 ../src/gui/preferences.cpp:936
+msgid ""
+"Select the format for video cameras (does not apply to most USB cameras)"
+msgstr ""
+"Seleccioneu el format per a càmeres de vídeo. (No té rellevància en la "
+"majoria de càmeres USB)"
+
+#: ../ekiga.schemas.in.in.h:71
+msgid ""
+"Select the transmitted video size: Small (QCIF 176x144) or Large (CIF "
+"352x288)"
+msgstr ""
+"Escolliu la mida del vídeo transmés: Petita (QCIF 176x144) o Gran (CIF "
+"352x288)"
+
+#: ../ekiga.schemas.in.in.h:72 ../src/gui/preferences.cpp:928
+msgid ""
+"Select the video input device to use. If an error occurs when using this "
+"device a test picture will be transmitted."
+msgstr ""
+"Seleccioneu el dispositiu de vídeo d'entrada que vulgueu fer servir. Si es "
+"produeix algun error, es transmetrà una imatge de prova."
+
+#: ../ekiga.schemas.in.in.h:73
+msgid "Show offline contacts"
+msgstr "Mostra els contactes fora de línia"
+
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3220
+msgid "Show the call panel"
+msgstr "Mostra el quadre de trucada"
+
+#: ../ekiga.schemas.in.in.h:75
+msgid "Size of the address book window"
+msgstr "Mida de la finestra de la llibreta d'adreces"
+
+#: ../ekiga.schemas.in.in.h:76
+msgid "Size of the audio settings window"
+msgstr "Mida de la finestra de paràmetres d'àudio"
+
+#: ../ekiga.schemas.in.in.h:77
+msgid "Size of the chat window"
+msgstr "Mida de la finestra del xat"
+
+#: ../ekiga.schemas.in.in.h:78
+msgid "Size of the druid window"
+msgstr "Mida de la finestra de l'auxiliar"
+
+#: ../ekiga.schemas.in.in.h:79
+msgid "Size of the preferences window"
+msgstr "Mida de la finestra de preferències"
+
+#: ../ekiga.schemas.in.in.h:80
+msgid "Size of the video settings window"
+msgstr "Mida de la finestra de paràmetres de vídeo"
+
+#: ../ekiga.schemas.in.in.h:81
+msgid "Specify the software scaling algorithm"
+msgstr "Especifiqueu l'algorisme d'escalat per programari"
+
+#: ../ekiga.schemas.in.in.h:82
+msgid ""
+"Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest "
+"neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
+"Does not apply on windows systems."
+msgstr ""
+"Especifiqueu l'algorisme d'escalat per programari: 0: veí més proper, 1: veí "
+"més proper amb un filtre de caixa, 2: filtrat bilineal, 3: filtrat "
+"hiperbòlic. No és aplicable als sistemes Windows."
+
+#: ../ekiga.schemas.in.in.h:83
+msgid "Start hidden"
+msgstr "Arrenca amagat"
+
+#: ../ekiga.schemas.in.in.h:84
+msgid "TCP port range"
+msgstr "Rang de ports TCP"
+
+#: ../ekiga.schemas.in.in.h:85
+msgid "Temporal Spatial Trade Off"
+msgstr "Balanç temporal/espacial"
+
+#: ../ekiga.schemas.in.in.h:86
+msgid "The Audio Codecs List"
+msgstr "Llista de còdecs d'àudio"
+
+#: ../ekiga.schemas.in.in.h:87 ../src/gui/preferences.cpp:727
+msgid "The SIP Outbound Proxy to use for outgoing calls"
+msgstr ""
+"El servidor intermediari d'eixida SIP per a utilitzar en trucades eixints"
+
+#: ../ekiga.schemas.in.in.h:88
+msgid "The STUN Server"
+msgstr "El servidor STUN"
+
+#: ../ekiga.schemas.in.in.h:89
+msgid ""
+"The STUN server to use for STUN Support. STUN is a technology that permits "
+"passage through some types of NAT gateway"
+msgstr ""
+"El servidor STUN a utilitzar per a les funcions d'STUN. L'STUN és una "
+"tecnologia que permet travessar certs tipus d'encaminadors NAT."
+
+#: ../ekiga.schemas.in.in.h:90
+msgid "The Video Codecs List"
+msgstr "La llista de còdecs de vídeo"
+
+#: ../ekiga.schemas.in.in.h:91
+msgid "The accounts list"
+msgstr "La llista de comptes"
+
+#: ../ekiga.schemas.in.in.h:92
+msgid "The audio codecs list"
+msgstr "La llista de còdecs d'àudio"
+
+#: ../ekiga.schemas.in.in.h:93
+msgid "The busy tone sound"
+msgstr "El so d'ocupat"
+
+#: ../ekiga.schemas.in.in.h:94
+msgid ""
+"The chosen sound will be played at the end of calls or calling somebody who "
+"is busy, if enabled"
+msgstr ""
+"Si s'habilita, el so que escolliu es reproduirà al final de cada trucada o "
+"si truqueu algú que estiga ocupat"
+
+#: ../ekiga.schemas.in.in.h:95
+msgid "The chosen sound will be played on incoming calls, if enabled"
+msgstr "Si s'habilita, el so que escolliu es reproduirà quan vos truquen"
+
+#: ../ekiga.schemas.in.in.h:96
+msgid ""
+"The chosen sound will be played when a new instant message is received, if "
+"enabled"
+msgstr ""
+"Si s'habilita, el so que escolliu es reproduirà quan rebeu algun missatge "
+"instantani"
+
+#: ../ekiga.schemas.in.in.h:97
+msgid ""
+"The chosen sound will be played when a new voice mail is received, if enabled"
+msgstr ""
+"Si s'habilita, el so que escolliu es reproduirà quan rebeu algun correu de "
+"veu"
+
+#: ../ekiga.schemas.in.in.h:98
+msgid "The chosen sound will be played when calling somebody, if enabled"
+msgstr "Si s'habilita, el so que escolliu es reproduirà quan truqueu a algú"
+
+#: ../ekiga.schemas.in.in.h:99
+msgid "The default video view"
+msgstr "La visualització de vídeo predeterminada"
+
+# FIXME
+#: ../ekiga.schemas.in.in.h:100
+msgid ""
+"The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with "
+"local video in a separate window, 4: Both)"
+msgstr ""
+"La visualització de vídeo predeterminada (0: Local, 1: Remota, 2: Ambdues en "
+"capes, 3: Ambdues, amb el vídeo local en una finestra separada, 4: Ambdues)"
+
+#: ../ekiga.schemas.in.in.h:101
+msgid "The dial tone sound"
+msgstr "El so del to del marcatge"
+
+#: ../ekiga.schemas.in.in.h:102
+msgid "The history of the 100 last calls"
+msgstr "L'historial de les darreres 100 trucades"
+
+#: ../ekiga.schemas.in.in.h:103 ../src/gui/preferences.cpp:676
+#: ../src/gui/preferences.cpp:730
+msgid "The host where calls should be forwarded if call forwarding is enabled"
+msgstr ""
+"El nom de l'ordinador on es desviaran les trucades si el desviament de "
+"trucades està activat"
+
+#: ../ekiga.schemas.in.in.h:104
+msgid "The incoming call sound"
+msgstr "El so per a trucades que rebeu"
+
+#: ../ekiga.schemas.in.in.h:105
+msgid "The list of accounts to which Ekiga should register"
+msgstr "La llista de comptes als que l'Ekiga s'hauria de registrar"
+
+#: ../ekiga.schemas.in.in.h:106
+msgid "The long status information"
+msgstr "La informació detallada sobre l'estat"
+
+#: ../ekiga.schemas.in.in.h:107
+msgid ""
+"The maximum RX video bitrate in kbit/s. This value will be signaled to the "
+"peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
+"above the signaled value"
+msgstr ""
+"La taxa de bits màxima per a la recepció del vídeo, en kbit/s. Este valor "
+"s'indicarà a l'extrem de l'interlocutor que puga (si ho implementa) ajustar "
+"la seua taxa de bits de transmissió en cas que sobrepasse el valor indicat."
+
+#: ../ekiga.schemas.in.in.h:108
+msgid ""
+"The maximum TX video bitrate in kbit/s. The video quality and the number of "
+"transmitted frames per second (depends on selected codec) will be "
+"dynamically adjusted above their minimum during calls to try to minimize the "
+"bandwidth to the given value"
+msgstr ""
+"La taxa de bits per a la transmissió de vídeo en kbits/s. La qualitat del "
+"vídeo i el nombre de quadres per segon transmesos (depenent del còdec "
+"utilitzat) s'ajustaran automàticament per sobre del seu mínim durant les "
+"trucades. D'esta manera, s'intentarà minimitzar l'amplada de banda al valor "
+"que indiqueu ací"
+
+#: ../ekiga.schemas.in.in.h:109
+msgid "The maximum jitter buffer size for audio reception (in ms)"
+msgstr ""
+"El valor màxim de la memòria intermèdia per al jitter en la recepció d'àudio "
+"(en ms)"
+
+#: ../ekiga.schemas.in.in.h:110
+msgid ""
+"The maximum transmitted frame rate in frames/s. This rate may not be reached "
+"in case a minimum quality was configure via a TSTO value smaller than 31 and "
+"the bitrate selected is not sufficient to support this minimum quality"
+msgstr ""
+"El nombre màxim de quadres per segon transmesos. Pot ser que esta taxa no "
+"s'assolisca en cas que s'haja configurat una qualitat mínima a través d'un "
+"valor de balanç temporal/espacial menor de 31, i que la taxa de bits "
+"seleccionada no siga suficient per a funcionar amb esta qualitat mínima"
+
+#: ../ekiga.schemas.in.in.h:111
+msgid "The new instant message sound"
+msgstr "El so per a nous missatges instantanis"
+
+#: ../ekiga.schemas.in.in.h:112
+msgid "The new voice mail sound"
+msgstr "El so per a nous correus de veu"
+
+#: ../ekiga.schemas.in.in.h:113
+msgid ""
+"The port to listen to for incoming connections. Ekiga needs to be restarted "
+"for the new value to take effect"
+msgstr ""
+"El port on escoltar per a la recepció de connexions entrants. Caldrà que "
+"reinicieu l'Ekiga per tal que el nou valor tinga efecte"
+
+#: ../ekiga.schemas.in.in.h:114
+msgid ""
+"The port to listen to for incoming connections. Ekiga needs to be restarted "
+"for the new value to take effect."
+msgstr ""
+"El port on escoltar per a la recepció de connexions entrants. Caldrà que "
+"reinicieu l'Ekiga per tal que el nou valor tinga efecte."
+
+#: ../ekiga.schemas.in.in.h:115
+msgid "The position of the local video window"
+msgstr "La posició de la finestra del vídeo local"
+
+#: ../ekiga.schemas.in.in.h:116
+msgid "The position of the remote video window"
+msgstr "La posició de la finestra del vídeo remot"
+
+#: ../ekiga.schemas.in.in.h:117
+msgid ""
+"The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
+"port range has no effect if both participants to the conference are using "
+"H.245 Tunneling."
+msgstr ""
+"L'interval de ports TCP que l'Ekiga farà servir per al canal H.323 H.245. "
+"Este rang de ports no té cap efecte si els dos participants a la conferència "
+"fan servir la tunelització H.245."
+
+#: ../ekiga.schemas.in.in.h:118
+msgid "The range of UDP ports that Ekiga will use."
+msgstr "L'interval de ports UDP que utilitzarà l'Ekiga."
+
+#: ../ekiga.schemas.in.in.h:119
+msgid "The short status information"
+msgstr "La informació resumida sobre l'estat"
+
+#: ../ekiga.schemas.in.in.h:120
+msgid "The size of the local video window"
+msgstr "La mida de la finestra del vídeo local"
+
+#: ../ekiga.schemas.in.in.h:121
+msgid "The size of the remote video window"
+msgstr "La mida de la finestra del vídeo remot"
+
+#: ../ekiga.schemas.in.in.h:122
+msgid ""
+"The sound that will be played at the end of calls or when calling somebody "
+"who is busy, if enabled"
+msgstr ""
+"Si s'habilita, el so que es reproduirà al final de les trucades o quan "
+"truqueu algú que estiga ocupat"
+
+#: ../ekiga.schemas.in.in.h:123
+msgid "The sound that will be played on incoming calls, if enabled"
+msgstr "Si s'habilita, el so que es reproduirà per a trucades entrants"
+
+#: ../ekiga.schemas.in.in.h:124
+msgid "The sound that will be played when calling somebody, if enabled"
+msgstr "Si s'habilita, el so que es reproduirà quan es truque algú"
+
+#: ../ekiga.schemas.in.in.h:125
+msgid ""
+"The sound that will be played when there is a new instant message, if enabled"
+msgstr ""
+"Si s'habilita, el so que es reproduirà quan es reba un missatge instantani"
+
+#: ../ekiga.schemas.in.in.h:126
+msgid ""
+"The sound that will be played when there is a new voice mail, if enabled"
+msgstr "Si s'habilita, el so que es reproduirà quan es reba un correu de veu"
+
+#: ../ekiga.schemas.in.in.h:127 ../src/gui/preferences.cpp:932
+msgid "The video channel number to use (to select camera, tv or other sources)"
+msgstr ""
+"El canal de vídeo que es farà servir (seleccioneu càmera, tv, o altres "
+"fonts...)"
+
+#: ../ekiga.schemas.in.in.h:128
+msgid "The video codecs list"
+msgstr "La llista de còdecs de vídeo"
+
+#: ../ekiga.schemas.in.in.h:129
+msgid "The video view before having switched to fullscreen"
+msgstr "La vista del vídeo abans d'haver commutat a pantalla completa"
+
+#: ../ekiga.schemas.in.in.h:130
+msgid ""
+"The video view before having switched to fullscreen (same values as "
+"video_view)"
+msgstr ""
+"La vista de vídeo abans d'haver commutat a la visualització de pantalla "
+"completa (s'hi permeten els mateixos valors que a video_view)"
+
+#: ../ekiga.schemas.in.in.h:131
+msgid "The zoom value"
+msgstr "El valor del zoom"
+
+#: ../ekiga.schemas.in.in.h:132
+msgid ""
+"The zoom value in percent to apply to images displayed in the main GUI (can "
+"be 50, 100, or 200)"
+msgstr ""
+"El percentatge d'augment que s'aplicarà per a les imatges mostrades a la "
+"interfície principal (pot ser 50, 100 o 200)"
+
+#: ../ekiga.schemas.in.in.h:133
+msgid ""
+"This allows you to set the mode for sending DTMFs. The values can be "
+"\"RFC2833\" (0), \"INFO\" (1)"
+msgstr ""
+"Això permet especificar el mode d'enviament de DTMF. Els valors poden ser "
+"«RFC2833», «\\» (0), «INDO» (1)"
+
+#: ../ekiga.schemas.in.in.h:134
+msgid ""
+"This allows you to set the mode for sending DTMFs. The values can be \"String"
+"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
+"\"). Choosing other values than \"String\" disables the Text Chat"
+msgstr ""
+"Això permet seleccionar el mode per a l'emissió de DTMF. Els valors poden "
+"ser «String» (0), «To» (1), «RFC2833» (2), o bé «Q.931» (3) (per defecte és "
+"«String»). Si escolliu un valor que no siga «String», s'inhabilitarà el xat de "
+"text"
+
+#: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
+msgid ""
+"This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
+"are encapsulated into the H.225 channel (port 1720). This saves one TCP "
+"connection during calls. H.245 Tunneling was introduced in H.323v2 and "
+"Netmeeting does not support it. Using both Fast Start and H.245 Tunneling "
+"can crash some versions of Netmeeting."
+msgstr ""
+"Això habilitarà la tunelització H.245. En este mode, els missatges estaran "
+"encapsulats en el canal H.225 (port 1720), cosa que permet estalviar un port "
+"TCP durant les trucades. La tunelització H.245 es va introduir a la versió 2 "
+"del protocol H.323, i el Netmeeting no ho implementa. Si s'utilitza "
+"l'Arrencada ràpida juntament amb la Tunelització H.245 al mateix temps, és "
+"possible que algunes versions del Netmeeting fallen."
+
+#: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:690
+msgid "This enables H.245 early in the setup"
+msgstr "Això habilita H.245 al principi de la configuració"
+
+#: ../ekiga.schemas.in.in.h:137
+msgid ""
+"This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
+"acceleration"
+msgstr ""
+"Esta clau inhabilita l'acceleració per maquinari del DirectX (al win32) i de "
+"l'XVideo (al Linux)"
+
+#: ../ekiga.schemas.in.in.h:138
+msgid "UDP port range"
+msgstr "Rang de ports UDP"
+
+#: ../ekiga.schemas.in.in.h:139
+msgid "Video channel"
+msgstr "Canal de vídeo"
+
+#: ../ekiga.schemas.in.in.h:140
+msgid "Video format"
+msgstr "Format de vídeo"
+
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
+msgid "Video input device"
+msgstr "Dispositiu de vídeo d'entrada"
+
+#: ../ekiga.schemas.in.in.h:142
+msgid "Video preview"
+msgstr "Visualització prèvia del vídeo"
+
+#: ../ekiga.schemas.in.in.h:143
+msgid "Video size"
+msgstr "Mida del vídeo"
+
+#: ../ekiga.schemas.in.in.h:144
+msgid ""
+"Whether to prefer to sustain the max. frame rate or lower it possibly in "
+"order to keep a minimum level of (spatial) quality for all frames. 0: "
+"Highest minimal quality, 31: lowest minimal quality"
+msgstr ""
+"Si preferiu mantindre el nombre màxim de quadres per segon o bé disminuir-lo "
+"de manera que es mantinga un nivell mínim de qualitat (espacial) per a tots "
+"els quadres. Es permet l'interval de valors següents: 0: qualitat mínima "
+"màxima, 31: qualitat mínima mínima"
+
+#: ../lib/engine/addressbook/contact-core.cpp:60
+msgid "_Find"
+msgstr "_Cerca"
+
+#: ../lib/engine/components/avahi/avahi-heap.cpp:125
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
+msgid "Neighbours"
+msgstr "Veïns"
+
+#: ../lib/engine/components/call-history/history-book.cpp:137
+#: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
+msgid "Clear List"
+msgstr "Neteja la llista"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:155
+msgid "Received"
+msgstr "Trucades rebudes"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:158
+msgid "Placed"
+msgstr "Trucades fetes"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:161
+msgid "Missed"
+msgstr "Trucades perdudes"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:76
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
+#, c-format
+msgid "%d user found"
+msgid_plural "%d users found"
+msgstr[0] "S'ha trobat %d usuari"
+msgstr[1] "S'han trobat %d usuaris"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:283
+msgid "New _Contact"
+msgstr "Afig un _contacte"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
+#: ../lib/engine/components/local-roster/local-cluster.cpp:82
+#: ../lib/engine/components/local-roster/local-heap.cpp:117
+msgid "New contact"
+msgstr "Afegisca contacte"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
+msgid "Please update the following fields:"
+msgstr "Actualitzeu els camps següents:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
+msgid "_Name:"
+msgstr "_Nom:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
+msgid "VoIP _URI:"
+msgstr "_URI de VoIP:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+msgid "_Home phone:"
+msgstr "Telèfon _particular:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+msgid "_Office phone:"
+msgstr "Telèfon de la _faena:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:327
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+msgid "_Cell phone:"
+msgstr "Telèfon _mòbil:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:328
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+msgid "_Pager:"
+msgstr "_Cercapersones:"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:234
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3178
+msgid "_Edit"
+msgstr "_Edita"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:236
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
+msgid "_Remove"
+msgstr "_Suprimeix"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
+msgid "Edit contact"
+msgstr "Edita el contacte"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:169
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+msgid "Name:"
+msgstr "Nom:"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
+msgid "Remove contact"
+msgstr "Suprimeix el contacte"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
+#, c-format
+msgid "Are you sure you want to remove %s from the addressbook?"
+msgstr "Esteu segur que voleu suprimir %s de la llibreta d'adreces?"
+
+#: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
+msgid "Audio test"
+msgstr "Comprovació de l'àudio"
+
+#: ../lib/engine/components/gstreamer/gst-audiooutput.cpp:320
+msgid "Silent"
+msgstr "En silenci"
+
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
+msgid "Video test"
+msgstr "Comprovació del vídeo"
+
+#. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Crazy"
+msgstr "Boig"
+
+# FIXME (dpm)
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Screencast"
+msgstr "Screencast"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
+msgid "_Refresh"
+msgstr "_Refresca"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
+msgid "_Remove addressbook"
+msgstr "_Suprimeix la llibreta d'adreces"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
+msgid "Addressbook _properties"
+msgstr "_Propietats de la llibreta d'adreces"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
+msgid "LDAP SASL Interaction"
+msgstr "Interacció LDAP SASL"
+
+#. Translators, Howard explained : "Challenge" is a generic term
+#. * in authentication. It's a prompt from the authentication mechanism
+#. * for some type of credential. Exactly what kind of challenge and
+#. * what kind of credential depends on the specific authentication
+#. * mechanism. Since SASL is a generic interface, and can dynamically
+#. * load arbitrary mechanisms, there's not much more specific you can
+#. * say about it. You might google for "challenge response
+#. * authentication" if you'd like more background context.
+#.
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
+msgid "Challenge: "
+msgstr "Desafiament: "
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
+msgid "Interact"
+msgstr "Interacciona"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
+msgid "Refreshing"
+msgstr "S'està refrescant"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
+msgid "Could not initialize server"
+msgstr "No s'ha pogut inicialitzar el servidor"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
+msgid "LDAP Error: "
+msgstr "Error de l'LDAP: "
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
+msgid "Contacted server"
+msgstr "S'ha contactat amb el servidor"
+
+#. patience == 0
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
+msgid "Could not connect to server"
+msgstr "No s'ha pogut connectar al servidor"
+
+#. patience == 0
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
+msgid "Could not search"
+msgstr "No s'ha pogut cercar"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
+msgid "Waiting for search results"
+msgstr "S'estan esperant els resultats de la cerca"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
+msgid "Please edit the following fields"
+msgstr "Per favor, editeu els camps següents"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
+msgid "Book _Name"
+msgstr "_Nom del llibre"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
+msgid "Server _URI"
+msgstr "_URI del servidor"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
+msgid "_Base DN"
+msgstr "Nom de domini _base"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
+msgid "Subtree"
+msgstr "Subàrbre"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
+msgid "Single Level"
+msgstr "Un sol nivell"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
+msgid "_Search Scope"
+msgstr "Àmbit de _cerca:"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
+msgid "_DisplayName Attribute"
+msgstr "Atribut _DisplayName"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
+msgid "Call _Attributes"
+msgstr "_Atributs de la trucada"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
+msgid "_Filter Template"
+msgstr "Plantilla de _filtre"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
+msgid "Bind _ID"
+msgstr "_Identificador de vinculació"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
+msgid "_Password"
+msgstr "_Contrasenya"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
+msgid "Use TLS"
+msgstr "Utilitza el TLS"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
+msgid "Use SASL"
+msgstr "Utilitza el SASL"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
+msgid "SASL _Mechanism"
+msgstr "_Mecanisme del SASL"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
+msgid "Edit LDAP directory"
+msgstr "Edita el directori LDAP"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
+msgid "Please provide a Book Name for this directory\n"
+msgstr "Heu de proporcionar un nom de llibre per a este directori\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
+msgid "Please provide a Server URI\n"
+msgstr "Heu de proporcionar un URI de servidor\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
+msgid "Please provide a DisplayName Attribute\n"
+msgstr "Heu de proporcionar un atribut DisplayName\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
+msgid "Please provide a Call Attribute\n"
+msgstr "Heu de proporcionar un atribut de trucada\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
+msgid "Invalid Server URI\n"
+msgstr "L'URI del servidor no és vàlid\n"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
+msgid "Add an LDAP Address Book"
+msgstr "Afig una llibreta d'adreces LDAP"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
+msgid "Add the Ekiga.net Directory"
+msgstr "Afig el directori d'usuaris d'ekiga.net"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:152
+msgid "Create LDAP directory"
+msgstr "Crea el directori LDAP"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:167
+msgid "Ekiga.net Directory"
+msgstr "Directori d'usuaris d'ekiga.net"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
+msgid "Edit roster element"
+msgstr "Edita l'element de la llista"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
+msgid ""
+"Please fill in this form to change an existing element of ekiga's internal "
+"roster"
+msgstr ""
+"Ompliu este formulari per a canviar un element existent de la llista interna "
+"de l'Ekiga"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:170
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
+msgid "Address:"
+msgstr "Adreça:"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
+msgid "Choose groups:"
+msgstr "Escolliu els grups:"
+
+#: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
+msgid "Add to local roster"
+msgstr "Afig a la llista local"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
+msgid "Services"
+msgstr "Serveis"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
+msgid "Echo test"
+msgstr "Test d'eco"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
+msgid "Conference room"
+msgstr "Sala de conferències"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:110
+msgid "Local roster"
+msgstr "Llista local"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:127
+msgid "Rename"
+msgstr "Canvia el nom"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
+msgid "Family"
+msgstr "Família"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
+msgid "Friend"
+msgstr "Amic"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
+msgid "Associate"
+msgstr "Soci"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
+msgid "Assistant"
+msgstr "Assistent"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
+msgid "Supervisor"
+msgstr "Supervisor"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
+msgid "Self"
+msgstr "Jo mateix/a"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
+msgid ""
+"Please fill in this form to add a new contact to ekiga's internal roster"
+msgstr ""
+"Ompliu este formulari per a afegir un contacte nou a la llista interna de "
+"l'Ekiga"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
+msgid "Put contact in groups:"
+msgstr "Posa el contacte en els grups:"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
+msgid "You supplied an unsupported address"
+msgstr "Heu especificat una adreça no compatible"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
+msgid "You already have a contact with this address!"
+msgstr "Ja teniu un contacte amb esta adreça"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
+msgid "Rename group"
+msgstr "Canvia el nom del grup"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
+msgid "Please edit this group name"
+msgstr "Editeu el nom d'este grup"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:230
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
+msgid "Call"
+msgstr "Trucada"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:231
+#: ../lib/engine/components/opal/sip-endpoint.cpp:235 ../src/gui/main.cpp:2952
+msgid "Transfer"
+msgstr "Transfereix"
+
+#. Translators : The alias we are registering already exists : failure
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
+msgid "Duplicate alias"
+msgstr "Sobrenom duplicat"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
+msgid "Bad username/password"
+msgstr "Nom d'usuari o contrasenya incorrectes"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:900
+msgid "Transport error"
+msgstr "S'ha produit un error en el transport"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:907
+msgid "Failed"
+msgstr "Ha fallat"
+
+#: ../lib/engine/components/opal/opal-account.cpp:303
+msgid "_Disable"
+msgstr "_Inhabilita"
+
+#: ../lib/engine/components/opal/opal-account.cpp:306
+msgid "_Enable"
+msgstr "_Habilita"
+
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
+msgid "Recharge the account"
+msgstr "Recarrega el compte"
+
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
+msgid "Consult the balance history"
+msgstr "Consulta l'historial del balanç"
+
+#: ../lib/engine/components/opal/opal-account.cpp:337
+msgid "Consult the call history"
+msgstr "Consulta l'historial de trucades"
+
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
+msgid "Edit account"
+msgstr "Edita el compte"
+
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
+msgid "Registrar:"
+msgstr "Registrador:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
+msgid "Gatekeeper:"
+msgstr "Gatekeeper:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:174
+msgid "User:"
+msgstr "Nom d'usuari:"
+
+#. Translators:
+#. * SIP knows two usernames: The name for the client ("User") and the name
+#. * for the authentication procedure ("Authentication User")
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
+msgid "Authentication User:"
+msgstr "Usuari per a l'autenticació:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:173
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
+msgid "Timeout:"
+msgstr "Temps d'espera:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
+msgid "Enable Account"
+msgstr "Habilita el compte"
+
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
+msgid "You did not supply a name for that account."
+msgstr "No heu introduït cap nom per al compte."
+
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
+msgid "You did not supply a host to register to."
+msgstr "No heu indicat cap ordinador on efectuar el registre."
+
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
+msgid "You did not supply a user name for that account."
+msgstr "No heu introduït cap nom d'usuari per al compte."
+
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
+msgid "The timeout should have a bigger value."
+msgstr "El temps d'espera hauria de ser més llarg."
+
+#: ../lib/engine/components/opal/opal-bank.cpp:75
+msgid "_Add an Ekiga.net Account"
+msgstr "_Afig un compte d'ekiga.net"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:77
+msgid "_Add an Ekiga Call Out Account"
+msgstr "_Afig un PC-a-telèfon de l'Ekiga"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:79
+msgid "_Add a SIP Account"
+msgstr "_Afig un compte SIP"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:81
+msgid "_Add an H.323 Account"
+msgstr "_Afig un compte H.323"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:96
+msgid "Please update the following fields."
+msgstr "Actualitzeu els camps següents."
+
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
+msgid "Get an Ekiga.net SIP account"
+msgstr "Obteniu un compte SIP a ekiga.net"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
+msgid "Get an Ekiga Call Out account"
+msgstr "Obteniu un compte PC-a-telèfon de l'Ekiga"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2706
+#: ../src/gui/main.cpp:2801
+msgid "Account ID:"
+msgstr "Identificador del compte:"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:117
+msgid "PIN Code:"
+msgstr "Codi PIN:"
+
+#: ../lib/engine/components/opal/opal-call.cpp:404
+msgid "Local user cleared the call"
+msgstr "L'usuari local ha tallat la trucada"
+
+#: ../lib/engine/components/opal/opal-call.cpp:407
+#: ../lib/engine/components/opal/opal-call.cpp:410
+msgid "Local user rejected the call"
+msgstr "L'usuari local ha rebutjat la trucada"
+
+#: ../lib/engine/components/opal/opal-call.cpp:413
+msgid "Remote user cleared the call"
+msgstr "L'usuari remot ha tallat la trucada"
+
+#: ../lib/engine/components/opal/opal-call.cpp:416
+msgid "Remote user rejected the call"
+msgstr "L'usuari remot ha rebutjat la trucada"
+
+#: ../lib/engine/components/opal/opal-call.cpp:419
+msgid "Remote user has stopped calling"
+msgstr "L'usuari remot ha deixat de trucar"
+
+#: ../lib/engine/components/opal/opal-call.cpp:422
+msgid "Abnormal call termination"
+msgstr "La trucada ha acabat anormalment"
+
+#: ../lib/engine/components/opal/opal-call.cpp:425 ../src/gui/main.cpp:1496
+msgid "Could not connect to remote host"
+msgstr "No s'ha pogut connectar a l'ordinador remot"
+
+#: ../lib/engine/components/opal/opal-call.cpp:428
+msgid "The Gatekeeper cleared the call"
+msgstr "El gatekeeper ha tallat la trucada"
+
+#: ../lib/engine/components/opal/opal-call.cpp:431
+msgid "User not found"
+msgstr "No s'ha trobat este usuari"
+
+#: ../lib/engine/components/opal/opal-call.cpp:434
+msgid "Insufficient bandwidth"
+msgstr "No hi ha prou amplada de banda"
+
+#: ../lib/engine/components/opal/opal-call.cpp:437
+msgid "No common codec"
+msgstr "No hi ha cap còdec en comú"
+
+#: ../lib/engine/components/opal/opal-call.cpp:440
+msgid "Call forwarded"
+msgstr "S'ha desviat la trucada"
+
+#: ../lib/engine/components/opal/opal-call.cpp:443
+msgid "Security check failed"
+msgstr "Ha fallat la verificació de seguretat"
+
+#: ../lib/engine/components/opal/opal-call.cpp:446
+msgid "Local user is busy"
+msgstr "L'usuari local està ocupat"
+
+#: ../lib/engine/components/opal/opal-call.cpp:449
+#: ../lib/engine/components/opal/opal-call.cpp:455
+msgid "Congested link to remote party"
+msgstr "L'enllaç cap al vostre interlocutor està saturat"
+
+#: ../lib/engine/components/opal/opal-call.cpp:452
+msgid "Remote user is busy"
+msgstr "L'usuari remot està ocupat"
+
+#: ../lib/engine/components/opal/opal-call.cpp:458
+msgid "Remote host is offline"
+msgstr "L'usuari remot no està en línia"
+
+#: ../lib/engine/components/opal/opal-call.cpp:464
+msgid "User is not available"
+msgstr "L'usuari no està disponible"
+
+#: ../lib/engine/components/opal/opal-call.cpp:476
+msgid "Call completed"
+msgstr "S'ha finalitzat la trucada"
+
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
+msgid ""
+"Ekiga did not manage to configure your network settings automatically. You "
+"can still use it, but you need to configure your network settings manually.\n"
+"\n"
+"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"for instructions"
+msgstr ""
+"L'Ekiga no ha pogut gestionar els paràmetres de xarxa automàticament. El "
+"podeu utilitzar de totes maneres, però caldrà que configureu els paràmetres "
+"de xarxa manualment.\n"
+"\n"
+"Consulteu la pàgina http://wiki.ekiga.org/index.php/"
+"Enable_port_forwarding_manually per a obtindre'n instruccions"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:255
+#: ../lib/engine/components/opal/sip-endpoint.cpp:257
+msgid "Message"
+msgstr "Missatge"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:714
+msgid "Bad request"
+msgstr "Petició incorrecta"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:718
+msgid "Payment required"
+msgstr "Requereix pagament"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:722
+msgid "Unauthorized"
+msgstr "No autoritzat"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:726
+msgid "Forbidden"
+msgstr "Prohibit"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:730
+msgid "Timeout"
+msgstr "Temporització"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:734
+msgid "Conflict"
+msgstr "Conflicte"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:738
+msgid "Temporarily unavailable"
+msgstr "Temporalment no disponible"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:742
+msgid "Not acceptable"
+msgstr "No és acceptable"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:746
+msgid "Illegal status code"
+msgstr "Codi d'estat il·legal"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:750
+msgid "Multiple choices"
+msgstr "Opcions múltiples"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:754
+msgid "Moved permanently"
+msgstr "S'ha traslladat de manera permanent"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:758
+msgid "Moved temporarily"
+msgstr "S'ha traslladat de manera temporal"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:762
+msgid "Use proxy"
+msgstr "Fes servir un servidor intermediari"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:766
+msgid "Alternative service"
+msgstr "Servei alternatiu"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:770
+msgid "Not found"
+msgstr "No s'ha trobat"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:774
+msgid "Method not allowed"
+msgstr "No es permet el mètode"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:778
+msgid "Proxy authentication required"
+msgstr "Cal autenticació per al servidor intermediari"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:782
+msgid "Length required"
+msgstr "Cal especificar la llargada"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:786
+msgid "Request entity too big"
+msgstr "L'entitat de la sol·licitud és massa grossa"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:790
+msgid "Request URI too long"
+msgstr "L'URI de la sol·licitud és massa llarg"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:794
+msgid "Unsupported media type"
+msgstr "No s'implementa este tipus de medi"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:798
+msgid "Unsupported URI scheme"
+msgstr "No s'implementa este esquema d'URI"
+
+#. Translators : The extension we are trying to register does not exist
+#: ../lib/engine/components/opal/sip-endpoint.cpp:803
+msgid "Bad extension"
+msgstr "L'extensió és incorrecta"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:807
+msgid "Extension required"
+msgstr "Cal una extensió"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:811
+msgid "Interval too brief"
+msgstr "L'interval és massa breu"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:815
+msgid "Loop detected"
+msgstr "S'ha detectat un bucle"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:819
+msgid "Too many hops"
+msgstr "Hi ha massa salts"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:823
+msgid "Address incomplete"
+msgstr "L'adreça és incompleta"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:827
+msgid "Ambiguous"
+msgstr "Ambigu"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:831
+msgid "Busy Here"
+msgstr "Ocupat ací"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:835
+msgid "Request terminated"
+msgstr "Sol·licitud terminada"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:839
+msgid "Not acceptable here"
+msgstr "No és acceptable ací"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:843
+msgid "Bad event"
+msgstr "Esdeveniment incorrecte"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:847
+msgid "Request pending"
+msgstr "Sol·licitud pendent"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:851
+msgid "Undecipherable"
+msgstr "No desxifrable"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:855
+msgid "Internal server error"
+msgstr "Error intern del servidor"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:859
+msgid "Not implemented"
+msgstr "No implementat"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:863
+msgid "Bad gateway"
+msgstr "Passarel·la incorrecta"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:867
+msgid "Service unavailable"
+msgstr "Servei no disponible"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:871
+msgid "Server timeout"
+msgstr "S'ha excedit el temps d'espera del servidor"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:875
+msgid "SIP version not supported"
+msgstr "La versió del SIP no és compatible"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:879
+msgid "Message too large"
+msgstr "El missatge és massa llarg"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:883
+msgid "Busy everywhere"
+msgstr "Ocupat a tot arreu"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:887
+msgid "Decline"
+msgstr "Rebutja"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:891
+msgid "Does not exist anymore"
+msgstr "Ja no existeix"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:895
+msgid "Globally not acceptable"
+msgstr "No és globalment acceptable"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1032
+msgid "Could not send message"
+msgstr "No s'ha pogut enviar el missatge"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1154
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Trucada entrant de %s"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1156
+#, c-format
+msgid "Incoming call"
+msgstr "Trucada entrant"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1162
+#, c-format
+msgid "In a call with %s"
+msgstr "S'està trucant a %s"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1164
+#, c-format
+msgid "In a call"
+msgstr "S'està trucant"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:102
+msgid "New resource list"
+msgstr "Llista de recursos nova"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:166
+msgid "Add new resource-list"
+msgstr "Afig una llista de recursos nova"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:167
+msgid ""
+"Please fill in this form to add a new contact list to ekiga's remote roster"
+msgstr ""
+"Empleneu este formulari per a afegir un contacte nou a la llista de "
+"contactes remota de l'Ekiga"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:171
+msgid "Writable:"
+msgstr "Es pot escriure:"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:172
+msgid "Username:"
+msgstr "Nom d'usuari:"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
+#: ../lib/engine/components/resource-list/rl-heap.cpp:178
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
+msgid "Unnamed"
+msgstr "Sense nom"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:200
+msgid "_Add a new contact"
+msgstr "_Afig un contacte nou"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:202
+msgid "_Refresh contact list"
+msgstr "_Refresca la llista de contactes"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:204
+msgid "Contact list _properties"
+msgstr "_Propietats de la llista de contactes"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
+msgid "Edit contact list properties"
+msgstr "Edita les propietats de la llista de contactes"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
+msgid "Please edit the following fields (no identifier means global)"
+msgstr ""
+"Editeu els camps següents (si no hi ha cap identificador significa global)"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+msgid "Contact list's name"
+msgstr "Nom de la llista de contactes"
+
+#. "Document" used as a name -- uri point to the root of a document tree
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
+msgid "Document root"
+msgstr "Arrel del document"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+msgid "Identifier"
+msgstr "Identificador"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
+msgid "Writable"
+msgstr "S'hi pot escriure"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+msgid "Server username"
+msgstr "Nom d'usuari del servidor"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+msgid "Server password"
+msgstr "Contrasenya del servidor"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
+msgid "Add a remote contact"
+msgstr "Afig un contacte remot"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
+msgid "Please fill in this form to create a new contact on a remote server"
+msgstr ""
+"Empleneu este formulari per a afegir un contacte nou en un servidor remot"
+
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+msgid "Edit remote contact"
+msgstr "Edita el contacte remot"
+
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
+msgid ""
+"Please fill in this form to change an existing contact on a remote server"
+msgstr ""
+"Empleneu este formulari per a canviar un element existent en un servidor "
+"remot"
+
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
+msgid "Invalid server data"
+msgstr "Les dades del servidor no són vàlides"
+
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
+msgid "Click to fetch"
+msgstr "Feu clic per a recollir"
+
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
+msgid "Distant contact"
+msgstr "Contacte distant"
+
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
+#, c-format
+msgid "%s / List #%d"
+msgstr "%s / Llista núm. %d"
+
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
+#, c-format
+msgid "List #%d"
+msgstr "Llista núm. %d"
+
+#: ../lib/engine/gui/gtk-core/form-dialog-gtk.cpp:660
+msgid "Advanced"
+msgstr "Paràmetres avançats"
+
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:659
+msgid "Address Book"
+msgstr "Llibreta d'adreces"
+
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
+#: ../src/gui/main.cpp:3127
+msgid "Address _Book"
+msgstr "Lli_breta d'adreces"
+
+#. This will add static and dynamic actions
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:684
+msgid "_Action"
+msgstr "_Acció"
+
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:729
+msgid "Category"
+msgstr "Categoria"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
+#: ../src/gui/assistant.cpp:1368
+msgid "Full Name"
+msgstr "Nom complet"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:601
+msgid "_Search Filter:"
+msgstr "Filtre de _cerca:"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:247
+msgid "says:"
+msgstr "diu:"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:370
+msgid "Open link in browser"
+msgstr "Obri l'enllaç en el navegador"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:376
+msgid "Copy link"
+msgstr "Copia l'adreça de l'enllaç"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
+msgid "_Smile..."
+msgstr "_Emoticona..."
+
+#. we can't do much here since we get the Chat as reference...
+#: ../lib/engine/gui/gtk-frontend/chat-window.cpp:432
+msgid "Chat Window"
+msgstr "Finestra de xat"
+
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:989
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1024
+msgid "Unsorted"
+msgstr "Sense ordenar"
+
+#: ../lib/gui/codecsbox.cpp:478
+msgid "Move selected codec priority upwards"
+msgstr "Moveu la prioritat del còdec seleccionat cap amunt"
+
+#: ../lib/gui/codecsbox.cpp:488
+msgid "Move selected codec priority downwards"
+msgstr "Moveu la prioritat del còdec seleccionat cap avall"
+
+#: ../lib/gui/gmdialog.c:462
+msgid "Do not show this dialog again"
+msgstr "No tornes a mostrar este quadre de diàleg"
+
+#: ../src/gui/accounts.cpp:230
+msgid "Registered"
+msgstr "Registrat"
+
+#: ../src/gui/accounts.cpp:234
+msgid "Unregistered"
+msgstr "Desregistrat"
+
+#: ../src/gui/accounts.cpp:238
+msgid "Could not unregister"
+msgstr "No s'ha pogut cancel·lar el registre"
+
+#: ../src/gui/accounts.cpp:244
+msgid "Could not register"
+msgstr "No s'ha pogut registrar"
+
+#: ../src/gui/accounts.cpp:250
+msgid "Processing..."
+msgstr "S'està processant..."
+
+#: ../src/gui/accounts.cpp:636
+msgid "Account Name"
+msgstr "Nom del compte"
+
+#: ../src/gui/accounts.cpp:637
+msgid "Voice Mails"
+msgstr "Correus de veu"
+
+#: ../src/gui/accounts.cpp:638
+msgid "Status"
+msgstr "Estat"
+
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
+msgid "Accounts"
+msgstr "Comptes"
+
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3188
+msgid "_Accounts"
+msgstr "_Comptes"
+
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3271
+msgid "_Help"
+msgstr "A_juda"
+
+#. Translators:
+#. * The following string "A" means "activated" or "active". It's a column
+#. * description in the list of configured accounts, it shows if an account
+#. * is activated or not (a status the user can choose).
+#.
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
+msgid "A"
+msgstr "A"
+
+#: ../src/gui/assistant.cpp:321
+msgid ""
+"This is the Ekiga general configuration assistant. The following steps will "
+"set up Ekiga by asking a few simple questions.\n"
+"\n"
+"Once you have completed these steps, you can always change them later by "
+"selecting Preferences in the Edit menu."
+msgstr ""
+"Este és l'auxiliar de configuració de l'Ekiga. Els passos següents vos "
+"permetran configurar-lo a través d'una sèrie de preguntes senzilles.\n"
+"\n"
+"Un cop finalitzats estos passos, si voleu podreu canviar qualsevol dels "
+"paràmetres a partir del menú Preferències dins del menú Edita."
+
+#: ../src/gui/assistant.cpp:329
+msgid "Welcome to Ekiga"
+msgstr "Vos donem la benvinguda a l'Ekiga"
+
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
+msgid "Personal Information"
+msgstr "Informació personal"
+
+#. The user fields
+#: ../src/gui/assistant.cpp:356
+msgid "Please enter your first name and your surname:"
+msgstr "Indiqueu el vostre nom i cognoms:"
+
+#: ../src/gui/assistant.cpp:365
+msgid ""
+"Your first name and surname will be used when connecting to other VoIP and "
+"videoconferencing software."
+msgstr ""
+"El vostre nom i cognoms es faran servir quan vos connecteu amb un altre "
+"programa de videoconferència o de veu sobre IP"
+
+#: ../src/gui/assistant.cpp:559
+msgid "Ekiga.net Account"
+msgstr "Compte d'ekiga.net"
+
+#: ../src/gui/assistant.cpp:561
+msgid "Please enter your username:"
+msgstr "Entreu el vostre nom d'usuari:"
+
+#: ../src/gui/assistant.cpp:569
+msgid "Please enter your password:"
+msgstr "Entreu la vostra contrasenya:"
+
+#: ../src/gui/assistant.cpp:579
+msgid ""
+"The username and password are used to login to your existing account at the "
+"ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
+"you may first create an account below. This will provide a SIP address that "
+"allows people to call you.\n"
+"\n"
+"You may skip this step if you use an alternative SIP service, or if you "
+"would prefer to specify the login details later."
+msgstr ""
+"El nom d'usuari i la contrasenya s'utilitzen per a registrar el vostre "
+"compte al servei lliure SIP a ekiga.net. Si encara no teniu cap adreça SIP a "
+"ekia.net, podeu crear-ne una ací sota. Amb esta adreça SIP, altres persones "
+"vos podran trucar.\n"
+"\n"
+"Podeu saltar-vos este pas si utilitzeu un servei SIP alternatiu, o si voleu "
+"especificar els detalls d'entrada més tard."
+
+#: ../src/gui/assistant.cpp:606
+msgid "I do not want to sign up for the ekiga.net free service"
+msgstr "No vull que em registres al servei gratuït ekiga.net"
+
+#: ../src/gui/assistant.cpp:669
+msgid "Ekiga Call Out Account"
+msgstr "Compte PC-a-telèfon de l'Ekiga"
+
+#: ../src/gui/assistant.cpp:671
+msgid "Please enter your account ID:"
+msgstr "Entreu el vostre identificador de compte:"
+
+#: ../src/gui/assistant.cpp:679
+msgid "Please enter your PIN code:"
+msgstr "Introduïu el vostre codi PIN:"
+
+#: ../src/gui/assistant.cpp:690
+msgid ""
+"You can make calls to regular phones and cell numbers worldwide using "
+"Ekiga.\n"
+"\n"
+"To enable this, you need to do two things:\n"
+"- First buy an account at the URL below.\n"
+"- Then enter your account ID and PIN code.\n"
+"The service will work only if your account is created using the URL in this "
+"dialog.\n"
+msgstr ""
+"Amb l'Ekiga podeu fer trucades a telèfons convencionals i a mòbils a "
+"qualsevol lloc del món.\n"
+"\n"
+"Per a poder-ho fer, cal que seguiu dos passos:\n"
+"- Primer heu de crear un compte de pagament a través de l'URL d'ací sota.\n"
+"- Després caldrà que indiqueu el vostre nom d'usuari i el codi PIN.\n"
+"El servei només funcionarà si creeu el compte fent servir l'URL d'este "
+"quadre de diàleg.\n"
+
+#: ../src/gui/assistant.cpp:740
+msgid "Consult the calls history"
+msgstr "Consulta l'historial de trucades"
+
+#: ../src/gui/assistant.cpp:750
+msgid "I do not want to sign up for the Ekiga Call Out service"
+msgstr "No vull que em registres al servei de PC-a-telèfon per a l'Ekiga"
+
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
+msgid "Connection Type"
+msgstr "Tipus de connexió"
+
+#. The connection type
+#: ../src/gui/assistant.cpp:819
+msgid "Please choose your connection type:"
+msgstr "Escolliu el vostre tipus de connexió: "
+
+#: ../src/gui/assistant.cpp:836
+msgid "56k Modem"
+msgstr "Mòdem de 56k"
+
+#: ../src/gui/assistant.cpp:841
+msgid "ISDN"
+msgstr "XDSI"
+
+#: ../src/gui/assistant.cpp:846
+msgid "DSL/Cable (128 kbit/s uplink)"
+msgstr "DSL/cable (128 kbit/s de pujada)"
+
+#: ../src/gui/assistant.cpp:851
+msgid "DSL/Cable (512 kbit/s uplink)"
+msgstr "DSL/cable (512 kbit/s de pujada)"
+
+#: ../src/gui/assistant.cpp:856
+msgid "LAN"
+msgstr "LAN"
+
+#: ../src/gui/assistant.cpp:861
+msgid "Keep current settings"
+msgstr "Mantén les preferències actuals"
+
+#: ../src/gui/assistant.cpp:866
+msgid ""
+"The connection type will permit determining the best quality settings that "
+"Ekiga will use during calls. You can later change the settings individually "
+"in the preferences window."
+msgstr ""
+"El tipus de connexió permetrà determinar quins són els millors paràmetres "
+"per assegurar la millor qualitat durant les trucades amb l'Ekiga. Més avant "
+"podeu canviar estos paràmetres a la finestra de preferències."
+
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3017
+#: ../src/gui/main.cpp:3021 ../src/gui/preferences.cpp:760
+msgid "Audio Devices"
+msgstr "Dispositius d'àudio"
+
+#: ../src/gui/assistant.cpp:962
+msgid "Please choose the audio ringing device:"
+msgstr "Escolliu el dispositiu d'àudio de so del timbre:"
+
+#: ../src/gui/assistant.cpp:982
+msgid ""
+"The audio ringing device is the device that will be used to play the ringing "
+"sound on incoming calls."
+msgstr ""
+"El dispositiu d'àudio del so de timbre és el dispositiu que s'utilitzarà per "
+"a reproduir el so de timbre per a les trucades que rebeu."
+
+#. ---
+#: ../src/gui/assistant.cpp:993
+msgid "Please choose the audio output device:"
+msgstr "Escolliu el dispositiu d'àudio d'eixida:"
+
+#: ../src/gui/assistant.cpp:1013
+msgid ""
+"The audio output device is the device that will be used to play audio during "
+"calls."
+msgstr ""
+"El dispositiu d'àudio d'eixida és el que es farà servir per a la reproducció "
+"del so durant les trucades."
+
+#. ---
+#: ../src/gui/assistant.cpp:1024
+msgid "Please choose the audio input device:"
+msgstr "Escolliu el dispositiu d'àudio d'entrada:"
+
+#: ../src/gui/assistant.cpp:1044
+msgid ""
+"The audio input device is the device that will be used to record your voice "
+"during calls."
+msgstr ""
+"El dispositiu d'àudio d'entrada és el dispositiu que enregistra la vostra "
+"veu durant les trucades."
+
+#: ../src/gui/assistant.cpp:1146
+msgid "Please choose your video input device:"
+msgstr "Escolliu el dispositiu de vídeo d'entrada:"
+
+#: ../src/gui/assistant.cpp:1166
+msgid ""
+"The video input device is the device that will be used to capture video "
+"during calls."
+msgstr ""
+"El dispositiu de vídeo d'entrada és el dispositiu des d'on es capturarà el "
+"vídeo que es transmetrà durant les trucades."
+
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
+#: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
+msgid "No device found"
+msgstr "No s'ha trobat cap dispositiu"
+
+#: ../src/gui/assistant.cpp:1310
+msgid "Configuration Complete"
+msgstr "S'ha finalitzat la configuració"
+
+#: ../src/gui/assistant.cpp:1312
+msgid ""
+"You have now finished the Ekiga configuration. All the settings can be "
+"changed in the Ekiga preferences. Enjoy!"
+msgstr ""
+"Heu finalitzat la configuració de l'Ekiga. Recordeu que tots els paràmetres "
+"es poden canviar a les preferències de l'Ekiga. Esperem que gaudiu el "
+"programa!"
+
+#: ../src/gui/assistant.cpp:1319
+msgid "Configuration summary:"
+msgstr "Resum de la configuració:"
+
+#: ../src/gui/assistant.cpp:1389
+msgid "Audio Ringing Device"
+msgstr "Dispositiu d'àudio de so del timbre"
+
+#: ../src/gui/assistant.cpp:1398
+msgid "Audio Output Device"
+msgstr "Dispositiu d'àudio d'eixida"
+
+#: ../src/gui/assistant.cpp:1407
+msgid "Audio Input Device"
+msgstr "Dispositiu d'àudio d'entrada"
+
+#: ../src/gui/assistant.cpp:1416
+msgid "Video Input Device"
+msgstr "Dispositiu de vídeo d'entrada"
+
+#: ../src/gui/assistant.cpp:1429
+msgid "SIP URI"
+msgstr "URI de SIP"
+
+#: ../src/gui/assistant.cpp:1441
+msgid "Ekiga Call Out"
+msgstr "PC-a-telèfon de l'Ekiga"
+
+#: ../src/gui/assistant.cpp:1485
+#, c-format
+msgid "Ekiga Configuration Assistant (%d of %d)"
+msgstr "Auxiliar de configuració de l'Ekiga - (%d de %d)"
+
+#: ../src/gui/callbacks.cpp:131
+msgid "Contributors:"
+msgstr "Col·laboradors:"
+
+#: ../src/gui/callbacks.cpp:143
+msgid "Artwork:"
+msgstr "Art:"
+
+#: ../src/gui/callbacks.cpp:151
+msgid "See AUTHORS file for full credits"
+msgstr "Vegeu el fitxer AUTHORS per veure tots els crèdits"
+
+#: ../src/gui/callbacks.cpp:167
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version. "
+msgstr ""
+"Este programa és programari lliure; podeu redistribuir-lo i/o modificar-lo "
+"d'acord amb els termes de la llicència pública general de GNU tal com la "
+"publica la Free Software Foundation, ja siga la versió 2 de la llicència, o "
+"bé, si així ho voleu, qualsevol altra versió posterior."
+
+#: ../src/gui/callbacks.cpp:171
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details. You should have received a copy of the GNU General Public "
+"License along with this program; if not, write to the Free Software "
+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Este programa es distribueix amb l'esperança que siga útil, però SENSE CAP "
+"TIPUS DE GARANTIA, NI EXPLÍCITA NI IMPLÍCITA; AIXÒ INCLOU, SENSE LIMITAR-"
+"S'HI, LES GARANTIES IMPLÍCITES DE COMERCIALITZACIÓ I ADEQUACIÓ A UN ÚS "
+"CONCRET. Vegeu la llicència pública general de GNU per a obtindre'n més "
+"detalls. Juntament amb este programa, hauríeu d'haver rebut una còpia de la "
+"llicència pública general de GNU. En cas contrari, escriviu a la Free "
+"Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-"
+"1301, USA."
+
+#: ../src/gui/callbacks.cpp:178
+msgid ""
+"Ekiga is licensed under the GPL license and as a special exception, you have "
+"permission to link or otherwise combine this program with the programs OPAL, "
+"OpenH323 and PWLIB, and distribute the combination, without applying the "
+"requirements of the GNU GPL to the OPAL, OpenH323 and PWLIB programs, as "
+"long as you do follow the requirements of the GNU GPL for all the rest of "
+"the software thus combined."
+msgstr ""
+"L'Ekiga es distribueix sota els termes de la llicència pública general de "
+"GNU (GPL), i com a excepció especial, teniu permís per a enllaçar o combinar "
+"este programa amb els programes OPAL, OpenH323 i PWLIB, i distribuir-ne la "
+"combinació sense haver d'aplicar els requeriments de la GPL als programes "
+"OPAL, OpenH323 i PWLIB, sempre que satisfeu els requeriments de la GPL de "
+"GNU per la resta de programes combinats d'esta manera."
+
+#. Translators: Please write translator credits here, and
+#. * separate names with \n
+#: ../src/gui/callbacks.cpp:190
+msgid "translator-credits"
+msgstr ""
+"Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
+"David Planella Molas <david.planella@gmail.com>"
+
+# FIXME
+#: ../src/gui/callbacks.cpp:195
+msgid ""
+"Ekiga is full-featured SIP and H.323 compatible VoIP, IP-Telephony and "
+"Videoconferencing application that allows you to make audio and video calls "
+"to remote users with SIP and H.323 hardware or software."
+msgstr ""
+"L'Ekiga és un programa de videoconferència i telefonia IP totalment "
+"compatible amb qualsevol aplicació que implemente els protocols SIP o H.323 "
+"de VoIP. Vos permet fer trucades d'àudio i vídeo a usuaris remots que "
+"utilitzen maquinari o programari SIP i H.323."
+
+#: ../src/gui/callbacks.cpp:269
+msgid "Help display is not supported by your GTK+ version"
+msgstr "La vostra versió del GTK+ no permet la visualització de l'ajuda"
+
+#: ../src/gui/callbacks.cpp:277
+msgid "Unable to open help file."
+msgstr "No s'ha pogut obrir el fitxer de l'ajuda."
+
+#: ../src/gui/dialpad.cpp:55
+msgid "abc"
+msgstr "abcç"
+
+#: ../src/gui/dialpad.cpp:56
+msgid "def"
+msgstr "def"
+
+#: ../src/gui/dialpad.cpp:57
+msgid "ghi"
+msgstr "ghi"
+
+#: ../src/gui/dialpad.cpp:58
+msgid "jkl"
+msgstr "jkl"
+
+#: ../src/gui/dialpad.cpp:59
+msgid "mno"
+msgstr "mno"
+
+#: ../src/gui/dialpad.cpp:60
+msgid "pqrs"
+msgstr "pqrs"
+
+#: ../src/gui/dialpad.cpp:61
+msgid "tuv"
+msgstr "tuv"
+
+#: ../src/gui/dialpad.cpp:62
+msgid "wxyz"
+msgstr "wxyz"
+
+#. Translators: Is displayed once an account "%s" is registered.
+#: ../src/gui/main.cpp:521
+#, c-format
+msgid "Registered %s"
+msgstr "S'ha registrat a %s"
+
+#. Translators: Is displayed once an account "%s" is unregistered.
+#: ../src/gui/main.cpp:528
+#, c-format
+msgid "Unregistered %s"
+msgstr "S'ha cancel·lat el registre a %s"
+
+#: ../src/gui/main.cpp:533
+#, c-format
+msgid "Could not unregister %s"
+msgstr "No s'ha pogut cancel·lar el registre a %s"
+
+#: ../src/gui/main.cpp:537
+#, c-format
+msgid "Could not register %s"
+msgstr "No s'ha pogut registrar a %s"
+
+#: ../src/gui/main.cpp:607
+#, c-format
+msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
+msgstr "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
+
+# FIXME?
+#: ../src/gui/main.cpp:653
+#, c-format
+msgid "Connected with %s"
+msgstr "Esteu connectat amb %s"
+
+#: ../src/gui/main.cpp:694 ../src/gui/main.cpp:3517
+msgid "Standby"
+msgstr "En espera"
+
+#: ../src/gui/main.cpp:755
+msgid "Call on hold"
+msgstr "Trucada en espera"
+
+#: ../src/gui/main.cpp:766
+msgid "Call retrieved"
+msgstr "Trucada acceptada"
+
+#: ../src/gui/main.cpp:782
+#, c-format
+msgid "Missed call from %s"
+msgstr "Trucada perduda de %s"
+
+#: ../src/gui/main.cpp:919
+msgid "Error"
+msgstr "Error"
+
+#: ../src/gui/main.cpp:984
+msgid "Error while initializing video output"
+msgstr "S'ha produït un error en inicialitzar la eixida de vídeo"
+
+#: ../src/gui/main.cpp:985
+msgid "No video will be displayed during this call->"
+msgstr "No es mostrarà el vídeo durant esta trucada->"
+
+#: ../src/gui/main.cpp:995
+msgid ""
+"There was an error opening or initializing the video output. Please verify "
+"that no other application is using the accelerated video output."
+msgstr ""
+"S'ha produït un error en obrir o inicialitzar la eixida de vídeo. Assegureu-"
+"vos que no hi haja cap altra aplicació que estiga utilitzant la eixida "
+"d'acceleració de vídeo."
+
+#: ../src/gui/main.cpp:997
+msgid ""
+"There was an error opening or initializing the video output. Please verify "
+"that you are using a color depth of 24 or 32 bits per pixel."
+msgstr ""
+"S'ha produït un error en obrir o inicialitzar la eixida de vídeo. Assequreu-"
+"vos que estigueu utilitzant una profunditat de color de 24 o 32 bits per "
+"píxel."
+
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1110
+#, c-format
+msgid "Added video input device %s"
+msgstr "S'ha afegit el dispositiu de vídeo d'entrada %s"
+
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1122
+#, c-format
+msgid "Removed video input device %s"
+msgstr "S'ha suprimit el dispositiu de vídeo d'entrada %s"
+
+#: ../src/gui/main.cpp:1139
+#, c-format
+msgid "Error while accessing video device %s"
+msgstr "S'ha produït un error en accedir al dispositiu de vídeo %s"
+
+#: ../src/gui/main.cpp:1142
+msgid ""
+"A moving logo will be transmitted during calls. Notice that you can always "
+"transmit a given image or the moving logo by choosing \"Picture\" as video "
+"plugin and \"Moving logo\" or \"Static picture\" as device."
+msgstr ""
+"Es transmetrà un logotip en moviment durant les trucades. Podeu transmetre "
+"una imatge en lloc del logotip si escolliu «Picture» (imatge) com a connector "
+"de vídeo, i «Moving logo» (logotip en moviment) o «Static picture» (imatge "
+"estàtica) com a dispositiu."
+
+#: ../src/gui/main.cpp:1146
+msgid ""
+"There was an error while opening the device. In case it is a pluggable "
+"device it may be sufficient to reconnect it. If not, or if it still is not "
+"accessible, please check your permissions and make sure that the appropriate "
+"driver is loaded."
+msgstr ""
+"S'ha produït un error en obrir el dispositiu. En cas que siga un dispositiu "
+"endollable, pot ser que només calga tornar-lo a connectar. En cas contrari, "
+"o bé si encara no és accessible, comproveu els permisos i assegureu-vos que "
+"el controlador adequat estiga carregat."
+
+#: ../src/gui/main.cpp:1150
+msgid "Your video driver doesn't support the requested video format."
+msgstr ""
+"El programa de control que feu servir no implementa el format de vídeo "
+"requerit."
+
+#: ../src/gui/main.cpp:1154
+msgid "Could not open the chosen channel."
+msgstr "No s'ha pogut obrir el canal escollit."
+
+#: ../src/gui/main.cpp:1158
+msgid ""
+"Your driver doesn't seem to support any of the color formats supported by "
+"Ekiga.\n"
+" Please check your kernel driver documentation in order to determine which "
+"Palette is supported."
+msgstr ""
+"El controlador que feu servir no implementa cap dels formats de color que "
+"utilitza l'Ekiga.\n"
+" Comproveu la documentació sobre controladors del vostre nucli per tal de "
+"determinar quines paletes implementa."
+
+#: ../src/gui/main.cpp:1162
+msgid "Error while setting the frame rate."
+msgstr "S'ha produït un error en especificar el ràtio de quadres."
+
+#: ../src/gui/main.cpp:1166
+msgid "Error while setting the frame size."
+msgstr "S'ha produït un error en especificar la mida del quadre."
+
+#: ../src/gui/main.cpp:1171 ../src/gui/main.cpp:1273 ../src/gui/main.cpp:1388
+msgid "Unknown error."
+msgstr "Error desconegut."
+
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1221
+#, c-format
+msgid "Added audio input device %s"
+msgstr "S'ha afegit el dispositiu d'àudio d'entrada %s"
+
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1238
+#, c-format
+msgid "Removed audio input device %s"
+msgstr "S'ha suprimit el dispositiu d'àudio d'entrada %s"
+
+#: ../src/gui/main.cpp:1255
+#, c-format
+msgid "Error while opening audio input device %s"
+msgstr "S'ha produït un error en accedir al dispositiu d'àudio %s"
+
+#. Translators: This happens when there is an error with audio input:
+#. * Nothing ("silence") will be transmitted
+#: ../src/gui/main.cpp:1260
+msgid "Only silence will be transmitted."
+msgstr "Només es transmetrà silenci."
+
+#: ../src/gui/main.cpp:1264
+msgid ""
+"Unable to open the selected audio device for recording. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
+msgstr ""
+"No s'ha pogut obrir el dispositiu d'àudio seleccionat per a enregistrar. En "
+"cas que siga un dispositiu endollable, pot ser que només calga tornar-lo a "
+"connectar. En cas contrari, o bé si encara no és accessible, comproveu la "
+"configuració de l'àudio, els permisos, i que el dispositiu no estiga ocupat."
+
+#: ../src/gui/main.cpp:1268
+msgid ""
+"The selected audio device was successfully opened but it is impossible to "
+"read data from this device. In case it is a pluggable device it may be "
+"sufficient to reconnect it. If not, or if it still is not accessible, please "
+"check your audio setup."
+msgstr ""
+"S'ha obert correctament el dispositiu d'àudio seleccionat, però pareix que "
+"no és possible llegir-ne dades. En cas que siga un dispositiu endollable, "
+"pot ser que només calga tornar-lo a connectar. En cas contrari, o bé si "
+"encara no és accessible, comproveu la configuració de l'àudio."
+
+#: ../src/gui/main.cpp:1335
+#, c-format
+msgid "Added audio output device %s"
+msgstr "S'ha afegit el dispositiu d'àudio d'eixida %s"
+
+#: ../src/gui/main.cpp:1351
+#, c-format
+msgid "Removed audio output device %s"
+msgstr "S'ha suprimit el dispositiu d'àudio d'eixida %s"
+
+#: ../src/gui/main.cpp:1372
+#, c-format
+msgid "Error while opening audio output device %s"
+msgstr "S'ha produït un error en obrir el dispositiu de vídeo %s"
+
+#: ../src/gui/main.cpp:1375
+msgid "No incoming sound will be played."
+msgstr "No es reproduirà cap so d'entrada."
+
+#: ../src/gui/main.cpp:1379
+msgid ""
+"Unable to open the selected audio device for playing. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
+msgstr ""
+"No s'ha pogut obrir el dispositiu d'àudio seleccionat per a la reproducció. "
+"En cas que siga un dispositiu endollable, pot ser que només calga tornar-lo "
+"a connectar. En cas contrari, o bé si encara no és accessible, comproveu la "
+"configuració de l'àudio, els permisos, i que el dispositiu no estiga ocupat."
+
+#: ../src/gui/main.cpp:1383
+msgid ""
+"The selected audio device was successfully opened but it is impossible to "
+"write data to this device. In case it is a pluggable device it may be "
+"sufficient to reconnect it. If not, or if it still is not accessible, please "
+"check your audio setup."
+msgstr ""
+"S'ha obert correctament el dispositiu d'àudio seleccionat, però pareix que "
+"no és possible enregistrar-hi dades. En cas que siga un dispositiu "
+"endollable, pot ser que només calga tornar-lo a connectar. En cas contrari, "
+"o bé si encara no és accessible, comproveu la configuració de l'àudio."
+
+#: ../src/gui/main.cpp:1574
+msgid "Video Settings"
+msgstr "Preferències de vídeo"
+
+#: ../src/gui/main.cpp:1601
+msgid "Adjust brightness"
+msgstr "Ajusta la lluminositat"
+
+#: ../src/gui/main.cpp:1622
+msgid "Adjust whiteness"
+msgstr "Ajusta la blancor"
+
+#: ../src/gui/main.cpp:1643
+msgid "Adjust color"
+msgstr "Ajusta el color"
+
+#: ../src/gui/main.cpp:1664
+msgid "Adjust contrast"
+msgstr "Ajusta el contrast"
+
+#: ../src/gui/main.cpp:1710
+msgid "Audio Settings"
+msgstr "Paràmetres d'àudio"
+
+#: ../src/gui/main.cpp:2321
+msgid "_Retrieve Call"
+msgstr "_Recupera la trucada"
+
+#: ../src/gui/main.cpp:2334
+msgid "_Hold Call"
+msgstr "Mantén la t_rucada"
+
+#: ../src/gui/main.cpp:2366 ../src/gui/main.cpp:3154
+msgid "Suspend _Audio"
+msgstr "_Atura l'àudio"
+
+#: ../src/gui/main.cpp:2368 ../src/gui/main.cpp:3159
+msgid "Suspend _Video"
+msgstr "Atura el _vídeo"
+
+#: ../src/gui/main.cpp:2370
+msgid "Resume _Audio"
+msgstr "Reprén l'à_udio"
+
+#: ../src/gui/main.cpp:2372
+msgid "Resume _Video"
+msgstr "Reprén el _vídeo"
+
+#: ../src/gui/main.cpp:2655 ../src/gui/main.cpp:2807
+msgid "Reject"
+msgstr "Rebutja"
+
+#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2806
+msgid "Accept"
+msgstr "Accepta"
+
+#: ../src/gui/main.cpp:2663 ../src/gui/main.cpp:2794
+msgid "Incoming call from"
+msgstr "Trucada entrant de"
+
+#: ../src/gui/main.cpp:2681 ../src/gui/main.cpp:2797
+msgid "Remote URI:"
+msgstr "URI remota:"
+
+#: ../src/gui/main.cpp:2693 ../src/gui/main.cpp:2799
+msgid "Remote Application:"
+msgstr "Aplicació remota:"
+
+#: ../src/gui/main.cpp:2714
+#, c-format
+msgid "Call from %s"
+msgstr "Trucada de %s"
+
+#: ../src/gui/main.cpp:2920
+#, c-format
+msgid "Call Duration: %s\n"
+msgstr "Durada de la trucada: %s\n"
+
+#: ../src/gui/main.cpp:2951
+msgid "Transfer call to:"
+msgstr "S'està transferint la trucada a:"
+
+#: ../src/gui/main.cpp:3003
+msgid "No"
+msgstr "No"
+
+#: ../src/gui/main.cpp:3005
+msgid "Yes"
+msgstr "Sí"
+
+#: ../src/gui/main.cpp:3016
+msgid "Detected new audio input device:"
+msgstr "S'ha detectat un dispositiu d'àudio d'entrada nou:"
+
+#: ../src/gui/main.cpp:3020
+msgid "Detected new audio output device:"
+msgstr "S'ha detectat un dispositiu d'àudio d'eixida nou:"
+
+#: ../src/gui/main.cpp:3024
+msgid "Detected new video input device:"
+msgstr "S'ha detectat un dispositiu de vídeo d'entrada nou:"
+
+#: ../src/gui/main.cpp:3025 ../src/gui/preferences.cpp:921
+msgid "Video Devices"
+msgstr "Dispositius de vídeo"
+
+#: ../src/gui/main.cpp:3043
+msgid "Do you want to use it as default device?"
+msgstr "Voleu utilitzar-lo com a dispositiu predeterminat?"
+
+#: ../src/gui/main.cpp:3111
+msgid "_Chat"
+msgstr "_Xat"
+
+#: ../src/gui/main.cpp:3113
+msgid "Ca_ll"
+msgstr "_Trucada"
+
+#: ../src/gui/main.cpp:3113
+msgid "Place a new call"
+msgstr "Fes una nova trucada"
+
+#: ../src/gui/main.cpp:3116
+msgid "_Hang up"
+msgstr "_Penja"
+
+#: ../src/gui/main.cpp:3117
+msgid "Terminate the current call"
+msgstr "Acaba la trucada actual"
+
+#: ../src/gui/main.cpp:3123
+msgid "A_dd Contact"
+msgstr "_Afig un contacte"
+
+#: ../src/gui/main.cpp:3123
+msgid "Add a contact to the roster"
+msgstr "Afig un contacte a la llista"
+
+#: ../src/gui/main.cpp:3128
+msgid "Find contacts"
+msgstr "Cerca contactes"
+
+#: ../src/gui/main.cpp:3135
+msgid "_Contact"
+msgstr "C_ontacte"
+
+#: ../src/gui/main.cpp:3136
+msgid "Act on selected contact"
+msgstr "Actua sobre el contacte seleccionat"
+
+#: ../src/gui/main.cpp:3142
+msgid "H_old Call"
+msgstr "Posa la t_rucada en espera"
+
+#: ../src/gui/main.cpp:3142 ../src/gui/main.cpp:3611
+msgid "Hold the current call"
+msgstr "Mantén la trucada en curs"
+
+#: ../src/gui/main.cpp:3146
+msgid "_Transfer Call"
+msgstr "_Transfereix trucada"
+
+#: ../src/gui/main.cpp:3147
+msgid "Transfer the current call"
+msgstr "Transfereix la trucada actual"
+
+#: ../src/gui/main.cpp:3155
+msgid "Suspend or resume the audio transmission"
+msgstr "Atura o reprén la transmissió d'àudio"
+
+#: ../src/gui/main.cpp:3160
+msgid "Suspend or resume the video transmission"
+msgstr "Atura o reprén la transmissió de vídeo"
+
+#: ../src/gui/main.cpp:3167
+msgid "Close the Ekiga window"
+msgstr "Tanca la finestra de l'Ekiga"
+
+#: ../src/gui/main.cpp:3174 ../src/gui/statusicon.cpp:414
+msgid "Quit"
+msgstr "Ix"
+
+#: ../src/gui/main.cpp:3180
+msgid "_Configuration Assistant"
+msgstr "Au_xiliar de configuració"
+
+#: ../src/gui/main.cpp:3181
+msgid "Run the configuration assistant"
+msgstr "Inicia l'auxiliar de configuració"
+
+#: ../src/gui/main.cpp:3189
+msgid "Edit your accounts"
+msgstr "Editeu els vostres comptes"
+
+#: ../src/gui/main.cpp:3195
+msgid "Change your preferences"
+msgstr "Canvia les preferències"
+
+#: ../src/gui/main.cpp:3200
+msgid "_View"
+msgstr "_Visualitza"
+
+#: ../src/gui/main.cpp:3202
+msgid "Con_tacts"
+msgstr "C_ontactes"
+
+#: ../src/gui/main.cpp:3202
+msgid "View the contacts list"
+msgstr "Mostra la llista de contactes"
+
+#: ../src/gui/main.cpp:3207
+msgid "_Dialpad"
+msgstr "_Marcador"
+
+#: ../src/gui/main.cpp:3207
+msgid "View the dialpad"
+msgstr "Visualitza el marcador"
+
+#: ../src/gui/main.cpp:3212
+msgid "_Call History"
+msgstr "_Historial de trucades"
+
+#: ../src/gui/main.cpp:3212
+msgid "View the call history"
+msgstr "Mostra l'historial de trucades"
+
+#: ../src/gui/main.cpp:3220
+msgid "_Show Call Panel"
+msgstr "_Mostra el quadre de trucada"
+
+#: ../src/gui/main.cpp:3228
+msgid "_Local Video"
+msgstr "Vídeo _local"
+
+#: ../src/gui/main.cpp:3229
+msgid "Local video image"
+msgstr "Imatge del vídeo local"
+
+#: ../src/gui/main.cpp:3234
+msgid "_Remote Video"
+msgstr "Vídeo _remot"
+
+#: ../src/gui/main.cpp:3235
+msgid "Remote video image"
+msgstr "Imatge del vídeo remota"
+
+#: ../src/gui/main.cpp:3240
+msgid "_Picture-in-Picture"
+msgstr "_Imatge-en-imatge"
+
+#: ../src/gui/main.cpp:3241 ../src/gui/main.cpp:3247
+msgid "Both video images"
+msgstr "Ambdues imatges de vídeo"
+
+#: ../src/gui/main.cpp:3246
+msgid "Picture-in-Picture in Separate _Window"
+msgstr "Imatge-en-imatge en una _finestra separada"
+
+#: ../src/gui/main.cpp:3254
+msgid "Zoom in"
+msgstr "Apropa"
+
+#: ../src/gui/main.cpp:3258
+msgid "Zoom out"
+msgstr "Allunya"
+
+#: ../src/gui/main.cpp:3262
+msgid "Normal size"
+msgstr "Mida normal"
+
+#: ../src/gui/main.cpp:3266
+msgid "_Fullscreen"
+msgstr "Pantalla _completa"
+
+#: ../src/gui/main.cpp:3266
+msgid "Switch to fullscreen"
+msgstr "Commuta a pantalla completa"
+
+#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:402
+msgid "Get help by reading the Ekiga manual"
+msgstr "Obtingueu ajuda llegint el manual de l'Ekiga"
+
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:407
+msgid "View information about Ekiga"
+msgstr "Mostra informació quant a l'Ekiga"
+
+#: ../src/gui/main.cpp:3353
+msgid ""
+"Enter a URI on the left, and click this button to place a call or to hangup"
+msgstr ""
+"Introduïu un URI a l'esquerra, i feu clic en este botó per trucar-hi o "
+"penjar la trucada"
+
+#: ../src/gui/main.cpp:3404
+msgid "Contacts"
+msgstr "Contactes"
+
+#: ../src/gui/main.cpp:3427
+msgid "Dialpad"
+msgstr "Marcador"
+
+#: ../src/gui/main.cpp:3446
+msgid "Call history"
+msgstr "Historial de trucades"
+
+#: ../src/gui/main.cpp:3549
+msgid "Change the volume of your soundcard"
+msgstr "Canvia el volum de la vostra targeta de so"
+
+#: ../src/gui/main.cpp:3569
+msgid "Change the color settings of your video device"
+msgstr "Canvia els paràmetres del color del dispositiu de vídeo"
+
+#: ../src/gui/main.cpp:3680
+msgid "Ekiga"
+msgstr "Ekiga"
+
+#. Translators:
+#. * TX is a common abbreviation for "transmit"
+#: ../src/gui/main.cpp:4287
+#, c-format
+msgid "TX: %dx%d "
+msgstr "Transmés: %dx%d "
+
+#. Translators:
+#. * RX is a common abbreviation for "receive"
+#: ../src/gui/main.cpp:4292
+#, c-format
+msgid "RX: %dx%d "
+msgstr "Rebut: %dx%d "
+
+#: ../src/gui/main.cpp:4294
+#, c-format
+msgid ""
+"Lost packets: %.1f %%\n"
+"Late packets: %.1f %%\n"
+"Out of order packets: %.1f %%\n"
+"Jitter buffer: %d ms%s%s%s"
+msgstr ""
+"Paquets perduts: %.1f %%\n"
+"Paquets endarrerits: %.1f %%\n"
+"Paquets incorrectes: %.1f %%\n"
+"Mem. int. del jitter: %d ms%s%s%s"
+
+#: ../src/gui/main.cpp:4415
+msgid "Prints debug messages in the console (level between 1 and 5)"
+msgstr "Mostra missatges de depuració a la consola (nivell entre 1 i 5)"
+
+#: ../src/gui/main.cpp:4420
+msgid "Prints user plane debug messages in the console (level between 1 and 4)"
+msgstr ""
+"Mostra missatges de depuració del pla de l'usuari a la consola (nivell entre "
+"1 i 4)"
+
+#: ../src/gui/main.cpp:4425
+msgid "Makes Ekiga call the given URI"
+msgstr "Fa que l'Ekiga truque la URI indicada"
+
+#: ../src/gui/main.cpp:4544
+msgid "No usable audio plugin detected"
+msgstr "No s'ha pogut detectar cap gestor d'àudio adequat"
+
+#: ../src/gui/main.cpp:4545
+msgid ""
+"Ekiga didn't find any usable audio plugin. Make sure that your installation "
+"is correct."
+msgstr ""
+"No s'ha pogut trobar cap gestor d'àudio que es puga fer servir. Assegureu-"
+"vos que la instal·lació és correcta."
+
+#: ../src/gui/main.cpp:4548
+msgid "No usable audio codecs detected"
+msgstr "No s'ha pogut detectar cap còdec d'àudio que es puga fer servir"
+
+#: ../src/gui/main.cpp:4549
+msgid ""
+"Ekiga didn't find any usable audio codec. Make sure that your installation "
+"is correct."
+msgstr ""
+"No s'ha pogut trobar cap gestor d'àudio que es puga fer servir. Assegureu-"
+"vos que la instal·lació és correcta."
+
+#: ../src/gui/preferences.cpp:381
+msgid "Play sound for new voice mails"
+msgstr "Reprodueix un so per a nous correus de veu"
+
+#: ../src/gui/preferences.cpp:391
+msgid "Play sound for new instant messages"
+msgstr "Reprodueix un so per a nous missatges instantanis"
+
+#: ../src/gui/preferences.cpp:457
+msgid "_Full name:"
+msgstr "_Nom complet:"
+
+#: ../src/gui/preferences.cpp:475
+msgid "User Interface"
+msgstr "Interfície d'usuari"
+
+# Revisant l'aplicació, "_A" és la millor opció
+#: ../src/gui/preferences.cpp:477
+msgid "Start _hidden"
+msgstr "_Arrenca amagat"
+
+#: ../src/gui/preferences.cpp:479
+msgid "Show offline _contacts"
+msgstr "Mostra els _contactes fora de línia"
+
+#: ../src/gui/preferences.cpp:484
+msgid "Video Display"
+msgstr "Pantalla"
+
+# Revisant l'aplicació, "_P" és la millor opció
+#: ../src/gui/preferences.cpp:486
+msgid "Place windows displaying video _above other windows"
+msgstr "_Posa les finestres que mostren vídeo per sobre de les altres"
+
+#: ../src/gui/preferences.cpp:490
+msgid "Network Settings"
+msgstr "Paràmetres de la xarxa"
+
+#: ../src/gui/preferences.cpp:492
+msgid "Disable network _detection"
+msgstr "Inhabilita la _detecció de xarxa"
+
+#: ../src/gui/preferences.cpp:503
+msgid "Call Forwarding"
+msgstr "Desviació de trucades"
+
+#: ../src/gui/preferences.cpp:505
+msgid "_Always forward calls to the given host"
+msgstr "Desvia _sempre les trucades a un ordinador en concret"
+
+#: ../src/gui/preferences.cpp:505
+msgid ""
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the protocol settings"
+msgstr ""
+"Si s'habilita, totes les trucades entrants es desviaran a l'ordinador "
+"indicat en els paràmetres del protocol"
+
+#: ../src/gui/preferences.cpp:507
+msgid "Forward calls to the given host if _no answer"
+msgstr "Desvia les trucades a un ordinador en concret si no _conteste"
+
+#: ../src/gui/preferences.cpp:507
+msgid ""
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the protocol settings if you do not answer the call"
+msgstr ""
+"Si s'habilita, totes les trucades que rebeu i no contesteu, es desviaran cap "
+"a l'ordinador indicat en els paràmetres del protocol"
+
+#: ../src/gui/preferences.cpp:509
+msgid "Forward calls to the given host if _busy"
+msgstr "Desvia les trucades a un ordinador en concret quan estiga _ocupat"
+
+#: ../src/gui/preferences.cpp:509
+msgid ""
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the protocol settings if you already are in a call or if you "
+"are in Do Not Disturb mode"
+msgstr ""
+"Si s'habilita, totes les trucades entrants que rebeu mentre estigueu en una "
+"trucada o en mode «no molesteu», es desviaran a l'ordinador indicat en els "
+"paràmetres del protocol"
+
+#: ../src/gui/preferences.cpp:513 ../src/gui/preferences.cpp:1361
+msgid "Call Options"
+msgstr "Opcions de trucada"
+
+#. Add all the fields
+#: ../src/gui/preferences.cpp:516
+msgid "Timeout to reject or forward unanswered incoming calls (in seconds):"
+msgstr ""
+"Temps d'espera abans de rebutjar o desviar trucades entrants (en segons):"
+
+# FIXME: incidència? (josep)
+#: ../src/gui/preferences.cpp:548
+msgid "Ekiga Sound Events"
+msgstr "Esdeveniments de so de l'Ekiga"
+
+#: ../src/gui/preferences.cpp:598
+msgid "Event"
+msgstr "Incidència"
+
+#: ../src/gui/preferences.cpp:610
+msgid "Choose a sound"
+msgstr "Escolliu un so"
+
+#: ../src/gui/preferences.cpp:615
+msgid "Wavefiles"
+msgstr "Fitxers d'ona"
+
+#: ../src/gui/preferences.cpp:624 ../src/gui/preferences.cpp:643
+msgid "Play"
+msgstr "Reprodueix"
+
+#: ../src/gui/preferences.cpp:664
+msgid "String"
+msgstr "Cadena"
+
+#: ../src/gui/preferences.cpp:665
+msgid "Tone"
+msgstr "To"
+
+#: ../src/gui/preferences.cpp:666 ../src/gui/preferences.cpp:715
+msgid "RFC2833"
+msgstr "RFC2833"
+
+#: ../src/gui/preferences.cpp:667
+msgid "Q.931"
+msgstr "Q.931"
+
+#: ../src/gui/preferences.cpp:673 ../src/gui/preferences.cpp:725
+msgid "Misc Settings"
+msgstr "Altres paràmetres"
+
+#: ../src/gui/preferences.cpp:676 ../src/gui/preferences.cpp:730
+msgid "Forward _URI:"
+msgstr "_URI de Desviament:"
+
+#: ../src/gui/preferences.cpp:685
+msgid "Advanced Settings"
+msgstr "Paràmetres avançats"
+
+#. The toggles
+#: ../src/gui/preferences.cpp:688
+msgid "Enable H.245 _tunneling"
+msgstr "Habilita la tunelització _H.245"
+
+#: ../src/gui/preferences.cpp:690
+msgid "Enable _early H.245"
+msgstr "Habilita H.245 a l'_inici"
+
+#: ../src/gui/preferences.cpp:692
+msgid "Enable fast _start procedure"
+msgstr "Habilita l'arrencada _ràpida"
+
+#: ../src/gui/preferences.cpp:692
+msgid ""
+"Connection will be established in Fast Start mode. Fast Start is a new way "
+"to start calls faster that was introduced in H.323v2. It is not supported by "
+"Netmeeting and using both Fast Start and H.245 Tunneling can crash some "
+"versions of Netmeeting."
+msgstr ""
+"La connexió s'establirà en el mode d'Arrencada ràpida. Esta és una nova "
+"manera d'iniciar les trucades que va introduir-se a H323v2. El Netmeeting no "
+"ho implementa, de manera que utilitzant l'arrencada ràpida i la tunelització "
+"H.245 al mateix temps, pot fer penjar algunes versions del Netmeeting."
+
+#: ../src/gui/preferences.cpp:698 ../src/gui/preferences.cpp:738
+msgid "DTMF Mode"
+msgstr "Mode DTMF"
+
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
+msgid "_Send DTMF as:"
+msgstr "_Envia DTMF com a:"
+
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
+msgid "This allows you to set the mode for DTMFs sending."
+msgstr "Això vos permet especificar el mode d'enviament de DTMF."
+
+#: ../src/gui/preferences.cpp:716
+msgid "INFO"
+msgstr "INFO"
+
+#: ../src/gui/preferences.cpp:727
+msgid "_Outbound Proxy:"
+msgstr "_Servidor intermediari d'eixida:"
+
+#: ../src/gui/preferences.cpp:768
+msgid "Ringing Device"
+msgstr "Dispositiu del so del timbre"
+
+#: ../src/gui/preferences.cpp:768
+msgid "Select the ringing audio device to use"
+msgstr ""
+"Seleccioneu el dispositiu d'àudio del so del timbre que vulgueu utilitzar"
+
+#: ../src/gui/preferences.cpp:770
+msgid "Output device:"
+msgstr "Dispositiu d'eixida:"
+
+#: ../src/gui/preferences.cpp:777 ../src/gui/preferences.cpp:928
+msgid "Input device:"
+msgstr "Dispositiu d'entrada:"
+
+#. That button will refresh the device list
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
+msgid "_Detect devices"
+msgstr "_Detecta dispositius"
+
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
+msgid "Click here to refresh the device list."
+msgstr "Feu clic ací per actualitzar la llista de dispositius."
+
+#: ../src/gui/preferences.cpp:906
+msgid "PAL (Europe)"
+msgstr "PAL (Europa)"
+
+#: ../src/gui/preferences.cpp:907
+msgid "NTSC (America)"
+msgstr "NTSC (Amèrica)"
+
+#: ../src/gui/preferences.cpp:908
+msgid "SECAM (France)"
+msgstr "SECAM (França)"
+
+#: ../src/gui/preferences.cpp:909
+msgid "Auto"
+msgstr "Auto"
+
+#. Video Channel
+#: ../src/gui/preferences.cpp:932
+msgid "Channel:"
+msgstr "Canal:"
+
+#: ../src/gui/preferences.cpp:934
+msgid "Size:"
+msgstr "Mida:"
+
+#: ../src/gui/preferences.cpp:934
+msgid "Select the transmitted video size"
+msgstr "Seleccioneu la mida del vídeo a transmetre"
+
+#: ../src/gui/preferences.cpp:936
+msgid "Format:"
+msgstr "Format:"
+
+#: ../src/gui/preferences.cpp:963 ../src/gui/preferences.cpp:1002
+#: ../src/gui/preferences.cpp:1386 ../src/gui/preferences.cpp:1396
+msgid "Codecs"
+msgstr "Còdecs"
+
+#: ../src/gui/preferences.cpp:976 ../src/gui/preferences.cpp:1015
+msgid "Settings"
+msgstr "Paràmetres"
+
+#. Translators: the full sentence is Automatically adjust jitter buffer
+#. between X and Y ms
+#: ../src/gui/preferences.cpp:980
+msgid "Enable silence _detection"
+msgstr "Habilita la _detecció de silenci"
+
+#: ../src/gui/preferences.cpp:980
+msgid "If enabled, use silence detection with the codecs supporting it."
+msgstr ""
+"Si s'habilita, es farà servir la detecció de silenci pels còdecs que ho "
+"permeten."
+
+#: ../src/gui/preferences.cpp:982
+msgid "Enable echo can_celation"
+msgstr "Habilita la _cancel·lació de l'eco"
+
+#: ../src/gui/preferences.cpp:982
+msgid "If enabled, use echo cancelation."
+msgstr "Si s'habilita, es farà servir la cancel·lació de l'eco."
+
+#: ../src/gui/preferences.cpp:984
+msgid "Maximum _jitter buffer (in ms):"
+msgstr "Memòria intermèdia màxima per al _jitter (en ms):"
+
+#: ../src/gui/preferences.cpp:984
+msgid "The maximum jitter buffer size for audio reception (in ms)."
+msgstr ""
+"El valor màxim de la memòria intermèdia pel jitter per a la recepció d'àudio"
+"(en ms)."
+
+#. Translators: the full sentence is Keep a minimum video quality of X %
+#: ../src/gui/preferences.cpp:1018
+msgid "Picture Quality"
+msgstr "Qualitat de la imatge"
+
+#: ../src/gui/preferences.cpp:1018
+msgid ""
+"Choose if you want to guarantee a minimum image quality (possibly leading to "
+"dropped frames in order not to surpass the bitrate limit) or if you prefer "
+"to keep the frame rate."
+msgstr ""
+"Escolliu si voleu garantir una qualitat mínima de la imatge (cosa que pot "
+"ocasionar que es perden quadres en l'intent de no sobrepassar el límit de la "
+"taxa de bits) o bé si preferiu mantindre els quadres per segon."
+
+#: ../src/gui/preferences.cpp:1020
+msgid "Maximum video _bitrate (in kbits/s):"
+msgstr "Taxa de _bits màxima per al vídeo (en kbits/s):"
+
+#: ../src/gui/preferences.cpp:1020
+msgid ""
+"The maximum video bitrate in kbits/s. The video quality and the effective "
+"frame rate will be dynamically adjusted to keep the bitrate at the given "
+"value."
+msgstr ""
+"La taxa de bits màxima per al vídeo en kbits/s. La qualitat del vídeo i el "
+"nombre de quadres per segon transmesos s'ajustaran dinàmicament al valor que "
+"indiqueu ací."
+
+#: ../src/gui/preferences.cpp:1333
+msgid "Ekiga Preferences"
+msgstr "_Preferències de l'Ekiga"
+
+#: ../src/gui/preferences.cpp:1351
+msgid "General"
+msgstr "General"
+
+#: ../src/gui/preferences.cpp:1352
+msgid "Personal Data"
+msgstr "Dades personals"
+
+#: ../src/gui/preferences.cpp:1357
+msgid "General Settings"
+msgstr "Paràmetres generals"
+
+#: ../src/gui/preferences.cpp:1366
+msgid "Sound Events"
+msgstr "Esdeveniments de so"
+
+#: ../src/gui/preferences.cpp:1370
+msgid "Protocols"
+msgstr "Protocols"
+
+#: ../src/gui/preferences.cpp:1372
+msgid "SIP Settings"
+msgstr "Paràmetres SIP"
+
+#: ../src/gui/preferences.cpp:1377
+msgid "H.323 Settings"
+msgstr "Paràmetres H.323"
+
+#: ../src/gui/preferences.cpp:1381
+msgid "Audio"
+msgstr "Àudio"
+
+#: ../src/gui/preferences.cpp:1382 ../src/gui/preferences.cpp:1392
+msgid "Devices"
+msgstr "Dispositius"
+
+#: ../src/gui/preferences.cpp:1391
+msgid "Video"
+msgstr "Vídeo"
+
+#: ../src/gui/statusicon.cpp:306
+#, c-format
+msgid "You have %d message"
+msgid_plural "You have %d messages"
+msgstr[0] "Teniu %d missatge"
+msgstr[1] "Teniu %d missatges"
+
+#: ../src/gui/statusmenu.cpp:87
+msgid "Online"
+msgstr "En línia"
+
+#: ../src/gui/statusmenu.cpp:88
+msgid "Away"
+msgstr "Absent"
+
+#: ../src/gui/statusmenu.cpp:89
+msgid "Do Not Disturb"
+msgstr "No em molesteu"
+
+#: ../src/gui/statusmenu.cpp:387
+msgid "Custom message..."
+msgstr "Missatge personalitzat..."
+
+#: ../src/gui/statusmenu.cpp:430
+msgid "Clear"
+msgstr "Neteja"
+
+#. Build the dialog
+#: ../src/gui/statusmenu.cpp:521 ../src/gui/statusmenu.cpp:671
+msgid "Custom Message"
+msgstr "Missatge personalitzat"
+
+#: ../src/gui/statusmenu.cpp:537
+msgid "Delete custom messages:"
+msgstr "Suprimiu els missatges personalitzats:"
+
+#: ../src/gui/statusmenu.cpp:692
+msgid "Define a custom message:"
+msgstr "Definiu un missatge personalitzat:"
diff -Nru ekiga-3.2.5/po/de.po ekiga-3.2.6~ppa~karmic1/po/de.po
--- ekiga-3.2.5/po/de.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/de.po	2009-09-02 19:12:52.000000000 +0100
@@ -2324,7 +2324,7 @@
 #: ../src/gui/main.cpp:535
 #, c-format
 msgid "Could not register %s"
-msgstr "%s konnte nicht abgemeldet werden"
+msgstr "%s konnte nicht angemeldet werden"
 
 #: ../src/gui/main.cpp:605
 #, c-format
diff -Nru ekiga-3.2.5/po/et.po ekiga-3.2.6~ppa~karmic1/po/et.po
--- ekiga-3.2.5/po/et.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/et.po	2009-09-22 15:27:35.000000000 +0100
@@ -2,17 +2,18 @@
 # Estonian translation of Ekiga.
 #
 # Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-# Copyright (C) 2007, 2008 The GNOME Project
+# Copyright (C) 2007-2009 The GNOME Project
 # This file is distributed under the same license as the ekiga package.
 #
-# Ivar Smolin <okul@linux.ee>, 2005-2008.
+# Ivar Smolin <okul@linux.ee>, 2005-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ekiga HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-06 18:02+0000\n"
-"PO-Revision-Date: 2008-10-11 10:35+0300\n"
+"Project-Id-Version: ekiga 3.2.5\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=ekiga&component=general\n"
+"POT-Creation-Date: 2009-04-16 20:21+0000\n"
+"PO-Revision-Date: 2009-09-16 06:26+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -20,54 +21,39 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../ekiga.desktop.in.in.h:1
 msgid "Ekiga Softphone"
 msgstr "Ekiga tarkvaraline telefon"
 
-#: ../ekiga.desktop.in.in.h:2
 msgid "IP Telephony, VoIP and Video Conferencing"
 msgstr "IP-telefon, VoIP ja videokonverentsid"
 
-#: ../ekiga.desktop.in.in.h:3
 msgid "Talk to people over the Internet"
 msgstr "Inimestega rääkimine Interneti kaudu"
 
-#: ../ekiga.schemas.in.in.h:1
 msgid "0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: Custom"
 msgstr "0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: Kohandatud"
 
-#: ../ekiga.schemas.in.in.h:2
 msgid ""
 "Allow Ekiga to fall back to software scaling the picture-in-picture if "
 "hardware support is not available. If this is set to false, Ekiga will not "
 "try to open the PIP if hardware support is not available."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:3
 msgid "Allow picture-in-picture software scaling"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:4
 msgid "Alternative audio output device"
 msgstr "Alternatiivne audioväljundi seade"
 
-#: ../ekiga.schemas.in.in.h:5
 msgid "Always forward calls to the given host"
 msgstr "Alati kõnede edastamine määratud hostile"
 
-#: ../ekiga.schemas.in.in.h:6
 msgid "Audio input device"
 msgstr "Audiosisendi seade"
 
-#: ../ekiga.schemas.in.in.h:7
 msgid "Audio output device"
 msgstr "Audioväljundi seade"
 
-#: ../ekiga.schemas.in.in.h:8
-msgid "Automatic echo cancellation"
-msgstr "Automaatne kaja eemaldamine"
-
-#: ../ekiga.schemas.in.in.h:9 ../src/gui/preferences.cpp:428
 msgid ""
 "Automatically reject or forward incoming calls if no answer is given after "
 "the specified amount of time (in seconds)"
@@ -75,15 +61,12 @@
 "Kui sisenevatele kõnedele pole määratud aja (sekundites) jooksul vastatud, "
 "siis suunatakse need edasi või lükatakse tagasi"
 
-#: ../ekiga.schemas.in.in.h:10
 msgid "Calls history"
 msgstr "Kõnede ajalugu"
 
-#: ../ekiga.schemas.in.in.h:11
 msgid "Change the main window panel section"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:12
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -91,85 +74,65 @@
 "versions of Netmeeting"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:13
 msgid "Contact long status"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:14
 msgid "Contact short status"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:15
-msgid "Country code"
-msgstr "Riigi kood"
-
-#: ../ekiga.schemas.in.in.h:16
 msgid "DTMF sending"
 msgstr "DTMF-i saatmine"
 
-#: ../ekiga.schemas.in.in.h:17
+msgid "Disable STUN network detection"
+msgstr "STUN-võrgu tuvastamine keelatud"
+
+msgid "Disable the automatic network setup resulting from the STUN test"
+msgstr ""
+
 msgid "Disable video hardware acceleration"
 msgstr "Keela video riistvaraline kiirendi"
 
-#: ../ekiga.schemas.in.in.h:18
-msgid "Display a popup window when receiving a call"
-msgstr "Siseneva kõne korral hüpikakna kuvamine"
+msgid "Display images from your camera device"
+msgstr "Kaameraseadmest tulevate piltide kuvamine"
 
-#: ../ekiga.schemas.in.in.h:19
 msgid "Enable 'Fast Start'"
 msgstr "Kiirkäivituse lubamine"
 
-#: ../ekiga.schemas.in.in.h:20
 msgid "Enable H.245 tunneling"
 msgstr "H.245 tunneldamine lubatud"
 
-#: ../ekiga.schemas.in.in.h:21
 msgid "Enable early H.245"
 msgstr "Varajane H.245 lubatud"
 
-#: ../ekiga.schemas.in.in.h:22
 msgid "Enable echo cancelation"
 msgstr "Kaja eemaldamine lubatud"
 
-#: ../ekiga.schemas.in.in.h:23
 msgid "Enable silence detection"
 msgstr "Vaikusetuvastus lubatud"
 
-#: ../ekiga.schemas.in.in.h:24
-msgid "Enable video support"
-msgstr "Video tugi lubatud"
-
-#: ../ekiga.schemas.in.in.h:25
 msgid ""
 "Enter the number of seconds after which Ekiga should try refreshing the NAT "
 "binding when STUN is being used"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:26 ../src/gui/preferences.cpp:378
 msgid "Enter your full name"
 msgstr "Sisesta siia oma täisnimi"
 
-#: ../ekiga.schemas.in.in.h:27
 msgid "Forward calls to host"
 msgstr "Kõnede edasisuunamine hostile"
 
-#: ../ekiga.schemas.in.in.h:28
 msgid "Forward calls to the given host if busy"
 msgstr "Kõnede edasisuunamine valitud hostile, kui ollakse hõivatud"
 
-#: ../ekiga.schemas.in.in.h:29
 msgid "Forward calls to the given host if no answer"
 msgstr "Kõnede edasisuunamine valitud hostile, kui ei vastata"
 
-#: ../ekiga.schemas.in.in.h:30 ../src/gui/preferences.cpp:999
 msgid "Frame Rate"
 msgstr "Kaadrisagedus"
 
-#: ../ekiga.schemas.in.in.h:31
 msgid "Full name"
 msgstr "Täisnimi"
 
-#: ../ekiga.schemas.in.in.h:32 ../src/gui/preferences.cpp:396
 msgid ""
 "If enabled, Ekiga will start hidden provided that the notification area is "
 "present in the GNOME panel"
@@ -177,12 +140,6 @@
 "Kui märgitud, siis Ekiga käivitub peidetuna. Eeldatakse, et GNOME paneelil "
 "on teateala"
 
-#: ../ekiga.schemas.in.in.h:33
-msgid ""
-"If enabled, a popup window will be displayed when receiving an incoming call"
-msgstr "Kui märgitud, siis avatakse siseneva kõne korral hüpikaken"
-
-#: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below"
@@ -190,7 +147,6 @@
 "Kui lubatud, siis kõik sisenevad kõned suunatakse allpool oleval väljal "
 "kirjeldatud hostile"
 
-#: ../ekiga.schemas.in.in.h:35
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you already are in a call or if you are in "
@@ -200,189 +156,130 @@
 "juhul, kui sul on parasjagu kõne pooleli ja režiimiks on määratud \"Mitte "
 "häirida\""
 
-#: ../ekiga.schemas.in.in.h:36
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you do not answer the call"
 msgstr ""
 "Lubamise korral suunatakse vastamata jäetud kõne allpool määratud hostile."
 
-#: ../ekiga.schemas.in.in.h:37
-msgid "If enabled, allows video during calls"
-msgstr "Kõne käigus ka video vastuvõtmise lubamine"
-
-#: ../ekiga.schemas.in.in.h:38 ../src/gui/preferences.cpp:398
 msgid "If enabled, offline contacts will be shown in the roster"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:39
 msgid "If enabled, use echo cancelation"
-msgstr ""
+msgstr "Kui lubatud, siis kasutatakse kaja eemaldamist"
 
-#: ../ekiga.schemas.in.in.h:40
 msgid "If enabled, use silence detection with the codecs supporting it"
 msgstr ""
 "Kui märgitud, siis on vaikuse tuvastamine lubatud seda toetavate koodekite "
 "korral"
 
-#: ../ekiga.schemas.in.in.h:41
 msgid "Kind of network selected in the druid"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:42
 msgid "LDAP servers"
 msgstr "LDAP-serverid"
 
-#: ../ekiga.schemas.in.in.h:43
 msgid "List of configured LDAP servers"
 msgstr "Seadistatud LDAP-serverite nimekiri"
 
-#: ../ekiga.schemas.in.in.h:44
 msgid "List of folded groups in the roster"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:45
 msgid "Listen port"
 msgstr "Kuulatav port"
 
-#: ../ekiga.schemas.in.in.h:46
 msgid "Local video window size"
 msgstr "Kohalik videoakna suurus"
 
-#: ../ekiga.schemas.in.in.h:47
 msgid "Maximum RX video bitrate"
 msgstr "Vastuvõetava video suurim läbilaskevõime"
 
-#: ../ekiga.schemas.in.in.h:48
 msgid "Maximum TX video bitrate"
 msgstr "Saadetava video suurim läbilaskevõime"
 
-#: ../ekiga.schemas.in.in.h:49
 msgid "Maximum jitter buffer"
 msgstr "Suurim värinapuhver"
 
-#: ../ekiga.schemas.in.in.h:50
 msgid "NAT Binding Timeout"
 msgstr "NAT-ühendumise ajapiirang"
 
-#: ../ekiga.schemas.in.in.h:51
 msgid "No answer timeout"
 msgstr "Kõnele vastamata jätmise ajapiirang"
 
-#: ../ekiga.schemas.in.in.h:52
 msgid "Outbound Proxy"
 msgstr "Väljuva ühenduse proksi"
 
-#: ../ekiga.schemas.in.in.h:53
-msgid "Output device type"
-msgstr "Väljundseadme tüüp"
-
-#: ../ekiga.schemas.in.in.h:54 ../src/gui/preferences.cpp:405
 msgid "Place windows displaying video above other windows during calls"
 msgstr "Kõne ajal videoakna asetamine teiste akende peale"
 
-#: ../ekiga.schemas.in.in.h:55 ../src/gui/preferences.cpp:1367
 msgid "Play busy tone"
 msgstr "Kinnise tooni esitamine"
 
-#: ../ekiga.schemas.in.in.h:56 ../src/gui/preferences.cpp:1358
 msgid "Play ring tone"
 msgstr "Telefonihelina esitamine"
 
-#: ../ekiga.schemas.in.in.h:57 ../src/gui/preferences.cpp:1349
 msgid "Play sound on incoming calls"
 msgstr "Heli esitamine siseneva kõne korral"
 
-#: ../ekiga.schemas.in.in.h:58
 msgid "Play sound on new message"
 msgstr "Heli esitamine uue sõnumi korral"
 
-#: ../ekiga.schemas.in.in.h:59
 msgid "Play sound on new voice mail"
 msgstr "Heli esitamine kõneposti uue sõnumi korral"
 
-#: ../ekiga.schemas.in.in.h:60
 msgid "Position of the local video window"
 msgstr "Kohaliku videoakna asukoht"
 
-#: ../ekiga.schemas.in.in.h:61
 msgid "Position on the screen of the address book window"
 msgstr "Aadressiraamatu akna asukoht ekraanil"
 
-#: ../ekiga.schemas.in.in.h:62
 msgid "Position on the screen of the audio settings window"
 msgstr "Audiosätete akna asukoht ekraanil"
 
-#: ../ekiga.schemas.in.in.h:63
 msgid "Position on the screen of the chat window"
 msgstr "Vestlusakna asukoht ekraanil"
 
-#: ../ekiga.schemas.in.in.h:64
 msgid "Position on the screen of the druid window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:65
 msgid "Position on the screen of the log window"
 msgstr "Logiakna asukoht ekraanil"
 
-#: ../ekiga.schemas.in.in.h:66
 msgid "Position on the screen of the main window"
 msgstr "Peaakna asukoht ekraanil"
 
-#: ../ekiga.schemas.in.in.h:67
 msgid "Position on the screen of the preferences window"
 msgstr "Eelistuste akna asukoht ekraanil"
 
-#: ../ekiga.schemas.in.in.h:68
 msgid "Position on the screen of the video settings window"
 msgstr "Videosätete akna asukoht ekraanil"
 
-#: ../ekiga.schemas.in.in.h:69
-msgid "Registration timeout"
-msgstr "Registreerimise ajapiirang"
-
-#: ../ekiga.schemas.in.in.h:70
 msgid "Remote video window position"
 msgstr "Kaugvideo akna asukoht"
 
-#: ../ekiga.schemas.in.in.h:71
 msgid "Remote video window size"
 msgstr "Kaugvideo akna suurus"
 
-#: ../ekiga.schemas.in.in.h:72
-msgid "Revision of the schema file"
-msgstr "Skeemifaili versioon"
-
-#: ../ekiga.schemas.in.in.h:73
-msgid "Roster view saving group status"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:74
 msgid "Select an alternative audio output device to use for sound events."
 msgstr "Helisündmuste jaoks alternatiivse audioväljundi seadme valimine."
 
-#: ../ekiga.schemas.in.in.h:75 ../src/gui/preferences.cpp:707
 msgid "Select the audio input device to use"
 msgstr "Kasutatava audiosisendi seadme valimine"
 
-#: ../ekiga.schemas.in.in.h:76 ../src/gui/preferences.cpp:700
 msgid "Select the audio output device to use"
 msgstr "Kasutatava audioväljundi seadme valimine"
 
-#: ../ekiga.schemas.in.in.h:77 ../src/gui/preferences.cpp:863
 msgid ""
 "Select the format for video cameras (does not apply to most USB cameras)"
 msgstr ""
 "Videokaamera poolt kasutatava vormingu valimine (ei kehti enamuse USB-"
 "kaamerate kohta)"
 
-#: ../ekiga.schemas.in.in.h:78
 msgid ""
 "Select the transmitted video size: Small (QCIF 176x144) or Large (CIF "
 "352x288)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:79 ../src/gui/preferences.cpp:855
 msgid ""
 "Select the video input device to use. If an error occurs when using this "
 "device a test picture will be transmitted."
@@ -390,81 +287,57 @@
 "Video sisendseadme valimine. Kui selle seadme kasutamisel tekib viga, siis "
 "kantakse video asemel üle testpilti."
 
-#: ../ekiga.schemas.in.in.h:80
 msgid "Show offline contacts"
 msgstr "Ühendamata kontaktide näitamine"
 
-#: ../ekiga.schemas.in.in.h:81 ../src/gui/main.cpp:1850
 msgid "Show the call panel"
 msgstr "Kõnede paneeli näitamine"
 
-#: ../ekiga.schemas.in.in.h:82
 msgid "Size of the address book window"
 msgstr "Aadressiraamatu akna suurus"
 
-#: ../ekiga.schemas.in.in.h:83
 msgid "Size of the audio settings window"
 msgstr "Audiosätete akna suurus"
 
-#: ../ekiga.schemas.in.in.h:84
 msgid "Size of the chat window"
 msgstr "Vestlusakna suurus"
 
-#: ../ekiga.schemas.in.in.h:85
 msgid "Size of the druid window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:86
 msgid "Size of the preferences window"
 msgstr "Eelistuste akna suurus"
 
-#: ../ekiga.schemas.in.in.h:87
 msgid "Size of the video settings window"
 msgstr "Videosätete akna suurus"
 
-#: ../ekiga.schemas.in.in.h:88
 msgid "Specify the software scaling algorithm"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:89
 msgid ""
 "Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest "
 "neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
 "Does not apply on windows systems."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:90
 msgid "Start hidden"
 msgstr "Käivitatakse peidetuna"
 
-#: ../ekiga.schemas.in.in.h:91
 msgid "TCP port range"
 msgstr "TCP-portide vahemik"
 
-#: ../ekiga.schemas.in.in.h:92
 msgid "Temporal Spatial Trade Off"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:93
 msgid "The Audio Codecs List"
 msgstr "Audiokoodekite nimekiri"
 
-#: ../ekiga.schemas.in.in.h:94
-msgid ""
-"The Automatic Echo Cancellation level: Off, Low, Medium, High, Automatic "
-"Gain Compensation. Choosing Automatic Gain Compensation modulates the volume "
-"for best quality."
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:95 ../src/gui/preferences.cpp:657
 msgid "The SIP Outbound Proxy to use for outgoing calls"
 msgstr "SIP-proksi väljuvatele kõnedele"
 
-#: ../ekiga.schemas.in.in.h:96
 msgid "The STUN Server"
 msgstr "STUN server"
 
-#: ../ekiga.schemas.in.in.h:97
 msgid ""
 "The STUN server to use for STUN Support. STUN is a technology that permits "
 "passage through some types of NAT gateway"
@@ -472,134 +345,97 @@
 "STUN-i toe jaoks kasutatav STUN-server. STUN on tehnoloogia, mis võimaldab "
 "kasutada ühendusi läbi mõnda liiki NAT-väravate"
 
-#: ../ekiga.schemas.in.in.h:98
 msgid "The Video Codecs List"
 msgstr "Videokoodekite nimekiri"
 
-#: ../ekiga.schemas.in.in.h:99
 msgid "The accounts list"
 msgstr "Kontode nimekiri"
 
-#: ../ekiga.schemas.in.in.h:100
 msgid "The audio codecs list"
 msgstr "Audiokoodekite nimekiri"
 
-#: ../ekiga.schemas.in.in.h:101
 msgid "The busy tone sound"
 msgstr "Kinnise tooni heli"
 
-#: ../ekiga.schemas.in.in.h:102
 msgid ""
 "The chosen sound will be played at the end of calls or calling somebody who "
 "is busy, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:103
 msgid "The chosen sound will be played on incoming calls, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:104
 msgid ""
 "The chosen sound will be played when a new instant message is received, if "
 "enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:105
 msgid ""
 "The chosen sound will be played when a new voice mail is received, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:106
 msgid "The chosen sound will be played when calling somebody, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:107
 msgid "The default video view"
 msgstr "Vaikimisi videovaade"
 
-#: ../ekiga.schemas.in.in.h:108
 msgid ""
 "The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with "
 "local video in a separate window, 4: Both)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:109
 msgid "The dial tone sound"
 msgstr "Valimistooni heli"
 
-#: ../ekiga.schemas.in.in.h:110
 msgid "The history of the 100 last calls"
 msgstr "Viimase 100 kõne ajalugu"
 
-#: ../ekiga.schemas.in.in.h:111 ../src/gui/preferences.cpp:606
-#: ../src/gui/preferences.cpp:660
 msgid "The host where calls should be forwarded if call forwarding is enabled"
 msgstr "Host, kuhu kõnede ümbersuunamise lubamise korral kõned edastatakse"
 
-#: ../ekiga.schemas.in.in.h:112
-msgid ""
-"The image to transmit if \"Picture\" is selected as video plugin or if the "
-"opening of the device fails. Leave blank to use the default Ekiga logo."
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:113
 msgid "The incoming call sound"
 msgstr "Siseneva kõne heli"
 
-#: ../ekiga.schemas.in.in.h:114
 msgid "The list of accounts to which Ekiga should register"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:115
 msgid "The long status information"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:116
 msgid ""
 "The maximum RX video bitrate in kbit/s. This value will be signaled to the "
 "peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
 "above the signaled value"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:117
 msgid ""
 "The maximum TX video bitrate in kbit/s. The video quality and the number of "
 "transmitted frames per second (depends on selected codec) will be "
 "dynamically adjusted above their minimum during calls to try to minimize the "
 "bandwidth to the given value"
 msgstr ""
-"Video suurim läbilaskevõime ühikuga kilobaite sekundi kohta. Video kvaliteeti "
-"ja sekundis ülekantavate kaadrite arvu (mis sõltub valitud koodekist) "
-"reguleeritakse kõne ajal dünaamiliselt video vähimast võimalikust väärtusest "
-"kõrgemale ja püütakse hoida siintoodud väärtuse ligidal."
+"Video suurim läbilaskevõime ühikuga kilobaite sekundi kohta. Video "
+"kvaliteeti ja sekundis ülekantavate kaadrite arvu (mis sõltub valitud "
+"koodekist) reguleeritakse kõne ajal dünaamiliselt video vähimast võimalikust "
+"väärtusest kõrgemale ja püütakse hoida siintoodud väärtuse ligidal."
 
-#: ../ekiga.schemas.in.in.h:118
 msgid "The maximum jitter buffer size for audio reception (in ms)"
 msgstr ""
 "Audiovastuvõtul kasutatava värinapuhvri suurim suurus (millisekundites)"
 
-#: ../ekiga.schemas.in.in.h:119
 msgid ""
 "The maximum transmitted frame rate in frames/s. This rate may not be reached "
 "in case a minimum quality was configure via a TSTO value smaller than 31 and "
 "the bitrate selected is not sufficient to support this minimum quality"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:120
 msgid "The new instant message sound"
 msgstr "Uue välksõnumi heli"
 
-#: ../ekiga.schemas.in.in.h:121
 msgid "The new voice mail sound"
 msgstr "Kõneposti uue sõnumi heli"
 
-#: ../ekiga.schemas.in.in.h:122
-msgid ""
-"The output device type is the type of device connected to your Quicknet "
-"card. It can be either a POTS (Plain Old Telephone System) or a headset."
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:123
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect"
@@ -607,7 +443,6 @@
 "Port, mida kuulatakse sisenevate ühenduste vastuvõtmiseks. Uue väärtuse "
 "rakendamiseks tuleb Ekiga taaskäivitada"
 
-#: ../ekiga.schemas.in.in.h:124
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect."
@@ -615,21 +450,12 @@
 "Port, mida kuulatakse sisenevate ühenduste vastuvõtmiseks. Uue väärtuse "
 "rakendamiseks tuleb Ekiga taaskäivitada."
 
-#: ../ekiga.schemas.in.in.h:125
 msgid "The position of the local video window"
 msgstr "Kohaliku video akna asukoht"
 
-#: ../ekiga.schemas.in.in.h:126
 msgid "The position of the remote video window"
 msgstr "Kaugvideo akna asukoht"
 
-#: ../ekiga.schemas.in.in.h:127
-msgid ""
-"The prefix that will be used to save pictures of the conversation. That "
-"prefix is followed by the snapshot number."
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:128
 msgid ""
 "The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
 "port range has no effect if both participants to the conference are using "
@@ -639,102 +465,70 @@
 "pordivahemik ei mõju, kui mõlemad konverentsi osapooled kasutavad H.245 "
 "tunneldamist."
 
-#: ../ekiga.schemas.in.in.h:129
 msgid "The range of UDP ports that Ekiga will use."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:130
-msgid "The save prefix"
-msgstr "Salvestamise eesliide"
-
-#: ../ekiga.schemas.in.in.h:131
 msgid "The short status information"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:132
 msgid "The size of the local video window"
 msgstr "Kohaliku videoakna suurus"
 
-#: ../ekiga.schemas.in.in.h:133
 msgid "The size of the remote video window"
 msgstr "Kaugvideo akna suurus"
 
-#: ../ekiga.schemas.in.in.h:134
 msgid ""
 "The sound that will be played at the end of calls or when calling somebody "
 "who is busy, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:135
 msgid "The sound that will be played on incoming calls, if enabled"
 msgstr "Sisenevate kõnede korral (kui on lubatud) esitatav heli"
 
-#: ../ekiga.schemas.in.in.h:136
 msgid "The sound that will be played when calling somebody, if enabled"
 msgstr "Väljuvate kõnede korral (kui on lubatud) esitatav heli"
 
-#: ../ekiga.schemas.in.in.h:137
 msgid ""
 "The sound that will be played when there is a new instant message, if enabled"
 msgstr "Uue välksõnumi saabumise korral (kui on lubatud) esitatav heli"
 
-#: ../ekiga.schemas.in.in.h:138
 msgid ""
 "The sound that will be played when there is a new voice mail, if enabled"
 msgstr "Uue kõnepostisõnumi korral (kui on lubatud) esitatav heli"
 
-#: ../ekiga.schemas.in.in.h:139
-msgid ""
-"The time after which Ekiga will renew its registration with the registrar"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:140
-msgid "The two-letter country code of your country (e.g.: BE, UK, FR, DE, ...)"
-msgstr ""
-"Kahekohaline riigikood sinu asukohariigi kohta (näiteks ET, UK, DE, FE, jne)"
-
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/preferences.cpp:859
 msgid "The video channel number to use (to select camera, tv or other sources)"
 msgstr "Kasutatav videokanal (kaamera, tv või muude allikate valimiseks)"
 
-#: ../ekiga.schemas.in.in.h:142
 msgid "The video codecs list"
 msgstr "Videokoodekite nimekiri"
 
-#: ../ekiga.schemas.in.in.h:143
 msgid "The video view before having switched to fullscreen"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:144
 msgid ""
 "The video view before having switched to fullscreen (same values as "
 "video_view)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:145
 msgid "The zoom value"
 msgstr "Suurendustegur"
 
-#: ../ekiga.schemas.in.in.h:146
 msgid ""
 "The zoom value in percent to apply to images displayed in the main GUI (can "
 "be 50, 100, or 200)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:147
 msgid ""
 "This allows you to set the mode for sending DTMFs. The values can be "
 "\"RFC2833\" (0), \"INFO\" (1)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:148
 msgid ""
 "This allows you to set the mode for sending DTMFs. The values can be \"String"
 "\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
 "\"). Choosing other values than \"String\" disables the Text Chat"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:149 ../src/gui/preferences.cpp:618
 msgid ""
 "This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
 "are encapsulated into the H.225 channel (port 1720). This saves one TCP "
@@ -743,956 +537,841 @@
 "can crash some versions of Netmeeting."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:150 ../src/gui/preferences.cpp:620
 msgid "This enables H.245 early in the setup"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:151
 msgid ""
 "This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
 "acceleration"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:152
 msgid "UDP port range"
 msgstr "UDP-portide vahemik"
 
-#: ../ekiga.schemas.in.in.h:153
-msgid "Version"
-msgstr "Versioon"
-
-#: ../ekiga.schemas.in.in.h:154
 msgid "Video channel"
 msgstr "Videokanal"
 
-#: ../ekiga.schemas.in.in.h:155
 msgid "Video format"
 msgstr "Videovorming"
 
-#: ../ekiga.schemas.in.in.h:156
-msgid "Video image"
-msgstr "Videopilt"
-
-#: ../ekiga.schemas.in.in.h:157 ../src/gui/assistant.cpp:1045
 msgid "Video input device"
 msgstr "Videosisendi seade"
 
-#: ../ekiga.schemas.in.in.h:158
 msgid "Video preview"
 msgstr "Video eelvaade"
 
-#: ../ekiga.schemas.in.in.h:159
 msgid "Video size"
 msgstr "Video suurus"
 
-#: ../ekiga.schemas.in.in.h:160
 msgid ""
 "Whether to prefer to sustain the max. frame rate or lower it possibly in "
 "order to keep a minimum level of (spatial) quality for all frames. 0: "
 "Highest minimal quality, 31: lowest minimal quality"
 msgstr ""
 
-#: ../lib/engine/addressbook/call-history/history-contact.cpp:148
+msgid "_Find"
+msgstr "_Otsi"
+
+msgid "Neighbours"
+msgstr "Naabrid"
+
+msgid "Clear List"
+msgstr "Puhasta nimekiri"
+
 msgid "Received"
 msgstr "Vastuvõetud kõned"
 
-#: ../lib/engine/addressbook/call-history/history-contact.cpp:151
 msgid "Placed"
 msgstr "Valitud kõned"
 
-#: ../lib/engine/addressbook/call-history/history-contact.cpp:154
 msgid "Missed"
 msgstr "Vastamata kõned"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:234
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:194
-#: ../src/endpoints/opal-account.cpp:310 ../src/gui/main.cpp:1808
-msgid "_Edit"
-msgstr "_Redaktor"
+#, c-format
+msgid "%d user found"
+msgid_plural "%d users found"
+msgstr[0] "%d kasutaja leitud"
+msgstr[1] "%d kasutajat leitud"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:236
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:196
-#: ../src/endpoints/opal-account.cpp:312
-msgid "_Remove"
-msgstr "_Eemalda"
+msgid "New _Contact"
+msgstr "Uus _kontakt"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:325
-msgid "Edit contact"
-msgstr "Kontakti muutmine"
+msgid "New contact"
+msgstr "Uus kontakt"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:327
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:289
-#: ../src/endpoints/opal-account.cpp:353
 msgid "Please update the following fields:"
 msgstr "Palun uuenda järgnevaid välju:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:329
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:221
-#: ../lib/engine/presence/local-roster/local-heap.cpp:184
-#: ../lib/engine/presence/local-roster/local-heap.cpp:331
-#: ../src/endpoints/opal-account.cpp:355 ../src/endpoints/opal-bank.cpp:101
-#: ../src/endpoints/opal-bank.cpp:111
-msgid "Name:"
-msgstr "Nimi:"
+msgid "_Name:"
+msgstr "_Nimi:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:338
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:292
 msgid "VoIP _URI:"
 msgstr "VoIP-_URI:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:339
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:293
 msgid "_Home phone:"
 msgstr "_Kodutelefon:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:340
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:294
 msgid "_Office phone:"
 msgstr "_Töötelefon:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:341
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:295
 msgid "_Cell phone:"
 msgstr "_Mobiiltelefon:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:342
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:296
 msgid "_Pager:"
 msgstr "_Piipar:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:392
+msgid "_Edit"
+msgstr "_Redaktor"
+
+msgid "_Remove"
+msgstr "_Eemalda"
+
+msgid "Edit contact"
+msgstr "Kontakti muutmine"
+
+msgid "Name:"
+msgstr "Nimi:"
+
 msgid "Remove contact"
 msgstr "Kontakti eemaldamine"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:394
 #, c-format
 msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr "Kas soovid kontot %s aadressiraamatust kustutada?"
 
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:76
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:585
-#, c-format
-msgid "%d user found"
-msgid_plural "%d users found"
-msgstr[0] "%d kasutaja leitud"
-msgstr[1] "%d kasutajat leitud"
-
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:244
-msgid "New _Contact"
-msgstr "Uus _kontakt"
-
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:287
-#: ../lib/engine/presence/local-roster/local-heap.cpp:118
-msgid "New contact"
-msgstr "Uus kontakt"
-
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:291
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:157
-msgid "_Name:"
-msgstr "_Nimi:"
-
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:139
-msgid "Add an LDAP Address Book"
-msgstr "LDAP-aadressiraamatu lisamine"
-
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:142
-msgid "Add the Ekiga.net Directory"
-msgstr "Ekiga.net kataloogi lisamine"
-
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:153
-msgid "Create LDAP directory"
-msgstr "LDAP-aadressiraamatu loomine"
-
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:155
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:605
-msgid "Please edit the following fields"
-msgstr "Palun redigeeri järgnevaid välju"
-
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:158
-msgid "_Hostname:"
-msgstr "_Hostinimi:"
-
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:159
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:160
-msgid "_Base DN:"
-msgstr "_Baas-DN:"
+msgid "Audio test"
+msgstr "Audio test"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:164
-msgid "_Subtree"
-msgstr "_Alampuu"
+msgid "Silent"
+msgstr "Vaikus"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:165
-msgid "Single _Level"
-msgstr "Üks _tase"
+msgid "Video test"
+msgstr "Video test"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:166
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:623
-msgid "_Scope"
+#. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
+msgid "Crazy"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:169
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:626
-msgid "Call _Attribute"
+msgid "Screencast"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:170
-msgid "Password"
-msgstr "Parool"
-
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:188
-msgid "Ekiga.net Directory"
-msgstr "Ekiga.net kataloog"
-
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:310
 msgid "_Refresh"
 msgstr "_Värskenda"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:313
 msgid "_Remove addressbook"
 msgstr "_Eemalda aadressiraamat"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:315
 msgid "Addressbook _properties"
 msgstr "Aadressiraamatu _omadused"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:374
+msgid "LDAP SASL Interaction"
+msgstr ""
+
+#. Translators, Howard explained : "Challenge" is a generic term
+#. * in authentication. It's a prompt from the authentication mechanism
+#. * for some type of credential. Exactly what kind of challenge and
+#. * what kind of credential depends on the specific authentication
+#. * mechanism. Since SASL is a generic interface, and can dynamically
+#. * load arbitrary mechanisms, there's not much more specific you can
+#. * say about it. You might google for "challenge response
+#. * authentication" if you'd like more background context.
+#.
+#| msgid "Calling %s"
+msgid "Challenge: "
+msgstr ""
+
+#| msgid "User Interface"
+msgid "Interact"
+msgstr ""
+
 msgid "Refreshing"
 msgstr "Värskendamine"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:382
 msgid "Could not initialize server"
 msgstr "Serverit pole võimalik lähtestada"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:415
-msgid "Could not contact server"
-msgstr "Serveriga pole võimalik ühenduda"
+msgid "LDAP Error: "
+msgstr "LDAP-viga: "
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:423
 msgid "Contacted server"
 msgstr ""
 
 #. patience == 0
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:460
 msgid "Could not connect to server"
 msgstr "Serveriga pole võimalik ühenduda"
 
 #. patience == 0
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:510
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:558
 msgid "Could not search"
-msgstr ""
+msgstr "Otsimine pole võimalik"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:518
 msgid "Waiting for search results"
 msgstr "Otsingutulemuste ootamine"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:603
-msgid "Edit LDAP directory"
-msgstr "LDAP-kataloogi redigeerimine"
+msgid "Please edit the following fields"
+msgstr "Palun redigeeri järgnevaid välju"
+
+#| msgid "_Name"
+msgid "Book _Name"
+msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:607
-msgid "_Name"
-msgstr "_Nimi"
-
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:608
-msgid "_Hostname"
-msgstr "_Hostinimi"
-
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:614
-msgid "_Port"
-msgstr "_Port"
+msgid "Server _URI"
+msgstr "Serveri _URI"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:616
 msgid "_Base DN"
 msgstr "_Baas-DN"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:621
 msgid "Subtree"
 msgstr "Alampuu"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:622
 msgid "Single Level"
 msgstr "Üks tase"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:628
-msgid "_Password"
-msgstr "_Parool"
-
-#: ../lib/engine/addressbook/skel/contact-core.cpp:57
-msgid "_Find"
-msgstr "_Otsi"
-
-#: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
-msgid "Audio test"
-msgstr "Audio test"
-
-#: ../lib/engine/components/gstreamer/gst-audiooutput.cpp:282
-msgid "Silent"
-msgstr "Vaikus"
+#| msgid "Search Scope:"
+msgid "_Search Scope"
+msgstr "Otsingu_skoop:"
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
-msgid "Video test"
-msgstr "Video test"
+msgid "_DisplayName Attribute"
+msgstr ""
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:373
-msgid "Crazy"
+msgid "Call _Attributes"
 msgstr ""
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-msgid "Goom"
-msgstr "Goom"
+msgid "_Filter Template"
+msgstr ""
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:373
-msgid "Screencast"
+msgid "Bind _ID"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:656
-msgid "Address Book"
-msgstr "Aadressiraamat"
+msgid "_Password"
+msgstr "_Parool"
 
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:672
-#: ../src/gui/main.cpp:1757
-msgid "Address _Book"
-msgstr "Aadressi_raamat"
+msgid "Use TLS"
+msgstr ""
 
-#. This will add static and dynamic actions
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:681
-msgid "_Action"
+msgid "Use SASL"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:726
-msgid "Category"
-msgstr "Kategooria"
+msgid "SASL _Mechanism"
+msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:638
-#: ../src/gui/assistant.cpp:1253
-msgid "Full Name"
-msgstr "Täisnimi"
+msgid "Edit LDAP directory"
+msgstr "LDAP-kataloogi redigeerimine"
 
-#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:649
-msgid "_Search Filter:"
-msgstr "Otsingu_filter:"
+msgid "Please provide a Book Name for this directory\n"
+msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:163
-#: ../src/gui/statusmenu.cpp:499
-msgid "Clear"
+msgid "Please provide a Server URI\n"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:247
-msgid "says:"
-msgstr "ütles:"
+msgid "Please provide a DisplayName Attribute\n"
+msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:370
-msgid "Open link in browser"
-msgstr "Ava viit veebisirvijas"
+msgid "Please provide a Call Attribute\n"
+msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:376
-msgid "Copy link"
-msgstr "Kopeeri viit"
+msgid "Invalid Server URI\n"
+msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:905
-msgid "_Smile..."
-msgstr "_Tujunägu..."
+msgid "Add an LDAP Address Book"
+msgstr "LDAP-aadressiraamatu lisamine"
 
-#. we can't do much here since we get the Chat as reference...
-#: ../lib/engine/gui/gtk-frontend/chat-window.cpp:433
-msgid "Chat Window"
-msgstr "Vestlusaken"
+msgid "Add the Ekiga.net Directory"
+msgstr "Ekiga.net kataloogi lisamine"
 
-#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:981
-#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1016
-msgid "Unsorted"
-msgstr "Sortimata"
+msgid "Create LDAP directory"
+msgstr "LDAP-aadressiraamatu loomine"
 
-#: ../lib/engine/presence/avahi/avahi-heap.cpp:125
-#: ../lib/engine/presence/avahi/avahi-heap.cpp:307
-msgid "Neighbours"
-msgstr "Naabrid"
+msgid "Ekiga.net Directory"
+msgstr "Ekiga.net kataloog"
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:218
 msgid "Edit roster element"
 msgstr "Nimekirja kirje redigeerimine"
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:219
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:222
-#: ../lib/engine/presence/local-roster/local-heap.cpp:193
-#: ../lib/engine/presence/local-roster/local-heap.cpp:195
 msgid "Address:"
 msgstr "Aadress:"
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:224
 msgid "Choose groups:"
 msgstr "Gruppide valimine:"
 
-#: ../lib/engine/presence/local-roster/local-roster-bridge.cpp:94
-#: ../lib/engine/presence/local-roster/local-heap.cpp:181
 msgid "Add to local roster"
 msgstr "Kohalikku nimekirja lisamine"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:93
 msgid "Services"
 msgstr "Teenused"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:94
 msgid "Echo test"
 msgstr "Kajatest"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:95
 msgid "Conference room"
 msgstr "Konverentsiruum"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:111
 msgid "Local roster"
 msgstr "Kohalik nimekiri"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:128
 msgid "Rename"
 msgstr "Muuda nime"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:161
 msgid "Family"
 msgstr "Pere"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:162
 msgid "Friend"
 msgstr "Sõber"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:163
 msgid "Associate"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:164
 msgid "Assistant"
 msgstr "Abiline"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:165
 msgid "Supervisor"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:166
 msgid "Self"
 msgstr "Ise"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:182
 msgid ""
 "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:199
 msgid "Put contact in groups:"
 msgstr "Kontakti paigutamine gruppidesse:"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:302
 msgid "You supplied an unsupported address"
 msgstr "Sa kasutad toetamata aadressi"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:304
 msgid "You already have a contact with this address!"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:329
 msgid "Rename group"
 msgstr "Grupi nime muutmine"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:330
 msgid "Please edit this group name"
 msgstr "Palun redigeeri selle grupi nime"
 
-#: ../lib/gui/codecsbox.cpp:477
-msgid "Move selected codec priority upwards"
-msgstr ""
-
-#: ../lib/gui/codecsbox.cpp:487
-msgid "Move selected codec priority downwards"
-msgstr ""
-
-#: ../lib/gui/gmdialog.c:474
-msgid "Do not show this dialog again"
-msgstr "Seda dialoogi enam mitte näidata"
-
-#: ../src/endpoints/h323-endpoint.cpp:153
-#: ../src/endpoints/sip-endpoint.cpp:273 ../src/endpoints/sip-endpoint.cpp:277
 msgid "Call"
-msgstr ""
+msgstr "Helista"
 
-#: ../src/endpoints/h323-endpoint.cpp:156
-#: ../src/endpoints/sip-endpoint.cpp:274 ../src/endpoints/sip-endpoint.cpp:278
-#: ../src/gui/main.cpp:3878
 msgid "Transfer"
 msgstr "Ümbersuunamine"
 
 #. Translators : The alias we are registering already exists : failure
-#: ../src/endpoints/h323-endpoint.cpp:319
 msgid "Duplicate alias"
 msgstr ""
 
-#: ../src/endpoints/h323-endpoint.cpp:322
 msgid "Bad username/password"
 msgstr "Vigane kasutajanimi/parool"
 
-#: ../src/endpoints/h323-endpoint.cpp:325
-#: ../src/endpoints/sip-endpoint.cpp:904
 msgid "Transport error"
 msgstr ""
 
-#: ../src/endpoints/h323-endpoint.cpp:336
-#: ../src/endpoints/h323-endpoint.cpp:341
-#: ../src/endpoints/sip-endpoint.cpp:911
 msgid "Failed"
 msgstr "Tõrge"
 
-#: ../src/endpoints/manager.cpp:708
-msgid ""
-"Ekiga did not manage to configure your network settings automatically. You "
-"can still use it, but you need to configure your network settings manually.\n"
-"\n"
-"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
-"for instructions"
-msgstr ""
-
-#: ../src/endpoints/opal-account.cpp:302
 msgid "_Disable"
 msgstr "_Keela"
 
-#: ../src/endpoints/opal-account.cpp:305
 msgid "_Enable"
 msgstr "_Luba"
 
-#: ../src/endpoints/opal-account.cpp:326 ../src/gui/assistant.cpp:664
 msgid "Recharge the account"
 msgstr "Kõneaja laadimine"
 
-#: ../src/endpoints/opal-account.cpp:331 ../src/gui/assistant.cpp:676
 msgid "Consult the balance history"
-msgstr ""
+msgstr "Vaata kõneaja ajalugu"
 
-#: ../src/endpoints/opal-account.cpp:336
 msgid "Consult the call history"
 msgstr "Kõnede ajaloo vaatamine"
 
-#: ../src/endpoints/opal-account.cpp:351 ../src/endpoints/opal-bank.cpp:74
 msgid "Edit account"
 msgstr "Konto redigeerimine"
 
-#: ../src/endpoints/opal-account.cpp:357 ../src/endpoints/opal-bank.cpp:112
 msgid "Registrar:"
 msgstr "Registreerija:"
 
-#: ../src/endpoints/opal-account.cpp:359 ../src/endpoints/opal-bank.cpp:102
 msgid "Gatekeeper:"
 msgstr "Väravavalvur:"
 
-#: ../src/endpoints/opal-account.cpp:360 ../src/endpoints/opal-bank.cpp:83
-#: ../src/endpoints/opal-bank.cpp:103 ../src/endpoints/opal-bank.cpp:113
 msgid "User:"
 msgstr "Kasutaja:"
 
 #. Translators:
 #. * SIP knows two usernames: The name for the client ("User") and the name
 #. * for the authentication procedure ("Authentication User")
-#: ../src/endpoints/opal-account.cpp:365 ../src/endpoints/opal-bank.cpp:114
 msgid "Authentication User:"
 msgstr "Kasutaja autentimine:"
 
-#: ../src/endpoints/opal-account.cpp:366 ../src/endpoints/opal-bank.cpp:85
-#: ../src/endpoints/opal-bank.cpp:105 ../src/endpoints/opal-bank.cpp:115
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../src/endpoints/opal-account.cpp:367 ../src/endpoints/opal-bank.cpp:106
-#: ../src/endpoints/opal-bank.cpp:116
 msgid "Timeout:"
 msgstr "Ajapiirang:"
 
-#: ../src/endpoints/opal-account.cpp:368 ../src/endpoints/opal-bank.cpp:119
 msgid "Enable Account"
-msgstr "Konto lubamine"
+msgstr "Konto on lubatud"
 
-#: ../src/endpoints/opal-account.cpp:403 ../src/endpoints/opal-bank.cpp:155
 msgid "You did not supply a name for that account."
 msgstr "Sa ei määranud sellele kontole nime"
 
-#: ../src/endpoints/opal-account.cpp:405 ../src/endpoints/opal-bank.cpp:157
 msgid "You did not supply a host to register to."
 msgstr ""
 
-#: ../src/endpoints/opal-account.cpp:407 ../src/endpoints/opal-bank.cpp:159
 msgid "You did not supply a user name for that account."
 msgstr "Sa ei määranud sellele kontole kasutajanime"
 
-#: ../src/endpoints/opal-account.cpp:409 ../src/endpoints/opal-bank.cpp:161
 msgid "The timeout should have a bigger value."
 msgstr "Ajapiiranguks peaks olema suurem väärtus"
 
-#: ../src/endpoints/opal-bank.cpp:55
 msgid "_Add an Ekiga.net Account"
 msgstr "_Lisa Ekiga.net konto"
 
-#: ../src/endpoints/opal-bank.cpp:57
 msgid "_Add an Ekiga Call Out Account"
 msgstr "_Lisa Ekiga väljahelistamise konto"
 
-#: ../src/endpoints/opal-bank.cpp:59
 msgid "_Add a SIP Account"
 msgstr "_Lisa SIP-konto"
 
-#: ../src/endpoints/opal-bank.cpp:61
 msgid "_Add an H.323 Account"
 msgstr "_Lisa H.323 konto"
 
-#: ../src/endpoints/opal-bank.cpp:75
 msgid "Please update the following fields."
 msgstr "Palun uuenda järgnevaid välju."
 
-#: ../src/endpoints/opal-bank.cpp:80 ../src/gui/assistant.cpp:540
 msgid "Get an Ekiga.net SIP account"
 msgstr "Hangi omale Ekiga.net SIP-konto"
 
-#: ../src/endpoints/opal-bank.cpp:90 ../src/gui/assistant.cpp:652
 msgid "Get an Ekiga Call Out account"
 msgstr "Ekiga väljahelistamise konto hankimine"
 
-#: ../src/endpoints/opal-bank.cpp:94 ../src/gui/main.cpp:3575
-#: ../src/gui/main.cpp:3672
 msgid "Account ID:"
 msgstr "Konto ID:"
 
-#: ../src/endpoints/opal-bank.cpp:96
 msgid "PIN Code:"
 msgstr "PIN-kood:"
 
-#: ../src/endpoints/opal-call.cpp:410
 msgid "Local user cleared the call"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:413 ../src/endpoints/opal-call.cpp:416
 msgid "Local user rejected the call"
 msgstr "Kohalik kasutaja lükkas kõne tagasi"
 
-#: ../src/endpoints/opal-call.cpp:419
 msgid "Remote user cleared the call"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:422
 msgid "Remote user rejected the call"
 msgstr "Kaugkasutaja lükkas kõne tagasi"
 
-#: ../src/endpoints/opal-call.cpp:425
 msgid "Remote user has stopped calling"
 msgstr "Teine pool lõpetas helistamise"
 
-#: ../src/endpoints/opal-call.cpp:428
 msgid "Abnormal call termination"
 msgstr "Kõne ebanormaalne katkestamine"
 
-#: ../src/endpoints/opal-call.cpp:431 ../src/gui/main.cpp:1542
 msgid "Could not connect to remote host"
 msgstr "Kaughostiga pole võimalik ühenduda"
 
-#: ../src/endpoints/opal-call.cpp:434
 msgid "The Gatekeeper cleared the call"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:437
 msgid "User not found"
 msgstr "Kasutajat ei leitud"
 
-#: ../src/endpoints/opal-call.cpp:440
 msgid "Insufficient bandwidth"
 msgstr "Läbilaskevõime pole piisav"
 
-#: ../src/endpoints/opal-call.cpp:443
 msgid "No common codec"
 msgstr "Puudub üldine koodek"
 
-#: ../src/endpoints/opal-call.cpp:446
 msgid "Call forwarded"
 msgstr "Kõne on edasi suunatud"
 
-#: ../src/endpoints/opal-call.cpp:449
 msgid "Security check failed"
 msgstr "Tõrge turvakontrollil"
 
-#: ../src/endpoints/opal-call.cpp:452
 msgid "Local user is busy"
 msgstr "Kohalik kasutaja on hõivatud"
 
-#: ../src/endpoints/opal-call.cpp:455 ../src/endpoints/opal-call.cpp:461
 msgid "Congested link to remote party"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:458
 msgid "Remote user is busy"
 msgstr "Kaugkasutaja on hõivatud"
 
-#: ../src/endpoints/opal-call.cpp:464
 msgid "Remote host is offline"
 msgstr "Kaughost pole võrku ühendatud"
 
-#: ../src/endpoints/opal-call.cpp:470
 msgid "User is not available"
 msgstr "Kasutaja pole saadaval"
 
-#: ../src/endpoints/opal-call.cpp:482
 msgid "Call completed"
 msgstr "Kõne on lõpetatud"
 
-#: ../src/endpoints/sip-endpoint.cpp:298 ../src/endpoints/sip-endpoint.cpp:300
+msgid ""
+"Ekiga did not manage to configure your network settings automatically. You "
+"can still use it, but you need to configure your network settings manually.\n"
+"\n"
+"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"for instructions"
+msgstr ""
+
 msgid "Message"
 msgstr "Sõnum"
 
-#: ../src/endpoints/sip-endpoint.cpp:718
 msgid "Bad request"
 msgstr "Vigane päring"
 
-#: ../src/endpoints/sip-endpoint.cpp:722
 msgid "Payment required"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:726
 msgid "Unauthorized"
 msgstr "Autoriseerimata"
 
-#: ../src/endpoints/sip-endpoint.cpp:730
 msgid "Forbidden"
 msgstr "Keelatud"
 
-#: ../src/endpoints/sip-endpoint.cpp:734
 msgid "Timeout"
 msgstr "Ajapiirang"
 
-#: ../src/endpoints/sip-endpoint.cpp:738
 msgid "Conflict"
 msgstr "Vastuolu"
 
-#: ../src/endpoints/sip-endpoint.cpp:742
 msgid "Temporarily unavailable"
 msgstr "Ajutiselt pole saadaval"
 
-#: ../src/endpoints/sip-endpoint.cpp:746
 msgid "Not acceptable"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:750
 msgid "Illegal status code"
 msgstr "Lubamatu olekukood"
 
-#: ../src/endpoints/sip-endpoint.cpp:754
 msgid "Multiple choices"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:758
 msgid "Moved permanently"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:762
 msgid "Moved temporarily"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:766
 msgid "Use proxy"
 msgstr "Proxy kasutamine"
 
-#: ../src/endpoints/sip-endpoint.cpp:770
 msgid "Alternative service"
 msgstr "Alternatiivne teenus"
 
-#: ../src/endpoints/sip-endpoint.cpp:774
 msgid "Not found"
 msgstr "Ei leitud"
 
-#: ../src/endpoints/sip-endpoint.cpp:778
 msgid "Method not allowed"
 msgstr "Meetod pole lubatud"
 
-#: ../src/endpoints/sip-endpoint.cpp:782
 msgid "Proxy authentication required"
 msgstr "Vajalik on proksi autentimine"
 
-#: ../src/endpoints/sip-endpoint.cpp:786
 msgid "Length required"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:790
 msgid "Request entity too big"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:794
 msgid "Request URI too long"
 msgstr "Päritud URI on liiga pikk"
 
-#: ../src/endpoints/sip-endpoint.cpp:798
 msgid "Unsupported media type"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:802
 msgid "Unsupported URI scheme"
 msgstr ""
 
 #. Translators : The extension we are trying to register does not exist
-#: ../src/endpoints/sip-endpoint.cpp:807
 msgid "Bad extension"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:811
 msgid "Extension required"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:815
 msgid "Interval too brief"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:819
 msgid "Loop detected"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:823
 msgid "Too many hops"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:827
 msgid "Address incomplete"
 msgstr "Poolik aadress"
 
-#: ../src/endpoints/sip-endpoint.cpp:831
 msgid "Ambiguous"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:835
 msgid "Busy Here"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:839
 msgid "Request terminated"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:843
 msgid "Not acceptable here"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:847
 msgid "Bad event"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:851
 msgid "Request pending"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:855
 msgid "Undecipherable"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:859
 msgid "Internal server error"
 msgstr "Serveri sisemine viga"
 
-#: ../src/endpoints/sip-endpoint.cpp:863
 msgid "Not implemented"
 msgstr "Pole teostatud"
 
-#: ../src/endpoints/sip-endpoint.cpp:867
 msgid "Bad gateway"
 msgstr "Vigane värav"
 
-#: ../src/endpoints/sip-endpoint.cpp:871
 msgid "Service unavailable"
 msgstr "Teenus pole saadaval"
 
-#: ../src/endpoints/sip-endpoint.cpp:875
 msgid "Server timeout"
 msgstr "Serveri ajapiirang"
 
-#: ../src/endpoints/sip-endpoint.cpp:879
 msgid "SIP version not supported"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:883
 msgid "Message too large"
 msgstr "Sõnum on liiga suur"
 
-#: ../src/endpoints/sip-endpoint.cpp:887
 msgid "Busy everywhere"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:891
 msgid "Decline"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:895
 msgid "Does not exist anymore"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:899
 msgid "Globally not acceptable"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:1027
 msgid "Could not send message"
 msgstr "Sõnumit pole võimalik saata"
 
-#: ../src/gui/accounts.cpp:234
-msgid "Registered"
-msgstr "Registreeritud"
+#, c-format
+#| msgid "Incoming call mode"
+msgid "Incoming call from %s"
+msgstr "Sisenev kõne (%s)"
 
-#: ../src/gui/accounts.cpp:238
-msgid "Unregistered"
-msgstr "Registreerimata"
+#, c-format
+#| msgid "Incoming call mode"
+msgid "Incoming call"
+msgstr "Sisenev kõne"
 
-#: ../src/gui/accounts.cpp:242
-msgid "Could not unregister"
+#, c-format
+msgid "In a call with %s"
 msgstr ""
 
-#: ../src/gui/accounts.cpp:248
-msgid "Could not register"
-msgstr "Registreerimine pole võimalik"
+#, c-format
+msgid "In a call"
+msgstr ""
 
-#: ../src/gui/accounts.cpp:254
-msgid "Processing..."
-msgstr "Töötlemine..."
+msgid "New resource list"
+msgstr ""
 
-#: ../src/gui/accounts.cpp:628
-msgid "Account Name"
-msgstr "Konto nimi"
+msgid "Add new resource-list"
+msgstr ""
 
-#: ../src/gui/accounts.cpp:629
-msgid "Voice Mails"
-msgstr "Kõneposti sõnumid"
+msgid ""
+"Please fill in this form to add a new contact list to ekiga's remote roster"
+msgstr ""
 
-#: ../src/gui/accounts.cpp:630
-msgid "Status"
-msgstr "Olek"
+msgid "Writable:"
+msgstr ""
 
-#: ../src/gui/accounts.cpp:641 ../src/gui/accounts.cpp:684
-msgid "Accounts"
-msgstr "Kontod"
+#| msgid "User:"
+msgid "Username:"
+msgstr "Kasutajanimi:"
 
-#: ../src/gui/accounts.cpp:655 ../src/gui/main.cpp:1818
-msgid "_Accounts"
-msgstr "_Kontod"
+#| msgid "Rename"
+msgid "Unnamed"
+msgstr ""
 
-#: ../src/gui/accounts.cpp:659 ../src/gui/main.cpp:1901
-msgid "_Help"
-msgstr "A_bi"
+#| msgid "New contact"
+msgid "_Add a new contact"
+msgstr "_Lisa uus kontakt"
 
-#. Translators:
-#. * The following string "A" means "activated" or "active". It's a column
-#. * description in the list of configured accounts, it shows if an account
+#| msgid "View the contacts list"
+msgid "_Refresh contact list"
+msgstr "_Värskenda kontaktide nimekirja"
+
+msgid "Contact list _properties"
+msgstr "Kontaktide nimekirja _omadused"
+
+#| msgid "Put contact in groups:"
+msgid "Edit contact list properties"
+msgstr "Kontaktide nimekirja omaduste redigeerimine"
+
+#| msgid "Please edit the following fields"
+msgid "Please edit the following fields (no identifier means global)"
+msgstr ""
+"Palun redigeeri järgnevaid välju (identifikaatorita väljad tähendavad "
+"globaalseid välju)"
+
+msgid "Contact list's name"
+msgstr ""
+
+#. "Document" used as a name -- uri point to the root of a document tree
+#| msgid "Documented by"
+msgid "Document root"
+msgstr ""
+
+msgid "Identifier"
+msgstr "Identifikaator"
+
+#| msgid "_Disable"
+msgid "Writable"
+msgstr "Kirjutatav"
+
+#| msgid "Server timeout"
+msgid "Server username"
+msgstr "Serveri kasutajanimi"
+
+#| msgid "Bad username/password"
+msgid "Server password"
+msgstr "Serveri parool"
+
+#| msgid "Remove contact"
+msgid "Add a remote contact"
+msgstr "Kaugkontakti lisamine"
+
+msgid "Please fill in this form to create a new contact on a remote server"
+msgstr ""
+
+#| msgid "Edit contact"
+msgid "Edit remote contact"
+msgstr "Kaugkontakti redigeerimine"
+
+msgid ""
+"Please fill in this form to change an existing contact on a remote server"
+msgstr ""
+
+#| msgid "Invalid users directory"
+msgid "Invalid server data"
+msgstr "Vigased serveri andmed"
+
+msgid "Click to fetch"
+msgstr ""
+
+#| msgid "Edit contact"
+msgid "Distant contact"
+msgstr ""
+
+#, c-format
+msgid "%s / List #%d"
+msgstr ""
+
+#, c-format
+msgid "List #%d"
+msgstr ""
+
+#| msgid "Advanced Settings"
+msgid "Advanced"
+msgstr "Laiendatud"
+
+msgid "Address Book"
+msgstr "Aadressiraamat"
+
+msgid "Address _Book"
+msgstr "Aadressi_raamat"
+
+#. This will add static and dynamic actions
+msgid "_Action"
+msgstr ""
+
+msgid "Category"
+msgstr "Kategooria"
+
+msgid "Full Name"
+msgstr "Täisnimi"
+
+msgid "_Search Filter:"
+msgstr "Otsingu_filter:"
+
+msgid "says:"
+msgstr "ütles:"
+
+msgid "Open link in browser"
+msgstr "Ava viit veebisirvijas"
+
+msgid "Copy link"
+msgstr "Kopeeri viit"
+
+msgid "_Smile..."
+msgstr "_Tujunägu..."
+
+#. we can't do much here since we get the Chat as reference...
+msgid "Chat Window"
+msgstr "Vestlusaken"
+
+msgid "Unsorted"
+msgstr "Sortimata"
+
+msgid "Move selected codec priority upwards"
+msgstr ""
+
+msgid "Move selected codec priority downwards"
+msgstr ""
+
+msgid "Do not show this dialog again"
+msgstr "Seda dialoogi enam mitte näidata"
+
+msgid "Registered"
+msgstr "Registreeritud"
+
+msgid "Unregistered"
+msgstr "Registreerimata"
+
+msgid "Could not unregister"
+msgstr ""
+
+msgid "Could not register"
+msgstr "Registreerimine pole võimalik"
+
+msgid "Processing..."
+msgstr "Töötlemine..."
+
+msgid "Account Name"
+msgstr "Konto nimi"
+
+msgid "Voice Mails"
+msgstr "Kõneposti sõnumid"
+
+msgid "Status"
+msgstr "Olek"
+
+msgid "Accounts"
+msgstr "Kontod"
+
+msgid "_Accounts"
+msgstr "_Kontod"
+
+msgid "_Help"
+msgstr "A_bi"
+
+#. Translators:
+#. * The following string "A" means "activated" or "active". It's a column
+#. * description in the list of configured accounts, it shows if an account
 #. * is activated or not (a status the user can choose).
 #.
-#: ../src/gui/accounts.cpp:692 ../src/gui/preferences.cpp:497
 msgid "A"
 msgstr "A"
 
-#: ../src/gui/assistant.cpp:258
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1706,20 +1385,16 @@
 "Hiljem on võimalik tehtud valikuid alati muuta valides Redaktorimenüü alt "
 "menüüpunkti Eelistused."
 
-#: ../src/gui/assistant.cpp:266
-msgid "Welcome in Ekiga"
-msgstr "Tere tulemast Ekigat kasutama"
+msgid "Welcome to Ekiga"
+msgstr "Tere tulemast Ekiga kasutajaks"
 
-#: ../src/gui/assistant.cpp:300 ../src/gui/preferences.cpp:373
 msgid "Personal Information"
 msgstr "Isiklikud andmed"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:303
 msgid "Please enter your first name and your surname:"
 msgstr "Palun sisesta oma eesnimi ja perekonnanimi:"
 
-#: ../src/gui/assistant.cpp:312
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
@@ -1727,19 +1402,15 @@
 "Sinu ees- ja perekonnanime kasutatakse ühendumisel teise VoIP ja "
 "videokonverentsi tarkvaraga."
 
-#: ../src/gui/assistant.cpp:503
 msgid "Ekiga.net Account"
 msgstr "Ekiga.net konto"
 
-#: ../src/gui/assistant.cpp:505
 msgid "Please enter your username:"
 msgstr "Palun sisesta oma kasutajanimi:"
 
-#: ../src/gui/assistant.cpp:513
 msgid "Please enter your password:"
 msgstr "Palun sisesta oma parool:"
 
-#: ../src/gui/assistant.cpp:523
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1757,23 +1428,18 @@
 "Kui sa kasutad alternatiivset SIP-teenust või eelistad sisselogimisandmed "
 "hiljem sisestada, siis võib need sammud vahele jätta."
 
-#: ../src/gui/assistant.cpp:550
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "Ma ei soovi registreeruda ekiga.net vaba teenuse kasutajaks"
 
-#: ../src/gui/assistant.cpp:617
 msgid "Ekiga Call Out Account"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:619
 msgid "Please enter your account ID:"
 msgstr "Palun sisesta oma kasutaja ID:"
 
-#: ../src/gui/assistant.cpp:627
 msgid "Please enter your PIN code:"
 msgstr "Palun sisesta oma PIN-kood:"
 
-#: ../src/gui/assistant.cpp:638
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1785,48 +1451,37 @@
 "dialog.\n"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:688
 msgid "Consult the calls history"
-msgstr ""
+msgstr "Vaata kõnede ajalugu"
 
-#: ../src/gui/assistant.cpp:698
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr "Ma ei soovi registreeruda Ekiga.net teenuse kasutajaks"
 
-#: ../src/gui/assistant.cpp:767 ../src/gui/assistant.cpp:1264
 msgid "Connection Type"
 msgstr "Ühenduse liik"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:770
 msgid "Please choose your connection type:"
 msgstr "Palun vali oma ühenduse liik:"
 
-#: ../src/gui/assistant.cpp:787
 msgid "56k Modem"
 msgstr "56k Modem"
 
-#: ../src/gui/assistant.cpp:792
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:797
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "DSL/Kaabel (üleslaadimine 128 kbit/s)"
 
-#: ../src/gui/assistant.cpp:802
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "DSL/Kaabel (üleslaadimine 512 kbit/s)"
 
-#: ../src/gui/assistant.cpp:807
 msgid "LAN"
 msgstr "LAN"
 
-#: ../src/gui/assistant.cpp:812
 msgid "Keep current settings"
 msgstr "Käesolevad sätted säilitatakse"
 
-#: ../src/gui/assistant.cpp:817
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -1835,16 +1490,12 @@
 "Ühenduse liigi abil saab Ekiga valida kõnedele parimad kvaliteedisätted. "
 "Hiljem saab sätteid ükshaaval muuta eelistuste aknas."
 
-#: ../src/gui/assistant.cpp:907 ../src/gui/main.cpp:3948
-#: ../src/gui/main.cpp:3952 ../src/gui/preferences.cpp:690
 msgid "Audio Devices"
 msgstr "Audioseadmed"
 
-#: ../src/gui/assistant.cpp:909
 msgid "Please choose the audio ringing device:"
 msgstr "Palun vali helinaseade:"
 
-#: ../src/gui/assistant.cpp:917
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
@@ -1853,100 +1504,77 @@
 "seade."
 
 #. ---
-#: ../src/gui/assistant.cpp:928
 msgid "Please choose the audio output device:"
 msgstr "Palun vali audioväljundi seade:"
 
-#: ../src/gui/assistant.cpp:936
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
 msgstr "Audio väljundseade on kõnede ajal heli esitamiseks kasutatav seade."
 
 #. ---
-#: ../src/gui/assistant.cpp:947
 msgid "Please choose the audio input device:"
 msgstr "Palun vali audiosisendi seade:"
 
-#: ../src/gui/assistant.cpp:955
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
 msgstr ""
 "Audio sisendseade on kõnede ajal sinu hääle salvestamiseks kasutatav seade."
 
-#: ../src/gui/assistant.cpp:1047
 msgid "Please choose your video input device:"
 msgstr "Palun vali oma videosisendi seade:"
 
-#: ../src/gui/assistant.cpp:1055
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
 msgstr "Video sisendseade on kõnede ajal videopildi salvestamise seade."
 
-#: ../src/gui/assistant.cpp:1118 ../src/gui/assistant.cpp:1141
-#: ../src/gui/assistant.cpp:1164 ../src/gui/preferences.cpp:734
-#: ../src/gui/preferences.cpp:758 ../src/gui/preferences.cpp:781
 msgid "No device found"
 msgstr "Seadet ei leitud"
 
-#: ../src/gui/assistant.cpp:1195
 msgid "Configuration Complete"
 msgstr "Seadistused on valmis"
 
-#: ../src/gui/assistant.cpp:1197
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1204
 msgid "Configuration summary:"
 msgstr "Seadistuste kokkuvõte:"
 
-#: ../src/gui/assistant.cpp:1274
 msgid "Audio Ringing Device"
 msgstr "Helinaseade"
 
-#: ../src/gui/assistant.cpp:1283
 msgid "Audio Output Device"
 msgstr "Audioväljundi seade"
 
-#: ../src/gui/assistant.cpp:1292
 msgid "Audio Input Device"
 msgstr "Audiosisendi seade"
 
-#: ../src/gui/assistant.cpp:1301
 msgid "Video Input Device"
 msgstr "Videosisendi seade"
 
-#: ../src/gui/assistant.cpp:1314
 msgid "SIP URI"
 msgstr "SIP-URI"
 
-#: ../src/gui/assistant.cpp:1326
 msgid "Ekiga Call Out"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1368
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr "Seadistusabiline (%d. samm %d'st)"
 
-#: ../src/gui/callbacks.cpp:130
 msgid "Contributors:"
 msgstr "Kaastöötajad:"
 
-#: ../src/gui/callbacks.cpp:140
 msgid "Artwork:"
 msgstr "Kunst:"
 
-#: ../src/gui/callbacks.cpp:148
 msgid "See AUTHORS file for full credits"
 msgstr ""
 
-#: ../src/gui/callbacks.cpp:164
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -1958,7 +1586,6 @@
 "Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number 2 või "
 "(vastavalt Teie valikule) ükskõik milline hilisem versioon. "
 
-#: ../src/gui/callbacks.cpp:168
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -1974,7 +1601,6 @@
 "selle programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga, "
 "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/gui/callbacks.cpp:175
 msgid ""
 "Ekiga is licensed under the GPL license and as a special exception, you have "
 "permission to link or otherwise combine this program with the programs OPAL, "
@@ -1986,11 +1612,9 @@
 
 #. Translators: Please write translator credits here, and
 #. * separate names with \n
-#: ../src/gui/callbacks.cpp:187
 msgid "translator-credits"
-msgstr "Ivar Smolin <okul@linux.ee>, 2005-2008."
+msgstr "Ivar Smolin <okul@linux.ee>, 2005-2009."
 
-#: ../src/gui/callbacks.cpp:192
 msgid ""
 "Ekiga is full-featured SIP and H.323 compatible VoIP, IP-Telephony and "
 "Videoconferencing application that allows you to make audio and video calls "
@@ -2001,116 +1625,116 @@
 "videokõnesid kaugkasutajatele, kes pruugivad SIP ja H.323 riist- või "
 "tarkvara."
 
-#: ../src/gui/dialpad.cpp:59
+msgid "Help display is not supported by your GTK+ version"
+msgstr ""
+
+#| msgid "Failed to open the device"
+msgid "Unable to open help file."
+msgstr "Abiteabe faili pole võimalik avada."
+
 msgid "abc"
 msgstr "abc"
 
-#: ../src/gui/dialpad.cpp:60
 msgid "def"
 msgstr "def"
 
-#: ../src/gui/dialpad.cpp:61
 msgid "ghi"
 msgstr "ghi"
 
-#: ../src/gui/dialpad.cpp:62
 msgid "jkl"
 msgstr "jkl"
 
-#: ../src/gui/dialpad.cpp:63
 msgid "mno"
 msgstr "mno"
 
-#: ../src/gui/dialpad.cpp:64
 msgid "pqrs"
 msgstr "pqrs"
 
-#: ../src/gui/dialpad.cpp:65
 msgid "tuv"
 msgstr "tuv"
 
-#: ../src/gui/dialpad.cpp:66
 msgid "wxyz"
 msgstr "wxyz"
 
 #. Translators: Is displayed once an account "%s" is registered.
-#: ../src/gui/main.cpp:583
 #, c-format
 msgid "Registered %s"
 msgstr "Konto %s on registreeritud"
 
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:589
 #, c-format
 msgid "Unregistered %s"
 msgstr "Konto %s registreering on eemaldatud"
 
-#: ../src/gui/main.cpp:594
 #, c-format
 msgid "Could not unregister %s"
 msgstr "Konto %s registreeringu eemaldamine pole võimalik"
 
-#: ../src/gui/main.cpp:598
 #, c-format
 msgid "Could not register %s"
 msgstr "Konto %s registreerimine pole võimalik"
 
-#: ../src/gui/main.cpp:663
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr ""
 
-#: ../src/gui/main.cpp:708
 #, c-format
 msgid "Connected with %s"
 msgstr "Ühendumine %s-ga"
 
-#: ../src/gui/main.cpp:744 ../src/gui/main.cpp:2339
 msgid "Standby"
 msgstr "Ooterežiim"
 
-#: ../src/gui/main.cpp:810
 msgid "Call on hold"
 msgstr "Kõne on ootel"
 
-#: ../src/gui/main.cpp:823
 msgid "Call retrieved"
 msgstr "Kõne on vastu võetud"
 
-#: ../src/gui/main.cpp:840
 #, c-format
 msgid "Missed call from %s"
 msgstr "Vastamata kõned kontolt %s"
 
-#: ../src/gui/main.cpp:983 ../src/gui/misc.cpp:94
 msgid "Error"
 msgstr "Viga"
 
+#| msgid "Error while opening audio output device %s"
+msgid "Error while initializing video output"
+msgstr "Viga audioväljundi lähtestamisel"
+
+msgid "No video will be displayed during this call->"
+msgstr ""
+
+msgid ""
+"There was an error opening or initializing the video output. Please verify "
+"that no other application is using the accelerated video output."
+msgstr ""
+
+msgid ""
+"There was an error opening or initializing the video output. Please verify "
+"that you are using a color depth of 24 or 32 bits per pixel."
+msgstr ""
+
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1118
 #, c-format
 msgid "Added video input device %s"
 msgstr "Videosisendi seade %s lisatud"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1136
 #, c-format
 msgid "Removed video input device %s"
 msgstr "Videosisendi seade %s eemaldatud"
 
-#: ../src/gui/main.cpp:1153
 #, c-format
 msgid "Error while accessing video device %s"
 msgstr "Viga videoseadmele %s ligipääsul"
 
-#: ../src/gui/main.cpp:1156
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
 "plugin and \"Moving logo\" or \"Static picture\" as device."
 msgstr ""
 
-#: ../src/gui/main.cpp:1160
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
@@ -2121,15 +1745,12 @@
 "uuesti ühendamine. Kui see on püsivalt ühendatud seade, siis palun kontrolli "
 "oma pääsuõigusi ja veendu, et seadmele on laaditud õige draiver."
 
-#: ../src/gui/main.cpp:1164
 msgid "Your video driver doesn't support the requested video format."
 msgstr "Sinu videodraiver ei toeta küsitud videovormingut."
 
-#: ../src/gui/main.cpp:1168
 msgid "Could not open the chosen channel."
 msgstr "Valitud kanalit pole võimalik avada."
 
-#: ../src/gui/main.cpp:1172
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2137,42 +1758,34 @@
 "Palette is supported."
 msgstr ""
 
-#: ../src/gui/main.cpp:1176
 msgid "Error while setting the frame rate."
 msgstr "Viga kaadrisageduse määramisel."
 
-#: ../src/gui/main.cpp:1180
 msgid "Error while setting the frame size."
 msgstr "Viga kaadrisuuruse määramisel."
 
-#: ../src/gui/main.cpp:1185 ../src/gui/main.cpp:1300 ../src/gui/main.cpp:1422
 msgid "Unknown error."
 msgstr "Tundmatu viga."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1244
 #, c-format
 msgid "Added audio input device %s"
 msgstr "Audiosisendi seade %s lisatud"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1265
 #, c-format
 msgid "Removed audio input device %s"
 msgstr "Audiosisendi seade %s eemaldatud"
 
-#: ../src/gui/main.cpp:1282
 #, c-format
 msgid "Error while opening audio input device %s"
 msgstr "Viga audiosisendi seadme %s avamisel"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
-#: ../src/gui/main.cpp:1287
 msgid "Only silence will be transmitted."
 msgstr "Üle kantakse ainult vaikust."
 
-#: ../src/gui/main.cpp:1291
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2184,7 +1797,6 @@
 "tegemist pole irdseadmega, siis palun kontrolli oma audiosätteid ja "
 "pääsuõigusi ning veendu, et seade pole hõivatud."
 
-#: ../src/gui/main.cpp:1295
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2196,26 +1808,21 @@
 "ei aita või kui tegemist pole irdseadmega, siis palun kontrolli oma "
 "audiosätteid."
 
-#: ../src/gui/main.cpp:1367
 #, c-format
 msgid "Added audio output device %s"
 msgstr "Audioväljundi seade %s lisatud"
 
-#: ../src/gui/main.cpp:1385
 #, c-format
 msgid "Removed audio output device %s"
 msgstr "Audioväljundi seade %s eemaldatud"
 
-#: ../src/gui/main.cpp:1406
 #, c-format
 msgid "Error while opening audio output device %s"
 msgstr "Viga audioväljundi seadme %s avamisel"
 
-#: ../src/gui/main.cpp:1409
 msgid "No incoming sound will be played."
 msgstr "Sissetulevat heli ei esitata."
 
-#: ../src/gui/main.cpp:1413
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2227,7 +1834,6 @@
 "kui tegemist pole irdseadmega, siis palun kontrolli oma audiosätteid ja "
 "pääsuõigusi ning veendu, et seade pole hõivatud."
 
-#: ../src/gui/main.cpp:1417
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
@@ -2239,342 +1845,258 @@
 "ühendamine. Kui see ei aita või kui tegemist pole irdseadmega, siis palun "
 "kontrolli oma audiosätteid."
 
-#: ../src/gui/main.cpp:1660
-msgid "Enter a URI on the left, and click this button to place a call"
+msgid "Video Settings"
+msgstr "Videosätted"
+
+msgid "Adjust brightness"
+msgstr "Heleduse muutmine"
+
+msgid "Adjust whiteness"
 msgstr ""
-"Sisesta vasakul asuvasse lahtrisse URI ja helistamiseks vajuta sellele nupule"
 
-#: ../src/gui/main.cpp:1741
-msgid "_Chat"
+msgid "Adjust color"
+msgstr ""
+
+msgid "Adjust contrast"
+msgstr "Kontrasti muutmine"
+
+msgid "Audio Settings"
+msgstr "Audiosätted"
+
+msgid "_Retrieve Call"
+msgstr ""
+
+msgid "_Hold Call"
+msgstr ""
+
+msgid "Suspend _Audio"
+msgstr "Peata _audio"
+
+msgid "Suspend _Video"
+msgstr "Peata _video"
+
+msgid "Resume _Audio"
+msgstr ""
+
+msgid "Resume _Video"
+msgstr ""
+
+msgid "Reject"
+msgstr "Lükka tagasi"
+
+msgid "Accept"
+msgstr "Nõustu"
+
+msgid "Incoming call from"
+msgstr ""
+
+msgid "Remote URI:"
+msgstr "Kaug-URI:"
+
+msgid "Remote Application:"
+msgstr "Kaugrakendus:"
+
+#, c-format
+msgid "Call from %s"
+msgstr "Kõne kontolt %s"
+
+#, c-format
+msgid "Call Duration: %s\n"
+msgstr "Kõne kestus: %s\n"
+
+msgid "Transfer call to:"
 msgstr ""
 
-#: ../src/gui/main.cpp:1743
+msgid "No"
+msgstr "Ei"
+
+msgid "Yes"
+msgstr "Jah"
+
+msgid "Detected new audio input device:"
+msgstr "Tuvastati uus audiosisendi seade:"
+
+msgid "Detected new audio output device:"
+msgstr "Tuvastati uus audioväljundi seade:"
+
+msgid "Detected new video input device:"
+msgstr "Tuvastati uus videosisendi seade:"
+
+msgid "Video Devices"
+msgstr "Videoseadmed"
+
+msgid "Do you want to use it as default device?"
+msgstr "Kas sa soovid seda vaikimisi seadmena kasutada?"
+
+msgid "_Chat"
+msgstr "_Vestlus"
+
 msgid "Ca_ll"
 msgstr "_Helista"
 
-#: ../src/gui/main.cpp:1743
 msgid "Place a new call"
 msgstr "Helistamine"
 
-#: ../src/gui/main.cpp:1746
 msgid "_Hang up"
 msgstr "_Katkesta"
 
-#: ../src/gui/main.cpp:1747
 msgid "Terminate the current call"
 msgstr "Käimasoleva kõne katkestamine"
 
-#: ../src/gui/main.cpp:1753
 msgid "A_dd Contact"
 msgstr "_Lisa kontakt"
 
-#: ../src/gui/main.cpp:1753
 msgid "Add a contact to the roster"
 msgstr "Kontakti lisamine röstrisse"
 
-#: ../src/gui/main.cpp:1758
 msgid "Find contacts"
 msgstr "Kontaktide otsimine"
 
-#: ../src/gui/main.cpp:1765
-msgid "Co_ntact"
-msgstr ""
+msgid "_Contact"
+msgstr "_Kontaktid"
 
-#: ../src/gui/main.cpp:1766
 msgid "Act on selected contact"
 msgstr ""
 
-#: ../src/gui/main.cpp:1772
 msgid "H_old Call"
 msgstr "Pane kõne _ootele"
 
-#: ../src/gui/main.cpp:1772 ../src/gui/main.cpp:2435
 msgid "Hold the current call"
 msgstr "Kõne ootelepanek"
 
-#: ../src/gui/main.cpp:1776
 msgid "_Transfer Call"
 msgstr "_Suuna kõne ümber"
 
-#: ../src/gui/main.cpp:1777
 msgid "Transfer the current call"
 msgstr "Käesoleva kõne ümbersuunamine"
 
-#: ../src/gui/main.cpp:1784 ../src/gui/main.cpp:3193
-msgid "Suspend _Audio"
-msgstr "Peata _audio"
-
-#: ../src/gui/main.cpp:1785
 msgid "Suspend or resume the audio transmission"
 msgstr "Audio ülekandmise peatamine või taastamine"
 
-#: ../src/gui/main.cpp:1789 ../src/gui/main.cpp:3195
-msgid "Suspend _Video"
-msgstr "Peata _video"
-
-#: ../src/gui/main.cpp:1790
 msgid "Suspend or resume the video transmission"
 msgstr "Video ülekandmise peatamine või taastamine"
 
-#: ../src/gui/main.cpp:1797
 msgid "Close the Ekiga window"
 msgstr "Ekiga akna sulgemine"
 
-#: ../src/gui/main.cpp:1804 ../src/gui/statusicon.cpp:426
 msgid "Quit"
 msgstr "Lõpeta"
 
-#: ../src/gui/main.cpp:1810
 msgid "_Configuration Assistant"
 msgstr "_Seadistusabiline"
 
-#: ../src/gui/main.cpp:1811
 msgid "Run the configuration assistant"
 msgstr "Seadistusabilise käivitamine"
 
-#: ../src/gui/main.cpp:1819
 msgid "Edit your accounts"
 msgstr "Sinu kontode redigeerimine"
 
-#: ../src/gui/main.cpp:1825
 msgid "Change your preferences"
 msgstr "Sinu eelistuste muutmine"
 
-#: ../src/gui/main.cpp:1830
 msgid "_View"
 msgstr "_Vaade"
 
-#: ../src/gui/main.cpp:1832
 msgid "Con_tacts"
 msgstr "K_ontaktid"
 
-#: ../src/gui/main.cpp:1832
 msgid "View the contacts list"
 msgstr "Kontaktide nimekirja vaatamine"
 
-#: ../src/gui/main.cpp:1837
 msgid "_Dialpad"
 msgstr "_Klahvistik"
 
-#: ../src/gui/main.cpp:1837
 msgid "View the dialpad"
 msgstr "Numbriklahvistiku vaatamine"
 
-#: ../src/gui/main.cpp:1842
 msgid "_Call History"
 msgstr "Kõnede _ajalugu"
 
-#: ../src/gui/main.cpp:1842
 msgid "View the call history"
 msgstr "Kõnede ajaloo vaatamine"
 
-#: ../src/gui/main.cpp:1850
 msgid "_Show Call Panel"
 msgstr "Näita kõnede _paneeli"
 
-#: ../src/gui/main.cpp:1858
 msgid "_Local Video"
 msgstr "_Kohalik video"
 
-#: ../src/gui/main.cpp:1859
 msgid "Local video image"
 msgstr "Kohalik videopilt"
 
-#: ../src/gui/main.cpp:1864
 msgid "_Remote Video"
 msgstr "Kau_gvideo"
 
-#: ../src/gui/main.cpp:1865
 msgid "Remote video image"
 msgstr "Võrgust tulev videopilt"
 
-#: ../src/gui/main.cpp:1870
 msgid "_Picture-in-Picture"
 msgstr "_Pilt-pildis"
 
-#: ../src/gui/main.cpp:1871 ../src/gui/main.cpp:1877
 msgid "Both video images"
 msgstr "Mõlemad videopildid"
 
-#: ../src/gui/main.cpp:1876
 msgid "Picture-in-Picture in Separate _Window"
 msgstr "Pilt-pildis _eraldi aknas"
 
-#: ../src/gui/main.cpp:1884
 msgid "Zoom in"
 msgstr "Suurendamine"
 
-#: ../src/gui/main.cpp:1888
 msgid "Zoom out"
 msgstr "Vähendamine"
 
-#: ../src/gui/main.cpp:1892
 msgid "Normal size"
 msgstr "Algsuurus"
 
-#: ../src/gui/main.cpp:1896
 msgid "_Fullscreen"
 msgstr "_Täisekraan"
 
-#: ../src/gui/main.cpp:1896
 msgid "Switch to fullscreen"
 msgstr "Lülitumine täisekraanile"
 
-#: ../src/gui/main.cpp:1904 ../src/gui/statusicon.cpp:403
-#: ../src/gui/statusicon.cpp:414
 msgid "Get help by reading the Ekiga manual"
 msgstr "Abiteabe saamine Ekiga käsiraamatut lugedes"
 
-#: ../src/gui/main.cpp:1909 ../src/gui/statusicon.cpp:408
-#: ../src/gui/statusicon.cpp:419
 msgid "View information about Ekiga"
 msgstr "Ekiga kohta lähema teabe vaatamine"
 
-#: ../src/gui/main.cpp:1946
+#| msgid "Enter a URI on the left, and click this button to place a call"
+msgid ""
+"Enter a URI on the left, and click this button to place a call or to hangup"
+msgstr ""
+"Sisesta vasakul asuvasse lahtrisse URI ja helistamiseks või toru "
+"hargileviskamiseks vajuta sellele nupule"
+
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: ../src/gui/main.cpp:1974
 msgid "Dialpad"
 msgstr "Klahvid"
 
-#: ../src/gui/main.cpp:2010
-msgid "Video Settings"
-msgstr "Videosätted"
-
-#: ../src/gui/main.cpp:2037
-msgid "Adjust brightness"
-msgstr "Heleduse muutmine"
-
-#: ../src/gui/main.cpp:2058
-msgid "Adjust whiteness"
-msgstr ""
-
-#: ../src/gui/main.cpp:2079
-msgid "Adjust color"
-msgstr ""
-
-#: ../src/gui/main.cpp:2100
-msgid "Adjust contrast"
-msgstr "Kontrasti muutmine"
-
-#: ../src/gui/main.cpp:2154
-msgid "Audio Settings"
-msgstr "Audiosätted"
+msgid "Call history"
+msgstr "Kõnede ajalugu"
 
-#: ../src/gui/main.cpp:2373
 msgid "Change the volume of your soundcard"
 msgstr "Helikaardi valjuse muutmine"
 
-#: ../src/gui/main.cpp:2393
 msgid "Change the color settings of your video device"
 msgstr ""
 
-#: ../src/gui/main.cpp:2415
-msgid "Display images from your camera device"
-msgstr "Kaameraseadmest tulevate piltide kuvamine"
-
-#: ../src/gui/main.cpp:2468
-msgid "Call history"
-msgstr "Kõnede ajalugu"
+msgid "Ekiga"
+msgstr "Ekiga"
 
-#: ../src/gui/main.cpp:3141
-msgid "_Retrieve Call"
+#. Translators:
+#. * TX is a common abbreviation for "transmit"
+#, c-format
+msgid "TX: %dx%d "
 msgstr ""
 
-#: ../src/gui/main.cpp:3154
-msgid "_Hold Call"
+#. Translators:
+#. * RX is a common abbreviation for "receive"
+#, c-format
+msgid "RX: %dx%d "
 msgstr ""
 
-#: ../src/gui/main.cpp:3197
-msgid "Resume _Audio"
-msgstr ""
-
-#: ../src/gui/main.cpp:3199
-msgid "Resume _Video"
-msgstr ""
-
-#: ../src/gui/main.cpp:3524 ../src/gui/main.cpp:3678
-msgid "Reject"
-msgstr "Lükka tagasi"
-
-#: ../src/gui/main.cpp:3526 ../src/gui/main.cpp:3677
-msgid "Accept"
-msgstr "Nõustu"
-
-#: ../src/gui/main.cpp:3532 ../src/gui/main.cpp:3665
-msgid "Incoming call from"
-msgstr ""
-
-#: ../src/gui/main.cpp:3550 ../src/gui/main.cpp:3668
-msgid "Remote URI:"
-msgstr "Kaug-URI:"
-
-#: ../src/gui/main.cpp:3562 ../src/gui/main.cpp:3670
-msgid "Remote Application:"
-msgstr "Kaugrakendus:"
-
-#: ../src/gui/main.cpp:3583
-#, c-format
-msgid "Call from %s"
-msgstr "Kõne kontolt %s"
-
-#: ../src/gui/main.cpp:3840
-#, c-format
-msgid "Call Duration: %s\n"
-msgstr "Kõne kestus: %s\n"
-
-#: ../src/gui/main.cpp:3877
-msgid "Transfer call to:"
-msgstr ""
-
-#: ../src/gui/main.cpp:3934
-msgid "No"
-msgstr "Ei"
-
-#: ../src/gui/main.cpp:3936
-msgid "Yes"
-msgstr "Jah"
-
-#: ../src/gui/main.cpp:3947
-msgid "Detected new audio input device:"
-msgstr "Tuvastati uus audiosisendi seade:"
-
-#: ../src/gui/main.cpp:3951
-msgid "Detected new audio output device:"
-msgstr "Tuvastati uus audioväljundi seade:"
-
-#: ../src/gui/main.cpp:3955
-msgid "Detected new video input device:"
-msgstr "Tuvastati uus videosisendi seade:"
-
-#: ../src/gui/main.cpp:3956 ../src/gui/preferences.cpp:848
-msgid "Video Devices"
-msgstr "Videoseadmed"
-
-#: ../src/gui/main.cpp:3974
-msgid "Do you want to use it as default device?"
-msgstr "Kas sa soovid seda vaikimisi seadmena kasutada?"
-
-#: ../src/gui/main.cpp:4044
-msgid "Ekiga"
-msgstr "Ekiga"
-
-#. Translators:
-#. * TX is a common abbreviation for "transmit"
-#: ../src/gui/main.cpp:4468
-#, c-format
-msgid "TX: %dx%d "
-msgstr ""
-
-#. Translators:
-#. * RX is a common abbreviation for "receive"
-#: ../src/gui/main.cpp:4473
-#, c-format
-msgid "RX: %dx%d "
-msgstr ""
-
-#: ../src/gui/main.cpp:4475
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2587,23 +2109,18 @@
 "Segamini järjekorraga pakette: %.1f %%\n"
 "Värinapuhver: %d ms%s%s%s"
 
-#: ../src/gui/main.cpp:4623
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr "Silumisteadete väljastamine konsoolile (tasemega 1-5)"
 
-#: ../src/gui/main.cpp:4628
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr "Kasutaja silumisteadete väljastamine konsoolile (tasemega 1-4)"
 
-#: ../src/gui/main.cpp:4633
 msgid "Makes Ekiga call the given URI"
 msgstr "Ekikaga helistamine määratud URI-ile"
 
-#: ../src/gui/main.cpp:4749
 msgid "No usable audio plugin detected"
 msgstr "Kasutuskõlbulikke audiopluginaid ei tuvastatud"
 
-#: ../src/gui/main.cpp:4750
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
@@ -2611,11 +2128,9 @@
 "Ekiga ei tuvastanud ühtegi kasutuskõlbulikku audiopluginat. Veendu, et "
 "programmi paigaldus on korrektne."
 
-#: ../src/gui/main.cpp:4753
 msgid "No usable audio codecs detected"
 msgstr "Kasutuskõlbulikke audiopluginaid ei tuvastatud"
 
-#: ../src/gui/main.cpp:4754
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
@@ -2623,56 +2138,42 @@
 "Ekiga'l pole võimalik ühtki kasutuskõlbulikku audiopluginat leida. Veendu, "
 "et programmi paigaldus on korrektne."
 
-#: ../src/gui/main.cpp:4760
-msgid "Configuration database corruption"
-msgstr "Seadistuste andmebaas on rikutud"
+msgid "Play sound for new voice mails"
+msgstr "Heli esitamine kõneposti uute sõnumite korral"
 
-#: ../src/gui/main.cpp:4761
-#, c-format
-msgid ""
-"Ekiga got an invalid value for the configuration key %s.\n"
-"\n"
-"It probably means that your configuration schemas have not been correctly "
-"installed or that the permissions are not correct.\n"
-"\n"
-"Please check the FAQ (http://www.ekiga.org/), the troubleshooting section of "
-"the GConf site (http://www.gnome.org/projects/gconf/) or the mailing list "
-"archives for more information (http://mail.gnome.org) about this problem."
-msgstr ""
+msgid "Play sound for new instant messages"
+msgstr "Heli esitamine uute välksõnumite korral"
 
-#: ../src/gui/preferences.cpp:376
 msgid "_Full name:"
 msgstr "_Täisnimi:"
 
-#: ../src/gui/preferences.cpp:394
 msgid "User Interface"
 msgstr "Kasutajaliides"
 
-#: ../src/gui/preferences.cpp:396
 msgid "Start _hidden"
 msgstr "Käivitatakse _peidetuna"
 
-#: ../src/gui/preferences.cpp:398
 msgid "Show offline _contacts"
-msgstr ""
+msgstr "Ü_hendamata kontaktid on nähtaval"
 
-#: ../src/gui/preferences.cpp:403
 msgid "Video Display"
 msgstr "Videokuva"
 
-#: ../src/gui/preferences.cpp:405
 msgid "Place windows displaying video _above other windows"
 msgstr "Videokuvamise _akent hoitakse kõigi teiste akende peal"
 
-#: ../src/gui/preferences.cpp:415
+msgid "Network Settings"
+msgstr "Võrgusätted"
+
+msgid "Disable network _detection"
+msgstr "_Võrgu tuvastamine on keelatud"
+
 msgid "Call Forwarding"
 msgstr "Kõneedastus"
 
-#: ../src/gui/preferences.cpp:417
 msgid "_Always forward calls to the given host"
 msgstr "_Kõned edastatakse alati määratud hostile"
 
-#: ../src/gui/preferences.cpp:417
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings"
@@ -2680,11 +2181,9 @@
 "Kui märgitud, siis edastatakse kõik sisenevad kõned protokolli sätetes "
 "määratud hostile"
 
-#: ../src/gui/preferences.cpp:419
 msgid "Forward calls to the given host if _no answer"
 msgstr "Kõned edastatakse määratud hostile kui ei _vastata"
 
-#: ../src/gui/preferences.cpp:419
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you do not answer the call"
@@ -2692,11 +2191,9 @@
 "Kui märgitud, siis edastatakse sisenevad kõned vastamata jätmise korral "
 "protokolli sätetes määratud hostile"
 
-#: ../src/gui/preferences.cpp:421
 msgid "Forward calls to the given host if _busy"
 msgstr "Kõned edastatakse määratud hostile kui ollakse _hõivatud"
 
-#: ../src/gui/preferences.cpp:421
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you already are in a call or if you "
@@ -2705,78 +2202,59 @@
 "Kui märgitud, siis edastatakse sisenevad kõned mitte-häirida režiimi korral "
 "protokolli sätetes määratud hostile"
 
-#: ../src/gui/preferences.cpp:425 ../src/gui/preferences.cpp:1442
 msgid "Call Options"
 msgstr "Kõne valikud"
 
 #. Add all the fields
-#: ../src/gui/preferences.cpp:428
 msgid "Timeout to reject or forward unanswered incoming calls (in seconds):"
 msgstr "Sisenevate vastamata kõnede tagasilükkamise ajapiirang (sekundites):"
 
-#: ../src/gui/preferences.cpp:460
 msgid "Ekiga Sound Events"
 msgstr "Ekiga helisündmused"
 
-#: ../src/gui/preferences.cpp:509 ../src/gui/preferences.cpp:518
-#: ../src/gui/preferences.cpp:527
 msgid "Event"
 msgstr "Sündmus"
 
-#: ../src/gui/preferences.cpp:539
 msgid "Choose a sound"
 msgstr "Heli valimine"
 
-#: ../src/gui/preferences.cpp:545
 msgid "Wavefiles"
 msgstr "Wav-failid"
 
-#: ../src/gui/preferences.cpp:554 ../src/gui/preferences.cpp:573
 msgid "Play"
 msgstr "Esita"
 
-#: ../src/gui/preferences.cpp:594
 msgid "String"
 msgstr "String"
 
-#: ../src/gui/preferences.cpp:595
 msgid "Tone"
 msgstr "Toon"
 
-#: ../src/gui/preferences.cpp:596 ../src/gui/preferences.cpp:645
 msgid "RFC2833"
 msgstr "RFC2833"
 
-#: ../src/gui/preferences.cpp:597
 msgid "Q.931"
 msgstr "Q.931"
 
-#: ../src/gui/preferences.cpp:603 ../src/gui/preferences.cpp:655
 msgid "Misc Settings"
 msgstr "Muud sätted"
 
-#: ../src/gui/preferences.cpp:606 ../src/gui/preferences.cpp:660
 msgid "Forward _URI:"
 msgstr "Ümbersuunamise _URI:"
 
-#: ../src/gui/preferences.cpp:615
 msgid "Advanced Settings"
 msgstr "Laiendatud sätted"
 
 #. The toggles
-#: ../src/gui/preferences.cpp:618
 msgid "Enable H.245 _tunneling"
 msgstr "H.245 _tunneldamine lubatud"
 
-#: ../src/gui/preferences.cpp:620
 msgid "Enable _early H.245"
 msgstr "_Varajane H.245 lubatud"
 
-#: ../src/gui/preferences.cpp:622
 msgid "Enable fast _start procedure"
 msgstr "Kiire käivitamise protseduur _lubatud"
 
-#: ../src/gui/preferences.cpp:622
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -2784,194 +2262,107 @@
 "versions of Netmeeting."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:628 ../src/gui/preferences.cpp:668
 msgid "DTMF Mode"
 msgstr "DTMF-režiim"
 
-#: ../src/gui/preferences.cpp:630 ../src/gui/preferences.cpp:670
 msgid "_Send DTMF as:"
 msgstr "DTMF s_aadetakse kui:"
 
-#: ../src/gui/preferences.cpp:630 ../src/gui/preferences.cpp:670
 msgid "This allows you to set the mode for DTMFs sending."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:646
 msgid "INFO"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:657
 msgid "_Outbound Proxy:"
 msgstr "_Väljuvate kõnede proksi:"
 
-#: ../src/gui/preferences.cpp:698
 msgid "Ringing Device"
 msgstr "Helinaseade"
 
-#: ../src/gui/preferences.cpp:698
 msgid "Select the ringing audio device to use"
 msgstr "Helisemiseks kasutatava audioseadme valimine"
 
-#: ../src/gui/preferences.cpp:700
 msgid "Output device:"
 msgstr "Väljundseade:"
 
-#: ../src/gui/preferences.cpp:707 ../src/gui/preferences.cpp:855
 msgid "Input device:"
 msgstr "Sisendseade:"
 
 #. That button will refresh the device list
-#. The file selector button
-#. FIXME disabled for now
-#. label = gtk_label_new (_("Image:"));
-#.
-#. button =
-#. gtk_file_chooser_button_new_with_backend (_("Choose a Picture"),
-#. GTK_FILE_CHOOSER_ACTION_OPEN,
-#. FILECHOOSER_BACKEND);
-#.
-#. preview_image_frame = gtk_frame_new (_("Preview"));
-#. preview_image = gtk_image_new ();
-#. gtk_container_add (GTK_CONTAINER (preview_image_frame), preview_image);
-#. gtk_widget_set_size_request (preview_image, 256, 256);
-#. gtk_widget_show (preview_image);
-#. gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (button),
-#. preview_image_frame);
-#.
-#.
-#. filefilter = gtk_file_filter_new ();
-#. gtk_file_filter_set_name (filefilter, _("Images"));
-#. gtk_file_filter_add_pixbuf_formats (filefilter);
-#. gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (button), filefilter);
-#.
-#. g_signal_connect (G_OBJECT (button), "update-preview",
-#. G_CALLBACK (image_filename_browse_preview_cb),
-#. (gpointer) preview_image);
-#.
-#. conf_image = gm_conf_get_string (VIDEO_DEVICES_KEY "image");
-#. if (!conf_image || (!strcmp (conf_image, ""))) {
-#. g_free (conf_image);
-#. conf_image = NULL;
-#. }
-#.
-#. if (conf_image)
-#. gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (button), conf_image);
-#. g_free (conf_image);
-#.
-#. gtk_table_attach (GTK_TABLE (subsection), button, 1, 2, 4, 5,
-#. (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
-#. (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
-#. 0, GNOMEMEETING_PAD_SMALL);
-#.
-#. gtk_table_attach (GTK_TABLE (subsection), label, 0, 1, 4, 5,
-#. (GtkAttachOptions) (GTK_FILL),
-#. (GtkAttachOptions) (GTK_FILL),
-#. 0, 0);
-#.
-#. gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-#. gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-#.
-#. g_signal_connect_after (G_OBJECT (button), "selection-changed",
-#. G_CALLBACK (image_filename_browse_cb),
-#. (gpointer) VIDEO_DEVICES_KEY "image");
-#.
-#. That button will refresh the device list
-#: ../src/gui/preferences.cpp:712 ../src/gui/preferences.cpp:920
 msgid "_Detect devices"
 msgstr "_Tuvasta seadmed"
 
-#: ../src/gui/preferences.cpp:712 ../src/gui/preferences.cpp:920
 msgid "Click here to refresh the device list."
 msgstr "Seadmete nimekirja uuendamiseks klõpsa siia."
 
-#: ../src/gui/preferences.cpp:833
 msgid "PAL (Europe)"
 msgstr "PAL (Euroopa)"
 
-#: ../src/gui/preferences.cpp:834
 msgid "NTSC (America)"
 msgstr "NTSC (Ameerika)"
 
-#: ../src/gui/preferences.cpp:835
 msgid "SECAM (France)"
 msgstr "SECAM (Prantsusmaa)"
 
-#: ../src/gui/preferences.cpp:836
 msgid "Auto"
 msgstr "Automaatne"
 
 #. Video Channel
-#: ../src/gui/preferences.cpp:859
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: ../src/gui/preferences.cpp:861
 msgid "Size:"
 msgstr "Suurus:"
 
-#: ../src/gui/preferences.cpp:861
 msgid "Select the transmitted video size"
 msgstr "Vali ülekantava video suurus"
 
-#: ../src/gui/preferences.cpp:863
 msgid "Format:"
 msgstr "Vorming:"
 
-#: ../src/gui/preferences.cpp:944 ../src/gui/preferences.cpp:983
-#: ../src/gui/preferences.cpp:1467 ../src/gui/preferences.cpp:1477
 msgid "Codecs"
 msgstr "Koodekid"
 
-#: ../src/gui/preferences.cpp:957 ../src/gui/preferences.cpp:996
 msgid "Settings"
 msgstr "Sätted"
 
 #. Translators: the full sentence is Automatically adjust jitter buffer
 #. between X and Y ms
-#: ../src/gui/preferences.cpp:961
 msgid "Enable silence _detection"
-msgstr "_Vaikuse tuvastamine lubatud"
+msgstr "_Vaikuse tuvastamine on lubatud"
 
-#: ../src/gui/preferences.cpp:961
 msgid "If enabled, use silence detection with the codecs supporting it."
 msgstr ""
 "Kui märgitud, siis on vaikuse tuvastamine lubatud seda toetavate koodekite "
 "korral."
 
-#: ../src/gui/preferences.cpp:963
 msgid "Enable echo can_celation"
 msgstr "_Kaja eemaldamine lubatud"
 
-#: ../src/gui/preferences.cpp:963
 msgid "If enabled, use echo cancelation."
 msgstr "Kui märgitud, siis kasutatakse kaja eemaldamist."
 
-#: ../src/gui/preferences.cpp:965
 msgid "Maximum _jitter buffer (in ms):"
 msgstr "Suurim _värinapuhver (millisekundited):"
 
-#: ../src/gui/preferences.cpp:965
 msgid "The maximum jitter buffer size for audio reception (in ms)."
 msgstr ""
 "Audiovastuvõtul kasutatava värinapuhvri suurim suurus (millisekundites)."
 
 #. Translators: the full sentence is Keep a minimum video quality of X %
-#: ../src/gui/preferences.cpp:999
 msgid "Picture Quality"
 msgstr "Pildikvaliteet"
 
-#: ../src/gui/preferences.cpp:999
 msgid ""
 "Choose if you want to guarantee a minimum image quality (possibly leading to "
 "dropped frames in order not to surpass the bitrate limit) or if you prefer "
 "to keep the frame rate."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:1001
 msgid "Maximum video _bitrate (in kbits/s):"
 msgstr "_Video suurim läbilaskevõime (kbits/s):"
 
-#: ../src/gui/preferences.cpp:1001
 msgid ""
 "The maximum video bitrate in kbits/s. The video quality and the effective "
 "frame rate will be dynamically adjusted to keep the bitrate at the given "
@@ -2981,1233 +2372,66 @@
 "ja sekundis ülekantavate kaadrite arvu reguleeritakse dünaamiliselt nii, et "
 "bitisagedus vastaks siin määratud väärtusele."
 
-#: ../src/gui/preferences.cpp:1376
-msgid "Play sound for new voice mails"
-msgstr "Heli esitamine kõneposti uute sõnumite korral"
-
-#: ../src/gui/preferences.cpp:1385
-msgid "Play sound for new instant messages"
-msgstr "Heli esitamine uute välksõnumite korral"
-
-#: ../src/gui/preferences.cpp:1414
 msgid "Ekiga Preferences"
 msgstr "Ekiga eelistused"
 
-#: ../src/gui/preferences.cpp:1432
 msgid "General"
 msgstr "Üldine"
 
-#: ../src/gui/preferences.cpp:1433
 msgid "Personal Data"
 msgstr "Isiklikud andmed"
 
-#: ../src/gui/preferences.cpp:1438
 msgid "General Settings"
 msgstr "Üldised sätted"
 
-#: ../src/gui/preferences.cpp:1447
 msgid "Sound Events"
 msgstr "Helisündmused"
 
-#: ../src/gui/preferences.cpp:1451
 msgid "Protocols"
 msgstr "Protokollid"
 
-#: ../src/gui/preferences.cpp:1453
 msgid "SIP Settings"
 msgstr "SIP-sätted"
 
-#: ../src/gui/preferences.cpp:1458
 msgid "H.323 Settings"
 msgstr "H.323-sätted"
 
-#: ../src/gui/preferences.cpp:1462
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/gui/preferences.cpp:1463 ../src/gui/preferences.cpp:1473
 msgid "Devices"
 msgstr "Seadmed"
 
-#: ../src/gui/preferences.cpp:1472
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/statusicon.cpp:311
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
 msgstr[0] "Sulle on %d sõnum"
 msgstr[1] "Sulle on %d sõnumit"
 
-#: ../src/gui/statusicon.cpp:413
-msgid "_Contents"
-msgstr "_Sisukord"
-
-#: ../src/gui/statusicon.cpp:418
-msgid "_About"
-msgstr "_Programmist lähemalt"
-
-#: ../src/gui/statusmenu.cpp:90
 msgid "Online"
 msgstr ""
 
-#: ../src/gui/statusmenu.cpp:91
 msgid "Away"
 msgstr "Eemal"
 
-#: ../src/gui/statusmenu.cpp:92
 msgid "Do Not Disturb"
 msgstr "Mitte häirida"
 
-#: ../src/gui/statusmenu.cpp:456
 msgid "Custom message..."
 msgstr "Kohandatud sõnum..."
 
+msgid "Clear"
+msgstr ""
+
 #. Build the dialog
-#: ../src/gui/statusmenu.cpp:587 ../src/gui/statusmenu.cpp:741
 msgid "Custom Message"
 msgstr "Kohandatud sõnum"
 
-#: ../src/gui/statusmenu.cpp:603
 msgid "Delete custom messages:"
 msgstr "Kohandatud sõnumite kustutamine:"
 
-#: ../src/gui/statusmenu.cpp:762
 msgid "Define a custom message:"
 msgstr "Kohandatud sõnumite kirjeldamine:"
-
-#~ msgid "Position on the screen of the PC-To-Phone window"
-#~ msgstr "Arvutist-Telefonile akna asukoht ekraanil"
-
-#~ msgid "Size of the PC-To-Phone window"
-#~ msgstr "Arvutist-Telefonile akna suurus"
-
-#~ msgid "_Properties"
-#~ msgstr "_Omadused"
-
-#~ msgid "_Send"
-#~ msgstr "_Saada"
-
-#~ msgid "You say:\n"
-#~ msgstr "Sa ütled:\n"
-
-#~ msgid "Opening device for playing"
-#~ msgstr "Seadme avamine esitamiseks"
-
-#~ msgid "Opening device for recording"
-#~ msgstr "Seadme avamine salvestamiseks"
-
-#~ msgid "Failed to open the device"
-#~ msgstr "Tõrge seadme avamisel"
-
-#~ msgid ""
-#~ "Impossible to open the selected audio device (%s) for recording. Please "
-#~ "check your audio setup, the permissions and that the device is not busy."
-#~ msgstr ""
-#~ "Valitud audioseadet (%s) pole võimalik salvestamiseks avada. Palun "
-#~ "kontrolli oma audiosätteid, pääsuõiguseid ja seda, kas seade pole mõne "
-#~ "teise programmi poolt hõivatud."
-
-#~ msgid ""
-#~ "Impossible to open the selected audio device (%s) for playing. Please "
-#~ "check your audio setup, the permissions and that the device is not busy."
-#~ msgstr ""
-#~ "Valitud audioseadet (%s) pole võimalik audio esitamiseks avada. Palun "
-#~ "kontrolli oma audiosätteid, pääsuõiguseid ja seda, kas seade pole mõne "
-#~ "teise programmi poolt hõivatud."
-
-#~ msgid "Cannot use the audio device"
-#~ msgstr "Audioseadet pole võimalik avada"
-
-#~ msgid "Recording your voice"
-#~ msgstr "Sinu hääle salvestamine"
-
-#~ msgid "Recording and playing back"
-#~ msgstr "Salvestamine ja taasesitamine"
-
-#~ msgid "Audio test running"
-#~ msgstr "Audiotesti läbiviimine"
-
-#~ msgid ""
-#~ "Ekiga is now recording from %s and playing back to %s. Please say \"1, 2, "
-#~ "3, Ekiga rocks!\" in your microphone. You should hear yourself from the "
-#~ "speakers after a four-second delay."
-#~ msgstr ""
-#~ "Ekiga salvestab hetkel seadmest %s ja taasesitab seda seadmega %s. Palun "
-#~ "ütle oma mikrofoni \"1, 2, 3, Ekiga on lahe!\". Öeldu peaks olema nelja "
-#~ "sekundi pärast olema kuuldav sinu kõlaritest."
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#~ msgid "Missed calls: %d - Voice Mails: %d"
-#~ msgstr "Vastamata kõnesid: %d - Kõnepostiteateid: %d"
-
-#~ msgid "_Apply"
-#~ msgstr "_Rakenda"
-
-#~ msgid "Image:"
-#~ msgstr "Pilt:"
-
-#~ msgid "Choose a Picture"
-#~ msgstr "Pildi valimine"
-
-#~ msgid "Preview"
-#~ msgstr "Eelvaade"
-
-#~ msgid "Images"
-#~ msgstr "Pildid"
-
-#~ msgid "Number of frames for G.711"
-#~ msgstr "Kaadrite arv G.711 jaoks"
-
-#~ msgid "Number of frames for GSM"
-#~ msgstr "Kaadrite arv GSM-i jaoks"
-
-#~ msgid "Number of frames transmitted in each packet for the G.711 codec"
-#~ msgstr "G.711 koodeki korral iga paketiga ülekantavate kaadrite arv"
-
-#~ msgid "Number of frames transmitted in each packet for the GSM codec"
-#~ msgstr "GSM-koodeki korral iga paketiga ülekantavate kaadrite arv"
-
-#~ msgid "Remote user is not available"
-#~ msgstr "Kaugkasutaja pole saadaval"
-
-#~ msgid ""
-#~ "The video manager is the plugin that will manage your video devices, "
-#~ "Video4Linux is the most common choice if you own a webcam."
-#~ msgstr ""
-#~ "Videohaldur on videoseadmete haldamise plugin. Kui sul on veebikaamera, "
-#~ "siis on kõige üldisem valik Video4Linux."
-
-#~ msgid "_Find Contacts"
-#~ msgstr "_Otsi kontakte"
-
-#~ msgid "Enter your first name"
-#~ msgstr "Sisesta siia oma eesnimi"
-
-#~ msgid "Address of public IP detector"
-#~ msgstr "Avaliku IP tuvastaja aadress"
-
-#~ msgid "Audio plugin"
-#~ msgstr "Audioplugin"
-
-#~ msgid "Clear inactive calls"
-#~ msgstr "Passiivsete kõnede puhastamine"
-
-#~ msgid "Enable IP checking"
-#~ msgstr "IP kontrolli lubamine"
-
-#~ msgid ""
-#~ "Enter the public IP of your NAT/PAT router if you want to use IP "
-#~ "translation"
-#~ msgstr ""
-#~ "Kui soovid IP-transleerimist kasutada, siis sisesta oma NAT/PAT "
-#~ "marsruuteri IP-aadress"
-
-#~ msgid "First name"
-#~ msgstr "Eesnimi"
-
-#~ msgid ""
-#~ "If enabled, calls for which no audio and video has been received in the "
-#~ "last 30 seconds are automatically cleared"
-#~ msgstr ""
-#~ "Kui märgitud, siis 30 sekundi vältel ilma heli ja pildita olnud kõned "
-#~ "puhastatakse automaatselt"
-
-#~ msgid "Last name"
-#~ msgstr "Perekonnanimi"
-
-#~ msgid "Minimum jitter buffer"
-#~ msgstr "Väikseim värinapuhver"
-
-#~ msgid "Public IP of the NAT/PAT router"
-#~ msgstr "NAT/PAT marsruuteri avalik IP"
-
-#~ msgid "The NAT method"
-#~ msgstr "NAT meetod"
-
-#~ msgid ""
-#~ "The audio plugin that will be used to detect the devices and manage them"
-#~ msgstr "Audioplugin seadmete tuvastamiseks ja haldamiseks"
-
-#~ msgid "The local zoom value"
-#~ msgstr "Kohalik suurendusaste"
-
-#~ msgid "The minimum jitter buffer size for audio reception (in ms)"
-#~ msgstr ""
-#~ "Audiovastuvõtul kasutatava värinapuhvri vähim suurus (millisekundites)"
-
-#~ msgid "The network interface"
-#~ msgstr "Võrguliides"
-
-#~ msgid "The network interface to listen on"
-#~ msgstr "Võrguliides, millel kuulatakse"
-
-#~ msgid ""
-#~ "The range of UDP ports that Ekiga will use for RTP (audio and video "
-#~ "communication channels). Ekiga needs to be restarted for the new values "
-#~ "to take effect."
-#~ msgstr ""
-#~ "UDP portide vahemik, mida Ekiga kasutab RTP (audio- ja "
-#~ "videokommunikatsiooni kanalid) tarbeks. Uute väärtuste rakendamiseks "
-#~ "tuleb Ekiga taaskäivitada."
-
-#~ msgid ""
-#~ "The range of UDP ports that Ekiga will use for SIP signaling and when "
-#~ "registering to gatekeepers. Ekiga needs to be restarted for the new "
-#~ "values to take effect."
-#~ msgstr ""
-#~ "Ekiga poolt SIP-signaalide ja väravavalvurite registreerimiseks kasutatav "
-#~ "UDP-portide vahemik. Uute väärtuste rakendamiseks tuleb Ekiga uuesti "
-#~ "käivitada."
-
-#~ msgid ""
-#~ "The video plugin that will be used to detect the devices and manage them"
-#~ msgstr "Videoseadmete tuvastamiseks ja haldamiseks kasutatav videoplugin"
-
-#~ msgid "Video plugin"
-#~ msgstr "Videoplugin"
-
-#, fuzzy
-#~ msgid "Call _Attribute:"
-#~ msgstr "Otsingurekvisiit:"
-
-#~ msgid "Address Books"
-#~ msgstr "Aadressiraamatud"
-
-#~ msgid "Delete group %s?"
-#~ msgstr "Kas kustutada grupp %s?"
-
-#~ msgid "Could not delete group!"
-#~ msgstr "Gruppi pole võimalik kustutada"
-
-#~ msgid "Group renamed."
-#~ msgstr "Grupi nimi on muudetud."
-
-#~ msgid "Could not rename group!"
-#~ msgstr "Grupi nime pole võimalik muuta!"
-
-#~ msgid "Open NAT"
-#~ msgstr "Avatud NAT"
-
-#~ msgid "Restricted NAT"
-#~ msgstr "Piirangutega NAT"
-
-#~ msgid "Port Restricted NAT"
-#~ msgstr "Pordipiirangutega NAT"
-
-#~ msgid "Symmetric NAT"
-#~ msgstr "Sümmeetriline NAT"
-
-#~ msgid "Symmetric Firewall"
-#~ msgstr "Sümmeetriline tulemüür"
-
-#~ msgid "Blocked"
-#~ msgstr "Blokitud"
-
-#~ msgid "Partially Blocked"
-#~ msgstr "Osaliselt blokitud"
-
-#~ msgid "No NAT"
-#~ msgstr "NAT-i pole"
-
-#~ msgid ""
-#~ "STUN test result: %s.\n"
-#~ "\n"
-#~ "You do not seem to be using a NAT router. STUN support is not required."
-#~ msgstr ""
-#~ "STUN testi tulemus: %s.\n"
-#~ "\n"
-#~ "Paistab, et sa ei kasuta NAT-marsruuterit. STUN-i tugi pole tarvilik."
-
-#~ msgid ""
-#~ "STUN test result: %s.\n"
-#~ "\n"
-#~ "Using a STUN server is most probably the most appropriate method if your "
-#~ "router does not natively support SIP or H.323.\n"
-#~ "\n"
-#~ "Enable STUN Support?"
-#~ msgstr ""
-#~ "STUN testi tulemus: %s.\n"
-#~ "\n"
-#~ "Kui sinu marsruuter ei toeta SIP või H.323 protokolle, siis on STUN "
-#~ "serveri kasutamine on kõige tõenäolisemalt sobilikuim ühendumismeetod .\n"
-#~ "\n"
-#~ "Kas lubada STUN-i tugi?"
-
-#~ msgid "NAT Detection Finished"
-#~ msgstr "NAT-i tuvastamine on lõppenud"
-
-#~ msgid "The detection of your NAT type is finished"
-#~ msgstr "NAT-i liigi tuvastamine on lõppenud"
-
-#~ msgid "Detection in progress"
-#~ msgstr "Tuvastamine on hetkel käimas"
-
-#~ msgid "Please wait while your type of NAT is being detected."
-#~ msgstr "Palun oota kuni Sinu NAT-i liiki tuvastatakse."
-
-#~ msgid "Cannot run Ekiga"
-#~ msgstr "Ekiga't pole võimalik käivitada"
-
-#~ msgid ""
-#~ "Ekiga is already running, if you want it to call a given SIP, H.323, or "
-#~ "callto address, please use \"ekiga -c address\"."
-#~ msgstr ""
-#~ "Ekiga on juba käivitatud. Kui sa soovid helistada etteantud SIP, H.323 "
-#~ "või callto aadressile, siis kasuta palun käsku \"ekiga -c aadress\"."
-
-#~ msgid "Failed to retrieve Ekiga server from activation server\n"
-#~ msgstr "Tõrge Ekiga serveri vastuvõtmisel aktiveerimisserverist\n"
-
-#~ msgid "Picture"
-#~ msgstr "Pilt"
-
-#~ msgid ""
-#~ "Ekiga is now testing the %s video device. If you experience machine "
-#~ "crashes, then report a bug to the video driver author."
-#~ msgstr ""
-#~ "Ekiga testib videoseadet %s. Kui selle tulemuseks on masina "
-#~ "kokkujooksmine, siis palun teata sellest videodraiveri autorile."
-
-#~ msgid "Test %d done"
-#~ msgstr "Test %d valmis"
-
-#~ msgid "Test %d failed"
-#~ msgstr "Test %d nurjus"
-
-#~ msgid "Error while opening %s."
-#~ msgstr "Viga %s avamisel."
-
-#~ msgid "Could not open the chosen channel with the chosen video format."
-#~ msgstr "Valitud kanalit pole valitud videovorminguga võimalik avada."
-
-#~ msgid "Your driver doesn't support any of the color formats tried by Ekiga"
-#~ msgstr "Sinu draiver ei toeta ühtki Ekiga poolt proovitud värvivormingut"
-
-#~ msgid "Answering call..."
-#~ msgstr "Kõnele vastamine..."
-
-#~ msgid "Could not open audio channel for audio transmission"
-#~ msgstr "Audiokanalit pole audioülekandeks võimalik avada"
-
-#~ msgid "Invalid URL handler"
-#~ msgstr "Vigane URL-ikäsitleja"
-
-#~ msgid "Calling %s"
-#~ msgstr "Helistamine: %s"
-
-#~ msgid "Transferring call to %s"
-#~ msgstr "Kõne ümbersuunamine -> %s"
-
-#~ msgid "Failed to call user"
-#~ msgstr "Tõrge kasutajale helistamisel"
-
-#~ msgid "Edit the Account Information"
-#~ msgstr "Kontaktandmete redigeerimine"
-
-#~ msgid "Account Name:"
-#~ msgstr "Konto nimi:"
-
-#~ msgid "Protocol:"
-#~ msgstr "Protokoll:"
-
-#~ msgid "More _Options"
-#~ msgstr "R_ohkem valikud"
-
-#~ msgid "Gatekeeper ID:"
-#~ msgstr "Väravavalvuri ID:"
-
-#~ msgid "Registration Timeout:"
-#~ msgstr "Registreerimise ajapiirang:"
-
-#~ msgid "Missing or wrong information"
-#~ msgstr "Vigane või väär teave"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please make sure to provide at least an <b>account name</b>, a "
-#~ "<b>username</b> and a valid <b>timeout in seconds</b>."
-#~ msgstr ""
-#~ "Palun veendu, et sisestasid korrektsed konto-, hosti- ja kasutajanimed."
-
-#~ msgid "Protocol"
-#~ msgstr "Protokoll"
-
-#~ msgid "_Default"
-#~ msgstr "_Vaikimisi"
-
-#~ msgid "Personal Information - page %d/%d"
-#~ msgstr "Isiklikud andmed - %d. samm %d'st"
-
-#~ msgid "NAT Type - page %d/%d"
-#~ msgstr "NAT liik - %d. samm %d'st"
-
-#~ msgid "Click here to detect your NAT Type:"
-#~ msgstr "Oma NAT-i liigi tuvastamiseks klõpsa siia:"
-
-#~ msgid "Detect NAT Type"
-#~ msgstr "Tuvasta NAT-i liik"
-
-#~ msgid ""
-#~ "The NAT type detection will permit to assist you in configuring your NAT "
-#~ "router to be able to do calls with Ekiga."
-#~ msgstr ""
-#~ "NAT-i liigi tuvastamine aitab sul sinu NAT-marsruuterit seadistada nii, "
-#~ "et selle kaudu on võimalik Ekiga kõnesid võtta."
-
-#~ msgid "Audio Manager - page %d/%d"
-#~ msgstr "Audiohaldur - %d. samm %d'st"
-
-#~ msgid "Please choose your audio manager:"
-#~ msgstr "Palun vali oma audiohaldur:"
-
-#~ msgid ""
-#~ "The audio manager is the plugin that will manage your audio devices. ALSA "
-#~ "is probably the best choice when available."
-#~ msgstr ""
-#~ "Audiohaldur on sinu audioseadmeid haldav plugin. Kui ALSA on kasutatav, "
-#~ "siis on see arvatavasti parim valik."
-
-#~ msgid "Audio Devices - page %d/%d"
-#~ msgstr "Audioseadmed - %d. samm %d'st"
-
-#~ msgid "Test Settings"
-#~ msgstr "Sätete testimine"
-
-#~ msgid "Video Manager - page %d/%d"
-#~ msgstr "Videohaldur - %d. samm %d'st"
-
-#~ msgid "Please choose your video manager:"
-#~ msgstr "Palun vali oma videohaldur:"
-
-#~ msgid "Video Devices - page %d/%d"
-#~ msgstr "Videoseadmed - %d. samm %d'st"
-
-#~ msgid "xDSL/Cable"
-#~ msgstr "xDSL/Kaabel"
-
-#~ msgid ""
-#~ "You have now finished the Ekiga configuration. All the settings can be "
-#~ "changed in the Ekiga preferences. Enjoy!\n"
-#~ "\n"
-#~ "\n"
-#~ "Configuration summary:\n"
-#~ "\n"
-#~ "Username: %s\n"
-#~ "Connection type: %s\n"
-#~ "Audio manager: %s\n"
-#~ "Audio player: %s\n"
-#~ "Audio recorder: %s\n"
-#~ "Video manager: %s\n"
-#~ "Video input: %s\n"
-#~ "SIP URI: %s\n"
-#~ msgstr ""
-#~ "Ekiga seadistamine on lõpusirgel. Kõiki sätteid on võimalik Ekiga "
-#~ "eelistuste alt muuta. Tunne rõõmu!\n"
-#~ "\n"
-#~ "\n"
-#~ "Sätete kokkuvõte:\n"
-#~ "\n"
-#~ "Kasutajanimi: %s\n"
-#~ "Ühenduse liik: %s\n"
-#~ "Audiohaldur: %s\n"
-#~ "Audioesitaja: %s\n"
-#~ "Audiosalvestaja: %s\n"
-#~ "Videohaldur: %s\n"
-#~ "Videosisend: %s\n"
-#~ "SIP-i URL: %s\n"
-
-#, fuzzy
-#~ msgid "Forwarded call from %s"
-#~ msgstr "Kõne suunatakse edasi -> %s"
-
-#, fuzzy
-#~ msgid "Find Contacts"
-#~ msgstr "K_ontakt"
-
-#~ msgid "C_all"
-#~ msgstr "_Helistamine"
-
-#~ msgid "_Online"
-#~ msgstr "_Võrgus"
-
-#~ msgid "_Away"
-#~ msgstr "_Eemal"
-
-#~ msgid "Do Not _Disturb"
-#~ msgstr "_Mitte häirida"
-
-#~ msgid "_Free For Chat"
-#~ msgstr "_Vaba vestluseks"
-
-#~ msgid "Save a snapshot of the current video"
-#~ msgstr "Videost hetketõmmise salvestamine"
-
-#~ msgid "Panel"
-#~ msgstr "Paneel"
-
-#~ msgid "Calls _History"
-#~ msgstr "Kõnede _ajalugu"
-
-#~ msgid "View the call information"
-#~ msgstr "Kõnede andmete vaatamine"
-
-#~ msgid "Local Video"
-#~ msgstr "Kohalik video"
-
-#~ msgid "Remote Video"
-#~ msgstr "Kaugvideo"
-
-#~ msgid "Fullscreen"
-#~ msgstr "Täisekraan"
-
-#~ msgid "_Tools"
-#~ msgstr "_Tööriistad"
-
-#, fuzzy
-#~ msgid "PC-To-Phone Account"
-#~ msgstr "_Arvutist-Telefonile konto"
-
-#~ msgid "Manage your PC-To-Phone account"
-#~ msgstr "Sinu Arvutist-Telefonile konto haldamine"
-
-#~ msgid "Calls History"
-#~ msgstr "Kõnede ajalugu"
-
-#~ msgid "_First name:"
-#~ msgstr "_Eesnimi:"
-
-#~ msgid "Sur_name:"
-#~ msgstr "_Perekonnanimi:"
-
-#~ msgid "Enter your surname"
-#~ msgstr "Sisesta siia oma perekonnanimi"
-
-#~ msgid "Ekiga GUI"
-#~ msgstr "Ekiga kasutajaliides"
-
-#~ msgid "Auto Away"
-#~ msgstr "Automaatvaselt eemal"
-
-#~ msgid "Timeout after which the user is automatically set as away:"
-#~ msgstr "Aeg, mille möödudes määratakse kasutaja automaatselt eemalolevaks"
-
-#~ msgid "Automatically _clear calls after 30 seconds of inactivity"
-#~ msgstr "Kõnede automaatne _puhastamine pärast 30 passiivset sekundit"
-
-#~ msgid "Alternative output device:"
-#~ msgstr "Alternatiivne väljundseade:"
-
-#~ msgid "Select an alternative audio output device to use for sound events"
-#~ msgstr "Helisündmuste jaoks alternatiivse audioväljundi seadme valimine"
-
-#~ msgid "STUN"
-#~ msgstr "STUN"
-
-#~ msgid "IP Translation"
-#~ msgstr "IP-transleerimine"
-
-#~ msgid "Listen on:"
-#~ msgstr "Kuulatakse liidesel:"
-
-#~ msgid "STUN Se_rver:"
-#~ msgstr "STUN se_rver:"
-
-#~ msgid "The STUN server to use for STUN Support."
-#~ msgstr "STUN-i toe jaoks kasutatava STUN-serveri aadress."
-
-#~ msgid "Click here to update your NAT settings"
-#~ msgstr "Klõpsa siia oma NAT-sätete uuendamiseks"
-
-#~ msgid "Audio Plugin"
-#~ msgstr "Audioplugin"
-
-#~ msgid "Audio plugin:"
-#~ msgstr "Audioplugin:"
-
-#~ msgid ""
-#~ "The audio plugin that will be used to detect the devices and manage them."
-#~ msgstr ""
-#~ "Audioplugin, mida kasutatakse seadmete tuvastamiseks ja haldamiseks."
-
-#~ msgid "Video Plugin"
-#~ msgstr "Videoplugin"
-
-#~ msgid "Video plugin:"
-#~ msgstr "Videoplugin:"
-
-#~ msgid "Available Audio Codecs"
-#~ msgstr "Saadaolevad audiokoodekid"
-
-#~ msgid "Audio Codecs Settings"
-#~ msgstr "Audiokoodekite sätted"
-
-#~ msgid "Automatically adjust _jitter buffer between"
-#~ msgstr "Automaatne _värinapuhvri määramine vahemikus"
-
-#~ msgid "and"
-#~ msgstr "ja"
-
-#~ msgid "ms"
-#~ msgstr "ms"
-
-#~ msgid "The minimum jitter buffer size for audio reception (in ms)."
-#~ msgstr ""
-#~ "Audiovastuvõtul kasutatava värinapuhvri vähim suurus (millisekundites)."
-
-#~ msgid "Available Video Codecs"
-#~ msgstr "Saadaolevad videokoodekid"
-
-#~ msgid "Video Codecs Settings"
-#~ msgstr "Videokoodekite sätted"
-
-#~ msgid "Enable _video support"
-#~ msgstr "V_ideo tugi lubatud"
-
-#~ msgid "If enabled, allows video during calls."
-#~ msgstr "Kõne käigus ka video vastuvõtmise lubamine."
-
-#~ msgid ""
-#~ "Choose if you want to favour speed or quality for the transmitted video."
-#~ msgstr "Video kvaliteedi ja ülekandekiiruse vahel valimine."
-
-#~ msgid "Network Settings"
-#~ msgstr "Võrgusätted"
-
-#~ msgid "Invalid parameters"
-#~ msgstr "Vigased parameetrid"
-
-#~ msgid ""
-#~ "Please provide your username and password in order to be able to use the "
-#~ "PC-To-Phone service."
-#~ msgstr ""
-#~ "Arvutist-telefonile teenuse kasutamiseks sisesta palun oma kasutajanimi "
-#~ "ja parool."
-
-#~ msgid "PC-To-Phone Settings"
-#~ msgstr "Arvutist-Telefonile sätted"
-
-#~ msgid "Account _number:"
-#~ msgstr "Konto _number:"
-
-#~ msgid "Use PC-To-Phone service"
-#~ msgstr "Arvutile-telefonile teenuse kasutamine"
-
-#~ msgid "You have %d messages"
-#~ msgstr "Sulle on %d sõnumit"
-
-#~ msgid "Size of the log window"
-#~ msgstr "Logiakna suurus"
-
-#~ msgid "STUN server set to %s"
-#~ msgstr "STUN-serveriks on määratud %s"
-
-#~ msgid "Opening video device %s with plugin %s"
-#~ msgstr "Videoseadme %s avamine %s pluginaga"
-
-#~ msgid "Successfully opened video device %s, channel %d"
-#~ msgstr "Videoseade %s edukalt avatud, kanal %d"
-
-#~ msgid "Couldn't open the video device"
-#~ msgstr "Videoseadet pole võimalik avada"
-
-#~ msgid "Opened the video device using the \"Picture\" video plugin"
-#~ msgstr "Videoseade avatud plugina \"Pilt\" abil"
-
-#~ msgid "Registration failed"
-#~ msgstr "Tõrge registreerumisel"
-
-#~ msgid "Gatekeeper registration failed: duplicate alias"
-#~ msgstr "Tõrge väravavalvuri registreerimisel: alias on dubleeritud"
-
-#~ msgid "Gatekeeper registration failed: bad username/password"
-#~ msgstr "Tõrge väravavalvuri registreerimisel: halb kasutajanimi või parool"
-
-#~ msgid "Gatekeeper registration failed: transport error"
-#~ msgstr "Tõrge väravavalvuri registreerimisel: viga transpordil"
-
-#~ msgid "Gatekeeper registration failed"
-#~ msgstr "Tõrge väravavalvuri registreerimisel"
-
-#~ msgid "Started Ekiga %d.%d.%d for user %s"
-#~ msgstr "Ekiga %d.%d.%d käivitati kasutajale %s"
-
-#~ msgid "Rejecting incoming call"
-#~ msgstr "Siseneva kõne tagasilükkamine"
-
-#~ msgid "Forwarding incoming call"
-#~ msgstr "Siseneva kõne edasisuunamine"
-
-#~ msgid "Auto-Answering incoming call"
-#~ msgstr "Sisenevale kõnele automaatne vasamine"
-
-#~ msgid "Error while starting the listener for the H.323 protocol"
-#~ msgstr "Viga H.323 protokollile kuulaja käivitamisel"
-
-#~ msgid "Error while starting the listener for the SIP protocol"
-#~ msgstr "Viga SIP protokollile kuulaja käivitamisel"
-
-#~ msgid "Opened codec %s for transmission"
-#~ msgstr "Koodeki %s avamine ülekandeks"
-
-#~ msgid "Opened %s for recording with plugin %s"
-#~ msgstr "%s avati salvestamiseks plugina %s abil"
-
-#~ msgid "Opened %s for playing with plugin %s"
-#~ msgstr "%s avati esitamiseks plugina %s abil"
-
-#~ msgid "Error: User not found"
-#~ msgstr "Viga: Kasutajat ei leitud"
-
-#~ msgid "Error: User offline"
-#~ msgstr "Viga: Kasutaja pole ühendatud"
-
-#~ msgid "Error: Timeout"
-#~ msgstr "Viga: Ajapiirang ületatud"
-
-#~ msgid "Error: Failed to transmit message"
-#~ msgstr "Viga: Tõrge sõnumi ülekandmisel"
-
-#~ msgid "Call this user"
-#~ msgstr "Sellele kasutajale helistamine"
-
-#~ msgid "_Open URL"
-#~ msgstr "_Ava URL"
-
-#~ msgid "_Copy URL to Clipboard"
-#~ msgstr "Kopeeri URL _lõikelauale"
-
-#~ msgid "C_all Contact"
-#~ msgstr "_Helista kontaktile"
-
-#~ msgid "You"
-#~ msgstr "Sa"
-
-#~ msgid "New Remote User"
-#~ msgstr "Uus kaugkasutaja"
-
-#~ msgid "H.245 Tunneling disabled"
-#~ msgstr "H.245 tunneldamine keelatud"
-
-#~ msgid "H.245 Tunneling enabled"
-#~ msgstr "H.245 tunneldamine lubatud"
-
-#~ msgid "Early H.245 disabled"
-#~ msgstr "Varajane H.245 on keelatud"
-
-#~ msgid "Early H.245 enabled"
-#~ msgstr "Varajane H.245 on lubatud"
-
-#~ msgid "Fast Start disabled"
-#~ msgstr "Kiirkäivitus keelatud"
-
-#~ msgid "Fast Start enabled"
-#~ msgstr "Kiirkäivitus lubatud"
-
-#~ msgid "Enabled silence detection"
-#~ msgstr "Vaikuse tuvastamine lubatud"
-
-#~ msgid "Disabled silence detection"
-#~ msgstr "Vaikuse tuvastamine keelatud"
-
-#~ msgid "General History"
-#~ msgstr "Üldine ajalugu"
-
-#~ msgid "Open text chat"
-#~ msgstr "Tekstivestluse avamine"
-
-#~ msgid "C_hat Window"
-#~ msgstr "_Vestlusaken"
-
-#~ msgid "Open the chat window"
-#~ msgstr "Tekstivestluse akna avamine"
-
-#~ msgid "Change the view mode of the UI"
-#~ msgstr "Kasutajaliidese vaaterežiimi muutmine"
-
-#~ msgid "Change the view mode of the UI (softphone, videophone, full view)"
-#~ msgstr ""
-#~ "Kasutajaliidese vaaterežiimi muutmine (tarkvaratelefon, videotelefon, "
-#~ "täisvaade)"
-
-#~ msgid "Incoming call mode"
-#~ msgstr "Siseneva kõne režiim"
-
-#~ msgid "Minimum transmitted video quality"
-#~ msgstr "Madalaim ülekantava video kvaliteet"
-
-#~ msgid "Missed calls history"
-#~ msgstr "Vastamata kõnede ajalugu"
-
-#~ msgid "Placed calls history"
-#~ msgstr "Toimunud kõnede ajalugu"
-
-#~ msgid "Position on the screen of the calls history window"
-#~ msgstr "Kõnede ajaloo akna asukoht ekraanil"
-
-#~ msgid "Received calls history"
-#~ msgstr "Vastuvõetud kõnede ajalugu"
-
-#~ msgid "Size of the calls history window"
-#~ msgstr "Kõnede ajaloo akna suurus"
-
-#~ msgid "The history of the last 100 missed calls"
-#~ msgstr "Viimase 100 vastamata kõne ajalugu"
-
-#~ msgid "The history of the last 100 received calls"
-#~ msgstr "Viimase 100 vastuvõetud kõne ajalugu"
-
-#~ msgid ""
-#~ "An error has happened in the configuration backend.\n"
-#~ "Maybe some of your settings won't be saved."
-#~ msgstr ""
-#~ "Seadistamise taustaprogrammis tekkis viga.\n"
-#~ "Võib-olla jäid mõned sätted salvestamata."
-
-#~ msgid "On This Computer"
-#~ msgstr "Selles arvutis"
-
-#~ msgid "Personal"
-#~ msgstr "Isiklik"
-
-#~ msgid "Orientation"
-#~ msgstr "Suund"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "Salve suund"
-
-#~ msgid ""
-#~ "Another contact with the same speed dial already exists in your address "
-#~ "book:\n"
-#~ "\n"
-#~ "<b>Name</b>: %s\n"
-#~ "<b>URL</b>: %s\n"
-#~ "<b>Speed Dial</b>: %s\n"
-#~ msgstr ""
-#~ "Selle kiirvalimise alla on sinu aadressiraamatus juba kontakt olemas:\n"
-#~ "\n"
-#~ "<b>Nimi</b>: %s\n"
-#~ "<b>URL</b>: %s\n"
-#~ "<b>Kiirvalimine</b>: %s\n"
-
-#~ msgid ""
-#~ "Another contact with similar information already exists in your address "
-#~ "book:\n"
-#~ "\n"
-#~ "<b>Name</b>: %s\n"
-#~ "<b>URL</b>: %s\n"
-#~ "<b>Speed Dial</b>: %s\n"
-#~ "\n"
-#~ "Do you still want to add the contact?"
-#~ msgstr ""
-#~ "Sinu aadressiraamatus juba sarnaste andmetega kontakt olemas:\n"
-#~ "\n"
-#~ "<b>Nimi</b>: %s\n"
-#~ "<b>URL</b>: %s\n"
-#~ "<b>Kiirvalimine</b>: %s\n"
-#~ "\n"
-#~ "Soovid sa ikkagi seda kontakti lisada?"
-
-#~ msgid "S"
-#~ msgstr "O"
-
-#~ msgid "Comment"
-#~ msgstr "Kommentaar"
-
-#~ msgid "Software"
-#~ msgstr "Tarkvara"
-
-#~ msgid "E-Mail"
-#~ msgstr "E-post"
-
-#~ msgid "Location"
-#~ msgstr "Asukoht"
-
-#~ msgid "Speed Dial"
-#~ msgstr "Kiirvalimine"
-
-#~ msgid "Name contains"
-#~ msgstr "Nimi sisaldab"
-
-#~ msgid "URL contains"
-#~ msgstr "URL sisaldab"
-
-#~ msgid "Belongs to category"
-#~ msgstr "Kuulub kategooriasse"
-
-#~ msgid "Location contains"
-#~ msgstr "Asukoht sisaldab"
-
-#~ msgid "_Write e-Mail"
-#~ msgstr "Kirjuta _e-sõnum"
-
-#~ msgid "Error while fetching users list from %s"
-#~ msgstr "Viga kasutajate loendi vastuvõtmisel %s-st"
-
-#~ msgid "Found %d user in %s"
-#~ msgid_plural "Found %d users in %s"
-#~ msgstr[0] "Allikast '%2$s' leiti %1$d kasutaja"
-#~ msgstr[1] "Allikast '%2$s' leiti %1$d kasutajat"
-
-#~ msgid "New _Address Book"
-#~ msgstr "Uus _aadressiraamat"
-
-#~ msgid "_Close"
-#~ msgstr "_Sulge"
-
-#~ msgid "Email:"
-#~ msgstr "E-post:"
-
-#~ msgid "Speed Dial:"
-#~ msgstr "Kiirvalimine:"
-
-#~ msgid "Categories:"
-#~ msgstr "Kategooriad:"
-
-#~ msgid "Local Addressbook:"
-#~ msgstr "Kohalik aadressiraamat:"
-
-#~ msgid "Edit an address book"
-#~ msgstr "Aadressiraamatu redigeerimine"
-
-#~ msgid "Type:"
-#~ msgstr "Liik:"
-
-#~ msgid "Local"
-#~ msgstr "Kohalik"
-
-#~ msgid "Remote LDAP"
-#~ msgstr "Võrgusolev LDAP"
-
-#~ msgid "Remote ILS"
-#~ msgstr "Võrgusolev ILS"
-
-#~ msgid "Search Scope:"
-#~ msgstr "Otsinguskoop:"
-
-#~ msgid "Please make sure you fill in all required fields."
-#~ msgstr "Palun veendu, et sa täitsid kõik vajalikud väljad."
-
-#~ msgid "Are you sure you want to delete %s and all its contacts?"
-#~ msgstr "Kas sa soovid kustutada %s ja kõik selle kontaktid?"
-
-#~ msgid "Date"
-#~ msgstr "Kuupäev"
-
-#~ msgid "Remote User"
-#~ msgstr "Teine kasutaja"
-
-#~ msgid "Call End Reason"
-#~ msgstr "Kõnelõpu põhjus"
-
-#~ msgid "Hang _up"
-#~ msgstr "_Toru hargile"
-
-#~ msgid "Change the view mode"
-#~ msgstr "Vaaterežiimi muutmine"
-
-#~ msgid ""
-#~ "Audio transmission status. During a call, click here to suspend or resume "
-#~ "the audio transmission."
-#~ msgstr ""
-#~ "Audio ülekandmise olek. Kõne ajal klõpsa audio ülekandmise peatamiseks "
-#~ "või taastamiseks siia."
-
-#~ msgid ""
-#~ "Video transmission status. During a call, click here to suspend or resume "
-#~ "the video transmission."
-#~ msgstr ""
-#~ "Video ülekandmise olek. Kõne ajal klõpsa video ülekandmise peatamiseks "
-#~ "või taastamiseks siia."
-
-#~ msgid "_Available"
-#~ msgstr "Saa_daval"
-
-#~ msgid "Forward calls"
-#~ msgstr "Kõnede edastamine"
-
-#~ msgid "Speed d_ials"
-#~ msgstr "_Kiirvalimised"
-
-#~ msgid "_Save Current Picture"
-#~ msgstr "Salvesta käesolev _pilt"
-
-#~ msgid "Quit Ekiga"
-#~ msgstr "Ekiga lõpetamine"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Eelistused"
-
-#~ msgid "View _Mode"
-#~ msgstr "Vaate_režiim"
-
-#~ msgid "Softp_hone"
-#~ msgstr "_Tarkvaraline telefon"
-
-#~ msgid "Show the softphone view"
-#~ msgstr "Tarkvaratelefoni vaate näitamine"
-
-#~ msgid "Show the videophone view"
-#~ msgstr "Videotelefoni vaate näitamine"
-
-#~ msgid "View all components"
-#~ msgstr "Kõikide komponentide näitamine"
-
-#~ msgid "View audio settings"
-#~ msgstr "Audiosätete vaatamine"
-
-#~ msgid "View video settings"
-#~ msgstr "Videosätete vaatamine"
-
-#~ msgid "_Statistics"
-#~ msgstr "_Statistika"
-
-#~ msgid "Both (_Side-by-Side)"
-#~ msgstr "Mõlemad (_külg-küljel)"
-
-#~ msgid "Both (_Both in New Windows)"
-#~ msgstr "Mõlemad (mõlemad uues _aknas)"
-
-#~ msgid "Zoom _In"
-#~ msgstr "_Suurenda"
-
-#~ msgid "Zoom _Out"
-#~ msgstr "_Vähenda"
-
-#~ msgid "_Normal Size"
-#~ msgstr "Al_gsuurus"
-
-#~ msgid "Open the address book"
-#~ msgstr "Aadressiraamatu avamine"
-
-#~ msgid "_General History"
-#~ msgstr "Ül_dine ajalugu"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistika"
-
-#~ msgid "Zoom In"
-#~ msgstr "Suurenda"
-
-#~ msgid "Zoom Out"
-#~ msgstr "Vähenda"
-
-#~ msgid "Normal Size"
-#~ msgstr "Algsuurus"
-
-#~ msgid "Notification area not detected"
-#~ msgstr "Teateala ei leitud"
-
-#~ msgid ""
-#~ "The notification area is not present in your panel, so Ekiga cannot start "
-#~ "hidden."
-#~ msgstr ""
-#~ "Sinu paneelil pole teateala ja seetõttu ei saa Ekiga peidetuna käivituda."
-
-#~ msgid "Out:"
-#~ msgstr "Välja:"
-
-#~ msgid "In:"
-#~ msgstr "Sisse:"
-
-#~ msgid "Registered accounts:"
-#~ msgstr "Registreeritud kontosid:"
-
-#~ msgid "Gconf key error"
-#~ msgstr "Viga Gconfi võtmes"
-
-#~ msgid "Bandwidth"
-#~ msgstr "Läbilaskevõime"
-
-#~ msgid "E-_mail address:"
-#~ msgstr "E-posti _aadress:"
-
-#~ msgid "Enter your e-mail address"
-#~ msgstr "Sisesta siia oma e-posti aadress"
-
-#~ msgid "_Comment:"
-#~ msgstr "_Kommentaar:"
-
-#~ msgid "Enter a comment about yourself"
-#~ msgstr "Sisesta enda kohta mõni kommentaar"
-
-#~ msgid "Enter your country or city"
-#~ msgstr "Sisesta siia oma riik või linn"
-
-#~ msgid "Users Directory"
-#~ msgstr "Kasutajate kataloog"
-
-#~ msgid "Users directory:"
-#~ msgstr "Kasutajate kataloog:"
-
-#~ msgid "The users directory server to register with"
-#~ msgstr "Millise kasutajate kataloogiserverisse registreerida"
-
-#~ msgid "Enable _registering"
-#~ msgstr "_Registreerimine lubatud"
-
-#~ msgid "If enabled, register with the selected users directory"
-#~ msgstr "Kui märgitud, siis registreeritakse valitud kasutajate kataloogi"
-
-#~ msgid "Click here to refresh the devices list"
-#~ msgstr "Seadmete loetelu värskendamiseks klõpsa siia"
-
-#~ msgid "Normal"
-#~ msgstr "Tavaline"
-
-#~ msgid "Large"
-#~ msgstr "Suur"
-
-#~ msgid "Bandwidth Control"
-#~ msgstr "Läbilaskevõime juhtimine"
-
-#~ msgid "Advanced Quality Settings"
-#~ msgstr "Laiendatud kvaliteedisätted"
-
-#~ msgid "Directory Settings"
-#~ msgstr "Kataloogisätted"
-
-#~ msgid ""
-#~ "Please provide your first name and e-mail in the Personal Data section in "
-#~ "order to be able to register to the users directory."
-#~ msgstr ""
-#~ "Kasutajate kataloogis registreerumiseks sisesta palun isiklike andmete "
-#~ "sektsiooni oma nimi ja e-posti aadress."
-
-#~ msgid "Invalid users directory"
-#~ msgstr "Vigane kasutajate kataloog"
-
-#~ msgid "Operation impossible since there is no users directory specified."
-#~ msgstr ""
-#~ "Operatsiooni pole võimalik läbi viia kuni kasutajate kataloogi pole "
-#~ "määratud."
-
-#~ msgid "Failed to parse XML file"
-#~ msgstr "Tõrge XML-faili analüüsimisel"
-
-#~ msgid "Bad information"
-#~ msgstr "Vigased andmed"
-
-#~ msgid "Bad LDAP information from XML file: %s."
-#~ msgstr "Vigased LDAP andmed XML-failist: %s."
-
-#~ msgid "Written by"
-#~ msgstr "Programmeerijad"
-
-#~ msgid "Documented by"
-#~ msgstr "Dokumenteerijad"
-
-#~ msgid "Translated by"
-#~ msgstr "Tõlkijad"
-
-#~ msgid "Authors"
-#~ msgstr "Autorid"
-
-#~ msgid "Documenter entry"
-#~ msgstr "Dokumenteerija kirje"
-
-#~ msgid "A single documenter entry"
-#~ msgstr "Üksik dokumenteerija kirje"
diff -Nru ekiga-3.2.5/po/ga.po ekiga-3.2.6~ppa~karmic1/po/ga.po
--- ekiga-3.2.5/po/ga.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/ga.po	2009-09-22 15:27:35.000000000 +0100
@@ -1,16 +1,16 @@
 # Irish translations for ekiga package.
-# Copyright (C) 2004-2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the ekiga package.
 # Paul Duffy <dubhthach@frink.nuigalway.ie>, 2003.
 # Alastair McKinstry <mckinstry@computer.org>, 2004.
-# Seán de Búrca <leftmostcat@gmail.com>, 2008.
+# Seán de Búrca <leftmostcat@gmail.com>, 2008, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ekiga HEAD\n"
+"Project-Id-Version: ekiga.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 23:42-0400\n"
-"PO-Revision-Date: 2008-09-06 23:42-0500\n"
+"POT-Creation-Date: 2009-08-20 15:48-0600\n"
+"PO-Revision-Date: 2009-08-20 16:09-0600\n"
 "Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@
 
 #: ../ekiga.desktop.in.in.h:1
 msgid "Ekiga Softphone"
-msgstr ""
+msgstr "Fón Bogearraí Ekiga"
 
 #: ../ekiga.desktop.in.in.h:2
 msgid "IP Telephony, VoIP and Video Conferencing"
@@ -62,25 +62,21 @@
 msgid "Audio output device"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:8
-msgid "Automatic echo cancellation"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:9 ../src/gui/preferences.cpp:439
+#: ../ekiga.schemas.in.in.h:8 ../src/gui/preferences.cpp:516
 msgid ""
 "Automatically reject or forward incoming calls if no answer is given after "
 "the specified amount of time (in seconds)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:10
+#: ../ekiga.schemas.in.in.h:9
 msgid "Calls history"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:11
+#: ../ekiga.schemas.in.in.h:10
 msgid "Change the main window panel section"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:12
+#: ../ekiga.schemas.in.in.h:11
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -88,28 +84,32 @@
 "versions of Netmeeting"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:13
+#: ../ekiga.schemas.in.in.h:12
 msgid "Contact long status"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:14
+#: ../ekiga.schemas.in.in.h:13
 msgid "Contact short status"
 msgstr ""
 
+#: ../ekiga.schemas.in.in.h:14
+msgid "DTMF sending"
+msgstr ""
+
 #: ../ekiga.schemas.in.in.h:15
-msgid "Country code"
-msgstr "Cód tíre"
+msgid "Disable STUN network detection"
+msgstr ""
 
-#: ../ekiga.schemas.in.in.h:16
-msgid "DTMF sending"
+#: ../ekiga.schemas.in.in.h:16 ../src/gui/preferences.cpp:492
+msgid "Disable the automatic network setup resulting from the STUN test"
 msgstr ""
 
 #: ../ekiga.schemas.in.in.h:17
 msgid "Disable video hardware acceleration"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:18
-msgid "Display a popup window when receiving a call"
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3591
+msgid "Display images from your camera device"
 msgstr ""
 
 #: ../ekiga.schemas.in.in.h:19
@@ -133,426 +133,374 @@
 msgstr ""
 
 #: ../ekiga.schemas.in.in.h:24
-msgid "Enable video support"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:25
 msgid ""
 "Enter the number of seconds after which Ekiga should try refreshing the NAT "
 "binding when STUN is being used"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:26 ../src/gui/preferences.cpp:386
+#: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
 msgid "Enter your full name"
 msgstr "Iontráil d'ainm iomlán"
 
-#: ../ekiga.schemas.in.in.h:27
+#: ../ekiga.schemas.in.in.h:26
 msgid "Forward calls to host"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:28
+#: ../ekiga.schemas.in.in.h:27
 msgid "Forward calls to the given host if busy"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:29
+#: ../ekiga.schemas.in.in.h:28
 msgid "Forward calls to the given host if no answer"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:30 ../src/gui/preferences.cpp:1009
+#: ../ekiga.schemas.in.in.h:29 ../src/gui/preferences.cpp:1018
 msgid "Frame Rate"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:31
+#: ../ekiga.schemas.in.in.h:30
 msgid "Full name"
 msgstr "Ainm iomlán"
 
-#: ../ekiga.schemas.in.in.h:32 ../src/gui/preferences.cpp:407
+#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:477
 msgid ""
 "If enabled, Ekiga will start hidden provided that the notification area is "
 "present in the GNOME panel"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:33
-msgid ""
-"If enabled, a popup window will be displayed when receiving an incoming call"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:34
+#: ../ekiga.schemas.in.in.h:32
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:35
+#: ../ekiga.schemas.in.in.h:33
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you already are in a call or if you are in "
 "Do Not Disturb mode"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:36
+#: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you do not answer the call"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:37
-msgid "If enabled, allows video during calls"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:38 ../src/gui/preferences.cpp:409
+#: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
 msgid "If enabled, offline contacts will be shown in the roster"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:39
+#: ../ekiga.schemas.in.in.h:36
 msgid "If enabled, use echo cancelation"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:40
+#: ../ekiga.schemas.in.in.h:37
 msgid "If enabled, use silence detection with the codecs supporting it"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:41
+#: ../ekiga.schemas.in.in.h:38
 msgid "Kind of network selected in the druid"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:42
+#: ../ekiga.schemas.in.in.h:39
 msgid "LDAP servers"
 msgstr "Freastalaí LDAP"
 
-#: ../ekiga.schemas.in.in.h:43
+#: ../ekiga.schemas.in.in.h:40
 msgid "List of configured LDAP servers"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:44
+#: ../ekiga.schemas.in.in.h:41
 msgid "List of folded groups in the roster"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:45
+#: ../ekiga.schemas.in.in.h:42
 msgid "Listen port"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:46
+#: ../ekiga.schemas.in.in.h:43
 msgid "Local video window size"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:47
+#: ../ekiga.schemas.in.in.h:44
 msgid "Maximum RX video bitrate"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:48
+#: ../ekiga.schemas.in.in.h:45
 msgid "Maximum TX video bitrate"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:49
+#: ../ekiga.schemas.in.in.h:46
 msgid "Maximum jitter buffer"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:50
+#: ../ekiga.schemas.in.in.h:47
 msgid "NAT Binding Timeout"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:51
+#: ../ekiga.schemas.in.in.h:48
 msgid "No answer timeout"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:52
+#: ../ekiga.schemas.in.in.h:49
 msgid "Outbound Proxy"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:53
-msgid "Output device type"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:54 ../src/gui/preferences.cpp:416
+#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video above other windows during calls"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:55 ../src/gui/preferences.cpp:1394
+#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
 msgid "Play busy tone"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:56 ../src/gui/preferences.cpp:1385
+#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:361
 msgid "Play ring tone"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:57 ../src/gui/preferences.cpp:1376
+#: ../ekiga.schemas.in.in.h:53 ../src/gui/preferences.cpp:351
 msgid "Play sound on incoming calls"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:58
+#: ../ekiga.schemas.in.in.h:54
 msgid "Play sound on new message"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:59
+#: ../ekiga.schemas.in.in.h:55
 msgid "Play sound on new voice mail"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:60
+#: ../ekiga.schemas.in.in.h:56
 msgid "Position of the local video window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:61
-msgid "Position on the screen of the PC-To-Phone window"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:62
+#: ../ekiga.schemas.in.in.h:57
 msgid "Position on the screen of the address book window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:63
+#: ../ekiga.schemas.in.in.h:58
 msgid "Position on the screen of the audio settings window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:64
+#: ../ekiga.schemas.in.in.h:59
 msgid "Position on the screen of the chat window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:65
+#: ../ekiga.schemas.in.in.h:60
 msgid "Position on the screen of the druid window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:66
+#: ../ekiga.schemas.in.in.h:61
 msgid "Position on the screen of the log window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:67
+#: ../ekiga.schemas.in.in.h:62
 msgid "Position on the screen of the main window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:68
+#: ../ekiga.schemas.in.in.h:63
 msgid "Position on the screen of the preferences window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:69
+#: ../ekiga.schemas.in.in.h:64
 msgid "Position on the screen of the video settings window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:70
-msgid "Registration timeout"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:71
+#: ../ekiga.schemas.in.in.h:65
 msgid "Remote video window position"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:72
+#: ../ekiga.schemas.in.in.h:66
 msgid "Remote video window size"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:73
-msgid "Revision of the schema file"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:74
-msgid "Roster view saving group status"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:75
+#: ../ekiga.schemas.in.in.h:67
 msgid "Select an alternative audio output device to use for sound events."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:76 ../src/gui/preferences.cpp:718
+#: ../ekiga.schemas.in.in.h:68 ../src/gui/preferences.cpp:777
 msgid "Select the audio input device to use"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:77 ../src/gui/preferences.cpp:711
+#: ../ekiga.schemas.in.in.h:69 ../src/gui/preferences.cpp:770
 msgid "Select the audio output device to use"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:78 ../src/gui/preferences.cpp:874
+#: ../ekiga.schemas.in.in.h:70 ../src/gui/preferences.cpp:936
 msgid ""
 "Select the format for video cameras (does not apply to most USB cameras)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:79
+#: ../ekiga.schemas.in.in.h:71
 msgid ""
 "Select the transmitted video size: Small (QCIF 176x144) or Large (CIF "
 "352x288)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:80 ../src/gui/preferences.cpp:866
+#: ../ekiga.schemas.in.in.h:72 ../src/gui/preferences.cpp:928
 msgid ""
 "Select the video input device to use. If an error occurs when using this "
 "device a test picture will be transmitted."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:81
+#: ../ekiga.schemas.in.in.h:73
 msgid "Show offline contacts"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:82 ../src/gui/main.cpp:1845
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3220
 msgid "Show the call panel"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:83
-msgid "Size of the PC-To-Phone window"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:84
+#: ../ekiga.schemas.in.in.h:75
 msgid "Size of the address book window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:85
-#, fuzzy
+#: ../ekiga.schemas.in.in.h:76
 msgid "Size of the audio settings window"
-msgstr "F_aoi GnomeMeeting"
+msgstr "Méid na fuinneoige socruithe fuaime"
 
-#: ../ekiga.schemas.in.in.h:86
+#: ../ekiga.schemas.in.in.h:77
 msgid "Size of the chat window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:87
+#: ../ekiga.schemas.in.in.h:78
 msgid "Size of the druid window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:88
+#: ../ekiga.schemas.in.in.h:79
 msgid "Size of the preferences window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:89
-#, fuzzy
+#: ../ekiga.schemas.in.in.h:80
 msgid "Size of the video settings window"
-msgstr "F_aoi GnomeMeeting"
+msgstr "Méid na fuinneoige socruithe físe"
 
-#: ../ekiga.schemas.in.in.h:90
+#: ../ekiga.schemas.in.in.h:81
 msgid "Specify the software scaling algorithm"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:91
+#: ../ekiga.schemas.in.in.h:82
 msgid ""
 "Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest "
 "neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
 "Does not apply on windows systems."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:92
+#: ../ekiga.schemas.in.in.h:83
 msgid "Start hidden"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:93
+#: ../ekiga.schemas.in.in.h:84
 msgid "TCP port range"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:94
+#: ../ekiga.schemas.in.in.h:85
 msgid "Temporal Spatial Trade Off"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:95
+#: ../ekiga.schemas.in.in.h:86
 msgid "The Audio Codecs List"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:96
-msgid ""
-"The Automatic Echo Cancellation level: Off, Low, Medium, High, Automatic "
-"Gain Compensation. Choosing Automatic Gain Compensation modulates the volume "
-"for best quality."
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:97 ../src/gui/preferences.cpp:668
+#: ../ekiga.schemas.in.in.h:87 ../src/gui/preferences.cpp:727
 msgid "The SIP Outbound Proxy to use for outgoing calls"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:98
+#: ../ekiga.schemas.in.in.h:88
 msgid "The STUN Server"
 msgstr "An Freastalaí STUN"
 
-#: ../ekiga.schemas.in.in.h:99
+#: ../ekiga.schemas.in.in.h:89
 msgid ""
 "The STUN server to use for STUN Support. STUN is a technology that permits "
 "passage through some types of NAT gateway"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:100
+#: ../ekiga.schemas.in.in.h:90
 msgid "The Video Codecs List"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:101
+#: ../ekiga.schemas.in.in.h:91
 msgid "The accounts list"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:102
+#: ../ekiga.schemas.in.in.h:92
 msgid "The audio codecs list"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:103
+#: ../ekiga.schemas.in.in.h:93
 msgid "The busy tone sound"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:104
+#: ../ekiga.schemas.in.in.h:94
 msgid ""
 "The chosen sound will be played at the end of calls or calling somebody who "
 "is busy, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:105
+#: ../ekiga.schemas.in.in.h:95
 msgid "The chosen sound will be played on incoming calls, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:106
+#: ../ekiga.schemas.in.in.h:96
 msgid ""
 "The chosen sound will be played when a new instant message is received, if "
 "enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:107
+#: ../ekiga.schemas.in.in.h:97
 msgid ""
 "The chosen sound will be played when a new voice mail is received, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:108
+#: ../ekiga.schemas.in.in.h:98
 msgid "The chosen sound will be played when calling somebody, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:109
+#: ../ekiga.schemas.in.in.h:99
 msgid "The default video view"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:110
+#: ../ekiga.schemas.in.in.h:100
 msgid ""
 "The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with "
 "local video in a separate window, 4: Both)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:111
+#: ../ekiga.schemas.in.in.h:101
 msgid "The dial tone sound"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:112
+#: ../ekiga.schemas.in.in.h:102
 msgid "The history of the 100 last calls"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:113 ../src/gui/preferences.cpp:617
-#: ../src/gui/preferences.cpp:671
+#: ../ekiga.schemas.in.in.h:103 ../src/gui/preferences.cpp:676
+#: ../src/gui/preferences.cpp:730
 msgid "The host where calls should be forwarded if call forwarding is enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:114
-msgid ""
-"The image to transmit if \"Picture\" is selected as video plugin or if the "
-"opening of the device fails. Leave blank to use the default Ekiga logo."
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:115
+#: ../ekiga.schemas.in.in.h:104
 msgid "The incoming call sound"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:116
+#: ../ekiga.schemas.in.in.h:105
 msgid "The list of accounts to which Ekiga should register"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:117
+#: ../ekiga.schemas.in.in.h:106
 msgid "The long status information"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:118
+#: ../ekiga.schemas.in.in.h:107
 msgid ""
 "The maximum RX video bitrate in kbit/s. This value will be signaled to the "
 "peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
 "above the signaled value"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:119
+#: ../ekiga.schemas.in.in.h:108
 msgid ""
 "The maximum TX video bitrate in kbit/s. The video quality and the number of "
 "transmitted frames per second (depends on selected codec) will be "
@@ -560,159 +508,134 @@
 "bandwidth to the given value"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:120
+#: ../ekiga.schemas.in.in.h:109
 msgid "The maximum jitter buffer size for audio reception (in ms)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:121
+#: ../ekiga.schemas.in.in.h:110
 msgid ""
 "The maximum transmitted frame rate in frames/s. This rate may not be reached "
 "in case a minimum quality was configure via a TSTO value smaller than 31 and "
 "the bitrate selected is not sufficient to support this minimum quality"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:122
+#: ../ekiga.schemas.in.in.h:111
 msgid "The new instant message sound"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:123
+#: ../ekiga.schemas.in.in.h:112
 msgid "The new voice mail sound"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:124
-msgid ""
-"The output device type is the type of device connected to your Quicknet "
-"card. It can be either a POTS (Plain Old Telephone System) or a headset."
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:125
+#: ../ekiga.schemas.in.in.h:113
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:126
+#: ../ekiga.schemas.in.in.h:114
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:127
+#: ../ekiga.schemas.in.in.h:115
 msgid "The position of the local video window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:128
+#: ../ekiga.schemas.in.in.h:116
 msgid "The position of the remote video window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:129
-msgid ""
-"The prefix that will be used to save pictures of the conversation. That "
-"prefix is followed by the snapshot number."
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:130
+#: ../ekiga.schemas.in.in.h:117
 msgid ""
 "The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
 "port range has no effect if both participants to the conference are using "
 "H.245 Tunneling."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:131
+#: ../ekiga.schemas.in.in.h:118
 msgid "The range of UDP ports that Ekiga will use."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:132
-msgid "The save prefix"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:133
+#: ../ekiga.schemas.in.in.h:119
 msgid "The short status information"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:134
+#: ../ekiga.schemas.in.in.h:120
 msgid "The size of the local video window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:135
+#: ../ekiga.schemas.in.in.h:121
 msgid "The size of the remote video window"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:136
+#: ../ekiga.schemas.in.in.h:122
 msgid ""
 "The sound that will be played at the end of calls or when calling somebody "
 "who is busy, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:137
+#: ../ekiga.schemas.in.in.h:123
 msgid "The sound that will be played on incoming calls, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:138
+#: ../ekiga.schemas.in.in.h:124
 msgid "The sound that will be played when calling somebody, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:139
+#: ../ekiga.schemas.in.in.h:125
 msgid ""
 "The sound that will be played when there is a new instant message, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:140
+#: ../ekiga.schemas.in.in.h:126
 msgid ""
 "The sound that will be played when there is a new voice mail, if enabled"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:141
-msgid ""
-"The time after which Ekiga will renew its registration with the registrar"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:142
-msgid "The two-letter country code of your country (e.g.: BE, UK, FR, DE, ...)"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:143 ../src/gui/preferences.cpp:870
+#: ../ekiga.schemas.in.in.h:127 ../src/gui/preferences.cpp:932
 msgid "The video channel number to use (to select camera, tv or other sources)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:144
+#: ../ekiga.schemas.in.in.h:128
 msgid "The video codecs list"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:145
+#: ../ekiga.schemas.in.in.h:129
 msgid "The video view before having switched to fullscreen"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:146
+#: ../ekiga.schemas.in.in.h:130
 msgid ""
 "The video view before having switched to fullscreen (same values as "
 "video_view)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:147
+#: ../ekiga.schemas.in.in.h:131
 msgid "The zoom value"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:148
+#: ../ekiga.schemas.in.in.h:132
 msgid ""
 "The zoom value in percent to apply to images displayed in the main GUI (can "
 "be 50, 100, or 200)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:149
+#: ../ekiga.schemas.in.in.h:133
 msgid ""
 "This allows you to set the mode for sending DTMFs. The values can be "
 "\"RFC2833\" (0), \"INFO\" (1)"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:150
+#: ../ekiga.schemas.in.in.h:134
 msgid ""
 "This allows you to set the mode for sending DTMFs. The values can be \"String"
 "\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
 "\"). Choosing other values than \"String\" disables the Text Chat"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:151 ../src/gui/preferences.cpp:629
+#: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
 msgid ""
 "This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
 "are encapsulated into the H.225 channel (port 1720). This saves one TCP "
@@ -721,1215 +644,1418 @@
 "can crash some versions of Netmeeting."
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:152 ../src/gui/preferences.cpp:631
+#: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:690
 msgid "This enables H.245 early in the setup"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:153
+#: ../ekiga.schemas.in.in.h:137
 msgid ""
 "This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
 "acceleration"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:154
+#: ../ekiga.schemas.in.in.h:138
 msgid "UDP port range"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:155
-msgid "Version"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:156
+#: ../ekiga.schemas.in.in.h:139
 msgid "Video channel"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:157
+#: ../ekiga.schemas.in.in.h:140
 msgid "Video format"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:158
-msgid "Video image"
-msgstr ""
-
-#: ../ekiga.schemas.in.in.h:159 ../src/gui/assistant.cpp:1045
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:160
+#: ../ekiga.schemas.in.in.h:142
 msgid "Video preview"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:161
+#: ../ekiga.schemas.in.in.h:143
 msgid "Video size"
 msgstr ""
 
-#: ../ekiga.schemas.in.in.h:162
+#: ../ekiga.schemas.in.in.h:144
 msgid ""
 "Whether to prefer to sustain the max. frame rate or lower it possibly in "
 "order to keep a minimum level of (spatial) quality for all frames. 0: "
 "Highest minimal quality, 31: lowest minimal quality"
 msgstr ""
 
-#: ../lib/engine/addressbook/call-history/history-contact.cpp:148
+#: ../lib/engine/addressbook/contact-core.cpp:60
+msgid "_Find"
+msgstr "_Aimsigh"
+
+#: ../lib/engine/components/avahi/avahi-heap.cpp:125
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
+msgid "Neighbours"
+msgstr "Comharsana"
+
+#: ../lib/engine/components/call-history/history-book.cpp:137
+#: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
+msgid "Clear List"
+msgstr ""
+
+#: ../lib/engine/components/call-history/history-contact.cpp:155
 msgid "Received"
 msgstr ""
 
-#: ../lib/engine/addressbook/call-history/history-contact.cpp:151
+#: ../lib/engine/components/call-history/history-contact.cpp:158
 msgid "Placed"
 msgstr ""
 
-#: ../lib/engine/addressbook/call-history/history-contact.cpp:154
+#: ../lib/engine/components/call-history/history-contact.cpp:161
 msgid "Missed"
 msgstr ""
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:234
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:194
-#: ../src/endpoints/opal-account.cpp:310 ../src/gui/main.cpp:1803
-msgid "_Edit"
-msgstr "_Eagar"
+#: ../lib/engine/components/evolution/evolution-book.cpp:76
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
+#, c-format
+msgid "%d user found"
+msgid_plural "%d users found"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:236
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:313
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:196
-#: ../src/endpoints/opal-account.cpp:312
-msgid "_Remove"
-msgstr ""
+#: ../lib/engine/components/evolution/evolution-book.cpp:283
+msgid "New _Contact"
+msgstr "_Teagmháil Nua"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:325
-msgid "Edit contact"
-msgstr "Cuir teagmháil in eagar"
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
+#: ../lib/engine/components/local-roster/local-cluster.cpp:82
+#: ../lib/engine/components/local-roster/local-heap.cpp:117
+msgid "New contact"
+msgstr "Teagmháil nua"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:327
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:313
-#: ../src/endpoints/opal-account.cpp:353
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
 msgid "Please update the following fields:"
-msgstr ""
+msgstr "Nuashonraigh na réimsí a leanas le do thoil:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:329
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:221
-#: ../lib/engine/presence/local-roster/local-heap.cpp:177
-#: ../lib/engine/presence/local-roster/local-heap.cpp:324
-#: ../src/endpoints/opal-account.cpp:355 ../src/endpoints/opal-bank.cpp:101
-#: ../src/endpoints/opal-bank.cpp:111
-msgid "Name:"
-msgstr "Ainm:"
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
+msgid "_Name:"
+msgstr "_Ainm:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:338
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:316
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
 msgid "VoIP _URI:"
 msgstr ""
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:339
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:317
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
 msgid "_Home phone:"
 msgstr ""
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:340
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:318
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
 msgid "_Office phone:"
 msgstr ""
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:341
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:319
+#: ../lib/engine/components/evolution/evolution-book.cpp:327
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
 msgid "_Cell phone:"
 msgstr ""
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:342
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:320
+#: ../lib/engine/components/evolution/evolution-book.cpp:328
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
 msgid "_Pager:"
 msgstr "_Glaoire:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:392
-msgid "Remove contact"
-msgstr "Bain teagmháil"
-
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:394
-#, c-format
-msgid "Are you sure you want to remove %s from the addressbook?"
-msgstr ""
-
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:86
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:591
-#, c-format
-msgid "%d user found"
-msgid_plural "%d users found"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:259
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:310
-msgid "_Refresh"
-msgstr ""
+#: ../lib/engine/components/evolution/evolution-contact.cpp:234
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3178
+msgid "_Edit"
+msgstr "_Eagar"
 
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:262
-msgid "New _Contact"
-msgstr "_Teagmháil Nua"
+#: ../lib/engine/components/evolution/evolution-contact.cpp:236
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
+msgid "_Remove"
+msgstr "_Bain"
 
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:311
-#: ../lib/engine/presence/local-roster/local-heap.cpp:118
-msgid "New contact"
-msgstr "Teagmháil nua"
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
+msgid "Edit contact"
+msgstr "Cuir teagmháil in eagar"
 
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:315
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:157
-msgid "_Name:"
-msgstr "_Ainm:"
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:169
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+msgid "Name:"
+msgstr "Ainm:"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:139
-msgid "Add an LDAP Address Book"
-msgstr ""
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
+msgid "Remove contact"
+msgstr "Bain teagmháil"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:142
-msgid "Add the Ekiga.net Directory"
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
+#, c-format
+msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:153
-msgid "Create LDAP directory"
-msgstr ""
+#: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
+msgid "Audio test"
+msgstr "Tástáil fuaime"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:155
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:611
-msgid "Please edit the following fields"
+#: ../lib/engine/components/gstreamer/gst-audiooutput.cpp:320
+msgid "Silent"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:158
-msgid "_Hostname:"
-msgstr "Ó_stainm:"
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
+msgid "Video test"
+msgstr "Tástáil físe"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:159
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:160
-msgid "_Base DN:"
+#. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Crazy"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:164
-msgid "_Subtree"
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Screencast"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:165
-msgid "Single _Level"
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
+msgid "_Refresh"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:166
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:629
-msgid "_Scope"
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
+msgid "_Remove addressbook"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:169
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:632
-msgid "Call _Attribute"
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
+msgid "Addressbook _properties"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:170
-msgid "Password"
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
+msgid "LDAP SASL Interaction"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:188
-msgid "Ekiga.net Directory"
-msgstr ""
+#. Translators, Howard explained : "Challenge" is a generic term
+#. * in authentication. It's a prompt from the authentication mechanism
+#. * for some type of credential. Exactly what kind of challenge and
+#. * what kind of credential depends on the specific authentication
+#. * mechanism. Since SASL is a generic interface, and can dynamically
+#. * load arbitrary mechanisms, there's not much more specific you can
+#. * say about it. You might google for "challenge response
+#. * authentication" if you'd like more background context.
+#.
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
+msgid "Challenge: "
+msgstr "Dúshlán:"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:315
-msgid "_Properties"
-msgstr ""
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
+msgid "Interact"
+msgstr "Idirghníomhaigh"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:380
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
 msgid "Refreshing"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:388
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
 msgid "Could not initialize server"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:421
-msgid "Could not contact server"
-msgstr ""
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
+msgid "LDAP Error: "
+msgstr "Earráid LDAP:"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:429
-#, fuzzy
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
 msgid "Contacted server"
-msgstr "Friothálaí Nua"
+msgstr "Rinneadh teagmháil le freastalaí"
 
 #. patience == 0
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:466
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
 msgid "Could not connect to server"
 msgstr ""
 
 #. patience == 0
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:516
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:564
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
 msgid "Could not search"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:524
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
 msgid "Waiting for search results"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:609
-msgid "Edit LDAP directory"
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
+msgid "Please edit the following fields"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:613
-msgid "_Name"
-msgstr "_Ainm"
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
+msgid "Book _Name"
+msgstr "_Ainm Leabhair"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:614
-msgid "_Hostname"
-msgstr "Ó_stainm"
-
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:620
-msgid "_Port"
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
+msgid "Server _URI"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:622
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
 msgid "_Base DN"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:627
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
 msgid "Subtree"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:628
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
 msgid "Single Level"
 msgstr ""
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:634
-msgid "_Password"
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
+msgid "_Search Scope"
 msgstr ""
 
-#: ../lib/engine/addressbook/skel/contact-core.cpp:57
-msgid "_Find"
-msgstr "_Aimsigh"
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
+msgid "_DisplayName Attribute"
+msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:660
-msgid "Address Book"
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
+msgid "Call _Attributes"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:680
-#: ../src/gui/main.cpp:1752
-msgid "Address _Book"
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
+msgid "_Filter Template"
 msgstr ""
 
-#. This will add static and dynamic actions
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:689
-msgid "_Action"
-msgstr "_Gníomh"
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
+msgid "Bind _ID"
+msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:734
-msgid "Category"
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
+msgid "_Password"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:248
-#: ../lib/engine/gui/gtk-frontend/chat-window-page.cpp:968
-msgid "says:"
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
+msgid "Use TLS"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:371
-msgid "Open link in browser"
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
+msgid "Use SASL"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:377
-msgid "Copy link"
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
+msgid "SASL _Mechanism"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:941
-msgid "_Smile..."
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
+msgid "Edit LDAP directory"
 msgstr ""
 
-#. The window
-#. we can't do much here since we get the Chat as reference...
-#: ../lib/engine/gui/gtk-frontend/chat-window-old.cpp:562
-#: ../lib/engine/gui/gtk-frontend/chat-window.cpp:421
-msgid "Chat Window"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
+msgid "Please provide a Book Name for this directory\n"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:638
-#: ../src/gui/assistant.cpp:1253
-msgid "Full Name"
-msgstr "Ainm Iomlán"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
+msgid "Please provide a Server URI\n"
+msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:649
-msgid "_Search Filter:"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
+msgid "Please provide a DisplayName Attribute\n"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:979
-#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1014
-msgid "Unsorted"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
+msgid "Please provide a Call Attribute\n"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-window-page.cpp:752
-msgid "_Send"
-msgstr "_Seol"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
+msgid "Invalid Server URI\n"
+msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/chat-window-page.cpp:963
-#, c-format
-msgid "You say:\n"
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
+msgid "Add an LDAP Address Book"
 msgstr ""
 
-#: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:163
-#: ../src/gui/statusmenu.cpp:546
-msgid "Clear"
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
+msgid "Add the Ekiga.net Directory"
 msgstr ""
 
-#: ../lib/engine/presence/avahi/avahi-presentity.cpp:47
-msgid "Neighbours"
+#: ../lib/engine/components/ldap/ldap-source.cpp:152
+msgid "Create LDAP directory"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:218
+#: ../lib/engine/components/ldap/ldap-source.cpp:167
+msgid "Ekiga.net Directory"
+msgstr ""
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
 msgid "Edit roster element"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:219
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:222
-#: ../lib/engine/presence/local-roster/local-heap.cpp:186
-#: ../lib/engine/presence/local-roster/local-heap.cpp:188
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:170
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
 msgid "Address:"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:224
-#, fuzzy
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
 msgid "Choose groups:"
-msgstr "Grúpa Nua"
+msgstr "Roghnaigh grúpaí:"
 
-#: ../lib/engine/presence/local-roster/local-roster-bridge.cpp:94
-#: ../lib/engine/presence/local-roster/local-heap.cpp:174
+#: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
 msgid "Add to local roster"
-msgstr ""
+msgstr "Cuir le uainchlár logánta"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:93
-#, fuzzy
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
 msgid "Services"
-msgstr "Gaireasaí"
+msgstr "Seirbhísí"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:94
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
 msgid "Echo test"
-msgstr ""
+msgstr "Tástáil macalla"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:95
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
 msgid "Conference room"
-msgstr ""
+msgstr "Seomra comhdhála"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:111
-#, fuzzy
+#: ../lib/engine/components/local-roster/local-heap.cpp:110
 msgid "Local roster"
-msgstr "Fîs Âitiúl"
+msgstr "Uainchlár logánta"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:128
+#: ../lib/engine/components/local-roster/local-heap.cpp:127
 msgid "Rename"
 msgstr "Athainmnigh"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:175
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
+msgid "Family"
+msgstr "Teaghlach"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
+msgid "Friend"
+msgstr "Cara"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
+msgid "Associate"
+msgstr "Comhpháirtí"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
+msgid "Assistant"
+msgstr "Cúntóir"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
+msgid "Supervisor"
+msgstr "Maoirseoir"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
+msgid "Self"
+msgstr "An Féin"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
 msgid ""
 "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:192
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
 msgid "Put contact in groups:"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:295
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
 msgid "You supplied an unsupported address"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:297
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
 msgid "You already have a contact with this address!"
 msgstr ""
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:322
-#, fuzzy
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
 msgid "Rename group"
-msgstr "Grúpa Nua"
+msgstr "Athainmnigh grúpa"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:323
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
 msgid "Please edit this group name"
 msgstr ""
 
-#: ../lib/gui/codecsbox.cpp:476
-msgid "Move selected codec priority upwards"
-msgstr ""
-
-#: ../lib/gui/codecsbox.cpp:486
-msgid "Move selected codec priority downwards"
-msgstr ""
-
-#: ../lib/gui/gmdialog.c:474
-msgid "Do not show this dialog again"
-msgstr ""
-
-#: ../src/devices/audio.cpp:281
-msgid "Opening device for playing"
-msgstr ""
-
-#: ../src/devices/audio.cpp:283
-msgid "Opening device for recording"
-msgstr ""
-
-#: ../src/devices/audio.cpp:294 ../src/devices/audio.cpp:296
-msgid "Failed to open the device"
-msgstr ""
-
-#: ../src/devices/audio.cpp:294
-#, c-format
-msgid ""
-"Impossible to open the selected audio device (%s) for recording. Please "
-"check your audio setup, the permissions and that the device is not busy."
-msgstr ""
-
-#: ../src/devices/audio.cpp:296
-#, c-format
-msgid ""
-"Impossible to open the selected audio device (%s) for playing. Please check "
-"your audio setup, the permissions and that the device is not busy."
-msgstr ""
-
-#: ../src/devices/audio.cpp:312 ../src/devices/audio.cpp:381
-msgid "Cannot use the audio device"
-msgstr ""
-
-#: ../src/devices/audio.cpp:312
-#, c-format
-msgid ""
-"The selected audio device (%s) was successfully opened but it is impossible "
-"to read data from this device. Please check your audio setup."
-msgstr ""
-
-#: ../src/devices/audio.cpp:321
-msgid "Recording your voice"
-msgstr ""
-
-#: ../src/devices/audio.cpp:360
-msgid "Recording and playing back"
-msgstr ""
-
-#: ../src/devices/audio.cpp:381
-#, c-format
-msgid ""
-"The selected audio device (%s) was successfully opened but it is impossible "
-"to write data to this device. Please check your audio setup."
-msgstr ""
-
-#: ../src/devices/audio.cpp:476 ../src/devices/audio.cpp:477
-#: ../src/gui/assistant.cpp:1118 ../src/gui/assistant.cpp:1141
-#: ../src/gui/assistant.cpp:1164 ../src/gui/preferences.cpp:745
-#: ../src/gui/preferences.cpp:769 ../src/gui/preferences.cpp:792
-msgid "No device found"
-msgstr ""
-
-#: ../src/devices/audio.cpp:488
-#, fuzzy
-msgid "Audio test running"
-msgstr "Plogála Fuaim"
-
-#: ../src/devices/audio.cpp:495
-#, c-format
-msgid ""
-"Ekiga is now recording from %s and playing back to %s. Please say \"1, 2, 3, "
-"Ekiga rocks!\" in your microphone. You should hear yourself from the "
-"speakers after a four-second delay."
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:230
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
+msgid "Call"
 msgstr ""
 
-#: ../src/endpoints/h323-endpoint.cpp:149
-#: ../src/endpoints/sip-endpoint.cpp:273 ../src/endpoints/sip-endpoint.cpp:277
-msgid "Call"
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:231
+#: ../lib/engine/components/opal/sip-endpoint.cpp:235 ../src/gui/main.cpp:2952
+msgid "Transfer"
 msgstr ""
 
-#: ../src/endpoints/h323-endpoint.cpp:314
+#. Translators : The alias we are registering already exists : failure
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
 msgid "Duplicate alias"
 msgstr ""
 
-#: ../src/endpoints/h323-endpoint.cpp:317
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
 msgid "Bad username/password"
 msgstr ""
 
-#: ../src/endpoints/h323-endpoint.cpp:320
-#: ../src/endpoints/sip-endpoint.cpp:903
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:911
 msgid "Transport error"
 msgstr ""
 
-#: ../src/endpoints/h323-endpoint.cpp:331
-#: ../src/endpoints/h323-endpoint.cpp:336
-#: ../src/endpoints/sip-endpoint.cpp:910
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:918
 msgid "Failed"
-msgstr "Teipthe"
-
-#: ../src/endpoints/manager.cpp:101
-msgid ""
-"Ekiga did not manage to configure your network settings automatically. You "
-"can still use it, but you need to configure your network settings manually.\n"
-"\n"
-"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
-"for instructions"
-msgstr ""
+msgstr "Theip"
 
-#: ../src/endpoints/opal-account.cpp:302
+#: ../lib/engine/components/opal/opal-account.cpp:303
 msgid "_Disable"
 msgstr "_Díchumasaigh"
 
-#: ../src/endpoints/opal-account.cpp:305
+#: ../lib/engine/components/opal/opal-account.cpp:306
 msgid "_Enable"
-msgstr ""
+msgstr "_Cumasaigh"
 
-#: ../src/endpoints/opal-account.cpp:326 ../src/gui/assistant.cpp:664
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
 msgid "Recharge the account"
 msgstr ""
 
-#: ../src/endpoints/opal-account.cpp:331 ../src/gui/assistant.cpp:676
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
 msgid "Consult the balance history"
 msgstr ""
 
-#: ../src/endpoints/opal-account.cpp:336
+#: ../lib/engine/components/opal/opal-account.cpp:337
 msgid "Consult the call history"
 msgstr ""
 
-#: ../src/endpoints/opal-account.cpp:351 ../src/endpoints/opal-bank.cpp:74
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
 msgid "Edit account"
-msgstr ""
+msgstr "Cuir Cuntas in Eagar"
 
-#: ../src/endpoints/opal-account.cpp:357 ../src/endpoints/opal-bank.cpp:112
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
 msgid "Registrar:"
-msgstr ""
+msgstr "Cláraitheoir:"
 
-#: ../src/endpoints/opal-account.cpp:359 ../src/endpoints/opal-bank.cpp:102
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
 msgid "Gatekeeper:"
-msgstr ""
+msgstr "Geatóir:"
 
-#: ../src/endpoints/opal-account.cpp:360 ../src/endpoints/opal-bank.cpp:83
-#: ../src/endpoints/opal-bank.cpp:103 ../src/endpoints/opal-bank.cpp:113
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:174
 msgid "User:"
-msgstr ""
+msgstr "Úsáideoir:"
 
-#: ../src/endpoints/opal-account.cpp:362 ../src/endpoints/opal-bank.cpp:114
+#. Translators:
+#. * SIP knows two usernames: The name for the client ("User") and the name
+#. * for the authentication procedure ("Authentication User")
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
 msgid "Authentication User:"
-msgstr ""
+msgstr "Úsáideoir fíordheimhnithe:"
 
-#: ../src/endpoints/opal-account.cpp:363 ../src/endpoints/opal-bank.cpp:85
-#: ../src/endpoints/opal-bank.cpp:105 ../src/endpoints/opal-bank.cpp:115
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:173
 msgid "Password:"
-msgstr ""
+msgstr "Focal faire:"
 
-#: ../src/endpoints/opal-account.cpp:364 ../src/endpoints/opal-bank.cpp:106
-#: ../src/endpoints/opal-bank.cpp:116
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
 msgid "Timeout:"
-msgstr ""
+msgstr "Teorainn ama:"
 
-#: ../src/endpoints/opal-account.cpp:365 ../src/endpoints/opal-bank.cpp:119
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
 msgid "Enable Account"
-msgstr ""
+msgstr "Cumasaigh cuntas"
 
-#: ../src/endpoints/opal-account.cpp:400 ../src/endpoints/opal-bank.cpp:155
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
 msgid "You did not supply a name for that account."
 msgstr ""
 
-#: ../src/endpoints/opal-account.cpp:402 ../src/endpoints/opal-bank.cpp:157
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
 msgid "You did not supply a host to register to."
 msgstr ""
 
-#: ../src/endpoints/opal-account.cpp:404 ../src/endpoints/opal-bank.cpp:159
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
 msgid "You did not supply a user name for that account."
 msgstr ""
 
-#: ../src/endpoints/opal-account.cpp:406 ../src/endpoints/opal-bank.cpp:161
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
 msgid "The timeout should have a bigger value."
 msgstr ""
 
-#: ../src/endpoints/opal-bank.cpp:55
+#: ../lib/engine/components/opal/opal-bank.cpp:75
 msgid "_Add an Ekiga.net Account"
-msgstr ""
+msgstr "Cuir Cuntas Ekiga.net _Leis"
 
-#: ../src/endpoints/opal-bank.cpp:57
+#: ../lib/engine/components/opal/opal-bank.cpp:77
 msgid "_Add an Ekiga Call Out Account"
-msgstr ""
+msgstr "Cuir Cuntas \"_Glaoigh Amach\" Ekiga Leis"
 
-#: ../src/endpoints/opal-bank.cpp:59
+#: ../lib/engine/components/opal/opal-bank.cpp:79
 msgid "_Add a SIP Account"
-msgstr ""
+msgstr "Cuir Cuntas _SIP Leis"
 
-#: ../src/endpoints/opal-bank.cpp:61
+#: ../lib/engine/components/opal/opal-bank.cpp:81
 msgid "_Add an H.323 Account"
-msgstr ""
+msgstr "Cuir Cuntas _H.323 Leis"
 
-#: ../src/endpoints/opal-bank.cpp:75
+#: ../lib/engine/components/opal/opal-bank.cpp:96
 msgid "Please update the following fields."
-msgstr ""
+msgstr "Nuashonraigh na réimsí a leanas le do thoil."
 
-#: ../src/endpoints/opal-bank.cpp:80 ../src/gui/assistant.cpp:540
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
 msgid "Get an Ekiga.net SIP account"
 msgstr ""
 
-#: ../src/endpoints/opal-bank.cpp:90 ../src/gui/assistant.cpp:652
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
 msgid "Get an Ekiga Call Out account"
 msgstr ""
 
-#: ../src/endpoints/opal-bank.cpp:94
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2706
+#: ../src/gui/main.cpp:2801
 msgid "Account ID:"
 msgstr ""
 
-#: ../src/endpoints/opal-bank.cpp:96
+#: ../lib/engine/components/opal/opal-bank.cpp:117
 msgid "PIN Code:"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:393
+#: ../lib/engine/components/opal/opal-call.cpp:404
 msgid "Local user cleared the call"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:396 ../src/endpoints/opal-call.cpp:399
+#: ../lib/engine/components/opal/opal-call.cpp:407
+#: ../lib/engine/components/opal/opal-call.cpp:410
 msgid "Local user rejected the call"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:402
+#: ../lib/engine/components/opal/opal-call.cpp:413
 msgid "Remote user cleared the call"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:405
+#: ../lib/engine/components/opal/opal-call.cpp:416
 msgid "Remote user rejected the call"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:408
+#: ../lib/engine/components/opal/opal-call.cpp:419
 msgid "Remote user has stopped calling"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:411
+#: ../lib/engine/components/opal/opal-call.cpp:422
 msgid "Abnormal call termination"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:414 ../src/gui/main.cpp:1553
+#: ../lib/engine/components/opal/opal-call.cpp:425 ../src/gui/main.cpp:1496
 msgid "Could not connect to remote host"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:417
+#: ../lib/engine/components/opal/opal-call.cpp:428
 msgid "The Gatekeeper cleared the call"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:420
+#: ../lib/engine/components/opal/opal-call.cpp:431
 msgid "User not found"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:423
+#: ../lib/engine/components/opal/opal-call.cpp:434
 msgid "Insufficient bandwidth"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:426
+#: ../lib/engine/components/opal/opal-call.cpp:437
 msgid "No common codec"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:429
+#: ../lib/engine/components/opal/opal-call.cpp:440
 msgid "Call forwarded"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:432
+#: ../lib/engine/components/opal/opal-call.cpp:443
 msgid "Security check failed"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:435
+#: ../lib/engine/components/opal/opal-call.cpp:446
 msgid "Local user is busy"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:438 ../src/endpoints/opal-call.cpp:444
+#: ../lib/engine/components/opal/opal-call.cpp:449
+#: ../lib/engine/components/opal/opal-call.cpp:455
 msgid "Congested link to remote party"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:441
+#: ../lib/engine/components/opal/opal-call.cpp:452
 msgid "Remote user is busy"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:447
+#: ../lib/engine/components/opal/opal-call.cpp:458
 msgid "Remote host is offline"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:453
+#: ../lib/engine/components/opal/opal-call.cpp:464
 msgid "User is not available"
 msgstr ""
 
-#: ../src/endpoints/opal-call.cpp:465
+#: ../lib/engine/components/opal/opal-call.cpp:476
 msgid "Call completed"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:274 ../src/endpoints/sip-endpoint.cpp:278
-#: ../src/gui/main.cpp:3652
-msgid "Transfer"
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
+msgid ""
+"Ekiga did not manage to configure your network settings automatically. You "
+"can still use it, but you need to configure your network settings manually.\n"
+"\n"
+"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"for instructions"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:298 ../src/endpoints/sip-endpoint.cpp:300
+#: ../lib/engine/components/opal/sip-endpoint.cpp:255
+#: ../lib/engine/components/opal/sip-endpoint.cpp:257
 msgid "Message"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:718
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
 msgid "Bad request"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:722
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
 msgid "Payment required"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:726
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
 msgid "Unauthorized"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:730
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
 msgid "Forbidden"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:734
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
 msgid "Timeout"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:738
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
 msgid "Conflict"
 msgstr "Coinbhleacht"
 
-#: ../src/endpoints/sip-endpoint.cpp:742
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
 msgid "Temporarily unavailable"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:746
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
 msgid "Not acceptable"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:750
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
 msgid "Illegal status code"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:754
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
 msgid "Multiple choices"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:758
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
 msgid "Moved permanently"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:762
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
 msgid "Moved temporarily"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:766
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
 msgid "Use proxy"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:770
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
 msgid "Alternative service"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:774
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
 msgid "Not found"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:778
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
 msgid "Method not allowed"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:782
-msgid "Proxy auth. required"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
+msgid "Proxy authentication required"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:786
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
 msgid "Length required"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:790
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
 msgid "Request entity too big"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:794
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
 msgid "Request URI too long"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:798
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
 msgid "Unsupported media type"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:802
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
 msgid "Unsupported URI scheme"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:806
+#. Translators : The extension we are trying to register does not exist
+#: ../lib/engine/components/opal/sip-endpoint.cpp:814
 msgid "Bad extension"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:810
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
 msgid "Extension required"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:814
+#: ../lib/engine/components/opal/sip-endpoint.cpp:822
 msgid "Interval too brief"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:818
+#: ../lib/engine/components/opal/sip-endpoint.cpp:826
 msgid "Loop detected"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:822
+#: ../lib/engine/components/opal/sip-endpoint.cpp:830
 msgid "Too many hops"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:826
+#: ../lib/engine/components/opal/sip-endpoint.cpp:834
 msgid "Address incomplete"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:830
+#: ../lib/engine/components/opal/sip-endpoint.cpp:838
 msgid "Ambiguous"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:834
+#: ../lib/engine/components/opal/sip-endpoint.cpp:842
 msgid "Busy Here"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:838
+#: ../lib/engine/components/opal/sip-endpoint.cpp:846
 msgid "Request terminated"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:842
+#: ../lib/engine/components/opal/sip-endpoint.cpp:850
 msgid "Not acceptable here"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:846
+#: ../lib/engine/components/opal/sip-endpoint.cpp:854
 msgid "Bad event"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:850
+#: ../lib/engine/components/opal/sip-endpoint.cpp:858
 msgid "Request pending"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:854
+#: ../lib/engine/components/opal/sip-endpoint.cpp:862
 msgid "Undecipherable"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:858
+#: ../lib/engine/components/opal/sip-endpoint.cpp:866
 msgid "Internal server error"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:862
+#: ../lib/engine/components/opal/sip-endpoint.cpp:870
 msgid "Not implemented"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:866
+#: ../lib/engine/components/opal/sip-endpoint.cpp:874
 msgid "Bad gateway"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:870
+#: ../lib/engine/components/opal/sip-endpoint.cpp:878
 msgid "Service unavailable"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:874
+#: ../lib/engine/components/opal/sip-endpoint.cpp:882
 msgid "Server timeout"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:878
+#: ../lib/engine/components/opal/sip-endpoint.cpp:886
 msgid "SIP version not supported"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:882
+#: ../lib/engine/components/opal/sip-endpoint.cpp:890
 msgid "Message too large"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:886
+#: ../lib/engine/components/opal/sip-endpoint.cpp:894
 msgid "Busy everywhere"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:890
+#: ../lib/engine/components/opal/sip-endpoint.cpp:898
 msgid "Decline"
 msgstr "Diúltaigh"
 
-#: ../src/endpoints/sip-endpoint.cpp:894
+#: ../lib/engine/components/opal/sip-endpoint.cpp:902
 msgid "Does not exist anymore"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:898
+#: ../lib/engine/components/opal/sip-endpoint.cpp:906
 msgid "Globally not acceptable"
 msgstr ""
 
-#: ../src/endpoints/sip-endpoint.cpp:1010
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1043
 msgid "Could not send message"
 msgstr ""
 
-#: ../src/gui/accounts.cpp:165
-msgid "Registered"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1165
+#, c-format
+msgid "Incoming call from %s"
 msgstr ""
 
-#: ../src/gui/accounts.cpp:169
-msgid "Unregistered"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1167
+#, c-format
+msgid "Incoming call"
 msgstr ""
 
-#: ../src/gui/accounts.cpp:173
-msgid "Could not unregister"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1173
+#, c-format
+msgid "In a call with %s"
 msgstr ""
 
-#: ../src/gui/accounts.cpp:179
-msgid "Could not register"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1175
+#, c-format
+msgid "In a call"
 msgstr ""
 
-#: ../src/gui/accounts.cpp:185
-msgid "Processing..."
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:102
+msgid "New resource list"
 msgstr ""
 
-#: ../src/gui/accounts.cpp:531
-msgid "Account Name"
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:166
+msgid "Add new resource-list"
 msgstr ""
 
-#: ../src/gui/accounts.cpp:532
-msgid "Voice Mails"
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:167
+msgid ""
+"Please fill in this form to add a new contact list to ekiga's remote roster"
 msgstr ""
 
-#: ../src/gui/accounts.cpp:533
-msgid "Status"
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:171
+msgid "Writable:"
+msgstr "Inscríofa:"
 
-#: ../src/gui/accounts.cpp:544 ../src/gui/accounts.cpp:582
-msgid "Accounts"
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:172
+msgid "Username:"
+msgstr "Ainm úsáideora:"
 
-#: ../src/gui/accounts.cpp:559
-msgid "Account"
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
+#: ../lib/engine/components/resource-list/rl-heap.cpp:178
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
+msgid "Unnamed"
+msgstr "Gan ainm"
 
-#: ../src/gui/accounts.cpp:585 ../src/gui/preferences.cpp:508
-msgid "A"
-msgstr "G"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:200
+msgid "_Add a new contact"
+msgstr "Cuir teagmháil nua _leis"
 
-#: ../src/gui/assistant.cpp:258
-msgid ""
-"This is the Ekiga general configuration assistant. The following steps will "
-"set up Ekiga by asking a few simple questions.\n"
-"\n"
-"Once you have completed these steps, you can always change them later by "
-"selecting Preferences in the Edit menu."
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-heap.cpp:202
+msgid "_Refresh contact list"
+msgstr "_Athnuaigh liosta teagmhálacha"
 
-#: ../src/gui/assistant.cpp:266
-msgid "Welcome in Ekiga"
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-heap.cpp:204
+msgid "Contact list _properties"
+msgstr "Airíonna an liosta teagmhálacha"
 
-#: ../src/gui/assistant.cpp:300 ../src/gui/preferences.cpp:381
-msgid "Personal Information"
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
+msgid "Edit contact list properties"
+msgstr "Cuir airíonna an liosta teagmhálacha in eagar"
 
-#. The user fields
-#: ../src/gui/assistant.cpp:303
-msgid "Please enter your first name and your surname:"
-msgstr "Iontráil d'ainm baiste agus do shloinne le do thoil:"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
+msgid "Please edit the following fields (no identifier means global)"
+msgstr ""
 
-#: ../src/gui/assistant.cpp:312
-msgid ""
-"Your first name and surname will be used when connecting to other VoIP and "
-"videoconferencing software."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+msgid "Contact list's name"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:503
-msgid "Ekiga.net Account"
+#. "Document" used as a name -- uri point to the root of a document tree
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
+msgid "Document root"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:505
-msgid "Please enter your username:"
-msgstr "Iontráil d'ainm úsáideora le do thoil:"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+msgid "Identifier"
+msgstr ""
 
-#: ../src/gui/assistant.cpp:513
-msgid "Please enter your password:"
-msgstr "Iontráil d'fhocal faire le do thoil:"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
+msgid "Writable"
+msgstr "Inscríofa"
 
-#: ../src/gui/assistant.cpp:523
-msgid ""
-"The username and password are used to login to your existing account at the "
-"ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
-"you may first create an account below. This will provide a SIP address that "
-"allows people to call you.\n"
-"\n"
-"You may skip this step if you use an alternative SIP service, or if you "
-"would prefer to specify the login details later."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+msgid "Server username"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:550
-msgid "I do not want to sign up for the ekiga.net free service"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+msgid "Server password"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:617
-msgid "Ekiga Call Out Account"
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
+msgid "Add a remote contact"
+msgstr "Cuir cianteagmháil leis"
 
-#: ../src/gui/assistant.cpp:619
-msgid "Please enter your account ID:"
-msgstr "Iontráil CA do chuntais le do thoil:"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
+msgid "Please fill in this form to create a new contact on a remote server"
+msgstr ""
 
-#: ../src/gui/assistant.cpp:627
-msgid "Please enter your PIN code:"
-msgstr "Iontráil do chód PIN le do thoil:"
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+msgid "Edit remote contact"
+msgstr "Cuir cianteagmháil in eagar"
 
-#: ../src/gui/assistant.cpp:638
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
 msgid ""
-"You can make calls to regular phones and cell numbers worldwide using "
-"Ekiga.\n"
-"\n"
-"To enable this, you need to do three things:\n"
-"- First buy an account at the URL below.\n"
-"- Then enter your account ID and PIN code.\n"
-"The service will work only if your account is created using the URL in this "
-"dialog.\n"
+"Please fill in this form to change an existing contact on a remote server"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:688
-msgid "Consult the calls history"
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
+msgid "Invalid server data"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:698
-msgid "I do not want to sign up for the Ekiga Call Out service"
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
+msgid "Click to fetch"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:767 ../src/gui/assistant.cpp:1264
-msgid "Connection Type"
-msgstr "Cineál an Naisc"
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
+msgid "Distant contact"
+msgstr "Cianteagmháil"
 
-#. The connection type
-#: ../src/gui/assistant.cpp:770
-msgid "Please choose your connection type:"
-msgstr ""
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
+#, c-format
+msgid "%s / List #%d"
+msgstr "%s / Liosta #%d"
 
-#: ../src/gui/assistant.cpp:787
-msgid "56k Modem"
-msgstr "Móideim 56k"
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
+#, c-format
+msgid "List #%d"
+msgstr "Liosta #%d"
 
-#: ../src/gui/assistant.cpp:792
-msgid "ISDN"
-msgstr "ISDN"
+#: ../lib/engine/gui/gtk-core/form-dialog-gtk.cpp:660
+msgid "Advanced"
+msgstr "Casta"
 
-#: ../src/gui/assistant.cpp:797
-msgid "DSL/Cable (128 kbit/s uplink)"
-msgstr ""
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:659
+msgid "Address Book"
+msgstr "Leabhar Seoltaí"
 
-#: ../src/gui/assistant.cpp:802
-msgid "DSL/Cable (512 kbit/s uplink)"
-msgstr ""
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
+#: ../src/gui/main.cpp:3127
+msgid "Address _Book"
+msgstr "_Leabhar Seoltaí"
 
-#: ../src/gui/assistant.cpp:807
-msgid "LAN"
-msgstr "LAN"
+#. This will add static and dynamic actions
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:684
+msgid "_Action"
+msgstr "_Gníomh"
 
-#: ../src/gui/assistant.cpp:812
-msgid "Keep current settings"
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:729
+msgid "Category"
+msgstr "Catagóir"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
+#: ../src/gui/assistant.cpp:1368
+msgid "Full Name"
+msgstr "Ainm Iomlán"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:601
+msgid "_Search Filter:"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:817
-msgid ""
-"The connection type will permit determining the best quality settings that "
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:247
+msgid "says:"
+msgstr "a deir:"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:370
+msgid "Open link in browser"
+msgstr ""
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:376
+msgid "Copy link"
+msgstr ""
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
+msgid "_Smile..."
+msgstr ""
+
+#. we can't do much here since we get the Chat as reference...
+#: ../lib/engine/gui/gtk-frontend/chat-window.cpp:432
+msgid "Chat Window"
+msgstr ""
+
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:989
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1024
+msgid "Unsorted"
+msgstr ""
+
+#: ../lib/gui/codecsbox.cpp:478
+msgid "Move selected codec priority upwards"
+msgstr ""
+
+#: ../lib/gui/codecsbox.cpp:488
+msgid "Move selected codec priority downwards"
+msgstr ""
+
+#: ../lib/gui/gmdialog.c:462
+msgid "Do not show this dialog again"
+msgstr ""
+
+#: ../src/gui/accounts.cpp:230
+msgid "Registered"
+msgstr ""
+
+#: ../src/gui/accounts.cpp:234
+msgid "Unregistered"
+msgstr ""
+
+#: ../src/gui/accounts.cpp:238
+msgid "Could not unregister"
+msgstr ""
+
+#: ../src/gui/accounts.cpp:244
+msgid "Could not register"
+msgstr ""
+
+#: ../src/gui/accounts.cpp:250
+msgid "Processing..."
+msgstr ""
+
+#: ../src/gui/accounts.cpp:636
+msgid "Account Name"
+msgstr "Ainm Cuntais"
+
+#: ../src/gui/accounts.cpp:637
+msgid "Voice Mails"
+msgstr "Glórphoist"
+
+#: ../src/gui/accounts.cpp:638
+msgid "Status"
+msgstr "Stádas"
+
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
+msgid "Accounts"
+msgstr "Cuntais"
+
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3188
+msgid "_Accounts"
+msgstr "Cunt_ais"
+
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3271
+msgid "_Help"
+msgstr "Cab_hair"
+
+#. Translators:
+#. * The following string "A" means "activated" or "active". It's a column
+#. * description in the list of configured accounts, it shows if an account
+#. * is activated or not (a status the user can choose).
+#.
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
+msgid "A"
+msgstr "G"
+
+#: ../src/gui/assistant.cpp:321
+msgid ""
+"This is the Ekiga general configuration assistant. The following steps will "
+"set up Ekiga by asking a few simple questions.\n"
+"\n"
+"Once you have completed these steps, you can always change them later by "
+"selecting Preferences in the Edit menu."
+msgstr ""
+
+#: ../src/gui/assistant.cpp:329
+msgid "Welcome to Ekiga"
+msgstr "Fáilte go Ekiga"
+
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
+msgid "Personal Information"
+msgstr "Eolas Pearsanta\t"
+
+#. The user fields
+#: ../src/gui/assistant.cpp:356
+msgid "Please enter your first name and your surname:"
+msgstr "Iontráil d'ainm baiste agus do shloinne le do thoil:"
+
+#: ../src/gui/assistant.cpp:365
+msgid ""
+"Your first name and surname will be used when connecting to other VoIP and "
+"videoconferencing software."
+msgstr ""
+
+#: ../src/gui/assistant.cpp:559
+msgid "Ekiga.net Account"
+msgstr "Cuntas Ekiga.net"
+
+#: ../src/gui/assistant.cpp:561
+msgid "Please enter your username:"
+msgstr "Iontráil d'ainm úsáideora, le do thoil:"
+
+#: ../src/gui/assistant.cpp:569
+msgid "Please enter your password:"
+msgstr "Iontráil d'fhocal faire, le do thoil:"
+
+#: ../src/gui/assistant.cpp:579
+msgid ""
+"The username and password are used to login to your existing account at the "
+"ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
+"you may first create an account below. This will provide a SIP address that "
+"allows people to call you.\n"
+"\n"
+"You may skip this step if you use an alternative SIP service, or if you "
+"would prefer to specify the login details later."
+msgstr ""
+
+#: ../src/gui/assistant.cpp:606
+msgid "I do not want to sign up for the ekiga.net free service"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:669
+msgid "Ekiga Call Out Account"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:671
+msgid "Please enter your account ID:"
+msgstr "Iontráil CA do chuntais, le do thoil:"
+
+#: ../src/gui/assistant.cpp:679
+msgid "Please enter your PIN code:"
+msgstr "Iontráil do chód UAP, le do thoil:"
+
+#: ../src/gui/assistant.cpp:690
+msgid ""
+"You can make calls to regular phones and cell numbers worldwide using "
+"Ekiga.\n"
+"\n"
+"To enable this, you need to do two things:\n"
+"- First buy an account at the URL below.\n"
+"- Then enter your account ID and PIN code.\n"
+"The service will work only if your account is created using the URL in this "
+"dialog.\n"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:740
+msgid "Consult the calls history"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:750
+msgid "I do not want to sign up for the Ekiga Call Out service"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
+msgid "Connection Type"
+msgstr "Cineál Ceangail"
+
+#. The connection type
+#: ../src/gui/assistant.cpp:819
+msgid "Please choose your connection type:"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:836
+msgid "56k Modem"
+msgstr "Móideim 56k"
+
+#: ../src/gui/assistant.cpp:841
+msgid "ISDN"
+msgstr "ISDN"
+
+#: ../src/gui/assistant.cpp:846
+msgid "DSL/Cable (128 kbit/s uplink)"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:851
+msgid "DSL/Cable (512 kbit/s uplink)"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:856
+msgid "LAN"
+msgstr "LAN"
+
+#: ../src/gui/assistant.cpp:861
+msgid "Keep current settings"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:866
+msgid ""
+"The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
 "in the preferences window."
 msgstr ""
 
-#: ../src/gui/assistant.cpp:907 ../src/gui/main.cpp:3820
-#: ../src/gui/main.cpp:3824 ../src/gui/preferences.cpp:701
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3017
+#: ../src/gui/main.cpp:3021 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
-msgstr ""
+msgstr "Gléasanna Fuaime"
 
-#: ../src/gui/assistant.cpp:909
+#: ../src/gui/assistant.cpp:962
 msgid "Please choose the audio ringing device:"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:917
+#: ../src/gui/assistant.cpp:982
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
 msgstr ""
 
 #. ---
-#: ../src/gui/assistant.cpp:928
+#: ../src/gui/assistant.cpp:993
 msgid "Please choose the audio output device:"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:936
+#: ../src/gui/assistant.cpp:1013
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
 msgstr ""
 
 #. ---
-#: ../src/gui/assistant.cpp:947
+#: ../src/gui/assistant.cpp:1024
 msgid "Please choose the audio input device:"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:955
+#: ../src/gui/assistant.cpp:1044
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1047
+#: ../src/gui/assistant.cpp:1146
 msgid "Please choose your video input device:"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1055
+#: ../src/gui/assistant.cpp:1166
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1195
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
+#: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
+msgid "No device found"
+msgstr ""
+
+#: ../src/gui/assistant.cpp:1310
 msgid "Configuration Complete"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1197
+#: ../src/gui/assistant.cpp:1312
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1204
+#: ../src/gui/assistant.cpp:1319
 msgid "Configuration summary:"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1274
+#: ../src/gui/assistant.cpp:1389
 msgid "Audio Ringing Device"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1283
+#: ../src/gui/assistant.cpp:1398
 msgid "Audio Output Device"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1292
-#, fuzzy
+#: ../src/gui/assistant.cpp:1407
 msgid "Audio Input Device"
-msgstr "Plogála Fuaim"
+msgstr "Gléas Ionchurtha Fuaime"
 
-#: ../src/gui/assistant.cpp:1301
+#: ../src/gui/assistant.cpp:1416
 msgid "Video Input Device"
-msgstr ""
+msgstr "Gléas Ionchurtha Físe"
 
-#: ../src/gui/assistant.cpp:1314
+#: ../src/gui/assistant.cpp:1429
 msgid "SIP URI"
-msgstr ""
+msgstr "URI SIP"
 
-#: ../src/gui/assistant.cpp:1326
+#: ../src/gui/assistant.cpp:1441
 msgid "Ekiga Call Out"
 msgstr ""
 
-#: ../src/gui/assistant.cpp:1368
+#: ../src/gui/assistant.cpp:1485
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr ""
 
-#: ../src/gui/callbacks.cpp:130
+#: ../src/gui/callbacks.cpp:131
 msgid "Contributors:"
 msgstr ""
 
-#: ../src/gui/callbacks.cpp:140
+#: ../src/gui/callbacks.cpp:143
 msgid "Artwork:"
 msgstr ""
 
-#: ../src/gui/callbacks.cpp:147
+#: ../src/gui/callbacks.cpp:151
 msgid "See AUTHORS file for full credits"
 msgstr ""
 
-#: ../src/gui/callbacks.cpp:163
+#: ../src/gui/callbacks.cpp:167
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
 "Software Foundation; either version 2 of the License, or (at your option) "
 "any later version. "
 msgstr ""
+"Is bogearraí saor é an clár seo; is féidir leat é a athdháileadh nó a athrú "
+"faoi théarmaí an GNU General Public License mar foilsíodh é ag an Free "
+"Software Foundation; leagan 2 an License, nó (de do rogha) aon leagan níos "
+"déanaí."
 
-#: ../src/gui/callbacks.cpp:167
+#: ../src/gui/callbacks.cpp:171
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -1938,8 +2064,15 @@
 "License along with this program; if not, write to the Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Dáileadh an clár seo le súil go mbeidh sé úsáideach, ach GAN AON BHARÁNTA; "
+"gan an baránta intuigthe INDÍOLTÓIREACHTA nó OIRIÚNACHTA D'FHEIDHM ÁIRITHE "
+"fiú. Féach an GNU General Public License le haghaidh tuilleadh mionsonraí.\n"
+"\n"
+"Ba chóir go bhfuair tú cóip an GNU General Public License in éineacht leis "
+"an gclár seo; mura bhfuair tú é, scríobh chuig an Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA."
 
-#: ../src/gui/callbacks.cpp:174
+#: ../src/gui/callbacks.cpp:178
 msgid ""
 "Ekiga is licensed under the GPL license and as a special exception, you have "
 "permission to link or otherwise combine this program with the programs OPAL, "
@@ -1951,128 +2084,158 @@
 
 #. Translators: Please write translator credits here, and
 #. * separate names with \n
-#: ../src/gui/callbacks.cpp:186
+#: ../src/gui/callbacks.cpp:190
 msgid "translator-credits"
 msgstr ""
 "Paul Duffy <dubhthach@frink.nuigalway.ie>\n"
 "Alastair McKinstry <mckinstry@computer.org>\n"
 "Seán de Búrca <leftmostcat@gmail.com>"
 
-#: ../src/gui/callbacks.cpp:191
+#: ../src/gui/callbacks.cpp:195
 msgid ""
 "Ekiga is full-featured SIP and H.323 compatible VoIP, IP-Telephony and "
 "Videoconferencing application that allows you to make audio and video calls "
 "to remote users with SIP and H.323 hardware or software."
 msgstr ""
 
-#: ../src/gui/dialpad.cpp:59
-msgid "abc"
+#: ../src/gui/callbacks.cpp:269
+msgid "Help display is not supported by your GTK+ version"
 msgstr ""
 
-#: ../src/gui/dialpad.cpp:60
-msgid "def"
+#: ../src/gui/callbacks.cpp:277
+msgid "Unable to open help file."
 msgstr ""
 
-#: ../src/gui/dialpad.cpp:61
+#: ../src/gui/dialpad.cpp:55
+msgid "abc"
+msgstr "abc"
+
+#: ../src/gui/dialpad.cpp:56
+msgid "def"
+msgstr "def"
+
+#: ../src/gui/dialpad.cpp:57
 msgid "ghi"
-msgstr ""
+msgstr "ghi"
 
-#: ../src/gui/dialpad.cpp:62
+#: ../src/gui/dialpad.cpp:58
 msgid "jkl"
-msgstr ""
+msgstr "jkl"
 
-#: ../src/gui/dialpad.cpp:63
+#: ../src/gui/dialpad.cpp:59
 msgid "mno"
-msgstr ""
+msgstr "mno"
 
-#: ../src/gui/dialpad.cpp:64
+#: ../src/gui/dialpad.cpp:60
 msgid "pqrs"
-msgstr ""
+msgstr "pqrs"
 
-#: ../src/gui/dialpad.cpp:65
+#: ../src/gui/dialpad.cpp:61
 msgid "tuv"
-msgstr ""
+msgstr "tuv"
 
-#: ../src/gui/dialpad.cpp:66
+#: ../src/gui/dialpad.cpp:62
 msgid "wxyz"
-msgstr ""
+msgstr "wxyz"
 
 #. Translators: Is displayed once an account "%s" is registered.
-#: ../src/gui/main.cpp:582
+#: ../src/gui/main.cpp:521
 #, c-format
 msgid "Registered %s"
 msgstr ""
 
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:588
+#: ../src/gui/main.cpp:528
 #, c-format
 msgid "Unregistered %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:593
+#: ../src/gui/main.cpp:533
 #, c-format
 msgid "Could not unregister %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:597
+#: ../src/gui/main.cpp:537
 #, c-format
 msgid "Could not register %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:657
+#: ../src/gui/main.cpp:607
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr ""
 
-#: ../src/gui/main.cpp:732
+#: ../src/gui/main.cpp:653
 #, c-format
 msgid "Connected with %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:765 ../src/gui/main.cpp:2341
+#: ../src/gui/main.cpp:694 ../src/gui/main.cpp:3517
 msgid "Standby"
 msgstr "Fuireachas"
 
-#: ../src/gui/main.cpp:826
+#: ../src/gui/main.cpp:755
 msgid "Call on hold"
 msgstr ""
 
-#: ../src/gui/main.cpp:839
+#: ../src/gui/main.cpp:766
 msgid "Call retrieved"
 msgstr ""
 
-#: ../src/gui/main.cpp:858
+#: ../src/gui/main.cpp:782
 #, c-format
 msgid "Missed call from %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1005 ../src/gui/misc.cpp:94
+#: ../src/gui/main.cpp:919
 msgid "Error"
+msgstr "Earráid"
+
+#: ../src/gui/main.cpp:984
+msgid "Error while initializing video output"
+msgstr ""
+
+#: ../src/gui/main.cpp:985
+msgid "No video will be displayed during this call->"
+msgstr ""
+
+#: ../src/gui/main.cpp:995
+msgid ""
+"There was an error opening or initializing the video output. Please verify "
+"that no other application is using the accelerated video output."
 msgstr ""
 
-#: ../src/gui/main.cpp:1138
+#: ../src/gui/main.cpp:997
+msgid ""
+"There was an error opening or initializing the video output. Please verify "
+"that you are using a color depth of 24 or 32 bits per pixel."
+msgstr ""
+
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1110
 #, c-format
 msgid "Added video input device %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1155
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1122
 #, c-format
 msgid "Removed video input device %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1172
+#: ../src/gui/main.cpp:1139
 #, c-format
 msgid "Error while accessing video device %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1175
+#: ../src/gui/main.cpp:1142
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
 "plugin and \"Moving logo\" or \"Static picture\" as device."
 msgstr ""
 
-#: ../src/gui/main.cpp:1179
+#: ../src/gui/main.cpp:1146
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
@@ -2080,15 +2243,15 @@
 "driver is loaded."
 msgstr ""
 
-#: ../src/gui/main.cpp:1183
+#: ../src/gui/main.cpp:1150
 msgid "Your video driver doesn't support the requested video format."
 msgstr ""
 
-#: ../src/gui/main.cpp:1187
+#: ../src/gui/main.cpp:1154
 msgid "Could not open the chosen channel."
 msgstr ""
 
-#: ../src/gui/main.cpp:1191
+#: ../src/gui/main.cpp:1158
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2096,38 +2259,42 @@
 "Palette is supported."
 msgstr ""
 
-#: ../src/gui/main.cpp:1195
+#: ../src/gui/main.cpp:1162
 msgid "Error while setting the frame rate."
 msgstr ""
 
-#: ../src/gui/main.cpp:1199
+#: ../src/gui/main.cpp:1166
 msgid "Error while setting the frame size."
 msgstr ""
 
-#: ../src/gui/main.cpp:1204 ../src/gui/main.cpp:1313 ../src/gui/main.cpp:1433
+#: ../src/gui/main.cpp:1171 ../src/gui/main.cpp:1273 ../src/gui/main.cpp:1388
 msgid "Unknown error."
-msgstr ""
+msgstr "Earráid anaithnid."
 
-#: ../src/gui/main.cpp:1260
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1221
 #, c-format
 msgid "Added audio input device %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1280
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1238
 #, c-format
 msgid "Removed audio input device %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1297
+#: ../src/gui/main.cpp:1255
 #, c-format
 msgid "Error while opening audio input device %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1300
+#. Translators: This happens when there is an error with audio input:
+#. * Nothing ("silence") will be transmitted
+#: ../src/gui/main.cpp:1260
 msgid "Only silence will be transmitted."
 msgstr ""
 
-#: ../src/gui/main.cpp:1304
+#: ../src/gui/main.cpp:1264
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2135,7 +2302,7 @@
 "that the device is not busy."
 msgstr ""
 
-#: ../src/gui/main.cpp:1308
+#: ../src/gui/main.cpp:1268
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2143,26 +2310,26 @@
 "check your audio setup."
 msgstr ""
 
-#: ../src/gui/main.cpp:1378
+#: ../src/gui/main.cpp:1335
 #, c-format
 msgid "Added audio output device %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1396
+#: ../src/gui/main.cpp:1351
 #, c-format
 msgid "Removed audio output device %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1417
+#: ../src/gui/main.cpp:1372
 #, c-format
 msgid "Error while opening audio output device %s"
 msgstr ""
 
-#: ../src/gui/main.cpp:1420
+#: ../src/gui/main.cpp:1375
 msgid "No incoming sound will be played."
 msgstr ""
 
-#: ../src/gui/main.cpp:1424
+#: ../src/gui/main.cpp:1379
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2170,359 +2337,344 @@
 "that the device is not busy."
 msgstr ""
 
-#: ../src/gui/main.cpp:1428
+#: ../src/gui/main.cpp:1383
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
-"write data from this device. In case it is a pluggable device it may be "
+"write data to this device. In case it is a pluggable device it may be "
 "sufficient to reconnect it. If not, or if it still is not accessible, please "
 "check your audio setup."
 msgstr ""
 
-#: ../src/gui/main.cpp:1655
-msgid "Enter a URI on the left, and click this button to place a call"
+#: ../src/gui/main.cpp:1574
+msgid "Video Settings"
+msgstr "Socruithe Físe"
+
+#: ../src/gui/main.cpp:1601
+msgid "Adjust brightness"
+msgstr ""
+
+#: ../src/gui/main.cpp:1622
+msgid "Adjust whiteness"
+msgstr ""
+
+#: ../src/gui/main.cpp:1643
+msgid "Adjust color"
+msgstr ""
+
+#: ../src/gui/main.cpp:1664
+msgid "Adjust contrast"
+msgstr ""
+
+#: ../src/gui/main.cpp:1710
+msgid "Audio Settings"
+msgstr "Socruithe Fuaime"
+
+#: ../src/gui/main.cpp:2321
+msgid "_Retrieve Call"
+msgstr ""
+
+#: ../src/gui/main.cpp:2334
+msgid "_Hold Call"
+msgstr ""
+
+#: ../src/gui/main.cpp:2366 ../src/gui/main.cpp:3154
+msgid "Suspend _Audio"
+msgstr "Cuir F_uaim ar Fionraí"
+
+#: ../src/gui/main.cpp:2368 ../src/gui/main.cpp:3159
+msgid "Suspend _Video"
+msgstr "Cuir _Fís ar Fionraí"
+
+#: ../src/gui/main.cpp:2370
+msgid "Resume _Audio"
+msgstr "Atosaigh F_uaim"
+
+#: ../src/gui/main.cpp:2372
+msgid "Resume _Video"
+msgstr "Atosaigh _Fís"
+
+#: ../src/gui/main.cpp:2655 ../src/gui/main.cpp:2807
+msgid "Reject"
+msgstr "Diúltaigh"
+
+#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2806
+msgid "Accept"
+msgstr "Glac Leis"
+
+#: ../src/gui/main.cpp:2663 ../src/gui/main.cpp:2794
+msgid "Incoming call from"
+msgstr ""
+
+#: ../src/gui/main.cpp:2681 ../src/gui/main.cpp:2797
+msgid "Remote URI:"
+msgstr ""
+
+#: ../src/gui/main.cpp:2693 ../src/gui/main.cpp:2799
+msgid "Remote Application:"
+msgstr ""
+
+#: ../src/gui/main.cpp:2714
+#, c-format
+msgid "Call from %s"
+msgstr ""
+
+#: ../src/gui/main.cpp:2920
+#, c-format
+msgid "Call Duration: %s\n"
+msgstr ""
+
+#: ../src/gui/main.cpp:2951
+msgid "Transfer call to:"
+msgstr ""
+
+#: ../src/gui/main.cpp:3003
+msgid "No"
+msgstr "Níl"
+
+#: ../src/gui/main.cpp:3005
+msgid "Yes"
+msgstr "Tá"
+
+#: ../src/gui/main.cpp:3016
+msgid "Detected new audio input device:"
+msgstr ""
+
+#: ../src/gui/main.cpp:3020
+msgid "Detected new audio output device:"
+msgstr ""
+
+#: ../src/gui/main.cpp:3024
+msgid "Detected new video input device:"
+msgstr ""
+
+#: ../src/gui/main.cpp:3025 ../src/gui/preferences.cpp:921
+msgid "Video Devices"
+msgstr "Gléasanna Físe"
+
+#: ../src/gui/main.cpp:3043
+msgid "Do you want to use it as default device?"
 msgstr ""
 
-#: ../src/gui/main.cpp:1736
+#: ../src/gui/main.cpp:3111
 msgid "_Chat"
 msgstr "_Comhrá"
 
-#: ../src/gui/main.cpp:1738
+#: ../src/gui/main.cpp:3113
 msgid "Ca_ll"
-msgstr ""
+msgstr "_Glaoigh"
 
-#: ../src/gui/main.cpp:1738
+#: ../src/gui/main.cpp:3113
 msgid "Place a new call"
 msgstr ""
 
-#: ../src/gui/main.cpp:1741
+#: ../src/gui/main.cpp:3116
 msgid "_Hang up"
-msgstr ""
+msgstr "_Croch"
 
-#: ../src/gui/main.cpp:1742
+#: ../src/gui/main.cpp:3117
 msgid "Terminate the current call"
 msgstr ""
 
-#: ../src/gui/main.cpp:1748
+#: ../src/gui/main.cpp:3123
 msgid "A_dd Contact"
-msgstr "_Cuir Teagmháil Leis"
+msgstr "Cuir Teagmháil _Leis"
 
-#: ../src/gui/main.cpp:1748
+#: ../src/gui/main.cpp:3123
 msgid "Add a contact to the roster"
 msgstr ""
 
-#: ../src/gui/main.cpp:1753
+#: ../src/gui/main.cpp:3128
 msgid "Find contacts"
 msgstr "Aimsigh teagmhálacha"
 
-#: ../src/gui/main.cpp:1760
+#: ../src/gui/main.cpp:3135
 msgid "_Contact"
 msgstr "_Teagmháil"
 
-#: ../src/gui/main.cpp:1761
+#: ../src/gui/main.cpp:3136
 msgid "Act on selected contact"
 msgstr ""
 
-#: ../src/gui/main.cpp:1767
+#: ../src/gui/main.cpp:3142
 msgid "H_old Call"
-msgstr ""
+msgstr "C_oinnigh Glao"
 
-#: ../src/gui/main.cpp:1767 ../src/gui/main.cpp:2439
+#: ../src/gui/main.cpp:3142 ../src/gui/main.cpp:3611
 msgid "Hold the current call"
 msgstr ""
 
-#: ../src/gui/main.cpp:1771
+#: ../src/gui/main.cpp:3146
 msgid "_Transfer Call"
-msgstr ""
+msgstr "_Aistrigh Glao"
 
-#: ../src/gui/main.cpp:1772
+#: ../src/gui/main.cpp:3147
 msgid "Transfer the current call"
 msgstr ""
 
-#: ../src/gui/main.cpp:1779 ../src/gui/main.cpp:3204
-msgid "Suspend _Audio"
-msgstr ""
-
-#: ../src/gui/main.cpp:1780
+#: ../src/gui/main.cpp:3155
 msgid "Suspend or resume the audio transmission"
 msgstr ""
 
-#: ../src/gui/main.cpp:1784 ../src/gui/main.cpp:3206
-msgid "Suspend _Video"
-msgstr ""
-
-#: ../src/gui/main.cpp:1785
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the video transmission"
 msgstr ""
 
-#: ../src/gui/main.cpp:1792
+#: ../src/gui/main.cpp:3167
 msgid "Close the Ekiga window"
-msgstr "Dún an fuinneog Ekiga"
+msgstr "Dún an fhuinneog Ekiga"
 
-#: ../src/gui/main.cpp:1799 ../src/gui/statusicon.cpp:419
+#: ../src/gui/main.cpp:3174 ../src/gui/statusicon.cpp:414
 msgid "Quit"
 msgstr "Scoir"
 
-#: ../src/gui/main.cpp:1805
+#: ../src/gui/main.cpp:3180
 msgid "_Configuration Assistant"
-msgstr ""
+msgstr "_Cúntóir Cumraíochta"
 
-#: ../src/gui/main.cpp:1806
+#: ../src/gui/main.cpp:3181
 msgid "Run the configuration assistant"
 msgstr ""
 
-#: ../src/gui/main.cpp:1813
-msgid "_Accounts"
-msgstr ""
-
-#: ../src/gui/main.cpp:1814
+#: ../src/gui/main.cpp:3189
 msgid "Edit your accounts"
 msgstr ""
 
-#: ../src/gui/main.cpp:1820
+#: ../src/gui/main.cpp:3195
 msgid "Change your preferences"
 msgstr ""
 
-#: ../src/gui/main.cpp:1825
+#: ../src/gui/main.cpp:3200
 msgid "_View"
 msgstr "_Amharc"
 
-#: ../src/gui/main.cpp:1827
+#: ../src/gui/main.cpp:3202
 msgid "Con_tacts"
-msgstr "Teag_mhálacha"
+msgstr "_Teagmhálacha"
 
-#: ../src/gui/main.cpp:1827
+#: ../src/gui/main.cpp:3202
 msgid "View the contacts list"
 msgstr "Amharc ar an liosta teagmhálacha"
 
-#: ../src/gui/main.cpp:1832
+#: ../src/gui/main.cpp:3207
 msgid "_Dialpad"
-msgstr ""
+msgstr "Pillín _Diailithe"
 
-#: ../src/gui/main.cpp:1832
+#: ../src/gui/main.cpp:3207
 msgid "View the dialpad"
 msgstr ""
 
-#: ../src/gui/main.cpp:1837
+#: ../src/gui/main.cpp:3212
 msgid "_Call History"
-msgstr ""
+msgstr "_Stair Ghlaonna"
 
-#: ../src/gui/main.cpp:1837
+#: ../src/gui/main.cpp:3212
 msgid "View the call history"
 msgstr ""
 
-#: ../src/gui/main.cpp:1845
+#: ../src/gui/main.cpp:3220
 msgid "_Show Call Panel"
-msgstr ""
+msgstr "Taispeáin Pai_néal Glao"
 
-#: ../src/gui/main.cpp:1853
+#: ../src/gui/main.cpp:3228
 msgid "_Local Video"
-msgstr "Físeán _Logánta"
+msgstr "Físeán L_ogánta"
 
-#: ../src/gui/main.cpp:1854
+#: ../src/gui/main.cpp:3229
 msgid "Local video image"
 msgstr ""
 
-#: ../src/gui/main.cpp:1859
+#: ../src/gui/main.cpp:3234
 msgid "_Remote Video"
-msgstr ""
+msgstr "Físeán _Cianda"
 
-#: ../src/gui/main.cpp:1860
+#: ../src/gui/main.cpp:3235
 msgid "Remote video image"
 msgstr ""
 
-#: ../src/gui/main.cpp:1865
+#: ../src/gui/main.cpp:3240
 msgid "_Picture-in-Picture"
-msgstr ""
+msgstr "_Pictiúr-i-bPictiúr"
 
-#: ../src/gui/main.cpp:1866 ../src/gui/main.cpp:1872
+#: ../src/gui/main.cpp:3241 ../src/gui/main.cpp:3247
 msgid "Both video images"
 msgstr ""
 
-#: ../src/gui/main.cpp:1871
+#: ../src/gui/main.cpp:3246
 msgid "Picture-in-Picture in Separate _Window"
-msgstr ""
+msgstr "Pictiúr-i-bPictiúr i bh_Fuinneog ar Leith"
 
-#: ../src/gui/main.cpp:1879
+#: ../src/gui/main.cpp:3254
 msgid "Zoom in"
 msgstr "Súmáil isteach"
 
-#: ../src/gui/main.cpp:1883
+#: ../src/gui/main.cpp:3258
 msgid "Zoom out"
 msgstr "Súmáil amach"
 
-#: ../src/gui/main.cpp:1887
+#: ../src/gui/main.cpp:3262
 msgid "Normal size"
-msgstr ""
+msgstr "Gnáthmhéid"
 
-#: ../src/gui/main.cpp:1891
+#: ../src/gui/main.cpp:3266
 msgid "_Fullscreen"
-msgstr ""
+msgstr "_Lánscáileán"
 
-#: ../src/gui/main.cpp:1891
+#: ../src/gui/main.cpp:3266
 msgid "Switch to fullscreen"
-msgstr ""
-
-#: ../src/gui/main.cpp:1896
-msgid "_Help"
-msgstr "Cab_hair"
+msgstr "Athraigh go lánscáileán"
 
-#: ../src/gui/main.cpp:1899 ../src/gui/statusicon.cpp:396
-#: ../src/gui/statusicon.cpp:407
+#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:402
 msgid "Get help by reading the Ekiga manual"
 msgstr ""
 
-#: ../src/gui/main.cpp:1904 ../src/gui/statusicon.cpp:401
-#: ../src/gui/statusicon.cpp:412
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:407
 msgid "View information about Ekiga"
 msgstr "Amharc ar eolas faoi Ekiga"
 
-#: ../src/gui/main.cpp:1941
+#: ../src/gui/main.cpp:3353
+msgid ""
+"Enter a URI on the left, and click this button to place a call or to hangup"
+msgstr ""
+
+#: ../src/gui/main.cpp:3404
 msgid "Contacts"
 msgstr "Teagmhálacha"
 
-#: ../src/gui/main.cpp:1969
+#: ../src/gui/main.cpp:3427
 msgid "Dialpad"
-msgstr ""
-
-#: ../src/gui/main.cpp:2005
-msgid "Video Settings"
-msgstr ""
+msgstr "Pillín diailithe"
 
-#: ../src/gui/main.cpp:2032
-msgid "Adjust brightness"
-msgstr ""
-
-#: ../src/gui/main.cpp:2053
-msgid "Adjust whiteness"
-msgstr ""
-
-#: ../src/gui/main.cpp:2074
-msgid "Adjust color"
-msgstr ""
-
-#: ../src/gui/main.cpp:2095
-msgid "Adjust contrast"
-msgstr ""
-
-#: ../src/gui/main.cpp:2149
-msgid "Audio Settings"
-msgstr "Socruithe Fuaime"
+#: ../src/gui/main.cpp:3446
+msgid "Call history"
+msgstr "Stair ghlaonna"
 
-#: ../src/gui/main.cpp:2375
+#: ../src/gui/main.cpp:3549
 msgid "Change the volume of your soundcard"
 msgstr ""
 
-#: ../src/gui/main.cpp:2397
+#: ../src/gui/main.cpp:3569
 msgid "Change the color settings of your video device"
 msgstr ""
 
-#: ../src/gui/main.cpp:2419
-msgid "Display images from your camera device"
-msgstr ""
-
-#: ../src/gui/main.cpp:2470
-msgid "Call history"
-msgstr ""
-
-#: ../src/gui/main.cpp:3152
-msgid "_Retrieve Call"
-msgstr ""
-
-#: ../src/gui/main.cpp:3165
-msgid "_Hold Call"
-msgstr ""
-
-#: ../src/gui/main.cpp:3208
-msgid "Resume _Audio"
-msgstr ""
-
-#: ../src/gui/main.cpp:3210
-msgid "Resume _Video"
-msgstr ""
-
-#: ../src/gui/main.cpp:3614
-#, c-format
-msgid "Call Duration: %s\n"
-msgstr ""
-
-#: ../src/gui/main.cpp:3651
-msgid "Transfer call to:"
-msgstr ""
-
-#: ../src/gui/main.cpp:3716
-msgid "Reject"
-msgstr ""
-
-#: ../src/gui/main.cpp:3718
-msgid "Accept"
-msgstr ""
-
-#: ../src/gui/main.cpp:3725
-msgid "Incoming call from"
-msgstr ""
-
-#: ../src/gui/main.cpp:3744
-msgid "Remote URI:"
-msgstr ""
-
-#: ../src/gui/main.cpp:3756
-msgid "Remote Application:"
-msgstr ""
-
-#: ../src/gui/main.cpp:3764
-#, c-format
-msgid "Call from %s"
-msgstr ""
-
-#: ../src/gui/main.cpp:3806
-msgid "No"
-msgstr "Níl"
-
-#: ../src/gui/main.cpp:3808
-msgid "Yes"
-msgstr ""
-
-#: ../src/gui/main.cpp:3819
-msgid "Detected new audio input device:"
-msgstr ""
-
-#: ../src/gui/main.cpp:3823
-msgid "Detected new audio output device:"
-msgstr ""
-
-#: ../src/gui/main.cpp:3827
-msgid "Detected new video input device:"
-msgstr ""
-
-#: ../src/gui/main.cpp:3828 ../src/gui/preferences.cpp:859
-msgid "Video Devices"
-msgstr ""
-
-#: ../src/gui/main.cpp:3846
-msgid "Do you want to use it as default device?"
-msgstr ""
-
-#. Add title
-#: ../src/gui/main.cpp:3904 ../src/gui/main.cpp:4009
+#: ../src/gui/main.cpp:3680
 msgid "Ekiga"
 msgstr "Ekiga"
 
-#: ../src/gui/main.cpp:4198
-#, c-format
-msgid "Missed calls: %d - Voice Mails: %d"
-msgstr ""
-
-#: ../src/gui/main.cpp:4356
+#. Translators:
+#. * TX is a common abbreviation for "transmit"
+#: ../src/gui/main.cpp:4287
 #, c-format
 msgid "TX: %dx%d "
-msgstr ""
+msgstr "TC: %dx%d "
 
-#: ../src/gui/main.cpp:4359
+#. Translators:
+#. * RX is a common abbreviation for "receive"
+#: ../src/gui/main.cpp:4292
 #, c-format
 msgid "RX: %dx%d "
-msgstr ""
+msgstr "GC: %dx%d "
 
-#: ../src/gui/main.cpp:4361
+#: ../src/gui/main.cpp:4294
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2531,197 +2683,184 @@
 "Jitter buffer: %d ms%s%s%s"
 msgstr ""
 
-#: ../src/gui/main.cpp:4507
+#: ../src/gui/main.cpp:4415
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr ""
 
-#: ../src/gui/main.cpp:4512
+#: ../src/gui/main.cpp:4420
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr ""
 
-#: ../src/gui/main.cpp:4517
+#: ../src/gui/main.cpp:4425
 msgid "Makes Ekiga call the given URI"
 msgstr ""
 
-#: ../src/gui/main.cpp:4626
+#: ../src/gui/main.cpp:4544
 msgid "No usable audio plugin detected"
 msgstr ""
 
-#: ../src/gui/main.cpp:4627
+#: ../src/gui/main.cpp:4545
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
 msgstr ""
 
-#: ../src/gui/main.cpp:4630
+#: ../src/gui/main.cpp:4548
 msgid "No usable audio codecs detected"
 msgstr ""
 
-#: ../src/gui/main.cpp:4631
+#: ../src/gui/main.cpp:4549
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
 msgstr ""
 
-#: ../src/gui/main.cpp:4637
-msgid "Configuration database corruption"
+#: ../src/gui/preferences.cpp:381
+msgid "Play sound for new voice mails"
 msgstr ""
 
-#: ../src/gui/main.cpp:4638
-#, c-format
-msgid ""
-"Ekiga got an invalid value for the configuration key %s.\n"
-"\n"
-"It probably means that your configuration schemas have not been correctly "
-"installed or that the permissions are not correct.\n"
-"\n"
-"Please check the FAQ (http://www.ekiga.org/), the troubleshooting section of "
-"the GConf site (http://www.gnome.org/projects/gconf/) or the mailing list "
-"archives for more information (http://mail.gnome.org) about this problem."
+#: ../src/gui/preferences.cpp:391
+msgid "Play sound for new instant messages"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:384
+#: ../src/gui/preferences.cpp:457
 msgid "_Full name:"
 msgstr "Ainm _iomlán:"
 
-#. Add the update button
-#: ../src/gui/preferences.cpp:391
-msgid "_Apply"
-msgstr ""
-
-#: ../src/gui/preferences.cpp:391
-msgid ""
-"Click here to update the users directory you are registered to with the new "
-"First Name, Last Name, E-Mail, Comment and Location"
-msgstr ""
-
-#: ../src/gui/preferences.cpp:405
+#: ../src/gui/preferences.cpp:475
 msgid "User Interface"
-msgstr ""
+msgstr "Comhéadan Úsáideora"
 
-#: ../src/gui/preferences.cpp:407
+#: ../src/gui/preferences.cpp:477
 msgid "Start _hidden"
-msgstr ""
+msgstr "Tosaigh _folaithe"
 
-#: ../src/gui/preferences.cpp:409
+#: ../src/gui/preferences.cpp:479
 msgid "Show offline _contacts"
-msgstr ""
+msgstr "Taispeáin _teagmhálacha as líne"
 
-#: ../src/gui/preferences.cpp:414
+#: ../src/gui/preferences.cpp:484
 msgid "Video Display"
-msgstr ""
+msgstr "Taispeáint Fhíse"
 
-#: ../src/gui/preferences.cpp:416
+#: ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video _above other windows"
-msgstr ""
+msgstr "Cuir fuinneoga a thaispeánann fís _os cionn fuinneog eile"
+
+#: ../src/gui/preferences.cpp:490
+msgid "Network Settings"
+msgstr "Socruithe Líonra"
 
-#: ../src/gui/preferences.cpp:426
+#: ../src/gui/preferences.cpp:492
+msgid "Disable network _detection"
+msgstr "Díchumasaigh _aimsiú líonra"
+
+#: ../src/gui/preferences.cpp:503
 msgid "Call Forwarding"
-msgstr ""
+msgstr "Cur ar Aghaidh Glaonna"
 
-#: ../src/gui/preferences.cpp:428
+#: ../src/gui/preferences.cpp:505
 msgid "_Always forward calls to the given host"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:428
+#: ../src/gui/preferences.cpp:505
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:430
+#: ../src/gui/preferences.cpp:507
 msgid "Forward calls to the given host if _no answer"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:430
+#: ../src/gui/preferences.cpp:507
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you do not answer the call"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:432
+#: ../src/gui/preferences.cpp:509
 msgid "Forward calls to the given host if _busy"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:432
+#: ../src/gui/preferences.cpp:509
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you already are in a call or if you "
 "are in Do Not Disturb mode"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:436 ../src/gui/preferences.cpp:1469
+#: ../src/gui/preferences.cpp:513 ../src/gui/preferences.cpp:1361
 msgid "Call Options"
-msgstr ""
+msgstr "Roghanna Glao"
 
 #. Add all the fields
-#: ../src/gui/preferences.cpp:439
+#: ../src/gui/preferences.cpp:516
 msgid "Timeout to reject or forward unanswered incoming calls (in seconds):"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:471
+#: ../src/gui/preferences.cpp:548
 msgid "Ekiga Sound Events"
-msgstr ""
+msgstr "Teagmhais Fuaime Ekiga"
 
-#: ../src/gui/preferences.cpp:520 ../src/gui/preferences.cpp:529
-#: ../src/gui/preferences.cpp:538
+#: ../src/gui/preferences.cpp:598
 msgid "Event"
-msgstr ""
+msgstr "Teagmhas"
 
-#: ../src/gui/preferences.cpp:550
+#: ../src/gui/preferences.cpp:610
 msgid "Choose a sound"
-msgstr ""
+msgstr "Roghnaigh fuaim"
 
-#: ../src/gui/preferences.cpp:556
+#: ../src/gui/preferences.cpp:615
 msgid "Wavefiles"
-msgstr ""
+msgstr "Comhaid Wave"
 
-#: ../src/gui/preferences.cpp:565 ../src/gui/preferences.cpp:584
+#: ../src/gui/preferences.cpp:624 ../src/gui/preferences.cpp:643
 msgid "Play"
-msgstr ""
+msgstr "Seinn"
 
-#: ../src/gui/preferences.cpp:605
+#: ../src/gui/preferences.cpp:664
 msgid "String"
-msgstr ""
+msgstr "Teaghrán"
 
-#: ../src/gui/preferences.cpp:606
+#: ../src/gui/preferences.cpp:665
 msgid "Tone"
 msgstr "Ton"
 
-#: ../src/gui/preferences.cpp:607 ../src/gui/preferences.cpp:656
+#: ../src/gui/preferences.cpp:666 ../src/gui/preferences.cpp:715
 msgid "RFC2833"
-msgstr ""
+msgstr "RFC2833"
 
-#: ../src/gui/preferences.cpp:608
+#: ../src/gui/preferences.cpp:667
 msgid "Q.931"
-msgstr ""
+msgstr "Q.931"
 
-#: ../src/gui/preferences.cpp:614 ../src/gui/preferences.cpp:666
+#: ../src/gui/preferences.cpp:673 ../src/gui/preferences.cpp:725
 msgid "Misc Settings"
-msgstr ""
+msgstr "Socruithe Éagsúla"
 
-#: ../src/gui/preferences.cpp:617 ../src/gui/preferences.cpp:671
+#: ../src/gui/preferences.cpp:676 ../src/gui/preferences.cpp:730
 msgid "Forward _URI:"
-msgstr ""
+msgstr "Cuir _URI ar Aghaidh:"
 
-#: ../src/gui/preferences.cpp:626
+#: ../src/gui/preferences.cpp:685
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Ardsocruithe"
 
 #. The toggles
-#: ../src/gui/preferences.cpp:629
+#: ../src/gui/preferences.cpp:688
 msgid "Enable H.245 _tunneling"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:631
+#: ../src/gui/preferences.cpp:690
 msgid "Enable _early H.245"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:633
+#: ../src/gui/preferences.cpp:692
 msgid "Enable fast _start procedure"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:633
+#: ../src/gui/preferences.cpp:692
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -2729,250 +2868,225 @@
 "versions of Netmeeting."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:639 ../src/gui/preferences.cpp:679
+#: ../src/gui/preferences.cpp:698 ../src/gui/preferences.cpp:738
 msgid "DTMF Mode"
-msgstr ""
+msgstr "Mód DTMF"
 
-#: ../src/gui/preferences.cpp:641 ../src/gui/preferences.cpp:681
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
 msgid "_Send DTMF as:"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:641 ../src/gui/preferences.cpp:681
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
 msgid "This allows you to set the mode for DTMFs sending."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:657
+#: ../src/gui/preferences.cpp:716
 msgid "INFO"
-msgstr ""
+msgstr "EOLAS"
 
-#: ../src/gui/preferences.cpp:668
+#: ../src/gui/preferences.cpp:727
 msgid "_Outbound Proxy:"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:709
+#: ../src/gui/preferences.cpp:768
 msgid "Ringing Device"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:709
+#: ../src/gui/preferences.cpp:768
 msgid "Select the ringing audio device to use"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:711
+#: ../src/gui/preferences.cpp:770
 msgid "Output device:"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:718 ../src/gui/preferences.cpp:866
+#: ../src/gui/preferences.cpp:777 ../src/gui/preferences.cpp:928
 msgid "Input device:"
 msgstr ""
 
 #. That button will refresh the device list
-#: ../src/gui/preferences.cpp:723 ../src/gui/preferences.cpp:930
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
 msgid "_Detect devices"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:723 ../src/gui/preferences.cpp:930
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
 msgid "Click here to refresh the device list."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:844
+#: ../src/gui/preferences.cpp:906
 msgid "PAL (Europe)"
 msgstr "PAL (An Eoraip)"
 
-#: ../src/gui/preferences.cpp:845
+#: ../src/gui/preferences.cpp:907
 msgid "NTSC (America)"
 msgstr "NTSC (Meiriceá)"
 
-#: ../src/gui/preferences.cpp:846
+#: ../src/gui/preferences.cpp:908
 msgid "SECAM (France)"
 msgstr "SECAM (An Fhrainc)"
 
-#: ../src/gui/preferences.cpp:847
+#: ../src/gui/preferences.cpp:909
 msgid "Auto"
-msgstr ""
+msgstr "Uath"
 
 #. Video Channel
-#: ../src/gui/preferences.cpp:870
+#: ../src/gui/preferences.cpp:932
 msgid "Channel:"
 msgstr "Cainéal:"
 
-#: ../src/gui/preferences.cpp:872
+#: ../src/gui/preferences.cpp:934
 msgid "Size:"
 msgstr "Méid:"
 
-#: ../src/gui/preferences.cpp:872
+#: ../src/gui/preferences.cpp:934
 msgid "Select the transmitted video size"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:874
+#: ../src/gui/preferences.cpp:936
 msgid "Format:"
 msgstr "Formáid:"
 
-#. The file selector button
-#: ../src/gui/preferences.cpp:877
-msgid "Image:"
-msgstr "Íomhá:"
-
-#: ../src/gui/preferences.cpp:880
-msgid "Choose a Picture"
-msgstr ""
-
-#: ../src/gui/preferences.cpp:884
-msgid "Preview"
-msgstr ""
-
-#: ../src/gui/preferences.cpp:894
-msgid "Images"
-msgstr "Íomhánna"
-
-#: ../src/gui/preferences.cpp:954 ../src/gui/preferences.cpp:993
-#: ../src/gui/preferences.cpp:1494 ../src/gui/preferences.cpp:1504
+#: ../src/gui/preferences.cpp:963 ../src/gui/preferences.cpp:1002
+#: ../src/gui/preferences.cpp:1386 ../src/gui/preferences.cpp:1396
 msgid "Codecs"
-msgstr ""
+msgstr "(Dí-)Comhbhrúnna"
 
-#: ../src/gui/preferences.cpp:967 ../src/gui/preferences.cpp:1006
+#: ../src/gui/preferences.cpp:976 ../src/gui/preferences.cpp:1015
 msgid "Settings"
-msgstr ""
+msgstr "Socruithe"
 
 #. Translators: the full sentence is Automatically adjust jitter buffer
 #. between X and Y ms
-#: ../src/gui/preferences.cpp:971
+#: ../src/gui/preferences.cpp:980
 msgid "Enable silence _detection"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:971
+#: ../src/gui/preferences.cpp:980
 msgid "If enabled, use silence detection with the codecs supporting it."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:973
+#: ../src/gui/preferences.cpp:982
 msgid "Enable echo can_celation"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:973
+#: ../src/gui/preferences.cpp:982
 msgid "If enabled, use echo cancelation."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:975
+#: ../src/gui/preferences.cpp:984
 msgid "Maximum _jitter buffer (in ms):"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:975
+#: ../src/gui/preferences.cpp:984
 msgid "The maximum jitter buffer size for audio reception (in ms)."
 msgstr ""
 
 #. Translators: the full sentence is Keep a minimum video quality of X %
-#: ../src/gui/preferences.cpp:1009
+#: ../src/gui/preferences.cpp:1018
 msgid "Picture Quality"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:1009
+#: ../src/gui/preferences.cpp:1018
 msgid ""
 "Choose if you want to guarantee a minimum image quality (possibly leading to "
 "dropped frames in order not to surpass the bitrate limit) or if you prefer "
 "to keep the frame rate."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:1011
+#: ../src/gui/preferences.cpp:1020
 msgid "Maximum video _bitrate (in kbits/s):"
 msgstr ""
 
-#: ../src/gui/preferences.cpp:1011
+#: ../src/gui/preferences.cpp:1020
 msgid ""
 "The maximum video bitrate in kbits/s. The video quality and the effective "
 "frame rate will be dynamically adjusted to keep the bitrate at the given "
 "value."
 msgstr ""
 
-#: ../src/gui/preferences.cpp:1403
-msgid "Play sound for new voice mails"
-msgstr ""
-
-#: ../src/gui/preferences.cpp:1412
-msgid "Play sound for new instant messages"
-msgstr ""
-
-#: ../src/gui/preferences.cpp:1441
+#: ../src/gui/preferences.cpp:1333
 msgid "Ekiga Preferences"
 msgstr "Sainroghanna Ekiga"
 
-#: ../src/gui/preferences.cpp:1459
+#: ../src/gui/preferences.cpp:1351
 msgid "General"
 msgstr "Ginearálta"
 
-#: ../src/gui/preferences.cpp:1460
+#: ../src/gui/preferences.cpp:1352
 msgid "Personal Data"
-msgstr ""
+msgstr "Sonraí Pearsanta"
 
-#: ../src/gui/preferences.cpp:1465
+#: ../src/gui/preferences.cpp:1357
 msgid "General Settings"
-msgstr ""
+msgstr "Socruithe Ginearálta"
 
-#: ../src/gui/preferences.cpp:1474
+#: ../src/gui/preferences.cpp:1366
 msgid "Sound Events"
-msgstr ""
+msgstr "Teagmhais Fuaime"
 
-#: ../src/gui/preferences.cpp:1478
+#: ../src/gui/preferences.cpp:1370
 msgid "Protocols"
-msgstr ""
+msgstr "Prótacail"
 
-#: ../src/gui/preferences.cpp:1480
+#: ../src/gui/preferences.cpp:1372
 msgid "SIP Settings"
-msgstr ""
+msgstr "Socruithe SIP"
 
-#: ../src/gui/preferences.cpp:1485
+#: ../src/gui/preferences.cpp:1377
 msgid "H.323 Settings"
-msgstr ""
+msgstr "Socruithe H.323"
 
-#: ../src/gui/preferences.cpp:1489
+#: ../src/gui/preferences.cpp:1381
 msgid "Audio"
 msgstr "Fuaim"
 
-#: ../src/gui/preferences.cpp:1490 ../src/gui/preferences.cpp:1500
+#: ../src/gui/preferences.cpp:1382 ../src/gui/preferences.cpp:1392
 msgid "Devices"
 msgstr "Gléasanna"
 
-#: ../src/gui/preferences.cpp:1499
+#: ../src/gui/preferences.cpp:1391
 msgid "Video"
 msgstr "Fís"
 
-#: ../src/gui/statusicon.cpp:304
+#: ../src/gui/statusicon.cpp:306
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tá %d teachtaireacht agat"
+msgstr[1] "Tá %d theachtaireacht agat"
+msgstr[2] "Tá %d theachtaireacht agat"
+msgstr[3] "Tá %d dteachtaireacht agat"
+msgstr[4] "Tá %d teachtaireacht agat"
 
-#: ../src/gui/statusicon.cpp:406
-msgid "_Contents"
-msgstr "_Inneachar"
-
-#: ../src/gui/statusicon.cpp:411
-msgid "_About"
-msgstr "_Maidir Leis Seo"
-
-#: ../src/gui/statusmenu.cpp:90
+#: ../src/gui/statusmenu.cpp:87
 msgid "Online"
-msgstr ""
+msgstr "Ar Líne"
 
-#: ../src/gui/statusmenu.cpp:91
+#: ../src/gui/statusmenu.cpp:88
 msgid "Away"
-msgstr ""
+msgstr "Amuigh"
 
-#: ../src/gui/statusmenu.cpp:92
+#: ../src/gui/statusmenu.cpp:89
 msgid "Do Not Disturb"
-msgstr ""
+msgstr "Ná Cuir Isteach Air"
 
-#: ../src/gui/statusmenu.cpp:511
+#: ../src/gui/statusmenu.cpp:387
 msgid "Custom message..."
-msgstr ""
+msgstr "Teachtaireacht saincheaptha..."
+
+#: ../src/gui/statusmenu.cpp:430
+msgid "Clear"
+msgstr "Glan"
 
-#: ../src/gui/statusmenu.cpp:625 ../src/gui/statusmenu.cpp:760
+#. Build the dialog
+#: ../src/gui/statusmenu.cpp:521 ../src/gui/statusmenu.cpp:671
 msgid "Custom Message"
-msgstr ""
+msgstr "Teachtaireacht Saincheaptha"
 
-#: ../src/gui/statusmenu.cpp:641
+#: ../src/gui/statusmenu.cpp:537
 msgid "Delete custom messages:"
-msgstr ""
+msgstr "Scrios teachtaireachtaí saincheaptha:"
 
-#: ../src/gui/statusmenu.cpp:781
+#: ../src/gui/statusmenu.cpp:692
 msgid "Define a custom message:"
-msgstr ""
+msgstr "Sainmhínigh teachtaireacht saincheaptha:"
diff -Nru ekiga-3.2.5/po/hi.po ekiga-3.2.6~ppa~karmic1/po/hi.po
--- ekiga-3.2.5/po/hi.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/hi.po	2009-09-22 15:27:35.000000000 +0100
@@ -1,16 +1,17 @@
-# translation of ekiga.HEAD.po to Hindi
+# translation of ekiga.gnome-2-26.po to Hindi
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 #: ../lib/engine/components/resource-list/rl-entry.cpp:163
 # Rajesh Ranjan <rranjan@redhat.com>, 2008, 2009.
+# Rajesh Ranjan <rajesh672@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: ekiga.HEAD\n"
+"Project-Id-Version: ekiga.gnome-2-26\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga&component=general\n"
-"POT-Creation-Date: 2009-03-04 13:46+0000\n"
-"PO-Revision-Date: 2009-03-10 12:41+0530\n"
-"Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
+"POT-Creation-Date: 2009-04-16 20:21+0000\n"
+"PO-Revision-Date: 2009-09-18 12:27+0530\n"
+"Last-Translator: Rajesh Ranjan <rajesh672@gmail.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +21,8 @@
 "\n"
 "\n"
 "\n"
+"\n"
+"\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../ekiga.desktop.in.in.h:1
@@ -43,11 +46,11 @@
 "Allow Ekiga to fall back to software scaling the picture-in-picture if "
 "hardware support is not available. If this is set to false, Ekiga will not "
 "try to open the PIP if hardware support is not available."
-msgstr ""
+msgstr "एकिगा को सॉफ्टवेयर अनुमापन तस्वीर में तस्वीर की ओर ले जाता है यदि हार्डवेयर समर्थन उपलब्ध नहीं है. यदि इसे गलत पर सेट किया जाता है, एकिगा खोलने की कोशिश नहीं करेगा PIP को यदि हार्डवेयर समर्थन अनुपलब्ध है."
 
 #: ../ekiga.schemas.in.in.h:3
 msgid "Allow picture-in-picture software scaling"
-msgstr ""
+msgstr "तस्वीर के अंदर तस्वीर सॉफ़्टवेयर अनुमापन स्वीकारें"
 
 #: ../ekiga.schemas.in.in.h:4
 msgid "Alternative audio output device"
@@ -79,7 +82,7 @@
 
 #: ../ekiga.schemas.in.in.h:10
 msgid "Change the main window panel section"
-msgstr ""
+msgstr "मुख्य विंडो पटल खंड बदलें"
 
 #: ../ekiga.schemas.in.in.h:11
 msgid ""
@@ -106,13 +109,12 @@
 msgstr "DTMF भेज रहा है"
 
 #: ../ekiga.schemas.in.in.h:15
-#| msgid "Enable silence detection"
 msgid "Disable STUN network detection"
 msgstr "STUN संजाल जाँच निष्क्रिय करें"
 
 #: ../ekiga.schemas.in.in.h:16 ../src/gui/preferences.cpp:492
 msgid "Disable the automatic network setup resulting from the STUN test"
-msgstr ""
+msgstr "STUN जाँच से आया स्वचालित संजाल सेटअप निष्क्रिय करें"
 
 #: ../ekiga.schemas.in.in.h:17
 msgid "Disable video hardware acceleration"
@@ -229,11 +231,11 @@
 
 #: ../ekiga.schemas.in.in.h:40
 msgid "List of configured LDAP servers"
-msgstr ""
+msgstr "विन्यस्त LDAP सर्वर की सूची"
 
 #: ../ekiga.schemas.in.in.h:41
 msgid "List of folded groups in the roster"
-msgstr ""
+msgstr "रोस्टर में फोल्ड किया समूह की सूची"
 
 #: ../ekiga.schemas.in.in.h:42
 msgid "Listen port"
@@ -301,7 +303,7 @@
 
 #: ../ekiga.schemas.in.in.h:58
 msgid "Position on the screen of the audio settings window"
-msgstr ""
+msgstr "ऑडियो सेटिंग विंडो के स्क्रीन की स्थिति"
 
 #: ../ekiga.schemas.in.in.h:59
 msgid "Position on the screen of the chat window"
@@ -325,7 +327,7 @@
 
 #: ../ekiga.schemas.in.in.h:64
 msgid "Position on the screen of the video settings window"
-msgstr ""
+msgstr "वीडियो सेटिंग विंडो के स्क्रीन की स्थिति"
 
 #: ../ekiga.schemas.in.in.h:65
 msgid "Remote video window position"
@@ -399,7 +401,7 @@
 
 #: ../ekiga.schemas.in.in.h:81
 msgid "Specify the software scaling algorithm"
-msgstr ""
+msgstr "सॉफ्टवेयर अनुमापन अलगोरिथम निर्दिष्ट करें"
 
 #: ../ekiga.schemas.in.in.h:82
 msgid ""
@@ -407,6 +409,9 @@
 "neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
 "Does not apply on windows systems."
 msgstr ""
+"सॉफ्टवेयर अनुमापन अलगोरिथम निर्दिष्ट करें: 0: nearest neighbor, 1: nearest "
+"neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
+"किसी विंडोज तंत्र पर मत लागू करें."
 
 #: ../ekiga.schemas.in.in.h:83
 msgid "Start hidden"
@@ -418,7 +423,7 @@
 
 #: ../ekiga.schemas.in.in.h:85
 msgid "Temporal Spatial Trade Off"
-msgstr ""
+msgstr "टेंपोरल स्पासियल ट्रैड ऑफ"
 
 #: ../ekiga.schemas.in.in.h:86
 msgid "The Audio Codecs List"
@@ -436,7 +441,7 @@
 msgid ""
 "The STUN server to use for STUN Support. STUN is a technology that permits "
 "passage through some types of NAT gateway"
-msgstr ""
+msgstr "STUN समर्थन के लिए STUN सर्वर. STUN एक प्रौद्योगिकी है जो कि NAT गेटवे के कुछ प्रकार से रास्ता देता है"
 
 #: ../ekiga.schemas.in.in.h:90
 msgid "The Video Codecs List"
@@ -489,6 +494,8 @@
 "The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with "
 "local video in a separate window, 4: Both)"
 msgstr ""
+"तयशुदा वीडियो दृश्य (0: Local, 1: Remote, 2: Both layered, 3: Both with "
+"local video in a separate window, 4: Both)"
 
 #: ../ekiga.schemas.in.in.h:101
 msgid "The dial tone sound"
@@ -520,7 +527,7 @@
 "The maximum RX video bitrate in kbit/s. This value will be signaled to the "
 "peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
 "above the signaled value"
-msgstr ""
+msgstr "अधिकतम RX वीडियो बिटरेट kbit/s में. यह मान पीयर अंतबिंदु को संकेतित किया जाएगा जो कि (if it supports it) इसके TX बिटरेट को समायोजित करेगा यदि संकेत किए मान से ऊपर है"
 
 #: ../ekiga.schemas.in.in.h:108
 msgid ""
@@ -528,7 +535,7 @@
 "transmitted frames per second (depends on selected codec) will be "
 "dynamically adjusted above their minimum during calls to try to minimize the "
 "bandwidth to the given value"
-msgstr ""
+msgstr "अधिकतम TX वीडियो बिटरेट kbit/s में. वीडियो गुणवत्ता और प्रेषित ढ़ांचा प्रति सेकेंड की संख्या (जो कि चुने गए codec) को गतिशील रूप से समायोजित किया जाएगा उसके न्यूनतम में कॉल के दौरान बैंडविड्थ को दिए मान में बचाने के लिए"
 
 #: ../ekiga.schemas.in.in.h:109
 msgid "The maximum jitter buffer size for audio reception (in ms)"
@@ -539,7 +546,7 @@
 "The maximum transmitted frame rate in frames/s. This rate may not be reached "
 "in case a minimum quality was configure via a TSTO value smaller than 31 and "
 "the bitrate selected is not sufficient to support this minimum quality"
-msgstr ""
+msgstr "फ्रेम में अधिकतम प्रेषित ढांचा. यह दर नहीं पहुँच सकता है उस स्थिति में न्यूनतम गुणवत्ता को को TSTO मान से विन्यस्त किया जाना है जो 31 से छोटा है और चुना गया बिटरेट इस न्यूनतम गुणवत्ता को समर्थन देने के लिए पर्याप्त नहीं है"
 
 #: ../ekiga.schemas.in.in.h:111
 msgid "The new instant message sound"
@@ -578,15 +585,15 @@
 "The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
 "port range has no effect if both participants to the conference are using "
 "H.245 Tunneling."
-msgstr ""
+msgstr "TCP पोर्ट की संख्या जो Ekiga H.323 H.245 चैनल के लिए प्रयोग करेगा. इस पोर्ट परिसर का कोई प्रभाव नहीं है यदि सम्मेलन के दोनों सहभागी H.245 टनेलिंग का प्रयोग कर रहे हैं."
 
 #: ../ekiga.schemas.in.in.h:118
 msgid "The range of UDP ports that Ekiga will use."
-msgstr ""
+msgstr "UDP पोर्ट की संख्या जो Ekiga प्रयोग करेगा."
 
 #: ../ekiga.schemas.in.in.h:119
 msgid "The short status information"
-msgstr ""
+msgstr "संक्षिप्क स्थिति सूचना"
 
 #: ../ekiga.schemas.in.in.h:120
 msgid "The size of the local video window"
@@ -628,13 +635,13 @@
 
 #: ../ekiga.schemas.in.in.h:129
 msgid "The video view before having switched to fullscreen"
-msgstr ""
+msgstr "विडियो दृश्य पूर्णस्क्रीन में जाने से पहले"
 
 #: ../ekiga.schemas.in.in.h:130
 msgid ""
 "The video view before having switched to fullscreen (same values as "
 "video_view)"
-msgstr ""
+msgstr "विडियो दृश्य पूर्णस्क्रीन में जाने से पहले (video_view के समान मान)"
 
 #: ../ekiga.schemas.in.in.h:131
 msgid "The zoom value"
@@ -644,13 +651,13 @@
 msgid ""
 "The zoom value in percent to apply to images displayed in the main GUI (can "
 "be 50, 100, or 200)"
-msgstr ""
+msgstr "मुख्य GUI में दिखाई गई छवि को लागू करने के लिए प्रतिशत ज़ूम मान  (50, 100, या 200 हो सकता है)"
 
 #: ../ekiga.schemas.in.in.h:133
 msgid ""
 "This allows you to set the mode for sending DTMFs. The values can be "
 "\"RFC2833\" (0), \"INFO\" (1)"
-msgstr ""
+msgstr "यह आपको DTMF को भेजने के लिए विधि सेट करने देता है. मान \"RFC2833\" (0), \"INFO\" (1) हो सकता है"
 
 #: ../ekiga.schemas.in.in.h:134
 msgid ""
@@ -658,6 +665,9 @@
 "\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
 "\"). Choosing other values than \"String\" disables the Text Chat"
 msgstr ""
+"यह DTMF के भेजने के लिए विधि सेट करने की छूट देता है. मान हो सकता है \"String"
+"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
+"\"). \"String\" के बजाय अन्य मान चुनना टेक्स्ट चैट को निष्क्रिय करता है"
 
 #: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
 msgid ""
@@ -667,6 +677,9 @@
 "Netmeeting does not support it. Using both Fast Start and H.245 Tunneling "
 "can crash some versions of Netmeeting."
 msgstr ""
+"यह H.245 टनेलिंग विधि को सक्रिय करता है. H.245 टनेलिंग विधि में H.245 संदेश "
+"को H.225 चैनल में समाहित किया जाता है (पोर्ट 1720). यह एक TCP "
+"कनेक्शन को कॉल के दौरान सहेजता है. H.245 टनेलिंग को H.323v2 में लाया गया था और नेटमीटिंग इसका समर्थन नहीं करता है. फास्ट स्टार्ट और H.245 टनेलिंग दोनों को प्रयोग नेटमीटिंग के कुछ संस्करण को क्रैस कर सकता है."
 
 #: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:690
 msgid "This enables H.245 early in the setup"
@@ -676,7 +689,7 @@
 msgid ""
 "This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
 "acceleration"
-msgstr ""
+msgstr "यह कुंजी DirectX (win32 पर) और XVideo (Linux पर) वीडियो हार्डवेयर त्वरण को निष्क्रिय करता है"
 
 #: ../ekiga.schemas.in.in.h:138
 msgid "UDP port range"
@@ -690,7 +703,7 @@
 msgid "Video format"
 msgstr "वीडियो प्रारूप"
 
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1153
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1158
 msgid "Video input device"
 msgstr "वीडियो इनपुट डिवाइस"
 
@@ -707,7 +720,7 @@
 "Whether to prefer to sustain the max. frame rate or lower it possibly in "
 "order to keep a minimum level of (spatial) quality for all frames. 0: "
 "Highest minimal quality, 31: lowest minimal quality"
-msgstr ""
+msgstr "क्या अधिकतम फ्रेम दर को बनाए रखना या इसे कम करना है संभवतः न्यूनतम स्तर (spatial) गुणवत्ता पर सभी फ्रेम के लिए बनाए रखने के लिए. Highest minimal quality, 31: lowest minimal quality"
 
 #: ../lib/engine/addressbook/contact-core.cpp:58
 msgid "_Find"
@@ -720,7 +733,6 @@
 
 #: ../lib/engine/components/call-history/history-book.cpp:140
 #: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
-#| msgid "Clear"
 msgid "Clear List"
 msgstr "सूची साफ करें"
 
@@ -741,8 +753,8 @@
 #, c-format
 msgid "%d user found"
 msgid_plural "%d users found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d उपयोक्ता मिला"
+msgstr[1] "%d उपयोक्ता मिले"
 
 #: ../lib/engine/components/evolution/evolution-book.cpp:244
 msgid "New _Contact"
@@ -758,7 +770,7 @@
 #: ../lib/engine/components/evolution/evolution-contact.cpp:328
 #: ../lib/engine/components/opal/opal-account.cpp:351
 msgid "Please update the following fields:"
-msgstr ""
+msgstr "कृपया निम्नलिखित क्षेत्र का अद्यतन करें:"
 
 #: ../lib/engine/components/evolution/evolution-book.cpp:292
 msgid "_Name:"
@@ -828,10 +840,9 @@
 #: ../lib/engine/components/evolution/evolution-contact.cpp:397
 #, c-format
 msgid "Are you sure you want to remove %s from the addressbook?"
-msgstr ""
+msgstr "क्या आप %s को पता पुस्तिका से वाकई हटाना चाहते हैं?"
 
 #: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
-#| msgid "Audio Devices"
 msgid "Audio test"
 msgstr "ऑडियो जाँच"
 
@@ -840,7 +851,6 @@
 msgstr "मूक"
 
 #: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
-#| msgid "Video size"
 msgid "Video test"
 msgstr "वीडियो जाँच"
 
@@ -861,12 +871,10 @@
 msgstr "ताज़ा करें (_R)"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:412
-#| msgid "_Remote Video"
 msgid "_Remove addressbook"
 msgstr "पता पुस्तिका हटाएँ (_R)"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:414
-#| msgid "Address incomplete"
 msgid "Addressbook _properties"
 msgstr "पतापुस्तिका गुण (_p)"
 
@@ -884,12 +892,10 @@
 #. * authentication" if you'd like more background context.
 #.
 #: ../lib/engine/components/ldap/ldap-book.cpp:587
-#| msgid "Channel:"
 msgid "Challenge: "
 msgstr "Challenge: "
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:595
-#| msgid "User Interface"
 msgid "Interact"
 msgstr "अंतःक्रिया करें"
 
@@ -930,7 +936,6 @@
 msgstr "निम्नलिखित क्षेत्र कृपया संपादित करें"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:933
-#| msgid "_Name"
 msgid "Book _Name"
 msgstr "पुस्तक नाम (_N)"
 
@@ -951,7 +956,6 @@
 msgstr "एकल स्तर"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:943
-#| msgid "_Search Filter:"
 msgid "_Search Scope"
 msgstr "खोज स्कोप (_S):"
 
@@ -960,7 +964,6 @@
 msgstr "_DisplayName विशेषता"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:953
-#| msgid "Call _Attribute"
 msgid "Call _Attributes"
 msgstr "काल विशेषता (_A)"
 
@@ -995,7 +998,7 @@
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:1016
 msgid "Please provide a Book Name for this directory\n"
-msgstr ""
+msgstr "कृपया एक पुस्तक इस निर्देशिका के लिए दें\n"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:1019
 msgid "Please provide a Server URI\n"
@@ -1037,7 +1040,7 @@
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
-msgstr ""
+msgstr "कृपया इस फॉर्म को भरें एकिगा के आंतरिक रोस्टर के मौजूदा तत्व को भरने के लिए"
 
 #: ../lib/engine/components/local-roster/local-presentity.cpp:225
 #: ../lib/engine/components/local-roster/local-heap.cpp:193
@@ -1080,12 +1083,10 @@
 msgstr "नाम बदलें"
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:160
-#| msgid "Failed"
 msgid "Family"
 msgstr "परिवार"
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:161
-#| msgid "_Find"
 msgid "Friend"
 msgstr "मित्र"
 
@@ -1098,7 +1099,6 @@
 msgstr "सहायक"
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:164
-#| msgid "Services"
 msgid "Supervisor"
 msgstr "निरीक्षक"
 
@@ -1108,7 +1108,7 @@
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:182
 msgid "Please fill in this form to add a new contact to ekiga's internal roster"
-msgstr ""
+msgstr "कृपया इस फॉर्म को भरें एकिगा के आंतरिक रोस्टर में नए संपर्क को भरने के लिए"
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:199
 msgid "Put contact in groups:"
@@ -1116,11 +1116,11 @@
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:335
 msgid "You supplied an unsupported address"
-msgstr ""
+msgstr "आपने असमर्थित पता दिया है"
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:337
 msgid "You already have a contact with this address!"
-msgstr ""
+msgstr "आपके पास पहले से यह पता संपर्क के साथ है!"
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:362
 msgid "Rename group"
@@ -1171,12 +1171,12 @@
 msgstr "समर्थ करें (_E)"
 
 #: ../lib/engine/components/opal/opal-account.cpp:324
-#: ../src/gui/assistant.cpp:725
+#: ../src/gui/assistant.cpp:730
 msgid "Recharge the account"
 msgstr "खाता फिर भरें"
 
 #: ../lib/engine/components/opal/opal-account.cpp:329
-#: ../src/gui/assistant.cpp:737
+#: ../src/gui/assistant.cpp:742
 msgid "Consult the balance history"
 msgstr "शेष इतिहास से सलाह लें"
 
@@ -1237,22 +1237,22 @@
 #: ../lib/engine/components/opal/opal-account.cpp:401
 #: ../lib/engine/components/opal/opal-bank.cpp:155
 msgid "You did not supply a name for that account."
-msgstr ""
+msgstr "आपने एक नाम खाता के लिए नहीं दिया है."
 
 #: ../lib/engine/components/opal/opal-account.cpp:403
 #: ../lib/engine/components/opal/opal-bank.cpp:157
 msgid "You did not supply a host to register to."
-msgstr ""
+msgstr "आपने एक नाम मेजबान नहीं दिया है जिसमें पंजीकरण करना है."
 
 #: ../lib/engine/components/opal/opal-account.cpp:405
 #: ../lib/engine/components/opal/opal-bank.cpp:159
 msgid "You did not supply a user name for that account."
-msgstr ""
+msgstr "आपने एक नाम उपयोक्तानाम नहीं दिया है उस खाते के लिए."
 
 #: ../lib/engine/components/opal/opal-account.cpp:407
 #: ../lib/engine/components/opal/opal-bank.cpp:161
 msgid "The timeout should have a bigger value."
-msgstr ""
+msgstr "समय समाप्ति को बड़ा मान होना चाहिए."
 
 #: ../lib/engine/components/opal/opal-bank.cpp:53
 msgid "_Add an Ekiga.net Account"
@@ -1274,11 +1274,11 @@
 msgid "Please update the following fields."
 msgstr "कृपया निम्नलिखित क्षेत्र अद्यतन करें."
 
-#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:605
+#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:610
 msgid "Get an Ekiga.net SIP account"
 msgstr "Ekiga.net SIP खाता पाएँ"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:713
+#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:718
 msgid "Get an Ekiga Call Out account"
 msgstr "एकिगा कॉल आउट खाता पाएँ"
 
@@ -1369,7 +1369,7 @@
 msgid "Call completed"
 msgstr "कॉल सम्पन्न"
 
-#: ../lib/engine/components/opal/opal-call-manager.cpp:725
+#: ../lib/engine/components/opal/opal-call-manager.cpp:727
 msgid ""
 "Ekiga did not manage to configure your network settings automatically. You "
 "can still use it, but you need to configure your network settings manually.\n"
@@ -1377,6 +1377,9 @@
 "Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
 "for instructions"
 msgstr ""
+"एकिगा आपके संजाल सेटिंग को स्वतः विन्यस्त करने का प्रबंध नहीं कर सका. आप इसे अभी भी प्रयोग कर सकते हैं, लेकिन आफको अपने संजाल सेटिंग को दस्ती रूप से विन्यस्त करना होगा.\n"
+"\n"
+"निर्देश के लिए कृपया देखें http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:282
 #: ../lib/engine/components/opal/sip-endpoint.cpp:284
@@ -1448,7 +1451,6 @@
 msgstr "विधि स्वीकृत नहीं"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:774
-#| msgid "Proxy auth. required"
 msgid "Proxy authentication required"
 msgstr "प्रॉक्सी सत्यापन जरूरी"
 
@@ -1575,13 +1577,11 @@
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:1134
 #, c-format
-#| msgid "Incoming call from"
 msgid "Incoming call from %s"
 msgstr "%s से आगत कॉल"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:1136
 #, c-format
-#| msgid "Incoming call from"
 msgid "Incoming call"
 msgstr "आगत कॉल"
 
@@ -1605,14 +1605,13 @@
 
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:167
 msgid "Please fill in this form to add a new contact list to ekiga's remote roster"
-msgstr ""
+msgstr "कृपया इस फॉर्म में नया संपर्क जोड़ने के लिए भरें एकिगा दूरस्थ रोस्टर में नया संपर्क जोड़ने के लिए"
 
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:171
 msgid "Writable:"
 msgstr "लिखने योग्य:"
 
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:172
-#| msgid "User:"
 msgid "Username:"
 msgstr "उपयोक्ता नाम:"
 
@@ -1621,36 +1620,30 @@
 #: ../lib/engine/components/resource-list/rl-heap.cpp:178
 #: ../lib/engine/components/resource-list/rl-presentity.cpp:133
 #: ../lib/engine/components/resource-list/rl-entry.cpp:130
-#| msgid "Rename"
 msgid "Unnamed"
 msgstr "बेनाम"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:200
-#| msgid "New contact"
 msgid "_Add a new contact"
 msgstr "नया संपर्क जोड़ें"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:202
-#| msgid "View the contacts list"
 msgid "_Refresh contact list"
 msgstr "संपर्क सूची ताजा करें"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:204
-#| msgid "Contact long status"
 msgid "Contact list _properties"
 msgstr "संपर्क सूची गुण (_p)"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:467
-#| msgid "Edit contact"
 msgid "Edit contact list properties"
 msgstr "संपर्क सूची गुण संपादित करें"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:469
 msgid "Please edit the following fields (no identifier means global)"
-msgstr ""
+msgstr "कृपया निम्न क्षेत्र संपादित करें (कोई पहचानकर्ता नहीं का अर्थ है वैश्विक)"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:472
-#| msgid "Contact long status"
 msgid "Contact list's name"
 msgstr "सूची नाम से संपर्क करें"
 
@@ -1664,40 +1657,34 @@
 msgstr "पहचानकर्ता"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:476
-#| msgid "_Disable"
 msgid "Writable"
 msgstr "लिखने योग्य"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:477
-#| msgid "Server timeout"
 msgid "Server username"
 msgstr "सर्वर उपयोक्तानाम"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:478
-#| msgid "Password"
 msgid "Server password"
 msgstr "सर्वर कूटशब्द"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:530
-#| msgid "Remove contact"
 msgid "Add a remote contact"
 msgstr "कोई दूरस्थ संपर्क जोड़ें"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:531
 msgid "Please fill in this form to create a new contact on a remote server"
-msgstr ""
+msgstr "कृपया इस फॉर्म को भरें दूरस्थ सर्वर पर नया संपर्क बनाने के लिए"
 
 #: ../lib/engine/components/resource-list/rl-presentity.cpp:221
-#| msgid "Edit contact"
 msgid "Edit remote contact"
 msgstr "दूरस्थ संपर्क संपादित करें"
 
 #: ../lib/engine/components/resource-list/rl-presentity.cpp:222
 msgid "Please fill in this form to change an existing contact on a remote server"
-msgstr ""
+msgstr "कृपया इस फॉर्म को भरें दूरस्थ सर्वर पर मौजूदा संपर्क बदलने के लिए"
 
 #: ../lib/engine/components/resource-list/rl-entry.cpp:186
-#| msgid "Internal server error"
 msgid "Invalid server data"
 msgstr "अवैध सर्वर त्रुटि"
 
@@ -1706,7 +1693,6 @@
 msgstr "पाने के लिए क्लिक करें"
 
 #: ../lib/engine/components/resource-list/rl-entry-ref.cpp:118
-#| msgid "Edit contact"
 msgid "Distant contact"
 msgstr "दूर के संपर्क"
 
@@ -1721,7 +1707,6 @@
 msgstr "सूची #%d"
 
 #: ../lib/engine/gui/gtk-core/form-dialog-gtk.cpp:660
-#| msgid "Advanced Settings"
 msgid "Advanced"
 msgstr "विस्तृत"
 
@@ -1744,7 +1729,7 @@
 msgstr "श्रेणी"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
-#: ../src/gui/assistant.cpp:1377
+#: ../src/gui/assistant.cpp:1382
 msgid "Full Name"
 msgstr "पूरा नाम"
 
@@ -1780,11 +1765,11 @@
 
 #: ../lib/gui/codecsbox.cpp:477
 msgid "Move selected codec priority upwards"
-msgstr ""
+msgstr "चयनित कोडेक प्राथमिकता को ऊपर की ओर खिसकाएँ"
 
 #: ../lib/gui/codecsbox.cpp:487
 msgid "Move selected codec priority downwards"
-msgstr ""
+msgstr "चयनित कोडेक प्राथमिकता को नीचे की ओर खिसकाएँ"
 
 #: ../lib/gui/gmdialog.c:462
 msgid "Do not show this dialog again"
@@ -1843,7 +1828,7 @@
 msgid "A"
 msgstr "A"
 
-#: ../src/gui/assistant.cpp:323
+#: ../src/gui/assistant.cpp:327
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1856,21 +1841,20 @@
 "\n"
 "इन चरण के एकबार पूरा होने पर, संपादन मेनू में वरीयता में जाकर आप उसे हमेशा बदल सकते हैं."
 
-#: ../src/gui/assistant.cpp:331
-#| msgid "Welcome in Ekiga"
+#: ../src/gui/assistant.cpp:335
 msgid "Welcome to Ekiga"
 msgstr "एकिगा में स्वागत है"
 
-#: ../src/gui/assistant.cpp:365 ../src/gui/preferences.cpp:454
+#: ../src/gui/assistant.cpp:359 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "व्यक्तिगत जानकारी"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:368
+#: ../src/gui/assistant.cpp:362
 msgid "Please enter your first name and your surname:"
 msgstr "कृपया अपना प्रथम नाम तथा अपना कुल नाम भरें"
 
-#: ../src/gui/assistant.cpp:377
+#: ../src/gui/assistant.cpp:371
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
@@ -1878,19 +1862,19 @@
 "आपका पहला नाम व उपनाम प्रयुक्त होगा जब अन्य VoIP और वीडियो कांफरेंशिंग की कोशिश करता "
 "है."
 
-#: ../src/gui/assistant.cpp:568
+#: ../src/gui/assistant.cpp:573
 msgid "Ekiga.net Account"
 msgstr "Ekiga.net खाता"
 
-#: ../src/gui/assistant.cpp:570
+#: ../src/gui/assistant.cpp:575
 msgid "Please enter your username:"
 msgstr "कृपया अपना प्रयोक्ता नाम भरें:"
 
-#: ../src/gui/assistant.cpp:578
+#: ../src/gui/assistant.cpp:583
 msgid "Please enter your password:"
 msgstr "कृपया अपना कूटशब्द भरें:"
 
-#: ../src/gui/assistant.cpp:588
+#: ../src/gui/assistant.cpp:593
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1908,23 +1892,23 @@
 "आप इस कदम को छोड़ सकते हैं यदि आप वैकल्पिक SIP सर्विस का प्रयोग करते हैं, या यदि आप बाद "
 "में लॉगिन विवरण निर्दिष्ट करने के लिए चुनाव करते हैं."
 
-#: ../src/gui/assistant.cpp:615
+#: ../src/gui/assistant.cpp:620
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "मैं ekiga.net फ्री सेवा के लिए हस्ताक्षर नहीं करना चाहता हूँ"
 
-#: ../src/gui/assistant.cpp:678
+#: ../src/gui/assistant.cpp:683
 msgid "Ekiga Call Out Account"
 msgstr "एकिगा कॉलआउट खाता"
 
-#: ../src/gui/assistant.cpp:680
+#: ../src/gui/assistant.cpp:685
 msgid "Please enter your account ID:"
 msgstr "कृपया अपना खाता आईडी दाखिल करें:"
 
-#: ../src/gui/assistant.cpp:688
+#: ../src/gui/assistant.cpp:693
 msgid "Please enter your PIN code:"
 msgstr "कृपया अपना PIN कोड दाखिल करें:"
 
-#: ../src/gui/assistant.cpp:699
+#: ../src/gui/assistant.cpp:704
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1935,49 +1919,55 @@
 "The service will work only if your account is created using the URL in this "
 "dialog.\n"
 msgstr ""
+"आप सामान्य फोन और सेल नंबर पर दुनिया भर में एकिगा से कॉल कर सकते हैं.\n"
+"\n"
+"इसे सक्रिय करने के लिए, आपको दो चीजें करनी होंगी:\n"
+"- नीचे URL पर एक खाता खरीदें.\n"
+"- फिर अपना खाता ID और पिन कोड दाखिल करें.\n"
+"यह सेवा तभी काम करेगी यदि आपका खाता URL के प्रयोग इस संवाद में बनाया जाता है.\n"
 
-#: ../src/gui/assistant.cpp:749
+#: ../src/gui/assistant.cpp:754
 msgid "Consult the calls history"
 msgstr "कॉल इतिहास देखें"
 
-#: ../src/gui/assistant.cpp:759
+#: ../src/gui/assistant.cpp:764
 msgid "I do not want to sign up for the Ekiga Call Out service"
-msgstr ""
+msgstr "मैं एकिगा कॉल आउट सेवा के लिए साइन अप नहीं करना चाहता हूँ"
 
-#: ../src/gui/assistant.cpp:825 ../src/gui/assistant.cpp:1388
+#: ../src/gui/assistant.cpp:830 ../src/gui/assistant.cpp:1393
 msgid "Connection Type"
 msgstr "कनेक्शन क़िस्म"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:828
+#: ../src/gui/assistant.cpp:833
 msgid "Please choose your connection type:"
 msgstr "कृपया अपना कनेक्शन प्रकार चुनें:"
 
-#: ../src/gui/assistant.cpp:845
+#: ../src/gui/assistant.cpp:850
 msgid "56k Modem"
 msgstr "56K मॉडेम"
 
-#: ../src/gui/assistant.cpp:850
+#: ../src/gui/assistant.cpp:855
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:855
+#: ../src/gui/assistant.cpp:860
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "DSL/Cable (128 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:860
+#: ../src/gui/assistant.cpp:865
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "DSL/Cable (512 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:865
+#: ../src/gui/assistant.cpp:870
 msgid "LAN"
 msgstr "LAN"
 
-#: ../src/gui/assistant.cpp:870
+#: ../src/gui/assistant.cpp:875
 msgid "Keep current settings"
 msgstr "वर्तमान विन्यास रखे रहें"
 
-#: ../src/gui/assistant.cpp:875
+#: ../src/gui/assistant.cpp:880
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -1986,101 +1976,101 @@
 "कनेक्शन सबसे अच्छी जमावट निर्धारित करने की अनुमति देगा जो एकिगा कॉल के दौरान प्रयोग "
 "करेगा. वरीयता विंडो में आप बाद में जमावट बदल सकते हैं."
 
-#: ../src/gui/assistant.cpp:969 ../src/gui/main.cpp:3012
+#: ../src/gui/assistant.cpp:974 ../src/gui/main.cpp:3012
 #: ../src/gui/main.cpp:3016 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "ऑडियो डिवाइस"
 
-#: ../src/gui/assistant.cpp:971
+#: ../src/gui/assistant.cpp:976
 msgid "Please choose the audio ringing device:"
-msgstr ""
+msgstr "कृपया कोई ऑडियो रिंगिंग युक्ति चुनें:"
 
-#: ../src/gui/assistant.cpp:991
+#: ../src/gui/assistant.cpp:996
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
-msgstr ""
+msgstr "ऑडियो रिंगिंग युक्ति एक ऐसी युक्ति है जो कि रिंगिंग ध्वनि बजाने के लिए प्रयुक्त होता है आने वाले कॉल पर."
 
 #. ---
-#: ../src/gui/assistant.cpp:1002
+#: ../src/gui/assistant.cpp:1007
 msgid "Please choose the audio output device:"
 msgstr "कृपया ऑडियो आउटपुट डिवाइस चुनें:"
 
-#: ../src/gui/assistant.cpp:1022
+#: ../src/gui/assistant.cpp:1027
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
-msgstr ""
+msgstr "ऑडियो आउटपुट युक्ति एक ऐसी युक्ति है जो कि ध्वनि बजाने के लिए प्रयुक्त होता है आने वाले कॉल पर."
 
 #. ---
-#: ../src/gui/assistant.cpp:1033
+#: ../src/gui/assistant.cpp:1038
 msgid "Please choose the audio input device:"
 msgstr "कृपया ऑडियो इनपुट डिवाइस चुनें:"
 
-#: ../src/gui/assistant.cpp:1053
+#: ../src/gui/assistant.cpp:1058
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
-msgstr ""
+msgstr "ऑडियो इनपुट युक्ति एक ऐसी युक्ति है जो कि आपके आवाज को रिकार्ड करने के लिए प्रयुक्त होता है आने वाले कॉल पर."
 
-#: ../src/gui/assistant.cpp:1155
+#: ../src/gui/assistant.cpp:1160
 msgid "Please choose your video input device:"
-msgstr ""
+msgstr "कृपया अपना विडियो इनपुट युक्ति चुनें:"
 
-#: ../src/gui/assistant.cpp:1175
+#: ../src/gui/assistant.cpp:1180
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
-msgstr ""
+msgstr "वीडियो इनपुट युक्ति एक ऐसी युक्ति है जो कि वीडियो लेने के लिए प्रयुक्त होता है कॉल के दौरान."
 
-#: ../src/gui/assistant.cpp:1240 ../src/gui/assistant.cpp:1264
-#: ../src/gui/assistant.cpp:1288 ../src/gui/preferences.cpp:805
+#: ../src/gui/assistant.cpp:1245 ../src/gui/assistant.cpp:1269
+#: ../src/gui/assistant.cpp:1293 ../src/gui/preferences.cpp:805
 #: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "कोई डिवायस नहीं मिला"
 
-#: ../src/gui/assistant.cpp:1319
+#: ../src/gui/assistant.cpp:1324
 msgid "Configuration Complete"
 msgstr "कॉन्फ़िगरेशन पूर्ण"
 
-#: ../src/gui/assistant.cpp:1321
+#: ../src/gui/assistant.cpp:1326
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
-msgstr ""
+msgstr "आपने एकिगा विन्यास पूरा किया है. सभी सेटिंग एकिगा की वरीयता में बदल जाएगी. आनंद लें!"
 
-#: ../src/gui/assistant.cpp:1328
+#: ../src/gui/assistant.cpp:1333
 msgid "Configuration summary:"
 msgstr "विन्यास सार:"
 
-#: ../src/gui/assistant.cpp:1398
+#: ../src/gui/assistant.cpp:1403
 msgid "Audio Ringing Device"
 msgstr "ऑडियो रिंगिंग युक्ति"
 
-#: ../src/gui/assistant.cpp:1407
+#: ../src/gui/assistant.cpp:1412
 msgid "Audio Output Device"
 msgstr "ऑडियो आउटपुट युक्ति"
 
-#: ../src/gui/assistant.cpp:1416
+#: ../src/gui/assistant.cpp:1421
 msgid "Audio Input Device"
 msgstr "ऑडियो इनपुट युक्ति"
 
-#: ../src/gui/assistant.cpp:1425
+#: ../src/gui/assistant.cpp:1430
 msgid "Video Input Device"
 msgstr "वीडियो इनपुट युक्ति"
 
-#: ../src/gui/assistant.cpp:1438
+#: ../src/gui/assistant.cpp:1443
 msgid "SIP URI"
 msgstr "SIP URI"
 
-#: ../src/gui/assistant.cpp:1450
+#: ../src/gui/assistant.cpp:1455
 msgid "Ekiga Call Out"
 msgstr "Ekiga कालआउट"
 
-#: ../src/gui/assistant.cpp:1492
+#: ../src/gui/assistant.cpp:1499
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
-msgstr ""
+msgstr "एकिगा विन्यास सहायक (%d of %d)"
 
 #: ../src/gui/callbacks.cpp:131
 msgid "Contributors:"
@@ -2156,10 +2146,9 @@
 
 #: ../src/gui/callbacks.cpp:269
 msgid "Help display is not supported by your GTK+ version"
-msgstr ""
+msgstr "मदद प्रदर्शन आपके GTK+ संस्करण के द्वारा समर्थित नहीं है"
 
 #: ../src/gui/callbacks.cpp:277
-#| msgid "Failed to open the device"
 msgid "Unable to open help file."
 msgstr "मदद फाइ खोलने में असमर्थ."
 
@@ -2250,47 +2239,47 @@
 
 #: ../src/gui/main.cpp:982
 msgid "Error while initializing video output"
-msgstr ""
+msgstr "विडियो आउटपुट आरंभ करने के दौरान त्रुटि"
 
 #: ../src/gui/main.cpp:983
 msgid "No video will be displayed during this call->"
-msgstr ""
+msgstr "कॉल के दौरान कोई वीडियो नहीं दिखाई जाएगी->"
 
 #: ../src/gui/main.cpp:993
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that no other application is using the accelerated video output."
-msgstr ""
+msgstr "वीडियो आउटपुट को खोलने या आरंभ करने के दौरान त्रुटि थी. कृपया जाँचें कि कोई दूसरा अनुप्रयोग त्वरित वीडियो आउटपुट का प्रयोग तो नहीं कर रहा है."
 
 #: ../src/gui/main.cpp:995
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that you are using a color depth of 24 or 32 bits per pixel."
-msgstr ""
+msgstr "वीडियो आउटपुट को खोलने या आरंभ करने के दौरान त्रुटि थी. कृपया जाँचें कि आप 24 या 32 बिट प्रति पिक्सेल की रंग गहराई का प्रयोग कर रहे हैं."
 
 #. Translators: This is a hotplug status
 #: ../src/gui/main.cpp:1108
 #, c-format
 msgid "Added video input device %s"
-msgstr ""
+msgstr "विडियो इनपुट युक्ति %s जोड़ा"
 
 #. Translators: This is a hotplug status
 #: ../src/gui/main.cpp:1120
 #, c-format
 msgid "Removed video input device %s"
-msgstr ""
+msgstr "विडियो इनपुट युक्ति %s हटाया"
 
 #: ../src/gui/main.cpp:1137
 #, c-format
 msgid "Error while accessing video device %s"
-msgstr ""
+msgstr "विडियो युक्ति %s की पहुँच के दौरान त्रुटि"
 
 #: ../src/gui/main.cpp:1140
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
 "plugin and \"Moving logo\" or \"Static picture\" as device."
-msgstr ""
+msgstr "एक गतिशील लोगो कॉल के दौरान प्रेषित की जाएगी. ध्यान दें कि आप हमेशा किसी दिए छवि को प्रेषित करेगे या गतिशील लोगो को \"Picture\" को बतौर वीडियो प्लगइन और \"Moving logo\" या \"Static picture\" को बतौर युक्ति चुनकर."
 
 #: ../src/gui/main.cpp:1144
 msgid ""
@@ -2298,7 +2287,7 @@
 "device it may be sufficient to reconnect it. If not, or if it still is not "
 "accessible, please check your permissions and make sure that the appropriate "
 "driver is loaded."
-msgstr ""
+msgstr "युक्ति को खोलने के दौरान त्रुटि थी. यदि यह एक प्लगेबल युक्ति है, इसे फिर कनेक्ट करना पर्याप्त होगा.. यदि नहीं, या यदि यह अभी भी पहुँच योग्य नहीं है, कृपया अपना अनुमति जाँचें और देखें उचित ड्राइवर लोड किया है या नहीं."
 
 #: ../src/gui/main.cpp:1148
 msgid "Your video driver doesn't support the requested video format."
@@ -2334,24 +2323,24 @@
 #: ../src/gui/main.cpp:1219
 #, c-format
 msgid "Added audio input device %s"
-msgstr ""
+msgstr "ऑडियो इनपुट युक्ति %s जोड़ा"
 
 #. Translators: This is a hotplug status
 #: ../src/gui/main.cpp:1236
 #, c-format
 msgid "Removed audio input device %s"
-msgstr ""
+msgstr "ऑडियो इनपुट युक्ति %s हटाया"
 
 #: ../src/gui/main.cpp:1253
 #, c-format
 msgid "Error while opening audio input device %s"
-msgstr ""
+msgstr "ऑडियो इनपुट युक्ति %s को खोलने के दौरान त्रुटि"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
 #: ../src/gui/main.cpp:1258
 msgid "Only silence will be transmitted."
-msgstr ""
+msgstr "केवल मौन संप्रेषित की जाएगी."
 
 #: ../src/gui/main.cpp:1262
 msgid ""
@@ -2359,7 +2348,7 @@
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
 "still is not accessible, please check your audio setup, the permissions and "
 "that the device is not busy."
-msgstr ""
+msgstr "चयनित ऑडियो युक्ति को रिकार्डिंग के लिए खोलने में असमर्थ. यदि यह एक प्लगेबल युक्ति है, इसे फिर कनेक्ट करना पर्याप्त होगा.. यदि नहीं, या यदि यह अभी भी पहुँच योग्य नहीं है, कृपया अपना ऑडियो सेटअप जाँचें, अनुमति, और देखें कि युक्ति व्यस्त तो नहीं है."
 
 #: ../src/gui/main.cpp:1266
 msgid ""
@@ -2367,26 +2356,26 @@
 "read data from this device. In case it is a pluggable device it may be "
 "sufficient to reconnect it. If not, or if it still is not accessible, please "
 "check your audio setup."
-msgstr ""
+msgstr "चयनित ऑडियो युक्ति सफलतापूर्वक खोला गया लेकिन इस युक्ति से आंकड़ा पढ़ना असंभव है. उस स्थिति में यदि यह एक प्लगेबल युक्ति है यह पर्याप्त होगा इसे फिर कनेक्ट करना. यदि नहीं, या यदि यह अभी भी पहुँच योग्य नहीं है, कृपया अपना ऑडियो सेटअप जाँचें."
 
 #: ../src/gui/main.cpp:1333
 #, c-format
 msgid "Added audio output device %s"
-msgstr ""
+msgstr "ऑडियो आउटपुट युक्ति %s जोड़ा"
 
 #: ../src/gui/main.cpp:1349
 #, c-format
 msgid "Removed audio output device %s"
-msgstr ""
+msgstr "ऑडियो आउटपुट युक्ति %s हटाया"
 
 #: ../src/gui/main.cpp:1370
 #, c-format
 msgid "Error while opening audio output device %s"
-msgstr ""
+msgstr "ऑडियो आउटपुट युक्ति %s को खोलने के दौरान त्रुटि"
 
 #: ../src/gui/main.cpp:1373
 msgid "No incoming sound will be played."
-msgstr ""
+msgstr "कोई आनेवाली ध्वनि नहीं बजायी जाएगी."
 
 #: ../src/gui/main.cpp:1377
 msgid ""
@@ -2394,10 +2383,9 @@
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
 "still is not accessible, please check your audio setup, the permissions and "
 "that the device is not busy."
-msgstr ""
+msgstr "बजाने के लिए चयनित ऑडियो युक्ति खोलने में असमर्थ. यदि यह एक प्लगेबल युक्ति है, इसे फिर कनेक्ट करना पर्याप्त होगा. यदि नहीं, या यह अभी भी पहुँच योग्य नहीं है, कृपया अपने ऑडियो सेटअप को जाँचें, अनुमति, और देखें कि युक्ति व्यस्त तो नहीं है."
 
 #: ../src/gui/main.cpp:1381
-#, fuzzy
 #| msgid ""
 #| "The selected audio device (%s) was successfully opened but it is "
 #| "impossible to write data to this device. Please check your audio setup."
@@ -2407,8 +2395,8 @@
 "sufficient to reconnect it. If not, or if it still is not accessible, please "
 "check your audio setup."
 msgstr ""
-"चयनित ऑडियो डिवाइस (%s) सफलतापूर्वक खोला गया लेकिन यह असंभव है आंकड़ा को डिवाइस में "
-"लिखना . कृपया अपना ऑडियो सेटअप जांचे."
+"चयनित ऑडियो डिवाइस सफलतापूर्वक खोला गया लेकिन यह असंभव है आंकड़ा को डिवाइस में "
+"लिखना . उस स्थिति में यदि यह एक प्लगेबल युक्ति है यह पर्याप्त होगा इसे फिर कनेक्ट करना. यदि नहीं, या यदि यह अभी भी पहुँच योग्य नहीं है, कृपया अपना ऑडियो सेटअप जाँचें."
 
 #: ../src/gui/main.cpp:1569
 msgid "Video Settings"
@@ -2502,15 +2490,15 @@
 
 #: ../src/gui/main.cpp:3011
 msgid "Detected new audio input device:"
-msgstr ""
+msgstr "नई ऑडियो इनपुट युक्ति पाया:"
 
 #: ../src/gui/main.cpp:3015
 msgid "Detected new audio output device:"
-msgstr ""
+msgstr "नई ऑडियो आउटपुट युक्ति पाया:"
 
 #: ../src/gui/main.cpp:3019
 msgid "Detected new video input device:"
-msgstr ""
+msgstr "नई वीडियो इनपुट युक्ति पाया:"
 
 #: ../src/gui/main.cpp:3020 ../src/gui/preferences.cpp:921
 msgid "Video Devices"
@@ -2518,7 +2506,7 @@
 
 #: ../src/gui/main.cpp:3038
 msgid "Do you want to use it as default device?"
-msgstr ""
+msgstr "क्या इसे आप तयशुदा युक्ति के रूप में प्रयोग करना चाहते हैं?"
 
 #: ../src/gui/main.cpp:3106
 msgid "_Chat"
@@ -2546,7 +2534,7 @@
 
 #: ../src/gui/main.cpp:3118
 msgid "Add a contact to the roster"
-msgstr ""
+msgstr "रोस्टर में कोई संपर्क जोड़ें"
 
 #: ../src/gui/main.cpp:3123
 msgid "Find contacts"
@@ -2666,7 +2654,7 @@
 
 #: ../src/gui/main.cpp:3241
 msgid "Picture-in-Picture in Separate _Window"
-msgstr ""
+msgstr "पृथक विंडो में तस्वीर में तस्वीर (_W)"
 
 #: ../src/gui/main.cpp:3249
 msgid "Zoom in"
@@ -2698,7 +2686,7 @@
 
 #: ../src/gui/main.cpp:3348
 msgid "Enter a URI on the left, and click this button to place a call or to hangup"
-msgstr ""
+msgstr "बायीं ओर URI दाखिल करें, इस बटन को क्लिक करें कोई कॉल या हैंगअप रखने के लिए"
 
 #: ../src/gui/main.cpp:3399
 msgid "Contacts"
@@ -2714,11 +2702,11 @@
 
 #: ../src/gui/main.cpp:3544
 msgid "Change the volume of your soundcard"
-msgstr ""
+msgstr "अपनी साउंडकार्ड की आवाज बदलें"
 
 #: ../src/gui/main.cpp:3564
 msgid "Change the color settings of your video device"
-msgstr ""
+msgstr "अपना वीडियो युक्ति का रंग सेटिंग बदलें"
 
 #: ../src/gui/main.cpp:3675
 msgid "Ekiga"
@@ -2753,21 +2741,21 @@
 
 #: ../src/gui/main.cpp:4406
 msgid "Prints debug messages in the console (level between 1 and 5)"
-msgstr ""
+msgstr "कंसोल में डिबग संदेश छापें (1 और 5 के बीच स्तर)"
 
 #: ../src/gui/main.cpp:4411
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
-msgstr ""
+msgstr "कंसोल में उपयोक्ता सादा डिबग संदेश छापें (1 और 4 के बीच स्तर)"
 
 #: ../src/gui/main.cpp:4416
 msgid "Makes Ekiga call the given URI"
 msgstr "एकिगा को दिए URI को कॉल करने के लिए कहता है"
 
-#: ../src/gui/main.cpp:4525
+#: ../src/gui/main.cpp:4528
 msgid "No usable audio plugin detected"
 msgstr "कोई प्रयोग करने योग्य ऑडियो प्लगिन जांचा नहीं गया"
 
-#: ../src/gui/main.cpp:4526
+#: ../src/gui/main.cpp:4529
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
@@ -2775,15 +2763,15 @@
 "एकिगा किसी प्रयोग योग्य ऑडियो प्लगिन को नहीं खोज पाता है. सुनिश्चित करें कि आपका "
 "संस्थापन सही है."
 
-#: ../src/gui/main.cpp:4529
+#: ../src/gui/main.cpp:4532
 msgid "No usable audio codecs detected"
 msgstr "कोई प्रयोग के लायक ऑडियो कोडेक नहीं जाँचा गया"
 
-#: ../src/gui/main.cpp:4530
+#: ../src/gui/main.cpp:4533
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
-msgstr ""
+msgstr "एकिगा में कोई प्रयोग योग्य ऑडियो कोडेक नहीं मिला. सुनिश्चित करें कि आपका संस्थापन सही है."
 
 #: ../src/gui/preferences.cpp:381
 msgid "Play sound for new voice mails"
@@ -2818,15 +2806,13 @@
 msgstr "विंडो को अन्य विंडो के ऊपर वीडियो रखें (_a)"
 
 #: ../src/gui/preferences.cpp:490
-#| msgid "Video Settings"
 msgid "Network Settings"
 msgstr "संजाल सेटिंग"
 
 #: ../src/gui/preferences.cpp:492
-#, fuzzy
 #| msgid "Enable silence _detection"
 msgid "Disable network _detection"
-msgstr "साइलेंस डिटेक्शन सक्षम करें (_d)"
+msgstr "संजाल जाँच निष्क्रिय करें (_d)"
 
 #: ../src/gui/preferences.cpp:503
 msgid "Call Forwarding"
@@ -2961,7 +2947,7 @@
 
 #: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
 msgid "This allows you to set the mode for DTMFs sending."
-msgstr ""
+msgstr "यह आपको DTMF प्रेषण के लिए विधि सेट करने की अनुमति देता है."
 
 #: ../src/gui/preferences.cpp:716
 msgid "INFO"
@@ -2977,7 +2963,7 @@
 
 #: ../src/gui/preferences.cpp:768
 msgid "Select the ringing audio device to use"
-msgstr ""
+msgstr "प्रयोग के लिए रिंगिंग ध्वनि युक्ति चुनें"
 
 #: ../src/gui/preferences.cpp:770
 msgid "Output device:"
@@ -2994,7 +2980,7 @@
 
 #: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
 msgid "Click here to refresh the device list."
-msgstr ""
+msgstr "युक्ति सूची को ताज़ा करने के लिए यहाँ क्लिक करें"
 
 #: ../src/gui/preferences.cpp:906
 msgid "PAL (Europe)"
@@ -3023,7 +3009,7 @@
 
 #: ../src/gui/preferences.cpp:934
 msgid "Select the transmitted video size"
-msgstr ""
+msgstr "प्रेषित विडियो आकार चुनें"
 
 #: ../src/gui/preferences.cpp:936
 msgid "Format:"
@@ -3058,7 +3044,7 @@
 
 #: ../src/gui/preferences.cpp:984
 msgid "Maximum _jitter buffer (in ms):"
-msgstr ""
+msgstr "अधिकतम jitter बफर (_j) (ms में):"
 
 #: ../src/gui/preferences.cpp:984
 msgid "The maximum jitter buffer size for audio reception (in ms)."
@@ -3074,18 +3060,18 @@
 "Choose if you want to guarantee a minimum image quality (possibly leading to "
 "dropped frames in order not to surpass the bitrate limit) or if you prefer "
 "to keep the frame rate."
-msgstr ""
+msgstr "चुनें यदि आप किसी न्यूनतम छवि गुणवत्ता की गारंटी देते हैं (संभवतः ड्राप फ्रेम के साथ बिटरेट सीमा को ताकि सरपास न करें) या यदि आप फ्रेम दर बनाए रखना चाहते हैं."
 
 #: ../src/gui/preferences.cpp:1020
 msgid "Maximum video _bitrate (in kbits/s):"
-msgstr ""
+msgstr "अधिकतम वीडियो बिटरेट (_b) (kbits/s में):"
 
 #: ../src/gui/preferences.cpp:1020
 msgid ""
 "The maximum video bitrate in kbits/s. The video quality and the effective "
 "frame rate will be dynamically adjusted to keep the bitrate at the given "
 "value."
-msgstr ""
+msgstr "अधिकतम वीडियो बिटरेट kbits/s में. वीडियो गुणवत्ता और प्रभावी फ्रेम दर को गतिशील रूप से समायोजित किया जाएगा दिए गए मन पर बिटरेट को बनाए रखने के लिए."
 
 #: ../src/gui/preferences.cpp:1333
 msgid "Ekiga Preferences"
@@ -3135,8 +3121,8 @@
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "आपके पास %d संदेश है"
+msgstr[1] "आपके पास %d संदेश हैं"
 
 #: ../src/gui/statusmenu.cpp:87
 msgid "Online"
diff -Nru ekiga-3.2.5/po/hu.po ekiga-3.2.6~ppa~karmic1/po/hu.po
--- ekiga-3.2.5/po/hu.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/hu.po	2009-09-10 21:34:46.000000000 +0100
@@ -6,14 +6,15 @@
 # Andras Timar <timar@gnome.hu>, 2002, 2003.
 # Laszlo Dvornik <dvornik@gnome.hu>, 2004.
 # Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005, 2006, 2007, 2008, 2009.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: ekiga.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga&component=general\n"
-"POT-Creation-Date: 2009-02-22 20:23+0000\n"
-"PO-Revision-Date: 2009-02-28 15:10+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
-"Language-Team: Hungarian <gnome@fsf.hu>\n"
+"POT-Creation-Date: 2009-04-16 20:21+0000\n"
+"PO-Revision-Date: 2009-09-10 14:34+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
+"Language-Team: Hungarian <gnome at fsf dot hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -118,27 +119,31 @@
 msgid "Disable video hardware acceleration"
 msgstr "A kép hardvergyorsításának kikapcsolása"
 
-#: ../ekiga.schemas.in.in.h:18
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3586
+msgid "Display images from your camera device"
+msgstr "Képek megjelenítése a kamerából"
+
+#: ../ekiga.schemas.in.in.h:19
 msgid "Enable 'Fast Start'"
 msgstr "”Gyors indítás” engedélyezése"
 
-#: ../ekiga.schemas.in.in.h:19
+#: ../ekiga.schemas.in.in.h:20
 msgid "Enable H.245 tunneling"
 msgstr "H.245 alagutazás engedélyezése"
 
-#: ../ekiga.schemas.in.in.h:20
+#: ../ekiga.schemas.in.in.h:21
 msgid "Enable early H.245"
 msgstr "Korai H.245 engedélyezése"
 
-#: ../ekiga.schemas.in.in.h:21
+#: ../ekiga.schemas.in.in.h:22
 msgid "Enable echo cancelation"
 msgstr "Visszhangtörlés engedélyezése"
 
-#: ../ekiga.schemas.in.in.h:22
+#: ../ekiga.schemas.in.in.h:23
 msgid "Enable silence detection"
 msgstr "Csendérzékelés engedélyezése"
 
-#: ../ekiga.schemas.in.in.h:23
+#: ../ekiga.schemas.in.in.h:24
 msgid ""
 "Enter the number of seconds after which Ekiga should try refreshing the NAT "
 "binding when STUN is being used"
@@ -146,31 +151,31 @@
 "Adja meg a másodpercek számát, amely után az Ekiga próbálja meg frissíteni a "
 "NAT kötést STUN használatakor"
 
-#: ../ekiga.schemas.in.in.h:24 ../src/gui/preferences.cpp:459
+#: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
 msgid "Enter your full name"
 msgstr "Adja meg a teljes nevét"
 
-#: ../ekiga.schemas.in.in.h:25
+#: ../ekiga.schemas.in.in.h:26
 msgid "Forward calls to host"
 msgstr "Továbbítsa a hívásokat ide"
 
-#: ../ekiga.schemas.in.in.h:26
+#: ../ekiga.schemas.in.in.h:27
 msgid "Forward calls to the given host if busy"
 msgstr "Hívások továbbítása az adott állomásnak foglaltság esetén"
 
-#: ../ekiga.schemas.in.in.h:27
+#: ../ekiga.schemas.in.in.h:28
 msgid "Forward calls to the given host if no answer"
 msgstr "Hívások továbbítása a megadott állomásnak, ha nincs válasz"
 
-#: ../ekiga.schemas.in.in.h:28 ../src/gui/preferences.cpp:1018
+#: ../ekiga.schemas.in.in.h:29 ../src/gui/preferences.cpp:1018
 msgid "Frame Rate"
 msgstr "Sebesség"
 
-#: ../ekiga.schemas.in.in.h:29
+#: ../ekiga.schemas.in.in.h:30
 msgid "Full name"
 msgstr "Teljes név"
 
-#: ../ekiga.schemas.in.in.h:30 ../src/gui/preferences.cpp:477
+#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:477
 msgid ""
 "If enabled, Ekiga will start hidden provided that the notification area is "
 "present in the GNOME panel"
@@ -178,7 +183,7 @@
 "Ha engedélyezi, az Ekiga rejtve fog elindulni, ha az értesítési terület "
 "kisalkalmazás fut a GNOME panelen"
 
-#: ../ekiga.schemas.in.in.h:31
+#: ../ekiga.schemas.in.in.h:32
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below"
@@ -186,7 +191,7 @@
 "Ha engedélyezve van, akkor minden bejövő hívás az alábbi mezőben megadott "
 "kiszolgálóra lesz továbbítva"
 
-#: ../ekiga.schemas.in.in.h:32
+#: ../ekiga.schemas.in.in.h:33
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you already are in a call or if you are in "
@@ -195,7 +200,7 @@
 "Ha engedélyezi, minden bejövő hívás a lejjebb megadott kiszolgálóra lesz "
 "továbbítva, ha már folyamatban van egy hívás vagy Ne zavarjanak módban van"
 
-#: ../ekiga.schemas.in.in.h:33
+#: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you do not answer the call"
@@ -203,142 +208,138 @@
 "Ha engedélyezve van, akkor minden bejövő hívás az alábbi mezőben megadott "
 "kiszolgálóra lesz továbbítva, ha nem fogadja a hívást"
 
-#: ../ekiga.schemas.in.in.h:34 ../src/gui/preferences.cpp:479
+#: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
 msgid "If enabled, offline contacts will be shown in the roster"
 msgstr "Ha engedélyezve van, a kilépett partnerek megjelennek a partnerlistán"
 
-#: ../ekiga.schemas.in.in.h:35
+#: ../ekiga.schemas.in.in.h:36
 msgid "If enabled, use echo cancelation"
 msgstr ""
 "Ha engedélyezve van, akkor az automatikus visszhangtörlés kerül "
 "felhasználásra"
 
-#: ../ekiga.schemas.in.in.h:36
+#: ../ekiga.schemas.in.in.h:37
 msgid "If enabled, use silence detection with the codecs supporting it"
 msgstr ""
 "Ha engedélyezve van, akkor az azt támogató kodekek használják a "
 "csendérzékelést"
 
-#: ../ekiga.schemas.in.in.h:37
+#: ../ekiga.schemas.in.in.h:38
 msgid "Kind of network selected in the druid"
-msgstr "A varázslóban kiválasztott hálózattípus"
+msgstr "Az asszisztensben kiválasztott hálózattípus"
 
-#: ../ekiga.schemas.in.in.h:38
+#: ../ekiga.schemas.in.in.h:39
 msgid "LDAP servers"
 msgstr "LDAP kiszolgálók"
 
-#: ../ekiga.schemas.in.in.h:39
+#: ../ekiga.schemas.in.in.h:40
 msgid "List of configured LDAP servers"
 msgstr "A beállított LDAP kiszolgálók listája"
 
-#: ../ekiga.schemas.in.in.h:40
+#: ../ekiga.schemas.in.in.h:41
 msgid "List of folded groups in the roster"
 msgstr "A partnerlista összecsukott csoportjainak listája"
 
-#: ../ekiga.schemas.in.in.h:41
+#: ../ekiga.schemas.in.in.h:42
 msgid "Listen port"
 msgstr "Figyelőport"
 
-#: ../ekiga.schemas.in.in.h:42
+#: ../ekiga.schemas.in.in.h:43
 msgid "Local video window size"
 msgstr "Helyi videoablak mérete"
 
-#: ../ekiga.schemas.in.in.h:43
+#: ../ekiga.schemas.in.in.h:44
 msgid "Maximum RX video bitrate"
 msgstr "Beérkező video maximális bitsebessége"
 
-#: ../ekiga.schemas.in.in.h:44
+#: ../ekiga.schemas.in.in.h:45
 msgid "Maximum TX video bitrate"
 msgstr "Kimenő video maximális bitsebessége"
 
-#: ../ekiga.schemas.in.in.h:45
+#: ../ekiga.schemas.in.in.h:46
 msgid "Maximum jitter buffer"
 msgstr "Maximális jitter puffer"
 
-#: ../ekiga.schemas.in.in.h:46
+#: ../ekiga.schemas.in.in.h:47
 msgid "NAT Binding Timeout"
 msgstr "NAT kötés időtúllépése"
 
-#: ../ekiga.schemas.in.in.h:47
+#: ../ekiga.schemas.in.in.h:48
 msgid "No answer timeout"
 msgstr "Nincs válaszidő-túllépés"
 
-#: ../ekiga.schemas.in.in.h:48
+#: ../ekiga.schemas.in.in.h:49
 msgid "Outbound Proxy"
 msgstr "Kimenő proxy"
 
-#: ../ekiga.schemas.in.in.h:49 ../src/gui/preferences.cpp:486
+#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video above other windows during calls"
 msgstr "A videot megjelenítő ablak legfelülre helyezése hívás közben"
 
-#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:371
+#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
 msgid "Play busy tone"
 msgstr "Foglalt jelzés lejátszása"
 
-#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:361
+#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:361
 msgid "Play ring tone"
 msgstr "Csengés lejátszása"
 
-#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:351
+#: ../ekiga.schemas.in.in.h:53 ../src/gui/preferences.cpp:351
 msgid "Play sound on incoming calls"
 msgstr "Hang lejátszása a bejövő hívásoknál"
 
-#: ../ekiga.schemas.in.in.h:53
+#: ../ekiga.schemas.in.in.h:54
 msgid "Play sound on new message"
 msgstr "Hang lejátszása új üzenetnél"
 
-#: ../ekiga.schemas.in.in.h:54
+#: ../ekiga.schemas.in.in.h:55
 msgid "Play sound on new voice mail"
 msgstr "Hang lejátszása új hangüzenetnél"
 
-#: ../ekiga.schemas.in.in.h:55
+#: ../ekiga.schemas.in.in.h:56
 msgid "Position of the local video window"
 msgstr "A helyi videoablak pozíciója"
 
-#: ../ekiga.schemas.in.in.h:56
+#: ../ekiga.schemas.in.in.h:57
 msgid "Position on the screen of the address book window"
 msgstr "A címjegyzék ablak pozíciója a képernyőn"
 
-#: ../ekiga.schemas.in.in.h:57
+#: ../ekiga.schemas.in.in.h:58
 msgid "Position on the screen of the audio settings window"
 msgstr "A hangbeállítások ablak pozíciója a képernyőn"
 
-#: ../ekiga.schemas.in.in.h:58
+#: ../ekiga.schemas.in.in.h:59
 msgid "Position on the screen of the chat window"
 msgstr "A csevegésablak pozíciója a képernyőn"
 
-#: ../ekiga.schemas.in.in.h:59
+#: ../ekiga.schemas.in.in.h:60
 msgid "Position on the screen of the druid window"
-msgstr "A varázslóablak pozíciója a képernyőn"
+msgstr "Az asszisztensablak pozíciója a képernyőn"
 
-#: ../ekiga.schemas.in.in.h:60
+#: ../ekiga.schemas.in.in.h:61
 msgid "Position on the screen of the log window"
 msgstr "A naplóablak pozíciója a képernyőn"
 
-#: ../ekiga.schemas.in.in.h:61
+#: ../ekiga.schemas.in.in.h:62
 msgid "Position on the screen of the main window"
 msgstr "A főablak pozíciója a képernyőn"
 
-#: ../ekiga.schemas.in.in.h:62
+#: ../ekiga.schemas.in.in.h:63
 msgid "Position on the screen of the preferences window"
 msgstr "A beállítások ablak pozíciója a képernyőn"
 
-#: ../ekiga.schemas.in.in.h:63
+#: ../ekiga.schemas.in.in.h:64
 msgid "Position on the screen of the video settings window"
 msgstr "A videobeállítások ablak pozíciója a képernyőn"
 
-#: ../ekiga.schemas.in.in.h:64
+#: ../ekiga.schemas.in.in.h:65
 msgid "Remote video window position"
 msgstr "Túloldali videoablak pozíciója"
 
-#: ../ekiga.schemas.in.in.h:65
+#: ../ekiga.schemas.in.in.h:66
 msgid "Remote video window size"
 msgstr "Túloldali videoablak mérete"
 
-#: ../ekiga.schemas.in.in.h:66
-msgid "Roster view saving group status"
-msgstr "Csoportállapot mentése a partnerlista nézetben"
-
 #: ../ekiga.schemas.in.in.h:67
 msgid "Select an alternative audio output device to use for sound events."
 msgstr ""
@@ -379,7 +380,7 @@
 msgid "Show offline contacts"
 msgstr "Kilépett partnerek mutatása"
 
-#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3214
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3215
 msgid "Show the call panel"
 msgstr "Híváspanel megjelenítése"
 
@@ -397,7 +398,7 @@
 
 #: ../ekiga.schemas.in.in.h:78
 msgid "Size of the druid window"
-msgstr "A varázslóablak mérete"
+msgstr "Az asszisztensablak mérete"
 
 #: ../ekiga.schemas.in.in.h:79
 msgid "Size of the preferences window"
@@ -751,7 +752,7 @@
 msgid "Video format"
 msgstr "Videoformátum"
 
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1153
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1158
 msgid "Video input device"
 msgstr "Video bemeneti eszköz"
 
@@ -856,7 +857,7 @@
 #: ../lib/engine/components/local-roster/local-presentity.cpp:197
 #: ../lib/engine/components/opal/opal-account.cpp:308
 #: ../lib/engine/components/resource-list/rl-presentity.cpp:203
-#: ../src/gui/main.cpp:3172
+#: ../src/gui/main.cpp:3173
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
@@ -1194,7 +1195,7 @@
 
 #: ../lib/engine/components/opal/h323-endpoint.cpp:146
 #: ../lib/engine/components/opal/sip-endpoint.cpp:258
-#: ../lib/engine/components/opal/sip-endpoint.cpp:262 ../src/gui/main.cpp:2946
+#: ../lib/engine/components/opal/sip-endpoint.cpp:262 ../src/gui/main.cpp:2947
 msgid "Transfer"
 msgstr "Hívásátadás"
 
@@ -1227,12 +1228,12 @@
 msgstr "_Engedélyezés"
 
 #: ../lib/engine/components/opal/opal-account.cpp:324
-#: ../src/gui/assistant.cpp:725
+#: ../src/gui/assistant.cpp:730
 msgid "Recharge the account"
 msgstr "A fiók feltöltése"
 
 #: ../lib/engine/components/opal/opal-account.cpp:329
-#: ../src/gui/assistant.cpp:737
+#: ../src/gui/assistant.cpp:742
 msgid "Consult the balance history"
 msgstr "Egyenlegnapló megtekintése"
 
@@ -1330,16 +1331,16 @@
 msgid "Please update the following fields."
 msgstr "Frissítse a következő mezőket."
 
-#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:605
+#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:610
 msgid "Get an Ekiga.net SIP account"
 msgstr "Ekiga.net SIP felhasználói fiók létrehozása"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:713
+#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:718
 msgid "Get an Ekiga Call Out account"
 msgstr "Ekiga pc->telefon felhasználói fiók létrehozása"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:92 ../src/gui/main.cpp:2700
-#: ../src/gui/main.cpp:2795
+#: ../lib/engine/components/opal/opal-bank.cpp:92 ../src/gui/main.cpp:2701
+#: ../src/gui/main.cpp:2796
 msgid "Account ID:"
 msgstr "Felhasználói fiók azonosítója:"
 
@@ -1372,7 +1373,7 @@
 msgid "Abnormal call termination"
 msgstr "A hívás abnormálisan ért véget "
 
-#: ../lib/engine/components/opal/opal-call.cpp:465 ../src/gui/main.cpp:1490
+#: ../lib/engine/components/opal/opal-call.cpp:465 ../src/gui/main.cpp:1491
 msgid "Could not connect to remote host"
 msgstr "Nem lehet kapcsolódni a túloldali géphez"
 
@@ -1425,7 +1426,7 @@
 msgid "Call completed"
 msgstr "Hívás befejezve"
 
-#: ../lib/engine/components/opal/opal-call-manager.cpp:725
+#: ../lib/engine/components/opal/opal-call-manager.cpp:727
 msgid ""
 "Ekiga did not manage to configure your network settings automatically. You "
 "can still use it, but you need to configure your network settings manually.\n"
@@ -1777,7 +1778,7 @@
 msgstr "Címjegyzék"
 
 #: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
-#: ../src/gui/main.cpp:3121
+#: ../src/gui/main.cpp:3122
 msgid "Address _Book"
 msgstr "_Címjegyzék"
 
@@ -1791,7 +1792,7 @@
 msgstr "Kategória"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
-#: ../src/gui/assistant.cpp:1377
+#: ../src/gui/assistant.cpp:1382
 msgid "Full Name"
 msgstr "Teljes név"
 
@@ -1873,11 +1874,11 @@
 msgid "Accounts"
 msgstr "Felhasználói fiókok"
 
-#: ../src/gui/accounts.cpp:659 ../src/gui/main.cpp:3182
+#: ../src/gui/accounts.cpp:659 ../src/gui/main.cpp:3183
 msgid "_Accounts"
 msgstr "_Felhasználói fiókok"
 
-#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3265
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3266
 msgid "_Help"
 msgstr "_Súgó"
 
@@ -1890,7 +1891,7 @@
 msgid "A"
 msgstr "A"
 
-#: ../src/gui/assistant.cpp:323
+#: ../src/gui/assistant.cpp:327
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1898,27 +1899,26 @@
 "Once you have completed these steps, you can always change them later by "
 "selecting Preferences in the Edit menu."
 msgstr ""
-"Ez az Ekiga általános beállításvarázslója. A következő lépésekben néhány "
+"Ez az Ekiga általános beállítóasszisztense. A következő lépésekben néhány "
 "egyszerű kérdés megválaszolásával beállíthatja az Ekigat.\n"
 "\n"
-"A varázsló befejeződése után a beállításokat később bármikor "
+"Az asszisztens befejeződése után a beállításokat később bármikor "
 "megváltoztathatja a Szerkesztés menü Beállítások pontjával."
 
-#: ../src/gui/assistant.cpp:331
-#| msgid "Welcome in Ekiga"
+#: ../src/gui/assistant.cpp:335
 msgid "Welcome to Ekiga"
 msgstr "Üdvözöljük az Ekigaban"
 
-#: ../src/gui/assistant.cpp:365 ../src/gui/preferences.cpp:454
+#: ../src/gui/assistant.cpp:359 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "Személyes adatok"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:368
+#: ../src/gui/assistant.cpp:362
 msgid "Please enter your first name and your surname:"
 msgstr "Adja meg a vezeték- és utónevét:"
 
-#: ../src/gui/assistant.cpp:377
+#: ../src/gui/assistant.cpp:371
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
@@ -1926,19 +1926,19 @@
 "A neve más VoIP és videokonferencia-szoftverekhez való kapcsolódáskor lesz "
 "felhasználva."
 
-#: ../src/gui/assistant.cpp:568
+#: ../src/gui/assistant.cpp:573
 msgid "Ekiga.net Account"
 msgstr "Ekiga.net felhasználói fiók"
 
-#: ../src/gui/assistant.cpp:570
+#: ../src/gui/assistant.cpp:575
 msgid "Please enter your username:"
 msgstr "Adja meg felhasználónevét:"
 
-#: ../src/gui/assistant.cpp:578
+#: ../src/gui/assistant.cpp:583
 msgid "Please enter your password:"
 msgstr "Adja meg jelszavát:"
 
-#: ../src/gui/assistant.cpp:588
+#: ../src/gui/assistant.cpp:593
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1956,23 +1956,23 @@
 "Átlépheti ezt a lépést, ha egy alternatív SIP szolgáltatást használ, vagy ha "
 "később szeretné megadni a bejelentkezés részleteit."
 
-#: ../src/gui/assistant.cpp:615
+#: ../src/gui/assistant.cpp:620
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "Nem akarok feliratkozni az ekiga.net ingyenes szolgáltatására"
 
-#: ../src/gui/assistant.cpp:678
+#: ../src/gui/assistant.cpp:683
 msgid "Ekiga Call Out Account"
 msgstr "Ekiga pc->telefon fiók"
 
-#: ../src/gui/assistant.cpp:680
+#: ../src/gui/assistant.cpp:685
 msgid "Please enter your account ID:"
 msgstr "Adja meg fiókazonosítóját:"
 
-#: ../src/gui/assistant.cpp:688
+#: ../src/gui/assistant.cpp:693
 msgid "Please enter your PIN code:"
 msgstr "Adja meg PIN kódját:"
 
-#: ../src/gui/assistant.cpp:699
+#: ../src/gui/assistant.cpp:704
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1993,48 +1993,48 @@
 "A szolgáltatás csak akkor fog működni, ha azt a párbeszédablakban található "
 "URL használatával hozta létre.\n"
 
-#: ../src/gui/assistant.cpp:749
+#: ../src/gui/assistant.cpp:754
 msgid "Consult the calls history"
 msgstr "Hívásnapló megtekintése"
 
-#: ../src/gui/assistant.cpp:759
+#: ../src/gui/assistant.cpp:764
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr "Nem akarok feliratkozni az Ekiga pc->telefon szolgáltatására"
 
-#: ../src/gui/assistant.cpp:825 ../src/gui/assistant.cpp:1388
+#: ../src/gui/assistant.cpp:830 ../src/gui/assistant.cpp:1393
 msgid "Connection Type"
 msgstr "Kapcsolattípus"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:828
+#: ../src/gui/assistant.cpp:833
 msgid "Please choose your connection type:"
 msgstr "Válassza ki a kapcsolat típusát:"
 
-#: ../src/gui/assistant.cpp:845
+#: ../src/gui/assistant.cpp:850
 msgid "56k Modem"
 msgstr "56k modem"
 
-#: ../src/gui/assistant.cpp:850
+#: ../src/gui/assistant.cpp:855
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:855
+#: ../src/gui/assistant.cpp:860
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "DSL/kábel (128 kbit/s feltöltés)"
 
-#: ../src/gui/assistant.cpp:860
+#: ../src/gui/assistant.cpp:865
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "DSL/kábel (512 kbit/s feltöltés)"
 
-#: ../src/gui/assistant.cpp:865
+#: ../src/gui/assistant.cpp:870
 msgid "LAN"
 msgstr "LAN"
 
-#: ../src/gui/assistant.cpp:870
+#: ../src/gui/assistant.cpp:875
 msgid "Keep current settings"
 msgstr "Jelenlegi beállítások megtartása"
 
-#: ../src/gui/assistant.cpp:875
+#: ../src/gui/assistant.cpp:880
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -2044,16 +2044,16 @@
 "használható legjobb minőségi beállítások meghatározását. Ezeket a "
 "beállításokat később megváltoztathatja a Tulajdonságok párbeszédablakban."
 
-#: ../src/gui/assistant.cpp:969 ../src/gui/main.cpp:3011
-#: ../src/gui/main.cpp:3015 ../src/gui/preferences.cpp:760
+#: ../src/gui/assistant.cpp:974 ../src/gui/main.cpp:3012
+#: ../src/gui/main.cpp:3016 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "Hangeszközök"
 
-#: ../src/gui/assistant.cpp:971
+#: ../src/gui/assistant.cpp:976
 msgid "Please choose the audio ringing device:"
 msgstr "Válassza ki a csengés eszközét:"
 
-#: ../src/gui/assistant.cpp:991
+#: ../src/gui/assistant.cpp:996
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
@@ -2062,48 +2062,48 @@
 "használandó eszköz."
 
 #. ---
-#: ../src/gui/assistant.cpp:1002
+#: ../src/gui/assistant.cpp:1007
 msgid "Please choose the audio output device:"
 msgstr "Válassza ki a hangkimeneti eszközt:"
 
-#: ../src/gui/assistant.cpp:1022
+#: ../src/gui/assistant.cpp:1027
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
 msgstr "A hangkimeneti eszköz a hívásokkor hanglejátszásra használandó eszköz."
 
 #. ---
-#: ../src/gui/assistant.cpp:1033
+#: ../src/gui/assistant.cpp:1038
 msgid "Please choose the audio input device:"
 msgstr "Válassza ki a hangbemeneti eszközt:"
 
-#: ../src/gui/assistant.cpp:1053
+#: ../src/gui/assistant.cpp:1058
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
 msgstr "A hangbemeneti eszköz a hívásokkor a hang felvételére használandó eszköz."
 
-#: ../src/gui/assistant.cpp:1155
+#: ../src/gui/assistant.cpp:1160
 msgid "Please choose your video input device:"
 msgstr "Válassza ki a videobemeneti eszközt:"
 
-#: ../src/gui/assistant.cpp:1175
+#: ../src/gui/assistant.cpp:1180
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
 msgstr "A videobemeneti eszköz a hívásokkor a videó felvételére használandó eszköz."
 
-#: ../src/gui/assistant.cpp:1240 ../src/gui/assistant.cpp:1264
-#: ../src/gui/assistant.cpp:1288 ../src/gui/preferences.cpp:805
+#: ../src/gui/assistant.cpp:1245 ../src/gui/assistant.cpp:1269
+#: ../src/gui/assistant.cpp:1293 ../src/gui/preferences.cpp:805
 #: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "Eszköz nem található"
 
-#: ../src/gui/assistant.cpp:1319
+#: ../src/gui/assistant.cpp:1324
 msgid "Configuration Complete"
 msgstr "Beállítás kész"
 
-#: ../src/gui/assistant.cpp:1321
+#: ../src/gui/assistant.cpp:1326
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
@@ -2111,38 +2111,38 @@
 "Az Ekiga beállítása befejeződött. Minden beállítás módosítható az Ekiga "
 "Tulajdonságai között."
 
-#: ../src/gui/assistant.cpp:1328
+#: ../src/gui/assistant.cpp:1333
 msgid "Configuration summary:"
 msgstr "Beállítások összegzése:"
 
-#: ../src/gui/assistant.cpp:1398
+#: ../src/gui/assistant.cpp:1403
 msgid "Audio Ringing Device"
 msgstr "Csengési eszköz"
 
-#: ../src/gui/assistant.cpp:1407
+#: ../src/gui/assistant.cpp:1412
 msgid "Audio Output Device"
 msgstr "Hangkimeneti eszköz"
 
-#: ../src/gui/assistant.cpp:1416
+#: ../src/gui/assistant.cpp:1421
 msgid "Audio Input Device"
 msgstr "Hangbemeneti eszköz"
 
-#: ../src/gui/assistant.cpp:1425
+#: ../src/gui/assistant.cpp:1430
 msgid "Video Input Device"
 msgstr "Videobemeneti eszköz"
 
-#: ../src/gui/assistant.cpp:1438
+#: ../src/gui/assistant.cpp:1443
 msgid "SIP URI"
 msgstr "SIP URI"
 
-#: ../src/gui/assistant.cpp:1450
+#: ../src/gui/assistant.cpp:1455
 msgid "Ekiga Call Out"
 msgstr "Ekiga pc->telefon"
 
-#: ../src/gui/assistant.cpp:1492
+#: ../src/gui/assistant.cpp:1499
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
-msgstr "Ekiga beállításvarázsló (%d./%d oldal)"
+msgstr "Ekiga beállítóasszisztens (%d./%d oldal)"
 
 #: ../src/gui/callbacks.cpp:131
 msgid "Contributors:"
@@ -2267,61 +2267,61 @@
 msgstr "%s regisztrálva"
 
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:525
+#: ../src/gui/main.cpp:526
 #, c-format
 msgid "Unregistered %s"
 msgstr "Regisztráció törölve: %s"
 
-#: ../src/gui/main.cpp:530
+#: ../src/gui/main.cpp:531
 #, c-format
 msgid "Could not unregister %s"
 msgstr "%s regisztrációja nem törölhető"
 
-#: ../src/gui/main.cpp:534
+#: ../src/gui/main.cpp:535
 #, c-format
 msgid "Could not register %s"
 msgstr "%s nem regisztrálható"
 
-#: ../src/gui/main.cpp:604
+#: ../src/gui/main.cpp:605
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr "H:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 
-#: ../src/gui/main.cpp:650
+#: ../src/gui/main.cpp:651
 #, c-format
 msgid "Connected with %s"
 msgstr "Csatlakozva ehhez: %s"
 
-#: ../src/gui/main.cpp:691 ../src/gui/main.cpp:3511
+#: ../src/gui/main.cpp:692 ../src/gui/main.cpp:3512
 msgid "Standby"
 msgstr "Készenlét"
 
-#: ../src/gui/main.cpp:752
+#: ../src/gui/main.cpp:753
 msgid "Call on hold"
 msgstr "Hívástartás"
 
-#: ../src/gui/main.cpp:763
+#: ../src/gui/main.cpp:764
 msgid "Call retrieved"
 msgstr "Hívás lekérve"
 
-#: ../src/gui/main.cpp:779
+#: ../src/gui/main.cpp:780
 #, c-format
 msgid "Missed call from %s"
 msgstr "Nem fogadott hívás ettől: %s"
 
-#: ../src/gui/main.cpp:916
+#: ../src/gui/main.cpp:917
 msgid "Error"
 msgstr "Hiba"
 
-#: ../src/gui/main.cpp:981
+#: ../src/gui/main.cpp:982
 msgid "Error while initializing video output"
 msgstr "Hiba a videokimenet előkészítése közben"
 
-#: ../src/gui/main.cpp:982
+#: ../src/gui/main.cpp:983
 msgid "No video will be displayed during this call->"
 msgstr "Nem jelenik meg videó a hívás során ->"
 
-#: ../src/gui/main.cpp:992
+#: ../src/gui/main.cpp:993
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that no other application is using the accelerated video output."
@@ -2329,7 +2329,7 @@
 "Hiba történt a videokimenet megnyitása vagy előkészítése során. Ellenőrizze, "
 "hogy nem használja más eszköz a gyorsított videokimenetet."
 
-#: ../src/gui/main.cpp:994
+#: ../src/gui/main.cpp:995
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that you are using a color depth of 24 or 32 bits per pixel."
@@ -2338,23 +2338,23 @@
 "hogy 24 vagy 32 bites színmélységet használ-e."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1107
+#: ../src/gui/main.cpp:1108
 #, c-format
 msgid "Added video input device %s"
 msgstr "%s hangbemeneti eszköz felvéve"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1119
+#: ../src/gui/main.cpp:1120
 #, c-format
 msgid "Removed video input device %s"
 msgstr "%s videobemeneti eszköz eltávolítva"
 
-#: ../src/gui/main.cpp:1136
+#: ../src/gui/main.cpp:1137
 #, c-format
 msgid "Error while accessing video device %s"
 msgstr "Hiba a videoeszköz (%s) elérésekor"
 
-#: ../src/gui/main.cpp:1139
+#: ../src/gui/main.cpp:1140
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
@@ -2364,7 +2364,7 @@
 "átvihet egy adott képet vagy a mozgó logót, ha videobővítményként a „Képet”, "
 "eszközként pedig a „Mozgó logót” vagy a „Statikus képet” választja."
 
-#: ../src/gui/main.cpp:1143
+#: ../src/gui/main.cpp:1144
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
@@ -2376,15 +2376,15 @@
 "jogosultságait és győződjön meg, hogy a megfelelő illesztőprogram be van "
 "töltve."
 
-#: ../src/gui/main.cpp:1147
+#: ../src/gui/main.cpp:1148
 msgid "Your video driver doesn't support the requested video format."
 msgstr "A videomeghajtója nem támogatja a kért videoformátumot."
 
-#: ../src/gui/main.cpp:1151
+#: ../src/gui/main.cpp:1152
 msgid "Could not open the chosen channel."
 msgstr "Nem lehet megnyitni a kiválasztott csatornát."
 
-#: ../src/gui/main.cpp:1155
+#: ../src/gui/main.cpp:1156
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2396,42 +2396,42 @@
 "Ellenőrizze a rendszermag-illesztőprogram dokumentációját a támogatott "
 "paletták meghatározása érdekében."
 
-#: ../src/gui/main.cpp:1159
+#: ../src/gui/main.cpp:1160
 msgid "Error while setting the frame rate."
 msgstr "Hiba a képkockasebesség beállítása közben."
 
-#: ../src/gui/main.cpp:1163
+#: ../src/gui/main.cpp:1164
 msgid "Error while setting the frame size."
 msgstr "Hiba a képkockaméret beállítása közben."
 
-#: ../src/gui/main.cpp:1168 ../src/gui/main.cpp:1270 ../src/gui/main.cpp:1385
+#: ../src/gui/main.cpp:1169 ../src/gui/main.cpp:1271 ../src/gui/main.cpp:1386
 msgid "Unknown error."
 msgstr "Ismeretlen hiba."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1218
+#: ../src/gui/main.cpp:1219
 #, c-format
 msgid "Added audio input device %s"
 msgstr "%s hangbemeneti eszköz felvéve"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1235
+#: ../src/gui/main.cpp:1236
 #, c-format
 msgid "Removed audio input device %s"
 msgstr "%s hangbemeneti eszköz eltávolítva"
 
-#: ../src/gui/main.cpp:1252
+#: ../src/gui/main.cpp:1253
 #, c-format
 msgid "Error while opening audio input device %s"
 msgstr "Hiba a hangbemeneti eszköz (%s) megnyitása közben"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
-#: ../src/gui/main.cpp:1257
+#: ../src/gui/main.cpp:1258
 msgid "Only silence will be transmitted."
 msgstr "Csak csend kerül átvitelre."
 
-#: ../src/gui/main.cpp:1261
+#: ../src/gui/main.cpp:1262
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2443,7 +2443,7 @@
 "esetben ellenőrizze a hangbeállításait, a jogosultságokat és hogy az eszköz "
 "nem foglalt-e."
 
-#: ../src/gui/main.cpp:1265
+#: ../src/gui/main.cpp:1266
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2454,26 +2454,26 @@
 "az eszközből. Ha ez egy eltávolítható eszköz, elegendő lehet az "
 "újracsatlakoztatása. Ellenkező esetben ellenőrizze a hangbeállításait."
 
-#: ../src/gui/main.cpp:1332
+#: ../src/gui/main.cpp:1333
 #, c-format
 msgid "Added audio output device %s"
 msgstr "%s hangkimeneti eszköz felvéve"
 
-#: ../src/gui/main.cpp:1348
+#: ../src/gui/main.cpp:1349
 #, c-format
 msgid "Removed audio output device %s"
 msgstr "%s hangkimeneti eszköz eltávolítva"
 
-#: ../src/gui/main.cpp:1369
+#: ../src/gui/main.cpp:1370
 #, c-format
 msgid "Error while opening audio output device %s"
 msgstr "Hiba a hangkimeneti eszköz (%s) megnyitása közben"
 
-#: ../src/gui/main.cpp:1372
+#: ../src/gui/main.cpp:1373
 msgid "No incoming sound will be played."
 msgstr "Nem kerül lejátszásra a bejövő hang."
 
-#: ../src/gui/main.cpp:1376
+#: ../src/gui/main.cpp:1377
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2485,7 +2485,7 @@
 "esetben ellenőrizze a hangbeállításait, a jogosultságokat és hogy az eszköz "
 "nem foglalt-e."
 
-#: ../src/gui/main.cpp:1380
+#: ../src/gui/main.cpp:1381
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
@@ -2496,341 +2496,337 @@
 "eszközre. Ha ez egy eltávolítható eszköz, elegendő lehet az "
 "újracsatlakoztatása. Ellenkező esetben ellenőrizze a hangbeállításait."
 
-#: ../src/gui/main.cpp:1568
+#: ../src/gui/main.cpp:1569
 msgid "Video Settings"
 msgstr "Videóbeállítások"
 
-#: ../src/gui/main.cpp:1595
+#: ../src/gui/main.cpp:1596
 msgid "Adjust brightness"
 msgstr "Fényesség beállítása"
 
-#: ../src/gui/main.cpp:1616
+#: ../src/gui/main.cpp:1617
 msgid "Adjust whiteness"
 msgstr "Fehéregyensúly beállítása"
 
-#: ../src/gui/main.cpp:1637
+#: ../src/gui/main.cpp:1638
 msgid "Adjust color"
 msgstr "Színek beállítása"
 
-#: ../src/gui/main.cpp:1658
+#: ../src/gui/main.cpp:1659
 msgid "Adjust contrast"
 msgstr "Kontraszt beállítása"
 
-#: ../src/gui/main.cpp:1704
+#: ../src/gui/main.cpp:1705
 msgid "Audio Settings"
 msgstr "Hangbeállítások"
 
-#: ../src/gui/main.cpp:2315
+#: ../src/gui/main.cpp:2316
 msgid "_Retrieve Call"
 msgstr "Hívás _visszavétele"
 
-#: ../src/gui/main.cpp:2328
+#: ../src/gui/main.cpp:2329
 msgid "_Hold Call"
 msgstr "Hívás_tartás"
 
-#: ../src/gui/main.cpp:2360 ../src/gui/main.cpp:3148
+#: ../src/gui/main.cpp:2361 ../src/gui/main.cpp:3149
 msgid "Suspend _Audio"
 msgstr "_Hang felfüggesztése"
 
-#: ../src/gui/main.cpp:2362 ../src/gui/main.cpp:3153
+#: ../src/gui/main.cpp:2363 ../src/gui/main.cpp:3154
 msgid "Suspend _Video"
 msgstr "_Video felfüggesztése"
 
-#: ../src/gui/main.cpp:2364
+#: ../src/gui/main.cpp:2365
 msgid "Resume _Audio"
 msgstr "_Hang vissza"
 
-#: ../src/gui/main.cpp:2366
+#: ../src/gui/main.cpp:2367
 msgid "Resume _Video"
 msgstr "_Video vissza"
 
-#: ../src/gui/main.cpp:2649 ../src/gui/main.cpp:2801
+#: ../src/gui/main.cpp:2650 ../src/gui/main.cpp:2802
 msgid "Reject"
 msgstr "Visszautasítás"
 
-#: ../src/gui/main.cpp:2651 ../src/gui/main.cpp:2800
+#: ../src/gui/main.cpp:2652 ../src/gui/main.cpp:2801
 msgid "Accept"
 msgstr "Elfogadás"
 
-#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2788
+#: ../src/gui/main.cpp:2658 ../src/gui/main.cpp:2789
 msgid "Incoming call from"
 msgstr "Bejövő hívás ettől"
 
-#: ../src/gui/main.cpp:2675 ../src/gui/main.cpp:2791
+#: ../src/gui/main.cpp:2676 ../src/gui/main.cpp:2792
 msgid "Remote URI:"
 msgstr "Túloldali URI:"
 
-#: ../src/gui/main.cpp:2687 ../src/gui/main.cpp:2793
+#: ../src/gui/main.cpp:2688 ../src/gui/main.cpp:2794
 msgid "Remote Application:"
 msgstr "Túloldali alkalmazás:"
 
-#: ../src/gui/main.cpp:2708
+#: ../src/gui/main.cpp:2709
 #, c-format
 msgid "Call from %s"
 msgstr "Hívás ettől: %s"
 
-#: ../src/gui/main.cpp:2914
+#: ../src/gui/main.cpp:2915
 #, c-format
 msgid "Call Duration: %s\n"
 msgstr "Hívás időtartama: %s\n"
 
-#: ../src/gui/main.cpp:2945
+#: ../src/gui/main.cpp:2946
 msgid "Transfer call to:"
 msgstr "Hívás átadása ide:"
 
-#: ../src/gui/main.cpp:2997
+#: ../src/gui/main.cpp:2998
 msgid "No"
 msgstr "Nem"
 
-#: ../src/gui/main.cpp:2999
+#: ../src/gui/main.cpp:3000
 msgid "Yes"
 msgstr "Igen"
 
-#: ../src/gui/main.cpp:3010
+#: ../src/gui/main.cpp:3011
 msgid "Detected new audio input device:"
 msgstr "Új hangbemeneti eszköz:"
 
-#: ../src/gui/main.cpp:3014
+#: ../src/gui/main.cpp:3015
 msgid "Detected new audio output device:"
 msgstr "Új hangkimeneti eszköz:"
 
-#: ../src/gui/main.cpp:3018
+#: ../src/gui/main.cpp:3019
 msgid "Detected new video input device:"
 msgstr "Új videobemeneti eszköz:"
 
-#: ../src/gui/main.cpp:3019 ../src/gui/preferences.cpp:921
+#: ../src/gui/main.cpp:3020 ../src/gui/preferences.cpp:921
 msgid "Video Devices"
 msgstr "Videoeszközök"
 
-#: ../src/gui/main.cpp:3037
+#: ../src/gui/main.cpp:3038
 msgid "Do you want to use it as default device?"
 msgstr "Kívánja alapértelmezett eszközként használni?"
 
-#: ../src/gui/main.cpp:3105
+#: ../src/gui/main.cpp:3106
 msgid "_Chat"
 msgstr "_Csevegés"
 
-#: ../src/gui/main.cpp:3107
+#: ../src/gui/main.cpp:3108
 msgid "Ca_ll"
 msgstr "_Hívás"
 
-#: ../src/gui/main.cpp:3107
+#: ../src/gui/main.cpp:3108
 msgid "Place a new call"
 msgstr "Új hívás"
 
-#: ../src/gui/main.cpp:3110
+#: ../src/gui/main.cpp:3111
 msgid "_Hang up"
 msgstr "_Felfüggesztés"
 
-#: ../src/gui/main.cpp:3111
+#: ../src/gui/main.cpp:3112
 msgid "Terminate the current call"
 msgstr "Jelenlegi hívás befejezése"
 
-#: ../src/gui/main.cpp:3117
+#: ../src/gui/main.cpp:3118
 msgid "A_dd Contact"
 msgstr "Partner _hozzáadása"
 
-#: ../src/gui/main.cpp:3117
+#: ../src/gui/main.cpp:3118
 msgid "Add a contact to the roster"
 msgstr "Partner felvétele a partnerlistára"
 
-#: ../src/gui/main.cpp:3122
+#: ../src/gui/main.cpp:3123
 msgid "Find contacts"
 msgstr "Partnerek keresése"
 
-#: ../src/gui/main.cpp:3129
+#: ../src/gui/main.cpp:3130
 msgid "_Contact"
 msgstr "_Partner"
 
-#: ../src/gui/main.cpp:3130
+#: ../src/gui/main.cpp:3131
 msgid "Act on selected contact"
 msgstr "Művelet a kiválasztott partneren"
 
-#: ../src/gui/main.cpp:3136
+#: ../src/gui/main.cpp:3137
 msgid "H_old Call"
 msgstr "Hívás_tartás"
 
-#: ../src/gui/main.cpp:3136 ../src/gui/main.cpp:3605
+#: ../src/gui/main.cpp:3137 ../src/gui/main.cpp:3606
 msgid "Hold the current call"
 msgstr "Jelenlegi hívás tartása"
 
-#: ../src/gui/main.cpp:3140
+#: ../src/gui/main.cpp:3141
 msgid "_Transfer Call"
 msgstr "_Hívásátadás"
 
-#: ../src/gui/main.cpp:3141
+#: ../src/gui/main.cpp:3142
 msgid "Transfer the current call"
 msgstr "Jelenlegi hívás átadása"
 
-#: ../src/gui/main.cpp:3149
+#: ../src/gui/main.cpp:3150
 msgid "Suspend or resume the audio transmission"
 msgstr "Hangátvitel felfüggesztése vagy újraindítása"
 
-#: ../src/gui/main.cpp:3154
+#: ../src/gui/main.cpp:3155
 msgid "Suspend or resume the video transmission"
 msgstr "Videoátvitel felfüggesztése vagy újraindítása"
 
-#: ../src/gui/main.cpp:3161
+#: ../src/gui/main.cpp:3162
 msgid "Close the Ekiga window"
 msgstr "Az Ekiga ablak bezárása"
 
-#: ../src/gui/main.cpp:3168 ../src/gui/statusicon.cpp:406
+#: ../src/gui/main.cpp:3169 ../src/gui/statusicon.cpp:406
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../src/gui/main.cpp:3174
+#: ../src/gui/main.cpp:3175
 msgid "_Configuration Assistant"
-msgstr "_Beállításvarázsló"
+msgstr "_Beállítóasszisztens"
 
-#: ../src/gui/main.cpp:3175
+#: ../src/gui/main.cpp:3176
 msgid "Run the configuration assistant"
-msgstr "A beállításvarázsló futtatása"
+msgstr "A beállítóasszisztens futtatása"
 
-#: ../src/gui/main.cpp:3183
+#: ../src/gui/main.cpp:3184
 msgid "Edit your accounts"
 msgstr "Felhasználói fiókok szerkesztése"
 
-#: ../src/gui/main.cpp:3189
+#: ../src/gui/main.cpp:3190
 msgid "Change your preferences"
 msgstr "Beállítások megváltoztatása"
 
-#: ../src/gui/main.cpp:3194
+#: ../src/gui/main.cpp:3195
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../src/gui/main.cpp:3196
+#: ../src/gui/main.cpp:3197
 msgid "Con_tacts"
 msgstr "_Partnerek"
 
-#: ../src/gui/main.cpp:3196
+#: ../src/gui/main.cpp:3197
 msgid "View the contacts list"
 msgstr "Partnerlista megtekintése"
 
-#: ../src/gui/main.cpp:3201
+#: ../src/gui/main.cpp:3202
 msgid "_Dialpad"
 msgstr "_Tárcsázókészülék"
 
-#: ../src/gui/main.cpp:3201
+#: ../src/gui/main.cpp:3202
 msgid "View the dialpad"
 msgstr "A tárcsázókészülék megjelenítése"
 
-#: ../src/gui/main.cpp:3206
+#: ../src/gui/main.cpp:3207
 msgid "_Call History"
 msgstr "_Hívástörténet"
 
-#: ../src/gui/main.cpp:3206
+#: ../src/gui/main.cpp:3207
 msgid "View the call history"
 msgstr "A hívástörténet megtekintése"
 
-#: ../src/gui/main.cpp:3214
+#: ../src/gui/main.cpp:3215
 msgid "_Show Call Panel"
 msgstr "Hí_vás ablak megjelenítése"
 
-#: ../src/gui/main.cpp:3222
+#: ../src/gui/main.cpp:3223
 msgid "_Local Video"
 msgstr "_Helyi videó"
 
-#: ../src/gui/main.cpp:3223
+#: ../src/gui/main.cpp:3224
 msgid "Local video image"
 msgstr "Helyi videokép"
 
-#: ../src/gui/main.cpp:3228
+#: ../src/gui/main.cpp:3229
 msgid "_Remote Video"
 msgstr "_Távoli videó"
 
-#: ../src/gui/main.cpp:3229
+#: ../src/gui/main.cpp:3230
 msgid "Remote video image"
 msgstr "Túloldali videokép"
 
-#: ../src/gui/main.cpp:3234
+#: ../src/gui/main.cpp:3235
 msgid "_Picture-in-Picture"
 msgstr "_Kép a képben"
 
-#: ../src/gui/main.cpp:3235 ../src/gui/main.cpp:3241
+#: ../src/gui/main.cpp:3236 ../src/gui/main.cpp:3242
 msgid "Both video images"
 msgstr "Mindkét videokép"
 
-#: ../src/gui/main.cpp:3240
+#: ../src/gui/main.cpp:3241
 msgid "Picture-in-Picture in Separate _Window"
 msgstr "Ké_p a képben külön ablakban"
 
-#: ../src/gui/main.cpp:3248
+#: ../src/gui/main.cpp:3249
 msgid "Zoom in"
 msgstr "Nagyítás"
 
-#: ../src/gui/main.cpp:3252
+#: ../src/gui/main.cpp:3253
 msgid "Zoom out"
 msgstr "Kicsinyítés"
 
-#: ../src/gui/main.cpp:3256
+#: ../src/gui/main.cpp:3257
 msgid "Normal size"
 msgstr "Normál méret"
 
-#: ../src/gui/main.cpp:3260
+#: ../src/gui/main.cpp:3261
 msgid "_Fullscreen"
 msgstr "_Teljes képernyő"
 
-#: ../src/gui/main.cpp:3260
+#: ../src/gui/main.cpp:3261
 msgid "Switch to fullscreen"
 msgstr "Átkapcsolás teljes képernyőre"
 
-#: ../src/gui/main.cpp:3268 ../src/gui/statusicon.cpp:394
+#: ../src/gui/main.cpp:3269 ../src/gui/statusicon.cpp:394
 msgid "Get help by reading the Ekiga manual"
 msgstr "Az Ekiga kézikönyvének megtekintése"
 
-#: ../src/gui/main.cpp:3273 ../src/gui/statusicon.cpp:399
+#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:399
 msgid "View information about Ekiga"
 msgstr "Információk megtekintése az Ekigaról"
 
-#: ../src/gui/main.cpp:3347
+#: ../src/gui/main.cpp:3348
 msgid "Enter a URI on the left, and click this button to place a call or to hangup"
 msgstr ""
 "Adja meg a felhívandó URI címet a bal oldalon, majd kattintson erre a gombra "
 "a híváshoz vagy a hívás befejezéséhez."
 
-#: ../src/gui/main.cpp:3398
+#: ../src/gui/main.cpp:3399
 msgid "Contacts"
 msgstr "Partnerek"
 
-#: ../src/gui/main.cpp:3421
+#: ../src/gui/main.cpp:3422
 msgid "Dialpad"
 msgstr "Tárcsázókészülék"
 
-#: ../src/gui/main.cpp:3440
+#: ../src/gui/main.cpp:3441
 msgid "Call history"
 msgstr "Hívástörténet"
 
-#: ../src/gui/main.cpp:3543
+#: ../src/gui/main.cpp:3544
 msgid "Change the volume of your soundcard"
 msgstr "A hangkártya hangerejének módosítása"
 
-#: ../src/gui/main.cpp:3563
+#: ../src/gui/main.cpp:3564
 msgid "Change the color settings of your video device"
 msgstr "A videoeszköz színbeállításainak módosítása"
 
-#: ../src/gui/main.cpp:3585
-msgid "Display images from your camera device"
-msgstr "Képek megjelenítése a kamerából"
-
-#: ../src/gui/main.cpp:3674
+#: ../src/gui/main.cpp:3675
 msgid "Ekiga"
 msgstr "Ekiga"
 
 #. Translators:
 #. * TX is a common abbreviation for "transmit"
-#: ../src/gui/main.cpp:4281
+#: ../src/gui/main.cpp:4282
 #, c-format
 msgid "TX: %dx%d "
 msgstr "Küldés: %dx%d "
 
 #. Translators:
 #. * RX is a common abbreviation for "receive"
-#: ../src/gui/main.cpp:4286
+#: ../src/gui/main.cpp:4287
 #, c-format
 msgid "RX: %dx%d "
 msgstr "Fogadás: %dx%d "
 
-#: ../src/gui/main.cpp:4288
+#: ../src/gui/main.cpp:4289
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2843,23 +2839,23 @@
 "Hibás csomagok: %.1f %%ms\n"
 "Jitter puffer: %d ms%s%s%s"
 
-#: ../src/gui/main.cpp:4405
+#: ../src/gui/main.cpp:4406
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr "Hibakövető üzenetek kiírása a konzolra (1-es és 5-ös szint között)"
 
-#: ../src/gui/main.cpp:4410
+#: ../src/gui/main.cpp:4411
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr "Hibakövető üzenetek kiírása a konzolra (1-es és 5-ös szint között)"
 
-#: ../src/gui/main.cpp:4415
+#: ../src/gui/main.cpp:4416
 msgid "Makes Ekiga call the given URI"
 msgstr "Az Ekiga felhívja a megadott URI címet"
 
-#: ../src/gui/main.cpp:4524
+#: ../src/gui/main.cpp:4528
 msgid "No usable audio plugin detected"
 msgstr "Nem találtam használható hangbővítményt"
 
-#: ../src/gui/main.cpp:4525
+#: ../src/gui/main.cpp:4529
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
@@ -2867,11 +2863,11 @@
 "Az Ekiga nem talált egyetlen használható hangbővítményt sem. Győződjön meg, "
 "hogy a telepítés megfelelő."
 
-#: ../src/gui/main.cpp:4528
+#: ../src/gui/main.cpp:4532
 msgid "No usable audio codecs detected"
 msgstr "Nem találhatók használható hangkodekek"
 
-#: ../src/gui/main.cpp:4529
+#: ../src/gui/main.cpp:4533
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
diff -Nru ekiga-3.2.5/po/ko.po ekiga-3.2.6~ppa~karmic1/po/ko.po
--- ekiga-3.2.5/po/ko.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/ko.po	2009-09-22 15:27:35.000000000 +0100
@@ -4,13 +4,13 @@
 #
 # 새로 번역하시는 분은 아래 translator-credits에 추가하세요.
 #
-#: ../lib/engine/components/resource-list/rl-entry.cpp:163
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
 "Project-Id-Version: ekiga\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 23:04+0900\n"
-"PO-Revision-Date: 2009-03-14 23:04+0900\n"
+"POT-Creation-Date: 2009-08-29 03:35+0900\n"
+"PO-Revision-Date: 2009-08-29 03:37+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
 "MIME-Version: 1.0\n"
@@ -116,7 +116,7 @@
 msgid "Disable video hardware acceleration"
 msgstr "비디오 하드웨어 가속 기능 사용하지 않음"
 
-#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3586
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3591
 msgid "Display images from your camera device"
 msgstr "카메라 장치에서 입력되는 이미지를 보여줍니다"
 
@@ -368,7 +368,7 @@
 msgid "Show offline contacts"
 msgstr "오프라인 연락쳐 보기"
 
-#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3215
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3220
 msgid "Show the call panel"
 msgstr "호출 패널을 봅니다"
 
@@ -728,7 +728,7 @@
 msgid "Video format"
 msgstr "비디오 형식"
 
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1155
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr "비디오 입력 장치"
 
@@ -745,126 +745,123 @@
 "Whether to prefer to sustain the max. frame rate or lower it possibly in "
 "order to keep a minimum level of (spatial) quality for all frames. 0: "
 "Highest minimal quality, 31: lowest minimal quality"
-msgstr ""
-"프레임 전송률을 최대로 유지할 지 아니면 반대로 프레임 전송률을 낮출 지 (낮추"
-"어서 순간의 프레임별 화질을 일정 수준으로 유지할 수 있습니다) 결정합니다. 0: "
-"가능한 높은 수준, 31: 가능한 낮은 수준."
+msgstr "프레임 전송률을 최대로 유지할지 아니면 반대로 프레임 전송률을 낮출지 (낮추어서 순간의 프레임별 화질을 일정 수준으로 유지할 수 있습니다) 결정합니다. 0: 가능한 높은 수준, 31: 가능한 낮은 수준."
 
-#: ../lib/engine/addressbook/contact-core.cpp:58
+#: ../lib/engine/addressbook/contact-core.cpp:60
 msgid "_Find"
 msgstr "찾기(_F)"
 
 #: ../lib/engine/components/avahi/avahi-heap.cpp:125
-#: ../lib/engine/components/avahi/avahi-heap.cpp:306
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
 msgid "Neighbours"
 msgstr "이웃"
 
-#: ../lib/engine/components/call-history/history-book.cpp:140
+#: ../lib/engine/components/call-history/history-book.cpp:137
 #: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
 msgid "Clear List"
 msgstr "목록 지우기"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:153
+#: ../lib/engine/components/call-history/history-contact.cpp:155
 msgid "Received"
 msgstr "받음"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:156
+#: ../lib/engine/components/call-history/history-contact.cpp:158
 msgid "Placed"
 msgstr "호출함"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:159
+#: ../lib/engine/components/call-history/history-contact.cpp:161
 msgid "Missed"
 msgstr "놓침"
 
 #: ../lib/engine/components/evolution/evolution-book.cpp:76
-#: ../lib/engine/components/ldap/ldap-book.cpp:909
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
 #, c-format
 msgid "%d user found"
 msgid_plural "%d users found"
 msgstr[0] "사용자 %d명이 있습니다"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:244
+#: ../lib/engine/components/evolution/evolution-book.cpp:283
 msgid "New _Contact"
 msgstr "새 연락처(_C)"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:288
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
 #: ../lib/engine/components/local-roster/local-cluster.cpp:82
 #: ../lib/engine/components/local-roster/local-heap.cpp:117
 msgid "New contact"
 msgstr "새 연락처"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:290
-#: ../lib/engine/components/evolution/evolution-contact.cpp:328
-#: ../lib/engine/components/opal/opal-account.cpp:351
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
 msgid "Please update the following fields:"
 msgstr "다음 항목을 입력하십시오:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:292
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:293
-#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
 msgid "VoIP _URI:"
 msgstr "VoIP _URI:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:294
-#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
 msgid "_Home phone:"
 msgstr "집 전화(_H):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:295
-#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
 msgid "_Office phone:"
 msgstr "직장 전화(_O):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:296
-#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+#: ../lib/engine/components/evolution/evolution-book.cpp:327
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
 msgid "_Cell phone:"
 msgstr "휴대 전화(_C):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:297
-#: ../lib/engine/components/evolution/evolution-contact.cpp:343
+#: ../lib/engine/components/evolution/evolution-book.cpp:328
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
 msgid "_Pager:"
 msgstr "호출기(_P):"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:234
-#: ../lib/engine/components/local-roster/local-presentity.cpp:197
-#: ../lib/engine/components/opal/opal-account.cpp:308
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:203
-#: ../src/gui/main.cpp:3173
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3178
 msgid "_Edit"
 msgstr "편집(_E)"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:236
-#: ../lib/engine/components/local-roster/local-presentity.cpp:199
-#: ../lib/engine/components/opal/opal-account.cpp:310
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:205
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
 msgid "_Remove"
 msgstr "제거(_R)"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
 msgid "Edit contact"
 msgstr "연락처 편집"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:330
-#: ../lib/engine/components/local-roster/local-presentity.cpp:224
-#: ../lib/engine/components/local-roster/local-heap.cpp:184
-#: ../lib/engine/components/local-roster/local-heap.cpp:364
-#: ../lib/engine/components/opal/opal-account.cpp:353
-#: ../lib/engine/components/opal/opal-bank.cpp:99
-#: ../lib/engine/components/opal/opal-bank.cpp:109
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:169
-#: ../lib/engine/components/resource-list/rl-heap.cpp:544
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:224
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
 msgid "Name:"
 msgstr "이름:"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:395
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
 msgid "Remove contact"
 msgstr "연락처 제거"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:397
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
 #, c-format
 msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr "정말로 주소록에서 %s을(를) 지우시겠습니까?"
@@ -882,30 +879,30 @@
 msgstr "비디오 테스트"
 
 #. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Crazy"
 msgstr "미침"
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Screencast"
 msgstr "스크린 캐스트"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:409
-#: ../lib/engine/components/resource-list/rl-entry.cpp:143
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:130
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
 msgid "_Refresh"
 msgstr "새로 고침(_R)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:412
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
 msgid "_Remove addressbook"
 msgstr "주소록 제거(_R)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:414
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
 msgid "Addressbook _properties"
 msgstr "주소록 속성(_P)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:545
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
 msgid "LDAP SASL Interaction"
 msgstr "LDAP SASL 상호 통신"
 
@@ -919,136 +916,136 @@
 #. * say about it. You might google for "challenge response
 #. * authentication" if you'd like more background context.
 #.
-#: ../lib/engine/components/ldap/ldap-book.cpp:587
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
 msgid "Challenge: "
 msgstr "첼린지: "
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:595
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
 msgid "Interact"
 msgstr "상호 통신"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:664
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
 msgid "Refreshing"
 msgstr "새로 고치는 중입니다"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:670
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
 msgid "Could not initialize server"
 msgstr "서버를 초기화할 수 없습니다"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:684
-#: ../lib/engine/components/ldap/ldap-book.cpp:729
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
 msgid "LDAP Error: "
 msgstr "LDAP 에러: "
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:738
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
 msgid "Contacted server"
 msgstr "연결한 서버"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:781
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
 msgid "Could not connect to server"
 msgstr "서버에 연결할 수 없습니다"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:829
-#: ../lib/engine/components/ldap/ldap-book.cpp:882
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
 msgid "Could not search"
 msgstr "찾을 수 없습니다"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:837
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
 msgid "Waiting for search results"
-msgstr "찾기 결과를 기다리는 중입니다"
+msgstr "검색 결과를 기다리는 중입니다"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:931
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
 msgid "Please edit the following fields"
 msgstr "다음 항목을 편집하십시오:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:933
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
 msgid "Book _Name"
 msgstr "주소록 이름(_N)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:934
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
 msgid "Server _URI"
 msgstr "서버 URI(_U)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:935
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
 msgid "_Base DN"
 msgstr "기본 DN(_B)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:941
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
 msgid "Subtree"
 msgstr "아래 트리"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:942
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
 msgid "Single Level"
 msgstr "한 단계"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
 msgid "_Search Scope"
-msgstr "찾기 범위(_S)"
+msgstr "검색 범위(_S)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:952
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
 msgid "_DisplayName Attribute"
 msgstr "DisplayName 속성(_D)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:953
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
 msgid "Call _Attributes"
 msgstr "Call 속성(_A)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:955
-#: ../lib/engine/components/ldap/ldap-book.cpp:957
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
 msgid "_Filter Template"
-msgstr "필터 템플리트(_F)"
+msgstr "필터 서식(_F)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:959
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
 msgid "Bind _ID"
 msgstr "바인딩 ID(_I)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:960
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
 msgid "_Password"
 msgstr "암호(_P)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:961
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
 msgid "Use TLS"
 msgstr "TLS 사용"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:962
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
 msgid "Use SASL"
 msgstr "SASL 사용"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:976
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
 msgid "SASL _Mechanism"
 msgstr "SASL 메커니즘(_M)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:987
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
 msgid "Edit LDAP directory"
 msgstr "LDAP 디렉터리 편집"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1016
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
 msgid "Please provide a Book Name for this directory\n"
 msgstr "이 디렉터리에 대한 주소록 이름을 입력하십시오\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1019
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
 msgid "Please provide a Server URI\n"
 msgstr "서버 URI를 입력하십시오\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1022
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
 msgid "Please provide a DisplayName Attribute\n"
 msgstr "DisplayName 속성을 입력하십시오\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1025
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
 msgid "Please provide a Call Attribute\n"
 msgstr "Call 속성을 입력하십시오\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1028
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
 msgid "Invalid Server URI\n"
 msgstr "서버 URI가 잘못되었습니다\n"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:127
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
 msgid "Add an LDAP Address Book"
 msgstr "LDAP 주소록 추가"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:130
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
 msgid "Add the Ekiga.net Directory"
 msgstr "Ekiga.net 디렉터리 추가"
 
@@ -1060,45 +1057,45 @@
 msgid "Ekiga.net Directory"
 msgstr "Ekiga.net 디렉터리"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:221
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
 msgid "Edit roster element"
 msgstr "목록의 항목 편집"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:222
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
 msgstr "에키가의 내부 목록의 항목을 바꾸려면 다음 사항을 입력하십시오"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:225
-#: ../lib/engine/components/local-roster/local-heap.cpp:193
-#: ../lib/engine/components/local-roster/local-heap.cpp:195
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:170
-#: ../lib/engine/components/resource-list/rl-heap.cpp:545
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
 msgid "Address:"
 msgstr "주소:"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:227
-#: ../lib/engine/components/resource-list/rl-heap.cpp:546
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
 msgid "Choose groups:"
 msgstr "그룹을 선택하십시오:"
 
 #: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
-#: ../lib/engine/components/local-roster/local-heap.cpp:181
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
 msgid "Add to local roster"
 msgstr "로컬 목록에 추가"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:92
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
 msgid "Services"
 msgstr "서비스"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
 msgid "Echo test"
 msgstr "반향음 테스트"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:94
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
 msgid "Conference room"
 msgstr "대화실"
 
@@ -1110,128 +1107,143 @@
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:160
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
 msgid "Family"
 msgstr "가족"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:161
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
 msgid "Friend"
 msgstr "친구"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:162
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
 msgid "Associate"
 msgstr "동료"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:163
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
 msgid "Assistant"
 msgstr "조수"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:164
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
 msgid "Supervisor"
 msgstr "상사"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:165
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
 msgid "Self"
 msgstr "나 자신"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:182
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
 msgid ""
 "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr "새 연락처를 에키가의 내부 목록에 추가하려면 다음 정보를 입력하십시오"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:199
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
 msgid "Put contact in groups:"
 msgstr "연락처를 그룹에 넣습니다:"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:335
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
 msgid "You supplied an unsupported address"
 msgstr "지원하지 않는 주소를 입력했습니다"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:337
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
 msgid "You already have a contact with this address!"
 msgstr "이 주소의 연락처가 이미 있습니다!"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:362
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
 msgid "Rename group"
 msgstr "그룹 이름 바꾸기"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:363
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
 msgid "Please edit this group name"
 msgstr "이 그룹 이름을 편집하십시오"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:143
-#: ../lib/engine/components/opal/sip-endpoint.cpp:257
-#: ../lib/engine/components/opal/sip-endpoint.cpp:261
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:230
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
 msgid "Call"
 msgstr "호출"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:146
-#: ../lib/engine/components/opal/sip-endpoint.cpp:258
-#: ../lib/engine/components/opal/sip-endpoint.cpp:262 ../src/gui/main.cpp:2947
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:231
+#: ../lib/engine/components/opal/sip-endpoint.cpp:235 ../src/gui/main.cpp:2952
 msgid "Transfer"
 msgstr "전달"
 
 #. Translators : The alias we are registering already exists : failure
-#: ../lib/engine/components/opal/h323-endpoint.cpp:310
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
 msgid "Duplicate alias"
 msgstr "부르는 이름이 중복되었습니다"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:313
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
 msgid "Bad username/password"
 msgstr "사용자 이름과 암호가 올바르지 않습니다"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:316
-#: ../lib/engine/components/opal/sip-endpoint.cpp:896
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:911
 msgid "Transport error"
 msgstr "송수신 오류"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:327
-#: ../lib/engine/components/opal/h323-endpoint.cpp:332
-#: ../lib/engine/components/opal/sip-endpoint.cpp:903
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:918
 msgid "Failed"
 msgstr "실패"
 
-#: ../lib/engine/components/opal/opal-account.cpp:300
+#: ../lib/engine/components/opal/opal-account.cpp:303
 msgid "_Disable"
 msgstr "사용하지 않기(_D)"
 
-#: ../lib/engine/components/opal/opal-account.cpp:303
+#: ../lib/engine/components/opal/opal-account.cpp:306
 msgid "_Enable"
 msgstr "사용(_E)"
 
-#: ../lib/engine/components/opal/opal-account.cpp:324
-#: ../src/gui/assistant.cpp:727
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
 msgid "Recharge the account"
 msgstr "계정 충전"
 
-#: ../lib/engine/components/opal/opal-account.cpp:329
-#: ../src/gui/assistant.cpp:739
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
 msgid "Consult the balance history"
 msgstr "잔액 기록을 봅니다"
 
-#: ../lib/engine/components/opal/opal-account.cpp:334
+#: ../lib/engine/components/opal/opal-account.cpp:337
 msgid "Consult the call history"
 msgstr "호출 기록을 봅니다"
 
-#: ../lib/engine/components/opal/opal-account.cpp:349
-#: ../lib/engine/components/opal/opal-bank.cpp:72
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
 msgid "Edit account"
 msgstr "계정 편집"
 
-#: ../lib/engine/components/opal/opal-account.cpp:355
-#: ../lib/engine/components/opal/opal-bank.cpp:110
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
 msgid "Registrar:"
 msgstr "등록 기관:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:357
-#: ../lib/engine/components/opal/opal-bank.cpp:100
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
 msgid "Gatekeeper:"
 msgstr "게이트키퍼:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:358
-#: ../lib/engine/components/opal/opal-bank.cpp:81
-#: ../lib/engine/components/opal/opal-bank.cpp:101
-#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:174
 msgid "User:"
 msgstr "사용자:"
@@ -1239,166 +1251,168 @@
 #. Translators:
 #. * SIP knows two usernames: The name for the client ("User") and the name
 #. * for the authentication procedure ("Authentication User")
-#: ../lib/engine/components/opal/opal-account.cpp:363
-#: ../lib/engine/components/opal/opal-bank.cpp:112
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
 msgid "Authentication User:"
 msgstr "인증 사용자:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:364
-#: ../lib/engine/components/opal/opal-bank.cpp:83
-#: ../lib/engine/components/opal/opal-bank.cpp:103
-#: ../lib/engine/components/opal/opal-bank.cpp:113
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:173
 msgid "Password:"
 msgstr "암호:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:365
-#: ../lib/engine/components/opal/opal-bank.cpp:104
-#: ../lib/engine/components/opal/opal-bank.cpp:114
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
 msgid "Timeout:"
 msgstr "제한 시간:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:366
-#: ../lib/engine/components/opal/opal-bank.cpp:117
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
 msgid "Enable Account"
 msgstr "계정 사용"
 
-#: ../lib/engine/components/opal/opal-account.cpp:401
-#: ../lib/engine/components/opal/opal-bank.cpp:155
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
 msgid "You did not supply a name for that account."
 msgstr "계정의 이름을 입력하지 않았습니다."
 
-#: ../lib/engine/components/opal/opal-account.cpp:403
-#: ../lib/engine/components/opal/opal-bank.cpp:157
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
 msgid "You did not supply a host to register to."
 msgstr "등록할 호스트를 입력하지 않았습니다."
 
-#: ../lib/engine/components/opal/opal-account.cpp:405
-#: ../lib/engine/components/opal/opal-bank.cpp:159
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
 msgid "You did not supply a user name for that account."
 msgstr "계정의 사용자 이름을 입력하지 않았습니다."
 
-#: ../lib/engine/components/opal/opal-account.cpp:407
-#: ../lib/engine/components/opal/opal-bank.cpp:161
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
 msgid "The timeout should have a bigger value."
 msgstr "시간 제한 값이 더 커야 합니다."
 
-#: ../lib/engine/components/opal/opal-bank.cpp:53
+#: ../lib/engine/components/opal/opal-bank.cpp:75
 msgid "_Add an Ekiga.net Account"
 msgstr "Ekiga.net 계정 추가(_A)"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:55
+#: ../lib/engine/components/opal/opal-bank.cpp:77
 msgid "_Add an Ekiga Call Out Account"
 msgstr "에키가 외부 전화 계정 추가(_A)"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:57
+#: ../lib/engine/components/opal/opal-bank.cpp:79
 msgid "_Add a SIP Account"
 msgstr "SIP 계정 추가(_A)"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:59
+#: ../lib/engine/components/opal/opal-bank.cpp:81
 msgid "_Add an H.323 Account"
 msgstr "H.323 계정 추가(_A)"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:73
+#: ../lib/engine/components/opal/opal-bank.cpp:96
 msgid "Please update the following fields."
 msgstr "다음 항목을 입력하십시오."
 
-#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:607
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
 msgid "Get an Ekiga.net SIP account"
 msgstr "Ekiga.net SIP 계정 만들기"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:715
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
 msgid "Get an Ekiga Call Out account"
 msgstr "에키가 외부 전화 계정을 만듭니다"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:92 ../src/gui/main.cpp:2701
-#: ../src/gui/main.cpp:2796
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2706
+#: ../src/gui/main.cpp:2801
 msgid "Account ID:"
 msgstr "계정 ID:"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:94
+#: ../lib/engine/components/opal/opal-bank.cpp:117
 msgid "PIN Code:"
 msgstr "비밀번호:"
 
-#: ../lib/engine/components/opal/opal-call.cpp:444
+#: ../lib/engine/components/opal/opal-call.cpp:404
 msgid "Local user cleared the call"
 msgstr "로컬 사용자가 호출을 끝냈습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:447
-#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:407
+#: ../lib/engine/components/opal/opal-call.cpp:410
 msgid "Local user rejected the call"
 msgstr "로컬 사용자가 호출을 거절했습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:453
+#: ../lib/engine/components/opal/opal-call.cpp:413
 msgid "Remote user cleared the call"
 msgstr "원격 사용자가 호출을 지웠습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:456
+#: ../lib/engine/components/opal/opal-call.cpp:416
 msgid "Remote user rejected the call"
 msgstr "원격 사용자가 호출을 거절했습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:459
+#: ../lib/engine/components/opal/opal-call.cpp:419
 msgid "Remote user has stopped calling"
 msgstr "원격 사용자가 호출을 멈췄습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:462
+#: ../lib/engine/components/opal/opal-call.cpp:422
 msgid "Abnormal call termination"
 msgstr "비정상적인 호출 종료"
 
-#: ../lib/engine/components/opal/opal-call.cpp:465 ../src/gui/main.cpp:1491
+#: ../lib/engine/components/opal/opal-call.cpp:425 ../src/gui/main.cpp:1496
 msgid "Could not connect to remote host"
 msgstr "원격 호스트에 연결할 수 없습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:468
+#: ../lib/engine/components/opal/opal-call.cpp:428
 msgid "The Gatekeeper cleared the call"
 msgstr "게이트키퍼가 호출을 끝냈습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:471
+#: ../lib/engine/components/opal/opal-call.cpp:431
 msgid "User not found"
 msgstr "사용자를 찾을 수 없습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:474
+#: ../lib/engine/components/opal/opal-call.cpp:434
 msgid "Insufficient bandwidth"
 msgstr "대역폭이 부족합니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:477
+#: ../lib/engine/components/opal/opal-call.cpp:437
 msgid "No common codec"
 msgstr "공통의 코덱이 없습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:480
+#: ../lib/engine/components/opal/opal-call.cpp:440
 msgid "Call forwarded"
 msgstr "호출을 전달했습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:483
+#: ../lib/engine/components/opal/opal-call.cpp:443
 msgid "Security check failed"
 msgstr "보안 검사가 실패했습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:486
+#: ../lib/engine/components/opal/opal-call.cpp:446
 msgid "Local user is busy"
 msgstr "로컬 사용자가 다른 용무 중입니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:489
-#: ../lib/engine/components/opal/opal-call.cpp:495
+#: ../lib/engine/components/opal/opal-call.cpp:449
+#: ../lib/engine/components/opal/opal-call.cpp:455
 msgid "Congested link to remote party"
 msgstr "원격 상대의 연결이 정체상태입니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:492
+#: ../lib/engine/components/opal/opal-call.cpp:452
 msgid "Remote user is busy"
 msgstr "원격 사용자가 다른 용무 중입니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:498
+#: ../lib/engine/components/opal/opal-call.cpp:458
 msgid "Remote host is offline"
 msgstr "원격 호스트가 연결되어 있지 않습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:504
+#: ../lib/engine/components/opal/opal-call.cpp:464
 msgid "User is not available"
 msgstr "사용자가 없습니다"
 
-#: ../lib/engine/components/opal/opal-call.cpp:516
+#: ../lib/engine/components/opal/opal-call.cpp:476
 msgid "Call completed"
 msgstr "호출을 마쳤습니다"
 
-#: ../lib/engine/components/opal/opal-call-manager.cpp:725
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
 msgid ""
 "Ekiga did not manage to configure your network settings automatically. You "
 "can still use it, but you need to configure your network settings manually.\n"
@@ -1412,216 +1426,216 @@
 "설정 방법은 http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
 "페이지를 참고하십시오"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:282
-#: ../lib/engine/components/opal/sip-endpoint.cpp:284
+#: ../lib/engine/components/opal/sip-endpoint.cpp:255
+#: ../lib/engine/components/opal/sip-endpoint.cpp:257
 msgid "Message"
 msgstr "메시지"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:710
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
 msgid "Bad request"
 msgstr "잘못된 요청"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:714
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
 msgid "Payment required"
 msgstr "요금을 지불해야 합니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:718
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
 msgid "Unauthorized"
 msgstr "인증하지 않았습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:722
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
 msgid "Forbidden"
 msgstr "금지"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:726
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
 msgid "Timeout"
 msgstr "제한 시간"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:730
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
 msgid "Conflict"
 msgstr "충돌"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:734
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
 msgid "Temporarily unavailable"
 msgstr "일시적으로 사용할 수 없습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:738
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
 msgid "Not acceptable"
 msgstr "받아들이지 않습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:742
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
 msgid "Illegal status code"
 msgstr "상태 코드가 잘못되었습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:746
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
 msgid "Multiple choices"
 msgstr "여러가지 선택이 있습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:750
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
 msgid "Moved permanently"
 msgstr "영구히 이동했습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:754
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
 msgid "Moved temporarily"
 msgstr "임시로 이동했습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:758
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
 msgid "Use proxy"
 msgstr "프록시 사용"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:762
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
 msgid "Alternative service"
 msgstr "예비 서비스"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:766
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
 msgid "Not found"
 msgstr "없음"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:770
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
 msgid "Method not allowed"
 msgstr "이 방법을 허용하지 않습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:774
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
 msgid "Proxy authentication required"
 msgstr "프록시 인증이 필요합니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:778
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
 msgid "Length required"
 msgstr "길이가 필요합니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:782
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
 msgid "Request entity too big"
 msgstr "요청 엔티티가 너무 큽니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:786
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
 msgid "Request URI too long"
 msgstr "요청 URI가 너무 깁니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:790
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
 msgid "Unsupported media type"
 msgstr "지원하지 않는 미디어 종류"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:794
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
 msgid "Unsupported URI scheme"
 msgstr "지원하지 않는 URI 방식"
 
 #. Translators : The extension we are trying to register does not exist
-#: ../lib/engine/components/opal/sip-endpoint.cpp:799
+#: ../lib/engine/components/opal/sip-endpoint.cpp:814
 msgid "Bad extension"
 msgstr "확장 기능이 올바르지 않습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:803
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
 msgid "Extension required"
 msgstr "확장 기능이 필요합니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:807
+#: ../lib/engine/components/opal/sip-endpoint.cpp:822
 msgid "Interval too brief"
 msgstr "간격이 너무 작습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:811
+#: ../lib/engine/components/opal/sip-endpoint.cpp:826
 msgid "Loop detected"
 msgstr "루프가 발견되었습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:815
+#: ../lib/engine/components/opal/sip-endpoint.cpp:830
 msgid "Too many hops"
 msgstr "단계가 너무 많습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:819
+#: ../lib/engine/components/opal/sip-endpoint.cpp:834
 msgid "Address incomplete"
 msgstr "주소가 불완전합니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:823
+#: ../lib/engine/components/opal/sip-endpoint.cpp:838
 msgid "Ambiguous"
 msgstr "애매합니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:827
+#: ../lib/engine/components/opal/sip-endpoint.cpp:842
 msgid "Busy Here"
 msgstr "여기를 사용 중입니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:831
+#: ../lib/engine/components/opal/sip-endpoint.cpp:846
 msgid "Request terminated"
 msgstr "요청을 없앴습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:835
+#: ../lib/engine/components/opal/sip-endpoint.cpp:850
 msgid "Not acceptable here"
 msgstr "여기서 받아들일 수 없습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:839
+#: ../lib/engine/components/opal/sip-endpoint.cpp:854
 msgid "Bad event"
 msgstr "잘못된 이벤트"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:843
+#: ../lib/engine/components/opal/sip-endpoint.cpp:858
 msgid "Request pending"
 msgstr "요청이 미해결 상태입니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:847
+#: ../lib/engine/components/opal/sip-endpoint.cpp:862
 msgid "Undecipherable"
 msgstr "해독할 수 없습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:851
+#: ../lib/engine/components/opal/sip-endpoint.cpp:866
 msgid "Internal server error"
 msgstr "내부 서버 오류"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:855
+#: ../lib/engine/components/opal/sip-endpoint.cpp:870
 msgid "Not implemented"
 msgstr "구현하지 않음"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:859
+#: ../lib/engine/components/opal/sip-endpoint.cpp:874
 msgid "Bad gateway"
 msgstr "게이트웨이가 올바르지 않습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:863
+#: ../lib/engine/components/opal/sip-endpoint.cpp:878
 msgid "Service unavailable"
 msgstr "서비스를 사용할 수 없습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:867
+#: ../lib/engine/components/opal/sip-endpoint.cpp:882
 msgid "Server timeout"
 msgstr "서버에서 제한 시간 초과"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:871
+#: ../lib/engine/components/opal/sip-endpoint.cpp:886
 msgid "SIP version not supported"
 msgstr "SIP 버전을 지원하지 않습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:875
+#: ../lib/engine/components/opal/sip-endpoint.cpp:890
 msgid "Message too large"
 msgstr "메시지가 너무 깁니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:879
+#: ../lib/engine/components/opal/sip-endpoint.cpp:894
 msgid "Busy everywhere"
 msgstr "모두 사용 중입니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:883
+#: ../lib/engine/components/opal/sip-endpoint.cpp:898
 msgid "Decline"
 msgstr "거부"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:887
+#: ../lib/engine/components/opal/sip-endpoint.cpp:902
 msgid "Does not exist anymore"
 msgstr "더 이상 없습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:891
+#: ../lib/engine/components/opal/sip-endpoint.cpp:906
 msgid "Globally not acceptable"
 msgstr "전체적으로 받아들일 수 없습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1020
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1043
 msgid "Could not send message"
 msgstr "메시지를 보낼 수 없습니다"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1165
 #, c-format
 msgid "Incoming call from %s"
 msgstr "호출 받음: %s"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1136
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1167
 #, c-format
 msgid "Incoming call"
 msgstr "호출 받음"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1142
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1173
 #, c-format
 msgid "In a call with %s"
 msgstr "통화 중: %s"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1144
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1175
 #, c-format
 msgid "In a call"
 msgstr "통화 중"
@@ -1648,11 +1662,11 @@
 msgid "Username:"
 msgstr "사용자 이름:"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:103
-#: ../lib/engine/components/resource-list/rl-heap.cpp:144
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
 #: ../lib/engine/components/resource-list/rl-heap.cpp:178
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:133
-#: ../lib/engine/components/resource-list/rl-entry.cpp:130
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
 msgid "Unnamed"
 msgstr "이름 없음"
 
@@ -1668,74 +1682,74 @@
 msgid "Contact list _properties"
 msgstr "연락처 목록 속성(_P)"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:467
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
 msgid "Edit contact list properties"
 msgstr "연락처 목록 속성 편집"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
 msgid "Please edit the following fields (no identifier means global)"
 msgstr "다음 항목을 편집하십시오 (ID가 없으면 전체를 의미합니다)"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
 msgid "Contact list's name"
 msgstr "연락처 목록의 이름"
 
 #. "Document" used as a name -- uri point to the root of a document tree
-#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
 msgid "Document root"
 msgstr "문서 최상위"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
 msgid "Identifier"
 msgstr "ID"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:476
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
 msgid "Writable"
 msgstr "쓰기 가능"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:477
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
 msgid "Server username"
 msgstr "서버 사용자 이름"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:478
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
 msgid "Server password"
 msgstr "서버 암호"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:530
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
 msgid "Add a remote contact"
 msgstr "원격 연락처 추가"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:531
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
 msgid "Please fill in this form to create a new contact on a remote server"
 msgstr "새 연락처를 원격 서버에 추가하려면 다음 정보를 입력하십시오"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:221
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
 msgid "Edit remote contact"
 msgstr "원격 연락처 편집"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
 msgid ""
 "Please fill in this form to change an existing contact on a remote server"
 msgstr "원격 서버의 기존 연락처를 바꾸려면 다음 정보를 입력하십시오"
 
-#: ../lib/engine/components/resource-list/rl-entry.cpp:186
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
 msgid "Invalid server data"
 msgstr "서버 데이터가 잘못되었습니다"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:51
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
 msgid "Click to fetch"
 msgstr "가져오려면 누르십시오"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:118
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
 msgid "Distant contact"
 msgstr "장거리 연락처"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:181
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
 #, c-format
 msgid "%s / List #%d"
 msgstr "%s / 목록 #%d"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:185
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
 #, c-format
 msgid "List #%d"
 msgstr "목록 #%d"
@@ -1749,7 +1763,7 @@
 msgstr "주소록"
 
 #: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
-#: ../src/gui/main.cpp:3122
+#: ../src/gui/main.cpp:3127
 msgid "Address _Book"
 msgstr "주소록(_B)"
 
@@ -1763,13 +1777,13 @@
 msgstr "분류"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
-#: ../src/gui/assistant.cpp:1379
+#: ../src/gui/assistant.cpp:1368
 msgid "Full Name"
 msgstr "전체 이름"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:601
 msgid "_Search Filter:"
-msgstr "찾기 필터(_S):"
+msgstr "검색 필터(_S):"
 
 #: ../lib/engine/gui/gtk-frontend/chat-area.cpp:247
 msgid "says:"
@@ -1784,7 +1798,7 @@
 msgstr "링크 복사"
 
 # 참고: 이모티콘 입력 단추
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:904
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
 msgid "_Smile..."
 msgstr "웃는 얼굴(_S)..."
 
@@ -1799,11 +1813,11 @@
 msgid "Unsorted"
 msgstr "분류 없음"
 
-#: ../lib/gui/codecsbox.cpp:477
+#: ../lib/gui/codecsbox.cpp:478
 msgid "Move selected codec priority upwards"
 msgstr "선택한 코덱의 우선순위를 낮춥니다"
 
-#: ../lib/gui/codecsbox.cpp:487
+#: ../lib/gui/codecsbox.cpp:488
 msgid "Move selected codec priority downwards"
 msgstr "선택한 코덱의 우선순위를 높입니다"
 
@@ -1811,47 +1825,47 @@
 msgid "Do not show this dialog again"
 msgstr "이 대화 상자를 다시 표시하지 안 함"
 
-#: ../src/gui/accounts.cpp:229
+#: ../src/gui/accounts.cpp:230
 msgid "Registered"
 msgstr "등록했습니다"
 
-#: ../src/gui/accounts.cpp:233
+#: ../src/gui/accounts.cpp:234
 msgid "Unregistered"
 msgstr "등록 해제했습니다"
 
-#: ../src/gui/accounts.cpp:237
+#: ../src/gui/accounts.cpp:238
 msgid "Could not unregister"
 msgstr "등록을 해제할 수 없습니다"
 
-#: ../src/gui/accounts.cpp:243
+#: ../src/gui/accounts.cpp:244
 msgid "Could not register"
 msgstr "등록할 수 없습니다"
 
-#: ../src/gui/accounts.cpp:249
+#: ../src/gui/accounts.cpp:250
 msgid "Processing..."
 msgstr "처리하는 중입니다..."
 
-#: ../src/gui/accounts.cpp:632
+#: ../src/gui/accounts.cpp:636
 msgid "Account Name"
 msgstr "계정 이름"
 
-#: ../src/gui/accounts.cpp:633
+#: ../src/gui/accounts.cpp:637
 msgid "Voice Mails"
 msgstr "보이스 메일"
 
-#: ../src/gui/accounts.cpp:634
+#: ../src/gui/accounts.cpp:638
 msgid "Status"
 msgstr "상태"
 
-#: ../src/gui/accounts.cpp:645 ../src/gui/accounts.cpp:688
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
 msgid "Accounts"
 msgstr "계정"
 
-#: ../src/gui/accounts.cpp:659 ../src/gui/main.cpp:3183
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3188
 msgid "_Accounts"
 msgstr "계정(_A)"
 
-#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3266
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3271
 msgid "_Help"
 msgstr "도움말(_H)"
 
@@ -1861,11 +1875,11 @@
 #. * description in the list of configured accounts, it shows if an account
 #. * is activated or not (a status the user can choose).
 #.
-#: ../src/gui/accounts.cpp:696 ../src/gui/preferences.cpp:586
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
 msgid "A"
 msgstr "A"
 
-#: ../src/gui/assistant.cpp:325
+#: ../src/gui/assistant.cpp:321
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1879,38 +1893,38 @@
 "이 단계를 모두 마친 이후에라도, 언제든지 편집 메뉴의 기본 설정에서 설정을 바"
 "꿀 수 있습니다."
 
-#: ../src/gui/assistant.cpp:333
+#: ../src/gui/assistant.cpp:329
 msgid "Welcome to Ekiga"
 msgstr "안녕하세요, 에키가입니다"
 
-#: ../src/gui/assistant.cpp:367 ../src/gui/preferences.cpp:454
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "개인 정보"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:370
+#: ../src/gui/assistant.cpp:356
 msgid "Please enter your first name and your surname:"
 msgstr "이름과 성을 입력하십시오:"
 
-#: ../src/gui/assistant.cpp:379
+#: ../src/gui/assistant.cpp:365
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
-msgstr "이름과 성은 다른 VoIP 및 화상 회의 소프트웨어에 연결하는 데 쓰입니다."
+msgstr "이름과 성은 다른 VoIP 및 화상 회의 소프트웨어에 연결하는데 쓰입니다."
 
-#: ../src/gui/assistant.cpp:570
+#: ../src/gui/assistant.cpp:559
 msgid "Ekiga.net Account"
 msgstr "Ekiga.net 계정"
 
-#: ../src/gui/assistant.cpp:572
+#: ../src/gui/assistant.cpp:561
 msgid "Please enter your username:"
 msgstr "사용자 이름을 입력하십시오:"
 
-#: ../src/gui/assistant.cpp:580
+#: ../src/gui/assistant.cpp:569
 msgid "Please enter your password:"
 msgstr "암호를 입력하십시오:"
 
-#: ../src/gui/assistant.cpp:590
+#: ../src/gui/assistant.cpp:579
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1920,30 +1934,27 @@
 "You may skip this step if you use an alternative SIP service, or if you "
 "would prefer to specify the login details later."
 msgstr ""
-"사용자 이름과 암호는 ekiga.net 무료 SIP 서비스의 계정에 로그인하는 데 사용합"
-"니다. ekiga.net SIP 주소가 아직 없으시다면, 아래에서 새로 계정을 만들 수 있습"
-"니다. 그러면 사람들이 사용자분께 전화할 수 있는 SIP 주소가 생깁니다.\n"
+"사용자 이름과 암호는 ekiga.net 무료 SIP 서비스의 계정에 로그인하는데 사용합니다. ekiga.net SIP 주소가 아직 없으시다면, 아래에서 새로 계정을 만들 수 있습니다. 그러면 사람들이 사용자분께 전화할 수 있는 SIP 주소가 생깁니다.\n"
 "\n"
-"이 단계를 건너 뛰고 다른 SIP 서비스를 사용할 수도 있고, 아니면 나중에 로그인 "
-"정보를 지정할 수도 있습니다."
+"이 단계를 건너 뛰고 다른 SIP 서비스를 사용할 수도 있고, 아니면 나중에 로그인 정보를 지정할 수도 있습니다."
 
-#: ../src/gui/assistant.cpp:617
+#: ../src/gui/assistant.cpp:606
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "ekiga.net 무료 서비스에 가입하지 않습니다"
 
-#: ../src/gui/assistant.cpp:680
+#: ../src/gui/assistant.cpp:669
 msgid "Ekiga Call Out Account"
 msgstr "에키가 외부 전화 계정"
 
-#: ../src/gui/assistant.cpp:682
+#: ../src/gui/assistant.cpp:671
 msgid "Please enter your account ID:"
 msgstr "계정 ID를 입력하십시오:"
 
-#: ../src/gui/assistant.cpp:690
+#: ../src/gui/assistant.cpp:679
 msgid "Please enter your PIN code:"
 msgstr "비밀번호를 입력하십시오:"
 
-#: ../src/gui/assistant.cpp:701
+#: ../src/gui/assistant.cpp:690
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1961,49 +1972,49 @@
 "- 그리고 계정 아이디와 비밀번호를 입력합니다.\n"
 "이 대화 상자의 이 URL을 사용해 계정을 만든 경우에만 이 서비스가 동작합니다.\n"
 
-#: ../src/gui/assistant.cpp:751
+#: ../src/gui/assistant.cpp:740
 msgid "Consult the calls history"
 msgstr "호출 기록을 살펴봅니다"
 
-#: ../src/gui/assistant.cpp:761
+#: ../src/gui/assistant.cpp:750
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr "에키가 외부 전화 서비스에 가입하지 않습니다"
 
-#: ../src/gui/assistant.cpp:827 ../src/gui/assistant.cpp:1390
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
 msgid "Connection Type"
 msgstr "연결 종류"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:830
+#: ../src/gui/assistant.cpp:819
 msgid "Please choose your connection type:"
 msgstr "연결 종류를 선택하십시오:"
 
-#: ../src/gui/assistant.cpp:847
+#: ../src/gui/assistant.cpp:836
 msgid "56k Modem"
 msgstr "56k 모뎀"
 
-#: ../src/gui/assistant.cpp:852
+#: ../src/gui/assistant.cpp:841
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:857
+#: ../src/gui/assistant.cpp:846
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "DSL/케이블 (128 kbit/s 업링크)"
 
-#: ../src/gui/assistant.cpp:862
+#: ../src/gui/assistant.cpp:851
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "DSL/케이블 (512 kbit/s 업링크)"
 
-#: ../src/gui/assistant.cpp:867
+#: ../src/gui/assistant.cpp:856
 msgid "LAN"
 msgstr "LAN"
 
-#: ../src/gui/assistant.cpp:872
+#: ../src/gui/assistant.cpp:861
 msgid "Keep current settings"
 msgstr "현재 설정을 유지"
 
 # FIXME - 좀 더 부드러운 한국말로..
-#: ../src/gui/assistant.cpp:877
+#: ../src/gui/assistant.cpp:866
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -2012,64 +2023,64 @@
 "연결 종류는 에키가 호출에 사용할 최고의 품질 설정을 합니다. 나중에 기본 설정 "
 "창에서 이 설정을 따로 바꿀 수 있습니다."
 
-#: ../src/gui/assistant.cpp:971 ../src/gui/main.cpp:3012
-#: ../src/gui/main.cpp:3016 ../src/gui/preferences.cpp:760
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3017
+#: ../src/gui/main.cpp:3021 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "오디오 장치"
 
-#: ../src/gui/assistant.cpp:973
+#: ../src/gui/assistant.cpp:962
 msgid "Please choose the audio ringing device:"
 msgstr "오디오 벨소리 장치를 선택하십시오:"
 
-#: ../src/gui/assistant.cpp:993
+#: ../src/gui/assistant.cpp:982
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
 msgstr "오디오 벨소리 장치는 전화가 걸려왔을 때 벨 소리를 내는 장치입니다."
 
 #. ---
-#: ../src/gui/assistant.cpp:1004
+#: ../src/gui/assistant.cpp:993
 msgid "Please choose the audio output device:"
 msgstr "오디오 출력 장치를 선택하십시오:"
 
-#: ../src/gui/assistant.cpp:1024
+#: ../src/gui/assistant.cpp:1013
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
-msgstr "오디오 출력 장치는 통화 중에 오디오를 재생하는 데 사용하는 장치입니다."
+msgstr "오디오 출력 장치는 통화 중에 오디오를 재생하는데 사용하는 장치입니다."
 
 #. ---
-#: ../src/gui/assistant.cpp:1035
+#: ../src/gui/assistant.cpp:1024
 msgid "Please choose the audio input device:"
 msgstr "오디오 입력 장치를 선택하십시오:"
 
-#: ../src/gui/assistant.cpp:1055
+#: ../src/gui/assistant.cpp:1044
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
-msgstr "오디오 입력 장치는 통화 중에 오디오를 녹음하는 데 사용하는 장치입니다."
+msgstr "오디오 입력 장치는 통화 중에 오디오를 녹음하는데 사용하는 장치입니다."
 
-#: ../src/gui/assistant.cpp:1157
+#: ../src/gui/assistant.cpp:1146
 msgid "Please choose your video input device:"
 msgstr "비디오 입력 장치를 선택하십시오:"
 
-#: ../src/gui/assistant.cpp:1177
+#: ../src/gui/assistant.cpp:1166
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
-msgstr "비디오 입력 장치는 비디오를 캡처하는 데 사용하는 장치입니다."
+msgstr "비디오 입력 장치는 비디오를 캡처하는데 사용하는 장치입니다."
 
-#: ../src/gui/assistant.cpp:1242 ../src/gui/assistant.cpp:1266
-#: ../src/gui/assistant.cpp:1290 ../src/gui/preferences.cpp:805
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
 #: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "장치를 찾을 수 없습니다"
 
-#: ../src/gui/assistant.cpp:1321
+#: ../src/gui/assistant.cpp:1310
 msgid "Configuration Complete"
 msgstr "설정을 마쳤습니다"
 
-#: ../src/gui/assistant.cpp:1323
+#: ../src/gui/assistant.cpp:1312
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
@@ -2077,35 +2088,35 @@
 "에키가 설정을 모두 마쳤습니다. 여기서 설정한 사항은 에키가 기본 설정에서도 바"
 "꿀 수 있습니다. 즐겁게 이용하십시오!"
 
-#: ../src/gui/assistant.cpp:1330
+#: ../src/gui/assistant.cpp:1319
 msgid "Configuration summary:"
 msgstr "설정 내용 요약:"
 
-#: ../src/gui/assistant.cpp:1400
+#: ../src/gui/assistant.cpp:1389
 msgid "Audio Ringing Device"
 msgstr "오디오 벨소리 장치"
 
-#: ../src/gui/assistant.cpp:1409
+#: ../src/gui/assistant.cpp:1398
 msgid "Audio Output Device"
 msgstr "오디오 출력 장치"
 
-#: ../src/gui/assistant.cpp:1418
+#: ../src/gui/assistant.cpp:1407
 msgid "Audio Input Device"
 msgstr "오디오 입력 장치"
 
-#: ../src/gui/assistant.cpp:1427
+#: ../src/gui/assistant.cpp:1416
 msgid "Video Input Device"
 msgstr "비디오 입력 장치"
 
-#: ../src/gui/assistant.cpp:1440
+#: ../src/gui/assistant.cpp:1429
 msgid "SIP URI"
 msgstr "SIP URI"
 
-#: ../src/gui/assistant.cpp:1452
+#: ../src/gui/assistant.cpp:1441
 msgid "Ekiga Call Out"
 msgstr "에키가 외부 전화"
 
-#: ../src/gui/assistant.cpp:1496
+#: ../src/gui/assistant.cpp:1485
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr "에키가 설정 도우미 (%d/%d)"
@@ -2223,100 +2234,96 @@
 msgstr "wxyz"
 
 #. Translators: Is displayed once an account "%s" is registered.
-#: ../src/gui/main.cpp:519
+#: ../src/gui/main.cpp:521
 #, c-format
 msgid "Registered %s"
 msgstr "등록: %s"
 
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:526
+#: ../src/gui/main.cpp:528
 #, c-format
 msgid "Unregistered %s"
 msgstr "등록 해제: %s"
 
-#: ../src/gui/main.cpp:531
+#: ../src/gui/main.cpp:533
 #, c-format
 msgid "Could not unregister %s"
 msgstr "%s 등록을 해제할 수 없습니다"
 
-#: ../src/gui/main.cpp:535
+#: ../src/gui/main.cpp:537
 #, c-format
 msgid "Could not register %s"
 msgstr "%s 등록할 수 없습니다"
 
-#: ../src/gui/main.cpp:605
+#: ../src/gui/main.cpp:607
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr "오디오:%.1f/%.1f   비디오:%.1f/%.1f   프레임:%d/%d"
 
-#: ../src/gui/main.cpp:651
+#: ../src/gui/main.cpp:653
 #, c-format
 msgid "Connected with %s"
 msgstr "%s(으)로 연결"
 
-#: ../src/gui/main.cpp:692 ../src/gui/main.cpp:3512
+#: ../src/gui/main.cpp:694 ../src/gui/main.cpp:3517
 msgid "Standby"
 msgstr "대기 상태"
 
-#: ../src/gui/main.cpp:753
+#: ../src/gui/main.cpp:755
 msgid "Call on hold"
 msgstr "호출 대기"
 
-#: ../src/gui/main.cpp:764
+#: ../src/gui/main.cpp:766
 msgid "Call retrieved"
 msgstr "호출 받음"
 
-#: ../src/gui/main.cpp:780
+#: ../src/gui/main.cpp:782
 #, c-format
 msgid "Missed call from %s"
 msgstr "호출 놓침 (건 사람: %s)"
 
-#: ../src/gui/main.cpp:917
+#: ../src/gui/main.cpp:919
 msgid "Error"
 msgstr "오류"
 
-#: ../src/gui/main.cpp:982
+#: ../src/gui/main.cpp:984
 msgid "Error while initializing video output"
-msgstr "비디오 출력을 초기화하는 데 오류 발생"
+msgstr "비디오 출력을 초기화하는데 오류 발생"
 
-#: ../src/gui/main.cpp:983
+#: ../src/gui/main.cpp:985
 msgid "No video will be displayed during this call->"
 msgstr "이 호출 중에는 비디오를 표시하지 않습니다->"
 
-#: ../src/gui/main.cpp:993
+#: ../src/gui/main.cpp:995
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that no other application is using the accelerated video output."
-msgstr ""
-"비디오 출력을 열거나 초기화하는 데 오류가 발생했습니다. 다른 프로그램이 비디"
-"오 출력 가속을 사용하지 않도록 하십시오."
+msgstr "비디오 출력을 열거나 초기화하는데 오류가 발생했습니다. 다른 프로그램이 비디오 출력 가속을 사용하지 않도록 하십시오."
 
-#: ../src/gui/main.cpp:995
+#: ../src/gui/main.cpp:997
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that you are using a color depth of 24 or 32 bits per pixel."
-msgstr ""
-"비디오 출력을 열거나 초기화하는 데 오류가 발생했습니다. 픽셀당 24비트나 32비"
-"트 색을 사용해야 합니다."
+msgstr "비디오 출력을 열거나 초기화하는데 오류가 발생했습니다. 픽셀당 24비트나 32비트 색을 사용해야 합니다."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1108
+#: ../src/gui/main.cpp:1110
 #, c-format
 msgid "Added video input device %s"
 msgstr "비디오 입력 장치를 (%s) 더했습니다"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1120
+#: ../src/gui/main.cpp:1122
 #, c-format
 msgid "Removed video input device %s"
 msgstr "비디오 입력 장치를 (%s) 지웠습니다"
 
-#: ../src/gui/main.cpp:1137
+#: ../src/gui/main.cpp:1139
 #, c-format
 msgid "Error while accessing video device %s"
-msgstr "비디오 장치에 (%s) 접근하는 데 오류 발생"
+msgstr "비디오 장치에 (%s) 접근하는데 오류 발생"
 
-#: ../src/gui/main.cpp:1140
+#: ../src/gui/main.cpp:1142
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
@@ -2326,26 +2333,23 @@
 "택하거나 \"Moving logo\" \"Static picture\"를 장치로 선택하면 주어진 그림이"
 "나 움직이는 로고를 선택할 수 있습니다."
 
-#: ../src/gui/main.cpp:1144
+#: ../src/gui/main.cpp:1146
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
 "accessible, please check your permissions and make sure that the appropriate "
 "driver is loaded."
-msgstr ""
-"장치를 여는 데 오류가 발생했습니다. 연결하는 방식의 장치인 경우 다시 연결하기"
-"만 하면 됩니다. 연결하는 장치가 아니거나 계속 열 수 없는 경우에는 권한이 올바"
-"른지 확인하고 해당 드라이버를 읽어들였는 지 확인하십시오."
+msgstr "장치를 여는데 오류가 발생했습니다. 연결하는 방식의 장치인 경우 다시 연결하기만 하면 됩니다. 연결하는 장치가 아니거나 계속 열 수 없는 경우에는 권한이 올바른지 확인하고 해당 드라이버를 읽어들였는지 확인하십시오."
 
-#: ../src/gui/main.cpp:1148
+#: ../src/gui/main.cpp:1150
 msgid "Your video driver doesn't support the requested video format."
 msgstr "비디오 드라이버가 요청한 비디오 형식을 지원하지 않습니다."
 
-#: ../src/gui/main.cpp:1152
+#: ../src/gui/main.cpp:1154
 msgid "Could not open the chosen channel."
 msgstr "선택한 채널을 열 수 없습니다."
 
-#: ../src/gui/main.cpp:1156
+#: ../src/gui/main.cpp:1158
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2355,42 +2359,42 @@
 "드라이버가 에키가가 지원하는 색 형식중에 아무 것도 지원하지 않습니다.\n"
 "어떤 팔레트를 지원하는 지에 대해서는 커널 드라이버의 문서를 확인하십시오."
 
-#: ../src/gui/main.cpp:1160
+#: ../src/gui/main.cpp:1162
 msgid "Error while setting the frame rate."
-msgstr "프레임 전송률을 설정하는 데 오류."
+msgstr "프레임 전송률을 설정하는데 오류."
 
-#: ../src/gui/main.cpp:1164
+#: ../src/gui/main.cpp:1166
 msgid "Error while setting the frame size."
-msgstr "프레임 크기를 설정하는 데 오류."
+msgstr "프레임 크기를 설정하는데 오류."
 
-#: ../src/gui/main.cpp:1169 ../src/gui/main.cpp:1271 ../src/gui/main.cpp:1386
+#: ../src/gui/main.cpp:1171 ../src/gui/main.cpp:1273 ../src/gui/main.cpp:1388
 msgid "Unknown error."
 msgstr "알 수 없는 오류."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1219
+#: ../src/gui/main.cpp:1221
 #, c-format
 msgid "Added audio input device %s"
 msgstr "오디오 입력 장치를 (%s) 더했습니다"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1236
+#: ../src/gui/main.cpp:1238
 #, c-format
 msgid "Removed audio input device %s"
 msgstr "오디오 입력 장치를 (%s) 지웠습니다"
 
-#: ../src/gui/main.cpp:1253
+#: ../src/gui/main.cpp:1255
 #, c-format
 msgid "Error while opening audio input device %s"
-msgstr "오디오 입력 장치를 (%s) 여는 데 오류 발생"
+msgstr "오디오 입력 장치를 (%s) 여는데 오류 발생"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
-#: ../src/gui/main.cpp:1258
+#: ../src/gui/main.cpp:1260
 msgid "Only silence will be transmitted."
 msgstr "묵음만 전달합니다."
 
-#: ../src/gui/main.cpp:1262
+#: ../src/gui/main.cpp:1264
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2401,7 +2405,7 @@
 "연결하기만 하면 됩니다. 연결하는 장치가 아니거나 계속 열 수 없는 경우에는 오"
 "디오 설정, 권한이 올바른지 확인하고 장치가 사용 중이 아닌지 확인하십시오."
 
-#: ../src/gui/main.cpp:1266
+#: ../src/gui/main.cpp:1268
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2412,26 +2416,26 @@
 "다. 연결하는 방식의 장치인 경우 다시 연결하기만 하면 됩니다. 연결하는 장치가 "
 "아니거나 계속 읽을 수 없는 경우에는 오디오 설정이 올바른지 확인하십시오."
 
-#: ../src/gui/main.cpp:1333
+#: ../src/gui/main.cpp:1335
 #, c-format
 msgid "Added audio output device %s"
 msgstr "오디오 출력 장치를 (%s) 더했습니다"
 
-#: ../src/gui/main.cpp:1349
+#: ../src/gui/main.cpp:1351
 #, c-format
 msgid "Removed audio output device %s"
 msgstr "오디오 출력 장치를 (%s) 지웠습니다"
 
-#: ../src/gui/main.cpp:1370
+#: ../src/gui/main.cpp:1372
 #, c-format
 msgid "Error while opening audio output device %s"
-msgstr "오디오 출력 장치를 (%s) 여는 데 오류 발생"
+msgstr "오디오 출력 장치를 (%s) 여는데 오류 발생"
 
-#: ../src/gui/main.cpp:1373
+#: ../src/gui/main.cpp:1375
 msgid "No incoming sound will be played."
 msgstr "받은 소리를 재생하지 않습니다."
 
-#: ../src/gui/main.cpp:1377
+#: ../src/gui/main.cpp:1379
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2442,7 +2446,7 @@
 "시 연결하기만 하면 됩니다. 연결하는 장치가 아니거나 계속 열 수 없는 경우에는 "
 "오디오 설정, 권한이 올바른지 확인하고 장치가 사용 중이 아닌지 확인하십시오."
 
-#: ../src/gui/main.cpp:1381
+#: ../src/gui/main.cpp:1383
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
@@ -2453,354 +2457,354 @@
 "연결하는 방식의 장치인 경우 다시 연결하기만 하면 됩니다. 연결하는 장치가 아니"
 "거나 계속 쓸 수 없는 경우에는 오디오 설정을 확인하십시오."
 
-#: ../src/gui/main.cpp:1569
+#: ../src/gui/main.cpp:1574
 msgid "Video Settings"
 msgstr "비디오 설정"
 
-#: ../src/gui/main.cpp:1596
+#: ../src/gui/main.cpp:1601
 msgid "Adjust brightness"
 msgstr "밝기 조정"
 
-#: ../src/gui/main.cpp:1617
+#: ../src/gui/main.cpp:1622
 msgid "Adjust whiteness"
 msgstr "백색 조정"
 
-#: ../src/gui/main.cpp:1638
+#: ../src/gui/main.cpp:1643
 msgid "Adjust color"
 msgstr "색 조정"
 
-#: ../src/gui/main.cpp:1659
+#: ../src/gui/main.cpp:1664
 msgid "Adjust contrast"
 msgstr "대비 조정"
 
-#: ../src/gui/main.cpp:1705
+#: ../src/gui/main.cpp:1710
 msgid "Audio Settings"
 msgstr "오디오 설정"
 
-#: ../src/gui/main.cpp:2316
+#: ../src/gui/main.cpp:2321
 msgid "_Retrieve Call"
 msgstr "호출 중지(_R)"
 
-#: ../src/gui/main.cpp:2329
+#: ../src/gui/main.cpp:2334
 msgid "_Hold Call"
 msgstr "호출 보류(_H)"
 
-#: ../src/gui/main.cpp:2361 ../src/gui/main.cpp:3149
+#: ../src/gui/main.cpp:2366 ../src/gui/main.cpp:3154
 msgid "Suspend _Audio"
 msgstr "오디오 일시 정지(_A)"
 
-#: ../src/gui/main.cpp:2363 ../src/gui/main.cpp:3154
+#: ../src/gui/main.cpp:2368 ../src/gui/main.cpp:3159
 msgid "Suspend _Video"
 msgstr "비디오 일시 정지(_V)"
 
-#: ../src/gui/main.cpp:2365
+#: ../src/gui/main.cpp:2370
 msgid "Resume _Audio"
 msgstr "오디오 다시 시작(_A)"
 
-#: ../src/gui/main.cpp:2367
+#: ../src/gui/main.cpp:2372
 msgid "Resume _Video"
 msgstr "비디오 다시 시작(_V)"
 
-#: ../src/gui/main.cpp:2650 ../src/gui/main.cpp:2802
+#: ../src/gui/main.cpp:2655 ../src/gui/main.cpp:2807
 msgid "Reject"
 msgstr "거부"
 
-#: ../src/gui/main.cpp:2652 ../src/gui/main.cpp:2801
+#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2806
 msgid "Accept"
 msgstr "허용"
 
-#: ../src/gui/main.cpp:2658 ../src/gui/main.cpp:2789
+#: ../src/gui/main.cpp:2663 ../src/gui/main.cpp:2794
 msgid "Incoming call from"
 msgstr "다음에서 호출 들어옴:"
 
-#: ../src/gui/main.cpp:2676 ../src/gui/main.cpp:2792
+#: ../src/gui/main.cpp:2681 ../src/gui/main.cpp:2797
 msgid "Remote URI:"
 msgstr "원격 URI:"
 
-#: ../src/gui/main.cpp:2688 ../src/gui/main.cpp:2794
+#: ../src/gui/main.cpp:2693 ../src/gui/main.cpp:2799
 msgid "Remote Application:"
 msgstr "원격 프로그램:"
 
-#: ../src/gui/main.cpp:2709
+#: ../src/gui/main.cpp:2714
 #, c-format
 msgid "Call from %s"
 msgstr "%s에서 호출"
 
-#: ../src/gui/main.cpp:2915
+#: ../src/gui/main.cpp:2920
 #, c-format
 msgid "Call Duration: %s\n"
 msgstr "호출 시간: %s\n"
 
-#: ../src/gui/main.cpp:2946
+#: ../src/gui/main.cpp:2951
 msgid "Transfer call to:"
 msgstr "호출 전달:"
 
-#: ../src/gui/main.cpp:2998
+#: ../src/gui/main.cpp:3003
 msgid "No"
 msgstr "아니오"
 
-#: ../src/gui/main.cpp:3000
+#: ../src/gui/main.cpp:3005
 msgid "Yes"
 msgstr "예"
 
-#: ../src/gui/main.cpp:3011
+#: ../src/gui/main.cpp:3016
 msgid "Detected new audio input device:"
 msgstr "새 오디오 입력 장치를 검색했습니다:"
 
-#: ../src/gui/main.cpp:3015
+#: ../src/gui/main.cpp:3020
 msgid "Detected new audio output device:"
 msgstr "새 오디오 출력 장치를 검색했습니다:"
 
-#: ../src/gui/main.cpp:3019
+#: ../src/gui/main.cpp:3024
 msgid "Detected new video input device:"
 msgstr "새 비디오 입력 장치를 검색했습니다:"
 
-#: ../src/gui/main.cpp:3020 ../src/gui/preferences.cpp:921
+#: ../src/gui/main.cpp:3025 ../src/gui/preferences.cpp:921
 msgid "Video Devices"
 msgstr "비디오 장치"
 
-#: ../src/gui/main.cpp:3038
+#: ../src/gui/main.cpp:3043
 msgid "Do you want to use it as default device?"
 msgstr "기본 장치로 사용하시겠습니까?"
 
-#: ../src/gui/main.cpp:3106
+#: ../src/gui/main.cpp:3111
 msgid "_Chat"
 msgstr "대화(_C)"
 
-#: ../src/gui/main.cpp:3108
+#: ../src/gui/main.cpp:3113
 msgid "Ca_ll"
 msgstr "호출(_L)"
 
-#: ../src/gui/main.cpp:3108
+#: ../src/gui/main.cpp:3113
 msgid "Place a new call"
 msgstr "새로 호출합니다"
 
-#: ../src/gui/main.cpp:3111
+#: ../src/gui/main.cpp:3116
 msgid "_Hang up"
 msgstr "끊기(_H)"
 
-#: ../src/gui/main.cpp:3112
+#: ../src/gui/main.cpp:3117
 msgid "Terminate the current call"
 msgstr "현재 호출을 멈춥니다"
 
-#: ../src/gui/main.cpp:3118
+#: ../src/gui/main.cpp:3123
 msgid "A_dd Contact"
 msgstr "연락처 추가(_D)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3118
+#: ../src/gui/main.cpp:3123
 msgid "Add a contact to the roster"
 msgstr "연락처를 목록에 추가합니다"
 
-#: ../src/gui/main.cpp:3123
+#: ../src/gui/main.cpp:3128
 msgid "Find contacts"
 msgstr "연락처 찾기"
 
-#: ../src/gui/main.cpp:3130
+#: ../src/gui/main.cpp:3135
 msgid "_Contact"
 msgstr "연락처(_C)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3131
+#: ../src/gui/main.cpp:3136
 msgid "Act on selected contact"
 msgstr "선택한 연락처에 대한 동작"
 
-#: ../src/gui/main.cpp:3137
+#: ../src/gui/main.cpp:3142
 msgid "H_old Call"
 msgstr "호출 보류(_O)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3137 ../src/gui/main.cpp:3606
+#: ../src/gui/main.cpp:3142 ../src/gui/main.cpp:3611
 msgid "Hold the current call"
 msgstr "현재 호출을 중지합니다"
 
-#: ../src/gui/main.cpp:3141
+#: ../src/gui/main.cpp:3146
 msgid "_Transfer Call"
 msgstr "호출 넘기기(_T)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3142
+#: ../src/gui/main.cpp:3147
 msgid "Transfer the current call"
 msgstr "현재 호출을 넘깁니다"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3150
+#: ../src/gui/main.cpp:3155
 msgid "Suspend or resume the audio transmission"
 msgstr "오디오 송신을 일시 정지하거나 다시 시작합니다"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3155
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the video transmission"
 msgstr "비디오 송신을 일시 정지하거나 다시 시작합니다"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3162
+#: ../src/gui/main.cpp:3167
 msgid "Close the Ekiga window"
 msgstr "에키가 창을 닫습니다"
 
-#: ../src/gui/main.cpp:3169 ../src/gui/statusicon.cpp:406
+#: ../src/gui/main.cpp:3174 ../src/gui/statusicon.cpp:414
 msgid "Quit"
 msgstr "끝내기"
 
-#: ../src/gui/main.cpp:3175
+#: ../src/gui/main.cpp:3180
 msgid "_Configuration Assistant"
 msgstr "설정 도우미(_C)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3176
+#: ../src/gui/main.cpp:3181
 msgid "Run the configuration assistant"
 msgstr "설정 도우미를 실행합니다"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3184
+#: ../src/gui/main.cpp:3189
 msgid "Edit your accounts"
 msgstr "계정을 편집합니다"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3190
+#: ../src/gui/main.cpp:3195
 msgid "Change your preferences"
 msgstr "기본 설정을 바꿉니다"
 
-#: ../src/gui/main.cpp:3195
+#: ../src/gui/main.cpp:3200
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../src/gui/main.cpp:3197
+#: ../src/gui/main.cpp:3202
 msgid "Con_tacts"
 msgstr "연락처(_T)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3197
+#: ../src/gui/main.cpp:3202
 msgid "View the contacts list"
 msgstr "연락처 목록을 봅니다"
 
-#: ../src/gui/main.cpp:3202
+#: ../src/gui/main.cpp:3207
 msgid "_Dialpad"
 msgstr "숫자판(_D)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3202
+#: ../src/gui/main.cpp:3207
 msgid "View the dialpad"
 msgstr "숫자판을 봅니다"
 
-#: ../src/gui/main.cpp:3207
+#: ../src/gui/main.cpp:3212
 msgid "_Call History"
 msgstr "호출 기록(_C)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3207
+#: ../src/gui/main.cpp:3212
 msgid "View the call history"
 msgstr "호출 기록을 봅니다"
 
-#: ../src/gui/main.cpp:3215
+#: ../src/gui/main.cpp:3220
 msgid "_Show Call Panel"
 msgstr "호출 패널 보기(_S)"
 
-#: ../src/gui/main.cpp:3223
+#: ../src/gui/main.cpp:3228
 msgid "_Local Video"
 msgstr "로컬 비디오(_L)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3224
+#: ../src/gui/main.cpp:3229
 msgid "Local video image"
 msgstr "로컬 비디오 이미지"
 
-#: ../src/gui/main.cpp:3229
+#: ../src/gui/main.cpp:3234
 msgid "_Remote Video"
 msgstr "원격 비디오(_R)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3230
+#: ../src/gui/main.cpp:3235
 msgid "Remote video image"
 msgstr "원격 비디오 이미지"
 
-#: ../src/gui/main.cpp:3235
+#: ../src/gui/main.cpp:3240
 msgid "_Picture-in-Picture"
 msgstr "화면 안에 화면(_P)"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3236 ../src/gui/main.cpp:3242
+#: ../src/gui/main.cpp:3241 ../src/gui/main.cpp:3247
 msgid "Both video images"
 msgstr "모든 비디오 이미지"
 
-#: ../src/gui/main.cpp:3241
+#: ../src/gui/main.cpp:3246
 msgid "Picture-in-Picture in Separate _Window"
 msgstr "화면 안에 화면 별도 창에(_W)"
 
-#: ../src/gui/main.cpp:3249
+#: ../src/gui/main.cpp:3254
 msgid "Zoom in"
 msgstr "확대"
 
-#: ../src/gui/main.cpp:3253
+#: ../src/gui/main.cpp:3258
 msgid "Zoom out"
 msgstr "축소"
 
-#: ../src/gui/main.cpp:3257
+#: ../src/gui/main.cpp:3262
 msgid "Normal size"
 msgstr "보통 크기"
 
-#: ../src/gui/main.cpp:3261
+#: ../src/gui/main.cpp:3266
 msgid "_Fullscreen"
 msgstr "전체 화면(_F)"
 
-#: ../src/gui/main.cpp:3261
+#: ../src/gui/main.cpp:3266
 msgid "Switch to fullscreen"
 msgstr "전체 화면으로 전환"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3269 ../src/gui/statusicon.cpp:394
+#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:402
 msgid "Get help by reading the Ekiga manual"
 msgstr "에키가 사용 설명서를 읽습니다"
 
 # 도구 설명
-#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:399
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:407
 msgid "View information about Ekiga"
 msgstr "에키가에 대한 정보를 봅니다"
 
-#: ../src/gui/main.cpp:3348
+#: ../src/gui/main.cpp:3353
 msgid ""
 "Enter a URI on the left, and click this button to place a call or to hangup"
 msgstr "호출하거나 끊으려면 왼쪽에 URI를 입력하고 이 단추를 누르십시오"
 
-#: ../src/gui/main.cpp:3399
+#: ../src/gui/main.cpp:3404
 msgid "Contacts"
 msgstr "연락처"
 
-#: ../src/gui/main.cpp:3422
+#: ../src/gui/main.cpp:3427
 msgid "Dialpad"
 msgstr "숫자판"
 
-#: ../src/gui/main.cpp:3441
+#: ../src/gui/main.cpp:3446
 msgid "Call history"
 msgstr "호출 기록"
 
-#: ../src/gui/main.cpp:3544
+#: ../src/gui/main.cpp:3549
 msgid "Change the volume of your soundcard"
 msgstr "사운드카드의 볼륨을 조정합니다"
 
-#: ../src/gui/main.cpp:3564
+#: ../src/gui/main.cpp:3569
 msgid "Change the color settings of your video device"
 msgstr "비디오 장치의 컬러 설정을 조정합니다"
 
-#: ../src/gui/main.cpp:3675
+#: ../src/gui/main.cpp:3680
 msgid "Ekiga"
 msgstr "에키가"
 
 #. Translators:
 #. * TX is a common abbreviation for "transmit"
-#: ../src/gui/main.cpp:4282
+#: ../src/gui/main.cpp:4287
 #, c-format
 msgid "TX: %dx%d "
 msgstr "송신: %dx%d "
 
 #. Translators:
 #. * RX is a common abbreviation for "receive"
-#: ../src/gui/main.cpp:4287
+#: ../src/gui/main.cpp:4292
 #, c-format
 msgid "RX: %dx%d "
 msgstr "수신: %dx%d "
 
-#: ../src/gui/main.cpp:4289
+#: ../src/gui/main.cpp:4294
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2813,23 +2817,23 @@
 "순서가 바뀐 패킷: %.1f %%\n"
 "지터 버퍼: %d ms%s%s%s"
 
-#: ../src/gui/main.cpp:4406
+#: ../src/gui/main.cpp:4415
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr "콘솔에 디버깅 메시지를 표시합니다 (1에서 5 사이의 레벨)"
 
-#: ../src/gui/main.cpp:4411
+#: ../src/gui/main.cpp:4420
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr "콘솔에 사용자 지정 디버깅 메시지를 씁니다 (1에서 4 사이의 레벨)"
 
-#: ../src/gui/main.cpp:4416
+#: ../src/gui/main.cpp:4425
 msgid "Makes Ekiga call the given URI"
 msgstr "에키가에서 주어진 URI로 호출합니다"
 
-#: ../src/gui/main.cpp:4525
+#: ../src/gui/main.cpp:4544
 msgid "No usable audio plugin detected"
 msgstr "사용 가능한 오디오 플러그인을 찾을 수 없습니다"
 
-#: ../src/gui/main.cpp:4526
+#: ../src/gui/main.cpp:4545
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
@@ -2837,17 +2841,15 @@
 "에키가에서 사용 가능한 오디오 플러그인을 찾지 못했습니다. 올바르게 설치했는 "
 "지 확인하십시오."
 
-#: ../src/gui/main.cpp:4529
+#: ../src/gui/main.cpp:4548
 msgid "No usable audio codecs detected"
 msgstr "사용 가능한 오디오 코덱을 찾을 수 없습니다"
 
-#: ../src/gui/main.cpp:4530
+#: ../src/gui/main.cpp:4549
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
-msgstr ""
-"에키가에서 사용 가능한 오디오 코덱을 찾지 못했습니다. 올바르게 설치했는 지 확"
-"인하십시오."
+msgstr "에키가에서 사용 가능한 오디오 코덱을 찾지 못했습니다. 올바르게 설치했는지 확인하십시오."
 
 #: ../src/gui/preferences.cpp:381
 msgid "Play sound for new voice mails"
@@ -3196,7 +3198,7 @@
 msgid "Video"
 msgstr "비디오"
 
-#: ../src/gui/statusicon.cpp:305
+#: ../src/gui/statusicon.cpp:306
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
diff -Nru ekiga-3.2.5/po/LINGUAS ekiga-3.2.6~ppa~karmic1/po/LINGUAS
--- ekiga-3.2.5/po/LINGUAS	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/LINGUAS	2009-09-22 15:27:35.000000000 +0100
@@ -10,6 +10,7 @@
 bn_IN
 bs
 ca
+ca@valencia
 crh
 cs
 cy
diff -Nru ekiga-3.2.5/po/lt.po ekiga-3.2.6~ppa~karmic1/po/lt.po
--- ekiga-3.2.5/po/lt.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/lt.po	2009-09-22 15:27:35.000000000 +0100
@@ -6,19 +6,19 @@
 # Tomas Kuliavas <tokul@users.sourceforge.net>, 2003-2004.
 # Žygimantas Beručka <zygis@gnome.org>, 2004-2006, 2009.
 # Gintautas Miliauskas <gintas@akl.lt>, 2007, 2008.
-#: ../lib/engine/components/resource-list/rl-entry.cpp:163
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 15:16+0200\n"
-"PO-Revision-Date: 2009-03-15 16:41+0200\n"
-"Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
+"POT-Creation-Date: 2009-09-22 01:10+0300\n"
+"PO-Revision-Date: 2009-09-22 01:09+0300\n"
+"Last-Translator: Gintautas Miliauskas <gintautas@miliauskas.lt>\n"
 "Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../ekiga.desktop.in.in.h:1
@@ -35,18 +35,23 @@
 
 #: ../ekiga.schemas.in.in.h:1
 msgid "0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: Custom"
-msgstr "0: 56Kbps, 1: ISDN, 2:DSL, 3: LAN, 4: kitas"
+msgstr "0: 56kb/s, 1: ISDN, 2:DSL, 3: LAN, 4: kitas"
 
 #: ../ekiga.schemas.in.in.h:2
+#, fuzzy
 msgid ""
 "Allow Ekiga to fall back to software scaling the picture-in-picture if "
 "hardware support is not available. If this is set to false, Ekiga will not "
 "try to open the PIP if hardware support is not available."
 msgstr ""
+"Leisti programai pasinaudoti programiniu vaizdo mastelio keitimu, jei "
+"aparatinis spartinimas neįmanomas. Išjungus šią nuostatą, „Ekiga“ nebandys "
+"atverti PIP, jei nėra atitinkamo aparatinio palaikymo."
 
 #: ../ekiga.schemas.in.in.h:3
+#, fuzzy
 msgid "Allow picture-in-picture software scaling"
-msgstr ""
+msgstr "Leisti programinį vaizdo mastelio keitimą"
 
 #: ../ekiga.schemas.in.in.h:4
 msgid "Alternative audio output device"
@@ -116,7 +121,7 @@
 msgid "Disable video hardware acceleration"
 msgstr "Išjungti vaizdo aparatinės įrangos spartinimą"
 
-#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3586
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3596
 msgid "Display images from your camera device"
 msgstr "Rodyti vaizdus iš jūsų kameros įrenginio"
 
@@ -372,7 +377,7 @@
 msgid "Show offline contacts"
 msgstr "Rodyti atsijungusius adresatus"
 
-#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3215
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3225
 msgid "Show the call panel"
 msgstr "Rodyti skambučių skydelį"
 
@@ -402,7 +407,7 @@
 
 #: ../ekiga.schemas.in.in.h:81
 msgid "Specify the software scaling algorithm"
-msgstr ""
+msgstr "Programinis vaizdo mastelio keitimo algoritmas"
 
 #: ../ekiga.schemas.in.in.h:82
 msgid ""
@@ -410,6 +415,10 @@
 "neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
 "Does not apply on windows systems."
 msgstr ""
+"Pasirinkite programinį algoritmą vaizdo masteliui keisti: 0 – artimiausias "
+"kaimynas, 1 – artimiausias kaimynas naudojant „dėžutės“ filtrą, 2 – dviejų "
+"tiesių (bilinear) filtras, 3 – hiperbolinis filtras. Ši nuostata nesvarbi "
+"„Windows“ platformose."
 
 #: ../ekiga.schemas.in.in.h:83
 msgid "Start hidden"
@@ -496,8 +505,8 @@
 "The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with "
 "local video in a separate window, 4: Both)"
 msgstr ""
-"Numatytasis vaizdo rodinys (0: vietinis, 1: nutolęs, 2: abu sluoksniais, "
-"3: abu su vietiniu vaizdu atskirame lange, 4: abu)"
+"Numatytasis vaizdo rodinys (0: vietinis, 1: nutolęs, 2: abu sluoksniais, 3: "
+"abu su vietiniu vaizdu atskirame lange, 4: abu)"
 
 #: ../ekiga.schemas.in.in.h:101
 msgid "The dial tone sound"
@@ -531,18 +540,21 @@
 "peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
 "above the signaled value"
 msgstr ""
+"Leistinas gaunamo vaizdo srauto dydis (kb/s). Ši reikšmė bus perduoda "
+"pašnekovo programai, kuri (jei šią galimybę palaiko) prireikus galės "
+"atitinkamai pakoreguoti savo siunčiamo vaizdo srauto dydį."
 
 #: ../ekiga.schemas.in.in.h:108
-#, fuzzy
 msgid ""
 "The maximum TX video bitrate in kbit/s. The video quality and the number of "
 "transmitted frames per second (depends on selected codec) will be "
 "dynamically adjusted above their minimum during calls to try to minimize the "
 "bandwidth to the given value"
 msgstr ""
-"Leistinas vaizdo srauto dydis kbaitai/s. Vaizdo kokybė ir perduodamų kadrų "
-"per sekundę skaičius bus automatiškai koreguojamas virš minimalios vertės, "
-"pokalbių metu siekiant sumažinti naudojamą srautą iki nurodytos vertės"
+"Leistinas siunčiamo vaizdo srauto dydis (kb/s). Vaizdo kokybė ir perduodamų "
+"kadrų per sekundę skaičius (priklausomai nuo pasirinkto kodeko) bus "
+"automatiškai koreguojami pokalbių metu siekiant sumažinti naudojamą srautą "
+"iki nurodytos vertės"
 
 #: ../ekiga.schemas.in.in.h:109
 msgid "The maximum jitter buffer size for audio reception (in ms)"
@@ -554,6 +566,8 @@
 "in case a minimum quality was configure via a TSTO value smaller than 31 and "
 "the bitrate selected is not sufficient to support this minimum quality"
 msgstr ""
+"Maksimalus siunčiamų kadrų kiekis per sekundę. Realus siunčiamų kadrų "
+"skaičius gali būti mažesnis, jei "
 
 #: ../ekiga.schemas.in.in.h:111
 msgid "The new instant message sound"
@@ -588,20 +602,18 @@
 msgstr "Nutolusio vaizdo lango padėtis"
 
 #: ../ekiga.schemas.in.in.h:117
-#, fuzzy
 msgid ""
 "The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
 "port range has no effect if both participants to the conference are using "
 "H.245 Tunneling."
 msgstr ""
-"TCP prievadų, kuriuos Ekiga naudos H.323 H.245 kanalui, intervalas. Norint, "
-"kad pakeista reikšmė įsigaliotų, Ekiga turi būti paleista iš naujo. Šis "
+"TCP prievadų, kuriuos Ekiga naudos H.323 H.245 kanalui, intervalas.Šis "
 "adresų intervalas nesvarbus kai abu pokalbio dalyviai naudoja H.245 "
 "tuneliavimą."
 
 #: ../ekiga.schemas.in.in.h:118
 msgid "The range of UDP ports that Ekiga will use."
-msgstr ""
+msgstr "UDP prievadų, kuriuos turėtų naudoti „Ekiga“, intervalas."
 
 #: ../ekiga.schemas.in.in.h:119
 msgid "The short status information"
@@ -652,49 +664,48 @@
 
 #: ../ekiga.schemas.in.in.h:129
 msgid "The video view before having switched to fullscreen"
-msgstr ""
+msgstr "Vaizdas prieš įjungiant pilno ekrano veikseną"
 
 #: ../ekiga.schemas.in.in.h:130
 msgid ""
 "The video view before having switched to fullscreen (same values as "
 "video_view)"
 msgstr ""
+"Vaizdas prieš įjungiant pilno ekrano veikseną (reikšmė ta pati kaip ir "
+"video_view)"
 
 #: ../ekiga.schemas.in.in.h:131
 msgid "The zoom value"
 msgstr "Mastelio reikšmė"
 
 #: ../ekiga.schemas.in.in.h:132
-#, fuzzy
 msgid ""
 "The zoom value in percent to apply to images displayed in the main GUI (can "
 "be 50, 100, or 200)"
 msgstr ""
-"Mastelis naudojamas išvedant paveikslėlius pagrindiniame lange (gali būti "
-"0.50, 1.00 arba 2.00)"
+"Mastelis naudojamas atvaizduojant paveikslėlius pagrindiniame lange (gali "
+"būti 50, 100 arba 200)"
 
 #: ../ekiga.schemas.in.in.h:133
-#, fuzzy
 msgid ""
 "This allows you to set the mode for sending DTMFs. The values can be "
 "\"RFC2833\" (0), \"INFO\" (1)"
 msgstr ""
-"Čia leidžiama nustatyti DTMF siuntimo režimą. Reikšmė gali būti tik „RFC2833“"
+"Čia leidžiama nustatyti DTMF siuntimo režimą. Reikšmė gali būti tik "
+"„RFC2833“ (0) ir „INFO“ (1)"
 
 #: ../ekiga.schemas.in.in.h:134
-#, fuzzy
 msgid ""
 "This allows you to set the mode for sending DTMFs. The values can be \"String"
 "\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
 "\"). Choosing other values than \"String\" disables the Text Chat"
 msgstr ""
-"Čia galima nustatyti DTMF siuntimo režimą. Galimos reikšmės yra "
-"„String“ (0), „Tone“ (1), „RFC2833“ (2), „Q.931“ (3) (numatytoji yra "
-"„String“). Pasirinkus kitas reikšmes nei „String“ bus išjungtas tekstinis "
+"Čia galima nustatyti DTMF siuntimo veikseną. Galimos reikšmės yra "
+"„String“ (0), „Tone“ (1), „RFC2833“ (2) ir „Q.931“ (3), numatytoji – "
+"„String“. Pasirinkus kitas reikšmes nei „String“ bus išjungtas tekstinis "
 "pokalbis"
 
 #: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
-#, fuzzy
 msgid ""
 "This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
 "are encapsulated into the H.225 channel (port 1720). This saves one TCP "
@@ -702,12 +713,12 @@
 "Netmeeting does not support it. Using both Fast Start and H.245 Tunneling "
 "can crash some versions of Netmeeting."
 msgstr ""
-"Čia įjungiamas H.245 tunelių režimas. Naudojant H.245 tunelius H.245 "
+"Čia įjungiama H.245 tuneliavimo veiksena. Naudojant H.245 tuneliavimą, H.245 "
 "pranešimai yra patalpinami H.225 kanale (1720 prievadas). Tai sutaupo vieną "
-"TCP jungtį vykdant skambučius. H.245 tuneliai buvo įvesti H.323v2 "
-"specifikacijoje ir NetMeeting jų nepalaiko. Tuo pat metu įjungti greito "
-"starto ir H.245 tunelių režimai gali sutrikdyti dalies NetMeeting versijų "
-"darbą."
+"TCP jungtį vykdant skambučius. H.245 tuneliavimas buvo įvestas H.323v2 "
+"specifikacijoje ir yra nesuderinamas su „NetMeeting“. Tuo pat metu įjungtos "
+"greitojo starto ir H.245 tuneliavimo veiksenos gali sutrikdyti kai kurių "
+"„NetMeeting“ versijų darbą."
 
 #: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:690
 msgid "This enables H.245 early in the setup"
@@ -718,6 +729,8 @@
 "This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
 "acceleration"
 msgstr ""
+"Ši nuostata išjungia aparatinį vaizdo spartinimą „DirectX“ („Windows“ "
+"platformose) ir „XVideo“ („Linux“ platformose) priemonėmis"
 
 #: ../ekiga.schemas.in.in.h:138
 msgid "UDP port range"
@@ -731,7 +744,7 @@
 msgid "Video format"
 msgstr "Vaizdo formatas"
 
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1155
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr "Vaizdo įvesties įrenginys"
 
@@ -749,35 +762,38 @@
 "order to keep a minimum level of (spatial) quality for all frames. 0: "
 "Highest minimal quality, 31: lowest minimal quality"
 msgstr ""
+"Ar norite išlaikyti maksimalų kadrų skaičių per sekundę, ar mažinti jį, "
+"prireikus minimaliai užtikrinti visų kadrų kokybę. 0 – aukščiausia minimali "
+"kokybė, 31 – žemiausia minimali kokybė"
 
-#: ../lib/engine/addressbook/contact-core.cpp:58
+#: ../lib/engine/addressbook/contact-core.cpp:60
 msgid "_Find"
 msgstr "_Rasti"
 
 #: ../lib/engine/components/avahi/avahi-heap.cpp:125
-#: ../lib/engine/components/avahi/avahi-heap.cpp:306
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
 msgid "Neighbours"
 msgstr "Kaimynai"
 
-#: ../lib/engine/components/call-history/history-book.cpp:140
+#: ../lib/engine/components/call-history/history-book.cpp:137
 #: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
 msgid "Clear List"
 msgstr "Išvalyti sąrašą"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:153
+#: ../lib/engine/components/call-history/history-contact.cpp:155
 msgid "Received"
 msgstr "Gauti"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:156
+#: ../lib/engine/components/call-history/history-contact.cpp:158
 msgid "Placed"
 msgstr "Įvykdyti"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:159
+#: ../lib/engine/components/call-history/history-contact.cpp:161
 msgid "Missed"
 msgstr "Praleisti"
 
 #: ../lib/engine/components/evolution/evolution-book.cpp:76
-#: ../lib/engine/components/ldap/ldap-book.cpp:909
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
 #, c-format
 msgid "%d user found"
 msgid_plural "%d users found"
@@ -785,88 +801,88 @@
 msgstr[1] "Rasti %d naudotojai"
 msgstr[2] "Rasta %d naudotojų"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:244
+#: ../lib/engine/components/evolution/evolution-book.cpp:281
 msgid "New _Contact"
 msgstr "Naujas _adresatas"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:288
+#: ../lib/engine/components/evolution/evolution-book.cpp:317
 #: ../lib/engine/components/local-roster/local-cluster.cpp:82
 #: ../lib/engine/components/local-roster/local-heap.cpp:117
 msgid "New contact"
 msgstr "Naujas adresatas"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:290
-#: ../lib/engine/components/evolution/evolution-contact.cpp:328
-#: ../lib/engine/components/opal/opal-account.cpp:351
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:365
 msgid "Please update the following fields:"
 msgstr "Atnaujinkite šiuos laukelius:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:292
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:293
-#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+#: ../lib/engine/components/evolution/evolution-book.cpp:322
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
 msgid "VoIP _URI:"
 msgstr "VoIP _URL:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:294
-#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
 msgid "_Home phone:"
 msgstr "_Namų telefonas:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:295
-#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
 msgid "_Office phone:"
 msgstr "_Biuro telefonas:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:296
-#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
 msgid "_Cell phone:"
 msgstr "_Mobilusis telefonas:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:297
-#: ../lib/engine/components/evolution/evolution-contact.cpp:343
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
 msgid "_Pager:"
 msgstr "_Pranešimų gaviklis:"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:234
-#: ../lib/engine/components/local-roster/local-presentity.cpp:197
-#: ../lib/engine/components/opal/opal-account.cpp:308
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:203
-#: ../src/gui/main.cpp:3173
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:322
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3183
 msgid "_Edit"
 msgstr "_Keisti"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:236
-#: ../lib/engine/components/local-roster/local-presentity.cpp:199
-#: ../lib/engine/components/opal/opal-account.cpp:310
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:205
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:324
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
 msgid "_Remove"
 msgstr "_Pašalinti"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
 msgid "Edit contact"
 msgstr "Keisti adresatą"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:330
-#: ../lib/engine/components/local-roster/local-presentity.cpp:224
-#: ../lib/engine/components/local-roster/local-heap.cpp:184
-#: ../lib/engine/components/local-roster/local-heap.cpp:364
-#: ../lib/engine/components/opal/opal-account.cpp:353
-#: ../lib/engine/components/opal/opal-bank.cpp:99
-#: ../lib/engine/components/opal/opal-bank.cpp:109
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:169
-#: ../lib/engine/components/resource-list/rl-heap.cpp:544
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:224
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
 msgid "Name:"
 msgstr "Vardas:"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:395
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
 msgid "Remove contact"
 msgstr "Pašalinti adresatą"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:397
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
 #, c-format
 msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr "Ar tikrai norite pašalinti %s iš adresų knygos?"
@@ -884,30 +900,31 @@
 msgstr "Vaizdo tikrinimas"
 
 #. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Crazy"
-msgstr ""
+msgstr "Išprotėjęs"
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+#, fuzzy
 msgid "Screencast"
-msgstr ""
+msgstr "Ekrano vaizdo transliacija"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:409
-#: ../lib/engine/components/resource-list/rl-entry.cpp:143
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:130
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
 msgid "_Refresh"
 msgstr "_Atnaujinti"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:412
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
 msgid "_Remove addressbook"
 msgstr "_Pašalinti adresų knygą"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:414
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
 msgid "Addressbook _properties"
 msgstr "Adresų knygos _savybės"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:545
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
 msgid "LDAP SASL Interaction"
 msgstr "LDAP SASL integracija"
 
@@ -920,136 +937,137 @@
 #. * say about it. You might google for "challenge response
 #. * authentication" if you'd like more background context.
 #.
-#: ../lib/engine/components/ldap/ldap-book.cpp:587
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
+#, fuzzy
 msgid "Challenge: "
-msgstr ""
+msgstr "Iššūkis:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:595
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
 msgid "Interact"
 msgstr ""
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:664
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
 msgid "Refreshing"
 msgstr "Atnaujinama"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:670
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
 msgid "Could not initialize server"
 msgstr "Nepavyko inicijuoti serverio"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:684
-#: ../lib/engine/components/ldap/ldap-book.cpp:729
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
 msgid "LDAP Error: "
 msgstr "LDAP klaida: "
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:738
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
 msgid "Contacted server"
 msgstr "Susisiekta su serveriu"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:781
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
 msgid "Could not connect to server"
 msgstr "Nepavyko prisijungti prie serverio"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:829
-#: ../lib/engine/components/ldap/ldap-book.cpp:882
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
 msgid "Could not search"
 msgstr "Nepavyko atlikti paieškos"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:837
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
 msgid "Waiting for search results"
 msgstr "Laukiama paieškos rezultatų"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:931
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
 msgid "Please edit the following fields"
 msgstr "Pakeiskite šiuos laukelius"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:933
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
 msgid "Book _Name"
 msgstr "Knygos _pavadinimas"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:934
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
 msgid "Server _URI"
 msgstr "Serverio _URI"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:935
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
 msgid "_Base DN"
 msgstr "_Pagrindinis DN:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:941
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
 msgid "Subtree"
 msgstr "Medžio atšaka"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:942
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
 msgid "Single Level"
 msgstr "Vienas lygis"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
 msgid "_Search Scope"
 msgstr "_Paieškos gylis"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:952
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
 msgid "_DisplayName Attribute"
-msgstr ""
+msgstr "„_DisplayName“ atributas"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:953
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
 msgid "Call _Attributes"
 msgstr "Skambučio _atributai"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:955
-#: ../lib/engine/components/ldap/ldap-book.cpp:957
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
 msgid "_Filter Template"
-msgstr ""
+msgstr "_Filtro šablonas"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:959
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
 msgid "Bind _ID"
 msgstr ""
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:960
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
 msgid "_Password"
 msgstr "_Slaptažodis"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:961
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
 msgid "Use TLS"
 msgstr "Naudoti TLS"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:962
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
 msgid "Use SASL"
 msgstr "Naudoti SASL"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:976
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
 msgid "SASL _Mechanism"
 msgstr "SASL _mechanizmas"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:987
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
 msgid "Edit LDAP directory"
 msgstr "Keisti LDAP katalogą"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1016
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
 msgid "Please provide a Book Name for this directory\n"
-msgstr ""
+msgstr "Prašom nurodyti šio katalogo pavadinimą\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1019
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
 msgid "Please provide a Server URI\n"
-msgstr ""
+msgstr "Prašom nurodyti serverio URI\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1022
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
 msgid "Please provide a DisplayName Attribute\n"
-msgstr ""
+msgstr "Prašom nurodyti „DisplayName“ atributą\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1025
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
 msgid "Please provide a Call Attribute\n"
-msgstr ""
+msgstr "Prašom nurodyti „Call“ atributą\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1028
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
 msgid "Invalid Server URI\n"
 msgstr "Netinkamas serverio URI\n"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:127
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
 msgid "Add an LDAP Address Book"
 msgstr "Pridėti LDAP adresų knygą"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:130
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
 msgid "Add the Ekiga.net Directory"
 msgstr "Pridėti Ekiga.net katalogą"
 
@@ -1061,45 +1079,45 @@
 msgid "Ekiga.net Directory"
 msgstr "Ekiga.net katalogas"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:221
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
 msgid "Edit roster element"
 msgstr "Taisyti sąrašo elementą"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:222
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
-msgstr ""
+msgstr "Užpildykite šią formą, kad būtų pakeistas sąraše jau esantis objektas"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:225
-#: ../lib/engine/components/local-roster/local-heap.cpp:193
-#: ../lib/engine/components/local-roster/local-heap.cpp:195
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:170
-#: ../lib/engine/components/resource-list/rl-heap.cpp:545
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
 msgid "Address:"
 msgstr "Adresas:"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:227
-#: ../lib/engine/components/resource-list/rl-heap.cpp:546
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
 msgid "Choose groups:"
 msgstr "Pasirinkite grupes:"
 
 #: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
-#: ../lib/engine/components/local-roster/local-heap.cpp:181
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
 msgid "Add to local roster"
 msgstr "Įtraukti į vietinį sąrašą"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:92
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
 msgid "Services"
 msgstr "Tarnybos"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
 msgid "Echo test"
 msgstr "Aido tikrinimas"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:94
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
 msgid "Conference room"
 msgstr "Konferencijų kambarys"
 
@@ -1111,129 +1129,144 @@
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:160
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
 msgid "Family"
 msgstr "Šeima"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:161
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
 msgid "Friend"
 msgstr "Draugas"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:162
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
 msgid "Associate"
 msgstr "Kolega"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:163
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
 msgid "Assistant"
 msgstr "Padėjėjas"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:164
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
 msgid "Supervisor"
 msgstr "Vadovas"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:165
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
 msgid "Self"
 msgstr "Aš"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:182
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
 msgid ""
 "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr ""
 "Užpildykite šią formą norėdami įtraukti naują adrestą į Ekiga vidinį sąrašą"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:199
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
 msgid "Put contact in groups:"
 msgstr "Sugrupuoti adresatus:"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:335
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
 msgid "You supplied an unsupported address"
 msgstr "Nurodėte nepalaikomą adresą"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:337
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
 msgid "You already have a contact with this address!"
 msgstr "Jau turite adresatą su šiuo adresu!"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:362
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
 msgid "Rename group"
 msgstr "Pervadinti grupę"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:363
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
 msgid "Please edit this group name"
 msgstr "Pakeiskite šios grupės pavadinimą"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:143
-#: ../lib/engine/components/opal/sip-endpoint.cpp:257
-#: ../lib/engine/components/opal/sip-endpoint.cpp:261
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
+#: ../lib/engine/components/opal/sip-endpoint.cpp:238
 msgid "Call"
 msgstr "Skambinti"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:146
-#: ../lib/engine/components/opal/sip-endpoint.cpp:258
-#: ../lib/engine/components/opal/sip-endpoint.cpp:262 ../src/gui/main.cpp:2947
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:235
+#: ../lib/engine/components/opal/sip-endpoint.cpp:239 ../src/gui/main.cpp:2957
 msgid "Transfer"
 msgstr "Nukreipti"
 
 #. Translators : The alias we are registering already exists : failure
-#: ../lib/engine/components/opal/h323-endpoint.cpp:310
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
 msgid "Duplicate alias"
 msgstr "Dvigubas alternatyvusis vardas"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:313
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
 msgid "Bad username/password"
 msgstr "Netinkamas naudotojo vardas / slaptažodis"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:316
-#: ../lib/engine/components/opal/sip-endpoint.cpp:896
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:822
 msgid "Transport error"
 msgstr "Transportavimo klaida"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:327
-#: ../lib/engine/components/opal/h323-endpoint.cpp:332
-#: ../lib/engine/components/opal/sip-endpoint.cpp:903
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:829
 msgid "Failed"
 msgstr "Nepavyko"
 
-#: ../lib/engine/components/opal/opal-account.cpp:300
+#: ../lib/engine/components/opal/opal-account.cpp:314
 msgid "_Disable"
 msgstr "_Išjungti"
 
-#: ../lib/engine/components/opal/opal-account.cpp:303
+#: ../lib/engine/components/opal/opal-account.cpp:317
 msgid "_Enable"
 msgstr "Į_jungti"
 
-#: ../lib/engine/components/opal/opal-account.cpp:324
-#: ../src/gui/assistant.cpp:727
+#: ../lib/engine/components/opal/opal-account.cpp:338
+#: ../src/gui/assistant.cpp:716
 msgid "Recharge the account"
 msgstr "Papildyti sąskaitą"
 
-#: ../lib/engine/components/opal/opal-account.cpp:329
-#: ../src/gui/assistant.cpp:739
+#: ../lib/engine/components/opal/opal-account.cpp:343
+#: ../src/gui/assistant.cpp:728
 msgid "Consult the balance history"
 msgstr "Žiūrėti balanso retrospektyvą"
 
-#: ../lib/engine/components/opal/opal-account.cpp:334
+#: ../lib/engine/components/opal/opal-account.cpp:348
 msgid "Consult the call history"
 msgstr "Žiūrėti skambučių retrospektyvą"
 
-#: ../lib/engine/components/opal/opal-account.cpp:349
-#: ../lib/engine/components/opal/opal-bank.cpp:72
+#: ../lib/engine/components/opal/opal-account.cpp:363
+#: ../lib/engine/components/opal/opal-bank.cpp:95
 msgid "Edit account"
 msgstr "Keisti sąskaitą"
 
-#: ../lib/engine/components/opal/opal-account.cpp:355
-#: ../lib/engine/components/opal/opal-bank.cpp:110
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:133
 msgid "Registrar:"
 msgstr "Registratorius:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:357
-#: ../lib/engine/components/opal/opal-bank.cpp:100
+#: ../lib/engine/components/opal/opal-account.cpp:371
+#: ../lib/engine/components/opal/opal-bank.cpp:123
 msgid "Gatekeeper:"
 msgstr "Gatekeeper:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:358
-#: ../lib/engine/components/opal/opal-bank.cpp:81
-#: ../lib/engine/components/opal/opal-bank.cpp:101
-#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../lib/engine/components/opal/opal-account.cpp:372
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:174
 msgid "User:"
 msgstr "Naudotojas:"
@@ -1241,166 +1274,168 @@
 #. Translators:
 #. * SIP knows two usernames: The name for the client ("User") and the name
 #. * for the authentication procedure ("Authentication User")
-#: ../lib/engine/components/opal/opal-account.cpp:363
-#: ../lib/engine/components/opal/opal-bank.cpp:112
+#: ../lib/engine/components/opal/opal-account.cpp:377
+#: ../lib/engine/components/opal/opal-bank.cpp:135
 msgid "Authentication User:"
 msgstr "Tapatybės nustatymo naudotojas:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:364
-#: ../lib/engine/components/opal/opal-bank.cpp:83
-#: ../lib/engine/components/opal/opal-bank.cpp:103
-#: ../lib/engine/components/opal/opal-bank.cpp:113
+#: ../lib/engine/components/opal/opal-account.cpp:378
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:173
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:365
-#: ../lib/engine/components/opal/opal-bank.cpp:104
-#: ../lib/engine/components/opal/opal-bank.cpp:114
+#: ../lib/engine/components/opal/opal-account.cpp:379
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
 msgid "Timeout:"
 msgstr "Laukimo laikas:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:366
-#: ../lib/engine/components/opal/opal-bank.cpp:117
+#: ../lib/engine/components/opal/opal-account.cpp:380
+#: ../lib/engine/components/opal/opal-bank.cpp:140
 msgid "Enable Account"
-msgstr ""
+msgstr "Įjungti paskyrą"
 
-#: ../lib/engine/components/opal/opal-account.cpp:401
-#: ../lib/engine/components/opal/opal-bank.cpp:155
+#: ../lib/engine/components/opal/opal-account.cpp:413
+#: ../lib/engine/components/opal/opal-bank.cpp:179
 msgid "You did not supply a name for that account."
-msgstr ""
+msgstr "Nenurodėte šios paskyros vardo."
 
-#: ../lib/engine/components/opal/opal-account.cpp:403
-#: ../lib/engine/components/opal/opal-bank.cpp:157
+#: ../lib/engine/components/opal/opal-account.cpp:415
+#: ../lib/engine/components/opal/opal-bank.cpp:181
 msgid "You did not supply a host to register to."
-msgstr ""
+msgstr "Nenurodėte serverio, kuriame reikėtų registruotis."
 
-#: ../lib/engine/components/opal/opal-account.cpp:405
-#: ../lib/engine/components/opal/opal-bank.cpp:159
+#: ../lib/engine/components/opal/opal-account.cpp:417
+#: ../lib/engine/components/opal/opal-bank.cpp:183
 msgid "You did not supply a user name for that account."
-msgstr ""
+msgstr "Nenurodėte šios paskyros abonento vardo."
 
-#: ../lib/engine/components/opal/opal-account.cpp:407
-#: ../lib/engine/components/opal/opal-bank.cpp:161
+#: ../lib/engine/components/opal/opal-account.cpp:419
+#: ../lib/engine/components/opal/opal-bank.cpp:185
 msgid "The timeout should have a bigger value."
-msgstr ""
+msgstr "Laukimo laiko reikšmė turėtų būti didesnė."
 
-#: ../lib/engine/components/opal/opal-bank.cpp:53
+#: ../lib/engine/components/opal/opal-bank.cpp:75
 msgid "_Add an Ekiga.net Account"
 msgstr "_Pridėti Ekiga.net paskyrą"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:55
+#: ../lib/engine/components/opal/opal-bank.cpp:77
 msgid "_Add an Ekiga Call Out Account"
 msgstr "_Pridėti Ekiga skambinimo paskyrą"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:57
+#: ../lib/engine/components/opal/opal-bank.cpp:79
 msgid "_Add a SIP Account"
 msgstr "_Pridėti SIP paskyrą"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:59
+#: ../lib/engine/components/opal/opal-bank.cpp:81
 msgid "_Add an H.323 Account"
 msgstr "_Pridėti H.323 paskyrą"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:73
+#: ../lib/engine/components/opal/opal-bank.cpp:96
 msgid "Please update the following fields."
 msgstr "Atnaujinkite šiuos laukelius."
 
-#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:607
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
 msgid "Get an Ekiga.net SIP account"
 msgstr "Gauti Ekiga.net SIP paskyrą"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:715
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
 msgid "Get an Ekiga Call Out account"
 msgstr "Gauti Ekiga skambinimo paskyrą"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:92 ../src/gui/main.cpp:2701
-#: ../src/gui/main.cpp:2796
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2711
+#: ../src/gui/main.cpp:2806
 msgid "Account ID:"
 msgstr "Paskyros ID:"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:94
+#: ../lib/engine/components/opal/opal-bank.cpp:117
 msgid "PIN Code:"
 msgstr "PIN kodas:"
 
-#: ../lib/engine/components/opal/opal-call.cpp:444
+#: ../lib/engine/components/opal/opal-call.cpp:405
 msgid "Local user cleared the call"
 msgstr "Vietinis naudotojas nutraukė pokalbį"
 
-#: ../lib/engine/components/opal/opal-call.cpp:447
-#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:408
+#: ../lib/engine/components/opal/opal-call.cpp:411
 msgid "Local user rejected the call"
 msgstr "Vietinis naudotojas atmetė pokalbį"
 
-#: ../lib/engine/components/opal/opal-call.cpp:453
+#: ../lib/engine/components/opal/opal-call.cpp:414
 msgid "Remote user cleared the call"
 msgstr "Nutolęs naudotojas nutraukė pokalbį"
 
-#: ../lib/engine/components/opal/opal-call.cpp:456
+#: ../lib/engine/components/opal/opal-call.cpp:417
 msgid "Remote user rejected the call"
 msgstr "Nutolęs naudotojas atmetė pokalbį"
 
-#: ../lib/engine/components/opal/opal-call.cpp:459
+#: ../lib/engine/components/opal/opal-call.cpp:420
 msgid "Remote user has stopped calling"
 msgstr "Nutolęs naudotojas liovėsi skambinti"
 
-#: ../lib/engine/components/opal/opal-call.cpp:462
+#: ../lib/engine/components/opal/opal-call.cpp:423
 msgid "Abnormal call termination"
 msgstr "Nenormalus skambučio nutraukimas"
 
-#: ../lib/engine/components/opal/opal-call.cpp:465 ../src/gui/main.cpp:1491
+#: ../lib/engine/components/opal/opal-call.cpp:426 ../src/gui/main.cpp:1501
 msgid "Could not connect to remote host"
 msgstr "Nepavyko prisijungti prie nutolusio kompiuterio"
 
-#: ../lib/engine/components/opal/opal-call.cpp:468
+#: ../lib/engine/components/opal/opal-call.cpp:429
 msgid "The Gatekeeper cleared the call"
 msgstr "Gatekeeper nutraukė pokalbį"
 
-#: ../lib/engine/components/opal/opal-call.cpp:471
+#: ../lib/engine/components/opal/opal-call.cpp:432
 msgid "User not found"
 msgstr "Naudotojas nerastas"
 
-#: ../lib/engine/components/opal/opal-call.cpp:474
+#: ../lib/engine/components/opal/opal-call.cpp:435
 msgid "Insufficient bandwidth"
 msgstr "Nepakanka turimos ryšio linijos"
 
-#: ../lib/engine/components/opal/opal-call.cpp:477
+#: ../lib/engine/components/opal/opal-call.cpp:438
 msgid "No common codec"
 msgstr "Nerasta bendrųjų kodekų"
 
-#: ../lib/engine/components/opal/opal-call.cpp:480
+#: ../lib/engine/components/opal/opal-call.cpp:441
 msgid "Call forwarded"
 msgstr "Skambutis nukreiptas"
 
-#: ../lib/engine/components/opal/opal-call.cpp:483
+#: ../lib/engine/components/opal/opal-call.cpp:444
 msgid "Security check failed"
 msgstr "Saugos patikra nesėkminga"
 
-#: ../lib/engine/components/opal/opal-call.cpp:486
+#: ../lib/engine/components/opal/opal-call.cpp:447
 msgid "Local user is busy"
 msgstr "Vietinis naudotojas užsiėmęs"
 
-#: ../lib/engine/components/opal/opal-call.cpp:489
-#: ../lib/engine/components/opal/opal-call.cpp:495
+#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:456
 msgid "Congested link to remote party"
 msgstr "Perkrauta linija iki nutolusio naudotojo"
 
-#: ../lib/engine/components/opal/opal-call.cpp:492
+#: ../lib/engine/components/opal/opal-call.cpp:453
 msgid "Remote user is busy"
 msgstr "Nutolęs naudotojas užsiėmęs"
 
-#: ../lib/engine/components/opal/opal-call.cpp:498
+#: ../lib/engine/components/opal/opal-call.cpp:459
 msgid "Remote host is offline"
 msgstr "Nutolęs kompiuteris yra atsijungęs"
 
-#: ../lib/engine/components/opal/opal-call.cpp:504
+#: ../lib/engine/components/opal/opal-call.cpp:465
 msgid "User is not available"
 msgstr "Naudotojas neprieinamas"
 
-#: ../lib/engine/components/opal/opal-call.cpp:516
+#: ../lib/engine/components/opal/opal-call.cpp:477
 msgid "Call completed"
 msgstr "Skambutis baigtas"
 
-#: ../lib/engine/components/opal/opal-call-manager.cpp:725
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
 msgid ""
 "Ekiga did not manage to configure your network settings automatically. You "
 "can still use it, but you need to configure your network settings manually.\n"
@@ -1408,219 +1443,223 @@
 "Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
 "for instructions"
 msgstr ""
+"„Ekiga“ nesugebėjo automatiškai parinkti tinklo nustatymų. Programa naudotis "
+"galite, tačiau tinklo nuostatas reikės parinkti rankiniu būdu.\n"
+"\n"
+"Instrukcijas rasite adresu http://wiki.ekiga.org/index.php/"
+"Enable_port_forwarding_manually"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:282
-#: ../lib/engine/components/opal/sip-endpoint.cpp:284
+#: ../lib/engine/components/opal/sip-endpoint.cpp:259
+#: ../lib/engine/components/opal/sip-endpoint.cpp:261
 msgid "Message"
 msgstr "Žinutė"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:710
+#: ../lib/engine/components/opal/sip-endpoint.cpp:636
 msgid "Bad request"
 msgstr "Bloga užklausa"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:714
+#: ../lib/engine/components/opal/sip-endpoint.cpp:640
 msgid "Payment required"
 msgstr "Būtinas apmokėjimas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:718
+#: ../lib/engine/components/opal/sip-endpoint.cpp:644
 msgid "Unauthorized"
 msgstr "Nenustatyta tapatybė"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:722
+#: ../lib/engine/components/opal/sip-endpoint.cpp:648
 msgid "Forbidden"
 msgstr "Uždrausta"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:726
+#: ../lib/engine/components/opal/sip-endpoint.cpp:652
 msgid "Timeout"
 msgstr "Baigėsi skirtas laikas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:730
+#: ../lib/engine/components/opal/sip-endpoint.cpp:656
 msgid "Conflict"
 msgstr "Konfliktas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:734
+#: ../lib/engine/components/opal/sip-endpoint.cpp:660
 msgid "Temporarily unavailable"
 msgstr "Laikinai neprieinama"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:738
+#: ../lib/engine/components/opal/sip-endpoint.cpp:664
 msgid "Not acceptable"
 msgstr "Nepriimtina"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:742
+#: ../lib/engine/components/opal/sip-endpoint.cpp:668
 msgid "Illegal status code"
-msgstr ""
+msgstr "Netinkamas būsenos kodas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:746
+#: ../lib/engine/components/opal/sip-endpoint.cpp:672
 msgid "Multiple choices"
-msgstr ""
+msgstr "Keletas pasirinkimų"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:750
+#: ../lib/engine/components/opal/sip-endpoint.cpp:676
 msgid "Moved permanently"
-msgstr ""
+msgstr "Perkelta visam laikui"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:754
+#: ../lib/engine/components/opal/sip-endpoint.cpp:680
 msgid "Moved temporarily"
-msgstr ""
+msgstr "Laikinai perkelta"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:758
-#, fuzzy
+#: ../lib/engine/components/opal/sip-endpoint.cpp:684
 msgid "Use proxy"
-msgstr "Naudotojų katalogas"
+msgstr "Naudoti įgaliotąjį serverį"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:762
-#, fuzzy
+#: ../lib/engine/components/opal/sip-endpoint.cpp:688
 msgid "Alternative service"
-msgstr "Alternatyvus išvesties įrenginys"
+msgstr "Alternatyvi tarnyba."
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:766
+#: ../lib/engine/components/opal/sip-endpoint.cpp:692
 msgid "Not found"
 msgstr "Nerasta"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:770
+#: ../lib/engine/components/opal/sip-endpoint.cpp:696
 msgid "Method not allowed"
 msgstr "Neleistinas metodas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:774
+#: ../lib/engine/components/opal/sip-endpoint.cpp:700
 msgid "Proxy authentication required"
 msgstr "Reikia nustatyti tapatybę tarpiniame serveryje"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:778
+#: ../lib/engine/components/opal/sip-endpoint.cpp:704
 msgid "Length required"
 msgstr "Reikia ilgio"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:782
+#: ../lib/engine/components/opal/sip-endpoint.cpp:708
 msgid "Request entity too big"
-msgstr ""
+msgstr "Užklausos esybė per didelė"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:786
+#: ../lib/engine/components/opal/sip-endpoint.cpp:712
 msgid "Request URI too long"
-msgstr ""
+msgstr "Užklausos URI per ilgas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:790
+#: ../lib/engine/components/opal/sip-endpoint.cpp:716
 msgid "Unsupported media type"
-msgstr ""
+msgstr "Netinkamas medijos tipas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:794
+#: ../lib/engine/components/opal/sip-endpoint.cpp:720
 msgid "Unsupported URI scheme"
-msgstr ""
+msgstr "Netinkama URI schema"
 
 #. Translators : The extension we are trying to register does not exist
-#: ../lib/engine/components/opal/sip-endpoint.cpp:799
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
 msgid "Bad extension"
 msgstr "Netinkamas plėtinys"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:803
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
 msgid "Extension required"
 msgstr "Reikia plėtinio"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:807
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
 msgid "Interval too brief"
-msgstr ""
+msgstr "Intervalas per mažas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:811
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
 msgid "Loop detected"
-msgstr ""
+msgstr "Aptikta kilpa"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:815
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
 msgid "Too many hops"
-msgstr ""
+msgstr "Per daug tarpinių punktų"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:819
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
 msgid "Address incomplete"
 msgstr "Nevisas adresas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:823
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
 msgid "Ambiguous"
-msgstr ""
+msgstr "Daugiaprasmis"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:827
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
+#, fuzzy
 msgid "Busy Here"
-msgstr ""
+msgstr "Užimtas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:831
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
 msgid "Request terminated"
 msgstr "Užklausa nutraukta"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:835
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
 msgid "Not acceptable here"
 msgstr "Čia nepriimtina"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:839
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
 msgid "Bad event"
 msgstr "Netinkamas įvykis"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:843
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
 msgid "Request pending"
 msgstr "Laukiama užklausos"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:847
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
 msgid "Undecipherable"
 msgstr "Neiššifruojama"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:851
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
 msgid "Internal server error"
 msgstr "Vidinį serverio klaida"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:855
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
 msgid "Not implemented"
 msgstr "Neįgyvendinta"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:859
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
 msgid "Bad gateway"
 msgstr "Netinkamas šliuzas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:863
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
 msgid "Service unavailable"
 msgstr "Tarnyba nepalaikoma"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:867
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
 msgid "Server timeout"
 msgstr "Serverio laukimo laikas"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:871
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
 msgid "SIP version not supported"
 msgstr "SIP versija nepalaikoma"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:875
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
 msgid "Message too large"
 msgstr "Pranešimas per didelis"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:879
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
 msgid "Busy everywhere"
 msgstr "Visur užimta"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:883
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
 msgid "Decline"
 msgstr "Atsisakyti"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:887
+#: ../lib/engine/components/opal/sip-endpoint.cpp:813
 msgid "Does not exist anymore"
 msgstr "Nebeegzistuoja"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:891
+#: ../lib/engine/components/opal/sip-endpoint.cpp:817
 msgid "Globally not acceptable"
 msgstr "Visuotinai nepriimtina"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1020
+#: ../lib/engine/components/opal/sip-endpoint.cpp:954
 msgid "Could not send message"
 msgstr "Nepavyko išsiųsti žinutės"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1049
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Gaunamas skambutis iš %s"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1136
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1051
 #, c-format
 msgid "Incoming call"
 msgstr "Gaunamas skambutis"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1142
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1057
 #, c-format
 msgid "In a call with %s"
 msgstr "Skambutyje su %s"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1144
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1059
 #, c-format
 msgid "In a call"
 msgstr "Skambutyje"
@@ -1648,11 +1687,11 @@
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:103
-#: ../lib/engine/components/resource-list/rl-heap.cpp:144
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
 #: ../lib/engine/components/resource-list/rl-heap.cpp:178
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:133
-#: ../lib/engine/components/resource-list/rl-entry.cpp:130
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
 msgid "Unnamed"
 msgstr "Nepavadinta"
 
@@ -1668,77 +1707,78 @@
 msgid "Contact list _properties"
 msgstr "Adresatų sąrašo _savybės"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:467
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
 msgid "Edit contact list properties"
 msgstr "Keisti adresatų sąrašo savybes"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
 msgid "Please edit the following fields (no identifier means global)"
 msgstr ""
 "Užpildykite šiuos laukelius (idendifikatoriaus nebuvimas reiškia visuotinį)"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
 msgid "Contact list's name"
 msgstr "Adresatų sąrašo pavadinimas"
 
 #. "Document" used as a name -- uri point to the root of a document tree
-#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
 msgid "Document root"
 msgstr "Dokumentų šaknis"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
 msgid "Identifier"
 msgstr "Identifikatorius"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:476
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
 msgid "Writable"
 msgstr "Įrašomas"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:477
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
 msgid "Server username"
 msgstr "Naudotojo vardas serveryje"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:478
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
 msgid "Server password"
 msgstr "Slaptažodis serveryje"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:530
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
 msgid "Add a remote contact"
 msgstr "Pridėti nuotolinį adresatą"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:531
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
 msgid "Please fill in this form to create a new contact on a remote server"
 msgstr ""
 "Užpildykite šią formą norėdami sukurti naują adresatą nuotoliniame serveryje"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:221
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
 msgid "Edit remote contact"
 msgstr "Keisti nuotolinį adresatą"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
 msgid ""
 "Please fill in this form to change an existing contact on a remote server"
 msgstr ""
-"Užpildykite šią formą norėdami pakeisti esantį adresatą nuotoliniame serveryje"
+"Užpildykite šią formą norėdami pakeisti esantį adresatą nuotoliniame "
+"serveryje"
 
-#: ../lib/engine/components/resource-list/rl-entry.cpp:186
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
 msgid "Invalid server data"
 msgstr "Netinkami serverio duomenys"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:51
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
 msgid "Click to fetch"
 msgstr "Spustelėkite norėdami gauti"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:118
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
 msgid "Distant contact"
 msgstr "Nutolęs adresatas"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:181
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
 #, c-format
 msgid "%s / List #%d"
 msgstr "%s / sąrašas Nr. %d"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:185
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
 #, c-format
 msgid "List #%d"
 msgstr "Sąrašas Nr. %d"
@@ -1752,7 +1792,7 @@
 msgstr "Adresų knyga"
 
 #: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
-#: ../src/gui/main.cpp:3122
+#: ../src/gui/main.cpp:3132
 msgid "Address _Book"
 msgstr "Adresų _knyga"
 
@@ -1766,7 +1806,7 @@
 msgstr "Kategorija"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
-#: ../src/gui/assistant.cpp:1379
+#: ../src/gui/assistant.cpp:1368
 msgid "Full Name"
 msgstr "Vardas ir pavardė"
 
@@ -1786,7 +1826,7 @@
 msgid "Copy link"
 msgstr "Kopijuoti nuorodą"
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:904
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
 msgid "_Smile..."
 msgstr "_Šypsotis..."
 
@@ -1798,61 +1838,61 @@
 #: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:989
 #: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1024
 msgid "Unsorted"
-msgstr ""
+msgstr "Nerikiuota"
 
-#: ../lib/gui/codecsbox.cpp:477
+#: ../lib/gui/codecsbox.cpp:478
 msgid "Move selected codec priority upwards"
-msgstr ""
+msgstr "Pakelti pažymėto kodeko prioritetą"
 
-#: ../lib/gui/codecsbox.cpp:487
+#: ../lib/gui/codecsbox.cpp:488
 msgid "Move selected codec priority downwards"
-msgstr ""
+msgstr "Nuleisti pažymėto kodeko prioritetą"
 
 #: ../lib/gui/gmdialog.c:462
 msgid "Do not show this dialog again"
 msgstr "Nerodyti šio dialogo kitą kartą"
 
-#: ../src/gui/accounts.cpp:229
+#: ../src/gui/accounts.cpp:230
 msgid "Registered"
 msgstr "Prisiregistruota"
 
-#: ../src/gui/accounts.cpp:233
+#: ../src/gui/accounts.cpp:234
 msgid "Unregistered"
 msgstr "Išsiregistruota"
 
-#: ../src/gui/accounts.cpp:237
+#: ../src/gui/accounts.cpp:238
 msgid "Could not unregister"
 msgstr "Nepavyko išsiregistruoti"
 
-#: ../src/gui/accounts.cpp:243
+#: ../src/gui/accounts.cpp:244
 msgid "Could not register"
 msgstr "Nepavyko užsiregistruoti"
 
-#: ../src/gui/accounts.cpp:249
+#: ../src/gui/accounts.cpp:250
 msgid "Processing..."
 msgstr "Apdorojama..."
 
-#: ../src/gui/accounts.cpp:632
+#: ../src/gui/accounts.cpp:636
 msgid "Account Name"
 msgstr "Paskyros vardas"
 
-#: ../src/gui/accounts.cpp:633
+#: ../src/gui/accounts.cpp:637
 msgid "Voice Mails"
 msgstr "Balso paštas"
 
-#: ../src/gui/accounts.cpp:634
+#: ../src/gui/accounts.cpp:638
 msgid "Status"
 msgstr "Būsena"
 
-#: ../src/gui/accounts.cpp:645 ../src/gui/accounts.cpp:688
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
 msgid "Accounts"
 msgstr "Paskyros"
 
-#: ../src/gui/accounts.cpp:659 ../src/gui/main.cpp:3183
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3193
 msgid "_Accounts"
 msgstr "_Paskyros"
 
-#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3266
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3276
 msgid "_Help"
 msgstr "_Žinynas"
 
@@ -1861,11 +1901,11 @@
 #. * description in the list of configured accounts, it shows if an account
 #. * is activated or not (a status the user can choose).
 #.
-#: ../src/gui/accounts.cpp:696 ../src/gui/preferences.cpp:586
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
 msgid "A"
 msgstr "A"
 
-#: ../src/gui/assistant.cpp:325
+#: ../src/gui/assistant.cpp:321
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1879,20 +1919,20 @@
 "Kartą tai atlikę nustatymus galėsite bet kada pakeisti meniu „Keisti“ "
 "pasirinkę punktą „Nustatymai“."
 
-#: ../src/gui/assistant.cpp:333
+#: ../src/gui/assistant.cpp:329
 msgid "Welcome to Ekiga"
 msgstr "Sveikiname paleidus Ekigą"
 
-#: ../src/gui/assistant.cpp:367 ../src/gui/preferences.cpp:454
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "Asmeninė informacija"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:370
+#: ../src/gui/assistant.cpp:356
 msgid "Please enter your first name and your surname:"
 msgstr "Įveskite savo vardą ir pavardę:"
 
-#: ../src/gui/assistant.cpp:379
+#: ../src/gui/assistant.cpp:365
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
@@ -1900,19 +1940,19 @@
 "Jūsų vardas ir pavardė bus naudojami jungiantis prie kitų VoIP ir vaizdo "
 "konferencinių programų."
 
-#: ../src/gui/assistant.cpp:570
+#: ../src/gui/assistant.cpp:559
 msgid "Ekiga.net Account"
 msgstr "Ekiga.net paskyra"
 
-#: ../src/gui/assistant.cpp:572
+#: ../src/gui/assistant.cpp:561
 msgid "Please enter your username:"
 msgstr "Įveskite savo naudotojo vardą:"
 
-#: ../src/gui/assistant.cpp:580
+#: ../src/gui/assistant.cpp:569
 msgid "Please enter your password:"
 msgstr "Įveskite savo slaptažodį:"
 
-#: ../src/gui/assistant.cpp:590
+#: ../src/gui/assistant.cpp:579
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1923,30 +1963,30 @@
 "would prefer to specify the login details later."
 msgstr ""
 "Naudotojo vardas ir slaptažodis yra naudojami jungiantis prie esamos jūsų "
-"nemokamos ekiga.net SIP paslaugos paskyros. Jeigu dar neturite ekiga.net "
-"SIP adreso, galite žemiau susikurti paskyrą. Taip gausite SIP adresą, kuriuo "
+"nemokamos ekiga.net SIP paslaugos paskyros. Jeigu dar neturite ekiga.net SIP "
+"adreso, galite žemiau susikurti paskyrą. Taip gausite SIP adresą, kuriuo "
 "kiti žmonės galės jums skambinti.\n"
 "\n"
 "Galite praleisti šį žingsnį, jei naudojate alternatyvią SIP paslaugą, arba "
 "jei norite nurodyti prisijungimo informaciją vėliau."
 
-#: ../src/gui/assistant.cpp:617
+#: ../src/gui/assistant.cpp:606
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "Aš nenoriu užsiregistruoti nemokamos ekiga.net paslaugos"
 
-#: ../src/gui/assistant.cpp:680
+#: ../src/gui/assistant.cpp:669
 msgid "Ekiga Call Out Account"
 msgstr "Ekiga skambinimo paskyra"
 
-#: ../src/gui/assistant.cpp:682
+#: ../src/gui/assistant.cpp:671
 msgid "Please enter your account ID:"
 msgstr "Įveskite savo paskyros ID:"
 
-#: ../src/gui/assistant.cpp:690
+#: ../src/gui/assistant.cpp:679
 msgid "Please enter your PIN code:"
 msgstr "Įveskite savo PIN kodą:"
 
-#: ../src/gui/assistant.cpp:701
+#: ../src/gui/assistant.cpp:690
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1966,48 +2006,48 @@
 "Ši paslauga veiks tik tada, jei sukursite savo paskyrą naudodami šiame lange "
 "pateiktą URL.\n"
 
-#: ../src/gui/assistant.cpp:751
+#: ../src/gui/assistant.cpp:740
 msgid "Consult the calls history"
 msgstr "Žiūrėti skambučių restrospektyvą"
 
-#: ../src/gui/assistant.cpp:761
+#: ../src/gui/assistant.cpp:750
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr "Aš nenoriu užsisakyti Ekiga.net skambinimo paslaugos"
 
-#: ../src/gui/assistant.cpp:827 ../src/gui/assistant.cpp:1390
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
 msgid "Connection Type"
 msgstr "Prisijungimo tipas"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:830
+#: ../src/gui/assistant.cpp:819
 msgid "Please choose your connection type:"
 msgstr "Pasirinkite savo prisijungimo tipą:"
 
-#: ../src/gui/assistant.cpp:847
+#: ../src/gui/assistant.cpp:836
 msgid "56k Modem"
 msgstr "56K modemas"
 
-#: ../src/gui/assistant.cpp:852
+#: ../src/gui/assistant.cpp:841
 msgid "ISDN"
 msgstr "ISDN linija"
 
-#: ../src/gui/assistant.cpp:857
+#: ../src/gui/assistant.cpp:846
 msgid "DSL/Cable (128 kbit/s uplink)"
-msgstr ""
+msgstr "DSL/kabelinis (siuntimas 128 kb/s)"
 
-#: ../src/gui/assistant.cpp:862
+#: ../src/gui/assistant.cpp:851
 msgid "DSL/Cable (512 kbit/s uplink)"
-msgstr ""
+msgstr "DSL/kabelinis (siuntimas 512 kb/s)"
 
-#: ../src/gui/assistant.cpp:867
+#: ../src/gui/assistant.cpp:856
 msgid "LAN"
 msgstr "LAN"
 
-#: ../src/gui/assistant.cpp:872
+#: ../src/gui/assistant.cpp:861
 msgid "Keep current settings"
 msgstr "Palikti esamus parametrus"
 
-#: ../src/gui/assistant.cpp:877
+#: ../src/gui/assistant.cpp:866
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -2017,76 +2057,70 @@
 "kokybės nustatymus naudojamus pokalbių metu. Vėliau galite nustatymus "
 "pakeisti programos nustatymų lange."
 
-#: ../src/gui/assistant.cpp:971 ../src/gui/main.cpp:3012
-#: ../src/gui/main.cpp:3016 ../src/gui/preferences.cpp:760
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3022
+#: ../src/gui/main.cpp:3026 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "Garso įrenginiai"
 
-#: ../src/gui/assistant.cpp:973
+#: ../src/gui/assistant.cpp:962
 msgid "Please choose the audio ringing device:"
 msgstr "Pasirinkite garso skambinimo įrenginį:"
 
-#: ../src/gui/assistant.cpp:993
-#, fuzzy
+#: ../src/gui/assistant.cpp:982
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
 msgstr ""
-"Garso įvesties įrenginys yra įrenginys, kurį garso tvarkyklė naudos įrašydama "
-"Jūsų balsą."
+"Skambinimo garso įrenginys bus naudojamas įeinančių skambučių skambinimo "
+"garsui atkurti."
 
 #. ---
-#: ../src/gui/assistant.cpp:1004
+#: ../src/gui/assistant.cpp:993
 msgid "Please choose the audio output device:"
 msgstr "Pasirinkite garso išvesties įrenginį:"
 
-#: ../src/gui/assistant.cpp:1024
-#, fuzzy
+#: ../src/gui/assistant.cpp:1013
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
 msgstr ""
-"Garso išvesties įrenginys yra įrenginys, kurį garso tvarkyklė naudos "
-"išvesdama garsą į garsiakalbius."
+"Garso išvesties įrenginys skambučio metu bus naudojamas garsui atkurti."
 
 #. ---
-#: ../src/gui/assistant.cpp:1035
+#: ../src/gui/assistant.cpp:1024
 msgid "Please choose the audio input device:"
 msgstr "Pasirinkite garso įvesties įrenginį:"
 
-#: ../src/gui/assistant.cpp:1055
-#, fuzzy
+#: ../src/gui/assistant.cpp:1044
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
 msgstr ""
-"Garso įvesties įrenginys yra įrenginys, kurį garso tvarkyklė naudos įrašydama "
-"Jūsų balsą."
+"Garso įvesties įrenginys skambučio metu bus naudojamas Jūsų balsui įrašyti."
 
-#: ../src/gui/assistant.cpp:1157
+#: ../src/gui/assistant.cpp:1146
 msgid "Please choose your video input device:"
 msgstr "Pasirinkite savo vaizdo įvesties įrenginį:"
 
-#: ../src/gui/assistant.cpp:1177
-#, fuzzy
+#: ../src/gui/assistant.cpp:1166
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
 msgstr ""
-"Vaizdo įvesties įrenginys yra įrenginys, kuri vaizdo tvarkyklė naudos vaizdo "
-"signalo priėmimui."
+"Vaizdo įvesties įrenginys skambučio metu bus naudojamas vaizdo signalo "
+"priėmimui."
 
-#: ../src/gui/assistant.cpp:1242 ../src/gui/assistant.cpp:1266
-#: ../src/gui/assistant.cpp:1290 ../src/gui/preferences.cpp:805
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
 #: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "Nerasta jokių įrenginių"
 
-#: ../src/gui/assistant.cpp:1321
+#: ../src/gui/assistant.cpp:1310
 msgid "Configuration Complete"
 msgstr "Konfigūravimas baigtas"
 
-#: ../src/gui/assistant.cpp:1323
+#: ../src/gui/assistant.cpp:1312
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
@@ -2094,35 +2128,35 @@
 "Ekiga konfigūravimas baigtas. Visi parametrai gali būti pakeisti Ekiga "
 "nustatymuose. Sėkmės!"
 
-#: ../src/gui/assistant.cpp:1330
+#: ../src/gui/assistant.cpp:1319
 msgid "Configuration summary:"
 msgstr "Konfigūracijos santrauka:"
 
-#: ../src/gui/assistant.cpp:1400
+#: ../src/gui/assistant.cpp:1389
 msgid "Audio Ringing Device"
 msgstr "Garso skambinimo įrenginys"
 
-#: ../src/gui/assistant.cpp:1409
+#: ../src/gui/assistant.cpp:1398
 msgid "Audio Output Device"
 msgstr "Garso išvesties įrenginys"
 
-#: ../src/gui/assistant.cpp:1418
+#: ../src/gui/assistant.cpp:1407
 msgid "Audio Input Device"
 msgstr "Garso įvesties įrenginys"
 
-#: ../src/gui/assistant.cpp:1427
+#: ../src/gui/assistant.cpp:1416
 msgid "Video Input Device"
 msgstr "Vaizdo įvesties įrenginys"
 
-#: ../src/gui/assistant.cpp:1440
+#: ../src/gui/assistant.cpp:1429
 msgid "SIP URI"
 msgstr "SIP URI"
 
-#: ../src/gui/assistant.cpp:1452
+#: ../src/gui/assistant.cpp:1441
 msgid "Ekiga Call Out"
 msgstr "Ekiga skambinimas"
 
-#: ../src/gui/assistant.cpp:1496
+#: ../src/gui/assistant.cpp:1485
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr "Konfigūravimo pagelbiklis (%d iš %d)"
@@ -2146,6 +2180,10 @@
 "Software Foundation; either version 2 of the License, or (at your option) "
 "any later version. "
 msgstr ""
+"Ši programa yra laisva. Jūs galite ją platinti ir/arba modifikuoti "
+"remdamiesi Free Software Foundation paskelbtomis GNU Bendrosios Viešosios "
+"licencijos (GNU GPL) sąlygomis: 2 licencijos versija, arba (savo nuožiūra) "
+"bet kuria vėlesne versija."
 
 #: ../src/gui/callbacks.cpp:171
 msgid ""
@@ -2156,6 +2194,13 @@
 "License along with this program; if not, write to the Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Ši programa platinama su viltimi, kad ji bus naudinga, bet BE JOKIŲ "
+"GARANTIJŲ; tame tarpe be jokių numanomų PERKAMUMO ar TINKAMUMO KONKRETIEMS "
+"TIKSLAMS garantijų. Žiūrėkite GNU Bendrąją Viešąją licenciją norėdami "
+"sužinoti smulkmenas. Jūs turėjote kartu su šia programa gauti ir GNU "
+"Bendrosios Viešosios licencijos kopiją; jei negavote – rašykite Free "
+"Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-"
+"1301, USA."
 
 #: ../src/gui/callbacks.cpp:178
 msgid ""
@@ -2166,6 +2211,10 @@
 "long as you do follow the requirements of the GNU GPL for all the rest of "
 "the software thus combined."
 msgstr ""
+"Programa „Ekiga“ yra platinama GNU GPL licencijos sąlygomis su papildoma "
+"sąlyga: ją leidžiama susieti ar kitaip kombinuoti su OPAL, OpenH323 ir PWLIB "
+"programomis bei platinti gautą produktą, OPAL, OpenH323 ir PWLIB programoms "
+"netaikant GNU GPL reikalavimų, tačiau juos taikant likusiai produkto daliai."
 
 #. Translators: Please write translator credits here, and
 #. * separate names with \n
@@ -2188,7 +2237,7 @@
 
 #: ../src/gui/callbacks.cpp:269
 msgid "Help display is not supported by your GTK+ version"
-msgstr ""
+msgstr "Žinynas nepalaikomas Jūsų naudojamoje GTK+ versijoje"
 
 #: ../src/gui/callbacks.cpp:277
 msgid "Unable to open help file."
@@ -2227,127 +2276,131 @@
 msgstr "wxyz"
 
 #. Translators: Is displayed once an account "%s" is registered.
-#: ../src/gui/main.cpp:519
+#: ../src/gui/main.cpp:526
 #, c-format
 msgid "Registered %s"
 msgstr "Užregistruota %s"
 
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:526
+#: ../src/gui/main.cpp:533
 #, c-format
 msgid "Unregistered %s"
 msgstr "Išregistruota %s"
 
-#: ../src/gui/main.cpp:531
+#: ../src/gui/main.cpp:538
 #, c-format
 msgid "Could not unregister %s"
 msgstr "Nepavyko išregistruoti %s"
 
-#: ../src/gui/main.cpp:535
+#: ../src/gui/main.cpp:542
 #, c-format
 msgid "Could not register %s"
 msgstr "Nepavyko užregistruoti %s"
 
-#: ../src/gui/main.cpp:605
+#: ../src/gui/main.cpp:612
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr "G:%.1f/%.1f   V:%.1f/%.1f   KPS:%d/%d"
 
-#: ../src/gui/main.cpp:651
+#: ../src/gui/main.cpp:658
 #, c-format
 msgid "Connected with %s"
 msgstr "Prisijungti prie %s"
 
-#: ../src/gui/main.cpp:692 ../src/gui/main.cpp:3512
+#: ../src/gui/main.cpp:699 ../src/gui/main.cpp:3522
 msgid "Standby"
 msgstr "Užmigdyti"
 
-#: ../src/gui/main.cpp:753
+#: ../src/gui/main.cpp:760
 msgid "Call on hold"
 msgstr "Skambutis sulaikytas"
 
-#: ../src/gui/main.cpp:764
+#: ../src/gui/main.cpp:771
 msgid "Call retrieved"
 msgstr "Skambutis priimtas"
 
-#: ../src/gui/main.cpp:780
+#: ../src/gui/main.cpp:787
 #, c-format
 msgid "Missed call from %s"
 msgstr "Praleistas %s skambutis"
 
-#: ../src/gui/main.cpp:917
+#: ../src/gui/main.cpp:924
 msgid "Error"
 msgstr "Klaida"
 
-#: ../src/gui/main.cpp:982
+#: ../src/gui/main.cpp:989
 msgid "Error while initializing video output"
 msgstr "Klaida inicijuojant vaizdo išvestį"
 
-#: ../src/gui/main.cpp:983
+#: ../src/gui/main.cpp:990
 msgid "No video will be displayed during this call->"
-msgstr ""
+msgstr "Šio skambučio metu vaizdas nebus rodomas->"
 
-#: ../src/gui/main.cpp:993
+#: ../src/gui/main.cpp:1000
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that no other application is using the accelerated video output."
 msgstr ""
+"Įvyko klaida, bandant atverti ar inicijuoti vaizdo išvestį. Įsitikinkite, "
+"jog paspartintos vaizdo išvesties įrenginio nenaudoja jokia kita programa."
 
-#: ../src/gui/main.cpp:995
+#: ../src/gui/main.cpp:1002
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that you are using a color depth of 24 or 32 bits per pixel."
 msgstr ""
+"Įvyko klaida, bandant atverti ar inicijuoti vaizdo išvestį. Įsitikinkite, "
+"jog naudojate 24 arba 32 bitų gylio spalvų paletę."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1108
+#: ../src/gui/main.cpp:1115
 #, c-format
 msgid "Added video input device %s"
 msgstr "Pridėtas vaizdo įvesties įrenginys %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1120
+#: ../src/gui/main.cpp:1127
 #, c-format
 msgid "Removed video input device %s"
 msgstr "Pašalintas vaizdo įvesties įrenginys %s"
 
-#: ../src/gui/main.cpp:1137
+#: ../src/gui/main.cpp:1144
 #, c-format
 msgid "Error while accessing video device %s"
 msgstr "Klaida gaunant prieigą prie vaizdo įrenginio %s"
 
-#: ../src/gui/main.cpp:1140
-#, fuzzy
+#: ../src/gui/main.cpp:1147
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
 "plugin and \"Moving logo\" or \"Static picture\" as device."
 msgstr ""
-"Skambučių metu bus perduodamas judantis logotipas. Turėkite omenyje, kad "
+"Skambučių metu bus siunčiamas judantis logotipas. Turėkite omenyje, kad "
 "visada galite perduoti pasirinktą paveikslėlį arba judantį logotipą, "
 "pasirinkdami vaizdo įskiepį „Paveikslėlis“ ir įrenginį „Judantis logotipas“ "
 "arba „Statinis paveikslėlis“."
 
-#: ../src/gui/main.cpp:1144
-#, fuzzy
+#: ../src/gui/main.cpp:1151
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
 "accessible, please check your permissions and make sure that the appropriate "
 "driver is loaded."
 msgstr ""
-"Įvyko klaida atidarant įrenginį. Patikrinkite įrenginio priėjimo teises ir "
-"įsitikinkite, kad atitinkama tvarkyklė yra paleista."
+"Įvyko klaida atidarant įrenginį. Jei tai išimamas įrenginys, galbūt užteks "
+"tiesiog jį atjungti ir prijungti vėl. Jei ne, arba jei tai nepadeda, "
+"patikrinkite įrenginio priėjimo teises ir įsitikinkite, kad naudojama "
+"atitinkama tvarkyklė."
 
-#: ../src/gui/main.cpp:1148
+#: ../src/gui/main.cpp:1155
 msgid "Your video driver doesn't support the requested video format."
 msgstr "Jūsų vaizdo tvarkyklė nepalaiko pasirinko vaizdo formato."
 
-#: ../src/gui/main.cpp:1152
+#: ../src/gui/main.cpp:1159
 msgid "Could not open the chosen channel."
 msgstr "Nepavyko atverti pasirinkto kanalo."
 
-#: ../src/gui/main.cpp:1156
+#: ../src/gui/main.cpp:1163
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2358,55 +2411,54 @@
 "Pasižiūrėkite savo branduolio tvarkyklės dokumentacijoje, kaip nustatyti "
 "palaikomą spalvų paletę."
 
-#: ../src/gui/main.cpp:1160
+#: ../src/gui/main.cpp:1167
 msgid "Error while setting the frame rate."
 msgstr "Nepavyko nustatyti kadrų skaičiaus."
 
-#: ../src/gui/main.cpp:1164
+#: ../src/gui/main.cpp:1171
 msgid "Error while setting the frame size."
 msgstr "Nepavyko nustatyti kadrų dydžio."
 
-#: ../src/gui/main.cpp:1169 ../src/gui/main.cpp:1271 ../src/gui/main.cpp:1386
+#: ../src/gui/main.cpp:1176 ../src/gui/main.cpp:1278 ../src/gui/main.cpp:1393
 msgid "Unknown error."
 msgstr "Nežinoma klaida."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1219
+#: ../src/gui/main.cpp:1226
 #, c-format
 msgid "Added audio input device %s"
 msgstr "Pridėtas garso įvesties įrenginys %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1236
+#: ../src/gui/main.cpp:1243
 #, c-format
 msgid "Removed audio input device %s"
 msgstr "Pašalintas garso įvesties įrenginys %s"
 
-#: ../src/gui/main.cpp:1253
+#: ../src/gui/main.cpp:1260
 #, c-format
 msgid "Error while opening audio input device %s"
 msgstr "Klaida atveriant garso įvesties įrenginį %s"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
-#: ../src/gui/main.cpp:1258
+#: ../src/gui/main.cpp:1265
 msgid "Only silence will be transmitted."
 msgstr "Bus perduodama tik tyla."
 
-#: ../src/gui/main.cpp:1262
-#, fuzzy
+#: ../src/gui/main.cpp:1269
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
 "still is not accessible, please check your audio setup, the permissions and "
 "that the device is not busy."
 msgstr ""
-"Nepavyko įrašyti garso iš pasirinkto garso įrenginio (%s). Patikrinkite "
-"programos garso nustatymus, priėjimo prie įrenginio teises ir ar įrenginys "
-"nėra užimtas."
+"Nepavyko įrašyti garso iš pasirinkto garso įrenginio. Jei tai išimamas "
+"įrenginys, galbūt užteks tiesiog jį atjungti ir prijungti vėl. Jei ne, arba "
+"jei tai nepadeda, patikrinkite parinktus garso nustatymus, priėjimo prie "
+"įrenginio teises ir ar įrenginys nėra užimtas."
 
-#: ../src/gui/main.cpp:1266
-#, fuzzy
+#: ../src/gui/main.cpp:1273
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2414,381 +2466,383 @@
 "check your audio setup."
 msgstr ""
 "Pasirinktas garso įrenginys (%s) buvo sėkmingai atidarytas, tačiau iš "
-"įrenginio nepavyko gauti jokių duomenų. Patikrinkite savo garso nustatymus."
+"įrenginio nepavyko gauti jokių duomenų. Jei tai išimamas įrenginys, galbūt "
+"užteks tiesiog jį atjungti ir prijungti vėl. Jei ne, arba jei tai nepadeda, "
+"patikrinkite parinktus garso nustatymus."
 
-#: ../src/gui/main.cpp:1333
+#: ../src/gui/main.cpp:1340
 #, c-format
 msgid "Added audio output device %s"
 msgstr "Pridėtas garso išvesties įrenginys %s"
 
-#: ../src/gui/main.cpp:1349
+#: ../src/gui/main.cpp:1356
 #, c-format
 msgid "Removed audio output device %s"
 msgstr "Pašalintas garso išvesties įrenginys %s"
 
-#: ../src/gui/main.cpp:1370
+#: ../src/gui/main.cpp:1377
 #, c-format
 msgid "Error while opening audio output device %s"
 msgstr "Klaida atveriant garso išvesties įrenginį %s"
 
-#: ../src/gui/main.cpp:1373
+#: ../src/gui/main.cpp:1380
 msgid "No incoming sound will be played."
 msgstr "Nebus grojama jokių gaunamų garsų."
 
-#: ../src/gui/main.cpp:1377
-#, fuzzy
+#: ../src/gui/main.cpp:1384
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
 "still is not accessible, please check your audio setup, the permissions and "
 "that the device is not busy."
 msgstr ""
-"Nepavyko išvesti garso į pasirinktą garso įrenginį (%s). Patikrinkite "
-"programos garso nustatymus, priėjimo teises ir ar įrenginys nėra užimtas."
+"Nepavyko išvesti garso į pasirinktą garso įrenginį. Patikrinkite programos "
+"garso nustatymus, priėjimo teises ir ar įrenginys nėra užimtas."
 
-#: ../src/gui/main.cpp:1381
-#, fuzzy
+#: ../src/gui/main.cpp:1388
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
 "sufficient to reconnect it. If not, or if it still is not accessible, please "
 "check your audio setup."
 msgstr ""
-"Pasirinktas garso įrenginys (%s) buvo sėkmingai atidarytas, tačiau į jį "
-"nepavyko įrašyti jokių duomenų. Patikrinkite savo garso nustatymus."
+"Pasirinktas garso įrenginys buvo sėkmingai atvertas, tačiau į jį nepavyko "
+"įrašyti jokių duomenų. Jei tai išimamas įrenginys, galbūt užteks tiesiog jį "
+"atjungti ir prijungti vėl. Jei ne, arba jei tai nepadeda, patikrinkite "
+"parinktus garso nustatymus."
 
-#: ../src/gui/main.cpp:1569
+#: ../src/gui/main.cpp:1579
 msgid "Video Settings"
 msgstr "Vaizdo parametrai"
 
-#: ../src/gui/main.cpp:1596
+#: ../src/gui/main.cpp:1606
 msgid "Adjust brightness"
 msgstr "Keisti ryškumą"
 
-#: ../src/gui/main.cpp:1617
+#: ../src/gui/main.cpp:1627
 msgid "Adjust whiteness"
 msgstr "Keisti baltumą"
 
-#: ../src/gui/main.cpp:1638
+#: ../src/gui/main.cpp:1648
 msgid "Adjust color"
 msgstr "Keisti spalvas"
 
-#: ../src/gui/main.cpp:1659
+#: ../src/gui/main.cpp:1669
 msgid "Adjust contrast"
 msgstr "Keisti kontrastą"
 
-#: ../src/gui/main.cpp:1705
+#: ../src/gui/main.cpp:1715
 msgid "Audio Settings"
 msgstr "Garso parametrai"
 
-#: ../src/gui/main.cpp:2316
+#: ../src/gui/main.cpp:2326
 msgid "_Retrieve Call"
 msgstr "P_riimti skambutį"
 
-#: ../src/gui/main.cpp:2329
+#: ../src/gui/main.cpp:2339
 msgid "_Hold Call"
 msgstr "_Sulaikyti skambutį"
 
-#: ../src/gui/main.cpp:2361 ../src/gui/main.cpp:3149
+#: ../src/gui/main.cpp:2371 ../src/gui/main.cpp:3159
 msgid "Suspend _Audio"
 msgstr "Sustabdyti g_arsą"
 
-#: ../src/gui/main.cpp:2363 ../src/gui/main.cpp:3154
+#: ../src/gui/main.cpp:2373 ../src/gui/main.cpp:3164
 msgid "Suspend _Video"
 msgstr "Sustabdyti _vaizdą"
 
-#: ../src/gui/main.cpp:2365
+#: ../src/gui/main.cpp:2375
 msgid "Resume _Audio"
 msgstr "Atstatyti g_arsą"
 
-#: ../src/gui/main.cpp:2367
+#: ../src/gui/main.cpp:2377
 msgid "Resume _Video"
 msgstr "Atstatyti _vaizdą"
 
-#: ../src/gui/main.cpp:2650 ../src/gui/main.cpp:2802
+#: ../src/gui/main.cpp:2660 ../src/gui/main.cpp:2812
 msgid "Reject"
 msgstr "Atmesti"
 
-#: ../src/gui/main.cpp:2652 ../src/gui/main.cpp:2801
+#: ../src/gui/main.cpp:2662 ../src/gui/main.cpp:2811
 msgid "Accept"
 msgstr "Priimti"
 
-#: ../src/gui/main.cpp:2658 ../src/gui/main.cpp:2789
+#: ../src/gui/main.cpp:2668 ../src/gui/main.cpp:2799
 msgid "Incoming call from"
 msgstr "Sulaukta skambučio iš"
 
-#: ../src/gui/main.cpp:2676 ../src/gui/main.cpp:2792
+#: ../src/gui/main.cpp:2686 ../src/gui/main.cpp:2802
 msgid "Remote URI:"
 msgstr "Nutolęs URI:"
 
-#: ../src/gui/main.cpp:2688 ../src/gui/main.cpp:2794
+#: ../src/gui/main.cpp:2698 ../src/gui/main.cpp:2804
 msgid "Remote Application:"
 msgstr "Nutolusi programa:"
 
-#: ../src/gui/main.cpp:2709
+#: ../src/gui/main.cpp:2719
 #, c-format
 msgid "Call from %s"
 msgstr "Skambutis nuo %s"
 
-#: ../src/gui/main.cpp:2915
+#: ../src/gui/main.cpp:2925
 #, c-format
 msgid "Call Duration: %s\n"
 msgstr "Skambučio trukmė: %s\n"
 
-#: ../src/gui/main.cpp:2946
+#: ../src/gui/main.cpp:2956
 msgid "Transfer call to:"
 msgstr "Nukreipti skambutį į:"
 
-#: ../src/gui/main.cpp:2998
+#: ../src/gui/main.cpp:3008
 msgid "No"
 msgstr "Ne"
 
-#: ../src/gui/main.cpp:3000
+#: ../src/gui/main.cpp:3010
 msgid "Yes"
 msgstr "Taip"
 
-#: ../src/gui/main.cpp:3011
+#: ../src/gui/main.cpp:3021
 msgid "Detected new audio input device:"
 msgstr "Pasirinkite naują garso įvesties įrenginį:"
 
-#: ../src/gui/main.cpp:3015
+#: ../src/gui/main.cpp:3025
 msgid "Detected new audio output device:"
 msgstr "Pasirinkite naują garso išvesties įrenginį:"
 
-#: ../src/gui/main.cpp:3019
+#: ../src/gui/main.cpp:3029
 msgid "Detected new video input device:"
 msgstr "Pasirinkite naują vaizdo įvesties įrenginį:"
 
-#: ../src/gui/main.cpp:3020 ../src/gui/preferences.cpp:921
+#: ../src/gui/main.cpp:3030 ../src/gui/preferences.cpp:921
 msgid "Video Devices"
 msgstr "Vaizdo įrenginiai"
 
-#: ../src/gui/main.cpp:3038
+#: ../src/gui/main.cpp:3048
 msgid "Do you want to use it as default device?"
 msgstr "Ar pageidaujate naudotį jį kaip numatytąjį įrenginį?"
 
-#: ../src/gui/main.cpp:3106
+#: ../src/gui/main.cpp:3116
 msgid "_Chat"
 msgstr "_Plepėti"
 
-#: ../src/gui/main.cpp:3108
+#: ../src/gui/main.cpp:3118
 msgid "Ca_ll"
 msgstr "S_kambinti"
 
-#: ../src/gui/main.cpp:3108
+#: ../src/gui/main.cpp:3118
 msgid "Place a new call"
 msgstr "Skambinti"
 
-#: ../src/gui/main.cpp:3111
+#: ../src/gui/main.cpp:3121
 msgid "_Hang up"
 msgstr "_Padėti ragelį"
 
-#: ../src/gui/main.cpp:3112
+#: ../src/gui/main.cpp:3122
 msgid "Terminate the current call"
 msgstr "Nutraukti esamą skambutį"
 
-#: ../src/gui/main.cpp:3118
+#: ../src/gui/main.cpp:3128
 msgid "A_dd Contact"
 msgstr "_Pridėti adresatą"
 
-#: ../src/gui/main.cpp:3118
+#: ../src/gui/main.cpp:3128
 msgid "Add a contact to the roster"
 msgstr "Įtraukti adresatą į sąrašą"
 
-#: ../src/gui/main.cpp:3123
+#: ../src/gui/main.cpp:3133
 msgid "Find contacts"
 msgstr "Rasti adresatą"
 
-#: ../src/gui/main.cpp:3130
+#: ../src/gui/main.cpp:3140
 msgid "_Contact"
 msgstr "_Adresatas"
 
-#: ../src/gui/main.cpp:3131
+#: ../src/gui/main.cpp:3141
 msgid "Act on selected contact"
 msgstr "Veikti pasirinktą adresatą"
 
-#: ../src/gui/main.cpp:3137
+#: ../src/gui/main.cpp:3147
 msgid "H_old Call"
 msgstr "_Sulaikyti skambutį"
 
-#: ../src/gui/main.cpp:3137 ../src/gui/main.cpp:3606
+#: ../src/gui/main.cpp:3147 ../src/gui/main.cpp:3616
 msgid "Hold the current call"
 msgstr "Sustabdyti dabartinį skambutį"
 
-#: ../src/gui/main.cpp:3141
+#: ../src/gui/main.cpp:3151
 msgid "_Transfer Call"
 msgstr "Persiųs_ti skambutį"
 
-#: ../src/gui/main.cpp:3142
+#: ../src/gui/main.cpp:3152
 msgid "Transfer the current call"
 msgstr "Nukreipti esamą skambutį"
 
-#: ../src/gui/main.cpp:3150
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the audio transmission"
 msgstr "Sulaikyti / tęsti garso perdavimą"
 
-#: ../src/gui/main.cpp:3155
+#: ../src/gui/main.cpp:3165
 msgid "Suspend or resume the video transmission"
 msgstr "Sulaikyti / tęsti vaizdo perdavimą"
 
-#: ../src/gui/main.cpp:3162
+#: ../src/gui/main.cpp:3172
 msgid "Close the Ekiga window"
 msgstr "Užverti Ekiga langą"
 
-#: ../src/gui/main.cpp:3169 ../src/gui/statusicon.cpp:406
+#: ../src/gui/main.cpp:3179 ../src/gui/statusicon.cpp:414
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../src/gui/main.cpp:3175
+#: ../src/gui/main.cpp:3185
 msgid "_Configuration Assistant"
 msgstr "_Konfigūravimo pagelbiklis"
 
-#: ../src/gui/main.cpp:3176
+#: ../src/gui/main.cpp:3186
 msgid "Run the configuration assistant"
 msgstr "Paleisti konfigūravimo pagelbiklį"
 
-#: ../src/gui/main.cpp:3184
+#: ../src/gui/main.cpp:3194
 msgid "Edit your accounts"
 msgstr "Keisti savo paskyras"
 
-#: ../src/gui/main.cpp:3190
+#: ../src/gui/main.cpp:3200
 msgid "Change your preferences"
 msgstr "Taisyti savo nustatymus"
 
-#: ../src/gui/main.cpp:3195
+#: ../src/gui/main.cpp:3205
 msgid "_View"
 msgstr "R_odymas"
 
-#: ../src/gui/main.cpp:3197
+#: ../src/gui/main.cpp:3207
 msgid "Con_tacts"
 msgstr "_Adresatai"
 
-#: ../src/gui/main.cpp:3197
+#: ../src/gui/main.cpp:3207
 msgid "View the contacts list"
 msgstr "Rodyti adresatų sąrašą"
 
-#: ../src/gui/main.cpp:3202
+#: ../src/gui/main.cpp:3212
 msgid "_Dialpad"
 msgstr "_Rinkiklis"
 
-#: ../src/gui/main.cpp:3202
+#: ../src/gui/main.cpp:3212
 msgid "View the dialpad"
 msgstr "Rodyti numerių rinkiklį"
 
-#: ../src/gui/main.cpp:3207
+#: ../src/gui/main.cpp:3217
 msgid "_Call History"
 msgstr "_Skambučių retrospektyva"
 
-#: ../src/gui/main.cpp:3207
+#: ../src/gui/main.cpp:3217
 msgid "View the call history"
 msgstr "Rodyti skambučių restrospektyvą"
 
-#: ../src/gui/main.cpp:3215
+#: ../src/gui/main.cpp:3225
 msgid "_Show Call Panel"
 msgstr "_Rodyti skambučių skydelį"
 
-#: ../src/gui/main.cpp:3223
+#: ../src/gui/main.cpp:3233
 msgid "_Local Video"
 msgstr "_Vietinis vaizdas"
 
-#: ../src/gui/main.cpp:3224
+#: ../src/gui/main.cpp:3234
 msgid "Local video image"
 msgstr "Vietinio vaizdo paveikslėlis"
 
-#: ../src/gui/main.cpp:3229
+#: ../src/gui/main.cpp:3239
 msgid "_Remote Video"
 msgstr "_Nutolęs vaizdas"
 
-#: ../src/gui/main.cpp:3230
+#: ../src/gui/main.cpp:3240
 msgid "Remote video image"
 msgstr "Nutolusio vaizdo paveikslėlis"
 
-#: ../src/gui/main.cpp:3235
+#: ../src/gui/main.cpp:3245
 msgid "_Picture-in-Picture"
 msgstr "_Paveikslėlis paveikslėlyje"
 
-#: ../src/gui/main.cpp:3236 ../src/gui/main.cpp:3242
+#: ../src/gui/main.cpp:3246 ../src/gui/main.cpp:3252
 msgid "Both video images"
 msgstr "Abu vaizdo paveikslėliai"
 
-#: ../src/gui/main.cpp:3241
+#: ../src/gui/main.cpp:3251
 msgid "Picture-in-Picture in Separate _Window"
 msgstr "Paveikslėlis paveikslėlyje atskirama _lange"
 
-#: ../src/gui/main.cpp:3249
+#: ../src/gui/main.cpp:3259
 msgid "Zoom in"
 msgstr "Didinti"
 
-#: ../src/gui/main.cpp:3253
+#: ../src/gui/main.cpp:3263
 msgid "Zoom out"
 msgstr "Mažinti"
 
-#: ../src/gui/main.cpp:3257
+#: ../src/gui/main.cpp:3267
 msgid "Normal size"
 msgstr "Normalus dydis"
 
-#: ../src/gui/main.cpp:3261
+#: ../src/gui/main.cpp:3271
 msgid "_Fullscreen"
 msgstr "_Visame ekrane"
 
-#: ../src/gui/main.cpp:3261
+#: ../src/gui/main.cpp:3271
 msgid "Switch to fullscreen"
 msgstr "Rodyti visame ekrane"
 
-#: ../src/gui/main.cpp:3269 ../src/gui/statusicon.cpp:394
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:402
 msgid "Get help by reading the Ekiga manual"
 msgstr "Gaukite pagalbą skaitydami Ekiga žinyną"
 
-#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:399
+#: ../src/gui/main.cpp:3284 ../src/gui/statusicon.cpp:407
 msgid "View information about Ekiga"
 msgstr "Parodyti informaciją apie Ekiga"
 
-#: ../src/gui/main.cpp:3348
+#: ../src/gui/main.cpp:3358
 msgid ""
 "Enter a URI on the left, and click this button to place a call or to hangup"
 msgstr ""
 "Kairėje įveskite URL ir spustelkite šį mygtuką norėdami paskambinti ar "
 "nutraukti pokalbį"
 
-#: ../src/gui/main.cpp:3399
+#: ../src/gui/main.cpp:3409
 msgid "Contacts"
 msgstr "Adresatai"
 
-#: ../src/gui/main.cpp:3422
+#: ../src/gui/main.cpp:3432
 msgid "Dialpad"
 msgstr "Rinkiklis"
 
-#: ../src/gui/main.cpp:3441
+#: ../src/gui/main.cpp:3451
 msgid "Call history"
 msgstr "Skambučių retrospektyva"
 
-#: ../src/gui/main.cpp:3544
+#: ../src/gui/main.cpp:3554
 msgid "Change the volume of your soundcard"
 msgstr "Pakeisti garso kortos garsumą"
 
-#: ../src/gui/main.cpp:3564
+#: ../src/gui/main.cpp:3574
 msgid "Change the color settings of your video device"
 msgstr "Pakeisti vaizdo įrenginio spalvų parametrus"
 
-#: ../src/gui/main.cpp:3675
+#: ../src/gui/main.cpp:3685
 msgid "Ekiga"
 msgstr "Ekiga"
 
 #. Translators:
 #. * TX is a common abbreviation for "transmit"
-#: ../src/gui/main.cpp:4282
+#: ../src/gui/main.cpp:4297
 #, c-format
 msgid "TX: %dx%d "
 msgstr "Siunčiama: %dx%d "
 
 #. Translators:
 #. * RX is a common abbreviation for "receive"
-#: ../src/gui/main.cpp:4287
+#: ../src/gui/main.cpp:4302
 #, c-format
 msgid "RX: %dx%d "
 msgstr "Gauta: %dx%d "
 
-#: ../src/gui/main.cpp:4289
+#: ../src/gui/main.cpp:4304
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2801,23 +2855,24 @@
 "Netvarkingi paketai: %.1f %%\n"
 "Mirgėjimo buferis: %d ms%s%s%s"
 
-#: ../src/gui/main.cpp:4406
+#: ../src/gui/main.cpp:4425
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr "Išveda derinimo pranešimus konsolėje (lygis tap 1 ir 5)"
 
-#: ../src/gui/main.cpp:4411
+#: ../src/gui/main.cpp:4430
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
-msgstr "Išveda naudojo lygmens derinimo pranešimus konsolėje (lygis tap 1 ir 4)"
+msgstr ""
+"Išveda naudojo lygmens derinimo pranešimus konsolėje (lygis tap 1 ir 4)"
 
-#: ../src/gui/main.cpp:4416
+#: ../src/gui/main.cpp:4435
 msgid "Makes Ekiga call the given URI"
 msgstr "Ekiga skambina nurodytu URL"
 
-#: ../src/gui/main.cpp:4525
+#: ../src/gui/main.cpp:4554
 msgid "No usable audio plugin detected"
 msgstr "Nerasta naudotinų garso įskiepių"
 
-#: ../src/gui/main.cpp:4526
+#: ../src/gui/main.cpp:4555
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
@@ -2825,11 +2880,11 @@
 "Ekiga nerado jokių naudotinų garso įskiepių. Įsitikinkite, kad Ekiga įdiegta "
 "tvarkingai."
 
-#: ../src/gui/main.cpp:4529
+#: ../src/gui/main.cpp:4558
 msgid "No usable audio codecs detected"
 msgstr "Nerasta naudotinų garso kodekų"
 
-#: ../src/gui/main.cpp:4530
+#: ../src/gui/main.cpp:4559
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
@@ -2902,8 +2957,8 @@
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you do not answer the call"
 msgstr ""
-"Jeigu įjungta, visi priimami skambučiai bus persiųsti į kompiuterį, "
-"nurodytą protokolo parametruose, jeigu neatsakysite į skambutį"
+"Jeigu įjungta, visi priimami skambučiai bus persiųsti į kompiuterį, nurodytą "
+"protokolo parametruose, jeigu neatsakysite į skambutį"
 
 #: ../src/gui/preferences.cpp:509
 msgid "Forward calls to the given host if _busy"
@@ -2915,9 +2970,9 @@
 "specified in the protocol settings if you already are in a call or if you "
 "are in Do Not Disturb mode"
 msgstr ""
-"Jeigu įjungta, visi gaunami skambučiai bus persiųsti į protokolo nustatymuose,"
-" nurodytą kompiuterį, jei jau esate prisiskambinę arba įjungę veikseną "
-"„Netrukdyti“."
+"Jeigu įjungta, visi gaunami skambučiai bus persiųsti į protokolo "
+"nustatymuose, nurodytą kompiuterį, jei jau esate prisiskambinę arba įjungę "
+"veikseną „Netrukdyti“."
 
 #: ../src/gui/preferences.cpp:513 ../src/gui/preferences.cpp:1361
 msgid "Call Options"
@@ -2999,9 +3054,9 @@
 "versions of Netmeeting."
 msgstr ""
 "Bus prisijungiama Greito Starto veiksenoje. Greitas Startas – tai naujas "
-"būdas greičiau pradėti skambučius, pasirodęs H.323v2. Jo nepalaiko Netmeeting"
-", o Greito Starto ir H.245 tunelių naudojimas vienu metu gali sutrikdyti "
-"kai kurių NetMeeting versijų darbą."
+"būdas greičiau pradėti skambučius, pasirodęs H.323v2. Jo nepalaiko "
+"Netmeeting, o Greito Starto ir H.245 tunelių naudojimas vienu metu gali "
+"sutrikdyti kai kurių NetMeeting versijų darbą."
 
 #: ../src/gui/preferences.cpp:698 ../src/gui/preferences.cpp:738
 msgid "DTMF Mode"
@@ -3128,22 +3183,23 @@
 "dropped frames in order not to surpass the bitrate limit) or if you prefer "
 "to keep the frame rate."
 msgstr ""
+"Pasirinkite, ar norite užtikrinti bent minimalią vaizdo kokybę (galbūt "
+"praleidžiamų kadrų, siekiant neviršyti srauto dydžio, sąskaita), ar norite "
+"palaikyti pastovų kadrų skaičių."
 
 #: ../src/gui/preferences.cpp:1020
 msgid "Maximum video _bitrate (in kbits/s):"
-msgstr "Maksimalus vaizdo _bitų dažnis (kB/s):"
+msgstr "Maksimalus vaizdo _bitų dažnis (kb/s):"
 
 #: ../src/gui/preferences.cpp:1020
-#, fuzzy
 msgid ""
 "The maximum video bitrate in kbits/s. The video quality and the effective "
 "frame rate will be dynamically adjusted to keep the bitrate at the given "
 "value."
 msgstr ""
-"Leistinas vaizdo srauto dydis kilobaitais per sekundę. Vaizdo kokybė ir "
-"perduodamų kadrų per sekundę skaičius bus automatiškai koreguojamas virš "
-"minimalios vertės pokalbių metu siekiant sumažinti naudojamą srautą iki "
-"nurodytos vertės."
+"Leistinas vaizdo srauto dydis (kb/s). Vaizdo kokybė ir perduodamų kadrų per "
+"sekundę skaičius bus automatiškai koreguojami pokalbių metu, siekiant "
+"palaikyti naudojamą srautą."
 
 #: ../src/gui/preferences.cpp:1333
 msgid "Ekiga Preferences"
@@ -3189,7 +3245,7 @@
 msgid "Video"
 msgstr "Vaizdas"
 
-#: ../src/gui/statusicon.cpp:305
+#: ../src/gui/statusicon.cpp:306
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
diff -Nru ekiga-3.2.5/po/ml.po ekiga-3.2.6~ppa~karmic1/po/ml.po
--- ekiga-3.2.5/po/ml.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/ml.po	2009-09-22 15:27:35.000000000 +0100
@@ -1,3 +1,4 @@
+# translation of ekiga.gnome-2-26.ml.po to
 # translation of ekiga.HEAD.ml.po to
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -7,10 +8,10 @@
 #: ../lib/engine/components/resource-list/rl-entry.cpp:163
 msgid ""
 msgstr ""
-"Project-Id-Version: ekiga.HEAD.ml\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=accerciser&component=general\n"
-"POT-Creation-Date: 2009-01-28 12:31+0000\n"
-"PO-Revision-Date: 2009-03-15 21:23+0530\n"
+"Project-Id-Version: ekiga.gnome-2-26.ml\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga&component=general\n"
+"POT-Creation-Date: 2009-04-16 20:21+0000\n"
+"PO-Revision-Date: 2009-09-16 00:28+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -42,6 +43,9 @@
 "hardware support is not available. If this is set to false, Ekiga will not "
 "try to open the PIP if hardware support is not available."
 msgstr ""
+"Allow Ekiga to fall back to software scaling the picture-in-picture if "
+"hardware support is not available. false അല്ലെങ്കില്‍, ഹാര്‍ഡ്‌വെയര്‍ പിന്തുണ "
+"ലഭ്യമാകാത്തപ്പോള്‍, എകീഗാ PIP തുറക്കുവാന്‍ ശ്രമിക്കുകയില്ല."
 
 #: ../ekiga.schemas.in.in.h:3
 msgid "Allow picture-in-picture software scaling"
@@ -68,6 +72,8 @@
 "Automatically reject or forward incoming calls if no answer is given after "
 "the specified amount of time (in seconds)"
 msgstr ""
+"പറഞ്ഞിരിക്കുന്ന സമയത്തിനുള്ളില്‍ (സെക്കന്‍ഡുകള്‍) കോള്‍ എടുത്തില്ലെങ്കില്‍, സ്വയമായി "
+"ഇന്‍കമിങ് കോളുകള്‍ നിരസിക്കുന്നതിനോ ഫോര്‍വേഡ് ചെയ്യുക"
 
 #: ../ekiga.schemas.in.in.h:9
 msgid "Calls history"
@@ -84,14 +90,16 @@
 "Netmeeting and using both Fast Start and H.245 Tunneling can crash some "
 "versions of Netmeeting"
 msgstr ""
+"ഫാസ്റ്റ് സ്റ്റാര്‍ട്ട് മോഡില്‍ കണക്ഷന്‍ സ്ഥാപിക്കപ്പെടുന്നു. കോളുകള്‍ പെട്ടെന്നാരംഭിക്കുന്നതിനുള്ള "
+"ഒരു പുതിയാ മാര്‍ഗ്ഗമാണു് ഫാസ്റ്റ് സ്റ്റാര്‍ട്ട് വേ. H.323v2-ലാണു് ഇതു് ലഭ്യമാകുവാന്‍ തുടങ്ങിയതു്. "
+"നെറ്റ്മീറ്റിങ് ഇതു് പിന്തുണയ്ക്കുന്നില്ല. ഫാസ്റ്റ് സ്റ്റാര്‍ട്ടും H.245 ടണലിങും ഉപയോഗിക്കുന്നതു് "
+"നെറ്റ്മീറ്റിങ് പതിപ്പുകളുടെ തകര്‍ച്ചയ്ക്കു് കാരണമാകുന്നു."
 
 #: ../ekiga.schemas.in.in.h:12
-#| msgid "Contact status"
 msgid "Contact long status"
 msgstr "വിലാസത്തിന്റെ അവസ്ഥ"
 
 #: ../ekiga.schemas.in.in.h:13
-#| msgid "Contact status"
 msgid "Contact short status"
 msgstr "വിലാസത്തിന്റെ ചെറിയ അവസ്ഥ"
 
@@ -100,7 +108,6 @@
 msgstr "DTMF അയയ്ക്കുന്നു"
 
 #: ../ekiga.schemas.in.in.h:15
-#| msgid "Enable silence detection"
 msgid "Disable STUN network detection"
 msgstr "STUN നെറ്റ്‌വര്‍ക്ക് തിരിച്ചറിയുന്നത് പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
@@ -141,9 +148,10 @@
 "Enter the number of seconds after which Ekiga should try refreshing the NAT "
 "binding when STUN is being used"
 msgstr ""
+"STUN ഉപയോഗിക്കുമ്പോള്‍ NAT ബൈന്‍ഡിങ് എകീഗാ എപ്പോള്‍ പുതുക്കണമെന്നു് "
+"സെക്കന്‍ഡുകളില്‍ നല്‍കുക"
 
 #: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
-#| msgid "Enter your last name"
 msgid "Enter your full name"
 msgstr "നിങ്ങളുടെ പൂര്‍ണ്ണ പേര് നല്‍കുക"
 
@@ -164,7 +172,6 @@
 msgstr "ഫ്റെയിം റേറ്റ്"
 
 #: ../ekiga.schemas.in.in.h:30
-#| msgid "Full Name"
 msgid "Full name"
 msgstr "പൂര്‍ണ്ണപേരു്"
 
@@ -173,12 +180,16 @@
 "If enabled, Ekiga will start hidden provided that the notification area is "
 "present in the GNOME panel"
 msgstr ""
+"പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, ഗ്നോം പാനലില്‍ അറിയിപ്പിനുള്ള സ്ഥലം ലഭ്യമെങ്കില്‍ "
+"എകീഗാ അദൃശ്യമാകുവാന്‍ തുടങ്ങുന്നു."
 
 #: ../ekiga.schemas.in.in.h:32
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below"
 msgstr ""
+"പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, ഫീള്‍ഡില്‍ പറഞ്ഞിരിക്കുന്ന ഹോസ്റ്റിലേക്ക് എല്ലാ കോളുകളും "
+"ഫോര്‍വേഡ് ചെയ്യുന്നു."
 
 #: ../ekiga.schemas.in.in.h:33
 msgid ""
@@ -186,12 +197,17 @@
 "specified in the field below if you already are in a call or if you are in "
 "Do Not Disturb mode"
 msgstr ""
+"പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, നിങ്ങള്‍ മറ്റൊരു കോളിലാണു് അല്ലെങ്കില്‍ ശല്യപ്പെടുത്തരുതു് "
+"എന്ന മോഡിലാണെങ്കില്‍, ഫീള്‍ഡില്‍ പറഞ്ഞിരിക്കുന്ന ഹോസ്റ്റിലേക്ക് എല്ലാ കോളുകളും "
+"ഫോര്‍വേഡ് ചെയ്യുന്നു."
 
 #: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you do not answer the call"
 msgstr ""
+"പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, നിങ്ങള്‍ കോള്‍ എടുത്തില്ലെങ്കില്‍, ഫീള്‍ഡില്‍ പറഞ്ഞിരിക്കുന്ന "
+"ഹോസ്റ്റിലേക്ക് എല്ലാ കോളുകളും ഫോര്‍വേഡ് ചെയ്യുന്നു."
 
 #: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
 msgid "If enabled, offline contacts will be shown in the roster"
@@ -203,7 +219,7 @@
 
 #: ../ekiga.schemas.in.in.h:37
 msgid "If enabled, use silence detection with the codecs supporting it"
-msgstr ""
+msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, പിന്തുണയ്ക്കുന്ന കോഡക്കുകള്‍ക്കൊപ്പം സൈലന്‍സ് ഡിറ്റക്ഷന്‍ ഉപയോഗിക്കുക"
 
 #: ../ekiga.schemas.in.in.h:38
 msgid "Kind of network selected in the druid"
@@ -247,7 +263,7 @@
 
 #: ../ekiga.schemas.in.in.h:48
 msgid "No answer timeout"
-msgstr ""
+msgstr "കോളെടുക്കുന്നതിനുള്ള സമയപരിധി ലഭ്യമല്ല"
 
 #: ../ekiga.schemas.in.in.h:49
 msgid "Outbound Proxy"
@@ -255,7 +271,7 @@
 
 #: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video above other windows during calls"
-msgstr ""
+msgstr "കോളുകള്‍ക്കിടയില്‍ മറ്റു് ജാലകങ്ങളില്‍ വീഡിയോ പ്രദര്‍ശിപ്പിക്കുന്ന ജാലകങ്ങള്‍ സ്ഥാപിക്കുക"
 
 #: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
 msgid "Play busy tone"
@@ -323,7 +339,7 @@
 
 #: ../ekiga.schemas.in.in.h:67
 msgid "Select an alternative audio output device to use for sound events."
-msgstr ""
+msgstr "ശബ്ദ ഇവന്റുകള്‍ക്കായി മറ്റൊരു ഓഡിയോ ഔട്ട്പുട്ട് ഉപകരണം തെരഞ്ഞെടുക്കുക."
 
 #: ../ekiga.schemas.in.in.h:68 ../src/gui/preferences.cpp:777
 msgid "Select the audio input device to use"
@@ -354,7 +370,6 @@
 "ഉണ്ടാകുന്നു എങ്കില്‍, പരീക്ഷിക്കുന്നതിനായി ഒരു പടം അയയ്ക്കുന്നതാണ്."
 
 #: ../ekiga.schemas.in.in.h:73
-#| msgid "Find contacts"
 msgid "Show offline contacts"
 msgstr "ഓഫ്‌ലൈന്‍ വിലാസങ്ങള്‍ കാണിക്കുക"
 
@@ -410,7 +425,7 @@
 
 #: ../ekiga.schemas.in.in.h:85
 msgid "Temporal Spatial Trade Off"
-msgstr ""
+msgstr "ടെംബറല്‍ സ്പേഷ്യല്‍ ട്രേഡ് ഓഫ്"
 
 #: ../ekiga.schemas.in.in.h:86
 msgid "The Audio Codecs List"
@@ -429,8 +444,8 @@
 "The STUN server to use for STUN Support. STUN is a technology that permits "
 "passage through some types of NAT gateway"
 msgstr ""
-"STUN പിന്തുണയ്ക്കുള്ള STUN സര്‍വര്‍. NAT ഗേറ്റ്‌വെയുടെ ചില തരങ്ങളിലൂടെ "
-"യാത്ര അനുവദിക്കുന്ന ഒരു സംവിധാനമാണു് STUN."
+"STUN പിന്തുണയ്ക്കുള്ള STUN സര്‍വര്‍. NAT ഗേറ്റ്‌വെയുടെ ചില തരങ്ങളിലൂടെ യാത്ര അനുവദിക്കുന്ന ഒരു "
+"സംവിധാനമാണു് STUN."
 
 #: ../ekiga.schemas.in.in.h:90
 msgid "The Video Codecs List"
@@ -441,7 +456,6 @@
 msgstr "അക്കൌണ്ടുകളുടെ പട്ടിക"
 
 #: ../ekiga.schemas.in.in.h:92
-#| msgid "The Audio Codecs List"
 msgid "The audio codecs list"
 msgstr "ഓഡിയോ കോഡകിന്റെ പട്ടിക"
 
@@ -454,6 +468,8 @@
 "The chosen sound will be played at the end of calls or calling somebody who "
 "is busy, if enabled"
 msgstr ""
+"കോളുകളുടെ ഒടുവില്‍ അല്ലെങ്കില്‍ തിരക്കിലുള്ള ആരെയെങ്കിലും വിളിക്കുമ്പോള്‍, പ്രവര്‍ത്തന "
+"സജ്ജമെങ്കില്‍, തെരഞ്ഞെടുത്ത ശബ്ദം കേള്‍ക്കുന്നു."
 
 #: ../ekiga.schemas.in.in.h:95
 msgid "The chosen sound will be played on incoming calls, if enabled"
@@ -496,7 +512,7 @@
 #: ../ekiga.schemas.in.in.h:103 ../src/gui/preferences.cpp:676
 #: ../src/gui/preferences.cpp:730
 msgid "The host where calls should be forwarded if call forwarding is enabled"
-msgstr ""
+msgstr "കോള്‍ ഫോര്‍വേഡിങ് പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, കോളുകള്‍ ഫോര്‍വേഡ് ചെയ്യേണ്ട ഹോസ്റ്റ്"
 
 #: ../ekiga.schemas.in.in.h:104
 msgid "The incoming call sound"
@@ -507,7 +523,6 @@
 msgstr "എകിഗാ രജിസ്ടറ്‍ ചെയ്യേണ്ട അക്കൌണ്ടുകളുടെ പട്ടിക"
 
 #: ../ekiga.schemas.in.in.h:106
-#| msgid "Personal Information"
 msgid "The long status information"
 msgstr "സ്വകാര്യം വിവരങ്ങള്‍"
 
@@ -517,6 +532,9 @@
 "peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
 "above the signaled value"
 msgstr ""
+"ഏറ്റവും കൂടിയ RX വീഡിയോ ബിറ്റ്റേറ്റ് kbits/s-ല്‍. This value will be signaled to the "
+"peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
+"above the signaled value"
 
 #: ../ekiga.schemas.in.in.h:108
 msgid ""
@@ -525,10 +543,14 @@
 "dynamically adjusted above their minimum during calls to try to minimize the "
 "bandwidth to the given value"
 msgstr ""
+"ഏറ്റവും കൂടിയ TX വീഡിയോ ബിറ്റ്റേറ്റ് kbits/s-ല്‍. TThe video quality and the number of "
+"transmitted frames per second (depends on selected codec) will be "
+"dynamically adjusted above their minimum during calls to try to minimize the "
+"bandwidth to the given value"
 
 #: ../ekiga.schemas.in.in.h:109
 msgid "The maximum jitter buffer size for audio reception (in ms)"
-msgstr ""
+msgstr "ഓഡിയോ റിസപ്ഷനുള്ള ഏറ്റവും കൂടിയ ജിറ്റര്‍ ബഫര്‍ വ്യാപ്തി (ms-ല്‍)"
 
 #: ../ekiga.schemas.in.in.h:110
 msgid ""
@@ -536,6 +558,9 @@
 "in case a minimum quality was configure via a TSTO value smaller than 31 and "
 "the bitrate selected is not sufficient to support this minimum quality"
 msgstr ""
+"The maximum transmitted frame rate in frames/s. This rate may not be reached "
+"in case a minimum quality was configure via a TSTO value smaller than 31 and "
+"the bitrate selected is not sufficient to support this minimum quality"
 
 #: ../ekiga.schemas.in.in.h:111
 msgid "The new instant message sound"
@@ -575,13 +600,15 @@
 "port range has no effect if both participants to the conference are using "
 "H.245 Tunneling."
 msgstr ""
+"The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
+"port range has no effect if both participants to the conference are using "
+"H.245 Tunneling."
 
 #: ../ekiga.schemas.in.in.h:118
 msgid "The range of UDP ports that Ekiga will use."
 msgstr "Ekiga ഉപയോഗിക്കുന്ന UDP പോര്‍ട്ടുകളുടെ പരിധി."
 
 #: ../ekiga.schemas.in.in.h:119
-#| msgid "View the call information"
 msgid "The short status information"
 msgstr "ചെറിയ അവസ്ഥ വിവരങ്ങള്‍"
 
@@ -622,7 +649,6 @@
 msgstr "ഉപയോഗിക്കണ്ട വീഡിയോ ചാനലിന്റെ നംബറ്‍(ക്യമാറ, ടിവി, മറ്റുള്ളവ തിരഞ്ഞെടുക്കേണ്ടതിന്)"
 
 #: ../ekiga.schemas.in.in.h:128
-#| msgid "The Video Codecs List"
 msgid "The video codecs list"
 msgstr "വീഡിയോ കോഡകിന്റെ പട്ടിക"
 
@@ -645,6 +671,8 @@
 "The zoom value in percent to apply to images displayed in the main GUI (can "
 "be 50, 100, or 200)"
 msgstr ""
+"The zoom value in percent to apply to images displayed in the main GUI (can "
+"be 50, 100, or 200)"
 
 #: ../ekiga.schemas.in.in.h:133
 msgid ""
@@ -660,10 +688,9 @@
 "\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
 "\"). Choosing other values than \"String\" disables the Text Chat"
 msgstr ""
-"DTMF അയയ്ക്കുന്നതിനുള്ള മോഡ് സജ്ജമാക്കുന്നതിനായി ഇതു് അനുവദിക്കുന്നു. "
-"സാധ്യമായ മൂല്ല്യങ്ങള്‍: \"String\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" "
-"(3) (default is \"String\"). \"String\" അല്ലാതെ ഏതു് തെരഞ്ഞെടുത്താലും ടെക്സ്റ്റ് "
-"ചാറ്റ് പ്രവര്‍ത്തന രഹിതമാകുന്നു."
+"DTMF അയയ്ക്കുന്നതിനുള്ള മോഡ് സജ്ജമാക്കുന്നതിനായി ഇതു് അനുവദിക്കുന്നു. സാധ്യമായ മൂല്ല്യങ്ങള്‍: \"String"
+"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
+"\"). \"String\" അല്ലാതെ ഏതു് തെരഞ്ഞെടുത്താലും ടെക്സ്റ്റ് ചാറ്റ് പ്രവര്‍ത്തന രഹിതമാകുന്നു."
 
 #: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
 msgid ""
@@ -673,6 +700,11 @@
 "Netmeeting does not support it. Using both Fast Start and H.245 Tunneling "
 "can crash some versions of Netmeeting."
 msgstr ""
+"This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
+"are encapsulated into the H.225 channel (port 1720). This saves one TCP "
+"connection during calls. H.245 Tunneling was introduced in H.323v2 and "
+"Netmeeting does not support it. Using both Fast Start and H.245 Tunneling "
+"can crash some versions of Netmeeting."
 
 #: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:690
 msgid "This enables H.245 early in the setup"
@@ -683,8 +715,8 @@
 "This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
 "acceleration"
 msgstr ""
-"DirectX (win32-ല്‍), XVideo (Linux-ല്‍) എന്നീ വീഡിയോ ഹാര്‍ഡ്‍‌വെയര്‍ ആക്സിലറേഷന്‍ "
-"ഈ കീ പ്രവര്‍ത്തന രഹിതമാക്കുന്നു"
+"DirectX (win32-ല്‍), XVideo (Linux-ല്‍) എന്നീ വീഡിയോ ഹാര്‍ഡ്‍‌വെയര്‍ ആക്സിലറേഷന്‍ ഈ കീ "
+"പ്രവര്‍ത്തന രഹിതമാക്കുന്നു"
 
 #: ../ekiga.schemas.in.in.h:138
 msgid "UDP port range"
@@ -698,7 +730,7 @@
 msgid "Video format"
 msgstr "വീഡിയോ രീതി"
 
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1153
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1158
 msgid "Video input device"
 msgstr "വീഡിയോ ഇന്‍പുട്ട് ഡിവൈസ്"
 
@@ -716,6 +748,9 @@
 "order to keep a minimum level of (spatial) quality for all frames. 0: "
 "Highest minimal quality, 31: lowest minimal quality"
 msgstr ""
+"Whether to prefer to sustain the max. frame rate or lower it possibly in "
+"order to keep a minimum level of (spatial) quality for all frames. 0: "
+"Highest minimal quality, 31: lowest minimal quality"
 
 #: ../lib/engine/addressbook/contact-core.cpp:58
 msgid "_Find"
@@ -736,7 +771,6 @@
 msgstr "ലഭ്യമായ"
 
 #: ../lib/engine/components/call-history/history-contact.cpp:156
-#| msgid "Blocked"
 msgid "Placed"
 msgstr "സ്ഥാപിച്ചിരിക്കുന്ന"
 
@@ -747,7 +781,6 @@
 #: ../lib/engine/components/evolution/evolution-book.cpp:76
 #: ../lib/engine/components/ldap/ldap-book.cpp:909
 #, c-format
-#| msgid "User not found"
 msgid "%d user found"
 msgid_plural "%d users found"
 msgstr[0] "%d ഉപയോക്താവു് ലഭ്യമായിരിക്കുന്നു"
@@ -831,18 +864,15 @@
 msgstr "നാമം:"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:395
-#| msgid "New contact"
 msgid "Remove contact"
 msgstr "വിലാസം നീക്കം ചെയ്യുക"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:397
 #, c-format
-#| msgid "Are you sure you want to delete account %s?"
 msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr "നിങ്ങള്‍ക്ക് വിലാസപുസ്തകത്തില്‍ നിന്നും %s എന്ന അക്കൌണ്ട് നീക്കം ചെയ്യണമോ?"
 
 #: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
-#| msgid "Audio Codecs"
 msgid "Audio test"
 msgstr "ഓഡിയോ പരീക്ഷ"
 
@@ -851,7 +881,6 @@
 msgstr "നിശബ്ദം"
 
 #: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
-#| msgid "Video Codecs"
 msgid "Video test"
 msgstr "വീഡിയോ പരീക്ഷ"
 
@@ -872,12 +901,10 @@
 msgstr "പുതുക്കുക (_R)"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:412
-#| msgid "Size of the address book window"
 msgid "_Remove addressbook"
 msgstr "വിലാസ പുസ്തകത്തം _നീക്കം ചെയ്യുക"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:414
-#| msgid "Address Books"
 msgid "Addressbook _properties"
 msgstr "വിലാസ പുസ്തകത്തിന്റെ _വിശേഷതകള്‍"
 
@@ -895,22 +922,18 @@
 #. * authentication" if you'd like more background context.
 #.
 #: ../lib/engine/components/ldap/ldap-book.cpp:587
-#| msgid "Calling %s"
 msgid "Challenge: "
 msgstr "വെല്ലുവിളി: "
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:595
-#| msgid "Contacts"
 msgid "Interact"
 msgstr "ബന്ധപ്പെടുക"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:664
-#| msgid "_Refresh"
 msgid "Refreshing"
 msgstr "പുതുക്കുന്നു"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:670
-#| msgid "Could not contact server"
 msgid "Could not initialize server"
 msgstr "സര്‍വര്‍ ആരംഭിക്കുവാന്‍ സാധ്യമായില്ല"
 
@@ -920,20 +943,17 @@
 msgstr "LDAP പിശക്: "
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:738
-#| msgid "Could not contact server"
 msgid "Contacted server"
 msgstr "ബന്ധപ്പെട്ട സര്‍വര്‍"
 
 #. patience == 0
 #: ../lib/engine/components/ldap/ldap-book.cpp:781
-#| msgid "Could not contact server"
 msgid "Could not connect to server"
 msgstr "സര്‍വറുമായി ബന്ധപ്പെടുവാന്‍ സാധ്യമായില്ല"
 
 #. patience == 0
 #: ../lib/engine/components/ldap/ldap-book.cpp:829
 #: ../lib/engine/components/ldap/ldap-book.cpp:882
-#| msgid "Could not search on"
 msgid "Could not search"
 msgstr "തെരയുവാന്‍ സാധ്യമായില്ല"
 
@@ -946,7 +966,6 @@
 msgstr "താഴെ പറയുന്നവയില്‍ മാറ്റം വരുത്തുക"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:933
-#| msgid "_Name:"
 msgid "Book _Name"
 msgstr "പുസ്തകത്തിന്റെ _പേര്"
 
@@ -955,7 +974,6 @@
 msgstr "സര്‍വര്‍ _URI"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:935
-#| msgid "_Base DN:"
 msgid "_Base DN"
 msgstr "_ബേയിസ് DN"
 
@@ -964,12 +982,10 @@
 msgstr "സബ്ട്റീ"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:942
-#| msgid "Single _Level"
 msgid "Single Level"
 msgstr "സിംഗിള്‍ ലവല്‍ "
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:943
-#| msgid "_Search Filter:"
 msgid "_Search Scope"
 msgstr "ഫില്‍‌റ്റര്‍ _തെരയുക"
 
@@ -978,7 +994,6 @@
 msgstr "_DisplayName വിശേഷത"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:953
-#| msgid "Call _Attribute:"
 msgid "Call _Attributes"
 msgstr "_ആട്രിബ്യൂട്ടുകള്‍ ലഭ്യമാക്കുക "
 
@@ -992,7 +1007,6 @@
 msgstr "Bind _ID"
 
 #: ../lib/engine/components/ldap/ldap-book.cpp:960
-#| msgid "_Password:"
 msgid "_Password"
 msgstr "_പാസ്‌വേര്‍ഡ്"
 
@@ -1033,7 +1047,6 @@
 msgstr "തെറ്റായ സര്‍വര്‍ URI\n"
 
 #: ../lib/engine/components/ldap/ldap-source.cpp:127
-#| msgid "Add an LDAP addressbook"
 msgid "Add an LDAP Address Book"
 msgstr "LDAP- നുള്ള ഒരു വിലാസം പുസ്തകം ചേര്‍ക്കുക"
 
@@ -1046,7 +1059,6 @@
 msgstr "LDAP ഡയറക്ടറി ഉണ്ടാക്കുക"
 
 #: ../lib/engine/components/ldap/ldap-source.cpp:167
-#| msgid "Edit LDAP directory"
 msgid "Ekiga.net Directory"
 msgstr "Ekiga.net ഡയറക്ടറി"
 
@@ -1059,8 +1071,8 @@
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
 msgstr ""
-"ekiga-യിലുള്ള ആന്തരിക റൂസ്റ്ററില്‍ നിലവിലുള്ള ഒരു എലമെന്റ് മാറ്റുന്നതിനായി ദയവായി ഈ "
-"ഫോറം പൂരിപ്പിക്കുക."
+"ekiga-യിലുള്ള ആന്തരിക റൂസ്റ്ററില്‍ നിലവിലുള്ള ഒരു എലമെന്റ് മാറ്റുന്നതിനായി ദയവായി ഈ ഫോറം "
+"പൂരിപ്പിക്കുക."
 
 #: ../lib/engine/components/local-roster/local-presentity.cpp:225
 #: ../lib/engine/components/local-roster/local-heap.cpp:193
@@ -1083,7 +1095,6 @@
 msgstr "ലോക്കല്‍ റൂസ്റ്റലിക്ക് ചേറ്‍ക്കുക"
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:92
-#| msgid "Devices"
 msgid "Services"
 msgstr "ഉപകരണങ്ങള്‍"
 
@@ -1108,7 +1119,6 @@
 msgstr "കുടുംബം"
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:161
-#| msgid "_Find"
 msgid "Friend"
 msgstr "കൂട്ടുകാരന്‍"
 
@@ -1131,8 +1141,8 @@
 #: ../lib/engine/components/local-roster/local-heap.cpp:182
 msgid "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr ""
-"ekiga-യിലുള്ള ആന്തരിക റൂസ്റ്ററില്‍ പുതിയ ഒരു വിലാസം ചേര്‍ക്കുന്നതിനായി ദയവായി ഈ "
-"ഫോറം പൂരിപ്പിക്കുക."
+"ekiga-യിലുള്ള ആന്തരിക റൂസ്റ്ററില്‍ പുതിയ ഒരു വിലാസം ചേര്‍ക്കുന്നതിനായി ദയവായി ഈ ഫോറം "
+"പൂരിപ്പിക്കുക."
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:199
 msgid "Put contact in groups:"
@@ -1151,7 +1161,6 @@
 msgstr "ഗ്റൂപ്പിന്റെ പേര് മാറ്റുക"
 
 #: ../lib/engine/components/local-roster/local-heap.cpp:363
-#| msgid "Please enter your username:"
 msgid "Please edit this group name"
 msgstr "ഈ ഗ്രൂപ്പിന്റെ പേരു് ദയവായി ചിട്ടപ്പെടുത്തുക"
 
@@ -1178,7 +1187,6 @@
 
 #: ../lib/engine/components/opal/h323-endpoint.cpp:316
 #: ../lib/engine/components/opal/sip-endpoint.cpp:896
-#| msgid "Transfer"
 msgid "Transport error"
 msgstr "മറ്റൊരിടത്തേക്ക് നീക്കുന്നതില്‍ പിശക്"
 
@@ -1189,7 +1197,6 @@
 msgstr "പരാജയപ്പെട്ടു"
 
 #: ../lib/engine/components/opal/opal-account.cpp:300
-#| msgid "_Invisible"
 msgid "_Disable"
 msgstr "_പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
@@ -1198,23 +1205,21 @@
 msgstr "_സജ്ജമാക്കുക"
 
 #: ../lib/engine/components/opal/opal-account.cpp:324
-#: ../src/gui/assistant.cpp:725
+#: ../src/gui/assistant.cpp:730
 msgid "Recharge the account"
 msgstr "അക്കൌണ്ട് വീണ്ടും പുതുക്കുക"
 
 #: ../lib/engine/components/opal/opal-account.cpp:329
-#: ../src/gui/assistant.cpp:737
+#: ../src/gui/assistant.cpp:742
 msgid "Consult the balance history"
 msgstr "ബാക്കിയുള്ള വിവരണങ്ങള്‍ പരിശോധിക്കുക"
 
 #: ../lib/engine/components/opal/opal-account.cpp:334
-#| msgid "Consult the calls history"
 msgid "Consult the call history"
 msgstr "മുമ്പുള്ള കോളുകളുടെ വിവരണം പരിശോധിക്കുക"
 
 #: ../lib/engine/components/opal/opal-account.cpp:349
 #: ../lib/engine/components/opal/opal-bank.cpp:72
-#| msgid "Edit your accounts"
 msgid "Edit account"
 msgstr "അക്കൌണ്ടു് ചിട്ടപ്പെടുത്തുക"
 
@@ -1241,7 +1246,6 @@
 #. * for the authentication procedure ("Authentication User")
 #: ../lib/engine/components/opal/opal-account.cpp:363
 #: ../lib/engine/components/opal/opal-bank.cpp:112
-#| msgid "Authentication Login:"
 msgid "Authentication User:"
 msgstr "ആധികാരികത ഉറപ്പാക്കുന്ന ഉപയോക്താവു്:"
 
@@ -1256,13 +1260,11 @@
 #: ../lib/engine/components/opal/opal-account.cpp:365
 #: ../lib/engine/components/opal/opal-bank.cpp:104
 #: ../lib/engine/components/opal/opal-bank.cpp:114
-#| msgid "Timeout"
 msgid "Timeout:"
 msgstr "സമയം കഴിഞ്ഞിരിക്കുന്നു:"
 
 #: ../lib/engine/components/opal/opal-account.cpp:366
 #: ../lib/engine/components/opal/opal-bank.cpp:117
-#| msgid "Accounts"
 msgid "Enable Account"
 msgstr "അക്കൌണ്ട് സജ്ജമാക്കുക"
 
@@ -1287,7 +1289,6 @@
 msgstr "സമയപരിധി വലിയ മൂല്ല്യമായിരിക്കണം."
 
 #: ../lib/engine/components/opal/opal-bank.cpp:53
-#| msgid "Get an ekiga.net SIP account"
 msgid "_Add an Ekiga.net Account"
 msgstr "ഒരു Ekiga.net അക്കൌണ്ട് _ചേര്‍ക്കുക"
 
@@ -1304,23 +1305,19 @@
 msgstr "ഒരു H.323 അക്കൌണ്ട് _ചേര്‍ക്കുക"
 
 #: ../lib/engine/components/opal/opal-bank.cpp:73
-#| msgid "Please update the following fields:"
 msgid "Please update the following fields."
 msgstr "താഴെ പറയുന്നവ പുതിയ വിവരങ്ങള്‍ നല്‍കുക:"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:605
-#| msgid "Get an ekiga.net SIP account"
+#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:610
 msgid "Get an Ekiga.net SIP account"
 msgstr "ekiga.net SIP-നുള്ള അക്കൌണ്ട് ലഭ്യമാക്കുക"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:713
-#| msgid "Get an Ekiga PC-To-Phone account"
+#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:718
 msgid "Get an Ekiga Call Out account"
 msgstr "Ekiga കോള്‍ ഔട്ട് അക്കൌണ്ട് ലഭ്യമാക്കുക"
 
 #: ../lib/engine/components/opal/opal-bank.cpp:92 ../src/gui/main.cpp:2701
 #: ../src/gui/main.cpp:2796
-#| msgid "Account Name:"
 msgid "Account ID:"
 msgstr "അക്കൌണ്ടിലെ ID:"
 
@@ -1399,7 +1396,6 @@
 msgstr "റിമോട്ട് ഹോസ്റ്റ് ഓഫ്ലൈന്‍ ആണ്"
 
 #: ../lib/engine/components/opal/opal-call.cpp:504
-#| msgid "Local user is not available at this time"
 msgid "User is not available"
 msgstr "ഉപയോക്താവു് ലഭ്യമല്ല"
 
@@ -1407,7 +1403,7 @@
 msgid "Call completed"
 msgstr "കോള്‍ പൂറ്‍ത്തിയാക്കിയിരിക്കുന്നു"
 
-#: ../lib/engine/components/opal/opal-call-manager.cpp:725
+#: ../lib/engine/components/opal/opal-call-manager.cpp:727
 msgid ""
 "Ekiga did not manage to configure your network settings automatically. You "
 "can still use it, but you need to configure your network settings manually.\n"
@@ -1415,10 +1411,14 @@
 "Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
 "for instructions"
 msgstr ""
+"Ekiga did not manage to configure your network settings automatically. You "
+"can still use it, but you need to configure your network settings manually.\n"
+"\n"
+"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"for instructions"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:282
 #: ../lib/engine/components/opal/sip-endpoint.cpp:284
-#| msgid "Send _Message"
 msgid "Message"
 msgstr "സന്ദേശം"
 
@@ -1431,7 +1431,6 @@
 msgstr "കാശടയ്ക്കേണ്ടതുണ്ട്"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:718
-#| msgid "Unsorted"
 msgid "Unauthorized"
 msgstr "അധികാരമില്ലാത്ത"
 
@@ -1452,7 +1451,6 @@
 msgstr "തല്‍ക്കാലത്തേക്ക് ലഭ്യമല്ല"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:738
-#| msgid "Not Acceptable"
 msgid "Not acceptable"
 msgstr "സ്വീകരിക്കാന്‍ സാധ്യമല്ല"
 
@@ -1473,17 +1471,14 @@
 msgstr "താല്‍ക്കാലികമായി നീക്കിയിരിക്കുന്നു"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:758
-#| msgid "User directory"
 msgid "Use proxy"
 msgstr "പ്രോക്സി ഉപയോഗിക്കുക"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:762
-#| msgid "Alternative Output Device"
 msgid "Alternative service"
 msgstr "മറ്റൊരു സേവനം"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:766
-#| msgid "User not found"
 msgid "Not found"
 msgstr "ലഭ്യമായില്ല"
 
@@ -1492,12 +1487,10 @@
 msgstr "മെഥേഡ് അനുവദിച്ചിട്ടില്ല"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:774
-#| msgid "Payment required"
 msgid "Proxy authentication required"
 msgstr "പ്രോക്സി ഉറപ്പാക്കല്‍ ആവശ്യമുണ്ടു്"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:778
-#| msgid "Payment required"
 msgid "Length required"
 msgstr "നീളം ആവശ്യമുണ്ടു്"
 
@@ -1523,7 +1516,6 @@
 msgstr "തെറ്റായ എക്സ്റ്റെന്‍ഷന്‍"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:803
-#| msgid "Payment required"
 msgid "Extension required"
 msgstr "എക്സ്റ്റെന്‍ഷന്‍ ആവശ്യമുണ്ടു്"
 
@@ -1532,7 +1524,6 @@
 msgstr "ഇടവേള ക്ഷണികം"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:811
-#| msgid "Group deleted."
 msgid "Loop detected"
 msgstr "ലൂപ്പ് ലഭ്യമാക്കിയിരിക്കുന്നു"
 
@@ -1557,17 +1548,14 @@
 msgstr "ആവശ്യം അവസാനിപ്പിച്ചിരിക്കുന്നു"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:835
-#| msgid "Not Acceptable"
 msgid "Not acceptable here"
 msgstr "ഇവിടെ സ്വീകരിക്കാന്‍ സാധ്യമല്ല"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:839
-#| msgid "Bad request"
 msgid "Bad event"
 msgstr "തെറ്റായ ഇവന്റ്"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:843
-#| msgid "Registering"
 msgid "Request pending"
 msgstr "ബാക്കിയുള്ള ആവശ്യം"
 
@@ -1584,17 +1572,14 @@
 msgstr "ലഭ്യമാക്കിയിട്ടില്ല"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:859
-#| msgid "Default _gateway:"
 msgid "Bad gateway"
 msgstr "തെറ്റായ ഗേറ്റ്‌വേ"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:863
-#| msgid "Temporarily unavailable"
 msgid "Service unavailable"
 msgstr "സേവനം ലഭ്യമല്ല"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:867
-#| msgid "Error: Timeout"
 msgid "Server timeout"
 msgstr "സര്‍വറിനുള്ള സമയം കഴിഞ്ഞിരിക്കുന്നു"
 
@@ -1611,7 +1596,6 @@
 msgstr "എല്ലാവരും തിരക്കില്‍"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:883
-#| msgid "Online"
 msgid "Decline"
 msgstr "അവസാനിപ്പിക്കുക"
 
@@ -1620,24 +1604,20 @@
 msgstr "ഇപ്പോള്‍ നിലവിലില്ല"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:891
-#| msgid "Not Acceptable"
 msgid "Globally not acceptable"
 msgstr "ഗ്ലോബലായി സ്വീകരിക്കാന്‍ സാധ്യമല്ല"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:1020
-#| msgid "Could not rename group!"
 msgid "Could not send message"
 msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമായില്ല"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:1134
 #, c-format
-#| msgid "Incoming call from"
 msgid "Incoming call from %s"
 msgstr "%s-ല്‍ നിന്നും വരുന്ന കോള്‍"
 
 #: ../lib/engine/components/opal/sip-endpoint.cpp:1136
 #, c-format
-#| msgid "Incoming call from"
 msgid "Incoming call"
 msgstr "വരുന്ന കോള്‍"
 
@@ -1661,14 +1641,15 @@
 
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:167
 msgid "Please fill in this form to add a new contact list to ekiga's remote roster"
-msgstr "ekiga-യിലുള്ള റിമോട്ട് റൂസ്റ്ററില്‍ പുതിയ ഒരു വിലാസം ചേര്‍ക്കുന്നതിനായി ദയവായി ഈ ഫോറം പൂരിപ്പിക്കുക."
+msgstr ""
+"ekiga-യിലുള്ള റിമോട്ട് റൂസ്റ്ററില്‍ പുതിയ ഒരു വിലാസം ചേര്‍ക്കുന്നതിനായി ദയവായി ഈ ഫോറം "
+"പൂരിപ്പിക്കുക."
 
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:171
 msgid "Writable:"
 msgstr "റൈറ്റബിള്‍:"
 
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:172
-#| msgid "User:"
 msgid "Username:"
 msgstr "ഉപയോക്താവ്:"
 
@@ -1677,37 +1658,30 @@
 #: ../lib/engine/components/resource-list/rl-heap.cpp:178
 #: ../lib/engine/components/resource-list/rl-presentity.cpp:133
 #: ../lib/engine/components/resource-list/rl-entry.cpp:130
-#| msgid "Rename"
 msgid "Unnamed"
 msgstr "പേരില്ലാത്ത"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:200
-#| msgid "New contact"
 msgid "_Add a new contact"
 msgstr "ഒരു പുതിയ വിലാസം _ചേര്‍ക്കുക"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:202
-#| msgid "View the contacts list"
 msgid "_Refresh contact list"
 msgstr "വിലാസങ്ങളുടെ പട്ടിക _പുതുക്കുക"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:204
-#| msgid "Contact status"
 msgid "Contact list _properties"
 msgstr "വിലാസങ്ങളുടെ പട്ടികയ്ക്കുള്ള _വിശേഷതകള്‍"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:467
-#| msgid "Put contact in groups:"
 msgid "Edit contact list properties"
 msgstr "വിലാസങ്ങളുടെ പട്ടികയ്ക്കുള്ള വിശേഷതകള്‍ ചിട്ടപ്പെടുത്തുക"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:469
-#| msgid "Please edit the following fields"
 msgid "Please edit the following fields (no identifier means global)"
 msgstr "താഴെ പറയുന്നവയില്‍ മാറ്റം വരുത്തുക (ഐഡന്റിഫയര്‍ ഇല്ലായെങ്കില്‍ ഗ്ലോബല്‍)"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:472
-#| msgid "Contact status"
 msgid "Contact list's name"
 msgstr "വിലാസത്തിന്റെ പേരു്"
 
@@ -1725,7 +1699,6 @@
 msgstr "റൈറ്റബിള്‍"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:477
-#| msgid "Enter your surname"
 msgid "Server username"
 msgstr "സര്‍വര്‍ ഉപയോക്തൃനാമം"
 
@@ -1734,7 +1707,6 @@
 msgstr "സര്‍വര്‍ പാസ്‌വേര്‍ഡ്"
 
 #: ../lib/engine/components/resource-list/rl-heap.cpp:530
-#| msgid "Edit contact"
 msgid "Add a remote contact"
 msgstr "ഒരു റിമോട്ട് വിലാസം ചേര്‍ക്കുക"
 
@@ -1743,7 +1715,6 @@
 msgstr "ഒരു റിമോട്ട് സര്‍വറില്‍ പുതിയ ഒരു വിലാസം ഉണ്ടാക്കുന്നതിനായി ദയവായി ഈ ഫോറം പൂരിപ്പിക്കുക."
 
 #: ../lib/engine/components/resource-list/rl-presentity.cpp:221
-#| msgid "Edit contact"
 msgid "Edit remote contact"
 msgstr "റിമോട്ട് വിലാസം ചിട്ടപ്പെടുത്തുക"
 
@@ -1760,7 +1731,6 @@
 msgstr "ലഭ്യമാക്കുന്നതിനായി ക്ലിക്ക് ചെയ്യുക"
 
 #: ../lib/engine/components/resource-list/rl-entry-ref.cpp:118
-#| msgid "Edit contact"
 msgid "Distant contact"
 msgstr "ദൂരെയുള്ള വിലാസം"
 
@@ -1775,12 +1745,10 @@
 msgstr "#%d ലഭ്യമാക്കുക"
 
 #: ../lib/engine/gui/gtk-core/form-dialog-gtk.cpp:660
-#| msgid "Advanced Settings"
 msgid "Advanced"
 msgstr "അധികമായ"
 
 #: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:659
-#| msgid "Address _Book"
 msgid "Address Book"
 msgstr "വിലാസ പുസ്തകം "
 
@@ -1799,7 +1767,7 @@
 msgstr "വിഭാഗം"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
-#: ../src/gui/assistant.cpp:1377
+#: ../src/gui/assistant.cpp:1382
 msgid "Full Name"
 msgstr "പൂറ്‍ണ്ണ നാമം"
 
@@ -1816,7 +1784,6 @@
 msgstr "ബ്രൌസറില്‍ ലിങ്ക് തുറക്കുക"
 
 #: ../lib/engine/gui/gtk-frontend/chat-area.cpp:376
-#| msgid "_Copy Equation"
 msgid "Copy link"
 msgstr "ലിങ്ക് പകര്‍ത്തുക"
 
@@ -1855,12 +1822,10 @@
 msgstr "രജിസ്ടര്‍ ചെയ്തിട്ടില്ലാത്ത"
 
 #: ../src/gui/accounts.cpp:237
-#| msgid "Could not search on"
 msgid "Could not unregister"
 msgstr "അണ്‍രജിസ്ടര്‍ ചെയ്യുവാന്‍ സാധ്യമായില്ല"
 
 #: ../src/gui/accounts.cpp:243
-#| msgid "Could not search on"
 msgid "Could not register"
 msgstr "രജിസ്ടര്‍ ചെയ്യുവാന്‍ സാധ്യമായില്ല"
 
@@ -1901,7 +1866,7 @@
 msgid "A"
 msgstr "A"
 
-#: ../src/gui/assistant.cpp:323
+#: ../src/gui/assistant.cpp:327
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1909,21 +1874,26 @@
 "Once you have completed these steps, you can always change them later by "
 "selecting Preferences in the Edit menu."
 msgstr ""
+"This is the Ekiga general configuration assistant. The following steps will "
+"set up Ekiga by asking a few simple questions.\n"
+"\n"
+"Once you have completed these steps, you can always change them later by "
+"selecting Preferences in the Edit menu."
 
-#: ../src/gui/assistant.cpp:331
+#: ../src/gui/assistant.cpp:335
 msgid "Welcome to Ekiga"
 msgstr "Ekiga-ലേക്കു് സ്വാഗതം"
 
-#: ../src/gui/assistant.cpp:365 ../src/gui/preferences.cpp:454
+#: ../src/gui/assistant.cpp:359 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "സ്വകാര്യം വിവരങ്ങള്‍"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:368
+#: ../src/gui/assistant.cpp:362
 msgid "Please enter your first name and your surname:"
 msgstr "നിങ്ങളുടെ ആദ്യ പേരും കുടുംബ പേരും ദയവായി നല്‍കുക:"
 
-#: ../src/gui/assistant.cpp:377
+#: ../src/gui/assistant.cpp:371
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
@@ -1931,20 +1901,19 @@
 "മറ്റ് VoIP, വീഡിയോകോണ്‍ഫറന്‍സിങ് സോഫ്റ്റ്‌വെയറിലേക്ക് ഘടിപ്പിക്കുമ്പോള്‍ നിങ്ങളുടെ ആദ്യ പേരും "
 "കുടുംബപേരും ഉപയോഗിക്കുന്നു."
 
-#: ../src/gui/assistant.cpp:568
-#| msgid "ekiga.net Account - page %d/%d"
+#: ../src/gui/assistant.cpp:573
 msgid "Ekiga.net Account"
 msgstr "ekiga.net അക്കൌണ്ട്"
 
-#: ../src/gui/assistant.cpp:570
+#: ../src/gui/assistant.cpp:575
 msgid "Please enter your username:"
 msgstr "നിങ്ങളുടെ ഉപയോക്താവിന്റെ നാമം നല്‍കുക:"
 
-#: ../src/gui/assistant.cpp:578
+#: ../src/gui/assistant.cpp:583
 msgid "Please enter your password:"
 msgstr "നിങ്ങളുടെ പാസ്‌വേറ്‍ഡ് നല്‍കുക:"
 
-#: ../src/gui/assistant.cpp:588
+#: ../src/gui/assistant.cpp:593
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1954,26 +1923,31 @@
 "You may skip this step if you use an alternative SIP service, or if you "
 "would prefer to specify the login details later."
 msgstr ""
+"The username and password are used to login to your existing account at the "
+"ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
+"you may first create an account below. This will provide a SIP address that "
+"allows people to call you.\n"
+"\n"
+"You may skip this step if you use an alternative SIP service, or if you "
+"would prefer to specify the login details later."
 
-#: ../src/gui/assistant.cpp:615
+#: ../src/gui/assistant.cpp:620
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "ekiga.net ഫ്റീ സറ്‍വീസ് എനിക്ക് ആവശ്യമില്ല"
 
-#: ../src/gui/assistant.cpp:678
+#: ../src/gui/assistant.cpp:683
 msgid "Ekiga Call Out Account"
 msgstr "Ekiga കോള്‍ ഔട്ട് അക്കൌണ്ട്"
 
-#: ../src/gui/assistant.cpp:680
-#| msgid "Please enter your username:"
+#: ../src/gui/assistant.cpp:685
 msgid "Please enter your account ID:"
 msgstr "നിങ്ങളുടെ അക്കൌണ്ടിനുള്ള ID നല്‍കുക:"
 
-#: ../src/gui/assistant.cpp:688
-#| msgid "Please enter your password:"
+#: ../src/gui/assistant.cpp:693
 msgid "Please enter your PIN code:"
 msgstr "ദയവായി നിങ്ങളുടെ പിന്‍കോഡ് നല്‍കുക:"
 
-#: ../src/gui/assistant.cpp:699
+#: ../src/gui/assistant.cpp:704
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1984,166 +1958,164 @@
 "The service will work only if your account is created using the URL in this "
 "dialog.\n"
 msgstr ""
+"You can make calls to regular phones and cell numbers worldwide using "
+"Ekiga.\n"
+"\n"
+"To enable this, you need to do two things:\n"
+"- First buy an account at the URL below.\n"
+"- Then enter your account ID and PIN code.\n"
+"The service will work only if your account is created using the URL in this "
+"dialog.\n"
 
-#: ../src/gui/assistant.cpp:749
+#: ../src/gui/assistant.cpp:754
 msgid "Consult the calls history"
 msgstr "മുമ്പുള്ള കോളുകളുടെ വിവരണം പരിശോധിക്കുക"
 
-#: ../src/gui/assistant.cpp:759
-#| msgid "I do not want to sign up for the ekiga.net free service"
+#: ../src/gui/assistant.cpp:764
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr "Ekiga കോള്‍ ഔട്ട് സേവനത്തില്‍ എനിക്കു് സൈനപ്പ് ചെയ്യേണ്ട"
 
-#: ../src/gui/assistant.cpp:825 ../src/gui/assistant.cpp:1388
-#| msgid "Connection Type - page %d/%d"
+#: ../src/gui/assistant.cpp:830 ../src/gui/assistant.cpp:1393
 msgid "Connection Type"
 msgstr "ഏത് തരം കണക്ഷന്‍ "
 
 #. The connection type
-#: ../src/gui/assistant.cpp:828
+#: ../src/gui/assistant.cpp:833
 msgid "Please choose your connection type:"
 msgstr "നിങ്ങളുടെ കണക്ഷന്‍ ഏത് തരത്തിലുള്ളതെന്ന് തിരഞ്ഞെടുക്കുക:"
 
-#: ../src/gui/assistant.cpp:845
+#: ../src/gui/assistant.cpp:850
 msgid "56k Modem"
 msgstr "56k മോഡം"
 
-#: ../src/gui/assistant.cpp:850
+#: ../src/gui/assistant.cpp:855
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:855
+#: ../src/gui/assistant.cpp:860
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "DSL/Cable (128 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:860
+#: ../src/gui/assistant.cpp:865
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "DSL/Cable (512 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:865
-#| msgid "T1/LAN"
+#: ../src/gui/assistant.cpp:870
 msgid "LAN"
 msgstr "LAN"
 
-#: ../src/gui/assistant.cpp:870
+#: ../src/gui/assistant.cpp:875
 msgid "Keep current settings"
 msgstr "നിലവിലുള്ള സജ്ജീകരണങ്ങള്‍ സൂക്ഷിക്കുക"
 
-#: ../src/gui/assistant.cpp:875
+#: ../src/gui/assistant.cpp:880
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
 "in the preferences window."
 msgstr ""
+"The connection type will permit determining the best quality settings that "
+"Ekiga will use during calls. You can later change the settings individually "
+"in the preferences window."
 
-#: ../src/gui/assistant.cpp:969 ../src/gui/main.cpp:3012
+#: ../src/gui/assistant.cpp:974 ../src/gui/main.cpp:3012
 #: ../src/gui/main.cpp:3016 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "ഓഡിയോ ഡിവൈസുകള്‍"
 
-#: ../src/gui/assistant.cpp:971
-#| msgid "Please choose the audio input device:"
+#: ../src/gui/assistant.cpp:976
 msgid "Please choose the audio ringing device:"
 msgstr "ദയവായി ഓ‍ഡിയോ റിങിങ് ഡിവൈസ് തെരഞ്ഞെടുക്കുക:"
 
-#: ../src/gui/assistant.cpp:991
+#: ../src/gui/assistant.cpp:996
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
 msgstr ""
+"കോളുകള്‍ വരുമ്പോള്‍ റിങ് ചെയ്യേണ്ട ശബ്ദത്തിനുള്ള ഉപകരണമാണു് ഓഡിയോ "
+"റിങിങ് ഡിവൈസ്."
 
 #. ---
-#: ../src/gui/assistant.cpp:1002
+#: ../src/gui/assistant.cpp:1007
 msgid "Please choose the audio output device:"
 msgstr "ദയവായി നിങ്ങളുടെ ഓ‍ഡിയോ ഔട്ട്പുട്ട് ഡിവൈസ് തിരഞ്ഞെടുക്കുക:"
 
-#: ../src/gui/assistant.cpp:1022
+#: ../src/gui/assistant.cpp:1027
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
 msgstr ""
+"കോളുകളുടെ ഇടയില്‍ ഓഡിയോ പ്രവര്‍ത്തിക്കുന്നതിനുള്ള ഡിവൈസാണു് ഓഡിയോ "
+"ഔട്ട്പുട്ട് ഡിവൈസ്."
 
 #. ---
-#: ../src/gui/assistant.cpp:1033
+#: ../src/gui/assistant.cpp:1038
 msgid "Please choose the audio input device:"
 msgstr "ദയവായി നിങ്ങളുടെ ഓ‍ഡിയോ ഇന്‍പുട്ട് ഡിവൈസ് തിരഞ്ഞെടുക്കുക:"
 
-#: ../src/gui/assistant.cpp:1053
-#| msgid ""
-#| "The audio plugin that will be used to detect the devices and manage them."
+#: ../src/gui/assistant.cpp:1058
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
-msgstr ""
-"കോളുകള്‍ക്കിടയില്‍ നിങ്ങളുടെ ശബ്ദം റിക്കോര്‍ഡ് ചെയ്യുന്നതിനുള്ള ഡിവൈസ് "
-"ആണു് ഓഡിയോ ഇന്‍പുട്ട ഡിവൈസ്"
+msgstr "കോളുകള്‍ക്കിടയില്‍ നിങ്ങളുടെ ശബ്ദം റിക്കോര്‍ഡ് ചെയ്യുന്നതിനുള്ള ഡിവൈസ് ആണു് ഓഡിയോ ഇന്‍പുട്ട ഡിവൈസ്"
 
-#: ../src/gui/assistant.cpp:1155
-#| msgid "Please choose the video input device:"
+#: ../src/gui/assistant.cpp:1160
 msgid "Please choose your video input device:"
 msgstr "ദയവായി നിങ്ങളുടെ വീഡിയോ ഇന്‍പുട്ട് ഡിവൈസ് തെരഞ്ഞെടുക്കുക:"
 
-#: ../src/gui/assistant.cpp:1175
+#: ../src/gui/assistant.cpp:1180
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
-msgstr ""
-"കോളുകള്‍ക്കിടയില്‍ നിങ്ങളുടെ വീഡിയോ റിക്കോര്‍ഡ് ചെയ്യുന്നതിനുള്ള ഡിവൈസ് "
-"ആണു് വീഡിയോ ഇന്‍പുട്ട ഡിവൈസ്."
+msgstr "കോളുകള്‍ക്കിടയില്‍ നിങ്ങളുടെ വീഡിയോ റിക്കോര്‍ഡ് ചെയ്യുന്നതിനുള്ള ഡിവൈസ് ആണു് വീഡിയോ ഇന്‍പുട്ട ഡിവൈസ്."
 
-#: ../src/gui/assistant.cpp:1240 ../src/gui/assistant.cpp:1264
-#: ../src/gui/assistant.cpp:1288 ../src/gui/preferences.cpp:805
+#: ../src/gui/assistant.cpp:1245 ../src/gui/assistant.cpp:1269
+#: ../src/gui/assistant.cpp:1293 ../src/gui/preferences.cpp:805
 #: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "ഡിവൈസ് ലഭ്യമായില്ല"
 
-#: ../src/gui/assistant.cpp:1319
-#| msgid "Configuration complete - page %d/%d"
+#: ../src/gui/assistant.cpp:1324
 msgid "Configuration Complete"
 msgstr "ക്രമീകരണം പൂര്‍ത്തിയാക്കിയിരിക്കുന്നു"
 
-#: ../src/gui/assistant.cpp:1321
+#: ../src/gui/assistant.cpp:1326
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
 msgstr ""
-"നിങ്ങള്‍ ഇപ്പോള്‍ Ekiga ക്രമീകരണം പൂര്‍ത്തിയാക്കിയിരിക്കുന്നു. എല്ലാ ക്രമീകരണങ്ങളും "
-"നിങ്ങള്‍ക്കു് Ekiga മുന്‍ഗണനകളില്‍ മാറ്റുവാന്‍ സാധിക്കുന്നു."
+"നിങ്ങള്‍ ഇപ്പോള്‍ Ekiga ക്രമീകരണം പൂര്‍ത്തിയാക്കിയിരിക്കുന്നു. എല്ലാ ക്രമീകരണങ്ങളും നിങ്ങള്‍ക്കു് "
+"Ekiga മുന്‍ഗണനകളില്‍ മാറ്റുവാന്‍ സാധിക്കുന്നു."
 
-#: ../src/gui/assistant.cpp:1328
+#: ../src/gui/assistant.cpp:1333
 msgid "Configuration summary:"
 msgstr "ക്രമീകരണത്തിന്റെ ചുരുക്കം:"
 
-#: ../src/gui/assistant.cpp:1398
-#| msgid "Audio input device"
+#: ../src/gui/assistant.cpp:1403
 msgid "Audio Ringing Device"
 msgstr "ഓഡിയോ റിങിങ് ഡിവൈസ്"
 
-#: ../src/gui/assistant.cpp:1407
-#| msgid "Audio output device"
+#: ../src/gui/assistant.cpp:1412
 msgid "Audio Output Device"
 msgstr "ഓഡിയോ ഔട്ട്പുട്ട് ഡിവൈസ്"
 
-#: ../src/gui/assistant.cpp:1416
-#| msgid "Audio input device"
+#: ../src/gui/assistant.cpp:1421
 msgid "Audio Input Device"
 msgstr "ഓഡിയോ ഇന്‍പുട്ട് ഡിവൈസ്"
 
-#: ../src/gui/assistant.cpp:1425
-#| msgid "Video input device"
+#: ../src/gui/assistant.cpp:1430
 msgid "Video Input Device"
 msgstr "വീഡിയോ ഇന്‍പുട്ട് ഡിവൈസ്"
 
-#: ../src/gui/assistant.cpp:1438
-#| msgid "VoIP URI"
+#: ../src/gui/assistant.cpp:1443
 msgid "SIP URI"
 msgstr "SIP URI"
 
-#: ../src/gui/assistant.cpp:1450
+#: ../src/gui/assistant.cpp:1455
 msgid "Ekiga Call Out"
 msgstr "Ekiga കോള്‍ ഔട്ട്"
 
-#: ../src/gui/assistant.cpp:1492
+#: ../src/gui/assistant.cpp:1499
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr "Ekiga ക്രമീകരണ അസ്സിസ്റ്റന്റ് (%d, മൊത്തം %d)"
@@ -2167,10 +2139,9 @@
 "Software Foundation; either version 2 of the License, or (at your option) "
 "any later version. "
 msgstr ""
-"ഈ പ്രോഗ്രാം ഒരു സ്വതന്ത്ര സോഫ്റ്റ്‌വെയറാണു്, നിങ്ങള്‍ക്കതു് പുനര്‍വിതരണം "
-"നടത്തുകയോ സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ ഫൌണ്ടേഷന്‍ പ്രസിദ്ധീകരിച്ച ഗ്നു ജനറല്‍ "
-"പബ്ലിക് ലൈസന്‍സ് ലക്കം 2 ഓ അതിനേക്കാള്‍ പുതിയ പതിപ്പോ (നിങ്ങളുടെ ഇഷ്ടപ്രകാരം) "
-"പ്രകാരം ഭേദഗതി വരുത്താവുന്നതോ ആണു്."
+"ഈ പ്രോഗ്രാം ഒരു സ്വതന്ത്ര സോഫ്റ്റ്‌വെയറാണു്, നിങ്ങള്‍ക്കതു് പുനര്‍വിതരണം നടത്തുകയോ സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ "
+"ഫൌണ്ടേഷന്‍ പ്രസിദ്ധീകരിച്ച ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സ് ലക്കം 2 ഓ അതിനേക്കാള്‍ പുതിയ പതിപ്പോ "
+"(നിങ്ങളുടെ ഇഷ്ടപ്രകാരം) പ്രകാരം ഭേദഗതി വരുത്താവുന്നതോ ആണു്."
 
 #: ../src/gui/callbacks.cpp:171
 msgid ""
@@ -2181,13 +2152,12 @@
 "License along with this program; if not, write to the Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"ഈ പ്രോഗ്രാം നിങ്ങള്‍ക്കു് പ്രയോജനപ്പെടും എന്ന പ്രതീക്ഷയില്‍ വിതരണം ചെയ്യുന്നതാണു്."
-"പക്ഷേ, ഇതിന് ഒരു വാറണ്ടിയും ലഭ്യമല്ല; വ്യാപാരയോഗ്യതയോ ഒരു പ്രത്യേക കാര്യത്തിനു്"
-"ചേരുന്നതാണെന്നോ ഉള്ള പരോക്ഷമായ ഒരു വാറണ്ടി പോലും ഇല്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്കു് "
-"ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സ് കാണുക. നിങ്ങള്‍ക്കു് ഗ്നോം ടെര്‍മിനലിനൊപ്പം ഗ്നു "
-"ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പു് ലഭിച്ചിട്ടുണ്ടായിരിയ്ക്കണം; ഇല്ലെങ്കില്‍, "
-"ഈ വിലാസത്തിലേയ്ക്കെഴുതുക: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
-"Boston, MA 02110-1301, USA."
+"ഈ പ്രോഗ്രാം നിങ്ങള്‍ക്കു് പ്രയോജനപ്പെടും എന്ന പ്രതീക്ഷയില്‍ വിതരണം ചെയ്യുന്നതാണു്.പക്ഷേ, ഇതിന് ഒരു "
+"വാറണ്ടിയും ലഭ്യമല്ല; വ്യാപാരയോഗ്യതയോ ഒരു പ്രത്യേക കാര്യത്തിനു്ചേരുന്നതാണെന്നോ ഉള്ള പരോക്ഷമായ "
+"ഒരു വാറണ്ടി പോലും ഇല്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്കു് ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സ് കാണുക. നിങ്ങള്‍ക്കു് ഗ്നോം "
+"ടെര്‍മിനലിനൊപ്പം ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പു് ലഭിച്ചിട്ടുണ്ടായിരിയ്ക്കണം; "
+"ഇല്ലെങ്കില്‍, ഈ വിലാസത്തിലേയ്ക്കെഴുതുക: Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
 #: ../src/gui/callbacks.cpp:178
 msgid ""
@@ -2198,6 +2168,12 @@
 "long as you do follow the requirements of the GNU GPL for all the rest of "
 "the software thus combined."
 msgstr ""
+"Ekiga is licensed under the GPL license and as a special exception, you have "
+"permission to link or otherwise combine this program with the programs OPAL, "
+"OpenH323 and PWLIB, and distribute the combination, without applying the "
+"requirements of the GNU GPL to the OPAL, OpenH323 and PWLIB programs, as "
+"long as you do follow the requirements of the GNU GPL for all the rest of "
+"the software thus combined."
 
 #. Translators: Please write translator credits here, and
 #. * separate names with \n
@@ -2211,13 +2187,15 @@
 "Videoconferencing application that allows you to make audio and video calls "
 "to remote users with SIP and H.323 hardware or software."
 msgstr ""
+"Ekiga is full-featured SIP and H.323 compatible VoIP, IP-Telephony and "
+"Videoconferencing application that allows you to make audio and video calls "
+"to remote users with SIP and H.323 hardware or software."
 
 #: ../src/gui/callbacks.cpp:269
 msgid "Help display is not supported by your GTK+ version"
 msgstr "നിങ്ങളുടെ GTK+ പതിപ്പില്‍ സഹായത്തിനുള്ള പ്രദര്‍ശനം പിന്തുണയ്ക്കുന്നില്ല."
 
 #: ../src/gui/callbacks.cpp:277
-#| msgid "Failed to open the device"
 msgid "Unable to open help file."
 msgstr "സഹായത്തിനുള്ള ഫയല്‍ തുറക്കുവാനായില്ല"
 
@@ -2267,19 +2245,16 @@
 
 #: ../src/gui/main.cpp:531
 #, c-format
-#| msgid "Could not search on"
 msgid "Could not unregister %s"
 msgstr "%s അണ്‍രജിസ്ടര്‍ ചെയ്യുവാന്‍ സാധ്യമായില്ല"
 
 #: ../src/gui/main.cpp:535
 #, c-format
-#| msgid "Could not search on"
 msgid "Could not register %s"
 msgstr "%s രജിസ്ടര്‍ ചെയ്യുവാന്‍ സാധ്യമായില്ല"
 
 #: ../src/gui/main.cpp:605
 #, c-format
-#| msgid "A:%.1f/%.1f   V:%.1f/%.1f  FPS:%d/%d"
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 
@@ -2293,18 +2268,15 @@
 msgstr "തയ്യാറായി നില്‍ക്കുക"
 
 #: ../src/gui/main.cpp:753
-#| msgid "Call completed"
 msgid "Call on hold"
 msgstr "കോള്‍ ഹോള്‍ഡ് ചെയ്തിരിക്കുന്നു"
 
 #: ../src/gui/main.cpp:764
-#| msgid "Call attribute"
 msgid "Call retrieved"
 msgstr "കോള്‍ ലഭ്യമാക്കിയിരിക്കുന്നു"
 
 #: ../src/gui/main.cpp:780
 #, c-format
-#| msgid "Call from %s"
 msgid "Missed call from %s"
 msgstr "%s-ല്‍ നിന്നും മിസ്സ്ഡ് കോള്‍"
 
@@ -2313,7 +2285,6 @@
 msgstr "തകരാറ്"
 
 #: ../src/gui/main.cpp:982
-#| msgid "Error while opening video device %s"
 msgid "Error while initializing video output"
 msgstr "വീഡിയോ ഔട്ട്പുട്ട് ആരംഭിക്കുന്നതില്‍ പിശക്"
 
@@ -2326,30 +2297,31 @@
 "There was an error opening or initializing the video output. Please verify "
 "that no other application is using the accelerated video output."
 msgstr ""
+"There was an error opening or initializing the video output. Please verify "
+"that no other application is using the accelerated video output."
 
 #: ../src/gui/main.cpp:995
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that you are using a color depth of 24 or 32 bits per pixel."
 msgstr ""
+"There was an error opening or initializing the video output. Please verify "
+"that you are using a color depth of 24 or 32 bits per pixel."
 
 #. Translators: This is a hotplug status
 #: ../src/gui/main.cpp:1108
 #, c-format
-#| msgid "Audio input device"
 msgid "Added video input device %s"
 msgstr "ഓഡിയോ ഇന്‍പുട്ട് ഡിവൈസ് %s ചേര്‍ത്തിരിക്കുന്നു"
 
 #. Translators: This is a hotplug status
 #: ../src/gui/main.cpp:1120
 #, c-format
-#| msgid "Video input device"
 msgid "Removed video input device %s"
 msgstr "വീഡിയോ ഇന്‍പുട്ട് ഡിവൈസ് %s നീക്കം ചെയ്തിരിക്കുന്നു"
 
 #: ../src/gui/main.cpp:1137
 #, c-format
-#| msgid "Error while opening video device %s"
 msgid "Error while accessing video device %s"
 msgstr "വീഡിയോ ഡിവൈസ് %s ലഭ്യമാക്കുന്നതില്‍ പിശക്"
 
@@ -2359,6 +2331,9 @@
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
 "plugin and \"Moving logo\" or \"Static picture\" as device."
 msgstr ""
+"A moving logo will be transmitted during calls. Notice that you can always "
+"transmit a given image or the moving logo by choosing \"Picture\" as video "
+"plugin and \"Moving logo\" or \"Static picture\" as device."
 
 #: ../src/gui/main.cpp:1144
 msgid ""
@@ -2367,6 +2342,10 @@
 "accessible, please check your permissions and make sure that the appropriate "
 "driver is loaded."
 msgstr ""
+"There was an error while opening the device. In case it is a pluggable "
+"device it may be sufficient to reconnect it. If not, or if it still is not "
+"accessible, please check your permissions and make sure that the appropriate "
+"driver is loaded."
 
 #: ../src/gui/main.cpp:1148
 msgid "Your video driver doesn't support the requested video format."
@@ -2383,6 +2362,10 @@
 " Please check your kernel driver documentation in order to determine which "
 "Palette is supported."
 msgstr ""
+"Your driver doesn't seem to support any of the color formats supported by "
+"Ekiga.\n"
+" Please check your kernel driver documentation in order to determine which "
+"Palette is supported."
 
 #: ../src/gui/main.cpp:1160
 msgid "Error while setting the frame rate."
@@ -2393,27 +2376,23 @@
 msgstr "ഫ്റെയിം വ്യാപ്തി സജ്ജീകരിക്കുന്നതില്‍ പിശക്."
 
 #: ../src/gui/main.cpp:1169 ../src/gui/main.cpp:1271 ../src/gui/main.cpp:1386
-#| msgid "Unknown NAT"
 msgid "Unknown error."
 msgstr "അപരിചിതമായ പിശക്."
 
 #. Translators: This is a hotplug status
 #: ../src/gui/main.cpp:1219
 #, c-format
-#| msgid "Audio input device"
 msgid "Added audio input device %s"
 msgstr "ഓഡിയോ ഇന്‍പുട്ട് ഡിവൈസ് %s ചേര്‍ത്തിരിക്കുന്നു"
 
 #. Translators: This is a hotplug status
 #: ../src/gui/main.cpp:1236
 #, c-format
-#| msgid "Audio input device"
 msgid "Removed audio input device %s"
 msgstr "ഓഡിയോ ഇന്‍പുട്ട് ഡിവൈസ് %s നീക്കം ചെയ്തിരിക്കുന്നു"
 
 #: ../src/gui/main.cpp:1253
 #, c-format
-#| msgid "Error while opening video device %s"
 msgid "Error while opening audio input device %s"
 msgstr "ഓഡിയോ ഇന്‍പുട്ട് ഡിവൈസ് %s ലഭ്യമാക്കുന്നതില്‍ പിശക്"
 
@@ -2430,11 +2409,12 @@
 "still is not accessible, please check your audio setup, the permissions and "
 "that the device is not busy."
 msgstr ""
+"Unable to open the selected audio device for recording. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
 
 #: ../src/gui/main.cpp:1266
-#| msgid ""
-#| "The selected audio device (%s) was successfully opened but it is "
-#| "impossible to read data from this device. Please check your audio setup."
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2442,24 +2422,21 @@
 "check your audio setup."
 msgstr ""
 "നിങ്ങള്‍ തിരഞ്ഞെടുത്ത ഓഡിയോ ഡിവൈസ് ലഭ്യമായെങ്കിലും അതിലേക്ക് ഡേറ്റാ സൂക്ഷിക്കുവാന്‍ "
-"സാധ്യമാകുന്നില്ല. ഘടിപ്പിക്കുന്ന ഡിവൈസ് ആണെങ്കില്‍, ഒരിക്കല്‍ കൂടി കണക്ട് ചെയ്യുക. "
-"അല്ലായെങ്കില്‍ ദയവായി നിങ്ങളുടെ ഓഡിയോ ക്രമീകരണം പരിശോധിക്കുക."
+"സാധ്യമാകുന്നില്ല. ഘടിപ്പിക്കുന്ന ഡിവൈസ് ആണെങ്കില്‍, ഒരിക്കല്‍ കൂടി കണക്ട് ചെയ്യുക. അല്ലായെങ്കില്‍ "
+"ദയവായി നിങ്ങളുടെ ഓഡിയോ ക്രമീകരണം പരിശോധിക്കുക."
 
 #: ../src/gui/main.cpp:1333
 #, c-format
-#| msgid "Audio output device"
 msgid "Added audio output device %s"
 msgstr "ഓഡിയോ ഔട്ട്പുട്ട് ഡിവൈസ് %s ചേര്‍ത്തിരിക്കുന്നു"
 
 #: ../src/gui/main.cpp:1349
 #, c-format
-#| msgid "Alternative audio output device"
 msgid "Removed audio output device %s"
 msgstr "ഓഡിയോ ഔട്ട്പുട്ട് ഡിവൈസ് %s നീക്കം ചെയ്തിരിക്കുന്നു"
 
 #: ../src/gui/main.cpp:1370
 #, c-format
-#| msgid "Error while opening video device %s"
 msgid "Error while opening audio output device %s"
 msgstr "ഓഡിയോ ഔട്ട്പുട്ട് ഡിവൈസ് %s ലഭ്യമാക്കുന്നതില്‍ പിശക്"
 
@@ -2474,11 +2451,12 @@
 "still is not accessible, please check your audio setup, the permissions and "
 "that the device is not busy."
 msgstr ""
+"Unable to open the selected audio device for playing. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
 
 #: ../src/gui/main.cpp:1381
-#| msgid ""
-#| "The selected audio device (%s) was successfully opened but it is "
-#| "impossible to write data to this device. Please check your audio setup."
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
@@ -2486,8 +2464,8 @@
 "check your audio setup."
 msgstr ""
 "നിങ്ങള്‍ തിരഞ്ഞെടുത്ത ഓഡിയോ ഡിവൈസ് ലഭ്യമായെങ്കിലും അതിലേക്ക് ഡേറ്റാ സൂക്ഷിക്കുവാന്‍ "
-"സാധ്യമാകുന്നില്ല. ഘടിപ്പിക്കുന്ന ഡിവൈസ് ആണെങ്കില്‍, ഒരിക്കല്‍ കൂടി കണക്ട് ചെയ്യുക. "
-"അല്ലായെങ്കില്‍ ദയവായി നിങ്ങളുടെ ഓഡിയോ ക്രമീകരണം പരിശോധിക്കുക."
+"സാധ്യമാകുന്നില്ല. ഘടിപ്പിക്കുന്ന ഡിവൈസ് ആണെങ്കില്‍, ഒരിക്കല്‍ കൂടി കണക്ട് ചെയ്യുക. അല്ലായെങ്കില്‍ "
+"ദയവായി നിങ്ങളുടെ ഓഡിയോ ക്രമീകരണം പരിശോധിക്കുക."
 
 #: ../src/gui/main.cpp:1569
 msgid "Video Settings"
@@ -2572,7 +2550,6 @@
 msgstr "കോള്‍ മറ്റൊരിടത്തേക്ക് നീക്കുക:"
 
 #: ../src/gui/main.cpp:2998
-#| msgid "None"
 msgid "No"
 msgstr "ഇല്ല"
 
@@ -2581,17 +2558,14 @@
 msgstr "ഉവ്വു്"
 
 #: ../src/gui/main.cpp:3011
-#| msgid "Please choose the audio input device:"
 msgid "Detected new audio input device:"
 msgstr "പുതിയ ഓഡിയോ ഇന്‍പുട്ട് ഡിവൈസ് ലഭ്യമാക്കിരിക്കുന്നു:"
 
 #: ../src/gui/main.cpp:3015
-#| msgid "Please choose the audio output device:"
 msgid "Detected new audio output device:"
 msgstr "പുതിയ ഓഡിയോ ഔട്ട്പുട്ട് ഡിവൈസ് ലഭ്യമാക്കിരിക്കുന്നു:"
 
 #: ../src/gui/main.cpp:3019
-#| msgid "Please choose the video input device:"
 msgid "Detected new video input device:"
 msgstr "പുതിയ വീഡിയോ ഇന്‍പുട്ട് ഡിവൈസ് ലഭ്യമാക്കിരിക്കുന്നു:"
 
@@ -2604,7 +2578,6 @@
 msgstr "നിങ്ങള്‍ക്കു് ഇതു് സ്വതവേയുള്ള ഡിവൈസായി ഉപയോഗിക്കണമോ?"
 
 #: ../src/gui/main.cpp:3106
-#| msgid "_Call"
 msgid "_Chat"
 msgstr "_ചാറ്റ് ചെയ്യുക"
 
@@ -2625,12 +2598,10 @@
 msgstr "ഈ കോള്‍ അവസാനിപ്പിക്കുക"
 
 #: ../src/gui/main.cpp:3118
-#| msgid "_Find Contacts"
 msgid "A_dd Contact"
 msgstr "വിലാസം _ചേര്‍ക്കുക"
 
 #: ../src/gui/main.cpp:3118
-#| msgid "Could not connect to remote host"
 msgid "Add a contact to the roster"
 msgstr "റൂസ്റ്ററിലേക്കു് ഒരു വിലാസം ചേര്‍ക്കുക"
 
@@ -2639,7 +2610,6 @@
 msgstr "വിലാസങ്ങള്‍ കണ്ടുപിടിക്കുക"
 
 #: ../src/gui/main.cpp:3130
-#| msgid "Contacts"
 msgid "_Contact"
 msgstr "_വിലാസങ്ങള്‍"
 
@@ -2648,7 +2618,6 @@
 msgstr "തെരഞ്ഞെടുത്ത വിലാസത്തില്‍ പ്രവര്‍ത്തിക്കുക"
 
 #: ../src/gui/main.cpp:3137
-#| msgid "_Hold Call"
 msgid "H_old Call"
 msgstr "കോള്‍ _ഹോള്‍ഡ് ചെയ്യുക"
 
@@ -2717,12 +2686,10 @@
 msgstr "ഡയല്‍ പാഡ് കാണുക"
 
 #: ../src/gui/main.cpp:3207
-#| msgid "Calls History"
 msgid "_Call History"
 msgstr "_കോളുകളുടെ വിവരണം"
 
 #: ../src/gui/main.cpp:3207
-#| msgid "View the calls history"
 msgid "View the call history"
 msgstr "കോളുകളുടെ വിവരണം കാണുക"
 
@@ -2731,7 +2698,6 @@
 msgstr "കോള്‍ പാനലില്‍ _കാണിക്കുക"
 
 #: ../src/gui/main.cpp:3223
-#| msgid "Local Video"
 msgid "_Local Video"
 msgstr "_ലോക്കല്‍ വീഡിയോ"
 
@@ -2740,7 +2706,6 @@
 msgstr "ലോക്കല്‍ വീഡിയോ ഇമേജ്"
 
 #: ../src/gui/main.cpp:3229
-#| msgid "Remote Video"
 msgid "_Remote Video"
 msgstr "_റിമോട്ട് വീഡിയോ"
 
@@ -2773,7 +2738,6 @@
 msgstr "സാധാരണ വ്യാപ്തി"
 
 #: ../src/gui/main.cpp:3261
-#| msgid "Fullscreen"
 msgid "_Fullscreen"
 msgstr "_സ്ക്രീന്‍ പൂര്‍ണ്ണവലിപ്പത്തില്‍"
 
@@ -2790,11 +2754,10 @@
 msgstr "എകീഗാ സംബന്ധിച്ചുള്ള വിവരങ്ങള്‍ കാണുക"
 
 #: ../src/gui/main.cpp:3348
-#| msgid "Enter a URI on the left, and click this button to place a call"
 msgid "Enter a URI on the left, and click this button to place a call or to hangup"
 msgstr ""
-"ഇടത് വശത്ത് ഒരു URI നല്‍കി, കോള്‍ ചെയ്യുന്നതിനായി അല്ലെങ്കില്‍ അവസാനിപ്പിക്കുന്നതിനായി "
-"ഈ ബട്ടണ്‍ ക്ലിക്ക് ചെയ്യുക"
+"ഇടത് വശത്ത് ഒരു URI നല്‍കി, കോള്‍ ചെയ്യുന്നതിനായി അല്ലെങ്കില്‍ അവസാനിപ്പിക്കുന്നതിനായി ഈ ബട്ടണ്‍ "
+"ക്ലിക്ക് ചെയ്യുക"
 
 #: ../src/gui/main.cpp:3399
 msgid "Contacts"
@@ -2805,7 +2768,6 @@
 msgstr "ഡയല്‍ പാഡ്"
 
 #: ../src/gui/main.cpp:3441
-#| msgid "Calls history"
 msgid "Call history"
 msgstr "കോളുകളുടെ വിവരണം"
 
@@ -2854,35 +2816,35 @@
 
 #: ../src/gui/main.cpp:4411
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
-msgstr ""
+msgstr "Prints user plane debug messages in the console (level between 1 and 4)"
 
 #: ../src/gui/main.cpp:4416
 msgid "Makes Ekiga call the given URI"
 msgstr "നല്‍കിയിരിക്കുന്ന URI-യുമായി ബന്ധപ്പെടുന്നതിന് എകിഗാ സജ്ജമാക്കുന്നു"
 
-#: ../src/gui/main.cpp:4525
+#: ../src/gui/main.cpp:4528
 msgid "No usable audio plugin detected"
 msgstr "ഉപയോഗിക്കുവാന്‍ സാധിക്കുന്ന ഓഡിയോ പ്ളഗ്ഗിന്‍ ലഭ്യമല്ല"
 
-#: ../src/gui/main.cpp:4526
+#: ../src/gui/main.cpp:4529
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
 msgstr ""
-"ഉപയോഗിക്കുവാന്‍ സാധ്യമാകുന്ന ഓഡിയോ പ്ലഗിന്‍ Ekiga-യ്ക്കു് ലഭ്യമായില്ല. "
-"ദയവായി നിങ്ങളുടെ ഇന്‍സ്റ്റലേഷന്‍ പരിശോധിക്കുക."
+"ഉപയോഗിക്കുവാന്‍ സാധ്യമാകുന്ന ഓഡിയോ പ്ലഗിന്‍ Ekiga-യ്ക്കു് ലഭ്യമായില്ല. ദയവായി നിങ്ങളുടെ "
+"ഇന്‍സ്റ്റലേഷന്‍ പരിശോധിക്കുക."
 
-#: ../src/gui/main.cpp:4529
+#: ../src/gui/main.cpp:4532
 msgid "No usable audio codecs detected"
 msgstr "ഉപയോഗിക്കുവാന്‍ സാധിക്കുന്ന ഓഡിയോ കോഡക്കുകള്‍ ലഭ്യമല്ല"
 
-#: ../src/gui/main.cpp:4530
+#: ../src/gui/main.cpp:4533
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
 msgstr ""
-"ഉപയോഗിക്കുവാന്‍ സാധ്യമാകുന്ന ഓഡിയോ കോഡകുകള്‍ Ekiga-യ്ക്കു് ലഭ്യമായില്ല. "
-"ദയവായി നിങ്ങളുടെ ഇന്‍സ്റ്റലേഷന്‍ പരിശോധിക്കുക."
+"ഉപയോഗിക്കുവാന്‍ സാധ്യമാകുന്ന ഓഡിയോ കോഡകുകള്‍ Ekiga-യ്ക്കു് ലഭ്യമായില്ല. ദയവായി നിങ്ങളുടെ "
+"ഇന്‍സ്റ്റലേഷന്‍ പരിശോധിക്കുക."
 
 #: ../src/gui/preferences.cpp:381
 msgid "Play sound for new voice mails"
@@ -2893,12 +2855,10 @@
 msgstr "പുതിയ സന്ദേശങ്ങള്‍ക്കായി ശബ്ദം പ്റവറ്‍ത്തിപ്പിക്കുക"
 
 #: ../src/gui/preferences.cpp:457
-#| msgid "Full Name"
 msgid "_Full name:"
 msgstr "_പൂര്‍ണ്ണ പേരു്:"
 
 #: ../src/gui/preferences.cpp:475
-#| msgid "Network Interface"
 msgid "User Interface"
 msgstr "സംയോജക ഘടകം"
 
@@ -2907,7 +2867,6 @@
 msgstr "അദൃശ്യമായവ ആരംഭിക്കുക (_h)"
 
 #: ../src/gui/preferences.cpp:479
-#| msgid "Find contacts"
 msgid "Show offline _contacts"
 msgstr "ഓഫ്‌ലൈന്‍ _വിലാസങ്ങള്‍ കാണിക്കുക"
 
@@ -2924,7 +2883,6 @@
 msgstr "നെറ്റ്‌വറ്‍ക്ക് സജ്ജീകരണങ്ങള്‍"
 
 #: ../src/gui/preferences.cpp:492
-#| msgid "Enable silence detection"
 msgid "Disable network _detection"
 msgstr "നെറ്റ്‌വര്‍ക്ക് _തിരിച്ചറിയുന്നത് പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
@@ -2941,8 +2899,8 @@
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings"
 msgstr ""
-"സജ്ജമെങ്കില്‍, സമ്പ്രദായ ക്രമീകരണങ്ങളില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന ഹോസ്റ്റിലേക്കു് "
-"വരുന്ന എല്ലാ കോളുകളും ഫോര്‍വേഡ് ചെയ്യുന്നു"
+"സജ്ജമെങ്കില്‍, സമ്പ്രദായ ക്രമീകരണങ്ങളില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന ഹോസ്റ്റിലേക്കു് വരുന്ന എല്ലാ "
+"കോളുകളും ഫോര്‍വേഡ് ചെയ്യുന്നു"
 
 #: ../src/gui/preferences.cpp:507
 msgid "Forward calls to the given host if _no answer"
@@ -2953,8 +2911,8 @@
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you do not answer the call"
 msgstr ""
-"സജ്ജമെങ്കില്‍, കോള്‍ എടുക്കാത്തപ്പോള്‍ സമ്പ്രദായ ക്രമീകരണങ്ങളില്‍ "
-"വ്യക്തമാക്കിയിരിക്കുന്ന ഹോസ്റ്റിലേക്കു് വരുന്ന എല്ലാ കോളുകളും ഫോര്‍വേഡ് ചെയ്യുന്നു"
+"സജ്ജമെങ്കില്‍, കോള്‍ എടുക്കാത്തപ്പോള്‍ സമ്പ്രദായ ക്രമീകരണങ്ങളില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന ഹോസ്റ്റിലേക്കു് "
+"വരുന്ന എല്ലാ കോളുകളും ഫോര്‍വേഡ് ചെയ്യുന്നു"
 
 #: ../src/gui/preferences.cpp:509
 msgid "Forward calls to the given host if _busy"
@@ -2966,6 +2924,9 @@
 "specified in the protocol settings if you already are in a call or if you "
 "are in Do Not Disturb mode"
 msgstr ""
+"If enabled, all incoming calls will be forwarded to the host that is "
+"specified in the protocol settings if you already are in a call or if you "
+"are in Do Not Disturb mode"
 
 #: ../src/gui/preferences.cpp:513 ../src/gui/preferences.cpp:1361
 msgid "Call Options"
@@ -2974,7 +2935,7 @@
 #. Add all the fields
 #: ../src/gui/preferences.cpp:516
 msgid "Timeout to reject or forward unanswered incoming calls (in seconds):"
-msgstr ""
+msgstr "Timeout to reject or forward unanswered incoming calls (in seconds):"
 
 #: ../src/gui/preferences.cpp:548
 msgid "Ekiga Sound Events"
@@ -3044,6 +3005,10 @@
 "Netmeeting and using both Fast Start and H.245 Tunneling can crash some "
 "versions of Netmeeting."
 msgstr ""
+"Connection will be established in Fast Start mode. Fast Start is a new way "
+"to start calls faster that was introduced in H.323v2. It is not supported by "
+"Netmeeting and using both Fast Start and H.245 Tunneling can crash some "
+"versions of Netmeeting."
 
 #: ../src/gui/preferences.cpp:698 ../src/gui/preferences.cpp:738
 msgid "DTMF Mode"
@@ -3070,7 +3035,6 @@
 msgstr "റിങ് ചെയ്യുന്ന ഡിവൈസ്"
 
 #: ../src/gui/preferences.cpp:768
-#| msgid "Select the audio input device to use"
 msgid "Select the ringing audio device to use"
 msgstr "ഉപയോഗിക്കുന്നതിനുള്ള പ്രവര്‍ത്തിക്കുന്ന ഓഡിയോ ഡിവൈസ് തെരഞ്ഞെടുക്കുക"
 
@@ -3130,7 +3094,6 @@
 msgstr "കോഡകുകള്‍"
 
 #: ../src/gui/preferences.cpp:976 ../src/gui/preferences.cpp:1015
-#| msgid "NAT Settings"
 msgid "Settings"
 msgstr "സജ്ജീകരണങ്ങള്‍"
 
@@ -3138,11 +3101,11 @@
 #. between X and Y ms
 #: ../src/gui/preferences.cpp:980
 msgid "Enable silence _detection"
-msgstr ""
+msgstr "Enable silence _detection"
 
 #: ../src/gui/preferences.cpp:980
 msgid "If enabled, use silence detection with the codecs supporting it."
-msgstr ""
+msgstr "If enabled, use silence detection with the codecs supporting it."
 
 #: ../src/gui/preferences.cpp:982
 msgid "Enable echo can_celation"
@@ -3153,13 +3116,12 @@
 msgstr "സജ്ജമെങ്കില്‍, ഇക്കോ റദ്ദാക്കല്‍ ഉപയോഗിക്കുക."
 
 #: ../src/gui/preferences.cpp:984
-#| msgid "Maximum jitter buffer"
 msgid "Maximum _jitter buffer (in ms):"
 msgstr "ഏറ്റവും കൂടിയ _ജിറ്റര്‍ ബഫര്‍ (ms-ല്‍):"
 
 #: ../src/gui/preferences.cpp:984
 msgid "The maximum jitter buffer size for audio reception (in ms)."
-msgstr ""
+msgstr "The maximum jitter buffer size for audio reception (in ms)."
 
 #. Translators: the full sentence is Keep a minimum video quality of X %
 #: ../src/gui/preferences.cpp:1018
@@ -3172,10 +3134,13 @@
 "dropped frames in order not to surpass the bitrate limit) or if you prefer "
 "to keep the frame rate."
 msgstr ""
+"Choose if you want to guarantee a minimum image quality (possibly leading to "
+"dropped frames in order not to surpass the bitrate limit) or if you prefer "
+"to keep the frame rate."
 
 #: ../src/gui/preferences.cpp:1020
 msgid "Maximum video _bitrate (in kbits/s):"
-msgstr ""
+msgstr "ഏറ്റവും കൂടിയ _ബിറ്റ്റേറ്റ് (kbits/s-ല്‍):"
 
 #: ../src/gui/preferences.cpp:1020
 msgid ""
@@ -3183,6 +3148,9 @@
 "frame rate will be dynamically adjusted to keep the bitrate at the given "
 "value."
 msgstr ""
+"ഏറ്റവും കൂടിയ വീഡിയോ ബിറ്റ്റേറ്റ് kbits/s-ല്‍. വീഡിയോയുടെ ഗുണവും ഫ്രെയിം റേറ്റും "
+"തന്നിരിക്കുന്ന മൂല്ലയമായി ബിറ്റ്റേറ്റ് സൂക്ഷിക്കുന്നതിനായി ഡൈനമിക്കായി "
+"മാറ്റം വരുത്തുന്നു."
 
 #: ../src/gui/preferences.cpp:1333
 msgid "Ekiga Preferences"
@@ -3217,7 +3185,6 @@
 msgstr "H.323 സജ്ജീകരണങ്ങള്‍"
 
 #: ../src/gui/preferences.cpp:1381
-#| msgid "Auto"
 msgid "Audio"
 msgstr "ഓഡിയോ"
 
@@ -3226,13 +3193,11 @@
 msgstr "ഉപകരണങ്ങള്‍"
 
 #: ../src/gui/preferences.cpp:1391
-#| msgid "Video size"
 msgid "Video"
 msgstr "വീഡിയോ"
 
 #: ../src/gui/statusicon.cpp:305
 #, c-format
-#| msgid "Send message"
 msgid "You have %d message"
 msgid_plural "You have %d messages"
 msgstr[0] "നിങ്ങള്‍ക്കു് %d സന്ദേശമുണ്ടു്"
diff -Nru ekiga-3.2.5/po/nb.po ekiga-3.2.6~ppa~karmic1/po/nb.po
--- ekiga-3.2.5/po/nb.po	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/nb.po	2009-09-22 15:27:35.000000000 +0100
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the gnomemeeting package.
 # Kjartan Maraas <kmaraas@gnome.org 2001-2009.
 # Sigurd Gartmann <sigurd-translate@brogar.org, 2004, 2005
-#: ../lib/engine/components/resource-list/rl-entry.cpp:163
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
 "Project-Id-Version: Ekiga 3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-17 09:22+0100\n"
-"PO-Revision-Date: 2009-03-17 09:32+0100\n"
+"POT-Creation-Date: 2009-08-21 14:42+0200\n"
+"PO-Revision-Date: 2009-08-21 14:45+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no\n"
 "MIME-Version: 1.0\n"
@@ -112,7 +112,7 @@
 msgid "Disable video hardware acceleration"
 msgstr "Deaktiver maskinvareaksellerasjon av video"
 
-#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3586
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3591
 msgid "Display images from your camera device"
 msgstr "Vis bilder fra ditt kamera"
 
@@ -364,7 +364,7 @@
 msgid "Show offline contacts"
 msgstr "Vis frakoblede kontakter"
 
-#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3215
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3220
 msgid "Show the call panel"
 msgstr "Vis samtalepanelet"
 
@@ -534,7 +534,10 @@
 "transmitted frames per second (depends on selected codec) will be "
 "dynamically adjusted above their minimum during calls to try to minimize the "
 "bandwidth to the given value"
-msgstr "Maksimal videobåndbredde i kbit/s. Videokvaliteten og antall overførte rammer per sekund (avhengig av valgt kodek) vil bli justert over minimumsverdien under samtaler for å minimere båndbredden til denne verdien."
+msgstr ""
+"Maksimal videobåndbredde i kbit/s. Videokvaliteten og antall overførte "
+"rammer per sekund (avhengig av valgt kodek) vil bli justert over "
+"minimumsverdien under samtaler for å minimere båndbredden til denne verdien."
 
 #: ../ekiga.schemas.in.in.h:109
 msgid "The maximum jitter buffer size for audio reception (in ms)"
@@ -584,7 +587,10 @@
 "The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
 "port range has no effect if both participants to the conference are using "
 "H.245 Tunneling."
-msgstr "Området med TCP-porter som Ekiga vil bruke for H323 H.245-kanalen. Portintervallet har ingen effekt hvis begge konferansedeltakerne bruker H.245-tunnellering."
+msgstr ""
+"Området med TCP-porter som Ekiga vil bruke for H323 H.245-kanalen. "
+"Portintervallet har ingen effekt hvis begge konferansedeltakerne bruker "
+"H.245-tunnellering."
 
 #: ../ekiga.schemas.in.in.h:118
 msgid "The range of UDP ports that Ekiga will use."
@@ -673,10 +679,12 @@
 "This allows you to set the mode for sending DTMFs. The values can be \"String"
 "\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
 "\"). Choosing other values than \"String\" disables the Text Chat"
-msgstr "Dette tillater innstilling av modus for sending av DTMF. Verdiene kan være «String» (0), «Tone» (1), «RFC2833» (2), «Q.931» (3) (standardverdi er «String»). Ved valg av andre verdier enn «String» deaktiveres tekstsamtale"
+msgstr ""
+"Dette tillater innstilling av modus for sending av DTMF. Verdiene kan være "
+"«String» (0), «Tone» (1), «RFC2833» (2), «Q.931» (3) (standardverdi er «String»). "
+"Ved valg av andre verdier enn «String» deaktiveres tekstsamtale"
 
 #: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
-#, fuzzy
 msgid ""
 "This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
 "are encapsulated into the H.225 channel (port 1720). This saves one TCP "
@@ -712,7 +720,7 @@
 msgid "Video format"
 msgstr "Videoformat"
 
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1155
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr "Enhet for innkommende video"
 
@@ -731,122 +739,122 @@
 "Highest minimal quality, 31: lowest minimal quality"
 msgstr ""
 
-#: ../lib/engine/addressbook/contact-core.cpp:58
+#: ../lib/engine/addressbook/contact-core.cpp:60
 msgid "_Find"
 msgstr "_Finn"
 
 #: ../lib/engine/components/avahi/avahi-heap.cpp:125
-#: ../lib/engine/components/avahi/avahi-heap.cpp:306
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
 msgid "Neighbours"
 msgstr "Naboer"
 
-#: ../lib/engine/components/call-history/history-book.cpp:140
+#: ../lib/engine/components/call-history/history-book.cpp:137
 #: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
 msgid "Clear List"
 msgstr "Tøm listen"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:153
+#: ../lib/engine/components/call-history/history-contact.cpp:155
 msgid "Received"
 msgstr "Mottatt"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:156
+#: ../lib/engine/components/call-history/history-contact.cpp:158
 msgid "Placed"
 msgstr "Oppringt"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:159
+#: ../lib/engine/components/call-history/history-contact.cpp:161
 msgid "Missed"
 msgstr "Tapt"
 
 #: ../lib/engine/components/evolution/evolution-book.cpp:76
-#: ../lib/engine/components/ldap/ldap-book.cpp:909
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
 #, c-format
 msgid "%d user found"
 msgid_plural "%d users found"
 msgstr[0] "%d bruker funnet"
 msgstr[1] "%d brukere funnet"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:244
+#: ../lib/engine/components/evolution/evolution-book.cpp:283
 msgid "New _Contact"
 msgstr "Ny _kontakt"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:288
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
 #: ../lib/engine/components/local-roster/local-cluster.cpp:82
 #: ../lib/engine/components/local-roster/local-heap.cpp:117
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:290
-#: ../lib/engine/components/evolution/evolution-contact.cpp:328
-#: ../lib/engine/components/opal/opal-account.cpp:351
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
 msgid "Please update the following fields:"
 msgstr "Vennligst oppdater følgende felt:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:292
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:293
-#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
 msgid "VoIP _URI:"
 msgstr "VoIP-_URI:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:294
-#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
 msgid "_Home phone:"
 msgstr "_Hjemmetelefon:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:295
-#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
 msgid "_Office phone:"
 msgstr "K_ontortelefon:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:296
-#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+#: ../lib/engine/components/evolution/evolution-book.cpp:327
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
 msgid "_Cell phone:"
 msgstr "Mo_biltelefon:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:297
-#: ../lib/engine/components/evolution/evolution-contact.cpp:343
+#: ../lib/engine/components/evolution/evolution-book.cpp:328
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
 msgid "_Pager:"
 msgstr "_Personsøker:"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:234
-#: ../lib/engine/components/local-roster/local-presentity.cpp:197
-#: ../lib/engine/components/opal/opal-account.cpp:308
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:203
-#: ../src/gui/main.cpp:3173
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3178
 msgid "_Edit"
 msgstr "R_ediger"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:236
-#: ../lib/engine/components/local-roster/local-presentity.cpp:199
-#: ../lib/engine/components/opal/opal-account.cpp:310
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:205
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
 msgid "Edit contact"
 msgstr "Rediger kontakt"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:330
-#: ../lib/engine/components/local-roster/local-presentity.cpp:224
-#: ../lib/engine/components/local-roster/local-heap.cpp:184
-#: ../lib/engine/components/local-roster/local-heap.cpp:364
-#: ../lib/engine/components/opal/opal-account.cpp:353
-#: ../lib/engine/components/opal/opal-bank.cpp:99
-#: ../lib/engine/components/opal/opal-bank.cpp:109
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:169
-#: ../lib/engine/components/resource-list/rl-heap.cpp:544
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:224
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:395
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
 msgid "Remove contact"
 msgstr "Fjern kontakt"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:397
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
 #, c-format
 msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr "Er du sikker på at du vil fjerne %s fra adresseboken?"
@@ -864,30 +872,30 @@
 msgstr "Bildetest"
 
 #. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Crazy"
 msgstr "Gal"
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Screencast"
 msgstr "Skjermkringkasting"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:409
-#: ../lib/engine/components/resource-list/rl-entry.cpp:143
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:130
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
 msgid "_Refresh"
 msgstr "Oppdate_r"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:412
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
 msgid "_Remove addressbook"
 msgstr "Fje_rn adressebok"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:414
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
 msgid "Addressbook _properties"
 msgstr "Egenska_per for adressebok"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:545
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
 msgid "LDAP SASL Interaction"
 msgstr "LDAP SASL-interaksjon"
 
@@ -900,136 +908,136 @@
 #. * say about it. You might google for "challenge response
 #. * authentication" if you'd like more background context.
 #.
-#: ../lib/engine/components/ldap/ldap-book.cpp:587
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
 msgid "Challenge: "
 msgstr "Utfordring: "
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:595
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
 msgid "Interact"
 msgstr "Interager"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:664
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
 msgid "Refreshing"
 msgstr "Oppdaterer"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:670
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
 msgid "Could not initialize server"
 msgstr "Kunne ikke initiere tjener"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:684
-#: ../lib/engine/components/ldap/ldap-book.cpp:729
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
 msgid "LDAP Error: "
 msgstr "LDAP-feil: "
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:738
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
 msgid "Contacted server"
 msgstr "Kontaktet tjener"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:781
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
 msgid "Could not connect to server"
 msgstr "Kunne ikke koble til tjener"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:829
-#: ../lib/engine/components/ldap/ldap-book.cpp:882
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
 msgid "Could not search"
 msgstr "Kunne ikke søke"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:837
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
 msgid "Waiting for search results"
 msgstr "Venter på søkeresultater"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:931
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
 msgid "Please edit the following fields"
 msgstr "Vennligst rediger følgende felt"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:933
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
 msgid "Book _Name"
 msgstr "_Navn på bok"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:934
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
 msgid "Server _URI"
 msgstr "_URI til tjener"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:935
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
 msgid "_Base DN"
 msgstr "_Base DN"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:941
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
 msgid "Subtree"
 msgstr "Undertre"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:942
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
 msgid "Single Level"
 msgstr "Ett nivå"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
 msgid "_Search Scope"
 msgstr "_Søkeområde"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:952
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
 msgid "_DisplayName Attribute"
 msgstr "_Visningsnavn-attributt"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:953
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
 msgid "Call _Attributes"
 msgstr "Samt_aleattributt"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:955
-#: ../lib/engine/components/ldap/ldap-book.cpp:957
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
 msgid "_Filter Template"
 msgstr "Mal for _filter"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:959
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
 msgid "Bind _ID"
 msgstr "Bind-_ID"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:960
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
 msgid "_Password"
 msgstr "_Passord"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:961
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
 msgid "Use TLS"
 msgstr "Bruk TLS"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:962
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
 msgid "Use SASL"
 msgstr "Bruk SASL"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:976
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
 msgid "SASL _Mechanism"
 msgstr "SASL-_mekanisme"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:987
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
 msgid "Edit LDAP directory"
 msgstr "Rediger LDAP-katalog"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1016
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
 msgid "Please provide a Book Name for this directory\n"
 msgstr "Oppgi et navn på denne katalogen\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1019
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
 msgid "Please provide a Server URI\n"
 msgstr "Oppgi URI til tjener\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1022
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
 msgid "Please provide a DisplayName Attribute\n"
 msgstr ""
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1025
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
 msgid "Please provide a Call Attribute\n"
 msgstr ""
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1028
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
 msgid "Invalid Server URI\n"
 msgstr "Ugyldig URI til tjener\n"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:127
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
 msgid "Add an LDAP Address Book"
 msgstr "Legg til en LDAP-adressebok"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:130
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
 msgid "Add the Ekiga.net Directory"
 msgstr "Legg til ekiga.net-katalogen"
 
@@ -1041,11 +1049,11 @@
 msgid "Ekiga.net Directory"
 msgstr "Ekiga.net-katalog"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:221
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
 msgid "Edit roster element"
 msgstr "Rediger element i roster"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:222
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
@@ -1053,35 +1061,35 @@
 "Vennligst fyll ut dette skjemaet for å endre et eksisterende element i "
 "ekiga's interne roster"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:225
-#: ../lib/engine/components/local-roster/local-heap.cpp:193
-#: ../lib/engine/components/local-roster/local-heap.cpp:195
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:170
-#: ../lib/engine/components/resource-list/rl-heap.cpp:545
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
 msgid "Address:"
 msgstr "Adresse:"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:227
-#: ../lib/engine/components/resource-list/rl-heap.cpp:546
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
 msgid "Choose groups:"
 msgstr "Velg grupper:"
 
 #: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
-#: ../lib/engine/components/local-roster/local-heap.cpp:181
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
 msgid "Add to local roster"
 msgstr "Legg til i lokal kontaktliste"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:92
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
 msgid "Services"
 msgstr "Tjenester"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
 msgid "Echo test"
 msgstr "Ekko-test"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:94
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
 msgid "Conference room"
 msgstr "Konferanserom"
 
@@ -1093,130 +1101,145 @@
 msgid "Rename"
 msgstr "Endre navn"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:160
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
 msgid "Family"
 msgstr "Familie"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:161
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
 msgid "Friend"
 msgstr "Venn"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:162
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
 msgid "Associate"
 msgstr "Kollega"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:163
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
 msgid "Assistant"
 msgstr "Assistent"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:164
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
 msgid "Supervisor"
 msgstr "Leder"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:165
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
 msgid "Self"
 msgstr "Meg"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:182
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
 msgid ""
 "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr ""
 "Vennligst fyll ut dette skjemaet for å legge til en ny kontakt i ekiga's "
 "interne kontaktliste"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:199
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
 msgid "Put contact in groups:"
 msgstr "Legg til kontakten i grupper:"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:335
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
 msgid "You supplied an unsupported address"
 msgstr "Du oppga en adresse som ikke er støttet"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:337
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
 msgid "You already have a contact with this address!"
 msgstr "Du har allerede en kontakt med denne adressen!"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:362
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
 msgid "Rename group"
 msgstr "Endre navn på gruppe"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:363
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
 msgid "Please edit this group name"
 msgstr "Vennligst rediger navnet på denne gruppen"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:143
-#: ../lib/engine/components/opal/sip-endpoint.cpp:257
-#: ../lib/engine/components/opal/sip-endpoint.cpp:261
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:230
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
 msgid "Call"
 msgstr "Ring"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:146
-#: ../lib/engine/components/opal/sip-endpoint.cpp:258
-#: ../lib/engine/components/opal/sip-endpoint.cpp:262 ../src/gui/main.cpp:2947
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:231
+#: ../lib/engine/components/opal/sip-endpoint.cpp:235 ../src/gui/main.cpp:2952
 msgid "Transfer"
 msgstr "Overfør"
 
 #. Translators : The alias we are registering already exists : failure
-#: ../lib/engine/components/opal/h323-endpoint.cpp:310
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
 msgid "Duplicate alias"
 msgstr "Duplisert alias"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:313
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
 msgid "Bad username/password"
 msgstr "Ugyldig brukernavn/passord"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:316
-#: ../lib/engine/components/opal/sip-endpoint.cpp:896
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:911
 msgid "Transport error"
 msgstr "Transportfeil"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:327
-#: ../lib/engine/components/opal/h323-endpoint.cpp:332
-#: ../lib/engine/components/opal/sip-endpoint.cpp:903
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:918
 msgid "Failed"
 msgstr "Feilet"
 
-#: ../lib/engine/components/opal/opal-account.cpp:300
+#: ../lib/engine/components/opal/opal-account.cpp:303
 msgid "_Disable"
 msgstr "_Deaktiver"
 
-#: ../lib/engine/components/opal/opal-account.cpp:303
+#: ../lib/engine/components/opal/opal-account.cpp:306
 msgid "_Enable"
 msgstr "_Aktiver"
 
-#: ../lib/engine/components/opal/opal-account.cpp:324
-#: ../src/gui/assistant.cpp:727
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
 msgid "Recharge the account"
 msgstr "Gjenopplad konto"
 
-#: ../lib/engine/components/opal/opal-account.cpp:329
-#: ../src/gui/assistant.cpp:739
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
 msgid "Consult the balance history"
 msgstr "Se på balansehistorikken"
 
-#: ../lib/engine/components/opal/opal-account.cpp:334
+#: ../lib/engine/components/opal/opal-account.cpp:337
 msgid "Consult the call history"
 msgstr "Se på samtalehistorikken"
 
-#: ../lib/engine/components/opal/opal-account.cpp:349
-#: ../lib/engine/components/opal/opal-bank.cpp:72
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
 msgid "Edit account"
 msgstr "Rediger konto"
 
-#: ../lib/engine/components/opal/opal-account.cpp:355
-#: ../lib/engine/components/opal/opal-bank.cpp:110
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
 msgid "Registrar:"
 msgstr "Registrar:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:357
-#: ../lib/engine/components/opal/opal-bank.cpp:100
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
 msgid "Gatekeeper:"
 msgstr "Portner:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:358
-#: ../lib/engine/components/opal/opal-bank.cpp:81
-#: ../lib/engine/components/opal/opal-bank.cpp:101
-#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:174
 msgid "User:"
 msgstr "Bruker:"
@@ -1224,166 +1247,168 @@
 #. Translators:
 #. * SIP knows two usernames: The name for the client ("User") and the name
 #. * for the authentication procedure ("Authentication User")
-#: ../lib/engine/components/opal/opal-account.cpp:363
-#: ../lib/engine/components/opal/opal-bank.cpp:112
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
 msgid "Authentication User:"
 msgstr "Bruker for autentisering:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:364
-#: ../lib/engine/components/opal/opal-bank.cpp:83
-#: ../lib/engine/components/opal/opal-bank.cpp:103
-#: ../lib/engine/components/opal/opal-bank.cpp:113
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:173
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:365
-#: ../lib/engine/components/opal/opal-bank.cpp:104
-#: ../lib/engine/components/opal/opal-bank.cpp:114
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
 msgid "Timeout:"
 msgstr "Tidsavbrudd:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:366
-#: ../lib/engine/components/opal/opal-bank.cpp:117
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
 msgid "Enable Account"
 msgstr "Aktiver konto"
 
-#: ../lib/engine/components/opal/opal-account.cpp:401
-#: ../lib/engine/components/opal/opal-bank.cpp:155
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
 msgid "You did not supply a name for that account."
 msgstr "Du oppga ikke et navn for den kontoen."
 
-#: ../lib/engine/components/opal/opal-account.cpp:403
-#: ../lib/engine/components/opal/opal-bank.cpp:157
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
 msgid "You did not supply a host to register to."
 msgstr "Du oppga ikke en vert å registrere deg på."
 
-#: ../lib/engine/components/opal/opal-account.cpp:405
-#: ../lib/engine/components/opal/opal-bank.cpp:159
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
 msgid "You did not supply a user name for that account."
 msgstr "Du oppga ikke et brukernavn for den kontoen."
 
-#: ../lib/engine/components/opal/opal-account.cpp:407
-#: ../lib/engine/components/opal/opal-bank.cpp:161
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
 msgid "The timeout should have a bigger value."
 msgstr "Tidsavbruddet bør ha en større verdi."
 
-#: ../lib/engine/components/opal/opal-bank.cpp:53
+#: ../lib/engine/components/opal/opal-bank.cpp:75
 msgid "_Add an Ekiga.net Account"
 msgstr "_Legg til Ekiga.net-konto"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:55
+#: ../lib/engine/components/opal/opal-bank.cpp:77
 msgid "_Add an Ekiga Call Out Account"
 msgstr "_Legg til konto for å ringe ut med Ekiga"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:57
+#: ../lib/engine/components/opal/opal-bank.cpp:79
 msgid "_Add a SIP Account"
 msgstr "_Legg til en SIP-konto"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:59
+#: ../lib/engine/components/opal/opal-bank.cpp:81
 msgid "_Add an H.323 Account"
 msgstr "_Legg til en H.323-konto"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:73
+#: ../lib/engine/components/opal/opal-bank.cpp:96
 msgid "Please update the following fields."
 msgstr "Vennligst oppdater følgende felt."
 
-#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:607
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
 msgid "Get an Ekiga.net SIP account"
 msgstr "Lag en Ekiga.net SIP-konto"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:715
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
 msgid "Get an Ekiga Call Out account"
 msgstr "Lag en konto for å ringe ut med Ekiga"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:92 ../src/gui/main.cpp:2701
-#: ../src/gui/main.cpp:2796
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2706
+#: ../src/gui/main.cpp:2801
 msgid "Account ID:"
 msgstr "Konto-ID:"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:94
+#: ../lib/engine/components/opal/opal-bank.cpp:117
 msgid "PIN Code:"
 msgstr "PIN-kode:"
 
-#: ../lib/engine/components/opal/opal-call.cpp:444
+#: ../lib/engine/components/opal/opal-call.cpp:404
 msgid "Local user cleared the call"
 msgstr "Lokal bruker avsluttet samtalen"
 
-#: ../lib/engine/components/opal/opal-call.cpp:447
-#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:407
+#: ../lib/engine/components/opal/opal-call.cpp:410
 msgid "Local user rejected the call"
 msgstr "Lokal bruker avviste samtalen"
 
-#: ../lib/engine/components/opal/opal-call.cpp:453
+#: ../lib/engine/components/opal/opal-call.cpp:413
 msgid "Remote user cleared the call"
 msgstr "Ekstern bruker avsluttet samtalen"
 
-#: ../lib/engine/components/opal/opal-call.cpp:456
+#: ../lib/engine/components/opal/opal-call.cpp:416
 msgid "Remote user rejected the call"
 msgstr "Ekstern bruker avviste samtalen"
 
-#: ../lib/engine/components/opal/opal-call.cpp:459
+#: ../lib/engine/components/opal/opal-call.cpp:419
 msgid "Remote user has stopped calling"
 msgstr "Den andre brukeren har avsluttet anropet"
 
-#: ../lib/engine/components/opal/opal-call.cpp:462
+#: ../lib/engine/components/opal/opal-call.cpp:422
 msgid "Abnormal call termination"
 msgstr "Uvanlig anropsavslutning"
 
-#: ../lib/engine/components/opal/opal-call.cpp:465 ../src/gui/main.cpp:1491
+#: ../lib/engine/components/opal/opal-call.cpp:425 ../src/gui/main.cpp:1496
 msgid "Could not connect to remote host"
 msgstr "Kunne ikke koble til den andre enden"
 
-#: ../lib/engine/components/opal/opal-call.cpp:468
+#: ../lib/engine/components/opal/opal-call.cpp:428
 msgid "The Gatekeeper cleared the call"
 msgstr "Portvakten avsluttet samtalen"
 
-#: ../lib/engine/components/opal/opal-call.cpp:471
+#: ../lib/engine/components/opal/opal-call.cpp:431
 msgid "User not found"
 msgstr "Bruker ikke funnet"
 
-#: ../lib/engine/components/opal/opal-call.cpp:474
+#: ../lib/engine/components/opal/opal-call.cpp:434
 msgid "Insufficient bandwidth"
 msgstr "Ikke nok båndbredde"
 
-#: ../lib/engine/components/opal/opal-call.cpp:477
+#: ../lib/engine/components/opal/opal-call.cpp:437
 msgid "No common codec"
 msgstr "Ingen passende komprimering"
 
-#: ../lib/engine/components/opal/opal-call.cpp:480
+#: ../lib/engine/components/opal/opal-call.cpp:440
 msgid "Call forwarded"
 msgstr "Anrop videresendt"
 
-#: ../lib/engine/components/opal/opal-call.cpp:483
+#: ../lib/engine/components/opal/opal-call.cpp:443
 msgid "Security check failed"
 msgstr "Sikkerhetssjekk feilet"
 
-#: ../lib/engine/components/opal/opal-call.cpp:486
+#: ../lib/engine/components/opal/opal-call.cpp:446
 msgid "Local user is busy"
 msgstr "Lokal bruker er opptatt"
 
-#: ../lib/engine/components/opal/opal-call.cpp:489
-#: ../lib/engine/components/opal/opal-call.cpp:495
+#: ../lib/engine/components/opal/opal-call.cpp:449
+#: ../lib/engine/components/opal/opal-call.cpp:455
 msgid "Congested link to remote party"
 msgstr "Overbelastet forbindelse til ekstern bruker"
 
-#: ../lib/engine/components/opal/opal-call.cpp:492
+#: ../lib/engine/components/opal/opal-call.cpp:452
 msgid "Remote user is busy"
 msgstr "Ekstern bruker er opptatt"
 
-#: ../lib/engine/components/opal/opal-call.cpp:498
+#: ../lib/engine/components/opal/opal-call.cpp:458
 msgid "Remote host is offline"
 msgstr "Ekstern bruker er frakoblet"
 
-#: ../lib/engine/components/opal/opal-call.cpp:504
+#: ../lib/engine/components/opal/opal-call.cpp:464
 msgid "User is not available"
 msgstr "Bruker er ikke tilgjengelig"
 
-#: ../lib/engine/components/opal/opal-call.cpp:516
+#: ../lib/engine/components/opal/opal-call.cpp:476
 msgid "Call completed"
 msgstr "Samtale fullført"
 
-#: ../lib/engine/components/opal/opal-call-manager.cpp:725
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
 msgid ""
 "Ekiga did not manage to configure your network settings automatically. You "
 "can still use it, but you need to configure your network settings manually.\n"
@@ -1397,216 +1422,216 @@
 "Vennligst se på http://wiki.ekiga.org/index.php/"
 "Enable_port_forwarding_manually for mer informasjon"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:282
-#: ../lib/engine/components/opal/sip-endpoint.cpp:284
+#: ../lib/engine/components/opal/sip-endpoint.cpp:255
+#: ../lib/engine/components/opal/sip-endpoint.cpp:257
 msgid "Message"
 msgstr "Melding"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:710
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
 msgid "Bad request"
 msgstr "Ugyldig forespørsel"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:714
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
 msgid "Payment required"
 msgstr "Betaling kreves"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:718
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
 msgid "Unauthorized"
 msgstr "Ikke-autorisert"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:722
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
 msgid "Forbidden"
 msgstr "Forbudt"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:726
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
 msgid "Timeout"
 msgstr "Tidsavbrudd"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:730
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:734
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
 msgid "Temporarily unavailable"
 msgstr "Midlertidig utilgjengelig"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:738
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
 msgid "Not acceptable"
 msgstr "Ikke akseptabel"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:742
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
 msgid "Illegal status code"
 msgstr "Ugyldig statuskode"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:746
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
 msgid "Multiple choices"
 msgstr "Flere valg"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:750
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
 msgid "Moved permanently"
 msgstr "Flyttet permanent"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:754
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
 msgid "Moved temporarily"
 msgstr "Flyttet midlertidig"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:758
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
 msgid "Use proxy"
 msgstr "Bruk proxy"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:762
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
 msgid "Alternative service"
 msgstr "Alternativ tjeneste"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:766
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:770
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
 msgid "Method not allowed"
 msgstr "Metode ikke tillatt"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:774
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
 msgid "Proxy authentication required"
 msgstr "Autentisering for proxy kreves"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:778
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
 msgid "Length required"
 msgstr "Lengde kreves"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:782
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
 msgid "Request entity too big"
 msgstr "Etterspurt entitet for stor"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:786
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
 msgid "Request URI too long"
 msgstr "Etterspurt URI er for lang"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:790
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
 msgid "Unsupported media type"
 msgstr "Medietype ikke støttet"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:794
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
 msgid "Unsupported URI scheme"
 msgstr "URI-skjema ikke støttet"
 
 #. Translators : The extension we are trying to register does not exist
-#: ../lib/engine/components/opal/sip-endpoint.cpp:799
+#: ../lib/engine/components/opal/sip-endpoint.cpp:814
 msgid "Bad extension"
 msgstr "Ugyldig utvidelse"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:803
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
 msgid "Extension required"
 msgstr "Utvidelse kreves"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:807
+#: ../lib/engine/components/opal/sip-endpoint.cpp:822
 msgid "Interval too brief"
 msgstr "For kort intervall"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:811
+#: ../lib/engine/components/opal/sip-endpoint.cpp:826
 msgid "Loop detected"
 msgstr "Løkke oppdaget"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:815
+#: ../lib/engine/components/opal/sip-endpoint.cpp:830
 msgid "Too many hops"
 msgstr "For mange «hopp»"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:819
+#: ../lib/engine/components/opal/sip-endpoint.cpp:834
 msgid "Address incomplete"
 msgstr "Ufullstendig adresse"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:823
+#: ../lib/engine/components/opal/sip-endpoint.cpp:838
 msgid "Ambiguous"
 msgstr "Tvetydig"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:827
+#: ../lib/engine/components/opal/sip-endpoint.cpp:842
 msgid "Busy Here"
 msgstr "Opptatt her"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:831
+#: ../lib/engine/components/opal/sip-endpoint.cpp:846
 msgid "Request terminated"
 msgstr "Forespørsel avbrutt"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:835
+#: ../lib/engine/components/opal/sip-endpoint.cpp:850
 msgid "Not acceptable here"
 msgstr "Ikke akseptabel her"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:839
+#: ../lib/engine/components/opal/sip-endpoint.cpp:854
 msgid "Bad event"
 msgstr "Ugyldig hendelse"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:843
+#: ../lib/engine/components/opal/sip-endpoint.cpp:858
 msgid "Request pending"
 msgstr "Forespørsel utestående"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:847
+#: ../lib/engine/components/opal/sip-endpoint.cpp:862
 msgid "Undecipherable"
 msgstr "Uforståelig"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:851
+#: ../lib/engine/components/opal/sip-endpoint.cpp:866
 msgid "Internal server error"
 msgstr "Intern feil med tjener"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:855
+#: ../lib/engine/components/opal/sip-endpoint.cpp:870
 msgid "Not implemented"
 msgstr "Ikke implementert"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:859
+#: ../lib/engine/components/opal/sip-endpoint.cpp:874
 msgid "Bad gateway"
 msgstr "Ugyldig portner"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:863
+#: ../lib/engine/components/opal/sip-endpoint.cpp:878
 msgid "Service unavailable"
 msgstr "Tjeneste ikke tilgjengelig"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:867
+#: ../lib/engine/components/opal/sip-endpoint.cpp:882
 msgid "Server timeout"
 msgstr "Tidsavbrudd for tjener"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:871
+#: ../lib/engine/components/opal/sip-endpoint.cpp:886
 msgid "SIP version not supported"
 msgstr "SIP-versjon ikke støttet"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:875
+#: ../lib/engine/components/opal/sip-endpoint.cpp:890
 msgid "Message too large"
 msgstr "Melding for stor"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:879
+#: ../lib/engine/components/opal/sip-endpoint.cpp:894
 msgid "Busy everywhere"
 msgstr "Opptatt over alt"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:883
+#: ../lib/engine/components/opal/sip-endpoint.cpp:898
 msgid "Decline"
 msgstr "Avstå"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:887
+#: ../lib/engine/components/opal/sip-endpoint.cpp:902
 msgid "Does not exist anymore"
 msgstr "Eksisterer ikke lenger"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:891
+#: ../lib/engine/components/opal/sip-endpoint.cpp:906
 msgid "Globally not acceptable"
 msgstr "Globalt ikke akseptabel"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1020
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1043
 msgid "Could not send message"
 msgstr "Kunne ikke sende melding"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1165
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Innkommende anrop fra %s"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1136
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1167
 #, c-format
 msgid "Incoming call"
 msgstr "Innkommende anrop"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1142
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1173
 #, c-format
 msgid "In a call with %s"
 msgstr "I samtale med %s"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1144
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1175
 #, c-format
 msgid "In a call"
 msgstr "I en samtale"
@@ -1622,7 +1647,9 @@
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:167
 msgid ""
 "Please fill in this form to add a new contact list to ekiga's remote roster"
-msgstr "Vennligst fyll ut dette skjemaet for å legge til en ny kontakt i ekiga's eksterne kontaktliste"
+msgstr ""
+"Vennligst fyll ut dette skjemaet for å legge til en ny kontakt i ekiga's "
+"eksterne kontaktliste"
 
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:171
 msgid "Writable:"
@@ -1632,11 +1659,11 @@
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:103
-#: ../lib/engine/components/resource-list/rl-heap.cpp:144
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
 #: ../lib/engine/components/resource-list/rl-heap.cpp:178
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:133
-#: ../lib/engine/components/resource-list/rl-entry.cpp:130
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
 msgid "Unnamed"
 msgstr "Uten navn"
 
@@ -1652,75 +1679,79 @@
 msgid "Contact list _properties"
 msgstr "Egenska_per for kontaktliste"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:467
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
 msgid "Edit contact list properties"
 msgstr "Rediger egenskaper for kontaktliste"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
 msgid "Please edit the following fields (no identifier means global)"
 msgstr "Vennligst rediger følgende felt (ingen identifikator betyr global)"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
 msgid "Contact list's name"
 msgstr "Navn på kontaktliste"
 
 #. "Document" used as a name -- uri point to the root of a document tree
-#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
 msgid "Document root"
 msgstr "Dokumentrot"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
 msgid "Identifier"
 msgstr "Identifikator"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:476
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
 msgid "Writable"
 msgstr "Skrivbar"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:477
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
 msgid "Server username"
 msgstr "Brukernavn for tjener"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:478
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
 msgid "Server password"
 msgstr "Passord for tjener"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:530
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
 msgid "Add a remote contact"
 msgstr "Legg til en ekstern kontakt"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:531
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
 msgid "Please fill in this form to create a new contact on a remote server"
-msgstr "Vennligst fyll ut dette skjemaet for å legge til en ny kontakt på en ekstern tjener"
+msgstr ""
+"Vennligst fyll ut dette skjemaet for å legge til en ny kontakt på en ekstern "
+"tjener"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:221
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
 msgid "Edit remote contact"
 msgstr "Rediger ekstern kontakt"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
 msgid ""
 "Please fill in this form to change an existing contact on a remote server"
-msgstr "Vennligst fyll ut dette skjemaet for å endre en eksisterende kontakt på en ekstern tjener"
+msgstr ""
+"Vennligst fyll ut dette skjemaet for å endre en eksisterende kontakt på en "
+"ekstern tjener"
 
-#: ../lib/engine/components/resource-list/rl-entry.cpp:186
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
 msgid "Invalid server data"
 msgstr "Ugyldige data fra tjener"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:51
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
 msgid "Click to fetch"
 msgstr "Klikk for å hente"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:118
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
 #, fuzzy
 msgid "Distant contact"
 msgstr "Fjern kontakt"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:181
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
 #, c-format
 msgid "%s / List #%d"
 msgstr "%s / Vis #%d"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:185
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
 #, c-format
 msgid "List #%d"
 msgstr "Vis #%d"
@@ -1734,7 +1765,7 @@
 msgstr "Adressebok"
 
 #: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
-#: ../src/gui/main.cpp:3122
+#: ../src/gui/main.cpp:3127
 msgid "Address _Book"
 msgstr "_Adressebok"
 
@@ -1748,7 +1779,7 @@
 msgstr "Kategori"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
-#: ../src/gui/assistant.cpp:1379
+#: ../src/gui/assistant.cpp:1368
 msgid "Full Name"
 msgstr "Fullt navn"
 
@@ -1768,7 +1799,7 @@
 msgid "Copy link"
 msgstr "Kopier lenke"
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:904
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
 msgid "_Smile..."
 msgstr "_Smil..."
 
@@ -1782,11 +1813,11 @@
 msgid "Unsorted"
 msgstr "Usortert"
 
-#: ../lib/gui/codecsbox.cpp:477
+#: ../lib/gui/codecsbox.cpp:478
 msgid "Move selected codec priority upwards"
 msgstr "Flytt prioritet for valgt kodek oppover"
 
-#: ../lib/gui/codecsbox.cpp:487
+#: ../lib/gui/codecsbox.cpp:488
 msgid "Move selected codec priority downwards"
 msgstr "Flytt prioritet for valgt kodek nedover"
 
@@ -1794,47 +1825,47 @@
 msgid "Do not show this dialog again"
 msgstr "Ikke vis denne dialogen igjen"
 
-#: ../src/gui/accounts.cpp:229
+#: ../src/gui/accounts.cpp:230
 msgid "Registered"
 msgstr "Registrert"
 
-#: ../src/gui/accounts.cpp:233
+#: ../src/gui/accounts.cpp:234
 msgid "Unregistered"
 msgstr "Registrering fjernet"
 
-#: ../src/gui/accounts.cpp:237
+#: ../src/gui/accounts.cpp:238
 msgid "Could not unregister"
 msgstr "Kunne ikke fjerne registrering"
 
-#: ../src/gui/accounts.cpp:243
+#: ../src/gui/accounts.cpp:244
 msgid "Could not register"
 msgstr "Kunne ikke registrere"
 
-#: ../src/gui/accounts.cpp:249
+#: ../src/gui/accounts.cpp:250
 msgid "Processing..."
 msgstr "Prosesserer..."
 
-#: ../src/gui/accounts.cpp:632
+#: ../src/gui/accounts.cpp:636
 msgid "Account Name"
 msgstr "Kontonavn"
 
-#: ../src/gui/accounts.cpp:633
+#: ../src/gui/accounts.cpp:637
 msgid "Voice Mails"
 msgstr "Talemeldinger"
 
-#: ../src/gui/accounts.cpp:634
+#: ../src/gui/accounts.cpp:638
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gui/accounts.cpp:645 ../src/gui/accounts.cpp:688
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../src/gui/accounts.cpp:659 ../src/gui/main.cpp:3183
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3188
 msgid "_Accounts"
 msgstr "_Kontoer"
 
-#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3266
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3271
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -1843,11 +1874,11 @@
 #. * description in the list of configured accounts, it shows if an account
 #. * is activated or not (a status the user can choose).
 #.
-#: ../src/gui/accounts.cpp:696 ../src/gui/preferences.cpp:586
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
 msgid "A"
 msgstr "L"
 
-#: ../src/gui/assistant.cpp:325
+#: ../src/gui/assistant.cpp:321
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1861,20 +1892,20 @@
 "Når du er ferdig med disse innstilingene, kan du endre dem ved å velge "
 "Brukervalg i Rediger-menyen."
 
-#: ../src/gui/assistant.cpp:333
+#: ../src/gui/assistant.cpp:329
 msgid "Welcome to Ekiga"
 msgstr "Velkommen til Ekiga"
 
-#: ../src/gui/assistant.cpp:367 ../src/gui/preferences.cpp:454
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:370
+#: ../src/gui/assistant.cpp:356
 msgid "Please enter your first name and your surname:"
 msgstr "Skriv inn fornavn og etternavn:"
 
-#: ../src/gui/assistant.cpp:379
+#: ../src/gui/assistant.cpp:365
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
@@ -1882,19 +1913,19 @@
 "Ditt fornavn og etternavn vil bli brukt ved oppkopling til andre VoIP- og "
 "videokonferanseprogram."
 
-#: ../src/gui/assistant.cpp:570
+#: ../src/gui/assistant.cpp:559
 msgid "Ekiga.net Account"
 msgstr "Ekiga.net-konto"
 
-#: ../src/gui/assistant.cpp:572
+#: ../src/gui/assistant.cpp:561
 msgid "Please enter your username:"
 msgstr "Vennligst oppgi ditt brukernavn:"
 
-#: ../src/gui/assistant.cpp:580
+#: ../src/gui/assistant.cpp:569
 msgid "Please enter your password:"
 msgstr "Vennligst oppgi ditt passord:"
 
-#: ../src/gui/assistant.cpp:590
+#: ../src/gui/assistant.cpp:579
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1912,23 +1943,23 @@
 "Du kan hoppe over dette steget hvis du bruker en annen SIP-tjeneste, eller "
 "hvis du foretrekker å oppgi disse detaljene senere."
 
-#: ../src/gui/assistant.cpp:617
+#: ../src/gui/assistant.cpp:606
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "Jeg vil ikke registrere meg for å få gratistjenesten fra ekiga.net"
 
-#: ../src/gui/assistant.cpp:680
+#: ../src/gui/assistant.cpp:669
 msgid "Ekiga Call Out Account"
 msgstr "Konto for å ringe ut med Ekiga"
 
-#: ../src/gui/assistant.cpp:682
+#: ../src/gui/assistant.cpp:671
 msgid "Please enter your account ID:"
 msgstr "Vennligst oppgi ID for din konto:"
 
-#: ../src/gui/assistant.cpp:690
+#: ../src/gui/assistant.cpp:679
 msgid "Please enter your PIN code:"
 msgstr "Vennligst oppgi din PIN-kode:"
 
-#: ../src/gui/assistant.cpp:701
+#: ../src/gui/assistant.cpp:690
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1948,49 +1979,49 @@
 "Tjenesten vil kun fungere hvis kontoen opprettes via URLen i denne "
 "dialogen.\n"
 
-#: ../src/gui/assistant.cpp:751
+#: ../src/gui/assistant.cpp:740
 msgid "Consult the calls history"
 msgstr "Vis samtalehistorikken"
 
-#: ../src/gui/assistant.cpp:761
+#: ../src/gui/assistant.cpp:750
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr ""
 "Jeg vil ikke registrere meg for å få tjenesten for å ringe ut med Ekiga"
 
-#: ../src/gui/assistant.cpp:827 ../src/gui/assistant.cpp:1390
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
 msgid "Connection Type"
 msgstr "Tilkoblingstype"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:830
+#: ../src/gui/assistant.cpp:819
 msgid "Please choose your connection type:"
 msgstr "Velg din tilkoblingstype:"
 
-#: ../src/gui/assistant.cpp:847
+#: ../src/gui/assistant.cpp:836
 msgid "56k Modem"
 msgstr "56K modem"
 
-#: ../src/gui/assistant.cpp:852
+#: ../src/gui/assistant.cpp:841
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:857
+#: ../src/gui/assistant.cpp:846
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "DSL/kabel (128 kbit/s opplasting)"
 
-#: ../src/gui/assistant.cpp:862
+#: ../src/gui/assistant.cpp:851
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "DSL/kabel (512 kbit/s opplasting)"
 
-#: ../src/gui/assistant.cpp:867
+#: ../src/gui/assistant.cpp:856
 msgid "LAN"
 msgstr "LAN"
 
-#: ../src/gui/assistant.cpp:872
+#: ../src/gui/assistant.cpp:861
 msgid "Keep current settings"
 msgstr "Behold nåværende innstillinger"
 
-#: ../src/gui/assistant.cpp:877
+#: ../src/gui/assistant.cpp:866
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -2000,16 +2031,16 @@
 "bruke under samtaler. Du kan senere endre innstillingene individuelt i "
 "brukervalgvinduet."
 
-#: ../src/gui/assistant.cpp:971 ../src/gui/main.cpp:3012
-#: ../src/gui/main.cpp:3016 ../src/gui/preferences.cpp:760
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3017
+#: ../src/gui/main.cpp:3021 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "Lydenheter"
 
-#: ../src/gui/assistant.cpp:973
+#: ../src/gui/assistant.cpp:962
 msgid "Please choose the audio ringing device:"
 msgstr "Velg ringeenhet for lyd:"
 
-#: ../src/gui/assistant.cpp:993
+#: ../src/gui/assistant.cpp:982
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
@@ -2018,11 +2049,11 @@
 "av ringelyden for innkommende samtaler."
 
 #. ---
-#: ../src/gui/assistant.cpp:1004
+#: ../src/gui/assistant.cpp:993
 msgid "Please choose the audio output device:"
 msgstr "Velg enhet for avspilling av lyd:"
 
-#: ../src/gui/assistant.cpp:1024
+#: ../src/gui/assistant.cpp:1013
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
@@ -2031,11 +2062,11 @@
 "av lyd under samtaler."
 
 #. ---
-#: ../src/gui/assistant.cpp:1035
+#: ../src/gui/assistant.cpp:1024
 msgid "Please choose the audio input device:"
 msgstr "Velg enhet for opptak av lyd:"
 
-#: ../src/gui/assistant.cpp:1055
+#: ../src/gui/assistant.cpp:1044
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
@@ -2043,11 +2074,11 @@
 "Inndataenhet for lyd er den enheten som lydhåndtereren vil bruke for å gjøre "
 "opptak av stemmen din under samtaler."
 
-#: ../src/gui/assistant.cpp:1157
+#: ../src/gui/assistant.cpp:1146
 msgid "Please choose your video input device:"
 msgstr "Velg enhet for opptak av video:"
 
-#: ../src/gui/assistant.cpp:1177
+#: ../src/gui/assistant.cpp:1166
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
@@ -2055,17 +2086,17 @@
 "Inndataenhet for video er den enheten som vil bli brukt for å gjøre opptak "
 "av video under samtaler."
 
-#: ../src/gui/assistant.cpp:1242 ../src/gui/assistant.cpp:1266
-#: ../src/gui/assistant.cpp:1290 ../src/gui/preferences.cpp:805
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
 #: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "Ingen enhet funnet"
 
-#: ../src/gui/assistant.cpp:1321
+#: ../src/gui/assistant.cpp:1310
 msgid "Configuration Complete"
 msgstr "Konfigurasjon fullført"
 
-#: ../src/gui/assistant.cpp:1323
+#: ../src/gui/assistant.cpp:1312
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
@@ -2073,35 +2104,35 @@
 "Du har nå fullført konfigurasjon av Ekiga. Alle innstillinger kan endres i "
 "brukervalg for programmet."
 
-#: ../src/gui/assistant.cpp:1330
+#: ../src/gui/assistant.cpp:1319
 msgid "Configuration summary:"
 msgstr "Konfigurasjonssammendrag:"
 
-#: ../src/gui/assistant.cpp:1400
+#: ../src/gui/assistant.cpp:1389
 msgid "Audio Ringing Device"
 msgstr "Ringeenhet for lyd"
 
-#: ../src/gui/assistant.cpp:1409
+#: ../src/gui/assistant.cpp:1398
 msgid "Audio Output Device"
 msgstr "Ut-enhet for lyd"
 
-#: ../src/gui/assistant.cpp:1418
+#: ../src/gui/assistant.cpp:1407
 msgid "Audio Input Device"
 msgstr "Inn-enhet for lyd"
 
-#: ../src/gui/assistant.cpp:1427
+#: ../src/gui/assistant.cpp:1416
 msgid "Video Input Device"
 msgstr "Inn-enhet for video"
 
-#: ../src/gui/assistant.cpp:1440
+#: ../src/gui/assistant.cpp:1429
 msgid "SIP URI"
 msgstr "SIP-URI"
 
-#: ../src/gui/assistant.cpp:1452
+#: ../src/gui/assistant.cpp:1441
 msgid "Ekiga Call Out"
 msgstr "Ring ut med Ekiga"
 
-#: ../src/gui/assistant.cpp:1496
+#: ../src/gui/assistant.cpp:1485
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr "Ekiga konfigurasjonsveiviser (%d av %d)"
@@ -2216,96 +2247,96 @@
 msgstr "wxyz"
 
 #. Translators: Is displayed once an account "%s" is registered.
-#: ../src/gui/main.cpp:519
+#: ../src/gui/main.cpp:521
 #, c-format
 msgid "Registered %s"
 msgstr "Registrerte %s"
 
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:526
+#: ../src/gui/main.cpp:528
 #, c-format
 msgid "Unregistered %s"
 msgstr "Fjernet registrering for %s"
 
-#: ../src/gui/main.cpp:531
+#: ../src/gui/main.cpp:533
 #, c-format
 msgid "Could not unregister %s"
 msgstr "Kunne ikke fjerne registrering for %s"
 
-#: ../src/gui/main.cpp:535
+#: ../src/gui/main.cpp:537
 #, c-format
 msgid "Could not register %s"
 msgstr "Kunne ikke registrere %s"
 
-#: ../src/gui/main.cpp:605
+#: ../src/gui/main.cpp:607
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 
-#: ../src/gui/main.cpp:651
+#: ../src/gui/main.cpp:653
 #, c-format
 msgid "Connected with %s"
 msgstr "Koblet sammen med %s"
 
-#: ../src/gui/main.cpp:692 ../src/gui/main.cpp:3512
+#: ../src/gui/main.cpp:694 ../src/gui/main.cpp:3517
 msgid "Standby"
 msgstr "På vent"
 
-#: ../src/gui/main.cpp:753
+#: ../src/gui/main.cpp:755
 msgid "Call on hold"
 msgstr "Samtale på vent"
 
-#: ../src/gui/main.cpp:764
+#: ../src/gui/main.cpp:766
 msgid "Call retrieved"
 msgstr "Samtale hentet inn"
 
-#: ../src/gui/main.cpp:780
+#: ../src/gui/main.cpp:782
 #, c-format
 msgid "Missed call from %s"
 msgstr "Tapt anrop fra %s"
 
-#: ../src/gui/main.cpp:917
+#: ../src/gui/main.cpp:919
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/gui/main.cpp:982
+#: ../src/gui/main.cpp:984
 msgid "Error while initializing video output"
 msgstr "Feil under initiering av utenhet for video"
 
-#: ../src/gui/main.cpp:983
+#: ../src/gui/main.cpp:985
 msgid "No video will be displayed during this call->"
 msgstr "Bilde blir ikke vist i denne samtalen->"
 
-#: ../src/gui/main.cpp:993
+#: ../src/gui/main.cpp:995
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that no other application is using the accelerated video output."
 msgstr ""
 
-#: ../src/gui/main.cpp:995
+#: ../src/gui/main.cpp:997
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that you are using a color depth of 24 or 32 bits per pixel."
 msgstr ""
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1108
+#: ../src/gui/main.cpp:1110
 #, c-format
 msgid "Added video input device %s"
 msgstr "La til inngang for video %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1120
+#: ../src/gui/main.cpp:1122
 #, c-format
 msgid "Removed video input device %s"
 msgstr "Fjernet inn-enhet for video %s"
 
-#: ../src/gui/main.cpp:1137
+#: ../src/gui/main.cpp:1139
 #, c-format
 msgid "Error while accessing video device %s"
 msgstr "Feil under åpning av videoenhet %s"
 
-#: ../src/gui/main.cpp:1140
+#: ../src/gui/main.cpp:1142
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
@@ -2315,7 +2346,7 @@
 "alltid kan overføre et gitt bilde, eller den bevegelige logoen ved å velge "
 "«Picture» som videotillegg og «MovingLogo» eller «StaticPicture» som enhet."
 
-#: ../src/gui/main.cpp:1144
+#: ../src/gui/main.cpp:1146
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
@@ -2327,15 +2358,15 @@
 "ikke, eller hvis enheten fremdeles ikke er tilgjengelig må du sjekke "
 "rettighetene og at den riktige driveren blir lastet."
 
-#: ../src/gui/main.cpp:1148
+#: ../src/gui/main.cpp:1150
 msgid "Your video driver doesn't support the requested video format."
 msgstr "Din grafikkdriver støtter ikke forespurt videoformat."
 
-#: ../src/gui/main.cpp:1152
+#: ../src/gui/main.cpp:1154
 msgid "Could not open the chosen channel."
 msgstr "Kunne ikke åpne valgt kanal."
 
-#: ../src/gui/main.cpp:1156
+#: ../src/gui/main.cpp:1158
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2346,42 +2377,42 @@
 "Sjekk kjernedriverdokumentasjonen for å finne ut hvilken fargepalett som er "
 "støttet."
 
-#: ../src/gui/main.cpp:1160
+#: ../src/gui/main.cpp:1162
 msgid "Error while setting the frame rate."
 msgstr "Feil ved setting av bildefrekvens."
 
-#: ../src/gui/main.cpp:1164
+#: ../src/gui/main.cpp:1166
 msgid "Error while setting the frame size."
 msgstr "Feil ved setting av bildestørrelse."
 
-#: ../src/gui/main.cpp:1169 ../src/gui/main.cpp:1271 ../src/gui/main.cpp:1386
+#: ../src/gui/main.cpp:1171 ../src/gui/main.cpp:1273 ../src/gui/main.cpp:1388
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1219
+#: ../src/gui/main.cpp:1221
 #, c-format
 msgid "Added audio input device %s"
 msgstr "La til inn-enhet for lyd %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1236
+#: ../src/gui/main.cpp:1238
 #, c-format
 msgid "Removed audio input device %s"
 msgstr "Fjernet inn-enhet for lyd %s"
 
-#: ../src/gui/main.cpp:1253
+#: ../src/gui/main.cpp:1255
 #, c-format
 msgid "Error while opening audio input device %s"
 msgstr "Feil under åpning av inndataenhet for lyd %s"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
-#: ../src/gui/main.cpp:1258
+#: ../src/gui/main.cpp:1260
 msgid "Only silence will be transmitted."
 msgstr "Kun stillhet vil bli overført."
 
-#: ../src/gui/main.cpp:1262
+#: ../src/gui/main.cpp:1264
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2393,7 +2424,7 @@
 "fremdeles ikke er tilgjengelig må du sjekke innstillinger for lyd, eventuelt "
 "også rettigheter og om enheten er opptatt."
 
-#: ../src/gui/main.cpp:1266
+#: ../src/gui/main.cpp:1268
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2405,379 +2436,373 @@
 "hjelper å koble den til på nytt. Hvis den fremdeles ikke er tilgjengelig må "
 "du sjekke lydoppsettet."
 
-#: ../src/gui/main.cpp:1333
+#: ../src/gui/main.cpp:1335
 #, c-format
 msgid "Added audio output device %s"
 msgstr "La til ut-enhet for lyd %s"
 
-#: ../src/gui/main.cpp:1349
+#: ../src/gui/main.cpp:1351
 #, c-format
 msgid "Removed audio output device %s"
 msgstr "Fjernet ut-enhet for lyd %s"
 
-#: ../src/gui/main.cpp:1370
+#: ../src/gui/main.cpp:1372
 #, c-format
 msgid "Error while opening audio output device %s"
 msgstr "Feil under åpning av utenhet for lyd %s"
 
-#: ../src/gui/main.cpp:1373
+#: ../src/gui/main.cpp:1375
 msgid "No incoming sound will be played."
 msgstr "Ingen innkommende lyd vil bli avspilt."
 
-#: ../src/gui/main.cpp:1377
-#, fuzzy
+#: ../src/gui/main.cpp:1379
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
 "still is not accessible, please check your audio setup, the permissions and "
 "that the device is not busy."
-msgstr ""
-"Umulig å bruke den valgte lydenheten (%s) til avspilling. Sjekk "
-"lydoppsettet, rettighetene og at enheten ikke er opptatt."
+msgstr "Kan ikke åpne den valgte lydenheten for avspilling. Hvis det er en avtagbar enhet kan det være nok å koble den til på nytt. Hvis ikke eller hvis den fremdeles ikke er tilgjengelig må du sjekke lydoppsettet, rettighetene og at enheten ikke er opptatt."
 
-#: ../src/gui/main.cpp:1381
-#, fuzzy
+#: ../src/gui/main.cpp:1383
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
 "sufficient to reconnect it. If not, or if it still is not accessible, please "
 "check your audio setup."
-msgstr ""
-"Den valgte lydenheten (%s) ble åpnet skikkelig, men det er umulig å skrive "
-"data til den. Sjekk lydoppsettet."
+msgstr "Den valgte lydenheten ble åpnet skikkelig, men det er umulig å skrive data til den. Hvis det er en avtagbar enhet vil det kanskje være nok å koble den til på nytt. Hvis ikke eller hvis den fremdeles ikke er tilgjengelig må du sjekke lydoppsettet."
 
-#: ../src/gui/main.cpp:1569
+#: ../src/gui/main.cpp:1574
 msgid "Video Settings"
 msgstr "Videoinnstillinger"
 
-#: ../src/gui/main.cpp:1596
+#: ../src/gui/main.cpp:1601
 msgid "Adjust brightness"
 msgstr "Juster lysstyrke"
 
-#: ../src/gui/main.cpp:1617
+#: ../src/gui/main.cpp:1622
 msgid "Adjust whiteness"
 msgstr "Juster hvitfarge"
 
-#: ../src/gui/main.cpp:1638
+#: ../src/gui/main.cpp:1643
 msgid "Adjust color"
 msgstr "Juster farge"
 
-#: ../src/gui/main.cpp:1659
+#: ../src/gui/main.cpp:1664
 msgid "Adjust contrast"
 msgstr "Juster kontrast"
 
-#: ../src/gui/main.cpp:1705
+#: ../src/gui/main.cpp:1710
 msgid "Audio Settings"
 msgstr "Lydinnstillinger"
 
-#: ../src/gui/main.cpp:2316
+#: ../src/gui/main.cpp:2321
 msgid "_Retrieve Call"
 msgstr "_Hent anrop"
 
-#: ../src/gui/main.cpp:2329
+#: ../src/gui/main.cpp:2334
 msgid "_Hold Call"
 msgstr "_Stopp anrop"
 
-#: ../src/gui/main.cpp:2361 ../src/gui/main.cpp:3149
+#: ../src/gui/main.cpp:2366 ../src/gui/main.cpp:3154
 msgid "Suspend _Audio"
 msgstr "Pause _lyd"
 
-#: ../src/gui/main.cpp:2363 ../src/gui/main.cpp:3154
+#: ../src/gui/main.cpp:2368 ../src/gui/main.cpp:3159
 msgid "Suspend _Video"
 msgstr "Stopp _bilde"
 
-#: ../src/gui/main.cpp:2365
+#: ../src/gui/main.cpp:2370
 msgid "Resume _Audio"
 msgstr "Gjenoppta _lyd"
 
-#: ../src/gui/main.cpp:2367
+#: ../src/gui/main.cpp:2372
 msgid "Resume _Video"
 msgstr "Gjenoppta _bilde"
 
-#: ../src/gui/main.cpp:2650 ../src/gui/main.cpp:2802
+#: ../src/gui/main.cpp:2655 ../src/gui/main.cpp:2807
 msgid "Reject"
 msgstr "Avvis"
 
-#: ../src/gui/main.cpp:2652 ../src/gui/main.cpp:2801
+#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2806
 msgid "Accept"
 msgstr "Godta"
 
-#: ../src/gui/main.cpp:2658 ../src/gui/main.cpp:2789
+#: ../src/gui/main.cpp:2663 ../src/gui/main.cpp:2794
 msgid "Incoming call from"
 msgstr "Innkommende anrop fra"
 
-#: ../src/gui/main.cpp:2676 ../src/gui/main.cpp:2792
+#: ../src/gui/main.cpp:2681 ../src/gui/main.cpp:2797
 msgid "Remote URI:"
 msgstr "Ekstern URI:"
 
-#: ../src/gui/main.cpp:2688 ../src/gui/main.cpp:2794
+#: ../src/gui/main.cpp:2693 ../src/gui/main.cpp:2799
 msgid "Remote Application:"
 msgstr "Eksternt program:"
 
-#: ../src/gui/main.cpp:2709
+#: ../src/gui/main.cpp:2714
 #, c-format
 msgid "Call from %s"
 msgstr "Samtale fra %s"
 
-#: ../src/gui/main.cpp:2915
+#: ../src/gui/main.cpp:2920
 #, c-format
 msgid "Call Duration: %s\n"
 msgstr "Samtalevarighet: %s\n"
 
-#: ../src/gui/main.cpp:2946
+#: ../src/gui/main.cpp:2951
 msgid "Transfer call to:"
 msgstr "Overfør anrop til:"
 
-#: ../src/gui/main.cpp:2998
+#: ../src/gui/main.cpp:3003
 msgid "No"
 msgstr "Nei"
 
-#: ../src/gui/main.cpp:3000
+#: ../src/gui/main.cpp:3005
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/gui/main.cpp:3011
+#: ../src/gui/main.cpp:3016
 msgid "Detected new audio input device:"
 msgstr "Fant ny enhet for opptak av lyd:"
 
-#: ../src/gui/main.cpp:3015
+#: ../src/gui/main.cpp:3020
 msgid "Detected new audio output device:"
 msgstr "Fant ny enhet for avspilling av lyd:"
 
-#: ../src/gui/main.cpp:3019
+#: ../src/gui/main.cpp:3024
 msgid "Detected new video input device:"
 msgstr "Fant ny enhet for opptak av video:"
 
-#: ../src/gui/main.cpp:3020 ../src/gui/preferences.cpp:921
+#: ../src/gui/main.cpp:3025 ../src/gui/preferences.cpp:921
 msgid "Video Devices"
 msgstr "Videoenheter"
 
-#: ../src/gui/main.cpp:3038
+#: ../src/gui/main.cpp:3043
 msgid "Do you want to use it as default device?"
 msgstr "Vil du bruke den som forvalgt enhet?"
 
-#: ../src/gui/main.cpp:3106
+#: ../src/gui/main.cpp:3111
 msgid "_Chat"
 msgstr "_Prat"
 
-#: ../src/gui/main.cpp:3108
+#: ../src/gui/main.cpp:3113
 msgid "Ca_ll"
 msgstr "R_ing"
 
-#: ../src/gui/main.cpp:3108
+#: ../src/gui/main.cpp:3113
 msgid "Place a new call"
 msgstr "Start en ny samtale"
 
-#: ../src/gui/main.cpp:3111
+#: ../src/gui/main.cpp:3116
 msgid "_Hang up"
 msgstr "_Legg på"
 
-#: ../src/gui/main.cpp:3112
+#: ../src/gui/main.cpp:3117
 msgid "Terminate the current call"
 msgstr "Avslutt denne samtalen"
 
-#: ../src/gui/main.cpp:3118
+#: ../src/gui/main.cpp:3123
 msgid "A_dd Contact"
 msgstr "_Legg til kontakt"
 
-#: ../src/gui/main.cpp:3118
+#: ../src/gui/main.cpp:3123
 msgid "Add a contact to the roster"
 msgstr "Legg til kontakt i lokal adresseliste"
 
-#: ../src/gui/main.cpp:3123
+#: ../src/gui/main.cpp:3128
 msgid "Find contacts"
 msgstr "Finn kontakter"
 
-#: ../src/gui/main.cpp:3130
+#: ../src/gui/main.cpp:3135
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../src/gui/main.cpp:3131
+#: ../src/gui/main.cpp:3136
 msgid "Act on selected contact"
 msgstr "Utfør handling på valgt kontakt"
 
-#: ../src/gui/main.cpp:3137
+#: ../src/gui/main.cpp:3142
 msgid "H_old Call"
 msgstr "Sett sa_mtale på vent"
 
-#: ../src/gui/main.cpp:3137 ../src/gui/main.cpp:3606
+#: ../src/gui/main.cpp:3142 ../src/gui/main.cpp:3611
 msgid "Hold the current call"
 msgstr "Stopp aktiv samtale"
 
-#: ../src/gui/main.cpp:3141
+#: ../src/gui/main.cpp:3146
 msgid "_Transfer Call"
 msgstr "_Overfør samtale"
 
-#: ../src/gui/main.cpp:3142
+#: ../src/gui/main.cpp:3147
 msgid "Transfer the current call"
 msgstr "Overfør denne samtalen"
 
-#: ../src/gui/main.cpp:3150
+#: ../src/gui/main.cpp:3155
 msgid "Suspend or resume the audio transmission"
 msgstr "Slå av eller på lydoverføringen"
 
-#: ../src/gui/main.cpp:3155
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the video transmission"
 msgstr "Slå av eller på videooverføringen"
 
-#: ../src/gui/main.cpp:3162
+#: ../src/gui/main.cpp:3167
 msgid "Close the Ekiga window"
 msgstr "Lukk Ekiga-vinduet"
 
-#: ../src/gui/main.cpp:3169 ../src/gui/statusicon.cpp:406
+#: ../src/gui/main.cpp:3174 ../src/gui/statusicon.cpp:414
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../src/gui/main.cpp:3175
+#: ../src/gui/main.cpp:3180
 msgid "_Configuration Assistant"
 msgstr "_Konfigurasjonsveiviser"
 
-#: ../src/gui/main.cpp:3176
+#: ../src/gui/main.cpp:3181
 msgid "Run the configuration assistant"
 msgstr "Kjør konfigurasjonsveiviseren"
 
-#: ../src/gui/main.cpp:3184
+#: ../src/gui/main.cpp:3189
 msgid "Edit your accounts"
 msgstr "Rediger din konto"
 
-#: ../src/gui/main.cpp:3190
+#: ../src/gui/main.cpp:3195
 msgid "Change your preferences"
 msgstr "Endre dine brukervalg"
 
-#: ../src/gui/main.cpp:3195
+#: ../src/gui/main.cpp:3200
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/gui/main.cpp:3197
+#: ../src/gui/main.cpp:3202
 msgid "Con_tacts"
 msgstr "Kon_takter"
 
-#: ../src/gui/main.cpp:3197
+#: ../src/gui/main.cpp:3202
 msgid "View the contacts list"
 msgstr "Vis kontaktlisten"
 
-#: ../src/gui/main.cpp:3202
+#: ../src/gui/main.cpp:3207
 msgid "_Dialpad"
 msgstr "_Nummertastatur"
 
-#: ../src/gui/main.cpp:3202
+#: ../src/gui/main.cpp:3207
 msgid "View the dialpad"
 msgstr "Vis nummertastatur"
 
-#: ../src/gui/main.cpp:3207
+#: ../src/gui/main.cpp:3212
 msgid "_Call History"
 msgstr "_Samtalelogg"
 
-#: ../src/gui/main.cpp:3207
+#: ../src/gui/main.cpp:3212
 msgid "View the call history"
 msgstr "Vis samtalehistorikken"
 
-#: ../src/gui/main.cpp:3215
+#: ../src/gui/main.cpp:3220
 msgid "_Show Call Panel"
 msgstr "Vi_s samtalepanel"
 
-#: ../src/gui/main.cpp:3223
+#: ../src/gui/main.cpp:3228
 msgid "_Local Video"
 msgstr "_Lokal video"
 
-#: ../src/gui/main.cpp:3224
+#: ../src/gui/main.cpp:3229
 msgid "Local video image"
 msgstr "Lokalt videobilde"
 
-#: ../src/gui/main.cpp:3229
+#: ../src/gui/main.cpp:3234
 msgid "_Remote Video"
 msgstr "Ekste_rn video"
 
-#: ../src/gui/main.cpp:3230
+#: ../src/gui/main.cpp:3235
 msgid "Remote video image"
 msgstr "Eksternt videobilde"
 
-#: ../src/gui/main.cpp:3235
+#: ../src/gui/main.cpp:3240
 msgid "_Picture-in-Picture"
 msgstr "_Bilde i bilde"
 
-#: ../src/gui/main.cpp:3236 ../src/gui/main.cpp:3242
+#: ../src/gui/main.cpp:3241 ../src/gui/main.cpp:3247
 msgid "Both video images"
 msgstr "Begge videobildene"
 
-#: ../src/gui/main.cpp:3241
+#: ../src/gui/main.cpp:3246
 msgid "Picture-in-Picture in Separate _Window"
 msgstr "Bilde i bilde i et eget _vindu"
 
-#: ../src/gui/main.cpp:3249
+#: ../src/gui/main.cpp:3254
 msgid "Zoom in"
 msgstr "Zoom inn"
 
-#: ../src/gui/main.cpp:3253
+#: ../src/gui/main.cpp:3258
 msgid "Zoom out"
 msgstr "Zoom ut"
 
-#: ../src/gui/main.cpp:3257
+#: ../src/gui/main.cpp:3262
 msgid "Normal size"
 msgstr "Normal størrelse"
 
-#: ../src/gui/main.cpp:3261
+#: ../src/gui/main.cpp:3266
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: ../src/gui/main.cpp:3261
+#: ../src/gui/main.cpp:3266
 msgid "Switch to fullscreen"
 msgstr "Bytt til fullskjerm"
 
-#: ../src/gui/main.cpp:3269 ../src/gui/statusicon.cpp:394
+#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:402
 msgid "Get help by reading the Ekiga manual"
 msgstr "Få hjelp ved å lese hjelp for Ekiga"
 
-#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:399
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:407
 msgid "View information about Ekiga"
 msgstr "Vis informasjon om Ekiga"
 
-#: ../src/gui/main.cpp:3348
-#, fuzzy
+#: ../src/gui/main.cpp:3353
 msgid ""
 "Enter a URI on the left, and click this button to place a call or to hangup"
 msgstr ""
-"Oppgi en URI til venstre og klikk på denne knappen for å starte en samtale"
+"Oppgi en URI til venstre og klikk på denne knappen for å starte eller "
+"avslutte en samtale"
 
-#: ../src/gui/main.cpp:3399
+#: ../src/gui/main.cpp:3404
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../src/gui/main.cpp:3422
+#: ../src/gui/main.cpp:3427
 msgid "Dialpad"
 msgstr "Nummertastatur"
 
-#: ../src/gui/main.cpp:3441
+#: ../src/gui/main.cpp:3446
 msgid "Call history"
 msgstr "Samtalelogg"
 
-#: ../src/gui/main.cpp:3544
+#: ../src/gui/main.cpp:3549
 msgid "Change the volume of your soundcard"
 msgstr "Endre volumet på lydkortet"
 
-#: ../src/gui/main.cpp:3564
+#: ../src/gui/main.cpp:3569
 msgid "Change the color settings of your video device"
 msgstr "Endre fargeinnstillingene for grafikkenheten"
 
-#: ../src/gui/main.cpp:3675
+#: ../src/gui/main.cpp:3680
 msgid "Ekiga"
 msgstr "Ekiga"
 
 #. Translators:
 #. * TX is a common abbreviation for "transmit"
-#: ../src/gui/main.cpp:4282
+#: ../src/gui/main.cpp:4287
 #, c-format
 msgid "TX: %dx%d "
 msgstr "TX: %dx%d "
 
 #. Translators:
 #. * RX is a common abbreviation for "receive"
-#: ../src/gui/main.cpp:4287
+#: ../src/gui/main.cpp:4292
 #, c-format
 msgid "RX: %dx%d "
 msgstr "RX: %dx%d "
 
-#: ../src/gui/main.cpp:4289
+#: ../src/gui/main.cpp:4294
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2790,24 +2815,24 @@
 "Pakker i feil rekkefølge: %.1f %%\n"
 "Jitterbuffer: %d ms%s%s%s"
 
-#: ../src/gui/main.cpp:4406
+#: ../src/gui/main.cpp:4415
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr "Skriver feilsøkingsmeldinger til konsollet (nivå fra 1 til 5)"
 
-#: ../src/gui/main.cpp:4411
+#: ../src/gui/main.cpp:4420
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr ""
 "Skriver brukernivå feilsøkingsmeldinger til konsollet (nivå fra 1 til 4)"
 
-#: ../src/gui/main.cpp:4416
+#: ../src/gui/main.cpp:4425
 msgid "Makes Ekiga call the given URI"
 msgstr "Får Ekiga til å anrope gitt URI"
 
-#: ../src/gui/main.cpp:4525
+#: ../src/gui/main.cpp:4544
 msgid "No usable audio plugin detected"
 msgstr "Ingen brukbart lydtillegg funnet"
 
-#: ../src/gui/main.cpp:4526
+#: ../src/gui/main.cpp:4545
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
@@ -2815,11 +2840,11 @@
 "Ekiga kunne ikke finne noe brukbart lydtillegg. Sjekk at installasjonen er "
 "korrekt."
 
-#: ../src/gui/main.cpp:4529
+#: ../src/gui/main.cpp:4548
 msgid "No usable audio codecs detected"
 msgstr "Ingen brukbare kodeker funnet"
 
-#: ../src/gui/main.cpp:4530
+#: ../src/gui/main.cpp:4549
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
@@ -3179,7 +3204,7 @@
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/statusicon.cpp:305
+#: ../src/gui/statusicon.cpp:306
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
diff -Nru ekiga-3.2.5/po/sr@latin.po ekiga-3.2.6~ppa~karmic1/po/sr@latin.po
--- ekiga-3.2.5/po/sr@latin.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/sr@latin.po	2009-09-22 15:27:35.000000000 +0100
@@ -5,14 +5,17 @@
 #
 # Maintainer: Dejan Matijević <dejan@ns.sympatico.ca>
 # Reviewed on 2005-08-13 by: Igor Nestorović <igor@prevod.org>
+# Translated on 2009-09-12 by: Branko Kokanović <branko.kokanovic@gmail.com>
 #
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
 "Project-Id-Version: ekiga\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 03:27+0000\n"
-"PO-Revision-Date: 2007-03-06 00:18+0100\n"
-"Last-Translator: Goran Rakić <grakic@devbase.net>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=ekiga&component=general\n"
+"POT-Creation-Date: 2009-09-10 20:34+0000\n"
+"PO-Revision-Date: 2009-09-12 17:05+0200\n"
+"Last-Translator: Branko Kokanović <branko.kokanovic@gmail.com>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,34 +42,36 @@
 "pretplatnička linija, 3: lokalna mreža, 4: proizvoljno"
 
 #: ../ekiga.schemas.in.in.h:2
-msgid "Address of public IP detector"
-msgstr "Adresa javnog prepoznavača IP-a"
+msgid ""
+"Allow Ekiga to fall back to software scaling the picture-in-picture if "
+"hardware support is not available. If this is set to false, Ekiga will not "
+"try to open the PIP if hardware support is not available."
+msgstr ""
+"Dozvoljava Ekigi da koristi programsko povećavanje i smanjivanje slike-u-slici "
+"ukoliko ne postoji hardverska podrška. Ukoliko postavite na „false“, Ekiga "
+"neće koristiti programsko povećanje čak i kad ne postoji hardverska podrška."
 
 #: ../ekiga.schemas.in.in.h:3
+msgid "Allow picture-in-picture software scaling"
+msgstr "Dozvoli programsko uvećanje slike-u-slici"
+
+#: ../ekiga.schemas.in.in.h:4
 msgid "Alternative audio output device"
 msgstr "Rezervni izlazni zvučni uređaj"
 
-#: ../ekiga.schemas.in.in.h:4
+#: ../ekiga.schemas.in.in.h:5
 msgid "Always forward calls to the given host"
 msgstr "Uvek prosledi pozive do datog računara"
 
-#: ../ekiga.schemas.in.in.h:5
+#: ../ekiga.schemas.in.in.h:6
 msgid "Audio input device"
 msgstr "Ulazni zvučni uređaji"
 
-#: ../ekiga.schemas.in.in.h:6
+#: ../ekiga.schemas.in.in.h:7
 msgid "Audio output device"
 msgstr "Izlazni zvučni uređaji"
 
-#: ../ekiga.schemas.in.in.h:7
-msgid "Audio plugin"
-msgstr "Dodatak za zvuk"
-
-#: ../ekiga.schemas.in.in.h:8
-msgid "Automatic echo cancellation"
-msgstr "Samo-poništavanje eha"
-
-#: ../ekiga.schemas.in.in.h:9 ../src/gui/preferences.cpp:740
+#: ../ekiga.schemas.in.in.h:8 ../src/gui/preferences.cpp:516
 msgid ""
 "Automatically reject or forward incoming calls if no answer is given after "
 "the specified amount of time (in seconds)"
@@ -74,33 +79,15 @@
 "Sam odbij ili prosledi dolazne pozive ukoliko nije odgovoreno određeno vreme "
 "(u sekundama)."
 
-#: ../ekiga.schemas.in.in.h:10
-msgid ""
-"Automatically switch to fullscreen for images displayed in the main GUI at "
-"the beginning of the call"
-msgstr ""
-"Sam prebaci u ceo ekran za slike prikazane u glavnom sučelju na početku "
-"razgovora."
+#: ../ekiga.schemas.in.in.h:9
+msgid "Calls history"
+msgstr "Istorijat poziva"
 
-#: ../ekiga.schemas.in.in.h:11
-msgid "Change the control panel section"
+#: ../ekiga.schemas.in.in.h:10
+msgid "Change the main window panel section"
 msgstr "Promenite odeljak upravljačkog panela"
 
-#: ../ekiga.schemas.in.in.h:12
-msgid "Change the view mode of the UI"
-msgstr "Promenite režim prikaza glavnog sučelja"
-
-#: ../ekiga.schemas.in.in.h:13
-msgid "Change the view mode of the UI (softphone, videophone, full view)"
-msgstr ""
-"Promenite režim prikaza glavnog sučelja (softverski, video telefon, pun "
-"prikaz)"
-
-#: ../ekiga.schemas.in.in.h:14
-msgid "Clear inactive calls"
-msgstr "Očisti neaktivne pozive"
-
-#: ../ekiga.schemas.in.in.h:15
+#: ../ekiga.schemas.in.in.h:11
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -112,17 +99,33 @@
 "Netmeeting-a i korišćenje i brzog pokretanja i N.245 tunela može da sruši neke "
 "verzije Netmeeting-a"
 
-#: ../ekiga.schemas.in.in.h:16
-msgid "Country code"
-msgstr "Kod države"
+#: ../ekiga.schemas.in.in.h:12
+msgid "Contact long status"
+msgstr "Opširno stanje kontakta"
+
+#: ../ekiga.schemas.in.in.h:13
+msgid "Contact short status"
+msgstr "Sažeto stanje kontakta"
 
-#: ../ekiga.schemas.in.in.h:17
+#: ../ekiga.schemas.in.in.h:14
 msgid "DTMF sending"
 msgstr "Slanje DTMF-a"
 
-#: ../ekiga.schemas.in.in.h:18
-msgid "Display a popup window when receiving a call"
-msgstr "Neka iskoči prozor pri primanju poziva"
+#: ../ekiga.schemas.in.in.h:15
+msgid "Disable STUN network detection"
+msgstr "Onemogući STUN detekciju mreže"
+
+#: ../ekiga.schemas.in.in.h:16 ../src/gui/preferences.cpp:492
+msgid "Disable the automatic network setup resulting from the STUN test"
+msgstr "Onemogući automatsko podešavanje mreže dobijeno STUN testom"
+
+#: ../ekiga.schemas.in.in.h:17
+msgid "Disable video hardware acceleration"
+msgstr "Onemogući hardversko ubrzavanje za video"
+
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3596
+msgid "Display images from your camera device"
+msgstr "Prikaži slike sa kamere"
 
 #: ../ekiga.schemas.in.in.h:19
 msgid "Enable 'Fast Start'"
@@ -133,46 +136,18 @@
 msgstr "Omogući H.245 tunel"
 
 #: ../ekiga.schemas.in.in.h:21
-msgid "Enable IP checking"
-msgstr "Omogući proveru mrežnih adresa"
-
-#: ../ekiga.schemas.in.in.h:22
-msgid "Enable bilinear filtering on displayed video"
-msgstr "Uključi bilinearni propusnik na prikazanom videu"
-
-#: ../ekiga.schemas.in.in.h:23
 msgid "Enable early H.245"
 msgstr "Uključi rani H.245"
 
-#: ../ekiga.schemas.in.in.h:24
+#: ../ekiga.schemas.in.in.h:22
 msgid "Enable echo cancelation"
 msgstr "Uključi poništavanje sopstvenog odjeka"
 
-#: ../ekiga.schemas.in.in.h:25
-msgid ""
-"Enable or disable bilinear interpolation when rendering video images (this "
-"has no effect in fullscreen mode)"
-msgstr ""
-"Uključi ili isključi bilinearnu interpolaciju pri iscrtavanju video slika (ovo "
-"ne uzima maha u režimu preko celog ekrana)"
-
-#: ../ekiga.schemas.in.in.h:26
+#: ../ekiga.schemas.in.in.h:23
 msgid "Enable silence detection"
 msgstr "Omogući pronalaženje tišine"
 
-#: ../ekiga.schemas.in.in.h:27
-msgid "Enable video support"
-msgstr "Omogući video podršku"
-
-#: ../ekiga.schemas.in.in.h:28
-msgid ""
-"Enter a valid URL to connect to a web application that outputs the public IP "
-"of your host"
-msgstr ""
-"Unesite ispravnu adresu za povezivanje sa veb programom koji ispisuje javni "
-"IP vašeg računara"
-
-#: ../ekiga.schemas.in.in.h:29
+#: ../ekiga.schemas.in.in.h:24
 msgid ""
 "Enter the number of seconds after which Ekiga should try refreshing the NAT "
 "binding when STUN is being used"
@@ -180,42 +155,31 @@
 "Unesite broj sekundi nakon kojih bi program trebao da osveži vezivanje na "
 "adresnog mrežnog prevodioca kada se koristi STUN"
 
-#: ../ekiga.schemas.in.in.h:30
-msgid ""
-"Enter the public IP of your NAT/PAT router if you want to use IP translation"
-msgstr ""
-"Unesite javnu adresu vašeg adresnog prevodioca usmerivača ako želite da "
-"koristite adresno prevođenje"
-
-#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:635
-msgid "Enter your first name"
-msgstr "Unesite ime"
-
-#: ../ekiga.schemas.in.in.h:32
-msgid "Enter your last name"
-msgstr "Unesite prezime"
-
-#: ../ekiga.schemas.in.in.h:33
-msgid "First name"
-msgstr "Ime"
+#: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
+msgid "Enter your full name"
+msgstr "Unesite puno ime"
 
-#: ../ekiga.schemas.in.in.h:34
+#: ../ekiga.schemas.in.in.h:26
 msgid "Forward calls to host"
 msgstr "Preusmeri poziv na računar"
 
-#: ../ekiga.schemas.in.in.h:35
+#: ../ekiga.schemas.in.in.h:27
 msgid "Forward calls to the given host if busy"
 msgstr "Preusmeri poziv na dati računar ako je zauzeto"
 
-#: ../ekiga.schemas.in.in.h:36
+#: ../ekiga.schemas.in.in.h:28
 msgid "Forward calls to the given host if no answer"
 msgstr "Preusmeri poziv na dati računar ako se ne odgovara na poziv"
 
-#: ../ekiga.schemas.in.in.h:37
-msgid "Gateway/proxy host"
-msgstr "Računar izlaza/posrednika"
+#: ../ekiga.schemas.in.in.h:29 ../src/gui/preferences.cpp:1018
+msgid "Frame Rate"
+msgstr "Učestanost kadrova"
 
-#: ../ekiga.schemas.in.in.h:38 ../src/gui/preferences.cpp:685
+#: ../ekiga.schemas.in.in.h:30
+msgid "Full name"
+msgstr "Puno ime"
+
+#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:477
 msgid ""
 "If enabled, Ekiga will start hidden provided that the notification area is "
 "present in the GNOME panel"
@@ -223,12 +187,7 @@
 "Ako je uključeno, program će se pokretati sakriven ako je obaveštajna zona "
 "prisutna na Gnomovom panelu"
 
-#: ../ekiga.schemas.in.in.h:39
-msgid ""
-"If enabled, a popup window will be displayed when receiving an incoming call"
-msgstr "Ako je uključeno, iskočiće prozor pri prijemu dolaznog poziva"
-
-#: ../ekiga.schemas.in.in.h:40
+#: ../ekiga.schemas.in.in.h:32
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below"
@@ -236,7 +195,7 @@
 "Ako je uključeno, svi dolazni pozivi će biti preusmereni na računar koji je "
 "naznačen u narednom polju"
 
-#: ../ekiga.schemas.in.in.h:41
+#: ../ekiga.schemas.in.in.h:33
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you already are in a call or if you are in "
@@ -245,7 +204,7 @@
 "Ako je uključeno, svi dolazni pozivi će biti preusmereni na računar koji je "
 "naznačen u narednom polju ako imate poziv ili ako ste u režimu Ne uznemiravaj"
 
-#: ../ekiga.schemas.in.in.h:42
+#: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you do not answer the call"
@@ -253,219 +212,161 @@
 "Ako je uključeno, svi dolazni pozivi će biti preusmereni na računar koji je "
 "naznačen u narednom polju ako ne odgovorite na poziv"
 
-# note(slobo): u TV tehnici se kaže prijem slike (za video)
-#: ../ekiga.schemas.in.in.h:43
-msgid "If enabled, allows video during calls"
-msgstr "Ako je uključeno, dozvoljava sliku za vreme poziva"
-
-#: ../ekiga.schemas.in.in.h:44 ../src/gui/preferences.cpp:738
-msgid ""
-"If enabled, calls for which no audio and video has been received in the last "
-"30 seconds are automatically cleared"
+#: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
+msgid "If enabled, offline contacts will be shown in the roster"
 msgstr ""
-"Ako je uključeno, pozivi kod kojih u poslednjih 30 sekundi nije primljen zvuk "
-"ili slika se čiste sami"
+"Ako je uključeno, kontakti koji nisu na mreži će biti prikazani u listi "
+"kontakata"
 
-#: ../ekiga.schemas.in.in.h:45
+#: ../ekiga.schemas.in.in.h:36
 msgid "If enabled, use echo cancelation"
 msgstr "Ako je uključeno, koristi poništavanje odjeka"
 
-#: ../ekiga.schemas.in.in.h:46
+#: ../ekiga.schemas.in.in.h:37
 msgid "If enabled, use silence detection with the codecs supporting it"
 msgstr ""
 "Ako je uključeno, koristi otkrivanje tišine sa kodecima koji to podržavaju"
 
-#: ../ekiga.schemas.in.in.h:47
-msgid "Incoming call mode"
-msgstr "Režim dolaznih poziva"
-
-#: ../ekiga.schemas.in.in.h:48
+#: ../ekiga.schemas.in.in.h:38
 msgid "Kind of network selected in the druid"
 msgstr "Vrsta mreže odabrana u čarobnjaku"
 
-#: ../ekiga.schemas.in.in.h:49
-msgid "Last name"
-msgstr "Prezime"
+#: ../ekiga.schemas.in.in.h:39
+msgid "LDAP servers"
+msgstr "LDAP serveri"
+
+#: ../ekiga.schemas.in.in.h:40
+msgid "List of configured LDAP servers"
+msgstr "Spisak podešenih LDAP servera"
+
+#: ../ekiga.schemas.in.in.h:41
+msgid "List of folded groups in the roster"
+msgstr "Spisak preklopljenih grupa u listi kontakata"
 
-#: ../ekiga.schemas.in.in.h:50
+#: ../ekiga.schemas.in.in.h:42
 msgid "Listen port"
 msgstr "Oslušavan port"
 
-#: ../ekiga.schemas.in.in.h:51
+#: ../ekiga.schemas.in.in.h:43
 msgid "Local video window size"
 msgstr "Veličina prozora lokalne slike"
 
-# bug(slobo): ne može ovako ostati
-#: ../ekiga.schemas.in.in.h:52
-msgid "Maximum jitter buffer"
-msgstr "Najveći jitter bafer"
+#: ../ekiga.schemas.in.in.h:44
+msgid "Maximum RX video bitrate"
+msgstr "Maksimalni video protok za primanje"
 
-#: ../ekiga.schemas.in.in.h:53
-msgid "Maximum video bandwidth"
-msgstr "Najveća širina propusnog opsega za sliku"
+#: ../ekiga.schemas.in.in.h:45
+msgid "Maximum TX video bitrate"
+msgstr "Maksimalni video protok za slanje"
 
 # bug(slobo): ne može ovako ostati
-#: ../ekiga.schemas.in.in.h:54
-msgid "Minimum jitter buffer"
-msgstr "Najmanji jitter bafer"
-
-#: ../ekiga.schemas.in.in.h:55
-msgid "Minimum transmitted video quality"
-msgstr "Najmanji zadani kvalitet za prenesenu sliku"
-
-#: ../ekiga.schemas.in.in.h:56
-msgid "Missed calls history"
-msgstr "Istorijat propuštenih poziva"
+#: ../ekiga.schemas.in.in.h:46
+msgid "Maximum jitter buffer"
+msgstr "Najveći jitter bafer"
 
-#: ../ekiga.schemas.in.in.h:57
+#: ../ekiga.schemas.in.in.h:47
 msgid "NAT Binding Timeout"
 msgstr "Vremenski rok vezivanja adresnog prevodioca"
 
 # bug(slobo): msgstr "Nema roka za odgovor" ...sumnjam da je ovo
-#: ../ekiga.schemas.in.in.h:58
+#: ../ekiga.schemas.in.in.h:48
 msgid "No answer timeout"
 msgstr "Vremenski rok kad se niko ne javlja"
 
-#: ../ekiga.schemas.in.in.h:59
-msgid "Number of frames for G.711"
-msgstr "Broj slika za G.711"
-
-#: ../ekiga.schemas.in.in.h:60
-msgid "Number of frames for GSM"
-msgstr "Broj slika za GSM"
-
-#: ../ekiga.schemas.in.in.h:61
-msgid "Number of frames transmitted in each packet for the G.711 codec"
-msgstr "Broj slika prenesenih u svakom paketu za G.711 kodek"
-
-#: ../ekiga.schemas.in.in.h:62
-msgid "Number of frames transmitted in each packet for the GSM codec"
-msgstr "Broj slika prenesenih u svakom paketu za GSM kodek"
-
-#: ../ekiga.schemas.in.in.h:63
+#: ../ekiga.schemas.in.in.h:49
 msgid "Outbound Proxy"
 msgstr "Spoljno-vezujući posrednik"
 
-#: ../ekiga.schemas.in.in.h:64
-msgid "Output device type"
-msgstr "Vrsta izlaznog uređaja"
-
-#: ../ekiga.schemas.in.in.h:65 ../src/gui/preferences.cpp:693
+#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video above other windows during calls"
 msgstr ""
 "Postavi prozore koji prikazuju sliku iznad ostalih prozora u toku razgovora"
 
-#: ../ekiga.schemas.in.in.h:66
-msgid "Placed calls history"
-msgstr "Istorijat načinjenih poziva"
-
-#: ../ekiga.schemas.in.in.h:67 ../src/gui/preferences.cpp:1898
+#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
 msgid "Play busy tone"
 msgstr "Pusti zvuk zauzeća"
 
-#: ../ekiga.schemas.in.in.h:68 ../src/gui/preferences.cpp:1889
+#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:361
 msgid "Play ring tone"
 msgstr "Pusti zvuk za zvono"
 
-#: ../ekiga.schemas.in.in.h:69 ../src/gui/preferences.cpp:1880
+#: ../ekiga.schemas.in.in.h:53 ../src/gui/preferences.cpp:351
 msgid "Play sound on incoming calls"
 msgstr "Pusti zvuk na dolazne pozive"
 
-#: ../ekiga.schemas.in.in.h:70
+#: ../ekiga.schemas.in.in.h:54
 msgid "Play sound on new message"
 msgstr "Pusti zvuk kad pristigne nova poruka"
 
-#: ../ekiga.schemas.in.in.h:71
+#: ../ekiga.schemas.in.in.h:55
 msgid "Play sound on new voice mail"
 msgstr "Pusti zvuk kada pristigne nova govorna pošta"
 
-#: ../ekiga.schemas.in.in.h:72
+#: ../ekiga.schemas.in.in.h:56
 msgid "Position of the local video window"
 msgstr "Položaj prozora lokalne slike"
 
-#: ../ekiga.schemas.in.in.h:73
-msgid "Position on the screen of the PC-To-Phone window"
-msgstr "Položaj prozora za „Računar — telefon“ poziv"
-
-#: ../ekiga.schemas.in.in.h:74
+#: ../ekiga.schemas.in.in.h:57
 msgid "Position on the screen of the address book window"
 msgstr "Položaj prozora imenika na ekranu"
 
-#: ../ekiga.schemas.in.in.h:75
-msgid "Position on the screen of the calls history window"
-msgstr "Položaj prozora istorijata poziva na ekranu"
+#: ../ekiga.schemas.in.in.h:58
+msgid "Position on the screen of the audio settings window"
+msgstr "Položaj prozora sa podešavanjima zvuka na ekranu"
 
-#: ../ekiga.schemas.in.in.h:76
+#: ../ekiga.schemas.in.in.h:59
 msgid "Position on the screen of the chat window"
 msgstr "Položaj prozora za tekstualne poruke"
 
-#: ../ekiga.schemas.in.in.h:77
+#: ../ekiga.schemas.in.in.h:60
 msgid "Position on the screen of the druid window"
 msgstr "Položaj prozora čarobnjaka-pomoćnika na ekranu"
 
-#: ../ekiga.schemas.in.in.h:78
+#: ../ekiga.schemas.in.in.h:61
 msgid "Position on the screen of the log window"
 msgstr "Položaj prozora dnevnika na ekranu"
 
-#: ../ekiga.schemas.in.in.h:79
+#: ../ekiga.schemas.in.in.h:62
 msgid "Position on the screen of the main window"
 msgstr "Položaj glavnog prozora na ekranu"
 
-#: ../ekiga.schemas.in.in.h:80
+#: ../ekiga.schemas.in.in.h:63
 msgid "Position on the screen of the preferences window"
 msgstr "Položaj prozora sa postavkama na ekranu"
 
-#: ../ekiga.schemas.in.in.h:81
-msgid "Public IP of the NAT/PAT router"
-msgstr "Javna IP adresa adresnog prevodioca usmerivača"
-
-#: ../ekiga.schemas.in.in.h:82
-msgid "Received calls history"
-msgstr "Istorijat primljenih poziva"
-
-#: ../ekiga.schemas.in.in.h:83
-msgid "Registration timeout"
-msgstr "Rok za registraciju"
+#: ../ekiga.schemas.in.in.h:64
+msgid "Position on the screen of the video settings window"
+msgstr "Položaj prozora sa video podešavanjima na ekranu"
 
-#: ../ekiga.schemas.in.in.h:84
+#: ../ekiga.schemas.in.in.h:65
 msgid "Remote video window position"
 msgstr "Položaj prozora sa udaljenom slikom"
 
-#: ../ekiga.schemas.in.in.h:85
+#: ../ekiga.schemas.in.in.h:66
 msgid "Remote video window size"
 msgstr "Veličina prozora za udaljenu sliku"
 
-#: ../ekiga.schemas.in.in.h:86
-msgid "Revision of the schema file"
-msgstr "Revizija šema datoteke"
-
-#: ../ekiga.schemas.in.in.h:87
+#: ../ekiga.schemas.in.in.h:67
 msgid "Select an alternative audio output device to use for sound events."
 msgstr ""
 "Izaberite jedan rezervni izlazni zvučni uređaj koji će se koristiti za "
 "zvučno oglašavanje događaja."
 
-#: ../ekiga.schemas.in.in.h:88 ../src/gui/preferences.cpp:1095
+#: ../ekiga.schemas.in.in.h:68 ../src/gui/preferences.cpp:777
 msgid "Select the audio input device to use"
 msgstr "Izaberite uređaj koji će se koristiti za ulaz zvuka"
 
-#: ../ekiga.schemas.in.in.h:89 ../src/gui/preferences.cpp:1088
+#: ../ekiga.schemas.in.in.h:69 ../src/gui/preferences.cpp:770
 msgid "Select the audio output device to use"
 msgstr "Izaberite uređaj koji će se koristiti za izlaz zvuka"
 
-#: ../ekiga.schemas.in.in.h:90 ../src/gui/preferences.cpp:959
-msgid ""
-"Select the desired method for NAT traversal (STUN is strongly suggested)"
-msgstr ""
-"Izaberite željeni metod za adresno prevođenje (strogo se preporučuje STUN)"
-
-#: ../ekiga.schemas.in.in.h:91 ../src/gui/preferences.cpp:1178
+#: ../ekiga.schemas.in.in.h:70 ../src/gui/preferences.cpp:936
 msgid ""
 "Select the format for video cameras (does not apply to most USB cameras)"
 msgstr ""
 "Izaberite format za video kamere (nije primenljivo na većinu USB kamera)"
 
-#: ../ekiga.schemas.in.in.h:92
+#: ../ekiga.schemas.in.in.h:71
 msgid ""
 "Select the transmitted video size: Small (QCIF 176x144) or Large (CIF "
 "352x288)"
@@ -473,7 +374,7 @@
 "Izaberite veličinu prenesene slike: Mala (QCIF 176x144) ili velika (CIF "
 "352x288)"
 
-#: ../ekiga.schemas.in.in.h:93 ../src/gui/preferences.cpp:1168
+#: ../ekiga.schemas.in.in.h:72 ../src/gui/preferences.cpp:928
 msgid ""
 "Select the video input device to use. If an error occurs when using this "
 "device a test picture will be transmitted."
@@ -481,105 +382,102 @@
 "Izaberite video ulaz koji će se koristiti. Ukoliko se dogodi greška pri "
 "upotrebi ovog uređaja, preneće se probna slika."
 
-#: ../ekiga.schemas.in.in.h:94
-msgid "Size of the PC-To-Phone window"
-msgstr "Veličina prozora poziva „Računar — telefon“"
+#: ../ekiga.schemas.in.in.h:73
+msgid "Show offline contacts"
+msgstr "Prikaži kontakte van mreže"
 
-#: ../ekiga.schemas.in.in.h:95
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3225
+msgid "Show the call panel"
+msgstr "Prikaži površ za pozive"
+
+#: ../ekiga.schemas.in.in.h:75
 msgid "Size of the address book window"
 msgstr "Veličina prozora imenika"
 
-#: ../ekiga.schemas.in.in.h:96
-msgid "Size of the calls history window"
-msgstr "Veličina prozora istorijata poziva"
+#: ../ekiga.schemas.in.in.h:76
+msgid "Size of the audio settings window"
+msgstr "Veličina prozora sa zvučnim podešavanjima"
 
-#: ../ekiga.schemas.in.in.h:97
+#: ../ekiga.schemas.in.in.h:77
 msgid "Size of the chat window"
 msgstr "Veličina prozora za tekstualne poruke"
 
-#: ../ekiga.schemas.in.in.h:98
+#: ../ekiga.schemas.in.in.h:78
 msgid "Size of the druid window"
 msgstr "Veličina prozora čarobnjaka"
 
-#: ../ekiga.schemas.in.in.h:99
-msgid "Size of the log window"
-msgstr "Veličina prozora dnevnika"
-
-#: ../ekiga.schemas.in.in.h:100
+#: ../ekiga.schemas.in.in.h:79
 msgid "Size of the preferences window"
 msgstr "Veličina prozora sa postavkama"
 
-#: ../ekiga.schemas.in.in.h:101
+#: ../ekiga.schemas.in.in.h:80
+msgid "Size of the video settings window"
+msgstr "Veličina prozora sa video podešavanjima"
+
+#: ../ekiga.schemas.in.in.h:81
+msgid "Specify the software scaling algorithm"
+msgstr "Odaberite algoritam za programsko povećanje slike"
+
+#: ../ekiga.schemas.in.in.h:82
+msgid ""
+"Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest "
+"neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
+"Does not apply on windows systems."
+msgstr ""
+"Izverite algoritam za programsko povećavanje ili smanjivanje slike: 0: "
+"najbliži sused, 1: najbliži sused sa filterom kutije, 2: bilinearno "
+"filtriranje, 3: hiperbolično filtriranje. Ne koristi se na Windows sistemima."
+
+#: ../ekiga.schemas.in.in.h:83
 msgid "Start hidden"
 msgstr "Počni skriven"
 
-#: ../ekiga.schemas.in.in.h:102 ../src/gui/main.cpp:1109
-#: ../src/gui/main.cpp:1587 ../src/gui/main.cpp:1612
-msgid "Switch to fullscreen"
-msgstr "Prebaci u ceo ekran"
-
-#: ../ekiga.schemas.in.in.h:103
+#: ../ekiga.schemas.in.in.h:84
 msgid "TCP port range"
 msgstr "Opseg TCP portova"
 
-#: ../ekiga.schemas.in.in.h:104
+#: ../ekiga.schemas.in.in.h:85
+msgid "Temporal Spatial Trade Off"
+msgstr "Vremensko prostorni odnos"
+
+#: ../ekiga.schemas.in.in.h:86
 msgid "The Audio Codecs List"
 msgstr "Spisak audio kodeka"
 
-#: ../ekiga.schemas.in.in.h:105
-msgid ""
-"The Automatic Echo Cancellation level: Off, Low, Medium, High, Automatic "
-"Gain Compensation. Choosing Automatic Gain Compensation modulates the volume "
-"for best quality."
-msgstr ""
-"Nivo poništavanja odjeka: isključen, nizak, srednji, visok, automatski "
-"postignuto izravnavanje. Izborom automatski postignutog izravnavanja jačina će "
-"biti prilagođena za najbolji kvalitet."
-
-#: ../ekiga.schemas.in.in.h:106 ../src/gui/preferences.cpp:986
-msgid ""
-"The Gateway host is the host to use to do H.323 calls through a gateway that "
-"will relay calls"
-msgstr ""
-"Računar za izlaz je računar preko kojeg se obavljaju H.323 pozivi preko "
-"izlaza koji prenosi pozive"
-
-#: ../ekiga.schemas.in.in.h:107
-msgid "The NAT method"
-msgstr "Metod adresnog prevođenja"
-
-#: ../ekiga.schemas.in.in.h:108 ../src/gui/preferences.cpp:1037
+#: ../ekiga.schemas.in.in.h:87 ../src/gui/preferences.cpp:727
 msgid "The SIP Outbound Proxy to use for outgoing calls"
 msgstr "SIP posrednik koji se koristi za odlazne pozive"
 
-#: ../ekiga.schemas.in.in.h:109
+#: ../ekiga.schemas.in.in.h:88
 msgid "The STUN Server"
 msgstr "STUN server"
 
 # bug: s/technic/technology/
-#: ../ekiga.schemas.in.in.h:110
+#: ../ekiga.schemas.in.in.h:89
 msgid ""
-"The STUN server to use for STUN Support. STUN is a technic that permits to "
-"go through some types of NAT gateways"
+"The STUN server to use for STUN Support. STUN is a technology that permits "
+"passage through some types of NAT gateway"
 msgstr ""
 "STUN server za STUN podršku. STUN je tehnologija koja dopušta da se prođe "
 "kroz neke vrste maskiranja mreže."
 
-#: ../ekiga.schemas.in.in.h:111
+#: ../ekiga.schemas.in.in.h:90
+msgid "The Video Codecs List"
+msgstr "Spisak video kodeka"
+
+#: ../ekiga.schemas.in.in.h:91
 msgid "The accounts list"
 msgstr "Spisak naloga"
 
-#: ../ekiga.schemas.in.in.h:112
-msgid ""
-"The audio plugin that will be used to detect the devices and manage them"
-msgstr ""
-"Dodatak za zvuk koji se koristi za prepoznavanje uređaja i njihovo upravljanje"
+#: ../ekiga.schemas.in.in.h:92
+msgid "The audio codecs list"
+msgstr "Spisak audio kodeka"
 
-#: ../ekiga.schemas.in.in.h:113
+#: ../ekiga.schemas.in.in.h:93
 msgid "The busy tone sound"
 msgstr "Zvuk zauzeća"
 
-#: ../ekiga.schemas.in.in.h:114
+#: ../ekiga.schemas.in.in.h:94
 msgid ""
 "The chosen sound will be played at the end of calls or calling somebody who "
 "is busy, if enabled"
@@ -587,137 +485,111 @@
 "Ako je uključeno, izabrani zvuk će biti pušten po završetku poziva ili pri "
 "zvanju nekoga ko je zauzet"
 
-#: ../ekiga.schemas.in.in.h:115
+#: ../ekiga.schemas.in.in.h:95
 msgid "The chosen sound will be played on incoming calls, if enabled"
 msgstr "Ako je uključeno, izabrani zvuk će biti pušten na dolazeće pozive"
 
-#: ../ekiga.schemas.in.in.h:116
+#: ../ekiga.schemas.in.in.h:96
 msgid ""
 "The chosen sound will be played when a new instant message is received, if "
 "enabled"
 msgstr ""
 "Ako je omogućeno, biće pušten izabrani zvuk pri prijemu nove brze poruke"
 
-#: ../ekiga.schemas.in.in.h:117
+#: ../ekiga.schemas.in.in.h:97
 msgid ""
 "The chosen sound will be played when a new voice mail is received, if enabled"
 msgstr ""
 "Ako je uključeno, biće pušten izabrani zvuk pri prijemu nove govorne pošte"
 
-#: ../ekiga.schemas.in.in.h:118
+#: ../ekiga.schemas.in.in.h:98
 msgid "The chosen sound will be played when calling somebody, if enabled"
 msgstr "Ako je uključeno, izabrani zvuk će biti pušten pri zvanju nekoga"
 
-#: ../ekiga.schemas.in.in.h:119
+#: ../ekiga.schemas.in.in.h:99
 msgid "The default video view"
 msgstr "Početni prikaz slike"
 
-#: ../ekiga.schemas.in.in.h:120
+#: ../ekiga.schemas.in.in.h:100
 msgid ""
-"The default video view (0: Local, 1: Remote, 2: Both incrusted, 3: Both with "
+"The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with "
 "local video in a separate window, 4: Both)"
 msgstr ""
-"Podešen prikaz slike (0: lokalni, 1: udaljeni, 2: oba presvučena, 3: oba sa "
-"lokalnom slikom u posebnom prozoru, 4: oba)"
+"Podrazumevani prikaz slike (0: lokalni, 1: udaljeni, 2: oba presvučena, 3: "
+"oba sa lokalnom slikom u posebnom prozoru, 4: oba)"
 
-#: ../ekiga.schemas.in.in.h:121
+#: ../ekiga.schemas.in.in.h:101
 msgid "The dial tone sound"
 msgstr "Zvuk za signal slobodnog biranja"
 
-#: ../ekiga.schemas.in.in.h:122
-msgid "The history of the last 100 missed calls"
-msgstr "Istorijat poslednjih 100 propuštenih poziva"
-
-#: ../ekiga.schemas.in.in.h:123
-msgid "The history of the last 100 placed calls"
+#: ../ekiga.schemas.in.in.h:102
+msgid "The history of the 100 last calls"
 msgstr "Istorijat poslednjih 100 načinjenih poziva"
 
-#: ../ekiga.schemas.in.in.h:124
-msgid "The history of the last 100 received calls"
-msgstr "Istorijat poslednjih 100 primljenih poziva"
-
-#: ../ekiga.schemas.in.in.h:125 ../src/gui/preferences.cpp:989
-#: ../src/gui/preferences.cpp:1040
+#: ../ekiga.schemas.in.in.h:103 ../src/gui/preferences.cpp:676
+#: ../src/gui/preferences.cpp:730
 msgid "The host where calls should be forwarded if call forwarding is enabled"
 msgstr ""
 "Računar prema kome treba da budu preusmereni pozivi ako je uključeno "
 "preusmeravanje"
 
-#: ../ekiga.schemas.in.in.h:126
-msgid ""
-"The image to transmit if \"Picture\" is selected as video plugin or if the "
-"opening of the device fails. Leave blank to use the default Ekiga logo."
-msgstr ""
-"Slika za prenos ako je „Slika“ izabrana kao video dodatak ili ako otvaranje "
-"uređaja ne uspe. Ostavite prazno za podrazumevani Ekiga logo."
-
-#: ../ekiga.schemas.in.in.h:127
+#: ../ekiga.schemas.in.in.h:104
 msgid "The incoming call sound"
 msgstr "Zvuk dolaznog poziva"
 
-#: ../ekiga.schemas.in.in.h:128
+#: ../ekiga.schemas.in.in.h:105
 msgid "The list of accounts to which Ekiga should register"
 msgstr "Spisak naloga koje Ekiga treba da koristi kod registracije/prijave"
 
-#: ../ekiga.schemas.in.in.h:129
-msgid "The local zoom value"
-msgstr "Lokalna vrednost uvećanja"
+#: ../ekiga.schemas.in.in.h:106
+msgid "The long status information"
+msgstr "Prošireni podaci stanja"
 
-#: ../ekiga.schemas.in.in.h:130
+#: ../ekiga.schemas.in.in.h:107
+msgid ""
+"The maximum RX video bitrate in kbit/s. This value will be signaled to the "
+"peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
+"above the signaled value"
+msgstr ""
+"Maksimalni video protok za primanje u kbit/s. Ova vrednost će biti poslata "
+"osobi sa kojom razgovarate (ako njen program to podržava) radi podešavanja "
+"video protok za slanje ukoliko je iznad ove vrednosti."
+
+#: ../ekiga.schemas.in.in.h:108
+msgid ""
+"The maximum TX video bitrate in kbit/s. The video quality and the number of "
+"transmitted frames per second (depends on selected codec) will be "
+"dynamically adjusted above their minimum during calls to try to minimize the "
+"bandwidth to the given value"
+msgstr ""
+"Maksimalni video protok za slanje u kbit/s. Kvalitet slike i broj prenesenih "
+"kadrova u sekundi (u zavisnosti od odabranog kodeka) biće dinamički "
+"prilagođeni iznad njihovog minimuma za vreme poziva pri pokušaju da se umanji "
+"protok na datu vrednost"
+
+#: ../ekiga.schemas.in.in.h:109
 msgid "The maximum jitter buffer size for audio reception (in ms)"
 msgstr "Najveća veličina jitter bafera za audio prijem (u ms)"
 
-#: ../ekiga.schemas.in.in.h:131
+#: ../ekiga.schemas.in.in.h:110
 msgid ""
-"The maximum video bandwidth in kbytes/s. The video quality and the number of "
-"transmitted frames per second will be dynamically adjusted above their "
-"minimum during calls to try to minimize the bandwidth to the given value"
-msgstr ""
-"Najveća širina propusnog opsega slike u kilobajtima/s. Kvalitet slike i broj "
-"prenesenih okvira u sekundi biće dinamički prilagođeni iznad njihovog "
-"minimuma za vreme poziva pri pokušaju da se umanji propusni opseg na datu "
-"vrednost"
-
-#: ../ekiga.schemas.in.in.h:132
-msgid "The minimum jitter buffer size for audio reception (in ms)"
-msgstr "Najmanja veličina jitter bafera za prijem zvuka (u ms)"
+"The maximum transmitted frame rate in frames/s. This rate may not be reached "
+"in case a minimum quality was configure via a TSTO value smaller than 31 and "
+"the bitrate selected is not sufficient to support this minimum quality"
+msgstr ""
+"Maksimalni protok broj kadrova u sekundi. Ovaj protok ne mora da se dostigne "
+"ukoliko je minimalni kvalitet podešen TSTO vrednošću manjom od 31 i bitski "
+"protok nije dovoljan da podrži minimalni kvalitet slike"
 
-#: ../ekiga.schemas.in.in.h:134
-#, no-c-format
-msgid ""
-"The minimum transmitted video quality to keep when trying to minimize the "
-"used bandwidth: choose 100% on a LAN for the best quality, 1% being the "
-"worst quality"
-msgstr ""
-"Najmanji kvalitet prenesene slike pri pokušaju da se umanji korištenje "
-"propusnog opsega: izaberite 100% za uslove lokalne mreže za najbolji "
-"kvalitet, 1% daje najlošiji kvalitet"
-
-#: ../ekiga.schemas.in.in.h:135
-msgid "The network interface"
-msgstr "Mrežni priključak"
-
-#: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:950
-msgid "The network interface to listen on"
-msgstr "Mrežni priključak koji treba osluškivati"
-
-#: ../ekiga.schemas.in.in.h:137
+#: ../ekiga.schemas.in.in.h:111
 msgid "The new instant message sound"
 msgstr "Zvuk za novu brzu poruku"
 
-#: ../ekiga.schemas.in.in.h:138
+#: ../ekiga.schemas.in.in.h:112
 msgid "The new voice mail sound"
 msgstr "Zvuk dolazne govorne pošte"
 
-#: ../ekiga.schemas.in.in.h:139
-msgid ""
-"The output device type is the type of device connected to your Quicknet "
-"card. It can be either a POTS (Plain Old Telephone System) or a headset."
-msgstr ""
-"Vrsta izlaznog uređaja predstavlja vrstu uređaja povezanog na vašu Quicknet "
-"kartu. Ona može biti ili SDTA (stari dobri telefonski aparat), ili slušalice."
-
-#: ../ekiga.schemas.in.in.h:140
+#: ../ekiga.schemas.in.in.h:113
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect"
@@ -725,7 +597,7 @@
 "Oslušavani port za dolazne pozive. Ekiga treba da bude ponovo pokrenuta da "
 "nova vrednost uzme maha"
 
-#: ../ekiga.schemas.in.in.h:141
+#: ../ekiga.schemas.in.in.h:114
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect."
@@ -733,69 +605,40 @@
 "Oslušavani port za dolazne pozive. Ekiga treba da bude ponovo pokrenuta da "
 "nova vrednost uzme maha."
 
-#: ../ekiga.schemas.in.in.h:142
+#: ../ekiga.schemas.in.in.h:115
 msgid "The position of the local video window"
 msgstr "Položaj prozora lokalne slike"
 
-#: ../ekiga.schemas.in.in.h:143
+#: ../ekiga.schemas.in.in.h:116
 msgid "The position of the remote video window"
 msgstr "Položaj prozora slike udaljenog sagovornika"
 
-#: ../ekiga.schemas.in.in.h:144
-msgid ""
-"The prefix that will be used to save pictures of the conversation. That "
-"prefix is followed by the snapshot number."
-msgstr ""
-"Prefiks koji će biti korišten da se snimi slike od razgovora. Prefiks je "
-"praćen zahvaćenim brojem."
-
-#: ../ekiga.schemas.in.in.h:145
-msgid ""
-"The range of TCP ports that Ekiga will use for the H.323 H.245 channel. "
-"Ekiga needs to be restarted for the new values to take effect. This port "
-"range has no effect if both participants to the conference are using H.245 "
-"Tunneling."
-msgstr ""
-"Opseg TCP portova koji Ekiga koristi za H.323 i H.245 kanal. Ekiga treba da "
-"bude ponovo pokrenuta da nove vrednosti uzmu maha. Ovaj opseg nema uticaja "
-"ako oba učesnika konferencije koriste H.245 tunel."
-
-#: ../ekiga.schemas.in.in.h:146
-msgid ""
-"The range of UDP ports that Ekiga will use for RTP (audio and video "
-"communication channels). Ekiga needs to be restarted for the new values to "
-"take effect."
-msgstr ""
-"Opseg UDP portova koje će koristiti Ekiga za RTP (kanale za prenos zvuka "
-"islike). Ekiga treba da bude iznova pokrenuta da bi promene uzele maha."
-
-#: ../ekiga.schemas.in.in.h:147
+#: ../ekiga.schemas.in.in.h:117
 msgid ""
-"The range of UDP ports that Ekiga will use for SIP signaling and when "
-"registering to gatekeepers. Ekiga needs to be restarted for the new values "
-"to take effect."
+"The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
+"port range has no effect if both participants to the conference are using "
+"H.245 Tunneling."
 msgstr ""
-"Opseg UDP portova koje će Ekiga koristiti za SIP signalizaciju i kada se "
-"obavlja registracija sa čuvarom kapije. Ekiga treba da bude iznova pokrenuta "
-"da bi promene uzele maha."
+"Opseg TCP portova koji Ekiga koristi za H.323 i H.245 kanal. Ovaj opseg nema "
+"uticaja ako oba učesnika konferencije koriste H.245 tunel."
 
-#: ../ekiga.schemas.in.in.h:148
-msgid "The remote zoom value"
-msgstr "Udaljena vrednost uvećanja"
+#: ../ekiga.schemas.in.in.h:118
+msgid "The range of UDP ports that Ekiga will use."
+msgstr "Opseg UDP portova koje Ekiga koristi."
 
-#: ../ekiga.schemas.in.in.h:149
-msgid "The save prefix"
-msgstr "Prefiks za čuvanje"
+#: ../ekiga.schemas.in.in.h:119
+msgid "The short status information"
+msgstr "Sažeti podaci o stanju"
 
-#: ../ekiga.schemas.in.in.h:150
+#: ../ekiga.schemas.in.in.h:120
 msgid "The size of the local video window"
 msgstr "Veličina prozora lokalne slike"
 
-#: ../ekiga.schemas.in.in.h:151
+#: ../ekiga.schemas.in.in.h:121
 msgid "The size of the remote video window"
 msgstr "Veličina prozora slike udaljenog sagovornika"
 
-#: ../ekiga.schemas.in.in.h:152
+#: ../ekiga.schemas.in.in.h:122
 msgid ""
 "The sound that will be played at the end of calls or when calling somebody "
 "who is busy, if enabled"
@@ -803,86 +646,79 @@
 "Ako je uključeno, zvuk koji će biti pušten po okončanju poziva ili pri zvanju "
 "nekoga ko je zauzet"
 
-#: ../ekiga.schemas.in.in.h:153
+#: ../ekiga.schemas.in.in.h:123
 msgid "The sound that will be played on incoming calls, if enabled"
 msgstr "Ako je uključeno, zvuk koji će biti pušten za dolazne pozive"
 
-#: ../ekiga.schemas.in.in.h:154
+#: ../ekiga.schemas.in.in.h:124
 msgid "The sound that will be played when calling somebody, if enabled"
 msgstr "Ako je uključeno, zvuk koji će biti pušten pri zvanju nekoga"
 
-#: ../ekiga.schemas.in.in.h:155
+#: ../ekiga.schemas.in.in.h:125
 msgid ""
 "The sound that will be played when there is a new instant message, if enabled"
 msgstr ""
 "Ako je uključeno, zvuk koji će biti pušten kada pristigne nova brza poruka"
 
-#: ../ekiga.schemas.in.in.h:156
+#: ../ekiga.schemas.in.in.h:126
 msgid ""
 "The sound that will be played when there is a new voice mail, if enabled"
 msgstr ""
 "Ako je uključeno, zvuk koji će biti pušten pri prijemu nove govorne pošte"
 
-#: ../ekiga.schemas.in.in.h:157
-msgid ""
-"The time after which Ekiga will renew its registration with the registrar"
-msgstr "Vreme nakon kojeg će Ekiga obnoviti svoju registraciju u registru"
-
-#: ../ekiga.schemas.in.in.h:158
-msgid "The two-letter country code of your country (e.g.: BE, UK, FR, DE, ...)"
-msgstr "Dva slova državne oznake za vašu državu (npr: YU, CA, UK, FR, DE, ...)"
-
-#: ../ekiga.schemas.in.in.h:159 ../src/gui/preferences.cpp:1172
+#: ../ekiga.schemas.in.in.h:127 ../src/gui/preferences.cpp:932
 msgid "The video channel number to use (to select camera, tv or other sources)"
 msgstr "Broj kanala za sliku (za izbor kamere, TV i ostalih izvora)"
 
-#: ../ekiga.schemas.in.in.h:160 ../src/gui/preferences.cpp:1156
-msgid ""
-"The video plugin that will be used to detect the devices and manage them"
-msgstr ""
-"Dodatak za sliku koji se koristi za prepoznavanje uređaja i njihovo upravljanje"
+#: ../ekiga.schemas.in.in.h:128
+msgid "The video codecs list"
+msgstr "Spisak video kodeka"
+
+#: ../ekiga.schemas.in.in.h:129
+msgid "The video view before having switched to fullscreen"
+msgstr "Širina slike pre prebacivanja na ceo ekran"
 
-#: ../ekiga.schemas.in.in.h:161
+#: ../ekiga.schemas.in.in.h:130
 msgid ""
-"The way to react to incoming calls: 0 displays a popup, 1 automatically "
-"answers the call, 2 automatically rejects the call and 3 forwards the call "
-"to the given URL, if any"
+"The video view before having switched to fullscreen (same values as "
+"video_view)"
 msgstr ""
-"Način reagovanja na primljene pozive: 0 iskače prozor, 1 sam odgovara na "
-"poziv, 2 sam odbija poziv i 3 preusmerava poziv na adresu, ukoliko je data"
+"Širina slike pre prebacivanja na ceo ekran (ista vrednost kao video_view)"
 
-#: ../ekiga.schemas.in.in.h:162
+#: ../ekiga.schemas.in.in.h:131
 msgid "The zoom value"
 msgstr "Vrednost uvećanja"
 
-#: ../ekiga.schemas.in.in.h:163
+#: ../ekiga.schemas.in.in.h:132
 msgid ""
-"The zoom value to apply to images displayed in the local video window (can "
-"be 0.50, 1.00, or 2.00)"
+"The zoom value in percent to apply to images displayed in the main GUI (can "
+"be 50, 100, or 200)"
 msgstr ""
-"Vrednost uvećanja slika koje se prikazuju u lokalnom prozoru za sliku (može "
-"biti 0.50, 1.00 ili 2.00)"
+"Vrednost uvećanja slika koje se prikazuju u glavnom prozoru (može biti 50, "
+"100 ili 200)"
 
-#: ../ekiga.schemas.in.in.h:164
+#: ../ekiga.schemas.in.in.h:133
 msgid ""
-"The zoom value to apply to images displayed in the main GUI (can be 0.50, "
-"1.00, or 2.00)"
+"This allows you to set the mode for sending DTMFs. The values can be "
+"\"RFC2833\" (0), \"INFO\" (1)"
 msgstr ""
-"Vrednost uvećanja slika koje se prikazuju u glavnom prozoru (može biti 0.50, "
-"1.00 ili 2.00)"
+"Ovo dozvoljava da postavite režim za DTMF slanje. Vrednost može biti "
+"„RFC2833“ (0), „INFO“ (1)"
 
-#: ../ekiga.schemas.in.in.h:165
+#: ../ekiga.schemas.in.in.h:134
 msgid ""
-"The zoom value to apply to images displayed in the remote video window (can "
-"be 0.50, 1.00, or 2.00)"
+"This allows you to set the mode for sending DTMFs. The values can be \"String"
+"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
+"\"). Choosing other values than \"String\" disables the Text Chat"
 msgstr ""
-"Vrednost uvećanja slika koje se prikazuju u udaljenom prozoru za sliku (može "
-"biti 0.50, 1.00 ili 2.00)"
+"Ovo omogućava podešavanje režima za slanje DTMF signala. Vrednosti mogu biti "
+"„Niz“ (0), „Ton“ (1), „RFC2833“ (2), „Q.931“ (3) (početna vrednost je "
+"„Niz“)  Izbor neke druge vrednosti od „Niz“ isključuje tekstualni razgovor"
 
-#: ../ekiga.schemas.in.in.h:166 ../src/gui/preferences.cpp:1001
+#: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
 msgid ""
 "This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
-"are encapsulated into the the H.225 channel (port 1720). This saves one TCP "
+"are encapsulated into the H.225 channel (port 1720). This saves one TCP "
 "connection during calls. H.245 Tunneling was introduced in H.323v2 and "
 "Netmeeting does not support it. Using both Fast Start and H.245 Tunneling "
 "can crash some versions of Netmeeting."
@@ -893,1337 +729,1502 @@
 "Upotreba i Brzog starta i H.245 tunela može da sruši neke verzije Netmeeting-"
 "a."
 
-#: ../ekiga.schemas.in.in.h:167 ../src/gui/preferences.cpp:1003
+#: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:690
 msgid "This enables H.245 early in the setup"
 msgstr "Ovo uključuje H.245 rano u podešavanju"
 
-#: ../ekiga.schemas.in.in.h:168
-msgid ""
-"This enables IP checking from ekiga.com. The returned IP is only used when "
-"IP Translation is enabled."
-msgstr ""
-"Ovo uključuje IP proveru sa ekiga.net mesta. Povratna IP adresa se koristi "
-"jedino ako postoji adresno prevođenje."
-
-#: ../ekiga.schemas.in.in.h:169
-msgid ""
-"This permits to set the mode for DTMFs sending. The value can be \"RFC2833"
-"\" (0) only"
-msgstr ""
-"Ovo dozvoljava da postavite režim za DTMF slanje. Vrednost može biti samo "
-"„RFC2833“"
-
-#: ../ekiga.schemas.in.in.h:170
+#: ../ekiga.schemas.in.in.h:137
 msgid ""
-"This permits to set the mode for DTMFs sending. The values can be \"String"
-"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
-"\"). Choosing other values than \"String\" disables the Text Chat"
+"This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
+"acceleration"
 msgstr ""
-"Ovo omogućava podešavanje režima za slanje DTMF signala. Vrednosti mogu biti "
-"„Niz“ (0), „Ton“ (1), „RFC2833“ (2), „Q.931“ (3) (početna vrednost je „Niz“) "
-"Izbor neke druge vrednosti od „Niz“ isključuje tekstualni razgovor"
+"Ovaj ključ onemogućava DirectX (na win32) i IksVideo (na Linuksu) hardversko "
+"ubrzanje videa"
 
-#: ../ekiga.schemas.in.in.h:171
+#: ../ekiga.schemas.in.in.h:138
 msgid "UDP port range"
 msgstr "Opseg UDP portova"
 
-#: ../ekiga.schemas.in.in.h:172
-msgid "User directory"
-msgstr "Korisnički direktorijum"
-
-#: ../ekiga.schemas.in.in.h:173
-msgid "Version"
-msgstr "Verzija"
-
-#: ../ekiga.schemas.in.in.h:174
+#: ../ekiga.schemas.in.in.h:139
 msgid "Video channel"
 msgstr "Kanal za sliku"
 
-#: ../ekiga.schemas.in.in.h:175
+#: ../ekiga.schemas.in.in.h:140
 msgid "Video format"
 msgstr "Video format"
 
-#: ../ekiga.schemas.in.in.h:176
-msgid "Video image"
-msgstr "Video slika"
-
-#: ../ekiga.schemas.in.in.h:177
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr "Ulazni video uređaj"
 
-#: ../ekiga.schemas.in.in.h:178
-msgid "Video plugin"
-msgstr "Dodatak za video"
-
-#: ../ekiga.schemas.in.in.h:179
+#: ../ekiga.schemas.in.in.h:142
 msgid "Video preview"
 msgstr "Pregled slike"
 
-#: ../ekiga.schemas.in.in.h:180
+#: ../ekiga.schemas.in.in.h:143
 msgid "Video size"
 msgstr "Veličina slike"
 
-#: ../lib/gmconf/gmconf-gconf.c:155
+#: ../ekiga.schemas.in.in.h:144
 msgid ""
-"An error has happened in the configuration backend.\n"
-"Maybe some of your settings won't be saved."
-msgstr ""
-"Dogodila se greška pri pozadinskom podešavanju.\n"
-"Neka od podešavanja možda neće biti sačuvana."
+"Whether to prefer to sustain the max. frame rate or lower it possibly in "
+"order to keep a minimum level of (spatial) quality for all frames. 0: "
+"Highest minimal quality, 31: lowest minimal quality"
+msgstr ""
+"Da li da se održava maksimalna brzina kadrova ili da se smanjuje zbog "
+"održavanja minimalni nivo (prostornog) kvaliteta svih kadrova. 0: Najveći "
+"minimalni kvalitet, 32: najmanji minimalni kvalitet"
+
+#: ../lib/engine/addressbook/contact-core.cpp:60
+msgid "_Find"
+msgstr "_Traži"
+
+#: ../lib/engine/components/avahi/avahi-heap.cpp:125
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
+msgid "Neighbours"
+msgstr "Susedi"
+
+#: ../lib/engine/components/call-history/history-book.cpp:137
+#: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
+msgid "Clear List"
+msgstr "Očisti spisak"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:155
+msgid "Received"
+msgstr "Primljeni"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:158
+msgid "Placed"
+msgstr "Načinjeni"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:161
+msgid "Missed"
+msgstr "Propušteni"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:76
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
+#, c-format
+msgid "%d user found"
+msgid_plural "%d users found"
+msgstr[0] "%d korisnik nije pronađen"
+msgstr[1] "%d korisnika nisu pronađena"
+msgstr[2] "%d korisnika nije pronađeno"
 
-#: ../lib/gmcontacts/gmcontacts-avahi.cpp:285
-msgid "Contacts Near Me"
-msgstr "Kontakti u mojoj blizini"
+#: ../lib/engine/components/evolution/evolution-book.cpp:281
+msgid "New _Contact"
+msgstr "Novi _kontakt"
 
-#. Init the address book
-#: ../lib/gmcontacts/gmcontacts-eds.cpp:304 ../src/endpoints/ekiga.cpp:501
-msgid "On This Computer"
-msgstr "Na ovom računaru"
+#: ../lib/engine/components/evolution/evolution-book.cpp:317
+#: ../lib/engine/components/local-roster/local-cluster.cpp:82
+#: ../lib/engine/components/local-roster/local-heap.cpp:117
+msgid "New contact"
+msgstr "Novi kontakt"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
+msgid "Please update the following fields:"
+msgstr "Ažurirajte sledeća polja:"
 
-#: ../lib/gmcontacts/gmcontacts-eds.cpp:308 ../src/endpoints/ekiga.cpp:501
-#: ../src/gui/addressbook.cpp:3042
-msgid "Personal"
-msgstr "Lični"
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+msgid "_Name:"
+msgstr "_Ime:"
 
-#: ../lib/gui/gmdialog.c:487
-msgid "Do not show this dialog again"
-msgstr "Ne prikazuj više ovo prozorče"
+#: ../lib/engine/components/evolution/evolution-book.cpp:322
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
+msgid "VoIP _URI:"
+msgstr "_Adresa za prenos glasa preko Interneta:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+msgid "_Home phone:"
+msgstr "_Kućni telefon:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+msgid "_Office phone:"
+msgstr "_Službeni telefon:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+msgid "_Cell phone:"
+msgstr "_Mobilni telefon"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+msgid "_Pager:"
+msgstr "_Pejdžer:"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:234
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3183
+msgid "_Edit"
+msgstr "_Uređivanje"
 
-#: ../src/clients/ils.cpp:105 ../src/gui/tools.cpp:174
-msgid "Invalid parameters"
-msgstr "Netačni parametri"
+#: ../lib/engine/components/evolution/evolution-contact.cpp:236
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
+msgid "Edit contact"
+msgstr "Izmeni kontakt"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:169
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+msgid "Name:"
+msgstr "Ime:"
 
-#: ../src/clients/ils.cpp:105
-msgid ""
-"Please provide your first name and e-mail in the Personal Data section in "
-"order to be able to register to the users directory."
-msgstr ""
-"Molim unesite ime i e-poštu u odeljku ličnih podataka kako bi mogli da se "
-"registrujete u korisnički direktorijum."
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
+msgid "Remove contact"
+msgstr "Ukloni kontakt"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
+#, c-format
+msgid "Are you sure you want to remove %s from the addressbook?"
+msgstr "Da li ste sigurni da želite da uklonite %s iz imenika?"
+
+#: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
+msgid "Audio test"
+msgstr "Zvučni test"
+
+#: ../lib/engine/components/gstreamer/gst-audiooutput.cpp:320
+msgid "Silent"
+msgstr "Tiho"
+
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
+msgid "Video test"
+msgstr "Video test"
+
+#. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Crazy"
+msgstr "Ludo"
+
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Screencast"
+msgstr "Prenos ekrana"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
+msgid "_Refresh"
+msgstr "_Osveži"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
+msgid "_Remove addressbook"
+msgstr "_Ukloni imenik"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
+msgid "Addressbook _properties"
+msgstr "Svojstva imenika"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
+msgid "LDAP SASL Interaction"
+msgstr "LDAP SASL povezanost"
+
+#. Translators, Howard explained : "Challenge" is a generic term
+#. * in authentication. It's a prompt from the authentication mechanism
+#. * for some type of credential. Exactly what kind of challenge and
+#. * what kind of credential depends on the specific authentication
+#. * mechanism. Since SASL is a generic interface, and can dynamically
+#. * load arbitrary mechanisms, there's not much more specific you can
+#. * say about it. You might google for "challenge response
+#. * authentication" if you'd like more background context.
+#.
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
+msgid "Challenge: "
+msgstr "Izazov: "
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
+msgid "Interact"
+msgstr "Interakcija"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
+msgid "Refreshing"
+msgstr "Osvežavam"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
+msgid "Could not initialize server"
+msgstr "Nije uspelo pokretanje servera"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
+msgid "LDAP Error: "
+msgstr "LDAP greška: "
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
+msgid "Contacted server"
+msgstr "Kontaktirani server"
+
+#. patience == 0
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
+msgid "Could not connect to server"
+msgstr "Ne mogu da se povežem na server"
+
+#. patience == 0
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
+msgid "Could not search"
+msgstr "Ne mogu da pretražim"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
+msgid "Waiting for search results"
+msgstr "Čekam na rezultate pretrage"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
+msgid "Please edit the following fields"
+msgstr "Izmenite sledeća polja"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
+msgid "Book _Name"
+msgstr "_Ime knjige"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
+msgid "Server _URI"
+msgstr "_Adresa servera"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
+msgid "_Base DN"
+msgstr "_Osnovno ime domena"
 
-#: ../src/clients/ils.cpp:145
-msgid "Invalid users directory"
-msgstr "Neispravan korisnički direktorijum"
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
+msgid "Subtree"
+msgstr "Podstablo"
 
-#: ../src/clients/ils.cpp:145
-msgid "Operation impossible since there is no users directory specified."
-msgstr "Radnja je nemoguća zato što nije određen korisnički direktorijum."
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
+msgid "Single Level"
+msgstr "Jedan nivo"
 
-#: ../src/clients/ils.cpp:238
-msgid "Failed to parse XML file"
-msgstr "Nije uspeo da obradi XML datoteku"
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
+msgid "_Search Scope"
+msgstr "Op_seg pretrage"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
+msgid "_DisplayName Attribute"
+msgstr "Osobina vi_dljivo ime (DisplayName)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
+msgid "Call _Attributes"
+msgstr "Osobine poziv_a"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
+msgid "_Filter Template"
+msgstr "Šablon _filtriranja"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
+msgid "Bind _ID"
+msgstr "_IB povezivanja"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
+msgid "_Password"
+msgstr "_Lozinka"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
+msgid "Use TLS"
+msgstr "Koristi TLS"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
+msgid "Use SASL"
+msgstr "Koristi SASL"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
+msgid "SASL _Mechanism"
+msgstr "SASL _mehanizam"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
+msgid "Edit LDAP directory"
+msgstr "Izmeni LDAP fasciklu"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
+msgid "Please provide a Book Name for this directory\n"
+msgstr "Unesite ime knjige za ovu fasciklu\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
+msgid "Please provide a Server URI\n"
+msgstr "Unesite adresu servera\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
+msgid "Please provide a DisplayName Attribute\n"
+msgstr "Unesite svojstvo vidljivog imena\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
+msgid "Please provide a Call Attribute\n"
+msgstr "Unesite osobinu poziva\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
+msgid "Invalid Server URI\n"
+msgstr "Pogrešna adresa servera\n"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
+msgid "Add an LDAP Address Book"
+msgstr "Dodaj LDAP adresar"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
+msgid "Add the Ekiga.net Directory"
+msgstr "Dodaj Ekiga.net fasciklu"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:152
+msgid "Create LDAP directory"
+msgstr "Napravi LDAP fasciklu"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:167
+msgid "Ekiga.net Directory"
+msgstr "Ekiga.net fascikla"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
+msgid "Edit roster element"
+msgstr "Izmeni elemente liste kontakata"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
+msgid ""
+"Please fill in this form to change an existing element of ekiga's internal "
+"roster"
+msgstr ""
+"Popunite ovaj formular da izmenite postojeći element Ekigine interne liste "
+"kontakata"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:170
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
+msgid "Address:"
+msgstr "Adresa:"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
+msgid "Choose groups:"
+msgstr "Odaberite grupe:"
+
+#: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
+msgid "Add to local roster"
+msgstr "Dodaj u lokalne kontakte"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
+msgid "Services"
+msgstr "Servisi"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
+msgid "Echo test"
+msgstr "Eho test"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
+msgid "Conference room"
+msgstr "Soba za konferenciju"
 
-#: ../src/clients/ils.cpp:238
-msgid ""
-"There was an error while parsing the XML file. Please make sure that it is "
-"correctly installed in your system."
-msgstr ""
-"Dogodila se greška prilikom raščlanjavanja XML datoteke. Proverite da je "
-"pravilno instalirana na sistem."
+#: ../lib/engine/components/local-roster/local-heap.cpp:110
+msgid "Local roster"
+msgstr "Lokalni kontakti"
 
-#: ../src/clients/ils.cpp:249
-msgid "Bad information"
-msgstr "Loši podaci"
+#: ../lib/engine/components/local-roster/local-heap.cpp:127
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
+msgid "Family"
+msgstr "Porodica"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
+msgid "Friend"
+msgstr "Prijatelj"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
+msgid "Associate"
+msgstr "Saradnik"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
+msgid "Assistant"
+msgstr "Asistent"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
+msgid "Supervisor"
+msgstr "Supervizor"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
+msgid "Self"
+msgstr "Ja"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
+msgid ""
+"Please fill in this form to add a new contact to ekiga's internal roster"
+msgstr ""
+"Popunite ovaj formular da dodate novi kontakt Ekiginoj internoj listi "
+"kontakata"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
+msgid "Put contact in groups:"
+msgstr "Stavi kontakt u grupe:"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
+msgid "You supplied an unsupported address"
+msgstr "Naveli ste nepodržanu adresu"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
+msgid "You already have a contact with this address!"
+msgstr "Već imate kontakt sa ovom adresom!"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
+msgid "Rename group"
+msgstr "Preimenuj grupu"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
+msgid "Please edit this group name"
+msgstr "Izmenite ime ove grupe"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:233
+#: ../lib/engine/components/opal/sip-endpoint.cpp:237
+msgid "Call"
+msgstr "Poziv"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
+#: ../lib/engine/components/opal/sip-endpoint.cpp:238 ../src/gui/main.cpp:2957
+msgid "Transfer"
+msgstr "Prebaci"
 
-#: ../src/clients/ils.cpp:249
-#, c-format
-msgid "Bad LDAP information from XML file: %s."
-msgstr "Loši LDAP podaci iz XML datoteke: %s."
+#. Translators : The alias we are registering already exists : failure
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
+msgid "Duplicate alias"
+msgstr "Već postoji ovaj nadimak"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
+msgid "Bad username/password"
+msgstr "Pogrešno korisničko ime/lozinka"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
+msgid "Transport error"
+msgstr "Greška prilikom transporta"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:825
+msgid "Failed"
+msgstr "Nije uspelo"
+
+#: ../lib/engine/components/opal/opal-account.cpp:303
+msgid "_Disable"
+msgstr "O_nemogući"
+
+#: ../lib/engine/components/opal/opal-account.cpp:306
+msgid "_Enable"
+msgstr "_Omogući"
 
-#: ../src/clients/ils.cpp:257
-#, c-format
-msgid "ILS registration failed: unable to connect to %s"
-msgstr "Neuspešna ILS registracija: ne mogu da se povežem na %s"
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
+msgid "Recharge the account"
+msgstr "Dopunite nalog"
 
-#: ../src/clients/ils.cpp:270
-msgid "ILS registration failed: unable to set time limit on operations"
-msgstr ""
-"Neuspešna ILS registracija: ne mogu da postavim vremensko ograničenje na "
-"operacije"
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
+msgid "Consult the balance history"
+msgstr "Pogledaj istorijat stanja"
 
-#: ../src/clients/ils.cpp:282
-#, c-format
-msgid "ILS registration failed: failed to bind to %s"
-msgstr "Neuspešna ILS registracija: ne mogu da se nakačim na %s"
+#: ../lib/engine/components/opal/opal-account.cpp:337
+msgid "Consult the call history"
+msgstr "Pogledaj istorijat poziva"
 
-#: ../src/clients/ils.cpp:310
-#, c-format
-msgid "Updated information on %s"
-msgstr "Osveženi podaci o %s"
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
+msgid "Edit account"
+msgstr "Izmeni nalog"
 
-#: ../src/clients/ils.cpp:314 ../src/endpoints/accountshandler.cpp:332
-#: ../src/endpoints/sip.cpp:235
-#, c-format
-msgid "Unregistered from %s"
-msgstr "Neregistrovan od %s"
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
+msgid "Registrar:"
+msgstr "Registar:"
 
-#: ../src/clients/stun.cpp:104
-#, c-format
-msgid "STUN server set to %s"
-msgstr "STUN server je %s"
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
+msgid "Gatekeeper:"
+msgstr "Čuvar kapije:"
 
-# bug: STUN
-#: ../src/clients/stun.cpp:113
-msgid "Removed STUN server"
-msgstr "Uklonjen STUN server"
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:174
+msgid "User:"
+msgstr "Korisnik:"
 
-#: ../src/clients/stun.cpp:142
-#, c-format
-msgid ""
-"STUN test result: %s.\n"
-"\n"
-"Ekiga could not detect the type of NAT you are using. The most appropriate "
-"method, if your router does not natively support SIP or H.323, is probably "
-"to forward the required ports to your internal machine and use IP "
-"translation if you are behind a NAT router. Please also make sure you are "
-"not running a local firewall."
-msgstr ""
-"Rezultat STUN provere: %s.\n"
-"\n"
-"Ekiga ne može da prepozna vrstu adresnog prevodioca koji koristite, "
-"najpogodniji metod, ukoliko usmerivač prirodno ne podržava SIP ili H.323, je "
-"da prosleđujete potrebne portove vašoj unutrašnjoj mašini i koristite IP "
-"prevođenje ukoliko ste iza adresnog prevodioca usmerivača. Molim da takođe "
-"proverite da nemate pokrenut lokalni zaštitni zid."
+#. Translators:
+#. * SIP knows two usernames: The name for the client ("User") and the name
+#. * for the authentication procedure ("Authentication User")
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
+msgid "Authentication User:"
+msgstr "Korisničko ime za prijavu:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:173
+msgid "Password:"
+msgstr "Lozinka:"
 
-#: ../src/clients/stun.cpp:148
-#, c-format
-msgid ""
-"STUN test result: %s.\n"
-"\n"
-"Your system does not need any specific configuration as long as you do not "
-"have a local firewall blocking the ports required by Ekiga."
-msgstr ""
-"Rezultat STUN provere: %s.\n"
-"\n"
-"Za vaš sistem nije potrebno nikakvo naročito podešavanje ako ne koristite "
-"lokalni zaštitni zid koji blokira portove koje koristi Ekiga."
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
+msgid "Timeout:"
+msgstr "Vreme prekoračenja:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
+msgid "Enable Account"
+msgstr "Omogući nalog"
+
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
+msgid "You did not supply a name for that account."
+msgstr "Morate navesti ime ovog naloga."
+
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
+msgid "You did not supply a host to register to."
+msgstr "Morate navesti računar koji koristite za posrednika ili izlaz."
+
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
+msgid "You did not supply a user name for that account."
+msgstr "Morate navesti korisničko ime za ovaj nalog."
+
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
+msgid "The timeout should have a bigger value."
+msgstr "Vreme prekoračenja mora biti veće."
+
+#: ../lib/engine/components/opal/opal-bank.cpp:75
+msgid "_Add an Ekiga.net Account"
+msgstr "Dod_aj Ekiga.net nalog"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:77
+msgid "_Add an Ekiga Call Out Account"
+msgstr "Dod_aj Ekiga nalog za telefoniranje sa računara na telefon"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:79
+msgid "_Add a SIP Account"
+msgstr "Dod_aj SIP nalog"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:81
+msgid "_Add an H.323 Account"
+msgstr "Dod_aj H.323 nalog"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:96
+msgid "Please update the following fields."
+msgstr "Ažurirajte sledeća polja."
+
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
+msgid "Get an Ekiga.net SIP account"
+msgstr "Zatražite ekiga.net SIP nalog"
 
-#: ../src/clients/stun.cpp:153
-msgid ""
-"Ekiga detected Symmetric NAT. The most appropriate method, if your router "
-"does not natively support SIP or H.323, is to forward the required ports to "
-"your internal machine in order to change your Symmetric NAT into Cone NAT. "
-"If you run this test again after the port forwarding has been done, it "
-"should report Cone NAT. This should allow Ekiga to be used with STUN support "
-"enabled. If it does not report Cone NAT, then it means that there is a "
-"problem in your forwarding rules."
-msgstr ""
-"Ekiga je otkrio simetrični adresni prevodilac. Najpogodniji način, ukoliko "
-"vaš usmerivač sam ne podržava SIP ili H.323 je da prosleđujete tražene "
-"portove na vaš interni računar radi izmene vašeg simetričnog adresnog "
-"prevodioca u kupasti. Ponovo pokretanje ove provere treba da prijavi kupasti "
-"adresni prevodilac, i da omogući da se Ekiga koristi uz STUN podršku. "
-"Ukoliko ne prijavi kupasti adresni prevodilac nakon što je izvršeno "
-"prosleđivanje portova, to znači da ima nekih problema u vašim pravilima "
-"prosleđivanja."
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
+msgid "Get an Ekiga Call Out account"
+msgstr "Zatraži Ekiga nalog za telefoniranje sa računara na telefon"
 
-#: ../src/clients/stun.cpp:157
-#, c-format
-msgid ""
-"STUN test result: %s.\n"
-"\n"
-"You do not seem to be using a NAT router. STUN support is not required."
-msgstr ""
-"Rezultat STUN probe: %s.\n"
-"\n"
-"Čini se da ne koristite adresnog mrežnog prevodioca. STUN podrška nije "
-"potrebna."
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2711
+#: ../src/gui/main.cpp:2806
+msgid "Account ID:"
+msgstr "IB naloga:"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:117
+msgid "PIN Code:"
+msgstr "PIN broj:"
 
-#: ../src/clients/stun.cpp:162
-#, c-format
-msgid ""
-"STUN test result: %s.\n"
-"\n"
-"Using a STUN server is most probably the most appropriate method if your "
-"router does not natively support SIP or H.323.\n"
-"\n"
-"Enable STUN Support?"
-msgstr ""
-"Rezultat STUN provere: %s.\n"
-"\n"
-"Najpogodniji način, ukoliko usmerivač sam ne podržava SIP ili H.323 je da "
-"koristite STUN server.\n"
-"\n"
-"Uključiti STUN podršku?"
+#: ../lib/engine/components/opal/opal-call.cpp:405
+msgid "Local user cleared the call"
+msgstr "Lokalni korisnik je sklonio poziv"
 
-#: ../src/clients/stun.cpp:170 ../src/clients/stun.cpp:183
-msgid "NAT Detection Finished"
-msgstr "Obavljeno je prepoznavanje mrežnog adresnog prevodioca"
+#: ../lib/engine/components/opal/opal-call.cpp:408
+#: ../lib/engine/components/opal/opal-call.cpp:411
+msgid "Local user rejected the call"
+msgstr "Lokalni korisnik je odbio poziv"
 
-#: ../src/clients/stun.cpp:194
-msgid "The detection of your NAT type is finished"
-msgstr "Obavljeno je prepoznavanje vrste vašeg mrežnog adresnog prevodioca"
+#: ../lib/engine/components/opal/opal-call.cpp:414
+msgid "Remote user cleared the call"
+msgstr "Udaljeni korisnik je poništio poziv"
 
-#: ../src/clients/stun.cpp:261
-msgid "Unknown NAT"
-msgstr "Nepoznat adresni prevodilac"
+#: ../lib/engine/components/opal/opal-call.cpp:417
+msgid "Remote user rejected the call"
+msgstr "Udaljeni korisnik je odbio poziv"
 
-#: ../src/clients/stun.cpp:262
-msgid "Open NAT"
-msgstr "Otvoreni adresni prevodilac"
+#: ../lib/engine/components/opal/opal-call.cpp:420
+msgid "Remote user has stopped calling"
+msgstr "Udaljeni korisnik je zaustavio poziv"
 
-#: ../src/clients/stun.cpp:263
-msgid "Cone NAT"
-msgstr "Kupasti adresni prevodilac"
+#: ../lib/engine/components/opal/opal-call.cpp:423
+msgid "Abnormal call termination"
+msgstr "Nenormalan prekid poziva"
 
-#: ../src/clients/stun.cpp:264
-msgid "Restricted NAT"
-msgstr "Ograničeni adresni prevodilac"
+#: ../lib/engine/components/opal/opal-call.cpp:426 ../src/gui/main.cpp:1501
+msgid "Could not connect to remote host"
+msgstr "Ne može se povezati na udaljenog domaćina"
 
-#: ../src/clients/stun.cpp:265
-msgid "Port Restricted NAT"
-msgstr "Adresni prevodilac ograničen po portu"
+#: ../lib/engine/components/opal/opal-call.cpp:429
+msgid "The Gatekeeper cleared the call"
+msgstr "Čuvar kapije je poništio poziv"
 
-#: ../src/clients/stun.cpp:266
-msgid "Symmetric NAT"
-msgstr "Simetrični adresni prevodilac"
+#: ../lib/engine/components/opal/opal-call.cpp:432
+msgid "User not found"
+msgstr "Korisnik nije pronađen"
 
-#: ../src/clients/stun.cpp:267
-msgid "Symmetric Firewall"
-msgstr "Simetrični zaštitni zid"
+#: ../lib/engine/components/opal/opal-call.cpp:435
+msgid "Insufficient bandwidth"
+msgstr "Nedovoljan propusni opseg"
 
-#: ../src/clients/stun.cpp:268
-msgid "Blocked"
-msgstr "Blokiran"
+#: ../lib/engine/components/opal/opal-call.cpp:438
+msgid "No common codec"
+msgstr "Nema poznatog kodeka"
 
-#: ../src/clients/stun.cpp:269
-msgid "Partially Blocked"
-msgstr "Delimično blokiran"
+#: ../lib/engine/components/opal/opal-call.cpp:441
+msgid "Call forwarded"
+msgstr "Poziv preusmeren"
 
-#: ../src/clients/stun.cpp:270
-msgid "No NAT"
-msgstr "Nema adresnog prevodioca"
+#: ../lib/engine/components/opal/opal-call.cpp:444
+msgid "Security check failed"
+msgstr "Neuspešna sigurnosna provera"
 
-#: ../src/clients/stun.cpp:321
-msgid "Detection in progress"
-msgstr "Prepoznavanje je u toku..."
+#: ../lib/engine/components/opal/opal-call.cpp:447
+msgid "Local user is busy"
+msgstr "Lokalni korisnik je zauzet"
 
-#: ../src/clients/stun.cpp:322
-msgid "Please wait while your type of NAT is being detected."
-msgstr ""
-"Molim sačekajte — u toku je prepoznavanje vrste vašeg adresnog prevodioca."
+#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:456
+msgid "Congested link to remote party"
+msgstr "Prepuna veza do udaljene strane"
 
-#: ../src/clients/stun.cpp:373
-#, c-format
-msgid "Set STUN server to %s (%s)"
-msgstr "Postavi STUN server na %s (%s)"
+#: ../lib/engine/components/opal/opal-call.cpp:453
+msgid "Remote user is busy"
+msgstr "Udaljeni korisnik je zauzet"
 
-#: ../src/clients/stun.cpp:375
-#, c-format
-msgid "Ignored STUN server (%s)"
-msgstr "Zanemareni STUN server (%s)"
+#: ../lib/engine/components/opal/opal-call.cpp:459
+msgid "Remote host is offline"
+msgstr "Udaljeni računar nije na mreži"
 
-#: ../src/components/bonobo.cpp:117
-msgid "Cannot run Ekiga"
-msgstr "Ne mogu da pokrenem Ekigu"
+#: ../lib/engine/components/opal/opal-call.cpp:465
+msgid "User is not available"
+msgstr "Korisnik nije dostupan"
 
-#: ../src/components/bonobo.cpp:117
-msgid ""
-"Ekiga is already running, if you want it to call a given SIP, H.323, or "
-"callto address, please use \"ekiga -c address\"."
-msgstr ""
-"Ekiga je već pokrenuta, ako želite da uputi poziv na datu adresu, molim "
-"koristite naredbu „ekiga -c ADRESA“."
+#: ../lib/engine/components/opal/opal-call.cpp:477
+msgid "Call completed"
+msgstr "Poziv završen"
 
-#: ../src/components/bonobo.cpp:170
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
 msgid ""
-"It appears that you do not have ekiga.server installed in a valid location. "
-"Factory mode disabled.\n"
+"Ekiga did not manage to configure your network settings automatically. You "
+"can still use it, but you need to configure your network settings manually.\n"
+"\n"
+"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"for instructions"
 msgstr ""
-"Izgleda da nemate ekiga.server instaliran na ispravnom mestu. Fabrički režim "
-"isključen.\n"
+"Ekiga nije uspela da sama podesi mrežna podešavanja. I dalje je možete "
+"koristiti, ali ćete morati da podesite mrežu ručno.\n"
+"\n"
+"Pogledajte http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"za instrukcije"
 
-#: ../src/components/bonobo.cpp:174
-msgid ""
-"Error registering Ekiga with the activation service; factory mode disabled.\n"
-msgstr ""
-"Greška pri registrovanju Ekige sa uslugom za pokretanje. Isključen fabrički "
-"režim.\n"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:258
+#: ../lib/engine/components/opal/sip-endpoint.cpp:260
+msgid "Message"
+msgstr "Poruka"
 
-#: ../src/components/bonobo.cpp:214
-msgid "Failed to retrieve Ekiga server from activation server\n"
-msgstr "Nije uspeo da pozove Ekiga server sa servera za pokretanje\n"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:632
+msgid "Bad request"
+msgstr "Loš zahtev"
 
-#: ../src/devices/audio.cpp:285
-msgid "Opening device for playing"
-msgstr "Otvara uređaj radi puštanja"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:636
+msgid "Payment required"
+msgstr "Nije besplatno"
 
-#: ../src/devices/audio.cpp:287
-msgid "Opening device for recording"
-msgstr "Otvara uređaj radi snimanja"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:640
+msgid "Unauthorized"
+msgstr "Neovlašćen"
 
-#: ../src/devices/audio.cpp:298 ../src/devices/audio.cpp:300
-#: ../src/devices/videoinput.cpp:708
-msgid "Failed to open the device"
-msgstr "Ne može da otvori uređaj"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:644
+msgid "Forbidden"
+msgstr "Zabranjeno"
 
-#: ../src/devices/audio.cpp:298
-#, c-format
-msgid ""
-"Impossible to open the selected audio device (%s) for recording. Please "
-"check your audio setup, the permissions and that the device is not busy."
-msgstr ""
-"Nije moguće otvoriti izabrani zvučni uređaj (%s) za snimanje. Proverite "
-"podešavanje zvuka, ovlašćenja i da li je uređaj zauzet."
+#: ../lib/engine/components/opal/sip-endpoint.cpp:648
+msgid "Timeout"
+msgstr "Vremenski rok"
 
-#: ../src/devices/audio.cpp:300
-#, c-format
-msgid ""
-"Impossible to open the selected audio device (%s) for playing. Please check "
-"your audio setup, the permissions and that the device is not busy."
-msgstr ""
-"Nije moguće otvoriti izabran zvučni uređaj (%s) za puštanje. Proverite "
-"podešavanje zvuka, ovlašćenja i da li je uređaj zauzet."
+#: ../lib/engine/components/opal/sip-endpoint.cpp:652
+msgid "Conflict"
+msgstr "Sukob"
 
-#: ../src/devices/audio.cpp:316 ../src/devices/audio.cpp:385
-msgid "Cannot use the audio device"
-msgstr "Ne može da koristi zvučni uređaj"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:656
+msgid "Temporarily unavailable"
+msgstr "Privremeno nedostupna"
 
-#: ../src/devices/audio.cpp:316
-#, c-format
-msgid ""
-"The selected audio device (%s) was successfully opened but it is impossible "
-"to read data from this device. Please check your audio setup."
-msgstr ""
-"Izabran zvučni uređaj (%s) je uspešno otvoren ali je nemoguće čitati podatke "
-"sa ovog uređaja. Proverite zvučna podešavanja."
+#: ../lib/engine/components/opal/sip-endpoint.cpp:660
+msgid "Not acceptable"
+msgstr "Neprihvatljivo"
 
-#: ../src/devices/audio.cpp:325
-msgid "Recording your voice"
-msgstr "Snima vaš glas"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:664
+msgid "Illegal status code"
+msgstr "Nedozvoljena šifra stanja"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:668
+msgid "Multiple choices"
+msgstr "Višestruki izbor"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:672
+msgid "Moved permanently"
+msgstr "Trajno premešten"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:676
+msgid "Moved temporarily"
+msgstr "Privremeno premešten"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:680
+msgid "Use proxy"
+msgstr "Koristi posrednika"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:684
+msgid "Alternative service"
+msgstr "Rezervni servis"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:688
+msgid "Not found"
+msgstr "Nije pronađen"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:692
+msgid "Method not allowed"
+msgstr "Metoda nije dozvoljena"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:696
+msgid "Proxy authentication required"
+msgstr "Zahteva se prijavljivanje na posrednika"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:700
+msgid "Length required"
+msgstr "Zahteva se dužina"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:704
+msgid "Request entity too big"
+msgstr "Zahtevani entitet je preveliki"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:708
+msgid "Request URI too long"
+msgstr "Adresa zahteva je predugačka"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:712
+msgid "Unsupported media type"
+msgstr "Nepodržani tip medija"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:716
+msgid "Unsupported URI scheme"
+msgstr "Nepodržana šema adrese"
+
+#. Translators : The extension we are trying to register does not exist
+#: ../lib/engine/components/opal/sip-endpoint.cpp:721
+msgid "Bad extension"
+msgstr "Loše proširenje"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
+msgid "Extension required"
+msgstr "Zahteva se proširenje"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
+msgid "Interval too brief"
+msgstr "Interval je prekratak"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
+msgid "Loop detected"
+msgstr "Detektovana petlja"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
+msgid "Too many hops"
+msgstr "Previše skokova"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
+msgid "Address incomplete"
+msgstr "Adresa nije dovršena"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
+msgid "Ambiguous"
+msgstr "Dvosmisleno"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
+msgid "Busy Here"
+msgstr "Ovde je zauzeto"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
+msgid "Request terminated"
+msgstr "Zahtev je prekinut"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
+msgid "Not acceptable here"
+msgstr "Ovde je neprihvatljivo"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
+msgid "Bad event"
+msgstr "Loš događaj"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
+msgid "Request pending"
+msgstr "Zahtev je na čekanju"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
+msgid "Undecipherable"
+msgstr "Dešifrovanje nije moguće"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
+msgid "Internal server error"
+msgstr "Interna greška na serveru"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
+msgid "Not implemented"
+msgstr "NOvo nije implementirano"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
+msgid "Bad gateway"
+msgstr "Loš mrežni prolaz"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
+msgid "Service unavailable"
+msgstr "Servis nije dostupan"
 
-#: ../src/devices/audio.cpp:364
-msgid "Recording and playing back"
-msgstr "Snimanje i puštanje"
+# bug(slobo): msgstr "Nema roka za odgovor" ...sumnjam da je ovo
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
+msgid "Server timeout"
+msgstr "Istekao je vremenski rok na serveru"
 
-#: ../src/devices/audio.cpp:385
-#, c-format
-msgid ""
-"The selected audio device (%s) was successfully opened but it is impossible "
-"to write data to this device. Please check your audio setup."
-msgstr ""
-"Izabran zvučni uređaj (%s) je uspešno otvoren ali je nemoguće snimati "
-"podatke na ovaj uređaj. Proverite zvučna podešavanja."
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
+msgid "SIP version not supported"
+msgstr "Izdanje SIP-a nije podržano"
 
-#: ../src/devices/audio.cpp:481 ../src/devices/audio.cpp:482
-#: ../src/devices/videoinput.cpp:310 ../src/devices/videoinput.cpp:585
-#: ../src/endpoints/ekiga.cpp:352 ../src/endpoints/ekiga.cpp:354
-#: ../src/endpoints/ekiga.cpp:356 ../src/endpoints/pcss.cpp:194
-#: ../src/gui/druid.cpp:1779 ../src/gui/druid.cpp:1793
-#: ../src/gui/druid.cpp:1853
-msgid "No device found"
-msgstr "Nisam našao uređaj"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
+msgid "Message too large"
+msgstr "Poruka je predugačka"
 
-#: ../src/devices/audio.cpp:500
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
+msgid "Busy everywhere"
+msgstr "Svuda je zauzeto"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
+msgid "Decline"
+msgstr "Odbij"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
+msgid "Does not exist anymore"
+msgstr "Više ne postoji"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:813
+msgid "Globally not acceptable"
+msgstr "Globalno neprihvatljivo"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:950
+msgid "Could not send message"
+msgstr "Ne mogu da pošaljem poruku"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1045
 #, c-format
-msgid ""
-"Ekiga is now recording from %s and playing back to %s. Please say \"1, 2, 3, "
-"Ekiga rocks!\" in your microphone. You should hear yourself back into the "
-"speakers with a four-second delay."
-msgstr ""
-"Ekiga sada snima sa %s i pušta na %s. Molim recite „1 2 3“ u vaš mikrofon, i "
-"treba da čujete sebe sa zvučnika nakon 4 sekunde."
+msgid "Incoming call from %s"
+msgstr "Dolazni poziv od %s"
 
-#: ../src/devices/videoinput.cpp:319
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1047
 #, c-format
-msgid "Opening video device %s with plugin %s"
-msgstr "Otvara video uređaj %s pomoću dodatka %s"
+msgid "Incoming call"
+msgstr "Dolazni poziv"
 
-#: ../src/devices/videoinput.cpp:347
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1053
 #, c-format
-msgid "Successfully opened video device %s, channel %d"
-msgstr "Uspešno otvoren video uređaj %s, kanal %d"
+msgid "In a call with %s"
+msgstr "Na vezi sa %s"
 
-#: ../src/devices/videoinput.cpp:358
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1055
 #, c-format
-msgid "Error while opening video device %s"
-msgstr "Greška pri otvaranju video uređaja %s"
+msgid "In a call"
+msgstr "Na vezi"
 
-#. Translators: Do not translate MovingLogo and Picture
-#: ../src/devices/videoinput.cpp:362
-msgid ""
-"A moving logo will be transmitted during calls. Notice that you can always "
-"transmit a given image or the moving logo by choosing \"Picture\" as video "
-"plugin and \"MovingLogo\" or \"StaticPicture\" as device."
-msgstr ""
-"Pokretni logo će biti prenet za vreme poziva. Uvek možete poslati datu sliku "
-"ili pokretni logo izborom „Slika“ za video dodatak i „PokretniLogo“ ili "
-"„StatičnaSlika“ za uređaj."
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:102
+msgid "New resource list"
+msgstr "Novi spisak resursa"
 
-#: ../src/devices/videoinput.cpp:364
-msgid "Couldn't open the video device"
-msgstr "Ne mogu da otvorim video uređaj"
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:166
+msgid "Add new resource-list"
+msgstr "Dodaj novi spisak resursa"
 
-#: ../src/devices/videoinput.cpp:368
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:167
 msgid ""
-"There was an error while opening the device. Please check your permissions "
-"and make sure that the appropriate driver is loaded."
+"Please fill in this form to add a new contact list to ekiga's remote roster"
 msgstr ""
-"Dogodila se greška prilikom otvaranja uređaja. Proverite ovlašćenja i uverite "
-"se da je odgovarajući upravljački program učitan."
+"Popunite ovaj formular za dodavanje novog spiska kontakata u Ekiginoj udaljenoj "
+"listi kontakata"
 
-#: ../src/devices/videoinput.cpp:372 ../src/devices/videoinput.cpp:686
-msgid "Your video driver doesn't support the requested video format."
-msgstr "Upravljački program za video ne podržava zahtevani video format."
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:171
+msgid "Writable:"
+msgstr "Upisivo:"
 
-#: ../src/devices/videoinput.cpp:376
-msgid "Could not open the chosen channel."
-msgstr "Ne mogu da otvorim izabrani kanal."
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:172
+msgid "Username:"
+msgstr "Korisničko ime:"
 
-#: ../src/devices/videoinput.cpp:380
-msgid ""
-"Your driver doesn't seem to support any of the color formats supported by "
-"Ekiga.\n"
-" Please check your kernel driver documentation in order to determine which "
-"Palette is supported."
-msgstr ""
-"Upravljački program izgleda da ne podržava nijedan od formata boja koje Ekiga "
-"podržava.\n"
-" Proverite dokumentaciju vašeg upravljačkog programa u jezgru da odredite "
-"koja paleta je podržana."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
+#: ../lib/engine/components/resource-list/rl-heap.cpp:178
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
+msgid "Unnamed"
+msgstr "Neimenovano"
 
-#: ../src/devices/videoinput.cpp:384
-msgid "Error while setting the frame rate."
-msgstr "Greška prilikom podešavanja broja okvira u sekundi."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:200
+msgid "_Add a new contact"
+msgstr "Dod_aj novi kontakt"
 
-#: ../src/devices/videoinput.cpp:388
-msgid "Error while setting the frame size."
-msgstr "Greška prilikom podešavanja veličine slike."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:202
+msgid "_Refresh contact list"
+msgstr "_Osveži spisak kontakata"
 
-#: ../src/devices/videoinput.cpp:428
-msgid "Opened the video device using the \"Picture\" video plugin"
-msgstr "Otvoren video uređaj uz video dodatak „Slika“"
-
-#: ../src/devices/videoinput.cpp:586
-msgid "Picture"
-msgstr "Slika"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:204
+msgid "Contact list _properties"
+msgstr "Osobine spiska kontakata"
 
-#: ../src/devices/videoinput.cpp:598
-#, c-format
-msgid ""
-"Ekiga is now testing the %s video device. If you experience machine crashes, "
-"then report a bug to the video driver author."
-msgstr ""
-"Ekiga sada isprobava video uređaj %s. Ukoliko mašina zaglavi, onda prijavite "
-"grešku autoru upravljačkog programa za video."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
+msgid "Edit contact list properties"
+msgstr "Izmeni osobine spiska kontakata"
 
-#: ../src/devices/videoinput.cpp:660
-#, c-format
-msgid "Test %d done"
-msgstr "Provera %d je gotova"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
+msgid "Please edit the following fields (no identifier means global)"
+msgstr "Izmenite sledeća polja (bez identifikatora podrazumeva globalnu izmenu)"
 
-#: ../src/devices/videoinput.cpp:662
-#, c-format
-msgid "Test %d failed"
-msgstr "Provera %d neuspela"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+msgid "Contact list's name"
+msgstr "Ime spiska kontakata"
 
-#: ../src/devices/videoinput.cpp:681
-#, c-format
-msgid "Error while opening %s."
-msgstr "Greška kod otvaranja %s."
+#. "Document" used as a name -- uri point to the root of a document tree
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
+msgid "Document root"
+msgstr "Koren dokumenta"
 
-#: ../src/devices/videoinput.cpp:690
-msgid "Could not open the chosen channel with the chosen video format."
-msgstr "Ne može da otvori izabrani kanal sa izabranim video formatom."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+msgid "Identifier"
+msgstr "Identifikator"
 
-#: ../src/devices/videoinput.cpp:694
-msgid "Your driver doesn't support any of the color formats tried by Ekiga"
-msgstr ""
-"Upravljački program ne podržava nijedan od formata boja koje je pokušao da "
-"koristi Ekiga"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
+msgid "Writable"
+msgstr "Upisivo"
 
-#: ../src/devices/videoinput.cpp:698
-msgid "Error with the frame rate."
-msgstr "Greška sa brojem slika u sekundi."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+msgid "Server username"
+msgstr "Korisničko ime servera"
 
-#: ../src/devices/videoinput.cpp:702
-msgid "Error with the frame size."
-msgstr "Greška sa veličinom slike."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+msgid "Server password"
+msgstr "Lozinka servera"
 
-#: ../src/endpoints/accountshandler.cpp:186
-#: ../src/endpoints/accountshandler.cpp:270
-msgid "Registering"
-msgstr "Registracija je u toku..."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
+msgid "Add a remote contact"
+msgstr "Dodaj udaljeni kontakt"
 
-#: ../src/endpoints/accountshandler.cpp:200
-#, c-format
-msgid "Registration of %s to %s failed"
-msgstr "Neuspela registracija korisnika %s na sistemu %s"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
+msgid "Please fill in this form to create a new contact on a remote server"
+msgstr ""
+"Popunite ovaj formular da biste napravili novi kontakt na udaljenom serveru"
 
-#: ../src/endpoints/accountshandler.cpp:211
-#: ../src/endpoints/accountshandler.cpp:323 ../src/endpoints/sip.cpp:316
-#: ../src/endpoints/sip.cpp:328
-msgid "Registration failed"
-msgstr "Neuspela registracija"
-
-#: ../src/endpoints/accountshandler.cpp:225
-#: ../src/endpoints/accountshandler.cpp:338
-msgid "Unregistering"
-msgstr "Poništavanje registracije je u toku..."
-
-#: ../src/endpoints/accountshandler.cpp:294
-msgid "Gatekeeper registration failed: duplicate alias"
-msgstr "Neuspešna registracija čuvara kapije: ponovljen nadimak"
-
-#: ../src/endpoints/accountshandler.cpp:298
-msgid "Gatekeeper registration failed: bad username/password"
-msgstr "Neuspešna registracija čuvara kapije: loše ime/lozinka"
-
-#: ../src/endpoints/accountshandler.cpp:301
-msgid "Gatekeeper registration failed: transport error"
-msgstr "Neuspešna registracija čuvara kapije: greška u prenosu"
-
-#: ../src/endpoints/accountshandler.cpp:304
-#: ../src/endpoints/accountshandler.cpp:309
-msgid "Gatekeeper registration failed"
-msgstr "Neuspešna registracija čuvara kapije"
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+msgid "Edit remote contact"
+msgstr "Izmeni udaljeni kontakt"
 
-#: ../src/endpoints/accountshandler.cpp:312 ../src/endpoints/sip.cpp:224
-#, c-format
-msgid "Registered to %s"
-msgstr "Registrovan(a) na %s"
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
+msgid ""
+"Please fill in this form to change an existing contact on a remote server"
+msgstr ""
+"Popunite ovaj formular da izmenite postojeći kontakt na udaljenom serveru"
 
-#: ../src/endpoints/accountshandler.cpp:322 ../src/endpoints/sip.cpp:230
-msgid "Registered"
-msgstr "Registracija je obavljena"
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
+msgid "Invalid server data"
+msgstr "Neispravni podaci o serveru"
 
-#: ../src/endpoints/accountshandler.cpp:352 ../src/endpoints/sip.cpp:241
-msgid "Unregistered"
-msgstr "Neregistrovan(a)"
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
+msgid "Click to fetch"
+msgstr "Kliknite da dobavite"
 
-#: ../src/endpoints/ekiga.cpp:105
-msgid "Answering incoming call"
-msgstr "Odgovaranje na dolazni poziv"
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
+msgid "Distant contact"
+msgstr "Udaljeni kontakt"
 
-#: ../src/endpoints/ekiga.cpp:530
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
 #, c-format
-msgid "Started Ekiga %d.%d.%d for user %s"
-msgstr "Pokrenuta Ekiga %d.%d.%d za korisnika %s"
+msgid "%s / List #%d"
+msgstr "%s / Spisak #%d"
 
-#: ../src/endpoints/manager.cpp:672
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
 #, c-format
-msgid "Forwarding call to %s"
-msgstr "Prosleđuje poziv za %s"
+msgid "List #%d"
+msgstr "Spisak #%d"
 
-#. Update the log and status bar
-#: ../src/endpoints/manager.cpp:826
-#, c-format
-msgid "Call from %s"
-msgstr "Poziv od %s"
-
-#: ../src/endpoints/manager.cpp:840
-msgid "Rejecting incoming call"
-msgstr "Odbacivanje dolazećeg poziva"
-
-#: ../src/endpoints/manager.cpp:842
-#, c-format
-msgid "Rejecting incoming call from %s"
-msgstr "Odbija poziv od %s"
-
-#: ../src/endpoints/manager.cpp:848
-msgid "Forwarding incoming call"
-msgstr "Preusmerava dolazni poziv"
-
-#: ../src/endpoints/manager.cpp:850
-#, c-format
-msgid "Forwarding incoming call from %s to %s"
-msgstr "Preusmerava poziv od %s do %s"
-
-#: ../src/endpoints/manager.cpp:856
-msgid "Auto-Answering incoming call"
-msgstr "Samo odgovaranje na dolazni poziv"
+#: ../lib/engine/gui/gtk-core/form-dialog-gtk.cpp:660
+msgid "Advanced"
+msgstr "Napredno"
 
-#: ../src/endpoints/manager.cpp:857
-#, c-format
-msgid "Auto-Answering incoming call from %s"
-msgstr "Samo odgovaranje dolaznog poziva %s"
-
-#: ../src/endpoints/manager.cpp:1012
-#, c-format
-msgid "Connected with %s using %s"
-msgstr "Povezano sa %s koristeći %s"
-
-#: ../src/endpoints/manager.cpp:1014
-#, c-format
-msgid "Connected with %s"
-msgstr "Povezano sa %s"
-
-#: ../src/endpoints/manager.cpp:1124 ../src/gui/main.cpp:4156
-msgid "Standby"
-msgstr "Pripravan"
-
-#: ../src/endpoints/manager.cpp:1189
-msgid "Local user cleared the call"
-msgstr "Lokalni korisnik je sklonio poziv"
-
-#: ../src/endpoints/manager.cpp:1192 ../src/endpoints/manager.cpp:1195
-msgid "Local user rejected the call"
-msgstr "Lokalni korisnik je odbio poziv"
-
-#: ../src/endpoints/manager.cpp:1198
-msgid "Remote user cleared the call"
-msgstr "Udaljeni korisnik je poništio poziv"
-
-#: ../src/endpoints/manager.cpp:1201
-msgid "Remote user rejected the call"
-msgstr "Udaljeni korisnik je odbio poziv"
-
-#: ../src/endpoints/manager.cpp:1204
-msgid "Call not answered in the required time"
-msgstr "Na poziv nije odgovoreno u zahtevanom vremenu"
-
-#: ../src/endpoints/manager.cpp:1207
-msgid "Remote user has stopped calling"
-msgstr "Udaljeni korisnik je zaustavio poziv"
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:659
+msgid "Address Book"
+msgstr "Imenik"
 
-#: ../src/endpoints/manager.cpp:1210
-msgid "Abnormal call termination"
-msgstr "Nenormalan prekid poziva"
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
+#: ../src/gui/main.cpp:3132
+msgid "Address _Book"
+msgstr "Imeni_k"
 
-#: ../src/endpoints/manager.cpp:1213
-msgid "Could not connect to remote host"
-msgstr "Ne može se povezati na udaljenog domaćina"
+#. This will add static and dynamic actions
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:684
+msgid "_Action"
+msgstr "_Radnja"
+
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:729
+msgid "Category"
+msgstr "Kategorija"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
+#: ../src/gui/assistant.cpp:1368
+msgid "Full Name"
+msgstr "Puno ime"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:601
+msgid "_Search Filter:"
+msgstr "_Filter pretrage:"
 
-#: ../src/endpoints/manager.cpp:1216
-msgid "The Gatekeeper cleared the call"
-msgstr "Čuvar kapije je poništio poziv"
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:247
+msgid "says:"
+msgstr "kaže:"
 
-#: ../src/endpoints/manager.cpp:1219 ../src/endpoints/urlhandler.cpp:530
-#: ../src/endpoints/urlhandler.cpp:535
-msgid "User not found"
-msgstr "Korisnik nije pronađen"
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:370
+msgid "Open link in browser"
+msgstr "Otvori vezu u Internet pregledniku"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:376
+msgid "Copy link"
+msgstr "Umnoži vezu"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
+msgid "_Smile..."
+msgstr "_Smešak..."
 
-#: ../src/endpoints/manager.cpp:1222
-msgid "Insufficient bandwidth"
-msgstr "Nedovoljan propusni opseg"
+#. we can't do much here since we get the Chat as reference...
+#: ../lib/engine/gui/gtk-frontend/chat-window.cpp:432
+msgid "Chat Window"
+msgstr "Prozor za tekstualne poruke"
 
-#: ../src/endpoints/manager.cpp:1225
-msgid "No common codec"
-msgstr "Nema poznatog kodeka"
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:989
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1024
+msgid "Unsorted"
+msgstr "Nepoređano"
+
+#: ../lib/gui/codecsbox.cpp:478
+msgid "Move selected codec priority upwards"
+msgstr "Pomeri prioritet označenog kodeka na više"
+
+#: ../lib/gui/codecsbox.cpp:488
+msgid "Move selected codec priority downwards"
+msgstr "Pomeri prioritet označenog kodeka na niže"
 
-#: ../src/endpoints/manager.cpp:1228
-msgid "Call forwarded"
-msgstr "Poziv preusmeren"
+#: ../lib/gui/gmdialog.c:462
+msgid "Do not show this dialog again"
+msgstr "Ne prikazuj više ovo prozorče"
 
-#: ../src/endpoints/manager.cpp:1231
-msgid "Security check failed"
-msgstr "Neuspešna sigurnosna provera"
+#: ../src/gui/accounts.cpp:230
+msgid "Registered"
+msgstr "Registracija je obavljena"
 
-#: ../src/endpoints/manager.cpp:1234
-msgid "Local user is busy"
-msgstr "Lokalni korisnik je zauzet"
+#: ../src/gui/accounts.cpp:234
+msgid "Unregistered"
+msgstr "Neregistrovan(a)"
 
-#: ../src/endpoints/manager.cpp:1237 ../src/endpoints/manager.cpp:1243
-msgid "Congested link to remote party"
-msgstr "Prepuna veza do udaljene strane"
+#: ../src/gui/accounts.cpp:238
+msgid "Could not unregister"
+msgstr "Ne mogu da isključim nalog"
+
+#: ../src/gui/accounts.cpp:244
+msgid "Could not register"
+msgstr "Ne mogu da registrujem nalog"
+
+#: ../src/gui/accounts.cpp:250
+msgid "Processing..."
+msgstr "Obrađujem..."
 
-#: ../src/endpoints/manager.cpp:1240
-msgid "Remote user is busy"
-msgstr "Udaljeni korisnik je zauzet"
+#: ../src/gui/accounts.cpp:636
+msgid "Account Name"
+msgstr "Ime naloga"
 
-#: ../src/endpoints/manager.cpp:1246
-msgid "Remote host is offline"
-msgstr "Udaljeni računar nije na mreži"
+#: ../src/gui/accounts.cpp:637
+msgid "Voice Mails"
+msgstr "Govorna pošta"
 
-#: ../src/endpoints/manager.cpp:1251
-msgid "Remote user is unreachable"
-msgstr "Udaljeni korisnik nije dostupan"
+#: ../src/gui/accounts.cpp:638
+msgid "Status"
+msgstr "Stanje"
 
-#: ../src/endpoints/manager.cpp:1255
-msgid "Call completed"
-msgstr "Poziv završen"
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
+msgid "Accounts"
+msgstr "Nalozi"
 
-#: ../src/endpoints/manager.cpp:1609
-msgid "Error while starting the listener for the H.323 protocol"
-msgstr "Greška pri pokretanju slušača za H.323 protokol"
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3193
+msgid "_Accounts"
+msgstr "Na_lozi"
 
-#: ../src/endpoints/manager.cpp:1609
-msgid ""
-"You will not be able to receive incoming H.323 calls. Please check that no "
-"other program is already running on the port used by Ekiga."
-msgstr ""
-"Nećete moći da primate dolazne H.323 pozive. Molim proverite da neki drugi "
-"program već nije pokrenut na portu koji koristi Ekiga."
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3276
+msgid "_Help"
+msgstr "_Pomoć"
 
-#: ../src/endpoints/manager.cpp:1626
-msgid "Error while starting the listener for the SIP protocol"
-msgstr "Greška pri pokretanju slušača za SIP protokol"
+#  Translators: This is "A" as in "Audio"
+#. Translators:
+#. * The following string "A" means "activated" or "active". It's a column
+#. * description in the list of configured accounts, it shows if an account
+#. * is activated or not (a status the user can choose).
+#.
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
+msgid "A"
+msgstr "Z"
 
-#: ../src/endpoints/manager.cpp:1626
+#: ../src/gui/assistant.cpp:321
 msgid ""
-"You will not be able to receive incoming SIP calls. Please check that no "
-"other program is already running on the port used by Ekiga."
+"This is the Ekiga general configuration assistant. The following steps will "
+"set up Ekiga by asking a few simple questions.\n"
+"\n"
+"Once you have completed these steps, you can always change them later by "
+"selecting Preferences in the Edit menu."
 msgstr ""
-"Nećete moći da primate dolazne SIP pozive. Molim proverite da neki drugi "
-"program nije trenutno pokrenut na portu koji koristi Ekiga."
-
-#: ../src/endpoints/manager.cpp:1873
-#, c-format
-msgid "Opened codec %s for transmission"
-msgstr "Otvoren kodek %s za prenos"
-
-#: ../src/endpoints/manager.cpp:1884
-#, c-format
-msgid "Closed codec %s which was opened for transmission"
-msgstr "Zatvoren kodek %s koji je otvoren za prenos"
-
-#: ../src/endpoints/manager.cpp:1898
-#, c-format
-msgid "Opened codec %s for reception"
-msgstr "Otvoren kodek %s za prijem"
-
-#: ../src/endpoints/manager.cpp:1909
-#, c-format
-msgid "Closed codec %s which was opened for reception"
-msgstr "Zatvoren kodek %s koji je otvoren za prijem"
-
-#: ../src/endpoints/manager.cpp:2095
-#, c-format
-msgid "%.2ld:%.2ld:%.2ld  A:%.2f/%.2f   V:%.2f/%.2f"
-msgstr "%.2ld:%.2ld:%.2ld  Z:%.2f/%.2f   V:%.2f/%.2f"
-
-#: ../src/endpoints/pcss.cpp:218
-#, c-format
-msgid "Opened %s for recording with plugin %s"
-msgstr "Otvorio sam %s radi snimanja pomoću dodatka %s"
-
-#: ../src/endpoints/pcss.cpp:219
-#, c-format
-msgid "Opened %s for playing with plugin %s"
-msgstr "Otvorio sam %s radi puštanja pomoću dodatka %s"
-
-#: ../src/endpoints/pcss.cpp:237
-msgid "Could not open audio channel for audio transmission"
-msgstr "Ne može da otvori zvučni kanal za zvučni prenos"
-
-#: ../src/endpoints/pcss.cpp:237
-msgid ""
-"An error occured while trying to record from the soundcard for the audio "
-"transmission. Please check that your soundcard is not busy and that your "
-"driver supports full-duplex.\n"
-"The audio transmission has been disabled."
-msgstr ""
-"Dogodila se greška prilikom pokušaja da snima sa zvučne karte za zvučni "
-"prenos. Proverite da li karta nije zauzeta i da li upravljački program "
-"podržava full-duplex.\n"
-"Zvučni prenos isključen."
-
-#: ../src/endpoints/pcss.cpp:239
-msgid "Could not open audio channel for audio reception"
-msgstr "Ne može da otvori zvučni kanal za zvučni prijem"
-
-#: ../src/endpoints/pcss.cpp:239
-msgid ""
-"An error occured while trying to play audio to the soundcard for the audio "
-"reception. Please check that your soundcard is not busy and that your driver "
-"supports full-duplex.\n"
-"The audio reception has been disabled."
-msgstr ""
-"Dogodila se greška prilikom pokušaja da se pusti zvuk sa zvučne karte za "
-"zvučni prijem. Proverite da li karta nije zauzeta i da li upravljački program "
-"podržava full-duplex.\n"
-"Zvučni prijem isključen."
-
-#: ../src/endpoints/sip.cpp:287
-msgid "Bad request"
-msgstr "Loš zahtev"
-
-#: ../src/endpoints/sip.cpp:291
-msgid "Payment required"
-msgstr "Nije besplatno"
-
-#: ../src/endpoints/sip.cpp:296
-msgid "Forbidden"
-msgstr "Zabranjeno"
-
-#: ../src/endpoints/sip.cpp:300
-msgid "Timeout"
-msgstr "Vremenski rok"
-
-#: ../src/endpoints/sip.cpp:304
-msgid "Conflict"
-msgstr "Sukob"
-
-#: ../src/endpoints/sip.cpp:308
-msgid "Temporarily unavailable"
-msgstr "Privremeno nedostupna"
-
-#: ../src/endpoints/sip.cpp:312
-msgid "Not Acceptable"
-msgstr "Neprihvatljivo"
-
-#: ../src/endpoints/sip.cpp:321
-#, c-format
-msgid "Registration failed: %s"
-msgstr "Neuspela registracija: %s"
-
-#: ../src/endpoints/sip.cpp:333
-#, c-format
-msgid "Unregistration failed: %s"
-msgstr "Neuspelo poništavanje registracije: %s"
+"Ovo je čarobnjak za podešavanje Ekige. Sledeći koraci će podesiti Ekigu "
+"postavljanjem par jednostavnih pitanja.\n"
+"\n"
+"Kada prođete ove korake, kasnije ih uvek možete izmeniti odabiranjem stavke "
+"Postavke u meniju Uređivanje."
 
-#: ../src/endpoints/sip.cpp:340
-msgid "Unregistration failed"
-msgstr "Neuspešno poništavanje registracije"
+#: ../src/gui/assistant.cpp:329
+msgid "Welcome to Ekiga"
+msgstr "Dobrodošli u Ekigu"
 
-#: ../src/endpoints/sip.cpp:540
-msgid "Error: User not found"
-msgstr "Greška: Korisnik nije pronađen"
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
+msgid "Personal Information"
+msgstr "Lični podaci"
 
-#: ../src/endpoints/sip.cpp:544
-msgid "Error: User offline"
-msgstr "Greška: Korisnik nije na mreži"
+#. The user fields
+#: ../src/gui/assistant.cpp:356
+msgid "Please enter your first name and your surname:"
+msgstr "Unesite ime i prezime:"
 
-#: ../src/endpoints/sip.cpp:549
-msgid "Error: Forbidden"
-msgstr "Greška: Zabranjeno"
+#: ../src/gui/assistant.cpp:365
+msgid ""
+"Your first name and surname will be used when connecting to other VoIP and "
+"videoconferencing software."
+msgstr ""
+"Ime i prezime će se koristiti pri povezivanju sa ostalim VoIP i softverom za "
+"video konferencije."
 
-#: ../src/endpoints/sip.cpp:553
-msgid "Error: Timeout"
-msgstr "Greška: Vreme je isteklo"
+#: ../src/gui/assistant.cpp:559
+msgid "Ekiga.net Account"
+msgstr "Ekiga.net nalog"
 
-#: ../src/endpoints/sip.cpp:557 ../src/gui/chat.cpp:1031
-msgid "Error: Failed to transmit message"
-msgstr "Greška: Ne mogu da prenesem poruku"
+#: ../src/gui/assistant.cpp:561
+msgid "Please enter your username:"
+msgstr "Unesite vaše korisničko ime:"
 
-#: ../src/endpoints/urlhandler.cpp:441
-msgid "Invalid URL handler"
-msgstr "Pogrešna URL ručka"
+#: ../src/gui/assistant.cpp:569
+msgid "Please enter your password:"
+msgstr "Unesite vašu lozinku:"
 
-#: ../src/endpoints/urlhandler.cpp:441
+#: ../src/gui/assistant.cpp:579
 msgid ""
-"Please specify a valid URL handler. Currently both h323: and callto: are "
-"supported."
-msgstr "Odredite ispravnu URL ručku. Trenutno oba h323: i callto: su podržani."
-
-#: ../src/endpoints/urlhandler.cpp:469
-#, c-format
-msgid "Calling %s"
-msgstr "Poziva %s"
+"The username and password are used to login to your existing account at the "
+"ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
+"you may first create an account below. This will provide a SIP address that "
+"allows people to call you.\n"
+"\n"
+"You may skip this step if you use an alternative SIP service, or if you "
+"would prefer to specify the login details later."
+msgstr ""
+"Možete da preskočite ovaj korak ukoliko koristite neku drugu SIP uslugu ili "
+"bi želeli da kasnije navedete podatke za prijavu."
 
-#: ../src/endpoints/urlhandler.cpp:472
-#, c-format
-msgid "Transferring call to %s"
-msgstr "Prenosi poziv do %s"
+#: ../src/gui/assistant.cpp:606
+msgid "I do not want to sign up for the ekiga.net free service"
+msgstr "Ne želim da prihvatim ekiga.net besplatnu uslugu"
 
-#: ../src/endpoints/urlhandler.cpp:541 ../src/endpoints/urlhandler.cpp:546
-msgid "Failed to call user"
-msgstr "Nisam uspeo da pozovem korisnika"
-
-#: ../src/gui/accounts.cpp:408
-msgid "Edit the Account Information"
-msgstr "Uredi podatke naloga"
-
-#. Account Name
-#: ../src/gui/accounts.cpp:432
-msgid "Account Name:"
-msgstr "Ime naloga:"
-
-#: ../src/gui/accounts.cpp:446
-msgid "Protocol:"
-msgstr "Protokol:"
+#: ../src/gui/assistant.cpp:669
+msgid "Ekiga Call Out Account"
+msgstr "Ekiga nalog za telefoniranje sa računara na telefon"
 
-#: ../src/gui/accounts.cpp:470 ../src/gui/accounts.cpp:973
-msgid "Registrar:"
-msgstr "Registar:"
+#: ../src/gui/assistant.cpp:671
+msgid "Please enter your account ID:"
+msgstr "Unesite korisničko ime naloga:"
 
-#: ../src/gui/accounts.cpp:472 ../src/gui/accounts.cpp:982
-msgid "Gatekeeper:"
-msgstr "Čuvar kapije:"
+#: ../src/gui/assistant.cpp:679
+msgid "Please enter your PIN code:"
+msgstr "Unesite vašu PIN lozinku:"
 
-#. User
-#: ../src/gui/accounts.cpp:486
-msgid "User:"
-msgstr "Korisnik:"
+#: ../src/gui/assistant.cpp:690
+msgid ""
+"You can make calls to regular phones and cell numbers worldwide using "
+"Ekiga.\n"
+"\n"
+"To enable this, you need to do two things:\n"
+"- First buy an account at the URL below.\n"
+"- Then enter your account ID and PIN code.\n"
+"The service will work only if your account is created using the URL in this "
+"dialog.\n"
+msgstr ""
+"Koristeći Ekigu možete da pozivate obične telefonske i mobilne brojeve širom "
+"sveta.\n"
+"\n"
+"Da bi to uradili treba da:\n"
+"- Kupite nalog na donjoj adresi.\n"
+"- Unesete broj naloga i lozinku.\n"
+"Usluga će raditi samo ako ste nalog napravili koristeći adresu iz ovog "
+"prozorčeta.\n"
 
-#. Password
-#: ../src/gui/accounts.cpp:501
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../src/gui/assistant.cpp:740
+msgid "Consult the calls history"
+msgstr "Pogledaj istorijat poziva"
 
-#. Advanced Options
-#: ../src/gui/accounts.cpp:518
-msgid "More _Options"
-msgstr "Više _mogućnosti"
-
-#: ../src/gui/accounts.cpp:532
-msgid "Authentication Login:"
-msgstr "Prijava:"
-
-#: ../src/gui/accounts.cpp:554 ../src/gui/accounts.cpp:983
-msgid "Gatekeeper ID:"
-msgstr "IB čuvara kapije:"
-
-#. Timeout
-#: ../src/gui/accounts.cpp:578
-msgid "Registration Timeout:"
-msgstr "Rok za registraciju:"
-
-#. SIP
-#. H323
-#: ../src/gui/accounts.cpp:684 ../src/gui/accounts.cpp:686
-#: ../src/gui/addressbook.cpp:3114 ../src/gui/addressbook.cpp:3593
-msgid "Missing information"
-msgstr "Nedostaju podaci"
-
-#: ../src/gui/accounts.cpp:684
-msgid ""
-"Please make sure to provide a valid account name, host name, and user name."
-msgstr "Molim dostavite ispravno ime naloga, računara i korisničko ime."
-
-#: ../src/gui/accounts.cpp:686
-msgid ""
-"Please make sure to provide a valid account name, host name and registration "
-"timeout."
-msgstr "Molim dostavite ispravno ime naloga, računara i roka za registraciju."
+#: ../src/gui/assistant.cpp:750
+msgid "I do not want to sign up for the Ekiga Call Out service"
+msgstr ""
+"Ne želim da se prijavim za Ekiginu uslugu telefoniranja sa računara na telefon"
 
-#: ../src/gui/accounts.cpp:716
-#, c-format
-msgid "Are you sure you want to delete account %s?"
-msgstr "Da li ste sigurni da želite da uklonite nalog %s?"
+#  Connection type
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
+msgid "Connection Type"
+msgstr "Vrsta povezivanja"
 
-#: ../src/gui/accounts.cpp:974
-msgid "Realm/Domain:"
-msgstr "Domen:"
+#. The connection type
+#: ../src/gui/assistant.cpp:819
+msgid "Please choose your connection type:"
+msgstr "Izaberite vrstu veze:"
 
-#: ../src/gui/accounts.cpp:1497
-msgid "Account Name"
-msgstr "Ime naloga"
+#: ../src/gui/assistant.cpp:836
+msgid "56k Modem"
+msgstr "Modem na običnoj telefonskoj liniji"
 
-#: ../src/gui/accounts.cpp:1498
-msgid "Protocol"
-msgstr "Protokol"
+#: ../src/gui/assistant.cpp:841
+msgid "ISDN"
+msgstr "Digitalna tel. linija sa integrisanim uslugama"
 
-#: ../src/gui/accounts.cpp:1507
-msgid "Voice Mails"
-msgstr "Govorna pošta"
+#: ../src/gui/assistant.cpp:846
+msgid "DSL/Cable (128 kbit/s uplink)"
+msgstr "DSL/Kablovska (128 kbit/s odlazno)"
+
+#: ../src/gui/assistant.cpp:851
+msgid "DSL/Cable (512 kbit/s uplink)"
+msgstr "DSL/Kablovska (512 kbit/s odlazno)"
+
+#: ../src/gui/assistant.cpp:856
+msgid "LAN"
+msgstr "Lokalna mreža"
 
-#: ../src/gui/accounts.cpp:1508
-msgid "Status"
-msgstr "Stanje"
+#: ../src/gui/assistant.cpp:861
+msgid "Keep current settings"
+msgstr "Zadrži tekuća podešavanja"
 
-#: ../src/gui/accounts.cpp:1519
-msgid "Accounts"
-msgstr "Nalozi"
+#: ../src/gui/assistant.cpp:866
+msgid ""
+"The connection type will permit determining the best quality settings that "
+"Ekiga will use during calls. You can later change the settings individually "
+"in the preferences window."
+msgstr ""
+"Vrsta veze dozvoljava određivanje podešavanja sa najboljim kvalitetom koje će "
+"Ekiga koristiti prilikom poziva. Naknadno možete izmeniti pojedinačna "
+"podešavanja među postavkama."
 
-#  Translators: This is "A" as in "Audio"
-#: ../src/gui/accounts.cpp:1555 ../src/gui/preferences.cpp:474
-#: ../src/gui/preferences.cpp:817
-msgid "A"
-msgstr "Z"
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3022
+#: ../src/gui/main.cpp:3026 ../src/gui/preferences.cpp:760
+msgid "Audio Devices"
+msgstr "Zvučni uređaji"
 
-#: ../src/gui/accounts.cpp:1655
-msgid "_Default"
-msgstr "_Početno"
-
-#: ../src/gui/addressbook.cpp:819
-msgid "Contact collision"
-msgstr "Sudar kontakta"
+#: ../src/gui/assistant.cpp:962
+msgid "Please choose the audio ringing device:"
+msgstr "Izaberite zvučni uređaj za zvono:"
 
-#: ../src/gui/addressbook.cpp:821
-#, c-format
+#: ../src/gui/assistant.cpp:982
 msgid ""
-"Another contact with the same speed dial already exists in your address "
-"book:\n"
-"\n"
-"<b>Name</b>: %s\n"
-"<b>URL</b>: %s\n"
-"<b>Speed Dial</b>: %s\n"
+"The audio ringing device is the device that will be used to play the ringing "
+"sound on incoming calls."
 msgstr ""
-"Drugi kontakt sa istim brzim biranjem već postoji u adresaru:\n"
-"\n"
-"<b>Ime</b>: %s\n"
-"<b>Adresa</b>: %s\n"
-"<b>Brzo biranje</b>: %s\n"
-
-#: ../src/gui/addressbook.cpp:821 ../src/gui/addressbook.cpp:823
-#: ../src/gui/druid.cpp:1915 ../src/gui/preferences.cpp:930
-msgid "None"
-msgstr "Ništa"
+"Zvučni uređaj za zvono je uređaj koji se koristi za puštanje zvuka zvona pri "
+"dolaznim pozivima."
 
-#: ../src/gui/addressbook.cpp:823
-#, c-format
+#. ---
+#: ../src/gui/assistant.cpp:993
+msgid "Please choose the audio output device:"
+msgstr "Izaberite izlazni uređaj za zvuk:"
+
+#: ../src/gui/assistant.cpp:1013
 msgid ""
-"Another contact with similar information already exists in your address "
-"book:\n"
-"\n"
-"<b>Name</b>: %s\n"
-"<b>URL</b>: %s\n"
-"<b>Speed Dial</b>: %s\n"
-"\n"
-"Do you still want to add the contact?"
+"The audio output device is the device that will be used to play audio during "
+"calls."
 msgstr ""
-"Drugi kontakt sa sličnim podacima već postoji u adresaru:\n"
-"\n"
-"<b>Ime</b>: %s\n"
-"<b>Adresa</b>: %s\n"
-"<b>Brzo biranje</b>: %s\n"
-"\n"
-"Da li i dalje želite da dodate ovaj kontakt?"
-
-#  Translators: This is "S" as in "Status"
-#. Translators: This is "S" as in "Status"
-#: ../src/gui/addressbook.cpp:991
-msgid "S"
-msgstr "S"
-
-#: ../src/gui/addressbook.cpp:1002 ../src/gui/preferences.cpp:488
-msgid "Name"
-msgstr "Ime"
-
-#: ../src/gui/addressbook.cpp:1017
-msgid "Comment"
-msgstr "Komentar"
-
-#: ../src/gui/addressbook.cpp:1032 ../src/gui/callshistory.cpp:755
-msgid "Software"
-msgstr "Softver"
-
-#: ../src/gui/addressbook.cpp:1046
-msgid "VoIP URL"
-msgstr "Adresa za prenos glasa preko Interneta"
-
-#: ../src/gui/addressbook.cpp:1062
-msgid "E-Mail"
-msgstr "E-pošta"
-
-#: ../src/gui/addressbook.cpp:1076
-msgid "Location"
-msgstr "Mesto"
-
-#: ../src/gui/addressbook.cpp:1090
-msgid "Categories"
-msgstr "Kategorije"
-
-#: ../src/gui/addressbook.cpp:1103
-msgid "Speed Dial"
-msgstr "Brzo biranje"
-
-#: ../src/gui/addressbook.cpp:1132
-msgid "Name contains"
-msgstr "Ime sadrži"
-
-#: ../src/gui/addressbook.cpp:1133
-msgid "URL contains"
-msgstr "Adresa sadrži"
-
-#: ../src/gui/addressbook.cpp:1135
-msgid "Belongs to category"
-msgstr "Pripada kategoriji"
-
-#: ../src/gui/addressbook.cpp:1137
-msgid "Location contains"
-msgstr "Adresa sadrži"
-
-#. call a contact, usage: general
-#: ../src/gui/addressbook.cpp:1552 ../src/gui/addressbook.cpp:2586
-#: ../src/gui/callshistory.cpp:295 ../src/gui/chat.cpp:682
-msgid "C_all Contact"
-msgstr "_Kontakt lista"
-
-#. copy a contact's URL to clipboard, usage: general
-#: ../src/gui/addressbook.cpp:1559 ../src/gui/addressbook.cpp:2596
-#: ../src/gui/chat.cpp:677 ../src/gui/chat.cpp:682
-msgid "_Copy URL to Clipboard"
-msgstr "U_množi adresu u spisak isečaka"
-
-#: ../src/gui/addressbook.cpp:1565 ../src/gui/addressbook.cpp:2601
-msgid "_Write e-Mail"
-msgstr "Napiši e-poruk_u"
-
-#. add a contact to the local addressbook, usage: remote contacts only
-#: ../src/gui/addressbook.cpp:1572 ../src/gui/addressbook.cpp:2613
-#: ../src/gui/callshistory.cpp:302 ../src/gui/chat.cpp:682
-msgid "Add Contact to _Address Book"
-msgstr "Dodaj kontakt u _adresar"
-
-#. send a contact a (SIP!) message, usage: SIP contacts only
-#: ../src/gui/addressbook.cpp:1579 ../src/gui/addressbook.cpp:2591
-msgid "_Send Message"
-msgstr "Pošalji po_ruku"
-
-#. edit a local contact's addressbook entry, usage: local contacts
-#: ../src/gui/addressbook.cpp:1586 ../src/gui/addressbook.cpp:1723
-#: ../src/gui/addressbook.cpp:2572
-msgid "_Properties"
-msgstr "O_sobine"
-
-#. delete a local contact entry, usage: local contacts
-#: ../src/gui/addressbook.cpp:1593 ../src/gui/addressbook.cpp:1730
-#: ../src/gui/addressbook.cpp:2567
-msgid "_Delete"
-msgstr "O_briši"
-
-#. "new contact" dialog, usage: local context
-#: ../src/gui/addressbook.cpp:1600 ../src/gui/addressbook.cpp:2608
-msgid "New _Contact"
-msgstr "Novi _kontakt"
-
-#: ../src/gui/addressbook.cpp:2027
-#, c-format
-msgid "Error while fetching users list from %s"
-msgstr "Greška pri preuzimanju spiska korisnika sa %s"
-
-#: ../src/gui/addressbook.cpp:2031
-#, c-format
-msgid "Found %d user in %s"
-msgid_plural "Found %d users in %s"
-msgstr[0] "Pronađen %d korisnik u %s"
-msgstr[1] "Pronađeno %d korisnika u %s"
-msgstr[2] "Pronađena %d korisnika u %s"
-
-#: ../src/gui/addressbook.cpp:2035
-#, c-format
-msgid "Found %d user in %s for a total of %d users"
-msgid_plural "Found %d users in %s for a total of %d users"
-msgstr[0] "Pronađen %d korisnik u %s od ukupno %d korisnika"
-msgstr[1] "Pronađena %d korisnika u %s od ukupno %d korisnika"
-msgstr[2] "Pronađeno %d korisnika u %s od ukupno %d korisnika"
-
-#: ../src/gui/addressbook.cpp:2523
-msgid "Address Book"
-msgstr "Imenik"
-
-#: ../src/gui/addressbook.cpp:2558
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../src/gui/addressbook.cpp:2560
-msgid "New _Address Book"
-msgstr "Novi i_menik"
-
-#: ../src/gui/addressbook.cpp:2579 ../src/gui/main.cpp:975
-msgid "_Close"
-msgstr "_Zatvori"
-
-#: ../src/gui/addressbook.cpp:2584
-msgid "C_ontact"
-msgstr "K_ontakt"
-
-#: ../src/gui/addressbook.cpp:2686
-msgid "Remote Contacts"
-msgstr "Udaljeni kontakti"
+"Izlazni uređaj za zvuk je uređaj koji se koristi za puštanje zvuka za vreme "
+"poziva."
 
-#: ../src/gui/addressbook.cpp:2694
-msgid "Local Contacts"
-msgstr "Lokalni kontakti"
+#. ---
+#: ../src/gui/assistant.cpp:1024
+msgid "Please choose the audio input device:"
+msgstr "Izaberite ulazni uređaj za zvuk:"
 
-#: ../src/gui/addressbook.cpp:2817
-msgid "Edit the Contact Information"
-msgstr "Uredi podatke kontakta"
+#: ../src/gui/assistant.cpp:1044
+msgid ""
+"The audio input device is the device that will be used to record your voice "
+"during calls."
+msgstr ""
+"Ulazni uređaj za zvuk je uređaj koji se koristi za snimanje glasa za vreme "
+"poziva."
 
-#: ../src/gui/addressbook.cpp:2838 ../src/gui/addressbook.cpp:3308
-msgid "Name:"
-msgstr "Ime:"
+#: ../src/gui/assistant.cpp:1146
+msgid "Please choose your video input device:"
+msgstr "Izaberite ulazni uređaj za video:"
 
-#: ../src/gui/addressbook.cpp:2858
-msgid "VoIP URL:"
-msgstr "Adresa za prenos glasa preko Interneta:"
+#: ../src/gui/assistant.cpp:1166
+msgid ""
+"The video input device is the device that will be used to capture video "
+"during calls."
+msgstr ""
+"Ulazni uređaj za video je uređaj koji se koristi za snimanje videa za vreme "
+"poziva."
 
-#: ../src/gui/addressbook.cpp:2880
-msgid "Email:"
-msgstr "E-pošta:"
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
+#: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
+msgid "No device found"
+msgstr "Nisam našao uređaj"
 
-#: ../src/gui/addressbook.cpp:2901
-msgid "Speed Dial:"
-msgstr "Brzo biranje:"
+#: ../src/gui/assistant.cpp:1310
+msgid "Configuration Complete"
+msgstr "Podešavanje završeno"
 
-#: ../src/gui/addressbook.cpp:2923
-msgid "Categories:"
-msgstr "Kategorije:"
+#: ../src/gui/assistant.cpp:1312
+msgid ""
+"You have now finished the Ekiga configuration. All the settings can be "
+"changed in the Ekiga preferences. Enjoy!"
+msgstr ""
+"Upravo ste završili podešavanje Ekige. Možete promeniti sva podešavanja promeniti iz "
+"Ekiginih „Postavki“. Uživajte!"
 
-#: ../src/gui/addressbook.cpp:2948
-msgid "Local Addressbook:"
-msgstr "Lokalni adresar:"
+#: ../src/gui/assistant.cpp:1319
+msgid "Configuration summary:"
+msgstr "Pregled podešavanja:"
 
-#: ../src/gui/addressbook.cpp:3114
-msgid ""
-"Please make sure to provide at least a full name or an URL for the contact."
-msgstr "Proverite da li ste uneli bar puno ime ili adresu kontakta."
+#: ../src/gui/assistant.cpp:1389
+msgid "Audio Ringing Device"
+msgstr "Zvučni uređaj za zvono"
 
-#: ../src/gui/addressbook.cpp:3161
-#, c-format
-msgid "Are you sure you want to delete %s from %s?"
-msgstr "Da li ste sigurni da želite da uklonite %s iz %s?"
+#: ../src/gui/assistant.cpp:1398
+msgid "Audio Output Device"
+msgstr "Izlazni zvučni uređaj"
 
-#: ../src/gui/addressbook.cpp:3287
-msgid "Edit an address book"
-msgstr "Uredi imenik"
-
-#: ../src/gui/addressbook.cpp:3288
-msgid "Add an address book"
-msgstr "Dodaj adresar"
-
-#: ../src/gui/addressbook.cpp:3333
-msgid "Type:"
-msgstr "Vrsta:"
-
-#: ../src/gui/addressbook.cpp:3339
-msgid "Local"
-msgstr "Lokalni"
-
-#: ../src/gui/addressbook.cpp:3340
-msgid "Remote LDAP"
-msgstr "Udaljeni LDAP"
-
-#: ../src/gui/addressbook.cpp:3341
-msgid "Remote ILS"
-msgstr "Udaljeni ILS"
-
-#: ../src/gui/addressbook.cpp:3372
-msgid "Hostname:"
-msgstr "Ime računara:"
-
-#: ../src/gui/addressbook.cpp:3395
-msgid "Port:"
-msgstr "Port:"
-
-#: ../src/gui/addressbook.cpp:3420
-msgid "Base DN:"
-msgstr "Osnovno ime domena:"
-
-#: ../src/gui/addressbook.cpp:3443
-msgid "Search Scope:"
-msgstr "Opseg pretrage:"
+#: ../src/gui/assistant.cpp:1407
+msgid "Audio Input Device"
+msgstr "Ulazni zvučni uređaj"
 
-#: ../src/gui/addressbook.cpp:3449
-msgid "Subtree"
-msgstr "Podstablo"
+#: ../src/gui/assistant.cpp:1416
+msgid "Video Input Device"
+msgstr "Ulazni video uređaj"
 
-#: ../src/gui/addressbook.cpp:3450
-msgid "One Level"
-msgstr "Jedan nivo"
+#: ../src/gui/assistant.cpp:1429
+msgid "SIP URI"
+msgstr "SIP adresa"
 
-#: ../src/gui/addressbook.cpp:3480
-msgid "Search Attribute:"
-msgstr "Pretraži atribut:"
-
-#: ../src/gui/addressbook.cpp:3593
-msgid "Please make sure you fill in all required fields."
-msgstr "Molim proverite da li ste popunili sva obavezna polja."
+#: ../src/gui/assistant.cpp:1441
+msgid "Ekiga Call Out"
+msgstr "Ekiga telefoniranje sa računara na telefon"
 
-#: ../src/gui/addressbook.cpp:3639
+#: ../src/gui/assistant.cpp:1485
 #, c-format
-msgid "Are you sure you want to delete %s and all its contacts?"
-msgstr "Da li ste sigurni da želite da uklonite %s i pripadajuće kontakte?"
+msgid "Ekiga Configuration Assistant (%d of %d)"
+msgstr "Čarobnjak za uvodno podešavanje (strana %d/%d)"
 
-#: ../src/gui/callbacks.cpp:124
-msgid "Disconnecting..."
-msgstr "Prekidam..."
-
-#: ../src/gui/callbacks.cpp:139
+#: ../src/gui/callbacks.cpp:131
 msgid "Contributors:"
 msgstr "Saradnici:"
 
-#: ../src/gui/callbacks.cpp:146
+#: ../src/gui/callbacks.cpp:143
 msgid "Artwork:"
 msgstr "Umetnički rad:"
 
-#: ../src/gui/callbacks.cpp:152
+#: ../src/gui/callbacks.cpp:151
 msgid "See AUTHORS file for full credits"
 msgstr "Pročitajte datoteku AUTHORS sa spiskom svih učesnika"
 
+#: ../src/gui/callbacks.cpp:167
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version. "
+msgstr ""
+"Ekiga je slobodan softver; možete ga raspodeljivati i/ili ga menjati pod "
+"uslovima GNU Opšte Javne Licence (GNU GPL) kako je objavljuje Zadužbina za "
+"Slobodni Softver (FSF); bilo verzije 2 te Licence, bilo (po vašem nahođenju) "
+"bilo koje novije verzije."
+
+#: ../src/gui/callbacks.cpp:171
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details. You should have received a copy of the GNU General Public "
+"License along with this program; if not, write to the Free Software "
+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Ekiga se raspodeljuje u nadi da će biti od koristi, ali BEZ IKAKVIH "
+"GARANCIJA; čak i bez podrazumevane garancije KORISNOSTI ili PRILAGOĐENOSTI "
+"ODREĐENOJ NAMENI.  Vidite GNU Opštu Javnu Licencu za više detalja. Trebali "
+"ste da primite primerak GNU Opšte Javne Licence uz Ekigu; ako niste, pišite "
+"Zadužbini za Slobodni Softver (Free Software Foundation, Inc.), 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+
+#: ../src/gui/callbacks.cpp:178
+msgid ""
+"Ekiga is licensed under the GPL license and as a special exception, you have "
+"permission to link or otherwise combine this program with the programs OPAL, "
+"OpenH323 and PWLIB, and distribute the combination, without applying the "
+"requirements of the GNU GPL to the OPAL, OpenH323 and PWLIB programs, as "
+"long as you do follow the requirements of the GNU GPL for all the rest of "
+"the software thus combined."
+msgstr ""
+"Ekiga je licencirana pod GNU Opštom Javnom Licencom (GNU GPL), a kao "
+"specijalni izuzetak, imate ovlašćenje da povezujete ili na drugi način "
+"kombinujete ovaj program sa programima OPAL, OpenH323 and PWLIB i "
+"raspodeljujete ovakvu kombinaciju bez primene GNU Opšte Javne Licence na "
+"OPAL, OpenH323 and PWLIB programe, dok god pratite zahteve GNU Opšte Javne "
+"Licence za ostale iskombinovane programe."
+
 #. Translators: Please write translator credits here, and
 #. * separate names with \n
 #: ../src/gui/callbacks.cpp:190
@@ -2232,6 +2233,7 @@
 "Dejan Matijević <dejan@ns.sympatico.ca>\n"
 "Danilo Šegan <danilo@prevod.org>\n"
 "Slobodan D. Sredojević <slobo@akrep.be>\n"
+"Branko Kokanović <branko.kokanovic@gmail.com>\n"
 "http://prevod.org — prevod na srpski jezik."
 
 #: ../src/gui/callbacks.cpp:195
@@ -2244,935 +2246,648 @@
 "Internet telefonijom, koji omogućava da činite audio i video pozive udaljenim "
 "korisnicima sa SIP i H.323 hardverom ili softverom."
 
-#: ../src/gui/callshistory.cpp:664
-msgid "Received Calls"
-msgstr "Primljeni pozivi"
-
-#: ../src/gui/callshistory.cpp:664
-msgid "Placed Calls"
-msgstr "Načinjeni pozivi"
-
-#: ../src/gui/callshistory.cpp:664
-msgid "Missed Calls"
-msgstr "Propušteni pozivi"
-
-#: ../src/gui/callshistory.cpp:676 ../src/gui/main.cpp:1136
-#: ../src/gui/statusicon.cpp:144
-msgid "Calls History"
-msgstr "Istorijat poziva"
+#: ../src/gui/callbacks.cpp:269
+msgid "Help display is not supported by your GTK+ version"
+msgstr "Prikaz pomoći nije podržan izdanjem GTK+ biblioteke koju imate"
 
-#: ../src/gui/callshistory.cpp:719
-msgid "Date"
-msgstr "Datum"
-
-#: ../src/gui/callshistory.cpp:727
-msgid "Remote User"
-msgstr "Udanjeni korisnik"
-
-#: ../src/gui/callshistory.cpp:736
-msgid "Call Duration"
-msgstr "Trajanje poziva"
-
-#: ../src/gui/callshistory.cpp:746
-msgid "Call End Reason"
-msgstr "Razlog završetka razgovora"
-
-#: ../src/gui/chat.cpp:625
-msgid "Hang _up"
-msgstr "Pre_kini vezu"
-
-#: ../src/gui/chat.cpp:626 ../src/gui/statusicon.cpp:100
-msgid "_Call"
-msgstr "Poz_iv"
-
-#: ../src/gui/chat.cpp:627
-msgid "Call this user"
-msgstr "Poziva ovog korisnika"
-
-#: ../src/gui/chat.cpp:635
-msgid "_Send"
-msgstr "_Pošalji"
-
-#: ../src/gui/chat.cpp:640
-msgid "Send message"
-msgstr "Pošalji poruku"
-
-#: ../src/gui/chat.cpp:677
-msgid "_Open URL"
-msgstr "Otvori _adresu"
-
-#: ../src/gui/chat.cpp:705
-msgid "_Copy Equation"
-msgstr "Umnoži _jednačinu"
+#: ../src/gui/callbacks.cpp:277
+msgid "Unable to open help file."
+msgstr "Ne mogu da otvorim datoteku pomoći."
 
-#: ../src/gui/chat.cpp:1325
-msgid "Chat Window"
-msgstr "Prozor za tekstualne poruke"
+#: ../src/gui/dialpad.cpp:55
+msgid "abc"
+msgstr "abc"
+
+#: ../src/gui/dialpad.cpp:56
+msgid "def"
+msgstr "def"
+
+#: ../src/gui/dialpad.cpp:57
+msgid "ghi"
+msgstr "ghi"
+
+#: ../src/gui/dialpad.cpp:58
+msgid "jkl"
+msgstr "jkl"
+
+#: ../src/gui/dialpad.cpp:59
+msgid "mno"
+msgstr "mnovvvv"
 
-#: ../src/gui/chat.cpp:1450
-msgid "You"
-msgstr "Ti"
+#: ../src/gui/dialpad.cpp:60
+msgid "pqrs"
+msgstr "pqrs"
 
-#. Translators: "He says", "You say"
-#: ../src/gui/chat.cpp:1452
-msgid "says:"
-msgstr "kaže:"
+#: ../src/gui/dialpad.cpp:61
+msgid "tuv"
+msgstr "tuv"
 
-#: ../src/gui/chat.cpp:1452
-msgid "say:"
-msgstr "kažeš:"
+#: ../src/gui/dialpad.cpp:62
+msgid "wxyz"
+msgstr "wxyz"
+
+#. Translators: Is displayed once an account "%s" is registered.
+#: ../src/gui/main.cpp:526
+#, c-format
+msgid "Registered %s"
+msgstr "%s je registrovan"
 
-#: ../src/gui/chat.cpp:1524
-msgid "New Remote User"
-msgstr "Novi udaljeni korisnik"
+#. Translators: Is displayed once an account "%s" is unregistered.
+#: ../src/gui/main.cpp:533
+#, c-format
+msgid "Unregistered %s"
+msgstr "Isključen je nalog %s"
 
-#: ../src/gui/config.cpp:236
-msgid "Changing this setting will only affect new calls"
-msgstr "Menjanje ovog podešavanja će se odraziti samo na nove pozive"
+#: ../src/gui/main.cpp:538
+#, c-format
+msgid "Could not unregister %s"
+msgstr "Ne mogu da isključim nalog %s"
 
-#: ../src/gui/config.cpp:237
-msgid ""
-"Ekiga cannot apply one or more changes to the current call. Your new "
-"settings will take effect for the next call."
-msgstr ""
-"Ekiga ne može da primeni jednu ili više učinjenih izmena na poziv koji je u "
-"toku. Nova podešavanja će uzeti maha pri sledećem pozivu."
+#: ../src/gui/main.cpp:542
+#, c-format
+msgid "Could not register %s"
+msgstr "Ne mogu da registujem %s"
 
-#: ../src/gui/config.cpp:331
-msgid "H.245 Tunneling disabled"
-msgstr "H.245 tunel isključen"
+#: ../src/gui/main.cpp:612
+#, c-format
+msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
+msgstr "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 
-#: ../src/gui/config.cpp:332
-msgid "H.245 Tunneling enabled"
-msgstr "H.245 tunel uključen"
+#: ../src/gui/main.cpp:658
+#, c-format
+msgid "Connected with %s"
+msgstr "Povezan sa %s"
 
-#: ../src/gui/config.cpp:364
-msgid "Early H.245 disabled"
-msgstr "Rani H.245 isključen"
+#: ../src/gui/main.cpp:699 ../src/gui/main.cpp:3522
+msgid "Standby"
+msgstr "Pripravan"
 
-#: ../src/gui/config.cpp:365
-msgid "Early H.245 enabled"
-msgstr "Rani H.245 uključen"
+#: ../src/gui/main.cpp:760
+msgid "Call on hold"
+msgstr "Poziv na čekanju"
 
-#: ../src/gui/config.cpp:398
-msgid "Fast Start disabled"
-msgstr "Brzo pokretanje je isključeno"
+#: ../src/gui/main.cpp:771
+msgid "Call retrieved"
+msgstr "Poziv povraćen"
 
-#: ../src/gui/config.cpp:399
-msgid "Fast Start enabled"
-msgstr "Brzo pokretanje je uključeno"
+#: ../src/gui/main.cpp:787
+#, c-format
+msgid "Missed call from %s"
+msgstr "Propušteni poziv od %s"
 
-#: ../src/gui/config.cpp:506
-msgid "Enabled silence detection"
-msgstr "Uključi otkrivanje tišine"
+#: ../src/gui/main.cpp:924
+msgid "Error"
+msgstr "Greška"
 
-#: ../src/gui/config.cpp:512
-msgid "Disabled silence detection"
-msgstr "Isključi otkrivanje tišine"
+#: ../src/gui/main.cpp:989
+msgid "Error while initializing video output"
+msgstr "Greška pri pokretanju video izlaza"
 
-#: ../src/gui/config.cpp:571
-msgid "Enabled echo cancelation"
-msgstr "Poništavanje odjeka je uključeno"
+#: ../src/gui/main.cpp:990
+msgid "No video will be displayed during this call->"
+msgstr "Nikakav video neće biti prikazan za vreme ovog poziva->"
 
-#: ../src/gui/config.cpp:577
-msgid "Disabled echo cancelation"
-msgstr "Poništavanje odjeka je isključeno"
+#: ../src/gui/main.cpp:1000
+msgid ""
+"There was an error opening or initializing the video output. Please verify "
+"that no other application is using the accelerated video output."
+msgstr ""
+"Desila se greška prilikom otvaranja ili pokretanja video izlaza. Proverite da "
+"nijedan drugi program ne koristi ubrzani video izlaz."
 
-#: ../src/gui/druid.cpp:610
+#: ../src/gui/main.cpp:1002
 msgid ""
-"This is the Ekiga general configuration assistant. The following steps will "
-"set up Ekiga by asking a few simple questions.\n"
-"\n"
-"Once you have completed these steps, you can always change them later by "
-"selecting Preferences in the Edit menu."
+"There was an error opening or initializing the video output. Please verify "
+"that you are using a color depth of 24 or 32 bits per pixel."
 msgstr ""
-"Ovo je čarobnjak za podešavanje Ekige. Sledeći koraci će podesiti Ekigu "
-"postavljanjem par jednostavnih pitanja.\n"
-"\n"
-"Kada prođete ove korake, kasnije ih uvek možete izmeniti odabiranjem stavke "
-"Postavke u meniju Uređivanje."
+"Desila se greška prilikom otvaranja ili pokretanja video izlaza. Proverite da "
+"li koristite dubinu boja od 24 ili 32 bita po pikselu."
 
-#: ../src/gui/druid.cpp:622
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1115
 #, c-format
-msgid "Configuration Assistant - page 1/%d"
-msgstr "Čarobnjak za uvodno podešavanje — strana 1/%d"
+msgid "Added video input device %s"
+msgstr "Dodat je ulazni video uređaj %s"
 
-#: ../src/gui/druid.cpp:664
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1127
 #, c-format
-msgid "Personal Information - page %d/%d"
-msgstr "Lični podaci — strana %d/%d"
+msgid "Removed video input device %s"
+msgstr "Uklonjen je ulazni video uređaj %s"
 
-#. The user fields
-#: ../src/gui/druid.cpp:677
-msgid "Please enter your first name and your surname:"
-msgstr "Molim unesite ime i prezime:"
+#: ../src/gui/main.cpp:1144
+#, c-format
+msgid "Error while accessing video device %s"
+msgstr "Greška prilikom pristupa video uređaju %s"
 
-#: ../src/gui/druid.cpp:686
+#: ../src/gui/main.cpp:1147
 msgid ""
-"Your first name and surname will be used when connecting to other VoIP and "
-"videoconferencing software."
+"A moving logo will be transmitted during calls. Notice that you can always "
+"transmit a given image or the moving logo by choosing \"Picture\" as video "
+"plugin and \"Moving logo\" or \"Static picture\" as device."
 msgstr ""
-"Ime i prezime će se koristiti pri povezivanju sa ostalim VoIP i softverom za "
-"video konferencije."
+"Pokretni logo će biti prenet za vreme poziva. Uvek možete poslati datu sliku "
+"ili pokretni logo izborom „Slika“ za video dodatak i „PokretniLogo“ ili "
+"„StatičnaSlika“ za uređaj."
 
-#: ../src/gui/druid.cpp:732
-#, c-format
-msgid "ekiga.net Account - page %d/%d"
-msgstr "ekiga.net adresa — strana %d/%d"
+#: ../src/gui/main.cpp:1151
+msgid ""
+"There was an error while opening the device. In case it is a pluggable "
+"device it may be sufficient to reconnect it. If not, or if it still is not "
+"accessible, please check your permissions and make sure that the appropriate "
+"driver is loaded."
+msgstr ""
+"Dogodila se greška prilikom otvaranja uređaja. Ukoliko možete da ponovo utaknete "
+"uređaj, možda je to dovoljno se ponovo poveže. Ukoliko se uređaj ne utačinje "
+"ili ovo ne uspe, proverite ovlašćenja i uverite se da je odgovarajući upravljački "
+"program učitan."
 
-#: ../src/gui/druid.cpp:743
-msgid "Please enter your username:"
-msgstr "Molim unesite vaše korisničko ime:"
+#: ../src/gui/main.cpp:1155
+msgid "Your video driver doesn't support the requested video format."
+msgstr "Upravljački program za video ne podržava zahtevani video format."
 
-#: ../src/gui/druid.cpp:751
-msgid "Please enter your password:"
-msgstr "Molim unesite vašu lozinku:"
+#: ../src/gui/main.cpp:1159
+msgid "Could not open the chosen channel."
+msgstr "Ne mogu da otvorim izabrani kanal."
 
-#: ../src/gui/druid.cpp:762
+#: ../src/gui/main.cpp:1163
 msgid ""
-"The username and password are used to login to your existing account at the "
-"ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
-"you may first create an account below. This will provide a SIP address that "
-"allows people to call you.\n"
-"\n"
-"You may skip this step if you use an alternative SIP service, or if you "
-"would prefer to specify the login details later."
+"Your driver doesn't seem to support any of the color formats supported by "
+"Ekiga.\n"
+" Please check your kernel driver documentation in order to determine which "
+"Palette is supported."
 msgstr ""
-"Možete da preskočite ovaj korak ukoliko koristite neku drugu SIP uslugu ili "
-"bi želeli da kasnije navedete podatke za prijavu."
+"Upravljački program izgleda da ne podržava nijedan od formata boja koje Ekiga "
+"podržava.\n"
+" Proverite dokumentaciju vašeg upravljačkog programa u jezgru da odredite "
+"koja paleta je podržana."
 
-#: ../src/gui/druid.cpp:772
-msgid "Get an ekiga.net SIP account"
-msgstr "Zatražite ekiga.net SIP nalog"
+#: ../src/gui/main.cpp:1167
+msgid "Error while setting the frame rate."
+msgstr "Greška prilikom podešavanja broja kadrova u sekundi."
 
-#: ../src/gui/druid.cpp:782
-msgid "I do not want to sign up for the ekiga.net free service"
-msgstr "Ne želim da prihvatim ekiga.net besplatnu uslugu"
+#: ../src/gui/main.cpp:1171
+msgid "Error while setting the frame size."
+msgstr "Greška prilikom podešavanja veličine slike."
 
-#: ../src/gui/druid.cpp:835
-#, c-format
-msgid "Connection Type - page %d/%d"
-msgstr "Vrsta veze — strana %d/%d"
+#: ../src/gui/main.cpp:1176 ../src/gui/main.cpp:1278 ../src/gui/main.cpp:1393
+msgid "Unknown error."
+msgstr "Nepoznata greška."
 
-#. The connection type
-#: ../src/gui/druid.cpp:847
-msgid "Please choose your connection type:"
-msgstr "Molim izaberite vrstu veze:"
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1226
+#, c-format
+msgid "Added audio input device %s"
+msgstr "Dodat ulazni zvučni uređaj %s"
 
-#: ../src/gui/druid.cpp:855
-msgid ""
-"The connection type will permit determining the best quality settings that "
-"Ekiga will use during calls. You can later change the settings individually "
-"in the preferences window."
-msgstr ""
-"Vrsta veze dozvoljava određivanje podešavanja sa najboljim kvalitetom koje će "
-"Ekiga koristiti prilikom poziva. Naknadno možete izmeniti pojedinačna "
-"podešavanja među postavkama."
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1243
+#, c-format
+msgid "Removed audio input device %s"
+msgstr "Uklonjen ulazni zvučni uređaj %s"
 
-#: ../src/gui/druid.cpp:893
+#: ../src/gui/main.cpp:1260
 #, c-format
-msgid "NAT Type - page %d/%d"
-msgstr "Vrsta adresnog prevodioca — strana %d/%d"
+msgid "Error while opening audio input device %s"
+msgstr "Greška pri otvaranju ulaznog zvučnog uređaja %s"
 
-#: ../src/gui/druid.cpp:903
-msgid "Click here to detect your NAT Type:"
-msgstr "Pritisnite ovde da otkrijete koju vrstu adresnog prevodioca koristite:"
+#. Translators: This happens when there is an error with audio input:
+#. * Nothing ("silence") will be transmitted
+#: ../src/gui/main.cpp:1265
+msgid "Only silence will be transmitted."
+msgstr "Druga strana će čuti samo tišinu."
 
-#: ../src/gui/druid.cpp:907
-msgid "Detect NAT Type"
-msgstr "Otkrij vrstu adresnog prevodioca"
+#: ../src/gui/main.cpp:1269
+msgid ""
+"Unable to open the selected audio device for recording. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
+msgstr ""
+"Ne mogu da otvorim izabrani zvučni uređaj za snimanje. Ukoliko je uređaj "
+"utačinje, možda će biti dovoljno ponovo ga povezati. Ukoliko se uređaj ne "
+"utačinje ili ovo ne uspe, proverite podešavanje zvuka, ovlašćenja i da li je "
+"uređaj zauzet."
 
-# bug: s/will permit to assist you/will assist you/
-#: ../src/gui/druid.cpp:911
+#: ../src/gui/main.cpp:1273
 msgid ""
-"The NAT type detection will permit to assist you in configuring your NAT "
-"router to be able to do calls with Ekiga."
+"The selected audio device was successfully opened but it is impossible to "
+"read data from this device. In case it is a pluggable device it may be "
+"sufficient to reconnect it. If not, or if it still is not accessible, please "
+"check your audio setup."
 msgstr ""
-"Otkrivanje vrste adresnog prevodioca će vam pomoći da podesite vaš adresni "
-"prevodilac usmerivač kako bi dopuštao pozive iz programa."
+"Izabran zvučni uređaj je uspešno otvoren ali je nemoguće čitati podatke sa "
+"ovog uređaja. Ukoliko možete da ponovo utaknete uređaj, možda je to dovoljno "
+"da se ponovo poveže. Ukoliko se uređaj ne utačinje ili ovo ne uspe, "
+"proverite zvučna podešavanja."
+
+#: ../src/gui/main.cpp:1340
+#, c-format
+msgid "Added audio output device %s"
+msgstr "Dodat je izlazni zvučni uređaj %s"
 
-#: ../src/gui/druid.cpp:956
+#: ../src/gui/main.cpp:1356
 #, c-format
-msgid "Audio Manager - page %d/%d"
-msgstr "Upravljanje zvukom — strana %d/%d"
+msgid "Removed audio output device %s"
+msgstr "Uklonjen je izlazni zvučni uređaj %s"
 
-#. The Audio devices
-#: ../src/gui/druid.cpp:968
-msgid "Please choose your audio manager:"
-msgstr "Molim izaberite upravljač zvukom:"
+#: ../src/gui/main.cpp:1377
+#, c-format
+msgid "Error while opening audio output device %s"
+msgstr "Greška pri otvaranju izlaznog zvučnog uređaja %s"
+
+#: ../src/gui/main.cpp:1380
+msgid "No incoming sound will be played."
+msgstr "Dolazni zvuk neće biti puštan."
 
-#: ../src/gui/druid.cpp:977
+#: ../src/gui/main.cpp:1384
 msgid ""
-"The audio manager is the plugin that will manage your audio devices. "
-"WindowsMultimedia is probably the best choice when available."
+"Unable to open the selected audio device for playing. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
 msgstr ""
-"Upravljač zvukom je dodatak koji upravlja zvučnim uređajima. WindowsMultimedia "
-"je verovatno najbolje rešenje ako je dostupna."
+"Nije moguće otvoriti izabran zvučni uređaj za puštanje. Ukoliko je uređaj "
+"utačinje, možda će biti dovoljno ponovo ga povezati. Ukoliko se uređaj ne "
+"utačinje ili ovo ne uspe, proverite podešavanje zvuka, ovlašćenja i da li je "
+"uređaj zauzet."
 
-#: ../src/gui/druid.cpp:979
+#: ../src/gui/main.cpp:1388
 msgid ""
-"The audio manager is the plugin that will manage your audio devices. ALSA is "
-"probably the best choice when available."
+"The selected audio device was successfully opened but it is impossible to "
+"write data to this device. In case it is a pluggable device it may be "
+"sufficient to reconnect it. If not, or if it still is not accessible, please "
+"check your audio setup."
 msgstr ""
-"Upravljač zvukom je dodatak koji upravlja zvučnim uređajima. ALSA je verovatno "
-"najbolje rešenje ako je dostupna."
+"Izabran zvučni uređaj je uspešno otvoren ali je nemoguće snimati podatke na "
+"ovaj uređaj. Ukoliko možete da ponovo utaknete uređaj, možda je to dovoljno "
+"da se ponovo poveže. Ukoliko se uređaj ne utačinje ili ovo ne uspe, proverite zvučna "
+"podešavanja."
 
-#: ../src/gui/druid.cpp:1019
-#, c-format
-msgid "Audio Devices - page %d/%d"
-msgstr "Zvučni uređaji - strana %d/%d"
+#: ../src/gui/main.cpp:1579
+msgid "Video Settings"
+msgstr "Podešavanja videa"
 
-#. The Audio devices
-#: ../src/gui/druid.cpp:1031
-msgid "Please choose the audio output device:"
-msgstr "Izaberite izlazni uređaj za zvuk:"
+#: ../src/gui/main.cpp:1606
+msgid "Adjust brightness"
+msgstr "Podesiti svetlinu"
 
-#: ../src/gui/druid.cpp:1039
-msgid ""
-"The audio output device is the device managed by the audio manager that will "
-"be used to play audio."
-msgstr ""
-"Izlazni uređaj za zvuk je uređaj kojim upravlja upravljač zvukom, a koji se "
-"koristi za puštanje zvuka."
+#: ../src/gui/main.cpp:1627
+msgid "Adjust whiteness"
+msgstr "Podesi belilo"
 
-#: ../src/gui/druid.cpp:1049
-msgid "Please choose the audio input device:"
-msgstr "Izaberite ulazni uređaj za zvuk:"
+#: ../src/gui/main.cpp:1648
+msgid "Adjust color"
+msgstr "Podesi boje"
 
-#: ../src/gui/druid.cpp:1057
-msgid ""
-"The audio input device is the device managed by the audio manager that will "
-"be used to record your voice."
-msgstr ""
-"Ulazni uređaj za zvuk je uređaj kojim upravlja upravljač zvukom, a koji se "
-"koristi za snimanje glasa."
+#: ../src/gui/main.cpp:1669
+msgid "Adjust contrast"
+msgstr "Podesiti kontrast"
 
-#: ../src/gui/druid.cpp:1070 ../src/gui/druid.cpp:1204
-msgid "Test Settings"
-msgstr "Proba podešavanja"
+#: ../src/gui/main.cpp:1715
+msgid "Audio Settings"
+msgstr "Podešavanja zvuka"
 
-#: ../src/gui/druid.cpp:1114
-#, c-format
-msgid "Video Manager - page %d/%d"
-msgstr "Upravljanje prenosom slike — strana %d/%d"
+#: ../src/gui/main.cpp:2326
+msgid "_Retrieve Call"
+msgstr "Pov_rati poziv"
 
-#. The Audio devices
-#: ../src/gui/druid.cpp:1126
-msgid "Please choose your video manager:"
-msgstr "Izaberite upravljača videom:"
+#: ../src/gui/main.cpp:2339
+msgid "_Hold Call"
+msgstr "_Zadrži poziv"
 
-#: ../src/gui/druid.cpp:1134
-msgid ""
-"The video manager is the plugin that will manage your video devices, "
-"Video4Linux is the most common choice if you own a webcam."
-msgstr ""
-"Upravljač videom je dodatak koji upravlja video uređajima, Video4Linuks je "
-"najčešći izbor ukoliko imate veb kameru."
+#: ../src/gui/main.cpp:2371 ../src/gui/main.cpp:3159
+msgid "Suspend _Audio"
+msgstr "Zaustavi _zvuk"
 
-#: ../src/gui/druid.cpp:1172
-#, c-format
-msgid "Video Devices - page %d/%d"
-msgstr "Uređaji za prenos slike— strana %d/%d"
+#: ../src/gui/main.cpp:2373 ../src/gui/main.cpp:3164
+msgid "Suspend _Video"
+msgstr "Zaustavi _sliku"
 
-#. The Video devices
-#: ../src/gui/druid.cpp:1184
-msgid "Please choose the video input device:"
-msgstr "Izaberite ulazni uređaj za video:"
+#: ../src/gui/main.cpp:2375
+msgid "Resume _Audio"
+msgstr "Obnovi prijem _zvuka"
 
-#: ../src/gui/druid.cpp:1192
-msgid ""
-"The video input device is the device managed by the video manager that will "
-"be used to capture video."
-msgstr ""
-"Ulazni uređaj za video je uređaj kojim upravlja upravljač videom, a koji se "
-"koristi za snimanje videa."
+#: ../src/gui/main.cpp:2377
+msgid "Resume _Video"
+msgstr "Obnovi prijem _slike"
 
-#: ../src/gui/druid.cpp:1240
-#, c-format
-msgid "Configuration complete - page %d/%d"
-msgstr "Podešavanje završeno - strana %d/%d"
+#: ../src/gui/main.cpp:2660 ../src/gui/main.cpp:2812
+msgid "Reject"
+msgstr "Odbaci"
 
-#: ../src/gui/druid.cpp:1630
-msgid "56k Modem"
-msgstr "Modem na običnoj telefonskoj liniji"
+#: ../src/gui/main.cpp:2662 ../src/gui/main.cpp:2811
+msgid "Accept"
+msgstr "Prihvati"
 
-#: ../src/gui/druid.cpp:1631
-msgid "ISDN"
-msgstr "Digitalna tel. linija sa integrisanim uslugama"
+#: ../src/gui/main.cpp:2668 ../src/gui/main.cpp:2799
+msgid "Incoming call from"
+msgstr "Dolazni poziv od"
 
-#: ../src/gui/druid.cpp:1632
-msgid "xDSL/Cable"
-msgstr "Digitalna pretplatnička linija/kablovski internet"
-
-#: ../src/gui/druid.cpp:1633
-msgid "T1/LAN"
-msgstr "Brzi zakupljeni vod/lokalna mreža"
+#: ../src/gui/main.cpp:2686 ../src/gui/main.cpp:2802
+msgid "Remote URI:"
+msgstr "Udaljena adresa:"
 
-#: ../src/gui/druid.cpp:1634
-msgid "Keep current settings"
-msgstr "Zadrži tekuća podešavanja"
+#: ../src/gui/main.cpp:2698 ../src/gui/main.cpp:2804
+msgid "Remote Application:"
+msgstr "Udaljeni program:"
 
-#: ../src/gui/druid.cpp:1915
+#: ../src/gui/main.cpp:2719
 #, c-format
-msgid ""
-"You have now finished the Ekiga configuration. All the settings can be "
-"changed in the Ekiga preferences. Enjoy!\n"
-"\n"
-"\n"
-"Configuration summary:\n"
-"\n"
-"Username: %s\n"
-"Connection type: %s\n"
-"Audio manager: %s\n"
-"Audio player: %s\n"
-"Audio recorder: %s\n"
-"Video manager: %s\n"
-"Video input: %s\n"
-"SIP URL: %s\n"
-msgstr ""
-"Završili ste podešavanje Ekige. Sva podešavanja se mogu promeniti u samim "
-"postavkama Ekige. Uživajte!\n"
-"\n"
-"\n"
-"Pregled podešavanja:\n"
-"\n"
-"Korisnik:  %s\n"
-"Vrsta veze: %s\n"
-"Upravljač zvukom: %s\n"
-"Puštanje zvuka: %s\n"
-"Snimanje zvuka: %s\n"
-"Upravljač slike: %s\n"
-"Ulaz slike: %s\n"
-"Adresa za pozive: %s\n"
-
-#: ../src/gui/druid.cpp:1970
-msgid "First Time Configuration Assistant"
-msgstr "Čarobnjak za prvo podešavanje"
-
-#: ../src/gui/history.cpp:128 ../src/gui/main.cpp:1131
-msgid "General History"
-msgstr "Opšti istorijat"
-
-#: ../src/gui/main.cpp:667
-msgid "Enter a URL on the left, and click this button to place a call"
-msgstr ""
-"Unesite adresu koju pozivate levo, i pritisnite ovo dugme da uputite poziv"
-
-#: ../src/gui/main.cpp:711
-msgid "Open text chat"
-msgstr "Otvori tekstualni razgovor"
-
-#: ../src/gui/main.cpp:735
-msgid "Change the view mode"
-msgstr "Promeni režim prikaza"
-
-#: ../src/gui/main.cpp:754
-msgid "Open address book"
-msgstr "Otvori imenik"
+msgid "Call from %s"
+msgstr "Poziv od %s"
 
-#: ../src/gui/main.cpp:775
-msgid "Display images from your camera device"
-msgstr "Prikaži slike sa kamere"
+#: ../src/gui/main.cpp:2925
+#, c-format
+msgid "Call Duration: %s\n"
+msgstr "Trajanje poziva: %s\n"
 
-#: ../src/gui/main.cpp:798
-msgid ""
-"Audio transmission status. During a call, click here to suspend or resume "
-"the audio transmission."
-msgstr ""
-"Stanje zvučnog prenosa. Za vreme poziva, pritisnite ovde da zaustavite ili "
-"nastavite zvučni prenos."
+#: ../src/gui/main.cpp:2956
+msgid "Transfer call to:"
+msgstr "Prebaci poziv:"
 
-#: ../src/gui/main.cpp:821
-msgid ""
-"Video transmission status. During a call, click here to suspend or resume "
-"the video transmission."
-msgstr ""
-"Stanje prenosa slike. Za vreme poziva, pritisnite ovde da zaustavite ili "
-"nastavite prenos slike."
+#: ../src/gui/main.cpp:3008
+msgid "No"
+msgstr "Ne"
+
+#: ../src/gui/main.cpp:3010
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/gui/main.cpp:3021
+msgid "Detected new audio input device:"
+msgstr "Prepoznat je novi ulazni zvučni uređaj:"
+
+#: ../src/gui/main.cpp:3025
+msgid "Detected new audio output device:"
+msgstr "Prepoznat je novi izlazni zvučni uređaj:"
+
+#: ../src/gui/main.cpp:3029
+msgid "Detected new video input device:"
+msgstr "Prepoznat je novi ulazni video uređaj:"
+
+#: ../src/gui/main.cpp:3030 ../src/gui/preferences.cpp:921
+msgid "Video Devices"
+msgstr "Uređaji za sliku"
 
-#: ../src/gui/main.cpp:901
-msgid "C_all"
-msgstr "Poz_ovi"
+#: ../src/gui/main.cpp:3048
+msgid "Do you want to use it as default device?"
+msgstr "Da li želite da ga koristite kao podrazumevani uređaj?"
+
+#: ../src/gui/main.cpp:3116
+msgid "_Chat"
+msgstr "Ćask_anje"
 
-#: ../src/gui/main.cpp:903
+#: ../src/gui/main.cpp:3118
 msgid "Ca_ll"
 msgstr "Pozov_i"
 
-#: ../src/gui/main.cpp:903 ../src/gui/statusicon.cpp:100
+#: ../src/gui/main.cpp:3118
 msgid "Place a new call"
 msgstr "Uputite novi poziv"
 
-#: ../src/gui/main.cpp:906 ../src/gui/statusicon.cpp:103
+#: ../src/gui/main.cpp:3121
 msgid "_Hang up"
 msgstr "Pre_kini poziv"
 
-#: ../src/gui/main.cpp:907 ../src/gui/statusicon.cpp:104
+#: ../src/gui/main.cpp:3122
 msgid "Terminate the current call"
 msgstr "Prekida tekući poziv"
 
-#: ../src/gui/main.cpp:913 ../src/gui/statusicon.cpp:110
-msgid "_Available"
-msgstr "_Dostupan"
-
-#: ../src/gui/main.cpp:914 ../src/gui/statusicon.cpp:111
-msgid "Display a popup to accept the call"
-msgstr "Prikaži iskačući prozor za prijem poziva"
-
-#: ../src/gui/main.cpp:919 ../src/gui/statusicon.cpp:116
-msgid "Aut_o Answer"
-msgstr "Sam se _javi"
-
-#: ../src/gui/main.cpp:920 ../src/gui/statusicon.cpp:117
-msgid "Auto answer calls"
-msgstr "Sam se javlja na pozive"
-
-#: ../src/gui/main.cpp:925 ../src/gui/statusicon.cpp:122
-msgid "_Do Not Disturb"
-msgstr "_Ne uznemiravaj"
-
-#: ../src/gui/main.cpp:926 ../src/gui/statusicon.cpp:123
-msgid "Reject calls"
-msgstr "Odbija pozive"
-
-#: ../src/gui/main.cpp:931 ../src/gui/statusicon.cpp:128
-msgid "_Forward"
-msgstr "_Preusmeri"
-
-#: ../src/gui/main.cpp:931 ../src/gui/statusicon.cpp:128
-msgid "Forward calls"
-msgstr "Preusmerava pozive"
-
-#: ../src/gui/main.cpp:939
-msgid "Speed dials"
-msgstr "Brzo biranje"
-
-#: ../src/gui/main.cpp:943 ../src/gui/main.cpp:3148
-msgid "_Hold Call"
-msgstr "_Zadrži poziv"
+#: ../src/gui/main.cpp:3128
+msgid "A_dd Contact"
+msgstr "Dod_aj kontakt"
+
+#: ../src/gui/main.cpp:3128
+msgid "Add a contact to the roster"
+msgstr "Dodaj kontakt u listu"
+
+#: ../src/gui/main.cpp:3133
+msgid "Find contacts"
+msgstr "Pronađi kontakt"
+
+#: ../src/gui/main.cpp:3140
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: ../src/gui/main.cpp:3141
+msgid "Act on selected contact"
+msgstr "Akcija nad izabranim kontaktom"
+
+#: ../src/gui/main.cpp:3147
+msgid "H_old Call"
+msgstr "Zadrži p_oziv"
 
-#: ../src/gui/main.cpp:943
+#: ../src/gui/main.cpp:3147 ../src/gui/main.cpp:3616
 msgid "Hold the current call"
 msgstr "Zadržava trenutni poziv"
 
-#: ../src/gui/main.cpp:947
+#: ../src/gui/main.cpp:3151
 msgid "_Transfer Call"
 msgstr "_Prebaci poziv"
 
-#: ../src/gui/main.cpp:948
+#: ../src/gui/main.cpp:3152
 msgid "Transfer the current call"
 msgstr "Prebacuje trenutni poziv"
 
-#: ../src/gui/main.cpp:955 ../src/gui/main.cpp:3182
-msgid "Suspend _Audio"
-msgstr "Zaustavi _zvuk"
-
-#: ../src/gui/main.cpp:956
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the audio transmission"
 msgstr "Zaustavlja ili nastavlja zvučni prenos"
 
-#: ../src/gui/main.cpp:960 ../src/gui/main.cpp:3184
-msgid "Suspend _Video"
-msgstr "Zaustavi _sliku"
-
-#: ../src/gui/main.cpp:961
+#: ../src/gui/main.cpp:3165
 msgid "Suspend or resume the video transmission"
 msgstr "Zaustavlja ili nastavlja prenos slike"
 
-#: ../src/gui/main.cpp:968
-msgid "_Save Current Picture"
-msgstr "_Sačuvaj trenutnu sliku"
-
-#: ../src/gui/main.cpp:969
-msgid "Save a snapshot of the current video"
-msgstr "Čuva trenutnu sliku sa video veze"
-
-#: ../src/gui/main.cpp:975
+#: ../src/gui/main.cpp:3172
 msgid "Close the Ekiga window"
 msgstr "Zatvara prozor programa Ekiga"
 
-#: ../src/gui/main.cpp:982 ../src/gui/statusicon.cpp:185
-msgid "_Quit"
-msgstr "_Izađi"
-
-#: ../src/gui/main.cpp:982 ../src/gui/statusicon.cpp:186
-msgid "Quit Ekiga"
-msgstr "Izađi iz programa Ekiga"
-
-#: ../src/gui/main.cpp:986
-msgid "_Edit"
-msgstr "_Uređivanje"
-
-#: ../src/gui/main.cpp:988
-msgid "Configuration Druid"
-msgstr "Čarobnjak za podešavanje"
-
-#: ../src/gui/main.cpp:989
-msgid "Run the configuration druid"
-msgstr "Pokreni čarobnjaka za podešavanje"
+#: ../src/gui/main.cpp:3179 ../src/gui/statusicon.cpp:414
+msgid "Quit"
+msgstr "Izađi"
+
+#: ../src/gui/main.cpp:3185
+msgid "_Configuration Assistant"
+msgstr "Čarobnja_k za prvo podešavanje"
 
-#: ../src/gui/main.cpp:996
-msgid "_Accounts"
-msgstr "Na_lozi"
+#: ../src/gui/main.cpp:3186
+msgid "Run the configuration assistant"
+msgstr "Pokreni čarobnjaka za prvo podešavanje"
 
-#: ../src/gui/main.cpp:997
+#: ../src/gui/main.cpp:3194
 msgid "Edit your accounts"
 msgstr "Uredite vaše naloge"
 
-#: ../src/gui/main.cpp:1002 ../src/gui/statusicon.cpp:152
-msgid "_Preferences"
-msgstr "_Postavke"
-
-#: ../src/gui/main.cpp:1003 ../src/gui/statusicon.cpp:153
+#: ../src/gui/main.cpp:3200
 msgid "Change your preferences"
 msgstr "Izmenite vaše postavke"
 
-#: ../src/gui/main.cpp:1008
+#: ../src/gui/main.cpp:3205
 msgid "_View"
 msgstr "P_regled"
 
-#: ../src/gui/main.cpp:1010
-msgid "View _Mode"
-msgstr "_Režim prikaza"
-
-#: ../src/gui/main.cpp:1012
-msgid "Softp_hone"
-msgstr "Softverski telefon"
-
-#: ../src/gui/main.cpp:1013
-msgid "Show the softphone view"
-msgstr "Prikaži softverski telefon"
-
-#: ../src/gui/main.cpp:1018
-msgid "_Videophone"
-msgstr "Videotelefon"
-
-#: ../src/gui/main.cpp:1019
-msgid "Show the videophone view"
-msgstr "Prikaži videotelefon"
-
-#: ../src/gui/main.cpp:1024
-msgid "_Full View"
-msgstr "P_uni prikaz"
-
-#: ../src/gui/main.cpp:1025
-msgid "View all components"
-msgstr "Otvori sve delove"
-
-#: ../src/gui/main.cpp:1033
-msgid "Control Panel"
-msgstr "Upravljački panel"
+#: ../src/gui/main.cpp:3207
+msgid "Con_tacts"
+msgstr "Kon_takti"
+
+#: ../src/gui/main.cpp:3207
+msgid "View the contacts list"
+msgstr "Pogledaj spisak kontakata"
 
-#: ../src/gui/main.cpp:1035
+#: ../src/gui/main.cpp:3212
 msgid "_Dialpad"
 msgstr "_Brojčanik"
 
-#: ../src/gui/main.cpp:1035
+#: ../src/gui/main.cpp:3212
 msgid "View the dialpad"
 msgstr "Prikaži brojčanik"
 
-#: ../src/gui/main.cpp:1040
-msgid "_Audio Settings"
-msgstr "Podešavanja zv_uka"
-
-#: ../src/gui/main.cpp:1041
-msgid "View audio settings"
-msgstr "Pregledaj podešavanja zvuka"
-
-#: ../src/gui/main.cpp:1046
-msgid "_Video Settings"
-msgstr "_Podešavanja prenosa slike"
-
-#: ../src/gui/main.cpp:1047
-msgid "View video settings"
-msgstr "Pogledajte podešavanja prenosa slike"
-
-#: ../src/gui/main.cpp:1052 ../src/gui/main.cpp:1232
-msgid "Statistics"
-msgstr "Statistika"
-
-#: ../src/gui/main.cpp:1053
-msgid "View audio/video transmission and reception statistics"
-msgstr "Pregled statistike slanja i prijema zvuka i slike"
-
-#: ../src/gui/main.cpp:1061 ../src/gui/main.cpp:4218
-msgid "Local Video"
-msgstr "Lokalna slika"
-
-#: ../src/gui/main.cpp:1062
-msgid "Local video image"
-msgstr "Lokalni video snimak"
-
-#: ../src/gui/main.cpp:1067 ../src/gui/main.cpp:4225
-msgid "Remote Video"
-msgstr "Udaljena slika"
-
-#: ../src/gui/main.cpp:1068
-msgid "Remote video image"
-msgstr "Udaljena slika"
-
-#: ../src/gui/main.cpp:1073
-msgid "Both (Picture-in-Picture)"
-msgstr "Oba (slika u slici)"
-
-#: ../src/gui/main.cpp:1074 ../src/gui/main.cpp:1080 ../src/gui/main.cpp:1087
-msgid "Both video images"
-msgstr "Oba video snimka"
-
-#: ../src/gui/main.cpp:1079
-msgid "Both (Side-by-Side)"
-msgstr "Oba (jedan pored drugog)"
-
-#: ../src/gui/main.cpp:1086
-msgid "Both (Both in New Windows)"
-msgstr "Oba (oba u novim prozorima)"
-
-#: ../src/gui/main.cpp:1095 ../src/gui/main.cpp:1573 ../src/gui/main.cpp:1598
-msgid "Zoom In"
-msgstr "Uvećaj"
-
-#: ../src/gui/main.cpp:1095 ../src/gui/main.cpp:1573 ../src/gui/main.cpp:1598
-msgid "Zoom in"
-msgstr "Uvećaj"
-
-#: ../src/gui/main.cpp:1099 ../src/gui/main.cpp:1577 ../src/gui/main.cpp:1602
-msgid "Zoom Out"
-msgstr "Umanji"
-
-#: ../src/gui/main.cpp:1099 ../src/gui/main.cpp:1577 ../src/gui/main.cpp:1602
-msgid "Zoom out"
-msgstr "Umanji"
-
-#: ../src/gui/main.cpp:1103 ../src/gui/main.cpp:1581 ../src/gui/main.cpp:1606
-msgid "Normal Size"
-msgstr "Normalna veličina"
-
-#: ../src/gui/main.cpp:1103 ../src/gui/main.cpp:1581 ../src/gui/main.cpp:1606
-msgid "Normal size"
-msgstr "Normalna veličina"
-
-#: ../src/gui/main.cpp:1109 ../src/gui/main.cpp:1587 ../src/gui/main.cpp:1612
-msgid "Fullscreen"
-msgstr "Ceo ekran"
-
-#: ../src/gui/main.cpp:1115
-msgid "_Tools"
-msgstr "_Alati"
-
-#: ../src/gui/main.cpp:1117 ../src/gui/statusicon.cpp:136
-msgid "Address _Book"
-msgstr "Imeni_k"
-
-#: ../src/gui/main.cpp:1118 ../src/gui/statusicon.cpp:137
-msgid "Open the address book"
-msgstr "Otvara imenik"
-
-#: ../src/gui/main.cpp:1125
-msgid "C_hat Window"
-msgstr "_Tekstualne poruke"
-
-#: ../src/gui/main.cpp:1126
-msgid "Open the chat window"
-msgstr "Prikaži prozor za tekstualne poruke"
-
-#: ../src/gui/main.cpp:1132
-msgid "View the operations history"
-msgstr "Pregledaj istorijat radnji"
-
-#: ../src/gui/main.cpp:1137 ../src/gui/statusicon.cpp:145
-msgid "View the calls history"
-msgstr "Pregledaj istorijat poziva"
-
-#: ../src/gui/main.cpp:1144
-msgid "PC-To-Phone Account"
-msgstr "Nalog „Računar — telefon“"
-
-#: ../src/gui/main.cpp:1145
-msgid "Manage your PC-To-Phone account"
-msgstr "Upravljajte nalogom računar — telefon"
-
-#: ../src/gui/main.cpp:1150
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: ../src/gui/main.cpp:1152 ../src/gui/statusicon.cpp:161
-#: ../src/gui/statusicon.cpp:172
-msgid "_Contents"
-msgstr "_Sadržaj"
-
-#: ../src/gui/main.cpp:1153 ../src/gui/statusicon.cpp:162
-#: ../src/gui/statusicon.cpp:173
-msgid "Get help by reading the Ekiga manual"
-msgstr "Potražite pomoć u uputstvu za Ekigu"
-
-#: ../src/gui/main.cpp:1157 ../src/gui/main.cpp:1163
-#: ../src/gui/statusicon.cpp:166 ../src/gui/statusicon.cpp:177
-msgid "_About"
-msgstr "_O programu"
-
-#: ../src/gui/main.cpp:1158 ../src/gui/main.cpp:1164
-#: ../src/gui/statusicon.cpp:167 ../src/gui/statusicon.cpp:178
-msgid "View information about Ekiga"
-msgstr "Pogledaj podatke o Ekigi"
-
-#: ../src/gui/main.cpp:1315
-msgid "Dialpad"
-msgstr "Brojčanik"
+#: ../src/gui/main.cpp:3217
+msgid "_Call History"
+msgstr "_Istorijat poziva"
 
-#: ../src/gui/main.cpp:1368
-msgid "Adjust brightness"
-msgstr "Podesiti svetlinu"
-
-#: ../src/gui/main.cpp:1390
-msgid "Adjust whiteness"
-msgstr "Podesi belilo"
-
-#: ../src/gui/main.cpp:1412
-msgid "Adjust color"
-msgstr "Podesi boje"
+#: ../src/gui/main.cpp:3217
+msgid "View the call history"
+msgstr "Pogledaj istorijat poziva"
 
-#: ../src/gui/main.cpp:1434
-msgid "Adjust contrast"
-msgstr "Podesiti kontrast"
+#: ../src/gui/main.cpp:3225
+msgid "_Show Call Panel"
+msgstr "Prika_ži panel zvanja"
+
+#: ../src/gui/main.cpp:3233
+msgid "_Local Video"
+msgstr "_Lokalni video"
 
-#: ../src/gui/main.cpp:1440
-msgid "Video"
-msgstr "Video"
+#: ../src/gui/main.cpp:3234
+msgid "Local video image"
+msgstr "Lokalna video slika"
 
-#: ../src/gui/main.cpp:1524
-msgid "Audio"
-msgstr "Zvuk"
+#: ../src/gui/main.cpp:3239
+msgid "_Remote Video"
+msgstr "_Udaljeni video"
 
-#: ../src/gui/main.cpp:1775
-msgid "Notification area not detected"
-msgstr "Obaveštajna zona nije pronađena"
+#: ../src/gui/main.cpp:3240
+msgid "Remote video image"
+msgstr "Udaljena slika"
 
-#: ../src/gui/main.cpp:1775
-msgid ""
-"The notification area is not present in your panel, so Ekiga cannot start "
-"hidden."
-msgstr ""
-"Obaveštajna zona nije prisutna na panelu, zato Ekiga ne može da se pokrene "
-"skrivena."
+#: ../src/gui/main.cpp:3245
+msgid "_Picture-in-Picture"
+msgstr "_Slika u slici"
 
-#: ../src/gui/main.cpp:2088
-#, c-format
-msgid "Sent DTMF %c"
-msgstr "Poslat DTMF %c"
+#: ../src/gui/main.cpp:3246 ../src/gui/main.cpp:3252
+msgid "Both video images"
+msgstr "Oba video snimka"
 
-#: ../src/gui/main.cpp:2311 ../src/gui/main.cpp:4308
-#, c-format
-msgid "Missed calls: %d - Voice Mails: %s"
-msgstr "Propušteni pozivi: %d — Govorna pošta: %s"
+#: ../src/gui/main.cpp:3251
+msgid "Picture-in-Picture in Separate _Window"
+msgstr "Slika u slici u _posebnom prozoru"
 
-#: ../src/gui/main.cpp:3132
-msgid "_Retrieve Call"
-msgstr "Pov_rati poziv"
+#: ../src/gui/main.cpp:3259
+msgid "Zoom in"
+msgstr "Uvećaj"
 
-#: ../src/gui/main.cpp:3186
-msgid "Resume _Audio"
-msgstr "Obnovi prijem _zvuka"
+#: ../src/gui/main.cpp:3263
+msgid "Zoom out"
+msgstr "Umanji"
 
-#: ../src/gui/main.cpp:3188
-msgid "Resume _Video"
-msgstr "Obnovi prijem _slike"
+#: ../src/gui/main.cpp:3267
+msgid "Normal size"
+msgstr "Normalna veličina"
 
-#: ../src/gui/main.cpp:3730
-msgid "Out:"
-msgstr "Napolje:"
-
-#: ../src/gui/main.cpp:3733
-msgid "In:"
-msgstr "Unutra:"
-
-#: ../src/gui/main.cpp:3757
-msgid "Registered accounts:"
-msgstr "Registrovani nalozi:"
+#: ../src/gui/main.cpp:3271
+msgid "_Fullscreen"
+msgstr "_Ceo ekran"
 
-#: ../src/gui/main.cpp:3882
-msgid "Transfer call to:"
-msgstr "Prebaci poziv:"
+#: ../src/gui/main.cpp:3271
+msgid "Switch to fullscreen"
+msgstr "Prebaci u ceo ekran"
 
-#: ../src/gui/main.cpp:3883 ../src/gui/main.cpp:3948
-msgid "Transfer"
-msgstr "Prebaci"
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:402
+msgid "Get help by reading the Ekiga manual"
+msgstr "Potražite pomoć u uputstvu za Ekigu"
 
-#: ../src/gui/main.cpp:3946
-msgid "Reject"
-msgstr "Odbaci"
+#: ../src/gui/main.cpp:3284 ../src/gui/statusicon.cpp:407
+msgid "View information about Ekiga"
+msgstr "Pogledaj podatke o Ekigi"
 
-#: ../src/gui/main.cpp:3950
-msgid "Accept"
-msgstr "Prihvati"
+#: ../src/gui/main.cpp:3358
+msgid ""
+"Enter a URI on the left, and click this button to place a call or to hangup"
+msgstr ""
+"Unesite adresu koju pozivate levo, i pritisnite ovo dugme da uputite poziv "
+"ili prekinete vezu"
 
-#: ../src/gui/main.cpp:3957
-msgid "Incoming call from"
-msgstr "Dolazni poziv od"
+#: ../src/gui/main.cpp:3409
+msgid "Contacts"
+msgstr "Kontakti"
 
-#: ../src/gui/main.cpp:3970
-msgid "Remote URL:"
-msgstr "Udaljena adresa:"
+#: ../src/gui/main.cpp:3432
+msgid "Dialpad"
+msgstr "Brojčanik"
 
-#: ../src/gui/main.cpp:3982
-msgid "Remote Application:"
-msgstr "Udaljeni program:"
+#: ../src/gui/main.cpp:3451
+msgid "Call history"
+msgstr "Istorijat poziva"
+
+#: ../src/gui/main.cpp:3554
+msgid "Change the volume of your soundcard"
+msgstr "Izmenite zvuk zvučne karte"
+
+#: ../src/gui/main.cpp:3574
+msgid "Change the color settings of your video device"
+msgstr "Izmenite podešavanja boje video uređaja"
 
 # bug(slobo): prevod za traversal
-#. Add the window icon and title
-#: ../src/gui/main.cpp:4050 ../src/gui/main.cpp:4238
+#: ../src/gui/main.cpp:3685
 msgid "Ekiga"
 msgstr "Ekiga"
 
-#: ../src/gui/main.cpp:4473
+#. Translators:
+#. * TX is a common abbreviation for "transmit"
+#: ../src/gui/main.cpp:4297
+#, c-format
+msgid "TX: %dx%d "
+msgstr "TX: %dx%d "
+
+#. Translators:
+#. * RX is a common abbreviation for "receive"
+#: ../src/gui/main.cpp:4302
+#, c-format
+msgid "RX: %dx%d "
+msgstr "RX: %dx%d "
+
+#: ../src/gui/main.cpp:4304
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
 "Late packets: %.1f %%\n"
 "Out of order packets: %.1f %%\n"
-"Jitter buffer: %d ms"
+"Jitter buffer: %d ms%s%s%s"
 msgstr ""
 "Izgubljeni paketi: %.1f %%\n"
 "Zakasneli paketi: %.1f %%\n"
 "Paketi van reda: %.1f %%\n"
-"Jitter bafer: %d ms"
+"Jitter bafer: %d ms%s%s%s"
 
-#: ../src/gui/main.cpp:4570
-#, c-format
-msgid ""
-"Ekiga got an invalid value for the GConf key %s.\n"
-"\n"
-"It probably means that your GConf schemas have not been correctly installed "
-"or the that permissions are not correct.\n"
-"\n"
-"Please check the FAQ (http://www.ekiga.org/), the troubleshooting section of "
-"the GConf site (http://www.gnome.org/projects/gconf/) or the mailing list "
-"archives for more information (http://mail.gnome.org) about this problem."
+#: ../src/gui/main.cpp:4425
+msgid "Prints debug messages in the console (level between 1 and 5)"
+msgstr "Prikazuje poruke za rešavanje problema u konzoli (nivoi između 1 i 5)"
+
+#: ../src/gui/main.cpp:4430
+msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr ""
-"Ekiga je dobio pogrešnu vrednost za GKonf ključ %s.\n"
-"\n"
-"Ovo verovatno znači da GKonf šema nije pravilno instalirana ili da ovlašćenja "
-"nisu ispravna.\n"
-"\n"
-"Proverite česta pitanja (http://www.ekiga.org/), deo o rešavanju problema sa "
-"GKonf stranice (http://www.gnome.org/projects/gconf/) ili arhivu dopisne "
-"liste za više podataka (http://mail.gnome.org) o ovom problemu."
-
-#: ../src/gui/main.cpp:4573
-msgid "Gconf key error"
-msgstr "Gconf greška ključa"
-
-#: ../src/gui/main.cpp:4603 ../src/gui/main.cpp:4622
-msgid "Prints debug messages in the console (level between 1 and 6)"
-msgstr "Prikazuje poruke za rešavanje problema u konzoli (nivoi između 1 i 6)"
+"Prikazuje korisničke poruke za rešavanje problema u konzoli (nivoi između 1 i "
+"4)"
 
-#: ../src/gui/main.cpp:4606 ../src/gui/main.cpp:4627
-msgid "Makes Ekiga call the given URL"
+#: ../src/gui/main.cpp:4435
+msgid "Makes Ekiga call the given URI"
 msgstr "Pravi Ekiga poziv na datu adresu"
 
-#: ../src/gui/main.cpp:4660
+#: ../src/gui/main.cpp:4554
 msgid "No usable audio plugin detected"
 msgstr "Nisam pronašao upotrebljiv zvučni uređaj"
 
-#: ../src/gui/main.cpp:4660
+#: ../src/gui/main.cpp:4555
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
@@ -3180,132 +2895,67 @@
 "Ekiga ne može da pronađe upotrebljiv zvučni uređaj. Proverite da li je "
 "instalacija ispravna."
 
-#: ../src/gui/misc.cpp:115
-msgid "Error"
-msgstr "Greška"
-
-#: ../src/gui/preferences.cpp:497
-msgid "Bandwidth"
-msgstr "Propusni opseg"
-
-#: ../src/gui/preferences.cpp:505
-msgid "Clock Rate"
-msgstr "Takt"
-
-#: ../src/gui/preferences.cpp:630
-msgid "Personal Information"
-msgstr "Lični podaci"
-
-#: ../src/gui/preferences.cpp:633
-msgid "_First name:"
-msgstr "_Ime:"
-
-#: ../src/gui/preferences.cpp:640
-msgid "Sur_name:"
-msgstr "_Prezime:"
-
-#: ../src/gui/preferences.cpp:642
-msgid "Enter your surname"
-msgstr "Unesite prezime"
-
-#: ../src/gui/preferences.cpp:648
-msgid "E-_mail address:"
-msgstr "E-_pošta:"
-
-#: ../src/gui/preferences.cpp:650
-msgid "Enter your e-mail address"
-msgstr "Unesite adresu e-pošte"
-
-#: ../src/gui/preferences.cpp:655
-msgid "_Comment:"
-msgstr "_Komentar:"
-
-#: ../src/gui/preferences.cpp:657
-msgid "Enter a comment about yourself"
-msgstr "Unesite komentar o sebi"
-
-#: ../src/gui/preferences.cpp:662
-msgid "_Location:"
-msgstr "_Mesto:"
-
-#: ../src/gui/preferences.cpp:664
-msgid "Enter your country or city"
-msgstr "Unesite državu ili grad"
-
-#. Add the update button
-#: ../src/gui/preferences.cpp:669 ../src/gui/preferences.cpp:963
-msgid "_Apply"
-msgstr "Pr_imeni"
+#: ../src/gui/main.cpp:4558
+msgid "No usable audio codecs detected"
+msgstr "Nisam pronašao upotrebljivi zvučni kodek"
 
-#: ../src/gui/preferences.cpp:669
+#: ../src/gui/main.cpp:4559
 msgid ""
-"Click here to update the users directory you are registered to with the new "
-"First Name, Last Name, E-Mail, Comment and Location"
+"Ekiga didn't find any usable audio codec. Make sure that your installation "
+"is correct."
 msgstr ""
-"Pritisnite ovde da osvežite korisnički direktorijum u koji ste prijavljeni sa "
-"novim imenom, prezimenom, e-poštom, napomenom i mestom"
+"Ekiga ne može da pronađe upotrebljivi zvučni kodek. Proverite da li je "
+"instalacija ispravna."
+
+#: ../src/gui/preferences.cpp:381
+msgid "Play sound for new voice mails"
+msgstr "Pusti zvuk pri prijemu govorne pošte"
 
-#: ../src/gui/preferences.cpp:683
-msgid "Ekiga GUI"
-msgstr "Ekiga grafičko sučelje"
+#: ../src/gui/preferences.cpp:391
+msgid "Play sound for new instant messages"
+msgstr "Pusti zvuk pri prijemu novih brzih poruka"
 
-#: ../src/gui/preferences.cpp:685
+#: ../src/gui/preferences.cpp:457
+msgid "_Full name:"
+msgstr "_Puno ime:"
+
+#: ../src/gui/preferences.cpp:475
+msgid "User Interface"
+msgstr "Korisničko sučelje"
+
+#: ../src/gui/preferences.cpp:477
 msgid "Start _hidden"
 msgstr "Počni _skriven"
 
-#: ../src/gui/preferences.cpp:691
+#: ../src/gui/preferences.cpp:479
+msgid "Show offline _contacts"
+msgstr "Prikaži kontakte van mreže"
+
+#: ../src/gui/preferences.cpp:484
 msgid "Video Display"
 msgstr "Prikaz slike"
 
-#: ../src/gui/preferences.cpp:693
+#: ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video _above other windows"
 msgstr "Postavi prozore koji prikazuju sliku _iznad ostalih prozora"
 
-#: ../src/gui/preferences.cpp:706
-msgid "Users Directory"
-msgstr "Korisnički direktorijum"
+#: ../src/gui/preferences.cpp:490
+msgid "Network Settings"
+msgstr "Podešavanja mreže"
 
-#. Add all the fields
-#: ../src/gui/preferences.cpp:710
-msgid "Users directory:"
-msgstr "Korisnički direktorijum:"
-
-#: ../src/gui/preferences.cpp:710
-msgid "The users directory server to register with"
-msgstr "Server korisničkih direktorijuma za registraciju"
-
-#: ../src/gui/preferences.cpp:712
-msgid "Enable _registering"
-msgstr "Uključi _registraciju"
-
-#: ../src/gui/preferences.cpp:712
-msgid "If enabled, register with the selected users directory"
-msgstr "Ako je uključeno, registruj se u izabrani korisnički direktorijum"
-
-#: ../src/gui/preferences.cpp:714
-msgid "_Publish my details in the users directory when registering"
-msgstr "_Objavi moje detalje u korisničkom direktorijumu pri registraciji"
-
-#: ../src/gui/preferences.cpp:714
-msgid ""
-"If enabled, your details are shown to people browsing the users directory. "
-"If disabled, you are not visible to users browsing the users directory, but "
-"they can still use the callto URL to call you."
-msgstr ""
-"Ako je uključeno, detalji se prikazuju ljudima koji pretražuju korisnički "
-"direktorijum. Ako je isključeno, nevidljivi ste ljudima koji pretražuju "
-"korisnički direktorijum, ali oni još uvek mogu da koriste callto adresu da "
-"vas pozovu."
+#: ../src/gui/preferences.cpp:492
+msgid "Disable network _detection"
+msgstr "Isključi o_tkrivanje mreže"
 
-#: ../src/gui/preferences.cpp:725
+#: ../src/gui/preferences.cpp:503
 msgid "Call Forwarding"
 msgstr "Preusmeravanje poziva"
 
-#: ../src/gui/preferences.cpp:727
+#: ../src/gui/preferences.cpp:505
 msgid "_Always forward calls to the given host"
 msgstr "_Uvek prosledi pozive do datog domaćina"
 
-#: ../src/gui/preferences.cpp:727
+#: ../src/gui/preferences.cpp:505
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings"
@@ -3313,11 +2963,11 @@
 "Ako je uključeno, svi dolazni pozivi će biti preusmereni na računar koji je "
 "naznačen u podešavanjima protokola"
 
-#: ../src/gui/preferences.cpp:729
+#: ../src/gui/preferences.cpp:507
 msgid "Forward calls to the given host if _no answer"
 msgstr "Preusmeri poziv do datog računara ako _nema odgovora"
 
-#: ../src/gui/preferences.cpp:729
+#: ../src/gui/preferences.cpp:507
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you do not answer the call"
@@ -3325,11 +2975,11 @@
 "Ako je uključeno, svi dolazni pozivi će biti preusmereni na računar koji je "
 "naznačen u podešavanjima protokola ako ne odgovorite na poziv"
 
-#: ../src/gui/preferences.cpp:731
+#: ../src/gui/preferences.cpp:509
 msgid "Forward calls to the given host if _busy"
 msgstr "Preusmeri poziv do datog domaćina ako je _zauzeto"
 
-#: ../src/gui/preferences.cpp:731
+#: ../src/gui/preferences.cpp:509
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you already are in a call or if you "
@@ -3339,136 +2989,79 @@
 "naznačen u podešavanjima protokola ako imate poziv ili ako ne želite da "
 "budete uznemiravani"
 
-#: ../src/gui/preferences.cpp:735 ../src/gui/preferences.cpp:1977
+#: ../src/gui/preferences.cpp:513 ../src/gui/preferences.cpp:1361
 msgid "Call Options"
 msgstr "Opcije poziva"
 
 #. Add all the fields
-#: ../src/gui/preferences.cpp:738
-msgid "Automatically _clear calls after 30 seconds of inactivity"
-msgstr "Sam _očisti pozive nakon 30 sekundi neaktivnosti"
-
-#: ../src/gui/preferences.cpp:740
+#: ../src/gui/preferences.cpp:516
 msgid "Timeout to reject or forward unanswered incoming calls (in seconds):"
 msgstr ""
 "Vremenski rok (u sekundama) pre odbijanja ili prosleđivanja neodgovorenih "
 "dolaznih poziva:"
 
-#: ../src/gui/preferences.cpp:780
+#: ../src/gui/preferences.cpp:548
 msgid "Ekiga Sound Events"
 msgstr "Ekiga zvučni događaji"
 
-#: ../src/gui/preferences.cpp:829 ../src/gui/preferences.cpp:838
-#: ../src/gui/preferences.cpp:847
+#: ../src/gui/preferences.cpp:598
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/gui/preferences.cpp:859
+#: ../src/gui/preferences.cpp:610
 msgid "Choose a sound"
 msgstr "Izaberite neki zvučni zapis"
 
-#: ../src/gui/preferences.cpp:865
+#: ../src/gui/preferences.cpp:615
 msgid "Wavefiles"
 msgstr "wav datoteke"
 
-#: ../src/gui/preferences.cpp:874 ../src/gui/preferences.cpp:893
+#: ../src/gui/preferences.cpp:624 ../src/gui/preferences.cpp:643
 msgid "Play"
 msgstr "Pusti"
 
-#: ../src/gui/preferences.cpp:907
-msgid "Alternative Output Device"
-msgstr "Rezervni izlaz za zvono"
-
-#: ../src/gui/preferences.cpp:913
-msgid "Alternative output device:"
-msgstr "Rezervni zvučni izlaz:"
-
-#: ../src/gui/preferences.cpp:913
-msgid "Select an alternative audio output device to use for sound events"
-msgstr "Izaberite rezervni izlazni zvučni uređaj koji će se koristiti za zvono"
-
-#: ../src/gui/preferences.cpp:931
-msgid "STUN"
-msgstr "STUN"
-
-#: ../src/gui/preferences.cpp:932
-msgid "IP Translation"
-msgstr "Prevođenje mrežnih adresa"
-
-#: ../src/gui/preferences.cpp:945
-msgid "Network Interface"
-msgstr "Mrežni priključak"
-
-#: ../src/gui/preferences.cpp:950
-msgid "Listen on:"
-msgstr "Osluškuj na:"
-
-#: ../src/gui/preferences.cpp:957
-msgid "NAT Settings"
-msgstr "Podešavanja adresnog prevodioca"
-
-#: ../src/gui/preferences.cpp:959
-msgid "NAT Traversal Method:"
-msgstr "Metod adresnog prevođenja:"
-
-#: ../src/gui/preferences.cpp:961
-msgid "STUN Se_rver:"
-msgstr "STU_N server:"
-
-#: ../src/gui/preferences.cpp:961
-msgid "The STUN server to use for STUN Support."
-msgstr "STUN server koji se koristi za STUN podršku."
-
-#: ../src/gui/preferences.cpp:963
-msgid "Click here to update your NAT settings"
-msgstr "Pritisnite ovde da osvežite podešavanja adresnog prevodioca"
-
-#: ../src/gui/preferences.cpp:975
+#: ../src/gui/preferences.cpp:664
 msgid "String"
 msgstr "Niz"
 
-#: ../src/gui/preferences.cpp:976
+#: ../src/gui/preferences.cpp:665
 msgid "Tone"
 msgstr "Ton"
 
-#: ../src/gui/preferences.cpp:977 ../src/gui/preferences.cpp:1027
+#: ../src/gui/preferences.cpp:666 ../src/gui/preferences.cpp:715
 msgid "RFC2833"
 msgstr "RFC2833"
 
-#: ../src/gui/preferences.cpp:978
+#: ../src/gui/preferences.cpp:667
 msgid "Q.931"
 msgstr "Q.931"
 
-#: ../src/gui/preferences.cpp:984 ../src/gui/preferences.cpp:1035
+#: ../src/gui/preferences.cpp:673 ../src/gui/preferences.cpp:725
 msgid "Misc Settings"
 msgstr "Razna podešavanja"
 
-#: ../src/gui/preferences.cpp:986
-msgid "Default _gateway:"
-msgstr "Podrazumevani uređaj za mrežni p_rolaz:"
-
-#: ../src/gui/preferences.cpp:989 ../src/gui/preferences.cpp:1040
-msgid "Forward _URL:"
-msgstr "_Preusmeri adresu:"
+#: ../src/gui/preferences.cpp:676 ../src/gui/preferences.cpp:730
+msgid "Forward _URI:"
+msgstr "Adresa pre_usmeravanja:"
 
-#: ../src/gui/preferences.cpp:998
+#: ../src/gui/preferences.cpp:685
 msgid "Advanced Settings"
 msgstr "Napredna podešavanja"
 
 #. The toggles
-#: ../src/gui/preferences.cpp:1001
+#: ../src/gui/preferences.cpp:688
 msgid "Enable H.245 _tunneling"
 msgstr "Omogući H.245 _tunel"
 
-#: ../src/gui/preferences.cpp:1003
+#: ../src/gui/preferences.cpp:690
 msgid "Enable _early H.245"
 msgstr "Uključi _rani H.245"
 
-#: ../src/gui/preferences.cpp:1005
+#: ../src/gui/preferences.cpp:692
 msgid "Enable fast _start procedure"
 msgstr "Uključi proceduru brzi _start"
 
-#: ../src/gui/preferences.cpp:1005
+#: ../src/gui/preferences.cpp:692
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -3480,2423 +3073,230 @@
 "u i upotreba Brzog starta i N.245 tunela zajedno može da sruši neke verzije "
 "Netmeeting-a."
 
-#: ../src/gui/preferences.cpp:1011 ../src/gui/preferences.cpp:1048
+#: ../src/gui/preferences.cpp:698 ../src/gui/preferences.cpp:738
 msgid "DTMF Mode"
 msgstr "DTMF režim"
 
-#: ../src/gui/preferences.cpp:1013 ../src/gui/preferences.cpp:1050
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
 msgid "_Send DTMF as:"
 msgstr "_Pošalji DTMF kao:"
 
-#: ../src/gui/preferences.cpp:1013
-msgid ""
-"This permits to set the mode for DTMFs sending. The values can be \"String"
-"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
-"\"). Choosing other values than \"String\" disables the Text Chat."
-msgstr ""
-"Ovo omogućava podešavanje režima za slanje DTMF signala. Vrednosti mogu biti "
-"„Niz“ (0), „Ton“ (1), „RFC2833“ (2), „Q.931“ (3) (početna vrednost je „Niz“) "
-"Izbor neke druge vrednosti od „Niz“ isključuje tekstualni razgovor"
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
+msgid "This allows you to set the mode for DTMFs sending."
+msgstr "Ovo dozvoljava da postavite režim za DTMF slanje."
+
+#: ../src/gui/preferences.cpp:716
+msgid "INFO"
+msgstr "INFO"
 
-#: ../src/gui/preferences.cpp:1037
+#: ../src/gui/preferences.cpp:727
 msgid "_Outbound Proxy:"
 msgstr "Spoljni vezani posredni_k:"
 
-#: ../src/gui/preferences.cpp:1050
-msgid ""
-"This permits to set the mode for DTMFs sending. The value can be \"RFC2833"
-"\" (0) only."
-msgstr ""
-"Ovo dozvoljava da postavite režim DTMF slanja. Vrednost može biti samo "
-"„RFC2833“"
-
-#: ../src/gui/preferences.cpp:1070
-msgid "Audio Plugin"
-msgstr "Dodatak za zvuk"
-
-#: ../src/gui/preferences.cpp:1075
-msgid "Audio plugin:"
-msgstr "Dodatak za zvuk:"
-
-#: ../src/gui/preferences.cpp:1075
-msgid ""
-"The audio plugin that will be used to detect the devices and manage them."
-msgstr ""
-"Dodatak za zvuk koji se koristi za prepoznavanje uređaja i njihovo upravljanje."
-
-#: ../src/gui/preferences.cpp:1081 ../src/gui/preferences.cpp:2013
-msgid "Audio Devices"
-msgstr "Zvučni uređaji"
+#: ../src/gui/preferences.cpp:768
+msgid "Ringing Device"
+msgstr "Uređaj za zvono"
+
+#: ../src/gui/preferences.cpp:768
+msgid "Select the ringing audio device to use"
+msgstr "Izaberite uređaj koji će se koristiti za zvonjenje"
 
-#: ../src/gui/preferences.cpp:1088
+#: ../src/gui/preferences.cpp:770
 msgid "Output device:"
 msgstr "Izlazni uređaj:"
 
-#: ../src/gui/preferences.cpp:1095 ../src/gui/preferences.cpp:1168
+#: ../src/gui/preferences.cpp:777 ../src/gui/preferences.cpp:928
 msgid "Input device:"
 msgstr "Ulazni uređaj:"
 
-#. That button will refresh the devices list
-#: ../src/gui/preferences.cpp:1100 ../src/gui/preferences.cpp:1234
+#. That button will refresh the device list
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
 msgid "_Detect devices"
 msgstr "Pro_nađi uređaje"
 
-#: ../src/gui/preferences.cpp:1100
-msgid "Click here to refresh the devices list"
-msgstr "Kliknite ovde da osvežite spisak uređaja"
-
-#: ../src/gui/preferences.cpp:1126
-msgid "Normal"
-msgstr "Uobičajen"
-
-#: ../src/gui/preferences.cpp:1127
-msgid "Large"
-msgstr "Veliki"
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
+msgid "Click here to refresh the device list."
+msgstr "Pritisnite ovde da osvežite spisak uređaja."
 
-#: ../src/gui/preferences.cpp:1133
+#: ../src/gui/preferences.cpp:906
 msgid "PAL (Europe)"
 msgstr "PAL (Evropa)"
 
-#: ../src/gui/preferences.cpp:1134
+#: ../src/gui/preferences.cpp:907
 msgid "NTSC (America)"
 msgstr "NTSC (Amerika)"
 
-#: ../src/gui/preferences.cpp:1135
+#: ../src/gui/preferences.cpp:908
 msgid "SECAM (France)"
 msgstr "SECAM (Francuska)"
 
-#: ../src/gui/preferences.cpp:1136
+#: ../src/gui/preferences.cpp:909
 msgid "Auto"
 msgstr "Samo"
 
-#: ../src/gui/preferences.cpp:1152
-msgid "Video Plugin"
-msgstr "Dodatak za sliku"
-
-#: ../src/gui/preferences.cpp:1156
-msgid "Video plugin:"
-msgstr "Dodatak za sliku:"
-
-#: ../src/gui/preferences.cpp:1162 ../src/gui/preferences.cpp:2017
-msgid "Video Devices"
-msgstr "Uređaji za sliku"
-
 #. Video Channel
-#: ../src/gui/preferences.cpp:1172
+#: ../src/gui/preferences.cpp:932
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: ../src/gui/preferences.cpp:1175
+#: ../src/gui/preferences.cpp:934
 msgid "Size:"
 msgstr "Veličina:"
 
-#: ../src/gui/preferences.cpp:1175
-msgid ""
-"Select the transmitted video size: Normal (QCIF 176x144) or Large (CIF "
-"352x288)"
-msgstr ""
-"Izaberite veličinu slike koja se prenosi: Mala (QCIF 176x144) ili velika "
-"(CIF 352x288)"
+#: ../src/gui/preferences.cpp:934
+msgid "Select the transmitted video size"
+msgstr "Odaberite veličinu poslatog video zapisa"
 
-#: ../src/gui/preferences.cpp:1178
+#: ../src/gui/preferences.cpp:936
 msgid "Format:"
 msgstr "Format:"
 
-#. The file selector button
-#: ../src/gui/preferences.cpp:1181
-msgid "Image:"
-msgstr "Slika:"
-
-#: ../src/gui/preferences.cpp:1184
-msgid "Choose a Picture"
-msgstr "Izaberite sliku"
-
-#: ../src/gui/preferences.cpp:1188
-msgid "Preview"
-msgstr "Pregled"
-
-#: ../src/gui/preferences.cpp:1198
-msgid "Images"
-msgstr "Slike"
-
-#: ../src/gui/preferences.cpp:1234
-msgid "Click here to refresh the devices list."
-msgstr "Pritisnite ovde da osvežite spisak uređaja."
+#: ../src/gui/preferences.cpp:963 ../src/gui/preferences.cpp:1002
+#: ../src/gui/preferences.cpp:1386 ../src/gui/preferences.cpp:1396
+msgid "Codecs"
+msgstr "Kodeci"
 
-#: ../src/gui/preferences.cpp:1257
-msgid "Available Audio Codecs"
-msgstr "Dostupni zvučni kodeci"
-
-#: ../src/gui/preferences.cpp:1272
-msgid "Audio Codecs Settings"
-msgstr "Podešavanja zvučnih kodeka"
+#: ../src/gui/preferences.cpp:976 ../src/gui/preferences.cpp:1015
+msgid "Settings"
+msgstr "Podešavanja"
 
 #. Translators: the full sentence is Automatically adjust jitter buffer
 #. between X and Y ms
-#: ../src/gui/preferences.cpp:1276
-msgid "Automatically adjust _jitter buffer between"
-msgstr "Automatski podesi _jitter bafer između"
-
-#: ../src/gui/preferences.cpp:1276
-msgid "and"
-msgstr "i"
-
-#: ../src/gui/preferences.cpp:1276
-msgid "ms"
-msgstr "ms"
-
-#: ../src/gui/preferences.cpp:1276
-msgid "The minimum jitter buffer size for audio reception (in ms)."
-msgstr "Najmanja veličina jitter bafera za zvučni prijem (u ms)."
-
-#: ../src/gui/preferences.cpp:1276
-msgid "The maximum jitter buffer size for audio reception (in ms)."
-msgstr "Najveća veličina jitter bafera za zvučni prijem (u ms)."
-
-#: ../src/gui/preferences.cpp:1278
+#: ../src/gui/preferences.cpp:980
 msgid "Enable silence _detection"
 msgstr "Uključi _otkrivanje tišine"
 
-#: ../src/gui/preferences.cpp:1278
+#: ../src/gui/preferences.cpp:980
 msgid "If enabled, use silence detection with the codecs supporting it."
 msgstr ""
 "Ako je uključeno, koristi otkrivanje tišine sa kodecima koji to podržavaju."
 
-#: ../src/gui/preferences.cpp:1280
+#: ../src/gui/preferences.cpp:982
 msgid "Enable echo can_celation"
 msgstr "Uključi poništavanje odjeka"
 
-#: ../src/gui/preferences.cpp:1280
+#: ../src/gui/preferences.cpp:982
 msgid "If enabled, use echo cancelation."
 msgstr "Ako je uključeno, koristi poništavanje odjeka"
 
-#: ../src/gui/preferences.cpp:1293 ../src/gui/preferences.cpp:1966
-msgid "General Settings"
-msgstr "Opšta podešavanja"
+# bug(slobo): ne može ovako ostati
+#: ../src/gui/preferences.cpp:984
+msgid "Maximum _jitter buffer (in ms):"
+msgstr "Maksimalni _jitter bafer (u ms):"
 
-#: ../src/gui/preferences.cpp:1295
-msgid "Enable _video support"
-msgstr "Uključi prenos slike"
-
-#: ../src/gui/preferences.cpp:1295
-msgid "If enabled, allows video during calls."
-msgstr "Ako je uključeno, videćete sagovornika tokom poziva."
-
-#: ../src/gui/preferences.cpp:1299
-msgid "Bandwidth Control"
-msgstr "Kontrola propusnog opsega"
-
-#: ../src/gui/preferences.cpp:1301
-msgid "Maximum video _bandwidth (in kB/s):"
-msgstr "Najveći _propusni opseg za sliku (kB/s):"
-
-#: ../src/gui/preferences.cpp:1301
-msgid ""
-"The maximum video bandwidth in kbytes/s. The video quality and the number of "
-"transmitted frames per second will be dynamically adjusted above their "
-"minimum during calls to try to minimize the bandwidth to the given value."
-msgstr ""
-"Najveći propusni opseg za sliku u kilobajtima/s. Kvalitet slike i broj "
-"prenesenih okvira u sekundi biće dinamički podešeni iznad njihovog minimuma "
-"za vreme poziva pri pokušaju da se umanji propusni opseg na datu vrednost."
-
-#: ../src/gui/preferences.cpp:1306
-msgid "Advanced Quality Settings"
-msgstr "Napredno podešavanje kvaliteta"
+#: ../src/gui/preferences.cpp:984
+msgid "The maximum jitter buffer size for audio reception (in ms)."
+msgstr "Najveća veličina jitter bafera za zvučni prijem (u ms)."
 
 #. Translators: the full sentence is Keep a minimum video quality of X %
-#: ../src/gui/preferences.cpp:1309
-msgid "Frame Rate"
-msgstr "Slika u sekundi"
-
-#: ../src/gui/preferences.cpp:1309
+#: ../src/gui/preferences.cpp:1018
 msgid "Picture Quality"
 msgstr "Kvalitet slike"
 
-#: ../src/gui/preferences.cpp:1309
+#: ../src/gui/preferences.cpp:1018
 msgid ""
-"Choose if you want to favour speed or quality for the transmitted video."
-msgstr "Izaberite da li vam je važnija brzina ili kvalitet prenesene slike."
+"Choose if you want to guarantee a minimum image quality (possibly leading to "
+"dropped frames in order not to surpass the bitrate limit) or if you prefer "
+"to keep the frame rate."
+msgstr ""
+"Odaberite da li želite da garantujete minimalni kvalitet slike (što može "
+"dovesti do odbačenih kadrova u prenosu da bi se obezbedio potreban protok) "
+"ili broj prenetih slika u sekundi."
 
-#: ../src/gui/preferences.cpp:1907
-msgid "Play sound for new voice mails"
-msgstr "Pusti zvuk pri prijemu govorne pošte"
+#: ../src/gui/preferences.cpp:1020
+msgid "Maximum video _bitrate (in kbits/s):"
+msgstr "Maksimalni _video protok (u kbits/s):"
 
-#: ../src/gui/preferences.cpp:1916
-msgid "Play sound for new instant messages"
-msgstr "Pusti zvuk pri prijemu novih brzih poruka"
+#: ../src/gui/preferences.cpp:1020
+msgid ""
+"The maximum video bitrate in kbits/s. The video quality and the effective "
+"frame rate will be dynamically adjusted to keep the bitrate at the given "
+"value."
+msgstr ""
+"Maksimalni video protok u kbit/s. Video kvalitet i broj prenesenih kadrova u "
+"sekundi će biti dinamički podešeni da bi se protok održao na zadatoj vrednosti."
 
-#: ../src/gui/preferences.cpp:1945
+#: ../src/gui/preferences.cpp:1333
 msgid "Ekiga Preferences"
 msgstr "Egiga postavke"
 
-#: ../src/gui/preferences.cpp:1960
+#: ../src/gui/preferences.cpp:1351
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/gui/preferences.cpp:1961
+#: ../src/gui/preferences.cpp:1352
 msgid "Personal Data"
 msgstr "Lični podaci"
 
-#: ../src/gui/preferences.cpp:1972
-msgid "Directory Settings"
-msgstr "Podešavanja direktorijuma"
+#: ../src/gui/preferences.cpp:1357
+msgid "General Settings"
+msgstr "Opšta podešavanja"
 
-#: ../src/gui/preferences.cpp:1982
+#: ../src/gui/preferences.cpp:1366
 msgid "Sound Events"
 msgstr "Zvučni događaji"
 
-#: ../src/gui/preferences.cpp:1986
+#: ../src/gui/preferences.cpp:1370
 msgid "Protocols"
 msgstr "Protokoli"
 
-#: ../src/gui/preferences.cpp:1988
-msgid "Network Settings"
-msgstr "Podešavanja mreže"
-
-#: ../src/gui/preferences.cpp:1993
+#: ../src/gui/preferences.cpp:1372
 msgid "SIP Settings"
 msgstr "SIP podešavanja"
 
-#: ../src/gui/preferences.cpp:1998
+#: ../src/gui/preferences.cpp:1377
 msgid "H.323 Settings"
 msgstr "H.323 podešavanja"
 
-#: ../src/gui/preferences.cpp:2002
-msgid "Codecs"
-msgstr "Kodeci"
-
-#: ../src/gui/preferences.cpp:2004
-msgid "Audio Codecs"
-msgstr "Zvučni kodeci"
-
-#: ../src/gui/preferences.cpp:2008
-msgid "Video Codecs"
-msgstr "Video kodeci"
+#: ../src/gui/preferences.cpp:1381
+msgid "Audio"
+msgstr "Zvuk"
 
-#: ../src/gui/preferences.cpp:2012
+#: ../src/gui/preferences.cpp:1382 ../src/gui/preferences.cpp:1392
 msgid "Devices"
 msgstr "Uređaji"
 
-#: ../src/gui/tools.cpp:174
-msgid ""
-"Please provide your username and password in order to be able to use the PC-"
-"To-Phone service."
-msgstr ""
-"Molim unesite ime i e-poštu kako bi mogli da koristite uslugu telefoniranja "
-"sa računara na telefon."
-
-#: ../src/gui/tools.cpp:312 ../src/gui/tools.cpp:331
-msgid "PC-To-Phone Settings"
-msgstr "Podešavanja Računar — telefon poziva"
-
-#. Introduction label
-#: ../src/gui/tools.cpp:322
-msgid ""
-"You can make calls to regular phones and cell numbers worldwide using Ekiga. "
-"To enable this, you need to do three things. First create an account at the "
-"URL below. Then enter your account number and password. Finally, activate "
-"the registration below.\n"
-"\n"
-"The service will work only if your account is created using the URL in this "
-"dialog."
-msgstr ""
-"Koristeći Ekigu možete da pozivate obične telefonske i mobilne brojeve širom "
-"sveta. Da bi to uradili treba da obavite tri koraka. Prvo na donjoj adresi "
-"napravite nalog, zatim unesite broj naloga i lozinku i konačno pokrenite "
-"registrovanje.\n"
-"\n"
-"Proverite da li koristite adresu u ovom prozorčetu za dobijanje naloga inače "
-"usluga neće raditi."
-
-#: ../src/gui/tools.cpp:333
-msgid "Account _number:"
-msgstr "Broj _naloga:"
-
-#: ../src/gui/tools.cpp:350
-msgid "_Password:"
-msgstr "_Lozinka:"
-
-#: ../src/gui/tools.cpp:369
-msgid "Use PC-To-Phone service"
-msgstr "Koristi uslugu poziva Računar — telefon"
-
-#: ../src/gui/tools.cpp:381
-msgid ""
-"Click on one of the following links to get more information about your "
-"existing Ekiga PC-To-Phone account, or to create a new account."
-msgstr ""
-"Pritisnite na jednu od sledećih veza da dobijete više informacija o vašem "
-"postojećem Ekiga nalogu za telefoniranje sa računara na telefon ili da "
-"napravite novi."
-
-#: ../src/gui/tools.cpp:389
-msgid "Get an Ekiga PC-To-Phone account"
-msgstr "Zatraži Ekiga nalog za telefoniranje sa računara na telefon"
-
-#: ../src/gui/tools.cpp:403
-msgid "Recharge the account"
-msgstr "Dopunite nalog"
-
-#: ../src/gui/tools.cpp:417
-msgid "Consult the balance history"
-msgstr "Pogledaj istorijat stanja"
-
-#: ../src/gui/tools.cpp:431
-msgid "Consult the calls history"
-msgstr "Pogledaj istorijat poziva"
-
-#~ msgid "Credits"
-#~ msgstr "Zasluge"
-
-#~ msgid "Written by"
-#~ msgstr "Napisao"
-
-#~ msgid "Documented by"
-#~ msgstr "Dokumentovao"
-
-#~ msgid "Translated by"
-#~ msgstr "Preveo"
-
-#~ msgid "C_redits"
-#~ msgstr "_Zasluge"
-
-#~ msgid "Authors"
-#~ msgstr "Autori"
-
-#~ msgid "List of authors of the programs"
-#~ msgstr "Spisak autora programa"
-
-#~ msgid "Documenter entry"
-#~ msgstr "Unos pisca dokumentacije"
-
-#~ msgid "A single documenter entry"
-#~ msgstr "Unos jednog pisca dokumentacije"
-
-#~ msgid "About %s"
-#~ msgstr "O programu %s"
-
-#~ msgid "Remote user is offline"
-#~ msgstr "Udaljeni korisnik nije na mreži"
-
-#~ msgid "_Call user"
-#~ msgstr "Pozovi _korisnika"
-
-#~ msgid "SIP Outbound Proxy"
-#~ msgstr "SIP spoljni vezani posrednik"
-
-#~ msgid "Code contributors:"
-#~ msgstr "Saradnici programeri:"
-
-#~ msgid ""
-#~ "Your username and password are used to register to the ekiga.net SIP "
-#~ "service. It will provide you a SIP address that you can give to your "
-#~ "friends and family so that they can call you."
-#~ msgstr ""
-#~ "Vaše korisničko ime i lozinka se koriste za prijavu na ekiga.net SIP "
-#~ "uslugu, To će vam doneti SIP adresu koju možete dati vašim prijateljima i "
-#~ "porodici kako bi vas mogli nazvati."
-
-#~ msgid "Audio Endpoint - page %d/%d"
-#~ msgstr "Zvučni izlaz — strana %d/%d"
-
-#~ msgid "Video Endpoint - page %d/%d"
-#~ msgstr "Slika — strana %d/%d"
-
-#~ msgid "Sound to play:"
-#~ msgstr "Zvuk za puštanje:"
-
-#~ msgid "If enabled, the splash screen will be displayed when Ekiga starts"
-#~ msgstr ""
-#~ "Ako je uključeno, uvodni ekran će biti prikazan pri pokretanju programa"
-
-#~ msgid "Show splash screen at startup"
-#~ msgstr "Prikaži uvodni ekran pri pokretanju"
-
-#~ msgid "_Show splash screen"
-#~ msgstr "Pr_ikaži uvodni ekran"
-
-#~ msgid "Cl_ear call"
-#~ msgstr "Sk_loni poziv"
-
-#~ msgid "C_onnect"
-#~ msgstr "P_oveži se"
-
-#~ msgid "Create a new connection"
-#~ msgstr "Napravi novu vezu"
-
-#~ msgid "Close the current connection"
-#~ msgstr "Zatvori trenutnu vezu"
-
-#~ msgid ""
-#~ "If enabled, all incoming calls will be forwarded to the host that is "
-#~ "specified in the field above"
-#~ msgstr ""
-#~ "Ako je uključeno, svi dolazeći pozivi će biti preusmereni na računar koji "
-#~ "je naznačen u prethodnom polju"
-
-#~ msgid "_Connect"
-#~ msgstr "_Poveži se"
-
-#~ msgid "GnomeMeeting"
-#~ msgstr "Gnom sastanak"
-
-#~ msgid "Videoconferencing"
-#~ msgstr "Video konferencija"
-
-#~ msgid "Automatically clear the text chat at the end of calls"
-#~ msgstr "Automatski obriši tekstualni razgovor na kraju poziva"
-
-#~ msgid ""
-#~ "Change the control panel section (4 means that the control panel is off)"
-#~ msgstr ""
-#~ "Promenite sekciju panela elemenata (4 znači da je panel elemenata "
-#~ "isključen)"
-
-#~ msgid ""
-#~ "Choose the number of blocks (that have not changed) transmitted with each "
-#~ "frame. These blocks fill in the background"
-#~ msgstr ""
-#~ "Izaberite broj blokova (koji nisu promenjeni) koji se prenosi uz svaki "
-#~ "kadar. Ovi blokovi se popunjavaju u pozadini"
-
-#~ msgid "E-mail address"
-#~ msgstr "Adresa e-pošte"
-
-#~ msgid "Enable H.245 tunnelling"
-#~ msgstr "Omogući H.245 tunel"
-
-#~ msgid "Enable IP translation"
-#~ msgstr "Omogući prevođenje mrežnih adresa"
-
-#~ msgid "Enable video reception"
-#~ msgstr "Omogući video prijem"
-
-#~ msgid "Enable video transmission"
-#~ msgstr "Omogući video prenos"
-
-#~ msgid "Enter a comment about yourself for the user directory"
-#~ msgstr "Unesite komentar o sebi za korisnički imenik"
-
-#~ msgid ""
-#~ "Enter the public IP of your NAT/PAT router if you want to use IP "
-#~ "translation. If you are registered to ils.seconix.com, GnomeMeeting will "
-#~ "automatically fetch the public IP using the ILS service"
-#~ msgstr ""
-#~ "Unesite javnu IP adresu od vašeg NAT/PAT rutera ako želite da koristite "
-#~ "IP prevođenje. Ako ste registrovani na ils.seconix.com, Gnom Sastanak će "
-#~ "automatski dobaviti javnu IP adresu koristeći ILS servis"
-
-#~ msgid "Enter your location (country or city) for the user directory"
-#~ msgstr "Unesite lokaciju (država ili grad) za korisnički imenik"
-
-#~ msgid "Gatekeeper ID"
-#~ msgstr "IB čuvara kapije"
-
-#~ msgid "Gatekeeper alias"
-#~ msgstr "Nadimak čuvara kapije"
-
-#~ msgid "Gatekeeper alias as primary alias"
-#~ msgstr "Nadimak čuvara kapije kao osnovni nadimak"
-
-#~ msgid "Gatekeeper host"
-#~ msgstr "Domaćin čuvara kapije"
-
-#~ msgid "Gatekeeper password"
-#~ msgstr "Lozinka čuvara kapije"
-
-#~ msgid "If enabled, register with the selected user directory"
-#~ msgstr ""
-#~ "Ako je uključeno, prijavi se pomoću direktorijuma izabranog korisnika"
-
-#~ msgid ""
-#~ "If enabled, the text chat will automatically be cleared at the end of "
-#~ "calls"
-#~ msgstr ""
-#~ "Ako je uključeno, tekstualni razgovor će biti izbrisan na kraju poziva"
-
-#~ msgid "If enabled, video is transmitted during a call"
-#~ msgstr "Ako je uključeno, video se prenosi za vreme poziva"
-
-#~ msgid ""
-#~ "If enabled, your details are shown to people browsing the user directory. "
-#~ "If disabled, you are not visible to users browsing the user directory, "
-#~ "but they can still use the callto URL to call you"
-#~ msgstr ""
-#~ "Ako je uključeno, vaši detalji su prikazani ljudima koji pretražuju "
-#~ "korisnički direktorijum. Ako je isključeno, nevidljivi ste ljudima koji "
-#~ "pretražuju korisnički direktorijum, ali oni još uvek mogu da koriste "
-#~ "poziv na URL da vas pozovu"
-
-#~ msgid "Show my details to other registered users"
-#~ msgstr "Pokaži moje detalje ostalim registrovanim korisnicima"
-
-#~ msgid "Show the chat window in the main window"
-#~ msgstr "Prikaži prozor za razgovor u glavnom prozoru"
-
-#~ msgid ""
-#~ "The Gatekeeper alias to use when registering (string, or E164 ID if only "
-#~ "0123456789#)"
-#~ msgstr ""
-#~ "Nadimak čuvara kapije za korišćenje kod registrovanja (niz znakova ili E164 "
-#~ "ID ako je samo 0123456789#)"
-
-#~ msgid "The Gatekeeper host to register with"
-#~ msgstr "Domaćin čuvara kapije za registrovanje"
-
-#~ msgid "The Gatekeeper identifier to register with"
-#~ msgstr "Identifikator čuvara kapije za registrovanje"
-
-#~ msgid ""
-#~ "The Gatekeeper password to use for H.235 authentication to the Gatekeeper"
-#~ msgstr ""
-#~ "Lozinka čuvara kapije da se koristi za H.235 autentikaciju za čuvara "
-#~ "kapije"
-
-#~ msgid ""
-#~ "The range of UDP ports that GnomeMeeting will use for RTP (audio and "
-#~ "video communication channels). You can change the UDP port range if you "
-#~ "are using IP translation and if you need to have several GnomeMeeting "
-#~ "running behind your NAT/PAT router. GnomeMeeting needs to be restarted "
-#~ "for the new values to take effect."
-#~ msgstr ""
-#~ "Opseg UDP porta koji Gnom sastanak koristi za RTP (zvučni i video "
-#~ "komunikacioni kanali). Možete promeniti UDP port ako koristite IP "
-#~ "prevođenje i ako imate potrebu za više Gnom sastanaka iza NAT/PAT rutera. "
-#~ "Gnom sastanak treba da bude ponovo pokrenut da nove vrednosti budu uzete "
-#~ "u obzir."
-
-#~ msgid ""
-#~ "The range of UDP ports that GnomeMeeting will use when registering to "
-#~ "gatekeepers. You can change the UDP port range if you are using IP "
-#~ "translation and if you need to have several GnomeMeeting running behind "
-#~ "your NAT/PAT router. GnomeMeeting needs to be restarted for the new "
-#~ "values to take effect. This port range has no effect if you are not "
-#~ "registering to a gatekeeper."
-#~ msgstr ""
-#~ "Opseg UDP porta koji Gnom sastanak koristi pri registrovanju na čuvara "
-#~ "kapije. Možete promeniti UDP port ako koristite IP prevođenje i ako imate "
-#~ "potrebu za više Gnom sastanaka iza NAT/PAT rutera. Gnom sastanak treba da "
-#~ "bude ponovo pokrenut da nove vrednosti budu uzete u obzir. Opseg porta "
-#~ "nema efekat ako niste registrovani na čuvaru kapije."
-
-#~ msgid "The registering method to use"
-#~ msgstr "Metod prijavljivanja koji se koristi"
-
-#~ msgid "The user directory server to register with"
-#~ msgstr "Korisnički direktorijum za registrovanje"
-
-#~ msgid ""
-#~ "This enables H.245 Tunnelling mode. In H.245 Tunnelling mode H.245 "
-#~ "messages are encapsulated into the the H.225 channel (port 1720). This "
-#~ "saves one TCP connection during calls. H.245 Tunnelling was introduced in "
-#~ "H.323v2 and Netmeeting does not support it. Using both Fast Start and "
-#~ "H.245 Tunnelling can crash some versions of Netmeeting."
-#~ msgstr ""
-#~ "Ovo uključuje H.245 režim tunela. U H.245 režimu tunela H.245 poruke su "
-#~ "uokvirene u H.225 kanal (port 1720). Ovo štedi jednu TCP vezu tokom "
-#~ "poziva. H.245 tunel je uveden u H.323v2 i Netmeeting ga ne podržava. "
-#~ "Korišćenje i Brzog starta i H.245 tunela može da sruši neke verzije "
-#~ "Netmeeting-a."
-
-#~ msgid ""
-#~ "This enables IP checking from seconix.com and fills the IP in the public "
-#~ "IP of the NAT/PAT gateway field of GnomeMeeting. The returned IP is only "
-#~ "used when IP Translation is enabled. If you disable IP checking, you will "
-#~ "have to manually enter the IP of your gateway in the GnomeMeeting "
-#~ "preferences"
-#~ msgstr ""
-#~ "Ovo uključuje proveru mrežne adrese sa seconix.com i popunjava IP u javnom "
-#~ "IP polju za NAT/PAT prolaz Gnom sastanka. Vraćeni IP se koristi jedino "
-#~ "kada je uključeno prevođenje mrežnih adresa. Ukoliko isključite proveru IP-"
-#~ "a, moraćete da ručno unesete mrežu adresu izlaza u postavkama Gnom "
-#~ "sastanka"
-
-#~ msgid ""
-#~ "This enables IP translation. IP translation is useful if GnomeMeeting is "
-#~ "running behind a NAT/PAT router. You have to put the public IP of the "
-#~ "router in the field below. If you are registered to ils.seconix.com, "
-#~ "GnomeMeeting will automatically fetch the public IP using the ILS "
-#~ "service. If your router natively supports H.323, you can disable this"
-#~ msgstr ""
-#~ "Ovo uključuje IP prevođenje. IP prevođenje je korisno kada je Gnom sastanak "
-#~ "pokrenut iza NAT/PAT rutera. Treba da unesete javnu IP adresu od rutera u "
-#~ "naredno polje. Ako ste registrovani na ils.seconix.com, Gnom sastanak će "
-#~ "automatski dobaviti javnu IP adresu koristeći ILS servis. Ako ruter "
-#~ "prirodno podržava H.323, ovo možete da isključite"
-
-# bug: s/technic/technology/
-#~ msgid ""
-#~ "This enables STUN Support. STUN is a technic that permits to go through "
-#~ "some types of NAT gateways."
-#~ msgstr ""
-#~ "Ovo uključuje podršku za STUN. STUN je tehnologija koja omogućava prolaz "
-#~ "kroz neke vrste mrežnih prevodilaca adresa."
-
-#~ msgid "Transmitted background blocks"
-#~ msgstr "Preneseni blokovi u pozadini"
-
-#~ msgid "Use the specified gateway to do calls"
-#~ msgstr "Koristi navedeni mrežni izlaz za razgovore"
-
-#~ msgid ""
-#~ "Use this option to ensure the above alias is used as the primary alias "
-#~ "when registering with a gatekeeper. This may be required if your "
-#~ "gatekeeper can only perform authentication using the first alias in the "
-#~ "list"
-#~ msgstr ""
-#~ "Koristite ovu opciju da obezbedite da se koristi gornji nadimak kao "
-#~ "osnovni nadimak pri prijavi čuvaru kapije. Ovo može biti obavezno ako "
-#~ "čuvar kapije ume da autentifikuje samo korišćenjem prvog nadimka iz spiska"
-
-#~ msgid "Total: %.2f MB"
-#~ msgstr "Ukupno: %.2f MB"
-
-#~ msgid "URL"
-#~ msgstr "Adresa"
-
-#~ msgid "---- Call begins at %s\n"
-#~ msgstr "—— Poziv počinje u %s\n"
-
-#~ msgid "---- Call ends at %s\n"
-#~ msgstr "—— Poziv se završava u %s\n"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Umnoži putanju veze"
-
-#~ msgid "Connect to"
-#~ msgstr "Poveži se sa"
-
-#~ msgid "Add to Address Book"
-#~ msgstr "Dodaj u adresar"
-
-#~ msgid "YES"
-#~ msgstr "DA"
-
-#~ msgid "Sorry, this script won't work while GnomeMeeting is running"
-#~ msgstr "Izvinite, ova skripta neće raditi dok je Gnom sastanak pokrenut"
-
-#~ msgid "  WARNING!!!"
-#~ msgstr "  UPOZORENJE!!!"
-
-#~ msgid ""
-#~ "  This script will delete all user GnomeMeeting configuration,\n"
-#~ "  including preferences that may be important! \n"
-#~ "  The GConf daemon will be shut down, so make sure you have no\n"
-#~ "  applications depending on it running.\n"
-#~ "\n"
-#~ "  Do you really want to do this?\n"
-#~ "\n"
-#~ "  If so, say \"YES\".\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  Ova skripta će obrisati sva podešavanja korisnika Gnom sastanaka,\n"
-#~ "  uključujući karakteristike koje mogu biti važne!\n"
-#~ "  GConf pozadinski proces biće ugašen, zato proverite da nema\n"
-#~ "  programa koji su pokrenuti i zavise od njega.\n"
-#~ "\n"
-#~ "  Da li stvarno to želite?\n"
-#~ "\n"
-#~ "  Ako je tako recite „DA“.\n"
-#~ "\n"
-
-#~ msgid "Removing $HOME/.gconf/apps/gnomemeeting"
-#~ msgstr "Uklanja $HOME/.gconf/apps/gnomemeeting"
-
-#~ msgid "Shutting down GConf daemon"
-#~ msgstr "Gašenje GConf pozadinskog procesa"
-
-#~ msgid "...Done."
-#~ msgstr "...Urađeno."
-
-#~ msgid "Leaving configuration alone."
-#~ msgstr "Ostavlja konfiguraciju samu."
-
-#~ msgid "Have a nice day."
-#~ msgstr "Prijatno."
-
-#~ msgid ""
-#~ "  The GConf daemon will be shut down, so make sure you have no\n"
-#~ "  applications depending on it running.\n"
-#~ "\n"
-#~ "  Do you really want to do this?\n"
-#~ "\n"
-#~ "  If so, say \"YES\".\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  GConf pozadinski proces biće ugašen, zato proverite da nema\n"
-#~ "  programa koji su pokrenuti i zavise od njega.\n"
-#~ "\n"
-#~ "  Da li stvarno to želite?\n"
-#~ "\n"
-#~ "  Ako je tako recite „DA“.\n"
-#~ "\n"
-
-#~ msgid "Removing schemas"
-#~ msgstr "Uklanja šeme"
-
-#~ msgid "Installing schemas"
-#~ msgstr "Instalira šeme"
-
-#~ msgid ""
-#~ "CRITICAL ERROR -- Schema installation failed.\n"
-#~ "Most probably you have the GConf daemon running as root.\n"
-#~ "\n"
-#~ "Run \"gnomemeeting-config-tool --install-schemas\" as root.\n"
-#~ msgstr ""
-#~ "KRITIČNA GREŠKA -- Instalacija šeme nije uspela.\n"
-#~ "Najverovatnije imate GConf pokrenut kao root.\n"
-#~ "\n"
-#~ "Pokrenite „gnomemeeting-config-tool --install-schemas“ kao root.\n"
-
-#~ msgid "Usage:  gnomemeeting-config-tool OPTION"
-#~ msgstr "Korištenje:  gnomemeeting-config-tool OPCIJA"
-
-#~ msgid "Fixes problems with the GnomeMeeting settings"
-#~ msgstr "Popravlja probleme sa podešavanjima Gnom sastanaka"
-
-#~ msgid "  --clean                remove all user settings"
-#~ msgstr "  --clean                 ukloniti sva korisnička podešavanja"
-
-#~ msgid ""
-#~ "  --install-schemas      install schemas with default settings (run as "
-#~ "root)"
-#~ msgstr ""
-#~ "  --install-schemas      instalira šeme sa podrazumevanim podešavanjima "
-#~ "(pokrenuti kao root)"
-
-#~ msgid ""
-#~ "  --clean-schemas        remove schemas with default settings (run as "
-#~ "root)"
-#~ msgstr ""
-#~ "  --clean-schemas        uklanja šeme sa podrazumevanim podešavanjima "
-#~ "(pokrenuti kao root)"
-
-#~ msgid ""
-#~ "  --fix-permissions      fix permissions of GConf repository (run as root)"
-#~ msgstr ""
-#~ "  --fix-permissions      popravlja ovlašćenja GConf spremišta (pokrenuti "
-#~ "kao root)"
-
-#~ msgid "No gateway or proxy specified"
-#~ msgstr "Nije naveden izlaz niti posrednik"
-
-#~ msgid "You need to specify a host to use as gateway or proxy."
-#~ msgstr "Morate navesti računar koji koristite za posrednika ili izlaz."
-
-#~ msgid "Forward URL not specified"
-#~ msgstr "Nije navedena adresa za preusmeravanje"
-
-#~ msgid ""
-#~ "You need to specify an URL where to forward calls in the call forwarding "
-#~ "section of the preferences!\n"
-#~ "\n"
-#~ "Disabling forwarding."
-#~ msgstr ""
-#~ "Morate navesti adresu na koju da preusmeravam pozive u odeljku postavki za "
-#~ "preusmeravanje poziva!\n"
-#~ "\n"
-#~ "Isključuje preusmeravanje."
-
-#~ msgid "Failure opening %s for transmission, will try with next common codec"
-#~ msgstr "Greška pri otvaranju %s za prenos, pokušaće sledeći poznati kodek"
-
-#~ msgid "Failure opening %s for reception, will try with next common codec"
-#~ msgstr "Greška pri otvaranju %s za prijem, pokušaće sledeći poznat kodek"
-
-#~ msgid "Call transfer failed"
-#~ msgstr "Neuspelo prebacivanje poziva"
-
-#~ msgid ""
-#~ "The remote user tried to transfer your call to another user, but it "
-#~ "failed."
-#~ msgstr ""
-#~ "Udaljeni korisnik je pokušao da prebaci vaš poziv drugom korisniku, ali "
-#~ "nije uspeo."
-
-#~ msgid ""
-#~ "Your e-mail address is used when registering to the GnomeMeeting users "
-#~ "directory. It is used to create a callto address permitting your contacts "
-#~ "to easily call you wherever you are."
-#~ msgstr ""
-#~ "E-pošta se koristi pri prijavljivanju u imenik korisnika Gnom sastanka. "
-#~ "Koristi se za obrazovanje pozivnih adresa koje vam dozvoljavaju da vas vaši "
-#~ "poznanici lako pozovu gde god da ste."
-
-#~ msgid ""
-#~ "I don't want to register to the GnomeMeeting users directory and get a "
-#~ "callto address"
-#~ msgstr ""
-#~ "Ne želim da se prijavim u imenik korisnika Gnom sastanka i da dobijem "
-#~ "pozivnu adresu"
-
-#~ msgid "Forwarding call from %s to %s (Forward all calls)"
-#~ msgstr "Preusmerava poziv od %s do %s (preusmeri sve pozive)"
-
-#~ msgid "Rejecting call from %s (Do Not Disturb)"
-#~ msgstr "Odbija poziv od %s (ne uznemiravaj)"
-
-#~ msgid "Accepting call from %s (Auto Answer)"
-#~ msgstr "Prihvata poziv od %s (sam odgovara)"
-
-#~ msgid "Call rejected"
-#~ msgstr "Poziv odbijen"
-
-#~ msgid "Call automatically answered"
-#~ msgstr "Automatski odgovoreno na poziv"
-
-#~ msgid "Error while forwarding call to %s"
-#~ msgstr "Greška pri prosleđivanju poziva za %s"
-
-#~ msgid "There was an error when forwarding the call to the given host."
-#~ msgstr "Došlo je do greške pri prosleđivanju poziva na dati računar."
-
-#~ msgid "Connected"
-#~ msgstr "Povezano"
-
-#~ msgid "Remote user did not accept the call"
-#~ msgstr "Udaljeni korisnik nije prihvatio poziv"
-
-#~ msgid "Local user did not accept the call"
-#~ msgstr "Lokalni korisnik nije prihvatio poziv"
-
-#~ msgid "Missed %d call"
-#~ msgid_plural "Missed %d calls"
-#~ msgstr[0] "Propušten %d poziv"
-#~ msgstr[1] "Propuštena %d poziva"
-#~ msgstr[2] "Propušteno %d poziva"
-
-#~ msgid "Attaching lid hardware to codec"
-#~ msgstr "Prilaže lid hardware na kodek"
-
-#~ msgid "Forwarding Call to %s (No Answer)"
-#~ msgstr "Preusmeravanje poziva na %s (bez odgovora)"
-
-#~ msgid "Unregistered from gatekeeper %s"
-#~ msgstr "Neregistrovan od čuvara kapije %s"
-
-#~ msgid "Invalid gatekeeper hostname"
-#~ msgstr "Neispravno ime čuvara kapije"
-
-#~ msgid "Please provide a hostname to use for the gatekeeper."
-#~ msgstr "Unesite ime domaćina koji će biti čuvar kapije."
-
-#~ msgid "Invalid gatekeeper ID"
-#~ msgstr "Neispravan IB čuvara kapije"
-
-#~ msgid "Please provide a valid ID for the gatekeeper."
-#~ msgstr "Obezbedite ispravan IB za čuvara kapije."
-
-#~ msgid "Gatekeeper set to %s"
-#~ msgstr "Čuvar kapije podešen na %s"
-
-#~ msgid "Trying to stop calling"
-#~ msgstr "Pokušavanje zaustavljanja poziva"
-
-#~ msgid "Stopping current call"
-#~ msgstr "Zaustavljanje trenutnog poziva"
-
-#~ msgid "Opened Quicknet device %s"
-#~ msgstr "Otvoren Quicknet uređaj %s"
-
-#~ msgid "Error while opening the Quicknet device."
-#~ msgstr "Greška pri otvaranju Quicknet uređaja."
-
-#~ msgid ""
-#~ "Please check that your driver is correctly installed and that the device "
-#~ "is working correctly."
-#~ msgstr ""
-#~ "Proverite da li je vaš upravljački program pravilno instaliran i da li "
-#~ "uređaj radi ispravno."
-
-#~ msgid "Closed Quicknet device %s"
-#~ msgstr "Zatvoren Quicknet uređaj %s"
-
-#~ msgid "Phone is off hook"
-#~ msgstr "Slušalica nije spuštena"
-
-#~ msgid "Phone is on hook"
-#~ msgstr "Slušalica spuštena"
-
-#~ msgid "Open control panel"
-#~ msgstr "Otvori kontrolni panel"
-
-#~ msgid "Quit GnomeMeeting"
-#~ msgstr "Izlazi iz Gnom sastanka"
-
-#~ msgid "Text Chat"
-#~ msgstr "Tekstualni razgovor"
-
-#~ msgid "View/Hide the text chat window"
-#~ msgstr "Pogledaj/sakrij prozor tekstualnog razgovora"
-
-#~ msgid "Off"
-#~ msgstr "Isključeno"
-
-#~ msgid "Hide the control panel"
-#~ msgstr "Sakrij kontrolni panel"
-
-#~ msgid "_Clear Text Chat"
-#~ msgstr "Očisti _tekstualni razgovor"
-
-#~ msgid "Clear the text chat"
-#~ msgstr "Čisti tekstualni razgovor"
-
-#~ msgid ""
-#~ "Lost packets:\n"
-#~ "Late packets:\n"
-#~ "Round-trip delay:\n"
-#~ "Jitter buffer:"
-#~ msgstr ""
-#~ "Izgubljeni paketi:\n"
-#~ "Kasni paketi:\n"
-#~ "Trajanje povratnog puta:\n"
-#~ "Jitter bafer:"
-
-#~ msgid "Click to clear"
-#~ msgstr "Kliknite da očistite"
-
-#~ msgid "Generic error"
-#~ msgstr "Opšta greška"
-
-#~ msgid "GnomeMeeting GUI"
-#~ msgstr "Sučelje Gnomovog sastanka"
-
-#~ msgid "Forward calls to _host:"
-#~ msgstr "Preusmeri poziv do _domaćina:"
-
-# bug: plural-forms
-#~ msgid "seconds"
-#~ msgstr "sekundi"
-
-#~ msgid "GnomeMeeting Sound Events"
-#~ msgstr "Zvučni događaji za Gnom sastanak"
-
-#~ msgid "Ring Output device:"
-#~ msgstr "Izlazni uređaj za zvono:"
-
-#~ msgid "All"
-#~ msgstr "Sve"
-
-#~ msgid "rfc2833"
-#~ msgstr "rfc2833"
-
-#~ msgid "Signal"
-#~ msgstr "Signal"
-
-#~ msgid "H.323 Version 2 Settings"
-#~ msgstr "H.323 Verzija 2 podešavanja"
-
-#~ msgid "DTMF Sending"
-#~ msgstr "Slanje DTMF-a"
-
-#~ msgid ""
-#~ "This permits to set the mode for DTMFs sending. The values can be \"All"
-#~ "\", \"None\", \"rfc2833\", \"Signal\" or \"String\" (default is \"All\"). "
-#~ "Choosing other values than \"All\", \"String\" or \"rfc2833\" disables "
-#~ "the Text Chat."
-#~ msgstr ""
-#~ "Ovo omogućava podešavanje režima za slanje DTMF-a. Vrednosti mogu biti "
-#~ "„All“, „None“, „rfc2833“, „Signal“ ili „String“ (podrazumevano je „All“). "
-#~ "Izborom neke druge vrednosti osim „All“, „String“ ili „rfc2833“ isključuje "
-#~ "se tekstualni razgovor."
-
-#~ msgid "Do not register"
-#~ msgstr "Ne registruj"
-
-#~ msgid "Automatically discover"
-#~ msgstr "Automatski prepoznaj"
-
-#~ msgid "Gatekeeper _host:"
-#~ msgstr "_Domaćin čuvara kapije:"
-
-#~ msgid "Gatekeeper _alias:"
-#~ msgstr "_Nadimak čuvara kapije:"
-
-#~ msgid "Gatekeeper _password:"
-#~ msgstr "_Lozinka čuvara kapije:"
-
-#~ msgid "Registration timeout of"
-#~ msgstr "Registracija ističe za"
-
-#~ msgid "minutes"
-#~ msgstr "minuta"
-
-#~ msgid "Register this alias as the primary alias with the gatekeeper"
-#~ msgstr "Registruj ovaj nadimak kao osnovni nadimak za čuvara kapije"
-
-#~ msgid ""
-#~ "Use this option to ensure the above alias is used as the primary alias "
-#~ "when registering with a gatekeeper. This may be required if your "
-#~ "gatekeeper can only perform authentication using the first alias in the "
-#~ "list."
-#~ msgstr ""
-#~ "Koristite ovu opciju da obezbedite da se koristi gornji nadimak kao "
-#~ "osnovni nadimak pri registraciji na čuvara kapije. Ovo može biti obavezno "
-#~ "ako čuvar kapije ume da autentifikuje samo korišćenjem prvog nadimka iz "
-#~ "spiska."
-
-#~ msgid "Registering method:"
-#~ msgstr "Metod registrovanja:"
-
-#~ msgid "Click here to update your Gatekeeper settings"
-#~ msgstr "Kliknite ovde da osvežite podešavanja čuvara kapije"
-
-#~ msgid "Gateway/Proxy"
-#~ msgstr "Mrežni izlaz/posrednik"
-
-#~ msgid "Gateway / Proxy host:"
-#~ msgstr "Domaćin za mrežni izlaz/posrednika:"
-
-#~ msgid "Use gateway or proxy"
-#~ msgstr "Koristi mrežni izlaz ili posrednika"
-
-#~ msgid "Enable IP _translation"
-#~ msgstr "Omogući _prevođenje IP adresa"
-
-#~ msgid ""
-#~ "This enables IP translation. IP translation is useful if GnomeMeeting is "
-#~ "running behind a NAT/PAT router. You have to put the public IP of the "
-#~ "router in the field below. If you are registered to ils.seconix.com, "
-#~ "GnomeMeeting will automatically fetch the public IP using the ILS "
-#~ "service. If your router natively supports H.323, you can disable this."
-#~ msgstr ""
-#~ "Ovo uključuje IP prevođenje. IP prevođenje je korisno kada je Gnom sastanak "
-#~ "pokrenut iza NAT/PAT rutera. Treba da unesete javnu IP adresu od rutera u "
-#~ "naredno polje. Ako ste registrovani na ils.seconix.com, Gnom sastanak će "
-#~ "automatski dobaviti javnu IP adresu koristeći ILS servis. Ako ruter "
-#~ "prirodno podržava H.323, možete to da isključite."
-
-#~ msgid "Enable _automatic IP checking"
-#~ msgstr "Omogući _automatsku proveru mrežnih adresa"
-
-#~ msgid ""
-#~ "This enables IP checking from seconix.com and fills the IP in the public "
-#~ "IP of the NAT/PAT gateway field of GnomeMeeting. The returned IP is only "
-#~ "used when IP Translation is enabled. If you disable IP checking, you will "
-#~ "have to manually enter the IP of your gateway in the GnomeMeeting "
-#~ "preferences."
-#~ msgstr ""
-#~ "Ovo uključuje proveru mrežne adrese sa seconix.com i popunjava IP u javnom "
-#~ "IP polju za NAT/PAT prolaz Gnom sastanka. Vraćeni IP se koristi jedino "
-#~ "kada je uključeno prevođenje mrežnih adresa. Ukoliko isključite proveru IP-"
-#~ "a, moraćete da ručno unesete mrežu adresu izlaza u postavkama Gnom "
-#~ "sastanka."
-
-#~ msgid "Public _IP of the NAT/PAT router:"
-#~ msgstr "Javna _IP adresa od NAT/PAT rutera:"
-
-#~ msgid ""
-#~ "Enter the public IP of your NAT/PAT router if you want to use IP "
-#~ "translation. If you are registered to ils.seconix.com, GnomeMeeting will "
-#~ "automatically fetch the public IP using the ILS service."
-#~ msgstr ""
-#~ "Unesite javnu IP adresu od vašeg NAT/PAT rutera ako želite da koristite "
-#~ "IP prevođenje. Ako ste registrovani na ils.seconix.com, Gnom sastanak će "
-#~ "automatski dobaviti javnu IP adresu koristeći ILS servis."
-
-# bug: STUN?
-#~ msgid "STUN Support"
-#~ msgstr "STUN podrška"
-
-#~ msgid "Low"
-#~ msgstr "Nizak"
-
-#~ msgid "Medium"
-#~ msgstr "Srednji"
-
-#~ msgid "High"
-#~ msgstr "Visok"
-
-#~ msgid "AGC"
-#~ msgstr "AGC"
-
-#~ msgid "POTS"
-#~ msgstr "SDTA"
-
-#~ msgid "Headset"
-#~ msgstr "Slušalice"
-
-#~ msgid "Quicknet Hardware"
-#~ msgstr "Quicknet hardver"
-
-#~ msgid "Output device type:"
-#~ msgstr "Vrsta izlaznog uređaja:"
-
-#~ msgid "Country _code:"
-#~ msgstr "Državna _oznaka:"
-
-#~ msgid ""
-#~ "The two-letter country code of your country (e.g.: BE, UK, FR, DE, ...)."
-#~ msgstr ""
-#~ "Dva slova državne oznake za vašu državu (npr: YU, CA, UK, FR, DE, ...)."
-
-#~ msgid "Small"
-#~ msgstr "Mali"
-
-#~ msgid "Enable video _transmission"
-#~ msgstr "Omogući video _prenos"
-
-#~ msgid "If enabled, video is transmitted during a call."
-#~ msgstr "Ako je uključeno, video se prenosi za vreme poziva."
-
-#~ msgid "Enable video _reception"
-#~ msgstr "Omogući video p_rijem"
-
-#~ msgid "kB/s"
-#~ msgstr "kB/s"
-
-# bug: bad! needs plural forms!!!
-#~ msgid "Transmit"
-#~ msgstr "Prenesi"
-
-#~ msgid ""
-#~ "Choose the number of blocks (that have not changed) transmitted with each "
-#~ "frame. These blocks fill in the background."
-#~ msgstr ""
-#~ "Izaberite broj blokova (koji nisu izmenjeni) koji se prenose uz svaku "
-#~ "sliku. Ovi blokovi se popunjavaju u pozadini."
-
-# bug: BAD! needs plural forms!
-#~ msgid "background _blocks with each frame"
-#~ msgstr "pozadinskih _blokova sa svakom slikom"
-
-#~ msgid "GnomeMeeting Preferences"
-#~ msgstr "Postavke Gnom sastanka"
-
-#~ msgid "Gatekeeper Settings"
-#~ msgstr "Podešavanja čuvara kapije"
-
-#~ msgid "Gateway / Proxy Settings"
-#~ msgstr "Podešavanja mrežnog izlaza / posrednika"
-
-#~ msgid "The type of NAT was successfully detected"
-#~ msgstr "Vrsta NAT-a je uspešno otkrivena"
-
-#~ msgid "Use your MicroTelco account number"
-#~ msgstr "Koristite broj MicroTelco naloga"
-
-#~ msgid "_Pin:"
-#~ msgstr "_Pin:"
-
-#~ msgid "Use your MicroTelco PIN"
-#~ msgstr "Koristite MicroTelco PIN"
-
-#~ msgid "GnomeMeeting Tray Icon"
-#~ msgstr "Gnom Sastanak ikona na panelu"
-
-#~ msgid ""
-#~ "The call transfer failed, the user was either unreachable, or simply busy "
-#~ "when he received the call transfer request."
-#~ msgstr ""
-#~ "Prenos poziva nije uspeo, korisnik nije dostupan ili je jednostavno bilo "
-#~ "zauzeto kada je primio zahtev za prenos poziva."
-
-#~ msgid "No contact with speed dial %s# found, will call number %s instead"
-#~ msgstr "Nije nađen kontakt sa brzim biranjem %s#, zvaće %s umesto njega"
-
-#~ msgid "Title"
-#~ msgstr "Naslov"
-
-# bug: assistant is preffered over druid
-#~ msgid "Title of the druid"
-#~ msgstr "Naslov pomoćnika"
-
-#~ msgid "Logo"
-#~ msgstr "Znak"
-
-#~ msgid "Logo image"
-#~ msgstr "Slika logotipa"
-
-#~ msgid "Top Watermark"
-#~ msgstr "Gornji vodeni žig"
-
-#~ msgid "Watermark image for the top"
-#~ msgstr "Slika vodenog žiga za vrh"
-
-#~ msgid "Title Foreground"
-#~ msgstr "Boja naslova"
-
-#~ msgid "Foreground color of the title"
-#~ msgstr "Boja naslova"
-
-#~ msgid "Title Foreground Color"
-#~ msgstr "Boja naslova"
-
-#~ msgid "Foreground color of the title as a GdkColor"
-#~ msgstr "Boja naslova kao GdkColor"
-
-#~ msgid "Title Foreground color set"
-#~ msgstr "Boja naslova je postavljena"
-
-#~ msgid "Foreground color of the title is set"
-#~ msgstr "Boja naslova je postavljena"
-
-#~ msgid "Background Color"
-#~ msgstr "Boja pozadine"
-
-#~ msgid "Background color"
-#~ msgstr "Boja pozadine"
-
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "Boja pozadine kao GdkColor"
-
-#~ msgid "Background color set"
-#~ msgstr "Boja pozadine postavljena"
-
-#~ msgid "Background color is set"
-#~ msgstr "Boja pozadine je postavljena"
-
-#~ msgid "Logo Background Color"
-#~ msgstr "Boja pozadine logotipa"
-
-#~ msgid "Logo Background color"
-#~ msgstr "Boja pozadine logotipa"
-
-#~ msgid "Logo Background color as a GdkColor"
-#~ msgstr "Boja pozadine logotipa kao GdkColor"
-
-#~ msgid "Logo Background color set"
-#~ msgstr "Boja pozadine logotipa postavljena"
-
-#~ msgid "Logo Background color is set"
-#~ msgstr "Boja pozadine logotipa je postavljena"
-
-#~ msgid "Show Finish"
-#~ msgstr "Prikaži „Završi“"
-
-#~ msgid "Show the 'Finish' button instead of the 'Next' button"
-#~ msgstr "Prikaži dugme „Završi“ umesto dugmeta „Sledeće“"
-
-#~ msgid "Show Help"
-#~ msgstr "Prikaži „Pomoć“"
-
-#~ msgid "Show the 'Help' button"
-#~ msgstr "Prikaži dugme „Pomoć“"
-
-# bug: plural-forms
-#~ msgid "Found %d users in %s"
-#~ msgstr "Nađoh %d korisnika u %s"
-
-# bug: plural-forms
-#~ msgid "Found %d users in %s for a total of %d users"
-#~ msgstr "Nađoh %d korisnika u %s od ukupno %d korisnika"
-
-#~ msgid "On LDAP servers"
-#~ msgstr "Na LDAP serverima"
-
-# bug: plural-forms
-#~ msgid "Missed %d calls"
-#~ msgstr "Propušten %d poziva"
-
-#~ msgid ""
-#~ "Another user already exists with the same alias, please use another alias."
-#~ msgstr "Već postoji drugi korisnik sa istim nadimkom, uzmite drugi nadimak."
-
-#~ msgid ""
-#~ "You are not allowed to register to the gatekeeper. Please check your "
-#~ "login, password and firewall."
-#~ msgstr ""
-#~ "Nije vam dozvoljeno registrovanje sa čuvarem kapije.  Proverite vaše ime, "
-#~ "lozinku i vatreni zid."
-
-#~ msgid "There was a transport error."
-#~ msgstr "Dogodila se greška prilikom transporta."
-
-#~ msgid "No gatekeeper corresponding to your options has been found."
-#~ msgstr "Nijedan čuvar kapije nije nađen prateći vaše opcije."
-
-#~ msgid "Error while registering with gatekeeper"
-#~ msgstr "Greška pri registrovanju sa čuvarem kapije"
-
-#~ msgid "Cannot contact the users directory"
-#~ msgstr "Ne može da kontaktira korisnički direktorijum"
-
-#~ msgid ""
-#~ "Failed to contact the users directory %s:%d. The directory is probably "
-#~ "currently overloaded, please try again later."
-#~ msgstr ""
-#~ "Nisam uspeo da se povežem sa korisničkim imenikom %s:%d. Imenik je "
-#~ "verovatno sada preopterećen, pokušajte kasnije."
-
-#~ msgid "Failed to bind to users directory: %s."
-#~ msgstr "Ne mogu da se vežem za direktorijum korisnika: %s."
-
-#~ msgid "Unregistered from the users directory %s."
-#~ msgstr "Odjavljen iz direktorijuma korisnika %s."
-
-#~ msgid "Error while registering to %s"
-#~ msgstr "Greška pri prijavi u %s"
-
-#~ msgid "Free for Cha_t"
-#~ msgstr "Slobodan za raz_govor"
-
-#~ msgid "_Busy"
-#~ msgstr "_Zauzet"
-
-#~ msgid "Both (Local Video Incrusted)"
-#~ msgstr "Oba (Obložen lokalni video)"
-
-#~ msgid "Sent dtmf %c"
-#~ msgstr "Poslah DTMF %c"
-
-#~ msgid "Buy a card"
-#~ msgstr "Kupiti karticu"
-
-#~ msgid "Consult my account details"
-#~ msgstr "Pogledaj detalje mog naloga"
-
-#~ msgid "_About..."
-#~ msgstr "_O programu..."
-
-#~ msgid "Fullscreen height"
-#~ msgstr "Visina celog ekrana"
-
-#~ msgid "Fullscreen width"
-#~ msgstr "Širina celog ekrana"
-
-#~ msgid "Show a status bar at the bottom of the main window"
-#~ msgstr "Prikaži liniju sa stanjem na dnu glavnog prozora"
-
-#~ msgid "Show status bar"
-#~ msgstr "Prikaži liniju sa stanjem"
-
-#~ msgid "The image height for fullscreen"
-#~ msgstr "Visina slike za ceo ekran"
-
-#~ msgid "The image width for fullscreen"
-#~ msgstr "Širina slike za ceo ekran"
-
-#~ msgid "The list of called URLs"
-#~ msgstr "Spisak zvanih URL-ova"
-
-#~ msgid "The list of groups"
-#~ msgstr "Spisak grupa"
-
-#~ msgid "Program name"
-#~ msgstr "Ime programa"
-
-#~ msgid "The name of the program"
-#~ msgstr "Ime programa"
-
-#~ msgid "Program version"
-#~ msgstr "Izdanje programa"
-
-#~ msgid "The version of the program"
-#~ msgstr "Izdanje programa"
-
-#~ msgid "Copyright string"
-#~ msgstr "Tekst autorskih prava"
-
-#~ msgid "Copyright information for the program"
-#~ msgstr "Podaci o autorskim pravima za program"
-
-#~ msgid "Comments string"
-#~ msgstr "Tekst primedbe"
-
-#~ msgid "Comments about the program"
-#~ msgstr "Primedbe o programu"
-
-#~ msgid "Author entry"
-#~ msgstr "Unos autora"
-
-#~ msgid "A single author entry"
-#~ msgstr "Unos jednog autora"
-
-#~ msgid "Documenters"
-#~ msgstr "Dokumentovali"
-
-#~ msgid "List of people documenting the program"
-#~ msgstr "Spisak ljudi koji su dokumentovali program"
-
-# bug: translator_credits should be translatable as well!
-#~ msgid "Translator credits"
-#~ msgstr ""
-#~ "Dejan Matijević <dejan@ns.sympatico.ca>\n"
-#~ "Danilo Šegan <danilo@prevod.org>\n"
-#~ "\n"
-#~ "Prevod.org — prevod na srpski jezik."
-
-#~ msgid ""
-#~ "Credits to the translators. This string should be marked as translatable"
-#~ msgstr "Zasluge prevodioca. Ovaj tekst mora biti označen kao prevodiv."
-
-#~ msgid "A logo for the about box"
-#~ msgstr "Znak za prozorče o programu"
-
-#~ msgid "Audio transmission: suspended"
-#~ msgstr "Zvućni prenos: obustavljen"
-
-#~ msgid "Audio transmission: resumed"
-#~ msgstr "Zvućni prenos: nastavljen"
-
-#~ msgid "Video transmission: suspended"
-#~ msgstr "Video prenos: obustavljen"
-
-#~ msgid "Video transmission: resumed"
-#~ msgstr "Video prenos: nastavljen"
-
-#~ msgid "Unanswered Calls"
-#~ msgstr "Neodgovoreni pozivi"
-
-#~ msgid "STUN Server error"
-#~ msgstr "Greška na STUN serveru"
-
-#~ msgid "Welcome to GnomeMeeting 1.00!"
-#~ msgstr "Dobrodošli u Gnom Sastanak 1.00!"
-
-#~ msgid ""
-#~ "Congratulations, you have just successfully launched GnomeMeeting 1.00 "
-#~ "for the first time.\n"
-#~ "GnomeMeeting is the leading VoIP, videoconferencing and telephony "
-#~ "software for Unix.\n"
-#~ "\n"
-#~ "Thanks to all of you who have helped us along the road to our golden 1.00 "
-#~ "release!\n"
-#~ "\n"
-#~ "The GnomeMeeting Team."
-#~ msgstr ""
-#~ "Čestitamo, upravo ste po prvi put uspešno pokrenuli Gnom sastanak 1.00.\n"
-#~ "Gnom sastanak je vodeći program za VoIP, video konferencije i telefoniju "
-#~ "za Unikse.\n"
-#~ "\n"
-#~ "Hvala svima koji su pomogli na putu do našeg zlatnog izdanja 1.00!\n"
-#~ "\n"
-#~ "Tim Gnom sastanka."
-
-#~ msgid "No usable audio manager detected"
-#~ msgstr "Nisam pronašao upotrebljivog upravnika zvukom"
-
-#~ msgid ""
-#~ "GnomeMeeting didn't find any usable sound manager. Make sure that your "
-#~ "installation is correct."
-#~ msgstr ""
-#~ "Gnom sastanak ne može da pronađe upotrebljivog upravnika zvukom. Proverite "
-#~ "da li je vaša instalacija ispravna."
-
-#~ msgid "View/Hide the status bar"
-#~ msgstr "Pogledaj ili skloni liniju stanja"
-
-#~ msgid "Both (Local Video in New Window)"
-#~ msgstr "Oba (Lokalni video u novom prozoru)"
-
-#~ msgid "Use a fullscreen size of"
-#~ msgstr "Koristi veličinu punog ekrana od"
-
-#~ msgid "by"
-#~ msgstr "sa"
-
-#~ msgid "pixels"
-#~ msgstr "tačaka"
-
-#~ msgid "The image width for fullscreen."
-#~ msgstr "Širina slike za ceo ekran."
-
-#~ msgid "The image height for fullscreen."
-#~ msgstr "Visina slike za ceo ekran."
-
-#~ msgid "Minimum transmitted FPS"
-#~ msgstr "Minimalan prenos FTS"
-
-#~ msgid ""
-#~ "The minimum number of video frames to transmit each second when trying to "
-#~ "minimize the bandwidth"
-#~ msgstr ""
-#~ "Minimalna širina propusnog opsega video okvira za prenos u svakoj sekundi "
-#~ "pri pokušaju da minimalizuje širina propusnog opsega videa"
-
-#~ msgid ""
-#~ "iLBC-13k3 (internet Low Bitrate Codec) is a free speech codec suitable "
-#~ "for robust voice communication over IP. The codec is designed for narrow "
-#~ "band speech and results in a payload bit rate of 13.33 kbit/s with an "
-#~ "encoding frame length of 30 ms. The iLBC codec enables graceful speech "
-#~ "quality degradation in the case of lost frames, which occurs in "
-#~ "connection with lost or delayed IP packets."
-#~ msgstr ""
-#~ "iLBC-13k3 (internet Low Bitrate Codec) je slobodno govorno kodiranje "
-#~ "prilagođeno dobroj glasovnoj vezi preko IP-a. Kodiranje je izrađeno za "
-#~ "uzak opseg govora i rezultuje u veličini od 13,33 kbit/s sa dužinom "
-#~ "kodiranog kadra od 30 ms. iLBC kodiranje omogućava dobrovoljno sniženje "
-#~ "kvaliteta govora u slučaju izgubljenih kadrova, što se dešava pri prekidu "
-#~ "veze ili kod izgubljenih IP paketa."
-
-#~ msgid "Excellent"
-#~ msgstr "Odlično"
-
-#~ msgid "13.33 Kbps"
-#~ msgstr "13,33 Kbps"
-
-#~ msgid ""
-#~ "iLBC-15k2 (internet Low Bitrate Codec) is a free speech codec suitable "
-#~ "for robust voice communication over IP. The codec is designed for narrow "
-#~ "band speech and results in a payload bitrate of 15.20 kbps with an "
-#~ "encoding length of 20 ms. The iLBC codec enables graceful speech quality "
-#~ "degradation in the case of lost frames, which occurs in connection with "
-#~ "lost or delayed IP packets."
-#~ msgstr ""
-#~ "iLBC-15k2 (internet Low Bitrate Codec) je slobodno govorno kodiranje "
-#~ "prilagođeno dobroj glasovnoj vezi preko IP-a. Kodiranje je izrađeno za "
-#~ "uzak opseg govora i rezultuje u veličini od 15,20 kbit/s sa dužinom "
-#~ "kodiranog kadra od 20 ms. iLBC kodiranje omogućava dobrovoljno sniženje "
-#~ "kvaliteta govora u slučaju izgubljenih kadrova, što se dešava pri prekidu "
-#~ "veze ili kod izgubljenih IP paketa."
-
-#~ msgid "15.2 Kbps"
-#~ msgstr "15,2 Kbps"
-
-#~ msgid ""
-#~ "Speex is an Open Source/Free Software patent-free audio compression "
-#~ "format designed for speech. The Speex Project aims to lower the barrier "
-#~ "of entry for voice applications by providing a free alternative to "
-#~ "expensive proprietary speech codecs. Moreover, Speex is well-adapted to "
-#~ "Internet applications and provides useful features that are not present "
-#~ "in most other codecs. Finally, Speex is part of the GNU Project and is "
-#~ "available under the Xiph.org variant of the BSD license. SpeexNarrow-15k "
-#~ "is based on CELP and is designed to compress voice at a payload bitrate "
-#~ "of 15 kbps."
-#~ msgstr ""
-#~ "Speex je sažimanje zvuka otvorenog koda i slobodan softver, bez upotrebe "
-#~ "patenata, sačinjen za glas. Speex projekat teži manjem pragu za ulaz u "
-#~ "glasovne programe obezbeđivanjem besplatne alternative vlasničkim govornim "
-#~ "kodiranjima. Dalje, Speex je dobro prilagođen Internet programima i "
-#~ "obezbeđuje korisne mogućnosti koje nisu prisutne u mnogim drugim "
-#~ "kodiranjima. Konačno, Speex je deo projekta GNU i dostupan je pod Xiph.org "
-#~ "varijantom BSD licence. SpeexNarrow-15k se zasniva na CELP-u i izrađen je "
-#~ "radi sažimanja glasa na veličinu od 15 kb/s."
-
-#~ msgid "15 Kbps"
-#~ msgstr "15 Kbps"
-
-#~ msgid ""
-#~ "Speex is an Open Source/Free Software patent-free audio compression "
-#~ "format designed for speech. The Speex Project aims to lower the barrier "
-#~ "of entry for voice applications by providing a free alternative to "
-#~ "expensive proprietary speech codecs. Moreover, Speex is well-adapted to "
-#~ "Internet applications and provides useful features that are not present "
-#~ "in most other codecs. Finally, Speex is part of the GNU Project and is "
-#~ "available under the Xiph.org variant of the BSD license. SpeexNarrow-8k "
-#~ "is based on CELP and is designed to compress voice at a payload bitrate "
-#~ "of 8 kbps."
-#~ msgstr ""
-#~ "Speex je sažimanje zvuka otvorenog koda i slobodan softver, bez upotrebe "
-#~ "patenata, sačinjen za glas. Speex projekat teži manjem pragu za ulaz u "
-#~ "glasovne programe obezbeđivanjem besplatne alternative vlasničkim govornim "
-#~ "kodiranjima. Dalje, Speex je dobro prilagođen Internet programima i "
-#~ "obezbeđuje korisne mogućnosti koje nisu prisutne u mnogim drugim "
-#~ "kodiranjima. Konačno, Speex je deo projekta GNU i dostupan je pod Xiph.org "
-#~ "varijantom BSD licence. SpeexNarrow-8k se zasniva na CELP-u i izrađen je "
-#~ "radi sažimanja glasa na veličinu od 8 kbit/s."
-
-#~ msgid "Good"
-#~ msgstr "Dobro"
-
-#~ msgid "8 Kbps"
-#~ msgstr "8 Kbps"
-
-#~ msgid ""
-#~ "MS-GSM is the Microsoft version of GSM 06.10. GSM 06.10 is a standardized "
-#~ "lossy speech compression employed by most European wireless telephones. "
-#~ "It uses RPE/LTP (residual pulse excitation/long term prediction) coding "
-#~ "to compress frames of 160 13-bit samples with a frame rate of 50 Hz into "
-#~ "260 bits.  Microsoft's GSM 06.10 codec is not compatible with the "
-#~ "standard frame format, they use 65-byte-frames (2 x 32 1/2) rather than "
-#~ "rounding to 33, and they number the bits in their bytes from the other "
-#~ "end."
-#~ msgstr ""
-#~ "MS-GSM je Mikrosoftovo izdanje GSM-a 06.10. GSM 06.10 je standardizovan "
-#~ "neočuvajuće sažimanje koje koristi većina evropskih mobilnih telefona. "
-#~ "Koristi RPE/LTP (residual pulse excitation/long term prediction) kodiranje "
-#~ "za sažimanje kadrova od 160 13-bitnih uzoraka sa učestalošću kadrova od 50 "
-#~ "Hz u 260 bita.  Mikrosoftovo GSM 06.10 kodiranje nije saglasno sa "
-#~ "standardnim oblikom kadra, oni koriste 65-bajtne kadrove (2 x 32 1/2) "
-#~ "umesto zaokrugljivanja na 33, i oni označajavu bitove u njihovim bajtovima "
-#~ "sa drugog kraja."
-
-#~ msgid "13 Kbps"
-#~ msgstr "13 Kbps"
-
-#~ msgid ""
-#~ "G.711 is the international standard for encoding telephone audio on 64 "
-#~ "kbps channel. It is a pulse code modulation (PCM) scheme operating at 8 "
-#~ "kHz sample rate, with 8 bits per sample, fully meeting ITU-T "
-#~ "recommendations. This standard has two forms, A-Law and u-Law. A-Law "
-#~ "G.711 PCM encoder converts 13 bit linear PCM samples into 8 bit "
-#~ "compressed PCM (logarithmic form) samples, and the decoder does the "
-#~ "conversion vice versa."
-#~ msgstr ""
-#~ "G.711 je međunarodni standard za kodiranje telefonskog zvuka preko 64 kbit/"
-#~ "s kanala. To je modulacija pulsnog koda (PCM) šema koja radi na "
-#~ "učestalosti uzorka od 8 kHz, sa 8 bitova po uzorku, u potpunosti "
-#~ "ispunjavajući preporuke ITU-T-a. Ovaj standard ima dva oblika, A-zakon i µ-"
-#~ "zakon. A-zakon G.711 PCM kodiranje pretvara 13-bitne linearne PCM uzorke u "
-#~ "8-bitne sažete PCM (logaritamski oblik) uzorke, a dekodiranje se obavlja "
-#~ "obrnutim postupkom."
-
-#~ msgid "64 Kbps"
-#~ msgstr "64 Kbps"
-
-#~ msgid ""
-#~ "G.711 is the international standard for encoding telephone audio on 64 "
-#~ "kbps channel. It is a pulse code modulation (PCM) scheme operating at 8 "
-#~ "kHz sample rate, with 8 bits per sample, fully meeting ITU-T "
-#~ "recommendations. This standard has two forms, A-Law and u-Law. u-Law "
-#~ "G.711 PCM encoder converts 14 bit linear PCM samples into 8 bit "
-#~ "compressed PCM (logarithmic form) samples, and the decoder does the "
-#~ "conversion vice versa."
-#~ msgstr ""
-#~ "G.711 je međunarodni standard za kodiranje telefonskog zvuka preko 64 kbit/"
-#~ "s kanala. To je modulacija pulsnog koda (PCM) šema koja radi na "
-#~ "učestalosti uzorka od 8 kHz, sa 8 bitova po uzorku, u potpunosti "
-#~ "ispunjavajući preporuke ITU-T-a. Ovaj standard ima dva oblika, A-zakon i µ-"
-#~ "zakon. µ-zakon G.711 PCM kodiranje pretvara 14-bitne linearne PCM uzorke u "
-#~ "8-bitne sažete PCM (logaritamski oblik) uzorke, a dekodiranje se obavlja "
-#~ "obrnutim postupkom."
-
-#~ msgid ""
-#~ "GSM 06.10 is a standardized lossy speech compression employed by first "
-#~ "generation of digital mobile phones in Europe. It uses RPE/LTP (residual "
-#~ "pulse excitation/long term prediction) coding to compress frames of 20 "
-#~ "ms, achieving a bitrate of 13kbps."
-#~ msgstr ""
-#~ "GSM 06.10 je standardizovano neočuvajuće sažimanje koje koristi većina "
-#~ "evropskih mobilnih telefona prve generacije. Koristi RPE/LTP (residual "
-#~ "pulse excitation/long term prediction) kodiranje za sažimanje kadrova od "
-#~ "20ms, dostižući količinu podataka od 13kbps."
-
-#~ msgid "16.5 Kbps"
-#~ msgstr "16,5 Kbps"
-
-#~ msgid ""
-#~ "G.726 conforms to ITU-T G.726 recommendation that specifies speech "
-#~ "compression and decompression at rates of 16, 24, 32 and 40 Kbps based on "
-#~ "Adaptive Differential Pulse Code Modulation (ADPCM)."
-#~ msgstr ""
-#~ "G.726 prati preporuku ITU-T G.726 koja određuje sažimanje i izvlačenje "
-#~ "glasa pri veličini od 16, 24, 32 i 40 Kbit/s zasnovano na prilagodljivoj "
-#~ "diferencijskoj modulaciji pulsnog koda (ADPCM)."
-
-#~ msgid "32 Kbps"
-#~ msgstr "32 Kbps"
-
-#~ msgid ""
-#~ "G.723.1 conforms to ITU-T G.723.1 recommendation. It was designed for "
-#~ "videoconferencing / telephony over standard phone lines, and is optimized "
-#~ "for realtime encode and decode. That codec is only available in "
-#~ "GnomeMeeting when using Quicknet cards due to patents restrictions."
-#~ msgstr ""
-#~ "G.723.1 prati preporuku ITU-T G.723.1. Izrađen je za video razgovore/"
-#~ "telefoniju preko običnih telefonskih linija, i prilagođen je kodiranju i "
-#~ "dekodiranju u realnom vremenu. Kodiranje je dostupno u Gnom sastanku jedino "
-#~ "kada se koriste Quicknet kartice zbog patentnih ograničenja."
-
-#~ msgid "6.3 or 5.7 Kbps"
-#~ msgstr "6,3 ili 5,7 Kbps"
-
-#~ msgid "Work"
-#~ msgstr "Posao"
-
-#~ msgid "Family"
-#~ msgstr "Porodica"
-
-#~ msgid "Cannot contact the user directory"
-#~ msgstr "Ne može da kontaktira korisnički direktorijum"
-
-#~ msgid "Failed to contact LDAP server %s:%d"
-#~ msgstr "Nije uspeo da kontaktira LDAP server %s:%d"
-
-#~ msgid "Failed to set time limit on LDAP operations"
-#~ msgstr "Nije uspeo da podesi vremenski limit na LDAP radnje"
-
-#~ msgid "Failed to contact to LDAP server %s: %s"
-#~ msgstr "Nije uspeo da kontaktira LDAP server %s: %s"
-
-#~ msgid "Fetching online users list from %s"
-#~ msgstr "Dohvata listu korisnika na vezi od %s"
-
-#~ msgid "Could not fetch online users list"
-#~ msgstr "Nije uspeo da dohvatiti listu korisnika na vezi"
-
-#~ msgid "Connection to %s lost"
-#~ msgstr "Veza sa %s prekinuta"
-
-# bug: plural-forms
-#~ msgid "Search completed: %d user(s) found on %s"
-#~ msgstr "Potraga završena: %d korisnika nađeno na %s"
-
-#~ msgid "Groups:"
-#~ msgstr "Grupe:"
-
-#~ msgid "Invalid user name or URL"
-#~ msgstr "Pogrešno korisničko ime ili URL"
-
-#~ msgid ""
-#~ "Please provide a valid name and URL for the contact you want to add to "
-#~ "the address book."
-#~ msgstr ""
-#~ "Obezbedite ispravno ime i URL za kontakt koji želite da dodate u adresar."
-
-#~ msgid "Invalid group"
-#~ msgstr "Pogrešna grupa"
-
-#~ msgid "You have to select a group to which you want to add your contact."
-#~ msgstr "Traba da odredite grupu u koju želite da dodate vaš kontakt."
-
-#~ msgid "Invalid speed dial"
-#~ msgstr "Pogrešno brzo biranje"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Pogrešna adresa (URL)"
-
-#~ msgid ""
-#~ "Another contact with the same URL already exists in the address book."
-#~ msgstr "Drugi kontakt sa istim URL već postoji u aresaru."
-
-#~ msgid "Are you sure you want to remove %s [%s] from this group?"
-#~ msgstr "Da li ste sigurni da želite da uklonite %s [%s] iz ove grupe?"
-
-#~ msgid "Add %s to Address Book"
-#~ msgstr "Dodaj %s u adresar"
-
-#~ msgid "_Tranfer Call to Contact"
-#~ msgstr "Prebacivanje poziva za kontakt"
-
-#~ msgid "Add a New Server"
-#~ msgstr "Dodaj novi server"
-
-#~ msgid "Enter the server name:"
-#~ msgstr "Unesite ime servera:"
-
-#~ msgid ""
-#~ "Sorry but there is already a server with the same name in the address "
-#~ "book."
-#~ msgstr "Nažalost već postoji server sa istim imenom u aresaru."
-
-#~ msgid "Add a New Group"
-#~ msgstr "Dodaj novu grupu"
-
-#~ msgid "Enter the group name:"
-#~ msgstr "Unesi novo ime za grupu:"
-
-#~ msgid ""
-#~ "Sorry but there is already a group with the same name in the address book."
-#~ msgstr "Nažalost već postoji grupa sa istim imenom u aresaru."
-
-#~ msgid "Invalid server or group name"
-#~ msgstr "Pogrešno ime servera ili grupe."
-
-#~ msgid "Please enter a new name for server %s:"
-#~ msgstr "Molim unesite novo ime za server %s:"
-
-#~ msgid "Please enter a new name for group %s:"
-#~ msgstr "Molim unesite novo ime za grupu %s:"
-
-#~ msgid "New Group"
-#~ msgstr "Nova grupa"
-
-#~ msgid "_Rename"
-#~ msgstr "P_reimenuj"
-
-#~ msgid "Delete"
-#~ msgstr "Obriši"
-
-#~ msgid "New _Server"
-#~ msgstr "Novi server"
-
-#~ msgid "New _Group"
-#~ msgstr "Nova grupa"
-
-#  Translators: This is "V" as in "Video"
-#~ msgid "V"
-#~ msgstr "B"
-
-#~ msgid "IP"
-#~ msgstr "IP"
-
-#~ msgid "First name contains"
-#~ msgstr "Ime sadrži"
-
-#~ msgid "Servers"
-#~ msgstr "Serveri"
-
-#~ msgid "Groups"
-#~ msgstr "Grupe"
-
-#~ msgid "_About GnomeMeeting"
-#~ msgstr "_O Gnom Sastanku"
-
-#~ msgid "Codec Information"
-#~ msgstr "Podaci o zapisu"
-
-#~ msgid "NAT/PAT Router Support"
-#~ msgstr "NAT/PAT podrška rutera"
-
-#~ msgid "Info"
-#~ msgstr "Informacije"
-
-#~ msgid "Keep a minimum video _quality of"
-#~ msgstr "Zadrži minimalni video kvalitet od"
-
-#~ msgid ""
-#~ "The minimum transmitted video quality to keep when trying to minimize the "
-#~ "used bandwidth:  choose 100% on a LAN for the best quality, 1% being the "
-#~ "worst quality"
-#~ msgstr ""
-#~ "Minimalno preneti video kvalitet da zadrži pri pokušaju da se "
-#~ "minimalizuje korišćenje širine propusnog opsega: izaberite 100% za LAN za "
-#~ "najbolji kvalitet, 1% daje najlošiji kvalitet"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Transmit at least"
-#~ msgstr "Preneti na kraju"
-
-#~ msgid "_frames per second"
-#~ msgstr "0 okvira u sekundi"
-
-#~ msgid "Enabled Silence Detection"
-#~ msgstr "Omogući pronalaženje tišine"
-
-#~ msgid "Failed to restart the video channel"
-#~ msgstr "Ne mogu da ponovo pokrenem video kanal"
-
-#~ msgid ""
-#~ "You have changed a video device related setting during a call. That "
-#~ "requires to restart the video transmission channel, but it failed."
-#~ msgstr ""
-#~ "Izmenili ste podešavanje video uređaja u toku poziva. Ovo zahteva ponovno "
-#~ "pokretanje kanala za prenos, ali to nije uspelo."
-
-#~ msgid "Test those settings"
-#~ msgstr "Isprobajte ova podešavanja"
-
-#~ msgid "New server"
-#~ msgstr "Novi server"
-
-#~ msgid "New group"
-#~ msgstr "Nova grupa"
-
-#~ msgid "New contact"
-#~ msgstr "Novi kontakt"
-
-#~ msgid "GnomeMeeting Address Book"
-#~ msgstr "Gnom Sastanak adresar"
-
-#~ msgid "Please choose the video image"
-#~ msgstr "Izaberite video sliku"
-
-#~ msgid "Position on the screen of the general history window"
-#~ msgstr "Položaj opšteg prozora istorijata na ekranu"
-
-#~ msgid "Size of the general history window"
-#~ msgstr "Veličina prozora opšteg istorijata"
-
-#~ msgid "Calls Clearing"
-#~ msgstr "Čićenje poziva"
-
-#~ msgid "Play or not the busy tone sound"
-#~ msgstr "Da li da pusti zvuk zauzeća"
-
-#~ msgid "Play or not the incoming call sound"
-#~ msgstr "Da li da pusti zvuk na dolazeći poziv"
-
-#~ msgid "Play or not the ring tone sound"
-#~ msgstr "Da li da pusti zvuk zvona"
-
-#~ msgid "transmission"
-#~ msgstr "prenos"
-
-#~ msgid "reception"
-#~ msgstr "prijem"
-
-#~ msgid "recording"
-#~ msgstr "snimanja"
-
-#~ msgid "playing"
-#~ msgstr "puštanja"
-
-#~ msgid ""
-#~ "Select the video device to use. Using an invalid video device or \"Picture"
-#~ "\" for video transmission will transmit a test picture."
-#~ msgstr ""
-#~ "Odaberite video uređaj koji će se koristiti.  Koristeći neodgovarajući "
-#~ "video uređaj ili \"Slika\" za video prenos će preneti test sliku."
-
-#~ msgid "Couldn't compile http/ftp regex!"
-#~ msgstr "Ne mogu da prevedem HTTP/FTP regiz!"
-
-#~ msgid "Couldn't compile smiley regex!"
-#~ msgstr "Ne mogu da prevedem regularni izraz za smeška!"
-
-#~ msgid "Couldn't compile latex regex!"
-#~ msgstr "Ne mogu da prevedem regularni izraz za LaTeH!"
-
-#~ msgid "Local video window height"
-#~ msgstr "Visina prozora lokalnog videa"
-
-#~ msgid "Number of entries to store in history boxes"
-#~ msgstr "Broj unosa za skladištenje u istorijskim kutijama"
-
-#~ msgid "Received Video Quality Hint"
-#~ msgstr "Pogodak primljenog video kvaliteta"
-
-#~ msgid "Remote video window height"
-#~ msgstr "Visina prozora daljinskog videa"
-
-#~ msgid "The Video Quality to request to the remote"
-#~ msgstr "Video kvalitet zahtevan od daljinskog"
-
-#~ msgid "The height of the local video window"
-#~ msgstr "Visina prozora lokalnog videa"
-
-#~ msgid "The height of the remote video window"
-#~ msgstr "Visina prozora daljinskog videa"
-
-#~ msgid "User Input Capabilities type"
-#~ msgstr "Tip korisničkih ulaznih sposobnosti"
-
-#~ msgid "Remote user is not running GnomeMeeting"
-#~ msgstr "Daljinski korisnik nije pokrenuo Gnom Sastanak"
-
-#~ msgid "Forward call to:"
-#~ msgstr "Prosledi poziv do:"
-
-#~ msgid "View the details of your account"
-#~ msgstr "Pogledajte detalje vašeg naloga"
-
-#~ msgid "Maximum bandwidth available for the endpoint"
-#~ msgstr "Najveća propusnost u krajnjoj tački"
-
-#~ msgid ""
-#~ "The codecs will be chosen during the negotiation according to the maximum "
-#~ "bandwidth available to the endpoint."
-#~ msgstr ""
-#~ "Kodiranja će biti izabrana prilikom pregovaranja prema najvećoj propusnoj "
-#~ "moći dostupnoj na krajnjoj tački."
-
-#~ msgid "Maximum Bandwidth"
-#~ msgstr "Najveća propusnost"
-
-#~ msgid "Maximum available bandwidth:"
-#~ msgstr "Najveća dostupna propusnost:"
-
-#~ msgid "kbps"
-#~ msgstr "kbps"
-
-#~ msgid "User Input Capabilities"
-#~ msgstr "Korisničke ulazne sposobnosti"
-
-#~ msgid "Call Control"
-#~ msgstr "Upravljanje pozivom"
-
-#~ msgid "Internationalisation Maintainer:"
-#~ msgstr "Održavaoc internacijalizacije:"
-
-#~ msgid ""
-#~ "GnomeMeeting is a full-featured H.323\n"
-#~ "video conferencing application."
-#~ msgstr ""
-#~ "Gnom Sastanak je pun dodataka H.323\n"
-#~ "video konferencije program."
-
-#~ msgid "Choose a file to play"
-#~ msgstr "Koju datoteku da pustim"
-
-#~ msgid "Open Link"
-#~ msgstr "Otvori vezu"
-
-#~ msgid "Copy Link Address"
-#~ msgstr "Umnoži adresu veze"
-
-#~ msgid ""
-#~ "If enabled, GnomeMeeting will play a sound when receiving an incoming "
-#~ "call (the sound to play is chosen in the Gnome Control Center)."
-#~ msgstr ""
-#~ "Ako je uključeno, Gnom Sastanak će svirati zvuk kada prima dolazeći poziv "
-#~ "(zvuk za sviranje je izabran u Gnom kontrolnom centru)."
-
-#~ msgid ""
-#~ "If enabled, GnomeMeeting will start hidden. The docklet must be enabled."
-#~ msgstr ""
-#~ "Ako je uključeno, Gnom Sastanak će startovati sakriven.  The docklet mora "
-#~ "biti uključen."
-
-#~ msgid "Play a sound on incoming calls"
-#~ msgstr "Sviraj zvuk na dolazeći poziv"
-
-#~ msgid "Incoming Call"
-#~ msgstr "Dolazeći poziv"
-
-#~ msgid "gnomemeeting"
-#~ msgstr "gnomemeeting"
-
-#~ msgid "Started transmission of %s"
-#~ msgstr "Započet prenos %s"
-
-#~ msgid "Stopped transmission of %s"
-#~ msgstr "Završen prenos %s"
-
-#~ msgid "Started reception of %s"
-#~ msgstr "Započet prijem %s"
-
-#~ msgid "Stopped reception of %s"
-#~ msgstr "Završen prijem %s"
-
-#~ msgid "Select the audio output device device to use."
-#~ msgstr "Odaberite uređaj koji će se koristiti za izlaz zvuka."
-
-#~ msgid "Audio manager"
-#~ msgstr "Upravnik zvukom"
-
-#~ msgid "Audio recorder"
-#~ msgstr "Snimanje zvuka"
-
-#~ msgid "TTL for the registration"
-#~ msgstr "TTL za registraciju"
-
-#~ msgid "The gatekeeper TTL for the registration, expressed in seconds."
-#~ msgstr "TTL zaštitnika za registraciju, izražen u sekundama."
-
-#~ msgid "Video manager"
-#~ msgstr "Upravnik videom"
-
-#  Player is always a correct sound device, thanks to
-#  gnomemeeting_add_string_option_menu
-#~ msgid "Set Audio player device to %s"
-#~ msgstr "Podesite uređaj za reprodukciju zvuka na %s"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "Audio Manager"
-#~ msgstr "Upravnik zvukom"
-
-#~ msgid "Audio manager:"
-#~ msgstr "Upravnik zvukom:"
-
-#~ msgid "Recording device:"
-#~ msgstr "Uređaj za snimanje:"
-
-#~ msgid "Video Manager"
-#~ msgstr "Upravnik videom"
-
-#~ msgid "Video manager:"
-#~ msgstr "Upravnik videom:"
-
-#~ msgid "Video device:"
-#~ msgstr "Video uređaj:"
-
-#~ msgid "Video format:"
-#~ msgstr "Video format:"
-
-#~ msgid "Video image:"
-#~ msgstr "Video slika:"
-
-#~ msgid "User Input Capabilities _type:"
-#~ msgstr "Tip korisničkih ulaznih sposobnosti:"
-
-# bug: label?
-#~ msgid "The lable."
-#~ msgstr "Oznaka"
-
-#~ msgid "Other"
-#~ msgstr "Drugo"
-
-#~ msgid "Enabled"
-#~ msgstr "Omogućeno"
-
-#~ msgid "Disabled"
-#~ msgstr "Isključeno"
-
-#~ msgid ""
-#~ "Please enter your first name and surname, they will be used when "
-#~ "connecting to other audio/video conferencing software.\n"
-#~ "\n"
-#~ "Your e-mail address is used to provide you with a callto address that "
-#~ "your friends can use to call you without knowing your IP address.\n"
-#~ "\n"
-#~ "No information is made public unless you allow it to be published on the "
-#~ "directory of online GnomeMeeting users."
-#~ msgstr ""
-#~ "Unesite vaše ime i nadimak, oni će biti korišteni pri vezi na ostale "
-#~ "programe za zvučne i video sastanke.\n"
-#~ "\n"
-#~ "Vaša adresa e-pošte je korištena da vas obezbedi sa \"poziv do\" adresom "
-#~ "koju vaši prijatelji mogu koristiti da vas pozovu bez potrebe da znaju "
-#~ "vašu IP adresu\n"
-#~ "\n"
-#~ "Nijedan podatak nije objavljen dok vi to ne dozvolite u direktorijumu "
-#~ "korisnika na vezi Gnom Sastanaka."
-
-#~ msgid "_Surname:"
-#~ msgstr "Nadimak:"
-
-#  The callto url
-#~ msgid "Callto URL"
-#~ msgstr "Poziv do URL"
-
-#~ msgid "Directory of Online GnomeMeeting Users"
-#~ msgstr "Direktorijum povezanih Gnom Sastanak korisnika"
-
-#~ msgid "Publish my information on the directory of online GnomeMeeting users"
-#~ msgstr ""
-#~ "Objavi moje podatke u direktorijumu korisnika na vezi Gnom Sastanaka"
-
-#~ msgid ""
-#~ "Please select your network connection type. This is used to set default "
-#~ "video settings for your bandwidth. It is possible to change these "
-#~ "defaults later."
-#~ msgstr ""
-#~ "Selektujte tip vaše mrežne veze.  Ovo se koristi za podešavanje podešenog "
-#~ "video podešavanja za vašu širinu propusnog opsega.  Moguće je promenuti "
-#~ "ove podešene vrednosti kasnije."
-
-#  Connection type
-#~ msgid "Connection Type"
-#~ msgstr "Vrsta povezivanja"
-
-#~ msgid "DSL/Cable"
-#~ msgstr "DSL/Kabl"
-
-#~ msgid ""
-#~ "Please choose the audio devices to use during the GnomeMeeting session. "
-#~ "You can also choose to use a Quicknet device instead of the soundcard, "
-#~ "but the \"Test Audio\" button will only work for soundcards. Notice that "
-#~ "some webcams models have an internal microphone that can be used with "
-#~ "GnomeMeeting."
-#~ msgstr ""
-#~ "Izaberite uređaj za reprodukciju zvuka koji će se koristiti za vreme "
-#~ "trajanja Gnom Sastanaka. Možete takođe da izaberete Quicknet uređaj umesto "
-#~ "zvučne kartice, ali \"Test zvuka\" dugme će raditi samo sa zvučnom "
-#~ "karticom.  Neki modeli mrežnih kamera imaju ugrađen mikrofon koji može "
-#~ "biti korišten sa Gnom Sastankom."
-
-#~ msgid "Audio recorder:"
-#~ msgstr "Snimanje zvuka:"
-
-#~ msgid "Test Audio"
-#~ msgstr "Zvučni test"
-
-#~ msgid ""
-#~ "Please choose the video device to use during the GnomeMeeting session. "
-#~ "Click on the \"Test Video\" button to check if your setup is correct and "
-#~ "if your driver is supported by GnomeMeeting. You can only test the "
-#~ "correctness of your driver if the selected device is not already in use."
-#~ msgstr ""
-#~ "Izaberite uređaj za reprodukciju videa koji će se koristiti za vreme "
-#~ "trajanja Gnom Sastanaka.   Kliknite na \"Video test\" dugme da proverite "
-#~ "da li je podešavanje odgovarajuće i da li je vaš drejver podržan od Gnom "
-#~ "Sastanka.  Možete testirati samo odgovaranje vašeg drajvera ako odabrani "
-#~ "uređaj nije u upotrebi."
-
-#~ msgid ""
-#~ "Enter the video device to use. Using an invalid video device for video "
-#~ "transmission will transmit a test picture."
-#~ msgstr ""
-#~ "Odredite video uređaj koji će se koristiti.  Koristeći neodgovarajući "
-#~ "video uređaj za video prenos će preneti test sliku."
-
-#~ msgid "Test Video"
-#~ msgstr "Video test"
-
-#~ msgid "PC-To-Phone Setup - page %d/%d"
-#~ msgstr "PC-do-telefon podešavanje - strana %d/%d"
-
-#~ msgid "Register to the MicroTelco service"
-#~ msgstr "Registrovan MicroTelco servis"
-
-#~ msgid "Tests OK!"
-#~ msgstr "Test je u redu!"
-
-#~ msgid "Call from %s [%s] using %s"
-#~ msgstr "Poziv od %s [%s] koristeći %s"
-
-#~ msgid "Auto Rejected"
-#~ msgstr "Automatski odbačen"
-
-#~ msgid "Call Forwarded"
-#~ msgstr "Poziv preusmeren"
-
-#~ msgid "Fast start disabled"
-#~ msgstr "Brzi start isključen"
-
-#~ msgid "Fast start enabled"
-#~ msgstr "Brzi start uključen"
-
-#~ msgid "H.245 Tunnelling disabled"
-#~ msgstr "H.245 tunel isključen"
-
-#~ msgid "H.245 Tunnelling enabled"
-#~ msgstr "H.245 tunel uključen"
-
-#~ msgid "Enabling H.245 Tunnelling"
-#~ msgstr "Omogućavanje H.245 tunela"
-
-#~ msgid "Disabling H.245 Tunnelling"
-#~ msgstr "Isključivanje H.245 tunel"
-
-#~ msgid "Enabling Fast Start"
-#~ msgstr "Omogućavanje 'Brzi start'"
-
-#~ msgid "Disabling Fast Start"
-#~ msgstr "Isključivanje 'Brzi start'"
-
-#~ msgid ""
-#~ "Call from %s\n"
-#~ "using %s"
-#~ msgstr ""
-#~ "Poziv od %s\n"
-#~ "koristeći %s"
-
-#~ msgid "Given calls"
-#~ msgstr "Prosleđeni pozivi"
-
-#~ msgid "Audio player mixer"
-#~ msgstr "Mikser reprodukcije zvuka"
-
-#~ msgid "Audio recorder mixer"
-#~ msgstr "Mikser snimanja zvuka"
-
-#~ msgid "Do not disturb"
-#~ msgstr "Ne uznemiravaj"
-
-#~ msgid "If enabled, incoming calls will be automatically answered."
-#~ msgstr "Ako je uključeno, na dolazeće pozive biće automatski odgovoreno."
-
-#~ msgid "If enabled, incoming calls will be automatically refused."
-#~ msgstr "Ako je uključeno, dolazeći pozivi će biti automatski odbijeni."
-
-#~ msgid "Select the mixer to use to change the volume of the audio player."
-#~ msgstr ""
-#~ "Selektujte mikser koji će se koristiti da se promeni snaga od "
-#~ "reprodukovanog zvuka."
-
-#~ msgid "Select the mixer to use to change the volume of the audio recorder."
-#~ msgstr ""
-#~ "Selektujte mikser koji će se koristiti da se promeni snaga od snimljenog "
-#~ "zvuka."
-
-#~ msgid "Started New Logical Channel..."
-#~ msgstr "Pokretanje novog logičnog kanala..."
-
-#~ msgid "Enabled silence detection for %s"
-#~ msgstr "Uključena detekcija tišine za %s"
-
-#~ msgid "Disabled silence detection for %s"
-#~ msgstr "Isključena detekcija tišine za %s"
-
-#~ msgid "Receiving %s"
-#~ msgstr "Primanje %s"
-
-#~ msgid "Requesting remote to send video quality: %d%%"
-#~ msgstr "Zahtevanje daljinskog da pošalje video kvalitet: %d%%"
-
-#~ msgid "Request ok"
-#~ msgstr "Zahtev je u redu"
-
-#~ msgid "Audio player mixer:"
-#~ msgstr "Mikser reprodukcije zvuka:"
-
-#~ msgid "Audio recorder mixer:"
-#~ msgstr "Mikser snimanja zvuka:"
-
-#~ msgid "Set Audio recorder device to %s"
-#~ msgstr "Podesite uređaj za snimanje zvuka na %s"
-
-#~ msgid "Contacting %s..."
-#~ msgstr "Kontaktira %s..."
-
-#~ msgid ""
-#~ "GnomeMeeting didn't find any usable sound devices. You need to install "
-#~ "and setup a soundcard or a Quicknet card in order to be able to use "
-#~ "GnomeMeeting. Please check your driver settings and permissions."
-#~ msgstr ""
-#~ "Gnom Sastanak nije našao nijedan koristan zvučni uređaj.  Treba da "
-#~ "instalirate i podesite zvučnu karticu ili Quicknet karticu da bi ste "
-#~ "mogli koristiti Gnom Sastanak.  Proverite vaše podešavanje drajvera i "
-#~ "ovlaštenja."
-
-#~ msgid "Local Video Image"
-#~ msgstr "Lokalni video snimak"
-
-#~ msgid "Remote Video Image"
-#~ msgstr "Daljinski video snimak"
-
-#~ msgid "Both Video Images"
-#~ msgstr "Oba video snimka"
-
-#~ msgid "Both (Local and Remote Video in New Windows)"
-#~ msgstr "Oba (Lokalni i daljinski video u novom prozoru)"
-
-#~ msgid "Do not disturb (reject incoming calls)"
-#~ msgstr "Ne uznemiravaj (odbacivanje dolazećih poziva)"
-
-#~ msgid "Okay"
-#~ msgstr "Uredu"
-
-#~ msgid "Good Quality"
-#~ msgstr "Dobar kvalitet"
-
-#~ msgid "Excellent Quality"
-#~ msgstr "Odličan kvalitet"
-
-#~ msgid "Behavior"
-#~ msgstr "Ponašanje"
-
-#~ msgid "Do _not disturb"
-#~ msgstr "Ne uznemiravaj"
-
-#~ msgid "Display a po_pup window when receiving a call"
-#~ msgstr "Prikazuj iskačući prozor pri primanju poziva"
-
-#~ msgid "Failed to open the audio device"
-#~ msgstr "Ne može da otvori zvučni uređaj"
-
-#~ msgid ""
-#~ "GnomeMeeting is now playing what it is recording with a 5 seconds delay. "
-#~ "If you don't hear yourself with the delay, you will have to fix your "
-#~ "audio setup and probably install a full-duplex driver before calling "
-#~ "other GnomeMeeting users.\n"
-#~ "\n"
-#~ "Recording and playing... Please talk."
-#~ msgstr ""
-#~ "Gnom Sastanak sada reprodukuje ono što je snimano za 5 sekundi "
-#~ "zakašnjenja.  Ako nemožete da čujete sebe sa zakašnjenjem, treba da popravite "
-#~ "vaša podešavanja zvuka i verovatno instalirate full-duplex  drajver pre "
-#~ "poziva ostalih Gnom Sastanak korisnika.\n"
-#~ "\n"
-#~ "Snimanje i reprodukcija... Govorite."
-
-#~ msgid "Video Device Opened"
-#~ msgstr "Video uređaj otvoren"
-
-#~ msgid "Video Device Closed"
-#~ msgstr "Video uređaj zatvoren"
-
-#~ msgid "Color Format for the video palette"
-#~ msgstr "Format boje za video palete"
-
-#~ msgid "Parse error"
-#~ msgstr "Greška pri obradi"
-
-#~ msgid ""
-#~ "There was an error while processing the registering to the user "
-#~ "directory: %d %s."
-#~ msgstr ""
-#~ "Nastala je greška prilikom obrade registrovanja na korisnički "
-#~ "direktorijum: %d %s."
-
-#~ msgid "Failed to contact the user directory %s:%d."
-#~ msgstr "Ne može da kontaktira korisnički direktorijum %s:%d."
-
-#~ msgid "Successfully registered to %s."
-#~ msgstr "Uspešno registrovan na %s."
-
-#~ msgid "Successfully unregistered from %s."
-#~ msgstr "Uspešno odregistrovan sa %s."
-
-#~ msgid "Enable bilinear _filtering on displayed video"
-#~ msgstr "Uključi bilinearni filter na prikazani video"
+#: ../src/gui/preferences.cpp:1391
+msgid "Video"
+msgstr "Video"
 
-#~ msgid "Browse..."
-#~ msgstr "Pretraži..."
+#: ../src/gui/statusicon.cpp:306
+#, c-format
+msgid "You have %d message"
+msgid_plural "You have %d messages"
+msgstr[0] "Imate %d poruku"
+msgstr[1] "Imate %d poruke"
+msgstr[2] "Imate %d poruka"
+
+#: ../src/gui/statusmenu.cpp:87
+msgid "Online"
+msgstr "Na mreži"
+
+#: ../src/gui/statusmenu.cpp:88
+msgid "Away"
+msgstr "Odsutan"
+
+#: ../src/gui/statusmenu.cpp:89
+msgid "Do Not Disturb"
+msgstr "Ne uznemiravaj"
+
+#: ../src/gui/statusmenu.cpp:387
+msgid "Custom message..."
+msgstr "Proizvoljna poruka..."
+
+#: ../src/gui/statusmenu.cpp:430
+msgid "Clear"
+msgstr "Očisti"
+
+#. Build the dialog
+#: ../src/gui/statusmenu.cpp:521 ../src/gui/statusmenu.cpp:671
+msgid "Custom Message"
+msgstr "Proizvoljna poruka"
+
+#: ../src/gui/statusmenu.cpp:537
+msgid "Delete custom messages:"
+msgstr "Izbriši proizvoljne poruke:"
+
+#: ../src/gui/statusmenu.cpp:692
+msgid "Define a custom message:"
+msgstr "Definiši proizvoljnu poruku:"
diff -Nru ekiga-3.2.5/po/sr.po ekiga-3.2.6~ppa~karmic1/po/sr.po
--- ekiga-3.2.5/po/sr.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/sr.po	2009-09-22 15:27:35.000000000 +0100
@@ -5,14 +5,17 @@
 #
 # Maintainer: Дејан Матијевић <dejan@ns.sympatico.ca>
 # Reviewed on 2005-08-13 by: Игор Несторовић <igor@prevod.org>
+# Translated on 2009-09-12 by: Бранко Кокановић <branko.kokanovic@gmail.com>
 #
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
 "Project-Id-Version: ekiga\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 03:27+0000\n"
-"PO-Revision-Date: 2007-03-06 00:18+0100\n"
-"Last-Translator: Горан Ракић <grakic@devbase.net>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=ekiga&component=general\n"
+"POT-Creation-Date: 2009-09-10 20:34+0000\n"
+"PO-Revision-Date: 2009-09-12 17:05+0200\n"
+"Last-Translator: Бранко Кокановић <branko.kokanovic@gmail.com>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,34 +42,36 @@
 "претплатничка линија, 3: локална мрежа, 4: произвољно"
 
 #: ../ekiga.schemas.in.in.h:2
-msgid "Address of public IP detector"
-msgstr "Адреса јавног препознавача ИП-а"
+msgid ""
+"Allow Ekiga to fall back to software scaling the picture-in-picture if "
+"hardware support is not available. If this is set to false, Ekiga will not "
+"try to open the PIP if hardware support is not available."
+msgstr ""
+"Дозвољава Екиги да користи програмско повећавање и смањивање слике-у-слици "
+"уколико не постоји хардверска подршка. Уколико поставите на „false“, Екига "
+"неће користити програмско повећање чак и кад не постоји хардверска подршка."
 
 #: ../ekiga.schemas.in.in.h:3
+msgid "Allow picture-in-picture software scaling"
+msgstr "Дозволи програмско увећање слике-у-слици"
+
+#: ../ekiga.schemas.in.in.h:4
 msgid "Alternative audio output device"
 msgstr "Резервни излазни звучни уређај"
 
-#: ../ekiga.schemas.in.in.h:4
+#: ../ekiga.schemas.in.in.h:5
 msgid "Always forward calls to the given host"
 msgstr "Увек проследи позиве до датог рачунара"
 
-#: ../ekiga.schemas.in.in.h:5
+#: ../ekiga.schemas.in.in.h:6
 msgid "Audio input device"
 msgstr "Улазни звучни уређаји"
 
-#: ../ekiga.schemas.in.in.h:6
+#: ../ekiga.schemas.in.in.h:7
 msgid "Audio output device"
 msgstr "Излазни звучни уређаји"
 
-#: ../ekiga.schemas.in.in.h:7
-msgid "Audio plugin"
-msgstr "Додатак за звук"
-
-#: ../ekiga.schemas.in.in.h:8
-msgid "Automatic echo cancellation"
-msgstr "Само-поништавање еха"
-
-#: ../ekiga.schemas.in.in.h:9 ../src/gui/preferences.cpp:740
+#: ../ekiga.schemas.in.in.h:8 ../src/gui/preferences.cpp:516
 msgid ""
 "Automatically reject or forward incoming calls if no answer is given after "
 "the specified amount of time (in seconds)"
@@ -74,33 +79,15 @@
 "Сам одбиј или проследи долазне позиве уколико није одговорено одређено време "
 "(у секундама)."
 
-#: ../ekiga.schemas.in.in.h:10
-msgid ""
-"Automatically switch to fullscreen for images displayed in the main GUI at "
-"the beginning of the call"
-msgstr ""
-"Сам пребаци у цео екран за слике приказане у главном сучељу на почетку "
-"разговора."
+#: ../ekiga.schemas.in.in.h:9
+msgid "Calls history"
+msgstr "Историјат позива"
 
-#: ../ekiga.schemas.in.in.h:11
-msgid "Change the control panel section"
+#: ../ekiga.schemas.in.in.h:10
+msgid "Change the main window panel section"
 msgstr "Промените одељак управљачког панела"
 
-#: ../ekiga.schemas.in.in.h:12
-msgid "Change the view mode of the UI"
-msgstr "Промените режим приказа главног сучеља"
-
-#: ../ekiga.schemas.in.in.h:13
-msgid "Change the view mode of the UI (softphone, videophone, full view)"
-msgstr ""
-"Промените режим приказа главног сучеља (софтверски, видео телефон, пун "
-"приказ)"
-
-#: ../ekiga.schemas.in.in.h:14
-msgid "Clear inactive calls"
-msgstr "Очисти неактивне позиве"
-
-#: ../ekiga.schemas.in.in.h:15
+#: ../ekiga.schemas.in.in.h:11
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -112,17 +99,33 @@
 "Netmeeting-а и коришћење и брзог покретања и Н.245 тунелa може да сруши неке "
 "верзије Netmeeting-a"
 
-#: ../ekiga.schemas.in.in.h:16
-msgid "Country code"
-msgstr "Код државе"
+#: ../ekiga.schemas.in.in.h:12
+msgid "Contact long status"
+msgstr "Опширно стање контакта"
+
+#: ../ekiga.schemas.in.in.h:13
+msgid "Contact short status"
+msgstr "Сажето стање контакта"
 
-#: ../ekiga.schemas.in.in.h:17
+#: ../ekiga.schemas.in.in.h:14
 msgid "DTMF sending"
 msgstr "Слање ДТМФ-а"
 
-#: ../ekiga.schemas.in.in.h:18
-msgid "Display a popup window when receiving a call"
-msgstr "Нека искочи прозор при примању позива"
+#: ../ekiga.schemas.in.in.h:15
+msgid "Disable STUN network detection"
+msgstr "Онемогући STUN детекцију мреже"
+
+#: ../ekiga.schemas.in.in.h:16 ../src/gui/preferences.cpp:492
+msgid "Disable the automatic network setup resulting from the STUN test"
+msgstr "Онемогући аутоматско подешавање мреже добијено STUN тестом"
+
+#: ../ekiga.schemas.in.in.h:17
+msgid "Disable video hardware acceleration"
+msgstr "Онемогући хардверско убрзавање за видео"
+
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3596
+msgid "Display images from your camera device"
+msgstr "Прикажи слике са камере"
 
 #: ../ekiga.schemas.in.in.h:19
 msgid "Enable 'Fast Start'"
@@ -133,46 +136,18 @@
 msgstr "Омогући H.245 тунел"
 
 #: ../ekiga.schemas.in.in.h:21
-msgid "Enable IP checking"
-msgstr "Омогући проверу мрежних адреса"
-
-#: ../ekiga.schemas.in.in.h:22
-msgid "Enable bilinear filtering on displayed video"
-msgstr "Укључи билинеарни пропусник на приказаном видеу"
-
-#: ../ekiga.schemas.in.in.h:23
 msgid "Enable early H.245"
 msgstr "Укључи рани H.245"
 
-#: ../ekiga.schemas.in.in.h:24
+#: ../ekiga.schemas.in.in.h:22
 msgid "Enable echo cancelation"
 msgstr "Укључи поништавање сопственог одјека"
 
-#: ../ekiga.schemas.in.in.h:25
-msgid ""
-"Enable or disable bilinear interpolation when rendering video images (this "
-"has no effect in fullscreen mode)"
-msgstr ""
-"Укључи или искључи билинеарну интерполацију при исцртавању видео слика (ово "
-"не узима маха у режиму преко целог екрана)"
-
-#: ../ekiga.schemas.in.in.h:26
+#: ../ekiga.schemas.in.in.h:23
 msgid "Enable silence detection"
 msgstr "Омогући проналажење тишине"
 
-#: ../ekiga.schemas.in.in.h:27
-msgid "Enable video support"
-msgstr "Омогући видео подршку"
-
-#: ../ekiga.schemas.in.in.h:28
-msgid ""
-"Enter a valid URL to connect to a web application that outputs the public IP "
-"of your host"
-msgstr ""
-"Унесите исправну адресу за повезивање са веб програмом који исписује јавни "
-"ИП вашег рачунара"
-
-#: ../ekiga.schemas.in.in.h:29
+#: ../ekiga.schemas.in.in.h:24
 msgid ""
 "Enter the number of seconds after which Ekiga should try refreshing the NAT "
 "binding when STUN is being used"
@@ -180,42 +155,31 @@
 "Унесите број секунди након којих би програм требао да освежи везивање на "
 "адресног мрежног преводиоца када се користи STUN"
 
-#: ../ekiga.schemas.in.in.h:30
-msgid ""
-"Enter the public IP of your NAT/PAT router if you want to use IP translation"
-msgstr ""
-"Унесите јавну адресу вашег адресног преводиоца усмеривача ако желите да "
-"користите адресно превођење"
-
-#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:635
-msgid "Enter your first name"
-msgstr "Унесите име"
-
-#: ../ekiga.schemas.in.in.h:32
-msgid "Enter your last name"
-msgstr "Унесите презиме"
-
-#: ../ekiga.schemas.in.in.h:33
-msgid "First name"
-msgstr "Име"
+#: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
+msgid "Enter your full name"
+msgstr "Унесите пуно име"
 
-#: ../ekiga.schemas.in.in.h:34
+#: ../ekiga.schemas.in.in.h:26
 msgid "Forward calls to host"
 msgstr "Преусмери позив на рачунар"
 
-#: ../ekiga.schemas.in.in.h:35
+#: ../ekiga.schemas.in.in.h:27
 msgid "Forward calls to the given host if busy"
 msgstr "Преусмери позив на дати рачунар ако је заузето"
 
-#: ../ekiga.schemas.in.in.h:36
+#: ../ekiga.schemas.in.in.h:28
 msgid "Forward calls to the given host if no answer"
 msgstr "Преусмери позив на дати рачунар ако се не одговара на позив"
 
-#: ../ekiga.schemas.in.in.h:37
-msgid "Gateway/proxy host"
-msgstr "Рачунар излаза/посредника"
+#: ../ekiga.schemas.in.in.h:29 ../src/gui/preferences.cpp:1018
+msgid "Frame Rate"
+msgstr "Учестаност кадрова"
 
-#: ../ekiga.schemas.in.in.h:38 ../src/gui/preferences.cpp:685
+#: ../ekiga.schemas.in.in.h:30
+msgid "Full name"
+msgstr "Пуно име"
+
+#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:477
 msgid ""
 "If enabled, Ekiga will start hidden provided that the notification area is "
 "present in the GNOME panel"
@@ -223,12 +187,7 @@
 "Ако је укључено, програм ће се покретати сакривен ако је обавештајна зона "
 "присутна на Гномовом панелу"
 
-#: ../ekiga.schemas.in.in.h:39
-msgid ""
-"If enabled, a popup window will be displayed when receiving an incoming call"
-msgstr "Ако је укључено, искочиће прозор при пријему долазног позива"
-
-#: ../ekiga.schemas.in.in.h:40
+#: ../ekiga.schemas.in.in.h:32
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below"
@@ -236,7 +195,7 @@
 "Ако је укључено, сви долазни позиви ће бити преусмерени на рачунар који је "
 "назначен у наредном пољу"
 
-#: ../ekiga.schemas.in.in.h:41
+#: ../ekiga.schemas.in.in.h:33
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you already are in a call or if you are in "
@@ -245,7 +204,7 @@
 "Ако је укључено, сви долазни позиви ће бити преусмерени на рачунар који је "
 "назначен у наредном пољу ако имате позив или ако сте у режиму Не узнемиравај"
 
-#: ../ekiga.schemas.in.in.h:42
+#: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you do not answer the call"
@@ -253,219 +212,161 @@
 "Ако је укључено, сви долазни позиви ће бити преусмерени на рачунар који је "
 "назначен у наредном пољу ако не одговорите на позив"
 
-# note(slobo): у TV техници се каже пријем слике (за video)
-#: ../ekiga.schemas.in.in.h:43
-msgid "If enabled, allows video during calls"
-msgstr "Ако је укључено, дозвољава слику за време позива"
-
-#: ../ekiga.schemas.in.in.h:44 ../src/gui/preferences.cpp:738
-msgid ""
-"If enabled, calls for which no audio and video has been received in the last "
-"30 seconds are automatically cleared"
+#: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
+msgid "If enabled, offline contacts will be shown in the roster"
 msgstr ""
-"Ако је укључено, позиви код којих у последњих 30 секунди није примљен звук "
-"или слика се чисте сами"
+"Ако је укључено, контакти који нису на мрежи ће бити приказани у листи "
+"контаката"
 
-#: ../ekiga.schemas.in.in.h:45
+#: ../ekiga.schemas.in.in.h:36
 msgid "If enabled, use echo cancelation"
 msgstr "Ако је укључено, користи поништавање одјека"
 
-#: ../ekiga.schemas.in.in.h:46
+#: ../ekiga.schemas.in.in.h:37
 msgid "If enabled, use silence detection with the codecs supporting it"
 msgstr ""
 "Ако је укључено, користи откривање тишине са кодецима који то подржавају"
 
-#: ../ekiga.schemas.in.in.h:47
-msgid "Incoming call mode"
-msgstr "Режим долазних позива"
-
-#: ../ekiga.schemas.in.in.h:48
+#: ../ekiga.schemas.in.in.h:38
 msgid "Kind of network selected in the druid"
 msgstr "Врста мреже одабрана у чаробњаку"
 
-#: ../ekiga.schemas.in.in.h:49
-msgid "Last name"
-msgstr "Презиме"
+#: ../ekiga.schemas.in.in.h:39
+msgid "LDAP servers"
+msgstr "ЛДАП сервери"
+
+#: ../ekiga.schemas.in.in.h:40
+msgid "List of configured LDAP servers"
+msgstr "Списак подешених ЛДАП сервера"
+
+#: ../ekiga.schemas.in.in.h:41
+msgid "List of folded groups in the roster"
+msgstr "Списак преклопљених група у листи контаката"
 
-#: ../ekiga.schemas.in.in.h:50
+#: ../ekiga.schemas.in.in.h:42
 msgid "Listen port"
 msgstr "Ослушаван порт"
 
-#: ../ekiga.schemas.in.in.h:51
+#: ../ekiga.schemas.in.in.h:43
 msgid "Local video window size"
 msgstr "Величина прозора локалне слике"
 
-# bug(slobo): не може овако остати
-#: ../ekiga.schemas.in.in.h:52
-msgid "Maximum jitter buffer"
-msgstr "Највећи jitter бафер"
+#: ../ekiga.schemas.in.in.h:44
+msgid "Maximum RX video bitrate"
+msgstr "Максимални видео проток за примање"
 
-#: ../ekiga.schemas.in.in.h:53
-msgid "Maximum video bandwidth"
-msgstr "Највећа ширина пропусног опсега за слику"
+#: ../ekiga.schemas.in.in.h:45
+msgid "Maximum TX video bitrate"
+msgstr "Максимални видео проток за слање"
 
 # bug(slobo): не може овако остати
-#: ../ekiga.schemas.in.in.h:54
-msgid "Minimum jitter buffer"
-msgstr "Најмањи jitter бафер"
-
-#: ../ekiga.schemas.in.in.h:55
-msgid "Minimum transmitted video quality"
-msgstr "Најмањи задани квалитет за пренесену слику"
-
-#: ../ekiga.schemas.in.in.h:56
-msgid "Missed calls history"
-msgstr "Историјат пропуштених позива"
+#: ../ekiga.schemas.in.in.h:46
+msgid "Maximum jitter buffer"
+msgstr "Највећи jitter бафер"
 
-#: ../ekiga.schemas.in.in.h:57
+#: ../ekiga.schemas.in.in.h:47
 msgid "NAT Binding Timeout"
 msgstr "Временски рок везивања адресног преводиоца"
 
 # bug(slobo): msgstr "Нема рока за одговор" ...сумњам да је ово
-#: ../ekiga.schemas.in.in.h:58
+#: ../ekiga.schemas.in.in.h:48
 msgid "No answer timeout"
 msgstr "Временски рок кад се нико не јавља"
 
-#: ../ekiga.schemas.in.in.h:59
-msgid "Number of frames for G.711"
-msgstr "Број слика за G.711"
-
-#: ../ekiga.schemas.in.in.h:60
-msgid "Number of frames for GSM"
-msgstr "Број слика за GSM"
-
-#: ../ekiga.schemas.in.in.h:61
-msgid "Number of frames transmitted in each packet for the G.711 codec"
-msgstr "Број слика пренесених у сваком пакету за G.711 кодек"
-
-#: ../ekiga.schemas.in.in.h:62
-msgid "Number of frames transmitted in each packet for the GSM codec"
-msgstr "Број слика пренесених у сваком пакету за GSM кодек"
-
-#: ../ekiga.schemas.in.in.h:63
+#: ../ekiga.schemas.in.in.h:49
 msgid "Outbound Proxy"
 msgstr "Спољно-везујући посредник"
 
-#: ../ekiga.schemas.in.in.h:64
-msgid "Output device type"
-msgstr "Врста излазног уређаја"
-
-#: ../ekiga.schemas.in.in.h:65 ../src/gui/preferences.cpp:693
+#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video above other windows during calls"
 msgstr ""
 "Постави прозоре који приказују слику изнад осталих прозора у току разговора"
 
-#: ../ekiga.schemas.in.in.h:66
-msgid "Placed calls history"
-msgstr "Историјат начињених позива"
-
-#: ../ekiga.schemas.in.in.h:67 ../src/gui/preferences.cpp:1898
+#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
 msgid "Play busy tone"
 msgstr "Пусти звук заузећа"
 
-#: ../ekiga.schemas.in.in.h:68 ../src/gui/preferences.cpp:1889
+#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:361
 msgid "Play ring tone"
 msgstr "Пусти звук за звоно"
 
-#: ../ekiga.schemas.in.in.h:69 ../src/gui/preferences.cpp:1880
+#: ../ekiga.schemas.in.in.h:53 ../src/gui/preferences.cpp:351
 msgid "Play sound on incoming calls"
 msgstr "Пусти звук на долазне позиве"
 
-#: ../ekiga.schemas.in.in.h:70
+#: ../ekiga.schemas.in.in.h:54
 msgid "Play sound on new message"
 msgstr "Пусти звук кад пристигне нова порука"
 
-#: ../ekiga.schemas.in.in.h:71
+#: ../ekiga.schemas.in.in.h:55
 msgid "Play sound on new voice mail"
 msgstr "Пусти звук када пристигне нова говорна пошта"
 
-#: ../ekiga.schemas.in.in.h:72
+#: ../ekiga.schemas.in.in.h:56
 msgid "Position of the local video window"
 msgstr "Положај прозора локалне слике"
 
-#: ../ekiga.schemas.in.in.h:73
-msgid "Position on the screen of the PC-To-Phone window"
-msgstr "Положај прозора за „Рачунар — телефон“ позив"
-
-#: ../ekiga.schemas.in.in.h:74
+#: ../ekiga.schemas.in.in.h:57
 msgid "Position on the screen of the address book window"
 msgstr "Положај прозора именика на екрану"
 
-#: ../ekiga.schemas.in.in.h:75
-msgid "Position on the screen of the calls history window"
-msgstr "Положај прозора историјата позива на екрану"
+#: ../ekiga.schemas.in.in.h:58
+msgid "Position on the screen of the audio settings window"
+msgstr "Положај прозора са подешавањима звука на екрану"
 
-#: ../ekiga.schemas.in.in.h:76
+#: ../ekiga.schemas.in.in.h:59
 msgid "Position on the screen of the chat window"
 msgstr "Положај прозора за текстуалне поруке"
 
-#: ../ekiga.schemas.in.in.h:77
+#: ../ekiga.schemas.in.in.h:60
 msgid "Position on the screen of the druid window"
 msgstr "Положај прозора чаробњака-помоћника на екрану"
 
-#: ../ekiga.schemas.in.in.h:78
+#: ../ekiga.schemas.in.in.h:61
 msgid "Position on the screen of the log window"
 msgstr "Положај прозора дневника на екрану"
 
-#: ../ekiga.schemas.in.in.h:79
+#: ../ekiga.schemas.in.in.h:62
 msgid "Position on the screen of the main window"
 msgstr "Положај главног прозора на екрану"
 
-#: ../ekiga.schemas.in.in.h:80
+#: ../ekiga.schemas.in.in.h:63
 msgid "Position on the screen of the preferences window"
 msgstr "Положај прозора са поставкама на екрану"
 
-#: ../ekiga.schemas.in.in.h:81
-msgid "Public IP of the NAT/PAT router"
-msgstr "Јавна ИП адреса адресног преводиоца усмеривача"
-
-#: ../ekiga.schemas.in.in.h:82
-msgid "Received calls history"
-msgstr "Историјат примљених позива"
-
-#: ../ekiga.schemas.in.in.h:83
-msgid "Registration timeout"
-msgstr "Рок за регистрацију"
+#: ../ekiga.schemas.in.in.h:64
+msgid "Position on the screen of the video settings window"
+msgstr "Положај прозора са видео подешавањима на екрану"
 
-#: ../ekiga.schemas.in.in.h:84
+#: ../ekiga.schemas.in.in.h:65
 msgid "Remote video window position"
 msgstr "Положај прозора са удаљеном сликом"
 
-#: ../ekiga.schemas.in.in.h:85
+#: ../ekiga.schemas.in.in.h:66
 msgid "Remote video window size"
 msgstr "Величина прозора за удаљену слику"
 
-#: ../ekiga.schemas.in.in.h:86
-msgid "Revision of the schema file"
-msgstr "Ревизија шема датотеке"
-
-#: ../ekiga.schemas.in.in.h:87
+#: ../ekiga.schemas.in.in.h:67
 msgid "Select an alternative audio output device to use for sound events."
 msgstr ""
 "Изаберите један резервни излазни звучни уређај који ће се користити за "
 "звучно оглашавање догађаја."
 
-#: ../ekiga.schemas.in.in.h:88 ../src/gui/preferences.cpp:1095
+#: ../ekiga.schemas.in.in.h:68 ../src/gui/preferences.cpp:777
 msgid "Select the audio input device to use"
 msgstr "Изаберите уређај који ће се користити за улаз звука"
 
-#: ../ekiga.schemas.in.in.h:89 ../src/gui/preferences.cpp:1088
+#: ../ekiga.schemas.in.in.h:69 ../src/gui/preferences.cpp:770
 msgid "Select the audio output device to use"
 msgstr "Изаберите уређај који ће се користити за излаз звука"
 
-#: ../ekiga.schemas.in.in.h:90 ../src/gui/preferences.cpp:959
-msgid ""
-"Select the desired method for NAT traversal (STUN is strongly suggested)"
-msgstr ""
-"Изаберите жељени метод за адресно превођење (строго се препоручује STUN)"
-
-#: ../ekiga.schemas.in.in.h:91 ../src/gui/preferences.cpp:1178
+#: ../ekiga.schemas.in.in.h:70 ../src/gui/preferences.cpp:936
 msgid ""
 "Select the format for video cameras (does not apply to most USB cameras)"
 msgstr ""
 "Изаберите формат за видео камере (није применљиво на већину USB камера)"
 
-#: ../ekiga.schemas.in.in.h:92
+#: ../ekiga.schemas.in.in.h:71
 msgid ""
 "Select the transmitted video size: Small (QCIF 176x144) or Large (CIF "
 "352x288)"
@@ -473,7 +374,7 @@
 "Изаберите величину пренесене слике: Мала (QCIF 176x144) или велика (CIF "
 "352x288)"
 
-#: ../ekiga.schemas.in.in.h:93 ../src/gui/preferences.cpp:1168
+#: ../ekiga.schemas.in.in.h:72 ../src/gui/preferences.cpp:928
 msgid ""
 "Select the video input device to use. If an error occurs when using this "
 "device a test picture will be transmitted."
@@ -481,105 +382,102 @@
 "Изаберите видео улаз који ће се користити. Уколико се догоди грешка при "
 "употреби овог уређаја, пренеће се пробна слика."
 
-#: ../ekiga.schemas.in.in.h:94
-msgid "Size of the PC-To-Phone window"
-msgstr "Величина прозора позива „Рачунар — телефон“"
+#: ../ekiga.schemas.in.in.h:73
+msgid "Show offline contacts"
+msgstr "Прикажи контакте ван мреже"
 
-#: ../ekiga.schemas.in.in.h:95
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3225
+msgid "Show the call panel"
+msgstr "Прикажи површ за позиве"
+
+#: ../ekiga.schemas.in.in.h:75
 msgid "Size of the address book window"
 msgstr "Величина прозора именика"
 
-#: ../ekiga.schemas.in.in.h:96
-msgid "Size of the calls history window"
-msgstr "Величина прозора историјата позива"
+#: ../ekiga.schemas.in.in.h:76
+msgid "Size of the audio settings window"
+msgstr "Величина прозора са звучним подешавањима"
 
-#: ../ekiga.schemas.in.in.h:97
+#: ../ekiga.schemas.in.in.h:77
 msgid "Size of the chat window"
 msgstr "Величина прозора за текстуалне поруке"
 
-#: ../ekiga.schemas.in.in.h:98
+#: ../ekiga.schemas.in.in.h:78
 msgid "Size of the druid window"
 msgstr "Величина прозора чаробњака"
 
-#: ../ekiga.schemas.in.in.h:99
-msgid "Size of the log window"
-msgstr "Величина прозора дневника"
-
-#: ../ekiga.schemas.in.in.h:100
+#: ../ekiga.schemas.in.in.h:79
 msgid "Size of the preferences window"
 msgstr "Величина прозора са поставкама"
 
-#: ../ekiga.schemas.in.in.h:101
+#: ../ekiga.schemas.in.in.h:80
+msgid "Size of the video settings window"
+msgstr "Величина прозора са видео подешавањима"
+
+#: ../ekiga.schemas.in.in.h:81
+msgid "Specify the software scaling algorithm"
+msgstr "Одаберите алгоритам за програмско повећање слике"
+
+#: ../ekiga.schemas.in.in.h:82
+msgid ""
+"Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest "
+"neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
+"Does not apply on windows systems."
+msgstr ""
+"Изверите алгоритам за програмско повећавање или смањивање слике: 0: "
+"најближи сусед, 1: најближи сусед са филтером кутије, 2: билинеарно "
+"филтрирање, 3: хиперболично филтрирање. Не користи се на Windows системима."
+
+#: ../ekiga.schemas.in.in.h:83
 msgid "Start hidden"
 msgstr "Почни скривен"
 
-#: ../ekiga.schemas.in.in.h:102 ../src/gui/main.cpp:1109
-#: ../src/gui/main.cpp:1587 ../src/gui/main.cpp:1612
-msgid "Switch to fullscreen"
-msgstr "Пребаци у цео екран"
-
-#: ../ekiga.schemas.in.in.h:103
+#: ../ekiga.schemas.in.in.h:84
 msgid "TCP port range"
 msgstr "Опсег TCP портова"
 
-#: ../ekiga.schemas.in.in.h:104
+#: ../ekiga.schemas.in.in.h:85
+msgid "Temporal Spatial Trade Off"
+msgstr "Временско просторни однос"
+
+#: ../ekiga.schemas.in.in.h:86
 msgid "The Audio Codecs List"
 msgstr "Списак аудио кодека"
 
-#: ../ekiga.schemas.in.in.h:105
-msgid ""
-"The Automatic Echo Cancellation level: Off, Low, Medium, High, Automatic "
-"Gain Compensation. Choosing Automatic Gain Compensation modulates the volume "
-"for best quality."
-msgstr ""
-"Ниво поништавања одјека: искључен, низак, средњи, висок, аутоматски "
-"постигнуто изравнавање. Избором аутоматски постигнутог изравнавања јачина ће "
-"бити прилагођена за најбољи квалитет."
-
-#: ../ekiga.schemas.in.in.h:106 ../src/gui/preferences.cpp:986
-msgid ""
-"The Gateway host is the host to use to do H.323 calls through a gateway that "
-"will relay calls"
-msgstr ""
-"Рачунар за излаз је рачунар преко којег се обављају H.323 позиви преко "
-"излаза који преноси позиве"
-
-#: ../ekiga.schemas.in.in.h:107
-msgid "The NAT method"
-msgstr "Метод адресног превођења"
-
-#: ../ekiga.schemas.in.in.h:108 ../src/gui/preferences.cpp:1037
+#: ../ekiga.schemas.in.in.h:87 ../src/gui/preferences.cpp:727
 msgid "The SIP Outbound Proxy to use for outgoing calls"
 msgstr "SIP посредник који се користи за одлазне позиве"
 
-#: ../ekiga.schemas.in.in.h:109
+#: ../ekiga.schemas.in.in.h:88
 msgid "The STUN Server"
 msgstr "STUN сервер"
 
 # bug: s/technic/technology/
-#: ../ekiga.schemas.in.in.h:110
+#: ../ekiga.schemas.in.in.h:89
 msgid ""
-"The STUN server to use for STUN Support. STUN is a technic that permits to "
-"go through some types of NAT gateways"
+"The STUN server to use for STUN Support. STUN is a technology that permits "
+"passage through some types of NAT gateway"
 msgstr ""
 "STUN сервер за STUN подршку. STUN је технологија која допушта да се прође "
 "кроз неке врсте маскирања мреже."
 
-#: ../ekiga.schemas.in.in.h:111
+#: ../ekiga.schemas.in.in.h:90
+msgid "The Video Codecs List"
+msgstr "Списак видео кодека"
+
+#: ../ekiga.schemas.in.in.h:91
 msgid "The accounts list"
 msgstr "Списак налога"
 
-#: ../ekiga.schemas.in.in.h:112
-msgid ""
-"The audio plugin that will be used to detect the devices and manage them"
-msgstr ""
-"Додатак за звук који се користи за препознавање уређаја и њихово управљање"
+#: ../ekiga.schemas.in.in.h:92
+msgid "The audio codecs list"
+msgstr "Списак аудио кодека"
 
-#: ../ekiga.schemas.in.in.h:113
+#: ../ekiga.schemas.in.in.h:93
 msgid "The busy tone sound"
 msgstr "Звук заузећа"
 
-#: ../ekiga.schemas.in.in.h:114
+#: ../ekiga.schemas.in.in.h:94
 msgid ""
 "The chosen sound will be played at the end of calls or calling somebody who "
 "is busy, if enabled"
@@ -587,137 +485,111 @@
 "Ако је укључено, изабрани звук ће бити пуштен по завршетку позива или при "
 "звању некога ко је заузет"
 
-#: ../ekiga.schemas.in.in.h:115
+#: ../ekiga.schemas.in.in.h:95
 msgid "The chosen sound will be played on incoming calls, if enabled"
 msgstr "Ако је укључено, изабрани звук ће бити пуштен на долазеће позиве"
 
-#: ../ekiga.schemas.in.in.h:116
+#: ../ekiga.schemas.in.in.h:96
 msgid ""
 "The chosen sound will be played when a new instant message is received, if "
 "enabled"
 msgstr ""
 "Ако је омогућено, биће пуштен изабрани звук при пријему нове брзе поруке"
 
-#: ../ekiga.schemas.in.in.h:117
+#: ../ekiga.schemas.in.in.h:97
 msgid ""
 "The chosen sound will be played when a new voice mail is received, if enabled"
 msgstr ""
 "Ако је укључено, биће пуштен изабрани звук при пријему нове говорне поште"
 
-#: ../ekiga.schemas.in.in.h:118
+#: ../ekiga.schemas.in.in.h:98
 msgid "The chosen sound will be played when calling somebody, if enabled"
 msgstr "Ако је укључено, изабрани звук ће бити пуштен при звању некога"
 
-#: ../ekiga.schemas.in.in.h:119
+#: ../ekiga.schemas.in.in.h:99
 msgid "The default video view"
 msgstr "Почетни приказ слике"
 
-#: ../ekiga.schemas.in.in.h:120
+#: ../ekiga.schemas.in.in.h:100
 msgid ""
-"The default video view (0: Local, 1: Remote, 2: Both incrusted, 3: Both with "
+"The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with "
 "local video in a separate window, 4: Both)"
 msgstr ""
-"Подешен приказ слике (0: локални, 1: удаљени, 2: оба пресвучена, 3: оба са "
-"локалном сликом у посебном прозору, 4: оба)"
+"Подразумевани приказ слике (0: локални, 1: удаљени, 2: оба пресвучена, 3: "
+"оба са локалном сликом у посебном прозору, 4: оба)"
 
-#: ../ekiga.schemas.in.in.h:121
+#: ../ekiga.schemas.in.in.h:101
 msgid "The dial tone sound"
 msgstr "Звук за сигнал слободног бирања"
 
-#: ../ekiga.schemas.in.in.h:122
-msgid "The history of the last 100 missed calls"
-msgstr "Историјат последњих 100 пропуштених позива"
-
-#: ../ekiga.schemas.in.in.h:123
-msgid "The history of the last 100 placed calls"
+#: ../ekiga.schemas.in.in.h:102
+msgid "The history of the 100 last calls"
 msgstr "Историјат последњих 100 начињених позива"
 
-#: ../ekiga.schemas.in.in.h:124
-msgid "The history of the last 100 received calls"
-msgstr "Историјат последњих 100 примљених позива"
-
-#: ../ekiga.schemas.in.in.h:125 ../src/gui/preferences.cpp:989
-#: ../src/gui/preferences.cpp:1040
+#: ../ekiga.schemas.in.in.h:103 ../src/gui/preferences.cpp:676
+#: ../src/gui/preferences.cpp:730
 msgid "The host where calls should be forwarded if call forwarding is enabled"
 msgstr ""
 "Рачунар према коме треба да буду преусмерени позиви ако је укључено "
 "преусмеравање"
 
-#: ../ekiga.schemas.in.in.h:126
-msgid ""
-"The image to transmit if \"Picture\" is selected as video plugin or if the "
-"opening of the device fails. Leave blank to use the default Ekiga logo."
-msgstr ""
-"Слика за пренос ако је „Слика“ изабрана као видео додатак или ако отварање "
-"уређаја не успе. Оставите празно за подразумевани Екига лого."
-
-#: ../ekiga.schemas.in.in.h:127
+#: ../ekiga.schemas.in.in.h:104
 msgid "The incoming call sound"
 msgstr "Звук долазног позива"
 
-#: ../ekiga.schemas.in.in.h:128
+#: ../ekiga.schemas.in.in.h:105
 msgid "The list of accounts to which Ekiga should register"
 msgstr "Списак налога које Екига треба да користи код регистрације/пријаве"
 
-#: ../ekiga.schemas.in.in.h:129
-msgid "The local zoom value"
-msgstr "Локална вредност увећања"
+#: ../ekiga.schemas.in.in.h:106
+msgid "The long status information"
+msgstr "Проширени подаци стања"
 
-#: ../ekiga.schemas.in.in.h:130
+#: ../ekiga.schemas.in.in.h:107
+msgid ""
+"The maximum RX video bitrate in kbit/s. This value will be signaled to the "
+"peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
+"above the signaled value"
+msgstr ""
+"Максимални видео проток за примање у kbit/s. Ова вредност ће бити послата "
+"особи са којом разговарате (ако њен програм то подржава) ради подешавања "
+"видео проток за слање уколико је изнад ове вредности."
+
+#: ../ekiga.schemas.in.in.h:108
+msgid ""
+"The maximum TX video bitrate in kbit/s. The video quality and the number of "
+"transmitted frames per second (depends on selected codec) will be "
+"dynamically adjusted above their minimum during calls to try to minimize the "
+"bandwidth to the given value"
+msgstr ""
+"Максимални видео проток за слање у kbit/s. Квалитет слике и број пренесених "
+"кадрова у секунди (у зависности од одабраног кодека) биће динамички "
+"прилагођени изнад њиховог минимума за време позива при покушају да се умањи "
+"проток на дату вредност"
+
+#: ../ekiga.schemas.in.in.h:109
 msgid "The maximum jitter buffer size for audio reception (in ms)"
 msgstr "Највећа величина jitter бафера за аудио пријем (у мс)"
 
-#: ../ekiga.schemas.in.in.h:131
+#: ../ekiga.schemas.in.in.h:110
 msgid ""
-"The maximum video bandwidth in kbytes/s. The video quality and the number of "
-"transmitted frames per second will be dynamically adjusted above their "
-"minimum during calls to try to minimize the bandwidth to the given value"
-msgstr ""
-"Највећа ширина пропусног опсега слике у килобајтима/с. Квалитет слике и број "
-"пренесених оквира у секунди биће динамички прилагођени изнад њиховог "
-"минимума за време позива при покушају да се умањи пропусни опсег на дату "
-"вредност"
-
-#: ../ekiga.schemas.in.in.h:132
-msgid "The minimum jitter buffer size for audio reception (in ms)"
-msgstr "Најмања величина jitter бафера за пријем звука (у мс)"
+"The maximum transmitted frame rate in frames/s. This rate may not be reached "
+"in case a minimum quality was configure via a TSTO value smaller than 31 and "
+"the bitrate selected is not sufficient to support this minimum quality"
+msgstr ""
+"Максимални проток број кадрова у секунди. Овај проток не мора да се достигне "
+"уколико је минимални квалитет подешен TSTO вредношћу мањом од 31 и битски "
+"проток није довољан да подржи минимални квалитет слике"
 
-#: ../ekiga.schemas.in.in.h:134
-#, no-c-format
-msgid ""
-"The minimum transmitted video quality to keep when trying to minimize the "
-"used bandwidth: choose 100% on a LAN for the best quality, 1% being the "
-"worst quality"
-msgstr ""
-"Најмањи квалитет пренесене слике при покушају да се умањи кориштење "
-"пропусног опсега: изаберите 100% за услове локалне мреже за најбољи "
-"квалитет, 1% даје најлошији квалитет"
-
-#: ../ekiga.schemas.in.in.h:135
-msgid "The network interface"
-msgstr "Мрежни прикључак"
-
-#: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:950
-msgid "The network interface to listen on"
-msgstr "Мрежни прикључак који треба ослушкивати"
-
-#: ../ekiga.schemas.in.in.h:137
+#: ../ekiga.schemas.in.in.h:111
 msgid "The new instant message sound"
 msgstr "Звук за нову брзу поруку"
 
-#: ../ekiga.schemas.in.in.h:138
+#: ../ekiga.schemas.in.in.h:112
 msgid "The new voice mail sound"
 msgstr "Звук долазне говорне поште"
 
-#: ../ekiga.schemas.in.in.h:139
-msgid ""
-"The output device type is the type of device connected to your Quicknet "
-"card. It can be either a POTS (Plain Old Telephone System) or a headset."
-msgstr ""
-"Врста излазног уређаја представља врсту уређаја повезаног на вашу Quicknet "
-"карту. Она може бити или СДТА (стари добри телефонски апарат), или слушалице."
-
-#: ../ekiga.schemas.in.in.h:140
+#: ../ekiga.schemas.in.in.h:113
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect"
@@ -725,7 +597,7 @@
 "Ослушавани порт за долазне позиве. Екига треба да буде поново покренута да "
 "нова вредност узме маха"
 
-#: ../ekiga.schemas.in.in.h:141
+#: ../ekiga.schemas.in.in.h:114
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect."
@@ -733,69 +605,40 @@
 "Ослушавани порт за долазне позиве. Екига треба да буде поново покренута да "
 "нова вредност узме маха."
 
-#: ../ekiga.schemas.in.in.h:142
+#: ../ekiga.schemas.in.in.h:115
 msgid "The position of the local video window"
 msgstr "Положај прозора локалне слике"
 
-#: ../ekiga.schemas.in.in.h:143
+#: ../ekiga.schemas.in.in.h:116
 msgid "The position of the remote video window"
 msgstr "Положај прозора слике удаљеног саговорника"
 
-#: ../ekiga.schemas.in.in.h:144
-msgid ""
-"The prefix that will be used to save pictures of the conversation. That "
-"prefix is followed by the snapshot number."
-msgstr ""
-"Префикс који ће бити кориштен да се сними слике од разговора. Префикс је "
-"праћен захваћеним бројем."
-
-#: ../ekiga.schemas.in.in.h:145
-msgid ""
-"The range of TCP ports that Ekiga will use for the H.323 H.245 channel. "
-"Ekiga needs to be restarted for the new values to take effect. This port "
-"range has no effect if both participants to the conference are using H.245 "
-"Tunneling."
-msgstr ""
-"Опсег TCP портова који Екига користи за H.323 и H.245 канал. Екига треба да "
-"буде поново покренута да нове вредности узму маха. Овај опсег нема утицаја "
-"ако оба учесника конференције користе H.245 тунел."
-
-#: ../ekiga.schemas.in.in.h:146
-msgid ""
-"The range of UDP ports that Ekiga will use for RTP (audio and video "
-"communication channels). Ekiga needs to be restarted for the new values to "
-"take effect."
-msgstr ""
-"Опсег UDP портова које ће користити Екига за RTP (канале за пренос звука "
-"ислике). Екига треба да буде изнова покренута да би промене узеле маха."
-
-#: ../ekiga.schemas.in.in.h:147
+#: ../ekiga.schemas.in.in.h:117
 msgid ""
-"The range of UDP ports that Ekiga will use for SIP signaling and when "
-"registering to gatekeepers. Ekiga needs to be restarted for the new values "
-"to take effect."
+"The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
+"port range has no effect if both participants to the conference are using "
+"H.245 Tunneling."
 msgstr ""
-"Опсег UDP портова које ће Екига користити за SIP сигнализацију и када се "
-"обавља регистрација са чуваром капије. Екига треба да буде изнова покренута "
-"да би промене узеле маха."
+"Опсег TCP портова који Екига користи за H.323 и H.245 канал. Овај опсег нема "
+"утицаја ако оба учесника конференције користе H.245 тунел."
 
-#: ../ekiga.schemas.in.in.h:148
-msgid "The remote zoom value"
-msgstr "Удаљена вредност увећања"
+#: ../ekiga.schemas.in.in.h:118
+msgid "The range of UDP ports that Ekiga will use."
+msgstr "Опсег UDP портова које Екига користи."
 
-#: ../ekiga.schemas.in.in.h:149
-msgid "The save prefix"
-msgstr "Префикс за чување"
+#: ../ekiga.schemas.in.in.h:119
+msgid "The short status information"
+msgstr "Сажети подаци о стању"
 
-#: ../ekiga.schemas.in.in.h:150
+#: ../ekiga.schemas.in.in.h:120
 msgid "The size of the local video window"
 msgstr "Величина прозора локалне слике"
 
-#: ../ekiga.schemas.in.in.h:151
+#: ../ekiga.schemas.in.in.h:121
 msgid "The size of the remote video window"
 msgstr "Величина прозора слике удаљеног саговорника"
 
-#: ../ekiga.schemas.in.in.h:152
+#: ../ekiga.schemas.in.in.h:122
 msgid ""
 "The sound that will be played at the end of calls or when calling somebody "
 "who is busy, if enabled"
@@ -803,86 +646,79 @@
 "Ако је укључено, звук који ће бити пуштен по окончању позива или при звању "
 "некога ко је заузет"
 
-#: ../ekiga.schemas.in.in.h:153
+#: ../ekiga.schemas.in.in.h:123
 msgid "The sound that will be played on incoming calls, if enabled"
 msgstr "Ако је укључено, звук који ће бити пуштен за долазне позиве"
 
-#: ../ekiga.schemas.in.in.h:154
+#: ../ekiga.schemas.in.in.h:124
 msgid "The sound that will be played when calling somebody, if enabled"
 msgstr "Ако је укључено, звук који ће бити пуштен при звању некога"
 
-#: ../ekiga.schemas.in.in.h:155
+#: ../ekiga.schemas.in.in.h:125
 msgid ""
 "The sound that will be played when there is a new instant message, if enabled"
 msgstr ""
 "Ако је укључено, звук који ће бити пуштен када пристигне нова брза порука"
 
-#: ../ekiga.schemas.in.in.h:156
+#: ../ekiga.schemas.in.in.h:126
 msgid ""
 "The sound that will be played when there is a new voice mail, if enabled"
 msgstr ""
 "Ако је укључено, звук који ће бити пуштен при пријему нове говорне поште"
 
-#: ../ekiga.schemas.in.in.h:157
-msgid ""
-"The time after which Ekiga will renew its registration with the registrar"
-msgstr "Време након којег ће Екига обновити своју регистрацију у регистру"
-
-#: ../ekiga.schemas.in.in.h:158
-msgid "The two-letter country code of your country (e.g.: BE, UK, FR, DE, ...)"
-msgstr "Два слова државне ознаке за вашу државу (нпр: YU, CA, UK, FR, DE, ...)"
-
-#: ../ekiga.schemas.in.in.h:159 ../src/gui/preferences.cpp:1172
+#: ../ekiga.schemas.in.in.h:127 ../src/gui/preferences.cpp:932
 msgid "The video channel number to use (to select camera, tv or other sources)"
 msgstr "Број канала за слику (за избор камере, ТВ и осталих извора)"
 
-#: ../ekiga.schemas.in.in.h:160 ../src/gui/preferences.cpp:1156
-msgid ""
-"The video plugin that will be used to detect the devices and manage them"
-msgstr ""
-"Додатак за слику који се користи за препознавање уређаја и њихово управљање"
+#: ../ekiga.schemas.in.in.h:128
+msgid "The video codecs list"
+msgstr "Списак видео кодека"
+
+#: ../ekiga.schemas.in.in.h:129
+msgid "The video view before having switched to fullscreen"
+msgstr "Ширина слике пре пребацивања на цео екран"
 
-#: ../ekiga.schemas.in.in.h:161
+#: ../ekiga.schemas.in.in.h:130
 msgid ""
-"The way to react to incoming calls: 0 displays a popup, 1 automatically "
-"answers the call, 2 automatically rejects the call and 3 forwards the call "
-"to the given URL, if any"
+"The video view before having switched to fullscreen (same values as "
+"video_view)"
 msgstr ""
-"Начин реаговања на примљене позиве: 0 искаче прозор, 1 сам одговара на "
-"позив, 2 сам одбија позив и 3 преусмерава позив на адресу, уколико је дата"
+"Ширина слике пре пребацивања на цео екран (иста вредност као video_view)"
 
-#: ../ekiga.schemas.in.in.h:162
+#: ../ekiga.schemas.in.in.h:131
 msgid "The zoom value"
 msgstr "Вредност увећања"
 
-#: ../ekiga.schemas.in.in.h:163
+#: ../ekiga.schemas.in.in.h:132
 msgid ""
-"The zoom value to apply to images displayed in the local video window (can "
-"be 0.50, 1.00, or 2.00)"
+"The zoom value in percent to apply to images displayed in the main GUI (can "
+"be 50, 100, or 200)"
 msgstr ""
-"Вредност увећања слика које се приказују у локалном прозору за слику (може "
-"бити 0.50, 1.00 или 2.00)"
+"Вредност увећања слика које се приказују у главном прозору (може бити 50, "
+"100 или 200)"
 
-#: ../ekiga.schemas.in.in.h:164
+#: ../ekiga.schemas.in.in.h:133
 msgid ""
-"The zoom value to apply to images displayed in the main GUI (can be 0.50, "
-"1.00, or 2.00)"
+"This allows you to set the mode for sending DTMFs. The values can be "
+"\"RFC2833\" (0), \"INFO\" (1)"
 msgstr ""
-"Вредност увећања слика које се приказују у главном прозору (може бити 0.50, "
-"1.00 или 2.00)"
+"Ово дозвољава да поставите режим за DTMF слање. Вредност може бити "
+"„RFC2833“ (0), „INFO“ (1)"
 
-#: ../ekiga.schemas.in.in.h:165
+#: ../ekiga.schemas.in.in.h:134
 msgid ""
-"The zoom value to apply to images displayed in the remote video window (can "
-"be 0.50, 1.00, or 2.00)"
+"This allows you to set the mode for sending DTMFs. The values can be \"String"
+"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
+"\"). Choosing other values than \"String\" disables the Text Chat"
 msgstr ""
-"Вредност увећања слика које се приказују у удаљеном прозору за слику (може "
-"бити 0.50, 1.00 или 2.00)"
+"Ово омогућава подешавање режима за слање DTMF сигнала. Вредности могу бити "
+"„Низ“ (0), „Тон“ (1), „RFC2833“ (2), „Q.931“ (3) (почетна вредност је "
+"„Низ“)  Избор неке друге вредности од „Низ“ искључује текстуални разговор"
 
-#: ../ekiga.schemas.in.in.h:166 ../src/gui/preferences.cpp:1001
+#: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
 msgid ""
 "This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
-"are encapsulated into the the H.225 channel (port 1720). This saves one TCP "
+"are encapsulated into the H.225 channel (port 1720). This saves one TCP "
 "connection during calls. H.245 Tunneling was introduced in H.323v2 and "
 "Netmeeting does not support it. Using both Fast Start and H.245 Tunneling "
 "can crash some versions of Netmeeting."
@@ -893,1337 +729,1502 @@
 "Употреба и Брзог старта и H.245 тунела може да сруши неке верзије Netmeeting-"
 "а."
 
-#: ../ekiga.schemas.in.in.h:167 ../src/gui/preferences.cpp:1003
+#: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:690
 msgid "This enables H.245 early in the setup"
 msgstr "Ово укључује H.245 рано у подешавању"
 
-#: ../ekiga.schemas.in.in.h:168
-msgid ""
-"This enables IP checking from ekiga.com. The returned IP is only used when "
-"IP Translation is enabled."
-msgstr ""
-"Ово укључује ИП проверу са ekiga.net места. Повратна ИП адреса се користи "
-"једино ако постоји адресно превођење."
-
-#: ../ekiga.schemas.in.in.h:169
-msgid ""
-"This permits to set the mode for DTMFs sending. The value can be \"RFC2833"
-"\" (0) only"
-msgstr ""
-"Ово дозвољава да поставите режим за DTMF слање. Вредност може бити само "
-"„RFC2833“"
-
-#: ../ekiga.schemas.in.in.h:170
+#: ../ekiga.schemas.in.in.h:137
 msgid ""
-"This permits to set the mode for DTMFs sending. The values can be \"String"
-"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
-"\"). Choosing other values than \"String\" disables the Text Chat"
+"This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
+"acceleration"
 msgstr ""
-"Ово омогућава подешавање режима за слање DTMF сигнала. Вредности могу бити "
-"„Низ“ (0), „Тон“ (1), „RFC2833“ (2), „Q.931“ (3) (почетна вредност је „Низ“) "
-"Избор неке друге вредности од „Низ“ искључује текстуални разговор"
+"Овај кључ онемогућава DirectX (на win32) и ИксВидео (на Линуксу) хардверско "
+"убрзање видеа"
 
-#: ../ekiga.schemas.in.in.h:171
+#: ../ekiga.schemas.in.in.h:138
 msgid "UDP port range"
 msgstr "Опсег UDP портова"
 
-#: ../ekiga.schemas.in.in.h:172
-msgid "User directory"
-msgstr "Кориснички директоријум"
-
-#: ../ekiga.schemas.in.in.h:173
-msgid "Version"
-msgstr "Верзија"
-
-#: ../ekiga.schemas.in.in.h:174
+#: ../ekiga.schemas.in.in.h:139
 msgid "Video channel"
 msgstr "Канал за слику"
 
-#: ../ekiga.schemas.in.in.h:175
+#: ../ekiga.schemas.in.in.h:140
 msgid "Video format"
 msgstr "Видео формат"
 
-#: ../ekiga.schemas.in.in.h:176
-msgid "Video image"
-msgstr "Видео слика"
-
-#: ../ekiga.schemas.in.in.h:177
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr "Улазни видео уређај"
 
-#: ../ekiga.schemas.in.in.h:178
-msgid "Video plugin"
-msgstr "Додатак за видео"
-
-#: ../ekiga.schemas.in.in.h:179
+#: ../ekiga.schemas.in.in.h:142
 msgid "Video preview"
 msgstr "Преглед слике"
 
-#: ../ekiga.schemas.in.in.h:180
+#: ../ekiga.schemas.in.in.h:143
 msgid "Video size"
 msgstr "Величина слике"
 
-#: ../lib/gmconf/gmconf-gconf.c:155
+#: ../ekiga.schemas.in.in.h:144
 msgid ""
-"An error has happened in the configuration backend.\n"
-"Maybe some of your settings won't be saved."
-msgstr ""
-"Догодила се грешка при позадинском подешавању.\n"
-"Нека од подешавања можда неће бити сачувана."
+"Whether to prefer to sustain the max. frame rate or lower it possibly in "
+"order to keep a minimum level of (spatial) quality for all frames. 0: "
+"Highest minimal quality, 31: lowest minimal quality"
+msgstr ""
+"Да ли да се одржава максимална брзина кадрова или да се смањује због "
+"одржавања минимални ниво (просторног) квалитета свих кадрова. 0: Највећи "
+"минимални квалитет, 32: најмањи минимални квалитет"
+
+#: ../lib/engine/addressbook/contact-core.cpp:60
+msgid "_Find"
+msgstr "_Тражи"
+
+#: ../lib/engine/components/avahi/avahi-heap.cpp:125
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
+msgid "Neighbours"
+msgstr "Суседи"
+
+#: ../lib/engine/components/call-history/history-book.cpp:137
+#: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
+msgid "Clear List"
+msgstr "Очисти списак"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:155
+msgid "Received"
+msgstr "Примљени"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:158
+msgid "Placed"
+msgstr "Начињени"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:161
+msgid "Missed"
+msgstr "Пропуштени"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:76
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
+#, c-format
+msgid "%d user found"
+msgid_plural "%d users found"
+msgstr[0] "%d корисник није пронађен"
+msgstr[1] "%d корисника нису пронађена"
+msgstr[2] "%d корисника није пронађено"
 
-#: ../lib/gmcontacts/gmcontacts-avahi.cpp:285
-msgid "Contacts Near Me"
-msgstr "Контакти у мојој близини"
+#: ../lib/engine/components/evolution/evolution-book.cpp:281
+msgid "New _Contact"
+msgstr "Нови _контакт"
 
-#. Init the address book
-#: ../lib/gmcontacts/gmcontacts-eds.cpp:304 ../src/endpoints/ekiga.cpp:501
-msgid "On This Computer"
-msgstr "На овом рачунару"
+#: ../lib/engine/components/evolution/evolution-book.cpp:317
+#: ../lib/engine/components/local-roster/local-cluster.cpp:82
+#: ../lib/engine/components/local-roster/local-heap.cpp:117
+msgid "New contact"
+msgstr "Нови контакт"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
+msgid "Please update the following fields:"
+msgstr "Ажурирајте следећа поља:"
 
-#: ../lib/gmcontacts/gmcontacts-eds.cpp:308 ../src/endpoints/ekiga.cpp:501
-#: ../src/gui/addressbook.cpp:3042
-msgid "Personal"
-msgstr "Лични"
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+msgid "_Name:"
+msgstr "_Име:"
 
-#: ../lib/gui/gmdialog.c:487
-msgid "Do not show this dialog again"
-msgstr "Не приказуј више ово прозорче"
+#: ../lib/engine/components/evolution/evolution-book.cpp:322
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
+msgid "VoIP _URI:"
+msgstr "_Адреса за пренос гласа преко Интернета:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+msgid "_Home phone:"
+msgstr "_Кућни телефон:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+msgid "_Office phone:"
+msgstr "_Службени телефон:"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+msgid "_Cell phone:"
+msgstr "_Мобилни телефон"
+
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+msgid "_Pager:"
+msgstr "_Пејџер:"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:234
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3183
+msgid "_Edit"
+msgstr "_Уређивање"
 
-#: ../src/clients/ils.cpp:105 ../src/gui/tools.cpp:174
-msgid "Invalid parameters"
-msgstr "Нетачни параметри"
+#: ../lib/engine/components/evolution/evolution-contact.cpp:236
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
+msgid "Edit contact"
+msgstr "Измени контакт"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:169
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+msgid "Name:"
+msgstr "Име:"
 
-#: ../src/clients/ils.cpp:105
-msgid ""
-"Please provide your first name and e-mail in the Personal Data section in "
-"order to be able to register to the users directory."
-msgstr ""
-"Молим унесите име и е-пошту у одељку личних података како би могли да се "
-"региструјете у кориснички директоријум."
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
+msgid "Remove contact"
+msgstr "Уклони контакт"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
+#, c-format
+msgid "Are you sure you want to remove %s from the addressbook?"
+msgstr "Да ли сте сигурни да желите да уклоните %s из именика?"
+
+#: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
+msgid "Audio test"
+msgstr "Звучни тест"
+
+#: ../lib/engine/components/gstreamer/gst-audiooutput.cpp:320
+msgid "Silent"
+msgstr "Тихо"
+
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
+msgid "Video test"
+msgstr "Видео тест"
+
+#. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Crazy"
+msgstr "Лудо"
+
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Screencast"
+msgstr "Пренос екрана"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
+msgid "_Refresh"
+msgstr "_Освежи"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
+msgid "_Remove addressbook"
+msgstr "_Уклони именик"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
+msgid "Addressbook _properties"
+msgstr "Својства именика"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
+msgid "LDAP SASL Interaction"
+msgstr "ЛДАП SASL повезаност"
+
+#. Translators, Howard explained : "Challenge" is a generic term
+#. * in authentication. It's a prompt from the authentication mechanism
+#. * for some type of credential. Exactly what kind of challenge and
+#. * what kind of credential depends on the specific authentication
+#. * mechanism. Since SASL is a generic interface, and can dynamically
+#. * load arbitrary mechanisms, there's not much more specific you can
+#. * say about it. You might google for "challenge response
+#. * authentication" if you'd like more background context.
+#.
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
+msgid "Challenge: "
+msgstr "Изазов: "
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
+msgid "Interact"
+msgstr "Интеракција"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
+msgid "Refreshing"
+msgstr "Освежавам"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
+msgid "Could not initialize server"
+msgstr "Није успело покретање сервера"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
+msgid "LDAP Error: "
+msgstr "ЛДАП грешка: "
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
+msgid "Contacted server"
+msgstr "Контактирани сервер"
+
+#. patience == 0
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
+msgid "Could not connect to server"
+msgstr "Не могу да се повежем на сервер"
+
+#. patience == 0
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
+msgid "Could not search"
+msgstr "Не могу да претражим"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
+msgid "Waiting for search results"
+msgstr "Чекам на резултате претраге"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
+msgid "Please edit the following fields"
+msgstr "Измените следећа поља"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
+msgid "Book _Name"
+msgstr "_Име књиге"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
+msgid "Server _URI"
+msgstr "_Адреса сервера"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
+msgid "_Base DN"
+msgstr "_Основно име домена"
 
-#: ../src/clients/ils.cpp:145
-msgid "Invalid users directory"
-msgstr "Неисправан кориснички директоријум"
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
+msgid "Subtree"
+msgstr "Подстабло"
 
-#: ../src/clients/ils.cpp:145
-msgid "Operation impossible since there is no users directory specified."
-msgstr "Радња је немогућа зато што није одређен кориснички директоријум."
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
+msgid "Single Level"
+msgstr "Један ниво"
 
-#: ../src/clients/ils.cpp:238
-msgid "Failed to parse XML file"
-msgstr "Није успео да обради XML датотеку"
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
+msgid "_Search Scope"
+msgstr "Оп_сег претраге"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
+msgid "_DisplayName Attribute"
+msgstr "Особина ви_дљиво име (DisplayName)"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
+msgid "Call _Attributes"
+msgstr "Особине позив_а"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
+msgid "_Filter Template"
+msgstr "Шаблон _филтрирања"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
+msgid "Bind _ID"
+msgstr "_ИБ повезивања"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
+msgid "_Password"
+msgstr "_Лозинка"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
+msgid "Use TLS"
+msgstr "Користи TLS"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
+msgid "Use SASL"
+msgstr "Користи SASL"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
+msgid "SASL _Mechanism"
+msgstr "SASL _механизам"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
+msgid "Edit LDAP directory"
+msgstr "Измени ЛДАП фасциклу"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
+msgid "Please provide a Book Name for this directory\n"
+msgstr "Унесите име књиге за ову фасциклу\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
+msgid "Please provide a Server URI\n"
+msgstr "Унесите адресу сервера\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
+msgid "Please provide a DisplayName Attribute\n"
+msgstr "Унесите својство видљивог имена\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
+msgid "Please provide a Call Attribute\n"
+msgstr "Унесите особину позива\n"
+
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
+msgid "Invalid Server URI\n"
+msgstr "Погрешна адреса сервера\n"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
+msgid "Add an LDAP Address Book"
+msgstr "Додај ЛДАП адресар"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
+msgid "Add the Ekiga.net Directory"
+msgstr "Додај Ekiga.net фасциклу"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:152
+msgid "Create LDAP directory"
+msgstr "Направи ЛДАП фасциклу"
+
+#: ../lib/engine/components/ldap/ldap-source.cpp:167
+msgid "Ekiga.net Directory"
+msgstr "Ekiga.net фасцикла"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
+msgid "Edit roster element"
+msgstr "Измени елементе листе контаката"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
+msgid ""
+"Please fill in this form to change an existing element of ekiga's internal "
+"roster"
+msgstr ""
+"Попуните овај формулар да измените постојећи елемент Екигине интерне листе "
+"контаката"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:170
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
+msgid "Address:"
+msgstr "Адреса:"
+
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
+msgid "Choose groups:"
+msgstr "Одаберите групе:"
+
+#: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
+msgid "Add to local roster"
+msgstr "Додај у локалне контакте"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
+msgid "Services"
+msgstr "Сервиси"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
+msgid "Echo test"
+msgstr "Ехо тест"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
+msgid "Conference room"
+msgstr "Соба за конференцију"
 
-#: ../src/clients/ils.cpp:238
-msgid ""
-"There was an error while parsing the XML file. Please make sure that it is "
-"correctly installed in your system."
-msgstr ""
-"Догодила се грешка приликом рашчлањавања XML датотеке. Проверите да је "
-"правилно инсталирана на систем."
+#: ../lib/engine/components/local-roster/local-heap.cpp:110
+msgid "Local roster"
+msgstr "Локални контакти"
 
-#: ../src/clients/ils.cpp:249
-msgid "Bad information"
-msgstr "Лоши подаци"
+#: ../lib/engine/components/local-roster/local-heap.cpp:127
+msgid "Rename"
+msgstr "Преименуј"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
+msgid "Family"
+msgstr "Породица"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
+msgid "Friend"
+msgstr "Пријатељ"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
+msgid "Associate"
+msgstr "Сарадник"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
+msgid "Assistant"
+msgstr "Асистент"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
+msgid "Supervisor"
+msgstr "Супервизор"
+
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
+msgid "Self"
+msgstr "Ја"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
+msgid ""
+"Please fill in this form to add a new contact to ekiga's internal roster"
+msgstr ""
+"Попуните овај формулар да додате нови контакт Екигиној интерној листи "
+"контаката"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
+msgid "Put contact in groups:"
+msgstr "Стави контакт у групе:"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
+msgid "You supplied an unsupported address"
+msgstr "Навели сте неподржану адресу"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
+msgid "You already have a contact with this address!"
+msgstr "Већ имате контакт са овом адресом!"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
+msgid "Rename group"
+msgstr "Преименуј групу"
+
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
+msgid "Please edit this group name"
+msgstr "Измените име ове групе"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:233
+#: ../lib/engine/components/opal/sip-endpoint.cpp:237
+msgid "Call"
+msgstr "Позив"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
+#: ../lib/engine/components/opal/sip-endpoint.cpp:238 ../src/gui/main.cpp:2957
+msgid "Transfer"
+msgstr "Пребаци"
 
-#: ../src/clients/ils.cpp:249
-#, c-format
-msgid "Bad LDAP information from XML file: %s."
-msgstr "Лоши LDAP подаци из XML датотеке: %s."
+#. Translators : The alias we are registering already exists : failure
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
+msgid "Duplicate alias"
+msgstr "Већ постоји овај надимак"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
+msgid "Bad username/password"
+msgstr "Погрешно корисничко име/лозинка"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
+msgid "Transport error"
+msgstr "Грешка приликом транспорта"
+
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:825
+msgid "Failed"
+msgstr "Није успело"
+
+#: ../lib/engine/components/opal/opal-account.cpp:303
+msgid "_Disable"
+msgstr "О_немогући"
+
+#: ../lib/engine/components/opal/opal-account.cpp:306
+msgid "_Enable"
+msgstr "_Омогући"
 
-#: ../src/clients/ils.cpp:257
-#, c-format
-msgid "ILS registration failed: unable to connect to %s"
-msgstr "Неуспешна ILS регистрација: не могу да се повежем на %s"
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
+msgid "Recharge the account"
+msgstr "Допуните налог"
 
-#: ../src/clients/ils.cpp:270
-msgid "ILS registration failed: unable to set time limit on operations"
-msgstr ""
-"Неуспешна ILS регистрација: не могу да поставим временско ограничење на "
-"операције"
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
+msgid "Consult the balance history"
+msgstr "Погледај историјат стања"
 
-#: ../src/clients/ils.cpp:282
-#, c-format
-msgid "ILS registration failed: failed to bind to %s"
-msgstr "Неуспешна ILS регистрација: не могу да се накачим на %s"
+#: ../lib/engine/components/opal/opal-account.cpp:337
+msgid "Consult the call history"
+msgstr "Погледај историјат позива"
 
-#: ../src/clients/ils.cpp:310
-#, c-format
-msgid "Updated information on %s"
-msgstr "Освежени подаци о %s"
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
+msgid "Edit account"
+msgstr "Измени налог"
 
-#: ../src/clients/ils.cpp:314 ../src/endpoints/accountshandler.cpp:332
-#: ../src/endpoints/sip.cpp:235
-#, c-format
-msgid "Unregistered from %s"
-msgstr "Нерегистрован од %s"
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
+msgid "Registrar:"
+msgstr "Регистар:"
 
-#: ../src/clients/stun.cpp:104
-#, c-format
-msgid "STUN server set to %s"
-msgstr "STUN сервер је %s"
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
+msgid "Gatekeeper:"
+msgstr "Чувар капије:"
 
-# bug: STUN
-#: ../src/clients/stun.cpp:113
-msgid "Removed STUN server"
-msgstr "Уклоњен STUN сервер"
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:174
+msgid "User:"
+msgstr "Корисник:"
 
-#: ../src/clients/stun.cpp:142
-#, c-format
-msgid ""
-"STUN test result: %s.\n"
-"\n"
-"Ekiga could not detect the type of NAT you are using. The most appropriate "
-"method, if your router does not natively support SIP or H.323, is probably "
-"to forward the required ports to your internal machine and use IP "
-"translation if you are behind a NAT router. Please also make sure you are "
-"not running a local firewall."
-msgstr ""
-"Резултат STUN провере: %s.\n"
-"\n"
-"Екига не може да препозна врсту адресног преводиоца који користите, "
-"најпогоднији метод, уколико усмеривач природно не подржава SIP или H.323, је "
-"да прослеђујете потребне портове вашој унутрашњој машини и користите ИП "
-"превођење уколико сте иза адресног преводиоца усмеривача. Молим да такође "
-"проверите да немате покренут локални заштитни зид."
+#. Translators:
+#. * SIP knows two usernames: The name for the client ("User") and the name
+#. * for the authentication procedure ("Authentication User")
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
+msgid "Authentication User:"
+msgstr "Корисничко име за пријаву:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:173
+msgid "Password:"
+msgstr "Лозинка:"
 
-#: ../src/clients/stun.cpp:148
-#, c-format
-msgid ""
-"STUN test result: %s.\n"
-"\n"
-"Your system does not need any specific configuration as long as you do not "
-"have a local firewall blocking the ports required by Ekiga."
-msgstr ""
-"Резултат STUN провере: %s.\n"
-"\n"
-"За ваш систем није потребно никакво нарочито подешавање ако не користите "
-"локални заштитни зид који блокира портове које користи Екига."
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
+msgid "Timeout:"
+msgstr "Време прекорачења:"
+
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
+msgid "Enable Account"
+msgstr "Омогући налог"
+
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
+msgid "You did not supply a name for that account."
+msgstr "Морате навести име овог налога."
+
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
+msgid "You did not supply a host to register to."
+msgstr "Морате навести рачунар који користите за посредника или излаз."
+
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
+msgid "You did not supply a user name for that account."
+msgstr "Морате навести корисничко име за овај налог."
+
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
+msgid "The timeout should have a bigger value."
+msgstr "Време прекорачења мора бити веће."
+
+#: ../lib/engine/components/opal/opal-bank.cpp:75
+msgid "_Add an Ekiga.net Account"
+msgstr "Дод_ај Ekiga.net налог"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:77
+msgid "_Add an Ekiga Call Out Account"
+msgstr "Дод_ај Екига налог за телефонирање са рачунара на телефон"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:79
+msgid "_Add a SIP Account"
+msgstr "Дод_ај SIP налог"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:81
+msgid "_Add an H.323 Account"
+msgstr "Дод_ај H.323 налог"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:96
+msgid "Please update the following fields."
+msgstr "Ажурирајте следећа поља."
+
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
+msgid "Get an Ekiga.net SIP account"
+msgstr "Затражите ekiga.net SIP налог"
 
-#: ../src/clients/stun.cpp:153
-msgid ""
-"Ekiga detected Symmetric NAT. The most appropriate method, if your router "
-"does not natively support SIP or H.323, is to forward the required ports to "
-"your internal machine in order to change your Symmetric NAT into Cone NAT. "
-"If you run this test again after the port forwarding has been done, it "
-"should report Cone NAT. This should allow Ekiga to be used with STUN support "
-"enabled. If it does not report Cone NAT, then it means that there is a "
-"problem in your forwarding rules."
-msgstr ""
-"Екига је открио симетрични адресни преводилац. Најпогоднији начин, уколико "
-"ваш усмеривач сам не подржава SIP или H.323 је да прослеђујете тражене "
-"портове на ваш интерни рачунар ради измене вашег симетричног адресног "
-"преводиоца у купасти. Поново покретање ове провере треба да пријави купасти "
-"адресни преводилац, и да омогући да се Екига користи уз STUN подршку. "
-"Уколико не пријави купасти адресни преводилац након што је извршено "
-"прослеђивање портова, то значи да има неких проблема у вашим правилима "
-"прослеђивања."
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
+msgid "Get an Ekiga Call Out account"
+msgstr "Затражи Екига налог за телефонирање са рачунара на телефон"
 
-#: ../src/clients/stun.cpp:157
-#, c-format
-msgid ""
-"STUN test result: %s.\n"
-"\n"
-"You do not seem to be using a NAT router. STUN support is not required."
-msgstr ""
-"Резултат STUN пробе: %s.\n"
-"\n"
-"Чини се да не користите адресног мрежног преводиоца. STUN подршка није "
-"потребна."
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2711
+#: ../src/gui/main.cpp:2806
+msgid "Account ID:"
+msgstr "ИБ налога:"
+
+#: ../lib/engine/components/opal/opal-bank.cpp:117
+msgid "PIN Code:"
+msgstr "ПИН број:"
 
-#: ../src/clients/stun.cpp:162
-#, c-format
-msgid ""
-"STUN test result: %s.\n"
-"\n"
-"Using a STUN server is most probably the most appropriate method if your "
-"router does not natively support SIP or H.323.\n"
-"\n"
-"Enable STUN Support?"
-msgstr ""
-"Резултат STUN провере: %s.\n"
-"\n"
-"Најпогоднији начин, уколико усмеривач сам не подржава SIP или H.323 је да "
-"користите STUN сервер.\n"
-"\n"
-"Укључити STUN подршку?"
+#: ../lib/engine/components/opal/opal-call.cpp:405
+msgid "Local user cleared the call"
+msgstr "Локални корисник је склонио позив"
 
-#: ../src/clients/stun.cpp:170 ../src/clients/stun.cpp:183
-msgid "NAT Detection Finished"
-msgstr "Обављено је препознавање мрежног адресног преводиоца"
+#: ../lib/engine/components/opal/opal-call.cpp:408
+#: ../lib/engine/components/opal/opal-call.cpp:411
+msgid "Local user rejected the call"
+msgstr "Локални корисник је одбио позив"
 
-#: ../src/clients/stun.cpp:194
-msgid "The detection of your NAT type is finished"
-msgstr "Обављено је препознавање врсте вашег мрежног адресног преводиоца"
+#: ../lib/engine/components/opal/opal-call.cpp:414
+msgid "Remote user cleared the call"
+msgstr "Удаљени корисник је поништио позив"
 
-#: ../src/clients/stun.cpp:261
-msgid "Unknown NAT"
-msgstr "Непознат адресни преводилац"
+#: ../lib/engine/components/opal/opal-call.cpp:417
+msgid "Remote user rejected the call"
+msgstr "Удаљени корисник је одбио позив"
 
-#: ../src/clients/stun.cpp:262
-msgid "Open NAT"
-msgstr "Отворени адресни преводилац"
+#: ../lib/engine/components/opal/opal-call.cpp:420
+msgid "Remote user has stopped calling"
+msgstr "Удаљени корисник је зауставио позив"
 
-#: ../src/clients/stun.cpp:263
-msgid "Cone NAT"
-msgstr "Купасти адресни преводилац"
+#: ../lib/engine/components/opal/opal-call.cpp:423
+msgid "Abnormal call termination"
+msgstr "Ненормалан прекид позива"
 
-#: ../src/clients/stun.cpp:264
-msgid "Restricted NAT"
-msgstr "Ограничени адресни преводилац"
+#: ../lib/engine/components/opal/opal-call.cpp:426 ../src/gui/main.cpp:1501
+msgid "Could not connect to remote host"
+msgstr "Не може се повезати на удаљеног домаћина"
 
-#: ../src/clients/stun.cpp:265
-msgid "Port Restricted NAT"
-msgstr "Адресни преводилац ограничен по порту"
+#: ../lib/engine/components/opal/opal-call.cpp:429
+msgid "The Gatekeeper cleared the call"
+msgstr "Чувар капије је поништио позив"
 
-#: ../src/clients/stun.cpp:266
-msgid "Symmetric NAT"
-msgstr "Симетрични адресни преводилац"
+#: ../lib/engine/components/opal/opal-call.cpp:432
+msgid "User not found"
+msgstr "Корисник није пронађен"
 
-#: ../src/clients/stun.cpp:267
-msgid "Symmetric Firewall"
-msgstr "Симетрични заштитни зид"
+#: ../lib/engine/components/opal/opal-call.cpp:435
+msgid "Insufficient bandwidth"
+msgstr "Недовољан пропусни опсег"
 
-#: ../src/clients/stun.cpp:268
-msgid "Blocked"
-msgstr "Блокиран"
+#: ../lib/engine/components/opal/opal-call.cpp:438
+msgid "No common codec"
+msgstr "Нема познатог кодека"
 
-#: ../src/clients/stun.cpp:269
-msgid "Partially Blocked"
-msgstr "Делимично блокиран"
+#: ../lib/engine/components/opal/opal-call.cpp:441
+msgid "Call forwarded"
+msgstr "Позив преусмерен"
 
-#: ../src/clients/stun.cpp:270
-msgid "No NAT"
-msgstr "Нема адресног преводиоца"
+#: ../lib/engine/components/opal/opal-call.cpp:444
+msgid "Security check failed"
+msgstr "Неуспешна сигурносна провера"
 
-#: ../src/clients/stun.cpp:321
-msgid "Detection in progress"
-msgstr "Препознавање је у току..."
+#: ../lib/engine/components/opal/opal-call.cpp:447
+msgid "Local user is busy"
+msgstr "Локални корисник је заузет"
 
-#: ../src/clients/stun.cpp:322
-msgid "Please wait while your type of NAT is being detected."
-msgstr ""
-"Молим сачекајте — у току је препознавање врсте вашег адресног преводиоца."
+#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:456
+msgid "Congested link to remote party"
+msgstr "Препуна веза до удаљене стране"
 
-#: ../src/clients/stun.cpp:373
-#, c-format
-msgid "Set STUN server to %s (%s)"
-msgstr "Постави STUN сервер на %s (%s)"
+#: ../lib/engine/components/opal/opal-call.cpp:453
+msgid "Remote user is busy"
+msgstr "Удаљени корисник је заузет"
 
-#: ../src/clients/stun.cpp:375
-#, c-format
-msgid "Ignored STUN server (%s)"
-msgstr "Занемарени STUN сервер (%s)"
+#: ../lib/engine/components/opal/opal-call.cpp:459
+msgid "Remote host is offline"
+msgstr "Удаљени рачунар није на мрежи"
 
-#: ../src/components/bonobo.cpp:117
-msgid "Cannot run Ekiga"
-msgstr "Не могу да покренем Екигу"
+#: ../lib/engine/components/opal/opal-call.cpp:465
+msgid "User is not available"
+msgstr "Корисник није доступан"
 
-#: ../src/components/bonobo.cpp:117
-msgid ""
-"Ekiga is already running, if you want it to call a given SIP, H.323, or "
-"callto address, please use \"ekiga -c address\"."
-msgstr ""
-"Екига је већ покренута, ако желите да упути позив на дату адресу, молим "
-"користите наредбу „ekiga -c АДРЕСА“."
+#: ../lib/engine/components/opal/opal-call.cpp:477
+msgid "Call completed"
+msgstr "Позив завршен"
 
-#: ../src/components/bonobo.cpp:170
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
 msgid ""
-"It appears that you do not have ekiga.server installed in a valid location. "
-"Factory mode disabled.\n"
+"Ekiga did not manage to configure your network settings automatically. You "
+"can still use it, but you need to configure your network settings manually.\n"
+"\n"
+"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"for instructions"
 msgstr ""
-"Изгледа да немате ekiga.server инсталиран на исправном месту. Фабрички режим "
-"искључен.\n"
+"Екига није успела да сама подеси мрежна подешавања. И даље је можете "
+"користити, али ћете морати да подесите мрежу ручно.\n"
+"\n"
+"Погледајте http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"за инструкције"
 
-#: ../src/components/bonobo.cpp:174
-msgid ""
-"Error registering Ekiga with the activation service; factory mode disabled.\n"
-msgstr ""
-"Грешка при регистровању Екиге са услугом за покретање. Искључен фабрички "
-"режим.\n"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:258
+#: ../lib/engine/components/opal/sip-endpoint.cpp:260
+msgid "Message"
+msgstr "Порука"
 
-#: ../src/components/bonobo.cpp:214
-msgid "Failed to retrieve Ekiga server from activation server\n"
-msgstr "Није успео да позове Екига сервер са сервера за покретање\n"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:632
+msgid "Bad request"
+msgstr "Лош захтев"
 
-#: ../src/devices/audio.cpp:285
-msgid "Opening device for playing"
-msgstr "Отвара уређај ради пуштања"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:636
+msgid "Payment required"
+msgstr "Није бесплатно"
 
-#: ../src/devices/audio.cpp:287
-msgid "Opening device for recording"
-msgstr "Отвара уређај ради снимања"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:640
+msgid "Unauthorized"
+msgstr "Неовлашћен"
 
-#: ../src/devices/audio.cpp:298 ../src/devices/audio.cpp:300
-#: ../src/devices/videoinput.cpp:708
-msgid "Failed to open the device"
-msgstr "Не може да отвори уређај"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:644
+msgid "Forbidden"
+msgstr "Забрањено"
 
-#: ../src/devices/audio.cpp:298
-#, c-format
-msgid ""
-"Impossible to open the selected audio device (%s) for recording. Please "
-"check your audio setup, the permissions and that the device is not busy."
-msgstr ""
-"Није могуће отворити изабрани звучни уређај (%s) за снимање. Проверите "
-"подешавање звука, овлашћења и да ли је уређај заузет."
+#: ../lib/engine/components/opal/sip-endpoint.cpp:648
+msgid "Timeout"
+msgstr "Временски рок"
 
-#: ../src/devices/audio.cpp:300
-#, c-format
-msgid ""
-"Impossible to open the selected audio device (%s) for playing. Please check "
-"your audio setup, the permissions and that the device is not busy."
-msgstr ""
-"Није могуће отворити изабран звучни уређај (%s) за пуштање. Проверите "
-"подешавање звука, овлашћења и да ли је уређај заузет."
+#: ../lib/engine/components/opal/sip-endpoint.cpp:652
+msgid "Conflict"
+msgstr "Сукоб"
 
-#: ../src/devices/audio.cpp:316 ../src/devices/audio.cpp:385
-msgid "Cannot use the audio device"
-msgstr "Не може да користи звучни уређај"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:656
+msgid "Temporarily unavailable"
+msgstr "Привремено недоступна"
 
-#: ../src/devices/audio.cpp:316
-#, c-format
-msgid ""
-"The selected audio device (%s) was successfully opened but it is impossible "
-"to read data from this device. Please check your audio setup."
-msgstr ""
-"Изабран звучни уређај (%s) је успешно отворен али је немогуће читати податке "
-"са овог уређаја. Проверите звучна подешавања."
+#: ../lib/engine/components/opal/sip-endpoint.cpp:660
+msgid "Not acceptable"
+msgstr "Неприхватљиво"
 
-#: ../src/devices/audio.cpp:325
-msgid "Recording your voice"
-msgstr "Снима ваш глас"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:664
+msgid "Illegal status code"
+msgstr "Недозвољена шифра стања"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:668
+msgid "Multiple choices"
+msgstr "Вишеструки избор"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:672
+msgid "Moved permanently"
+msgstr "Трајно премештен"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:676
+msgid "Moved temporarily"
+msgstr "Привремено премештен"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:680
+msgid "Use proxy"
+msgstr "Користи посредника"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:684
+msgid "Alternative service"
+msgstr "Резервни сервис"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:688
+msgid "Not found"
+msgstr "Није пронађен"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:692
+msgid "Method not allowed"
+msgstr "Метода није дозвољена"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:696
+msgid "Proxy authentication required"
+msgstr "Захтева се пријављивање на посредника"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:700
+msgid "Length required"
+msgstr "Захтева се дужина"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:704
+msgid "Request entity too big"
+msgstr "Захтевани ентитет је превелики"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:708
+msgid "Request URI too long"
+msgstr "Адреса захтева је предугачка"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:712
+msgid "Unsupported media type"
+msgstr "Неподржани тип медија"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:716
+msgid "Unsupported URI scheme"
+msgstr "Неподржана шема адресе"
+
+#. Translators : The extension we are trying to register does not exist
+#: ../lib/engine/components/opal/sip-endpoint.cpp:721
+msgid "Bad extension"
+msgstr "Лоше проширење"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
+msgid "Extension required"
+msgstr "Захтева се проширење"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
+msgid "Interval too brief"
+msgstr "Интервал је прекратак"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
+msgid "Loop detected"
+msgstr "Детектована петља"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
+msgid "Too many hops"
+msgstr "Превише скокова"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
+msgid "Address incomplete"
+msgstr "Адреса није довршена"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
+msgid "Ambiguous"
+msgstr "Двосмислено"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
+msgid "Busy Here"
+msgstr "Овде је заузето"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
+msgid "Request terminated"
+msgstr "Захтев је прекинут"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
+msgid "Not acceptable here"
+msgstr "Овде је неприхватљиво"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
+msgid "Bad event"
+msgstr "Лош догађај"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
+msgid "Request pending"
+msgstr "Захтев је на чекању"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
+msgid "Undecipherable"
+msgstr "Дешифровање није могуће"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
+msgid "Internal server error"
+msgstr "Интерна грешка на серверу"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
+msgid "Not implemented"
+msgstr "НОво није имплементирано"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
+msgid "Bad gateway"
+msgstr "Лош мрежни пролаз"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
+msgid "Service unavailable"
+msgstr "Сервис није доступан"
 
-#: ../src/devices/audio.cpp:364
-msgid "Recording and playing back"
-msgstr "Снимање и пуштање"
+# bug(slobo): msgstr "Нема рока за одговор" ...сумњам да је ово
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
+msgid "Server timeout"
+msgstr "Истекао је временски рок на серверу"
 
-#: ../src/devices/audio.cpp:385
-#, c-format
-msgid ""
-"The selected audio device (%s) was successfully opened but it is impossible "
-"to write data to this device. Please check your audio setup."
-msgstr ""
-"Изабран звучни уређај (%s) је успешно отворен али је немогуће снимати "
-"податке на овај уређај. Проверите звучна подешавања."
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
+msgid "SIP version not supported"
+msgstr "Издање SIP-а није подржано"
 
-#: ../src/devices/audio.cpp:481 ../src/devices/audio.cpp:482
-#: ../src/devices/videoinput.cpp:310 ../src/devices/videoinput.cpp:585
-#: ../src/endpoints/ekiga.cpp:352 ../src/endpoints/ekiga.cpp:354
-#: ../src/endpoints/ekiga.cpp:356 ../src/endpoints/pcss.cpp:194
-#: ../src/gui/druid.cpp:1779 ../src/gui/druid.cpp:1793
-#: ../src/gui/druid.cpp:1853
-msgid "No device found"
-msgstr "Нисам нашао уређај"
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
+msgid "Message too large"
+msgstr "Порука је предугачка"
 
-#: ../src/devices/audio.cpp:500
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
+msgid "Busy everywhere"
+msgstr "Свуда је заузето"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
+msgid "Decline"
+msgstr "Одбиј"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
+msgid "Does not exist anymore"
+msgstr "Више не постоји"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:813
+msgid "Globally not acceptable"
+msgstr "Глобално неприхватљиво"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:950
+msgid "Could not send message"
+msgstr "Не могу да пошаљем поруку"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1045
 #, c-format
-msgid ""
-"Ekiga is now recording from %s and playing back to %s. Please say \"1, 2, 3, "
-"Ekiga rocks!\" in your microphone. You should hear yourself back into the "
-"speakers with a four-second delay."
-msgstr ""
-"Екига сада снима са %s и пушта на %s. Молим реците „1 2 3“ у ваш микрофон, и "
-"треба да чујете себе са звучника након 4 секунде."
+msgid "Incoming call from %s"
+msgstr "Долазни позив од %s"
 
-#: ../src/devices/videoinput.cpp:319
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1047
 #, c-format
-msgid "Opening video device %s with plugin %s"
-msgstr "Отвара видео уређај %s помоћу додатка %s"
+msgid "Incoming call"
+msgstr "Долазни позив"
 
-#: ../src/devices/videoinput.cpp:347
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1053
 #, c-format
-msgid "Successfully opened video device %s, channel %d"
-msgstr "Успешно отворен видео уређај %s, канал %d"
+msgid "In a call with %s"
+msgstr "На вези са %s"
 
-#: ../src/devices/videoinput.cpp:358
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1055
 #, c-format
-msgid "Error while opening video device %s"
-msgstr "Грешка при отварању видео уређаја %s"
+msgid "In a call"
+msgstr "На вези"
 
-#. Translators: Do not translate MovingLogo and Picture
-#: ../src/devices/videoinput.cpp:362
-msgid ""
-"A moving logo will be transmitted during calls. Notice that you can always "
-"transmit a given image or the moving logo by choosing \"Picture\" as video "
-"plugin and \"MovingLogo\" or \"StaticPicture\" as device."
-msgstr ""
-"Покретни лого ће бити пренет за време позива. Увек можете послати дату слику "
-"или покретни лого избором „Слика“ за видео додатак и „ПокретниЛого“ или "
-"„СтатичнаСлика“ за уређај."
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:102
+msgid "New resource list"
+msgstr "Нови списак ресурса"
 
-#: ../src/devices/videoinput.cpp:364
-msgid "Couldn't open the video device"
-msgstr "Не могу да отворим видео уређај"
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:166
+msgid "Add new resource-list"
+msgstr "Додај нови списак ресурса"
 
-#: ../src/devices/videoinput.cpp:368
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:167
 msgid ""
-"There was an error while opening the device. Please check your permissions "
-"and make sure that the appropriate driver is loaded."
+"Please fill in this form to add a new contact list to ekiga's remote roster"
 msgstr ""
-"Догодила се грешка приликом отварања уређаја. Проверите овлашћења и уверите "
-"се да је одговарајући управљачки програм учитан."
+"Попуните овај формулар за додавање новог списка контаката у Екигиној удаљеној "
+"листи контаката"
 
-#: ../src/devices/videoinput.cpp:372 ../src/devices/videoinput.cpp:686
-msgid "Your video driver doesn't support the requested video format."
-msgstr "Управљачки програм за видео не подржава захтевани видео формат."
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:171
+msgid "Writable:"
+msgstr "Уписиво:"
 
-#: ../src/devices/videoinput.cpp:376
-msgid "Could not open the chosen channel."
-msgstr "Не могу да отворим изабрани канал."
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:172
+msgid "Username:"
+msgstr "Корисничко име:"
 
-#: ../src/devices/videoinput.cpp:380
-msgid ""
-"Your driver doesn't seem to support any of the color formats supported by "
-"Ekiga.\n"
-" Please check your kernel driver documentation in order to determine which "
-"Palette is supported."
-msgstr ""
-"Управљачки програм изгледа да не подржава ниједан од формата боја које Екига "
-"подржава.\n"
-" Проверите документацију вашег управљачког програма у језгру да одредите "
-"која палета је подржана."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
+#: ../lib/engine/components/resource-list/rl-heap.cpp:178
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
+msgid "Unnamed"
+msgstr "Неименовано"
 
-#: ../src/devices/videoinput.cpp:384
-msgid "Error while setting the frame rate."
-msgstr "Грешка приликом подешавања броја оквира у секунди."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:200
+msgid "_Add a new contact"
+msgstr "Дод_ај нови контакт"
 
-#: ../src/devices/videoinput.cpp:388
-msgid "Error while setting the frame size."
-msgstr "Грешка приликом подешавања величине слике."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:202
+msgid "_Refresh contact list"
+msgstr "_Освежи списак контаката"
 
-#: ../src/devices/videoinput.cpp:428
-msgid "Opened the video device using the \"Picture\" video plugin"
-msgstr "Отворен видео уређај уз видео додатак „Слика“"
-
-#: ../src/devices/videoinput.cpp:586
-msgid "Picture"
-msgstr "Слика"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:204
+msgid "Contact list _properties"
+msgstr "Особине списка контаката"
 
-#: ../src/devices/videoinput.cpp:598
-#, c-format
-msgid ""
-"Ekiga is now testing the %s video device. If you experience machine crashes, "
-"then report a bug to the video driver author."
-msgstr ""
-"Екига сада испробава видео уређај %s. Уколико машина заглави, онда пријавите "
-"грешку аутору управљачког програма за видео."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
+msgid "Edit contact list properties"
+msgstr "Измени особине списка контаката"
 
-#: ../src/devices/videoinput.cpp:660
-#, c-format
-msgid "Test %d done"
-msgstr "Провера %d је готова"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
+msgid "Please edit the following fields (no identifier means global)"
+msgstr "Измените следећа поља (без идентификатора подразумева глобалну измену)"
 
-#: ../src/devices/videoinput.cpp:662
-#, c-format
-msgid "Test %d failed"
-msgstr "Провера %d неуспела"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+msgid "Contact list's name"
+msgstr "Име списка контаката"
 
-#: ../src/devices/videoinput.cpp:681
-#, c-format
-msgid "Error while opening %s."
-msgstr "Грешка код отварања %s."
+#. "Document" used as a name -- uri point to the root of a document tree
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
+msgid "Document root"
+msgstr "Корен документа"
 
-#: ../src/devices/videoinput.cpp:690
-msgid "Could not open the chosen channel with the chosen video format."
-msgstr "Не може да отвори изабрани канал са изабраним видео форматом."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+msgid "Identifier"
+msgstr "Идентификатор"
 
-#: ../src/devices/videoinput.cpp:694
-msgid "Your driver doesn't support any of the color formats tried by Ekiga"
-msgstr ""
-"Управљачки програм не подржава ниједан од формата боја које је покушао да "
-"користи Екига"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
+msgid "Writable"
+msgstr "Уписиво"
 
-#: ../src/devices/videoinput.cpp:698
-msgid "Error with the frame rate."
-msgstr "Грешка са бројем слика у секунди."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+msgid "Server username"
+msgstr "Корисничко име сервера"
 
-#: ../src/devices/videoinput.cpp:702
-msgid "Error with the frame size."
-msgstr "Грешка са величином слике."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+msgid "Server password"
+msgstr "Лозинка сервера"
 
-#: ../src/endpoints/accountshandler.cpp:186
-#: ../src/endpoints/accountshandler.cpp:270
-msgid "Registering"
-msgstr "Регистрација је у току..."
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
+msgid "Add a remote contact"
+msgstr "Додај удаљени контакт"
 
-#: ../src/endpoints/accountshandler.cpp:200
-#, c-format
-msgid "Registration of %s to %s failed"
-msgstr "Неуспела регистрација корисника %s на систему %s"
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
+msgid "Please fill in this form to create a new contact on a remote server"
+msgstr ""
+"Попуните овај формулар да бисте направили нови контакт на удаљеном серверу"
 
-#: ../src/endpoints/accountshandler.cpp:211
-#: ../src/endpoints/accountshandler.cpp:323 ../src/endpoints/sip.cpp:316
-#: ../src/endpoints/sip.cpp:328
-msgid "Registration failed"
-msgstr "Неуспела регистрација"
-
-#: ../src/endpoints/accountshandler.cpp:225
-#: ../src/endpoints/accountshandler.cpp:338
-msgid "Unregistering"
-msgstr "Поништавање регистрације је у току..."
-
-#: ../src/endpoints/accountshandler.cpp:294
-msgid "Gatekeeper registration failed: duplicate alias"
-msgstr "Неуспешна регистрација чувара капије: поновљен надимак"
-
-#: ../src/endpoints/accountshandler.cpp:298
-msgid "Gatekeeper registration failed: bad username/password"
-msgstr "Неуспешна регистрација чувара капије: лоше име/лозинка"
-
-#: ../src/endpoints/accountshandler.cpp:301
-msgid "Gatekeeper registration failed: transport error"
-msgstr "Неуспешна регистрација чувара капије: грешка у преносу"
-
-#: ../src/endpoints/accountshandler.cpp:304
-#: ../src/endpoints/accountshandler.cpp:309
-msgid "Gatekeeper registration failed"
-msgstr "Неуспешна регистрација чувара капије"
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+msgid "Edit remote contact"
+msgstr "Измени удаљени контакт"
 
-#: ../src/endpoints/accountshandler.cpp:312 ../src/endpoints/sip.cpp:224
-#, c-format
-msgid "Registered to %s"
-msgstr "Регистрован(а) на %s"
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
+msgid ""
+"Please fill in this form to change an existing contact on a remote server"
+msgstr ""
+"Попуните овај формулар да измените постојећи контакт на удаљеном серверу"
 
-#: ../src/endpoints/accountshandler.cpp:322 ../src/endpoints/sip.cpp:230
-msgid "Registered"
-msgstr "Регистрација је обављена"
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
+msgid "Invalid server data"
+msgstr "Неисправни подаци о серверу"
 
-#: ../src/endpoints/accountshandler.cpp:352 ../src/endpoints/sip.cpp:241
-msgid "Unregistered"
-msgstr "Нерегистрован(а)"
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
+msgid "Click to fetch"
+msgstr "Кликните да добавите"
 
-#: ../src/endpoints/ekiga.cpp:105
-msgid "Answering incoming call"
-msgstr "Одговарање на долазни позив"
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
+msgid "Distant contact"
+msgstr "Удаљени контакт"
 
-#: ../src/endpoints/ekiga.cpp:530
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
 #, c-format
-msgid "Started Ekiga %d.%d.%d for user %s"
-msgstr "Покренута Екига %d.%d.%d за корисника %s"
+msgid "%s / List #%d"
+msgstr "%s / Списак #%d"
 
-#: ../src/endpoints/manager.cpp:672
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
 #, c-format
-msgid "Forwarding call to %s"
-msgstr "Прослеђује позив за %s"
+msgid "List #%d"
+msgstr "Списак #%d"
 
-#. Update the log and status bar
-#: ../src/endpoints/manager.cpp:826
-#, c-format
-msgid "Call from %s"
-msgstr "Позив од %s"
-
-#: ../src/endpoints/manager.cpp:840
-msgid "Rejecting incoming call"
-msgstr "Одбацивање долазећег позива"
-
-#: ../src/endpoints/manager.cpp:842
-#, c-format
-msgid "Rejecting incoming call from %s"
-msgstr "Одбија позив од %s"
-
-#: ../src/endpoints/manager.cpp:848
-msgid "Forwarding incoming call"
-msgstr "Преусмерава долазни позив"
-
-#: ../src/endpoints/manager.cpp:850
-#, c-format
-msgid "Forwarding incoming call from %s to %s"
-msgstr "Преусмерава позив од %s до %s"
-
-#: ../src/endpoints/manager.cpp:856
-msgid "Auto-Answering incoming call"
-msgstr "Само одговарање на долазни позив"
+#: ../lib/engine/gui/gtk-core/form-dialog-gtk.cpp:660
+msgid "Advanced"
+msgstr "Напредно"
 
-#: ../src/endpoints/manager.cpp:857
-#, c-format
-msgid "Auto-Answering incoming call from %s"
-msgstr "Само одговарање долазног позива %s"
-
-#: ../src/endpoints/manager.cpp:1012
-#, c-format
-msgid "Connected with %s using %s"
-msgstr "Повезано са %s користећи %s"
-
-#: ../src/endpoints/manager.cpp:1014
-#, c-format
-msgid "Connected with %s"
-msgstr "Повезано са %s"
-
-#: ../src/endpoints/manager.cpp:1124 ../src/gui/main.cpp:4156
-msgid "Standby"
-msgstr "Приправан"
-
-#: ../src/endpoints/manager.cpp:1189
-msgid "Local user cleared the call"
-msgstr "Локални корисник је склонио позив"
-
-#: ../src/endpoints/manager.cpp:1192 ../src/endpoints/manager.cpp:1195
-msgid "Local user rejected the call"
-msgstr "Локални корисник је одбио позив"
-
-#: ../src/endpoints/manager.cpp:1198
-msgid "Remote user cleared the call"
-msgstr "Удаљени корисник је поништио позив"
-
-#: ../src/endpoints/manager.cpp:1201
-msgid "Remote user rejected the call"
-msgstr "Удаљени корисник је одбио позив"
-
-#: ../src/endpoints/manager.cpp:1204
-msgid "Call not answered in the required time"
-msgstr "На позив није одговорено у захтеваном времену"
-
-#: ../src/endpoints/manager.cpp:1207
-msgid "Remote user has stopped calling"
-msgstr "Удаљени корисник је зауставио позив"
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:659
+msgid "Address Book"
+msgstr "Именик"
 
-#: ../src/endpoints/manager.cpp:1210
-msgid "Abnormal call termination"
-msgstr "Ненормалан прекид позива"
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
+#: ../src/gui/main.cpp:3132
+msgid "Address _Book"
+msgstr "Имени_к"
 
-#: ../src/endpoints/manager.cpp:1213
-msgid "Could not connect to remote host"
-msgstr "Не може се повезати на удаљеног домаћина"
+#. This will add static and dynamic actions
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:684
+msgid "_Action"
+msgstr "_Радња"
+
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:729
+msgid "Category"
+msgstr "Категорија"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
+#: ../src/gui/assistant.cpp:1368
+msgid "Full Name"
+msgstr "Пуно име"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:601
+msgid "_Search Filter:"
+msgstr "_Филтер претраге:"
 
-#: ../src/endpoints/manager.cpp:1216
-msgid "The Gatekeeper cleared the call"
-msgstr "Чувар капије је поништио позив"
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:247
+msgid "says:"
+msgstr "каже:"
 
-#: ../src/endpoints/manager.cpp:1219 ../src/endpoints/urlhandler.cpp:530
-#: ../src/endpoints/urlhandler.cpp:535
-msgid "User not found"
-msgstr "Корисник није пронађен"
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:370
+msgid "Open link in browser"
+msgstr "Отвори везу у Интернет прегледнику"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:376
+msgid "Copy link"
+msgstr "Умножи везу"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
+msgid "_Smile..."
+msgstr "_Смешак..."
 
-#: ../src/endpoints/manager.cpp:1222
-msgid "Insufficient bandwidth"
-msgstr "Недовољан пропусни опсег"
+#. we can't do much here since we get the Chat as reference...
+#: ../lib/engine/gui/gtk-frontend/chat-window.cpp:432
+msgid "Chat Window"
+msgstr "Прозор за текстуалне поруке"
 
-#: ../src/endpoints/manager.cpp:1225
-msgid "No common codec"
-msgstr "Нема познатог кодека"
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:989
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1024
+msgid "Unsorted"
+msgstr "Непоређано"
+
+#: ../lib/gui/codecsbox.cpp:478
+msgid "Move selected codec priority upwards"
+msgstr "Помери приоритет означеног кодека на више"
+
+#: ../lib/gui/codecsbox.cpp:488
+msgid "Move selected codec priority downwards"
+msgstr "Помери приоритет означеног кодека на ниже"
 
-#: ../src/endpoints/manager.cpp:1228
-msgid "Call forwarded"
-msgstr "Позив преусмерен"
+#: ../lib/gui/gmdialog.c:462
+msgid "Do not show this dialog again"
+msgstr "Не приказуј више ово прозорче"
 
-#: ../src/endpoints/manager.cpp:1231
-msgid "Security check failed"
-msgstr "Неуспешна сигурносна провера"
+#: ../src/gui/accounts.cpp:230
+msgid "Registered"
+msgstr "Регистрација је обављена"
 
-#: ../src/endpoints/manager.cpp:1234
-msgid "Local user is busy"
-msgstr "Локални корисник је заузет"
+#: ../src/gui/accounts.cpp:234
+msgid "Unregistered"
+msgstr "Нерегистрован(а)"
 
-#: ../src/endpoints/manager.cpp:1237 ../src/endpoints/manager.cpp:1243
-msgid "Congested link to remote party"
-msgstr "Препуна веза до удаљене стране"
+#: ../src/gui/accounts.cpp:238
+msgid "Could not unregister"
+msgstr "Не могу да искључим налог"
+
+#: ../src/gui/accounts.cpp:244
+msgid "Could not register"
+msgstr "Не могу да региструјем налог"
+
+#: ../src/gui/accounts.cpp:250
+msgid "Processing..."
+msgstr "Обрађујем..."
 
-#: ../src/endpoints/manager.cpp:1240
-msgid "Remote user is busy"
-msgstr "Удаљени корисник је заузет"
+#: ../src/gui/accounts.cpp:636
+msgid "Account Name"
+msgstr "Име налога"
 
-#: ../src/endpoints/manager.cpp:1246
-msgid "Remote host is offline"
-msgstr "Удаљени рачунар није на мрежи"
+#: ../src/gui/accounts.cpp:637
+msgid "Voice Mails"
+msgstr "Говорна пошта"
 
-#: ../src/endpoints/manager.cpp:1251
-msgid "Remote user is unreachable"
-msgstr "Удаљени корисник није доступан"
+#: ../src/gui/accounts.cpp:638
+msgid "Status"
+msgstr "Стање"
 
-#: ../src/endpoints/manager.cpp:1255
-msgid "Call completed"
-msgstr "Позив завршен"
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
+msgid "Accounts"
+msgstr "Налози"
 
-#: ../src/endpoints/manager.cpp:1609
-msgid "Error while starting the listener for the H.323 protocol"
-msgstr "Грешка при покретању слушача за H.323 протокол"
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3193
+msgid "_Accounts"
+msgstr "На_лози"
 
-#: ../src/endpoints/manager.cpp:1609
-msgid ""
-"You will not be able to receive incoming H.323 calls. Please check that no "
-"other program is already running on the port used by Ekiga."
-msgstr ""
-"Нећете моћи да примате долазне H.323 позиве. Молим проверите да неки други "
-"програм већ није покренут на порту који користи Екига."
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3276
+msgid "_Help"
+msgstr "_Помоћ"
 
-#: ../src/endpoints/manager.cpp:1626
-msgid "Error while starting the listener for the SIP protocol"
-msgstr "Грешка при покретању слушача за SIP протокол"
+#  Translators: This is "A" as in "Audio"
+#. Translators:
+#. * The following string "A" means "activated" or "active". It's a column
+#. * description in the list of configured accounts, it shows if an account
+#. * is activated or not (a status the user can choose).
+#.
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
+msgid "A"
+msgstr "З"
 
-#: ../src/endpoints/manager.cpp:1626
+#: ../src/gui/assistant.cpp:321
 msgid ""
-"You will not be able to receive incoming SIP calls. Please check that no "
-"other program is already running on the port used by Ekiga."
+"This is the Ekiga general configuration assistant. The following steps will "
+"set up Ekiga by asking a few simple questions.\n"
+"\n"
+"Once you have completed these steps, you can always change them later by "
+"selecting Preferences in the Edit menu."
 msgstr ""
-"Нећете моћи да примате долазне SIP позиве. Молим проверите да неки други "
-"програм није тренутно покренут на порту који користи Екига."
-
-#: ../src/endpoints/manager.cpp:1873
-#, c-format
-msgid "Opened codec %s for transmission"
-msgstr "Отворен кодек %s за пренос"
-
-#: ../src/endpoints/manager.cpp:1884
-#, c-format
-msgid "Closed codec %s which was opened for transmission"
-msgstr "Затворен кодек %s који је отворен за пренос"
-
-#: ../src/endpoints/manager.cpp:1898
-#, c-format
-msgid "Opened codec %s for reception"
-msgstr "Отворен кодек %s за пријем"
-
-#: ../src/endpoints/manager.cpp:1909
-#, c-format
-msgid "Closed codec %s which was opened for reception"
-msgstr "Затворен кодек %s који је отворен за пријем"
-
-#: ../src/endpoints/manager.cpp:2095
-#, c-format
-msgid "%.2ld:%.2ld:%.2ld  A:%.2f/%.2f   V:%.2f/%.2f"
-msgstr "%.2ld:%.2ld:%.2ld  З:%.2f/%.2f   В:%.2f/%.2f"
-
-#: ../src/endpoints/pcss.cpp:218
-#, c-format
-msgid "Opened %s for recording with plugin %s"
-msgstr "Отворио сам %s ради снимања помоћу додатка %s"
-
-#: ../src/endpoints/pcss.cpp:219
-#, c-format
-msgid "Opened %s for playing with plugin %s"
-msgstr "Отворио сам %s ради пуштања помоћу додатка %s"
-
-#: ../src/endpoints/pcss.cpp:237
-msgid "Could not open audio channel for audio transmission"
-msgstr "Не може да отвори звучни канал за звучни пренос"
-
-#: ../src/endpoints/pcss.cpp:237
-msgid ""
-"An error occured while trying to record from the soundcard for the audio "
-"transmission. Please check that your soundcard is not busy and that your "
-"driver supports full-duplex.\n"
-"The audio transmission has been disabled."
-msgstr ""
-"Догодила се грешка приликом покушаја да снима са звучне карте за звучни "
-"пренос. Проверите да ли карта није заузета и да ли управљачки програм "
-"подржава full-duplex.\n"
-"Звучни пренос искључен."
-
-#: ../src/endpoints/pcss.cpp:239
-msgid "Could not open audio channel for audio reception"
-msgstr "Не може да отвори звучни канал за звучни пријем"
-
-#: ../src/endpoints/pcss.cpp:239
-msgid ""
-"An error occured while trying to play audio to the soundcard for the audio "
-"reception. Please check that your soundcard is not busy and that your driver "
-"supports full-duplex.\n"
-"The audio reception has been disabled."
-msgstr ""
-"Догодила се грешка приликом покушаја да се пусти звук са звучне карте за "
-"звучни пријем. Проверите да ли карта није заузета и да ли управљачки програм "
-"подржава full-duplex.\n"
-"Звучни пријем искључен."
-
-#: ../src/endpoints/sip.cpp:287
-msgid "Bad request"
-msgstr "Лош захтев"
-
-#: ../src/endpoints/sip.cpp:291
-msgid "Payment required"
-msgstr "Није бесплатно"
-
-#: ../src/endpoints/sip.cpp:296
-msgid "Forbidden"
-msgstr "Забрањено"
-
-#: ../src/endpoints/sip.cpp:300
-msgid "Timeout"
-msgstr "Временски рок"
-
-#: ../src/endpoints/sip.cpp:304
-msgid "Conflict"
-msgstr "Сукоб"
-
-#: ../src/endpoints/sip.cpp:308
-msgid "Temporarily unavailable"
-msgstr "Привремено недоступна"
-
-#: ../src/endpoints/sip.cpp:312
-msgid "Not Acceptable"
-msgstr "Неприхватљиво"
-
-#: ../src/endpoints/sip.cpp:321
-#, c-format
-msgid "Registration failed: %s"
-msgstr "Неуспела регистрација: %s"
-
-#: ../src/endpoints/sip.cpp:333
-#, c-format
-msgid "Unregistration failed: %s"
-msgstr "Неуспело поништавање регистрације: %s"
+"Ово је чаробњак за подешавање Екиге. Следећи кораци ће подесити Екигу "
+"постављањем пар једноставних питања.\n"
+"\n"
+"Када прођете ове кораке, касније их увек можете изменити одабирањем ставке "
+"Поставке у менију Уређивање."
 
-#: ../src/endpoints/sip.cpp:340
-msgid "Unregistration failed"
-msgstr "Неуспешно поништавање регистрације"
+#: ../src/gui/assistant.cpp:329
+msgid "Welcome to Ekiga"
+msgstr "Добродошли у Екигу"
 
-#: ../src/endpoints/sip.cpp:540
-msgid "Error: User not found"
-msgstr "Грешка: Корисник није пронађен"
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
+msgid "Personal Information"
+msgstr "Лични подаци"
 
-#: ../src/endpoints/sip.cpp:544
-msgid "Error: User offline"
-msgstr "Грешка: Корисник није на мрежи"
+#. The user fields
+#: ../src/gui/assistant.cpp:356
+msgid "Please enter your first name and your surname:"
+msgstr "Унесите име и презиме:"
 
-#: ../src/endpoints/sip.cpp:549
-msgid "Error: Forbidden"
-msgstr "Грешка: Забрањено"
+#: ../src/gui/assistant.cpp:365
+msgid ""
+"Your first name and surname will be used when connecting to other VoIP and "
+"videoconferencing software."
+msgstr ""
+"Име и презиме ће се користити при повезивању са осталим VoIP и софтвером за "
+"видео конференције."
 
-#: ../src/endpoints/sip.cpp:553
-msgid "Error: Timeout"
-msgstr "Грешка: Време је истекло"
+#: ../src/gui/assistant.cpp:559
+msgid "Ekiga.net Account"
+msgstr "Ekiga.net налог"
 
-#: ../src/endpoints/sip.cpp:557 ../src/gui/chat.cpp:1031
-msgid "Error: Failed to transmit message"
-msgstr "Грешка: Не могу да пренесем поруку"
+#: ../src/gui/assistant.cpp:561
+msgid "Please enter your username:"
+msgstr "Унесите ваше корисничко име:"
 
-#: ../src/endpoints/urlhandler.cpp:441
-msgid "Invalid URL handler"
-msgstr "Погрешна URL ручка"
+#: ../src/gui/assistant.cpp:569
+msgid "Please enter your password:"
+msgstr "Унесите вашу лозинку:"
 
-#: ../src/endpoints/urlhandler.cpp:441
+#: ../src/gui/assistant.cpp:579
 msgid ""
-"Please specify a valid URL handler. Currently both h323: and callto: are "
-"supported."
-msgstr "Одредите исправну URL ручку. Тренутно оба h323: и callto: су подржани."
-
-#: ../src/endpoints/urlhandler.cpp:469
-#, c-format
-msgid "Calling %s"
-msgstr "Позива %s"
+"The username and password are used to login to your existing account at the "
+"ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
+"you may first create an account below. This will provide a SIP address that "
+"allows people to call you.\n"
+"\n"
+"You may skip this step if you use an alternative SIP service, or if you "
+"would prefer to specify the login details later."
+msgstr ""
+"Можете да прескочите овај корак уколико користите неку другу SIP услугу или "
+"би желели да касније наведете податке за пријаву."
 
-#: ../src/endpoints/urlhandler.cpp:472
-#, c-format
-msgid "Transferring call to %s"
-msgstr "Преноси позив до %s"
+#: ../src/gui/assistant.cpp:606
+msgid "I do not want to sign up for the ekiga.net free service"
+msgstr "Не желим да прихватим ekiga.net бесплатну услугу"
 
-#: ../src/endpoints/urlhandler.cpp:541 ../src/endpoints/urlhandler.cpp:546
-msgid "Failed to call user"
-msgstr "Нисам успео да позовем корисника"
-
-#: ../src/gui/accounts.cpp:408
-msgid "Edit the Account Information"
-msgstr "Уреди податке налога"
-
-#. Account Name
-#: ../src/gui/accounts.cpp:432
-msgid "Account Name:"
-msgstr "Име налога:"
-
-#: ../src/gui/accounts.cpp:446
-msgid "Protocol:"
-msgstr "Протокол:"
+#: ../src/gui/assistant.cpp:669
+msgid "Ekiga Call Out Account"
+msgstr "Екига налог за телефонирање са рачунара на телефон"
 
-#: ../src/gui/accounts.cpp:470 ../src/gui/accounts.cpp:973
-msgid "Registrar:"
-msgstr "Регистар:"
+#: ../src/gui/assistant.cpp:671
+msgid "Please enter your account ID:"
+msgstr "Унесите корисничко име налога:"
 
-#: ../src/gui/accounts.cpp:472 ../src/gui/accounts.cpp:982
-msgid "Gatekeeper:"
-msgstr "Чувар капије:"
+#: ../src/gui/assistant.cpp:679
+msgid "Please enter your PIN code:"
+msgstr "Унесите вашу ПИН лозинку:"
 
-#. User
-#: ../src/gui/accounts.cpp:486
-msgid "User:"
-msgstr "Корисник:"
+#: ../src/gui/assistant.cpp:690
+msgid ""
+"You can make calls to regular phones and cell numbers worldwide using "
+"Ekiga.\n"
+"\n"
+"To enable this, you need to do two things:\n"
+"- First buy an account at the URL below.\n"
+"- Then enter your account ID and PIN code.\n"
+"The service will work only if your account is created using the URL in this "
+"dialog.\n"
+msgstr ""
+"Користећи Екигу можете да позивате обичне телефонске и мобилне бројеве широм "
+"света.\n"
+"\n"
+"Да би то урадили треба да:\n"
+"- Купите налог на доњој адреси.\n"
+"- Унесете број налога и лозинку.\n"
+"Услуга ће радити само ако сте налог направили користећи адресу из овог "
+"прозорчета.\n"
 
-#. Password
-#: ../src/gui/accounts.cpp:501
-msgid "Password:"
-msgstr "Лозинка:"
+#: ../src/gui/assistant.cpp:740
+msgid "Consult the calls history"
+msgstr "Погледај историјат позива"
 
-#. Advanced Options
-#: ../src/gui/accounts.cpp:518
-msgid "More _Options"
-msgstr "Више _могућности"
-
-#: ../src/gui/accounts.cpp:532
-msgid "Authentication Login:"
-msgstr "Пријава:"
-
-#: ../src/gui/accounts.cpp:554 ../src/gui/accounts.cpp:983
-msgid "Gatekeeper ID:"
-msgstr "ИБ чувара капије:"
-
-#. Timeout
-#: ../src/gui/accounts.cpp:578
-msgid "Registration Timeout:"
-msgstr "Рок за регистрацију:"
-
-#. SIP
-#. H323
-#: ../src/gui/accounts.cpp:684 ../src/gui/accounts.cpp:686
-#: ../src/gui/addressbook.cpp:3114 ../src/gui/addressbook.cpp:3593
-msgid "Missing information"
-msgstr "Недостају подаци"
-
-#: ../src/gui/accounts.cpp:684
-msgid ""
-"Please make sure to provide a valid account name, host name, and user name."
-msgstr "Молим доставите исправно име налога, рачунара и корисничко име."
-
-#: ../src/gui/accounts.cpp:686
-msgid ""
-"Please make sure to provide a valid account name, host name and registration "
-"timeout."
-msgstr "Молим доставите исправно име налога, рачунара и рока за регистрацију."
+#: ../src/gui/assistant.cpp:750
+msgid "I do not want to sign up for the Ekiga Call Out service"
+msgstr ""
+"Не желим да се пријавим за Екигину услугу телефонирања са рачунара на телефон"
 
-#: ../src/gui/accounts.cpp:716
-#, c-format
-msgid "Are you sure you want to delete account %s?"
-msgstr "Да ли сте сигурни да желите да уклоните налог %s?"
+#  Connection type
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
+msgid "Connection Type"
+msgstr "Врста повезивања"
 
-#: ../src/gui/accounts.cpp:974
-msgid "Realm/Domain:"
-msgstr "Домен:"
+#. The connection type
+#: ../src/gui/assistant.cpp:819
+msgid "Please choose your connection type:"
+msgstr "Изаберите врсту везе:"
 
-#: ../src/gui/accounts.cpp:1497
-msgid "Account Name"
-msgstr "Име налога"
+#: ../src/gui/assistant.cpp:836
+msgid "56k Modem"
+msgstr "Модем на обичној телефонској линији"
 
-#: ../src/gui/accounts.cpp:1498
-msgid "Protocol"
-msgstr "Протокол"
+#: ../src/gui/assistant.cpp:841
+msgid "ISDN"
+msgstr "Дигитална тел. линија са интегрисаним услугама"
 
-#: ../src/gui/accounts.cpp:1507
-msgid "Voice Mails"
-msgstr "Говорна пошта"
+#: ../src/gui/assistant.cpp:846
+msgid "DSL/Cable (128 kbit/s uplink)"
+msgstr "ДСЛ/Кабловска (128 kbit/s одлазно)"
+
+#: ../src/gui/assistant.cpp:851
+msgid "DSL/Cable (512 kbit/s uplink)"
+msgstr "ДСЛ/Кабловска (512 kbit/s одлазно)"
+
+#: ../src/gui/assistant.cpp:856
+msgid "LAN"
+msgstr "Локална мрежа"
 
-#: ../src/gui/accounts.cpp:1508
-msgid "Status"
-msgstr "Стање"
+#: ../src/gui/assistant.cpp:861
+msgid "Keep current settings"
+msgstr "Задржи текућа подешавања"
 
-#: ../src/gui/accounts.cpp:1519
-msgid "Accounts"
-msgstr "Налози"
+#: ../src/gui/assistant.cpp:866
+msgid ""
+"The connection type will permit determining the best quality settings that "
+"Ekiga will use during calls. You can later change the settings individually "
+"in the preferences window."
+msgstr ""
+"Врста везе дозвољава одређивање подешавања са најбољим квалитетом које ће "
+"Екига користити приликом позива. Накнадно можете изменити појединачна "
+"подешавања међу поставкама."
 
-#  Translators: This is "A" as in "Audio"
-#: ../src/gui/accounts.cpp:1555 ../src/gui/preferences.cpp:474
-#: ../src/gui/preferences.cpp:817
-msgid "A"
-msgstr "З"
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3022
+#: ../src/gui/main.cpp:3026 ../src/gui/preferences.cpp:760
+msgid "Audio Devices"
+msgstr "Звучни уређаји"
 
-#: ../src/gui/accounts.cpp:1655
-msgid "_Default"
-msgstr "_Почетно"
-
-#: ../src/gui/addressbook.cpp:819
-msgid "Contact collision"
-msgstr "Судар контакта"
+#: ../src/gui/assistant.cpp:962
+msgid "Please choose the audio ringing device:"
+msgstr "Изаберите звучни уређај за звоно:"
 
-#: ../src/gui/addressbook.cpp:821
-#, c-format
+#: ../src/gui/assistant.cpp:982
 msgid ""
-"Another contact with the same speed dial already exists in your address "
-"book:\n"
-"\n"
-"<b>Name</b>: %s\n"
-"<b>URL</b>: %s\n"
-"<b>Speed Dial</b>: %s\n"
+"The audio ringing device is the device that will be used to play the ringing "
+"sound on incoming calls."
 msgstr ""
-"Други контакт са истим брзим бирањем већ постоји у адресару:\n"
-"\n"
-"<b>Име</b>: %s\n"
-"<b>Адреса</b>: %s\n"
-"<b>Брзо бирање</b>: %s\n"
-
-#: ../src/gui/addressbook.cpp:821 ../src/gui/addressbook.cpp:823
-#: ../src/gui/druid.cpp:1915 ../src/gui/preferences.cpp:930
-msgid "None"
-msgstr "Ништа"
+"Звучни уређај за звоно је уређај који се користи за пуштање звука звона при "
+"долазним позивима."
 
-#: ../src/gui/addressbook.cpp:823
-#, c-format
+#. ---
+#: ../src/gui/assistant.cpp:993
+msgid "Please choose the audio output device:"
+msgstr "Изаберите излазни уређај за звук:"
+
+#: ../src/gui/assistant.cpp:1013
 msgid ""
-"Another contact with similar information already exists in your address "
-"book:\n"
-"\n"
-"<b>Name</b>: %s\n"
-"<b>URL</b>: %s\n"
-"<b>Speed Dial</b>: %s\n"
-"\n"
-"Do you still want to add the contact?"
+"The audio output device is the device that will be used to play audio during "
+"calls."
 msgstr ""
-"Други контакт са сличним подацима већ постоји у адресару:\n"
-"\n"
-"<b>Име</b>: %s\n"
-"<b>Адреса</b>: %s\n"
-"<b>Брзо бирање</b>: %s\n"
-"\n"
-"Да ли и даље желите да додате овај контакт?"
-
-#  Translators: This is "S" as in "Status"
-#. Translators: This is "S" as in "Status"
-#: ../src/gui/addressbook.cpp:991
-msgid "S"
-msgstr "С"
-
-#: ../src/gui/addressbook.cpp:1002 ../src/gui/preferences.cpp:488
-msgid "Name"
-msgstr "Име"
-
-#: ../src/gui/addressbook.cpp:1017
-msgid "Comment"
-msgstr "Коментар"
-
-#: ../src/gui/addressbook.cpp:1032 ../src/gui/callshistory.cpp:755
-msgid "Software"
-msgstr "Софтвер"
-
-#: ../src/gui/addressbook.cpp:1046
-msgid "VoIP URL"
-msgstr "Адреса за пренос гласа преко Интернета"
-
-#: ../src/gui/addressbook.cpp:1062
-msgid "E-Mail"
-msgstr "Е-пошта"
-
-#: ../src/gui/addressbook.cpp:1076
-msgid "Location"
-msgstr "Место"
-
-#: ../src/gui/addressbook.cpp:1090
-msgid "Categories"
-msgstr "Категорије"
-
-#: ../src/gui/addressbook.cpp:1103
-msgid "Speed Dial"
-msgstr "Брзо бирање"
-
-#: ../src/gui/addressbook.cpp:1132
-msgid "Name contains"
-msgstr "Име садржи"
-
-#: ../src/gui/addressbook.cpp:1133
-msgid "URL contains"
-msgstr "Адреса садржи"
-
-#: ../src/gui/addressbook.cpp:1135
-msgid "Belongs to category"
-msgstr "Припада категорији"
-
-#: ../src/gui/addressbook.cpp:1137
-msgid "Location contains"
-msgstr "Адреса садржи"
-
-#. call a contact, usage: general
-#: ../src/gui/addressbook.cpp:1552 ../src/gui/addressbook.cpp:2586
-#: ../src/gui/callshistory.cpp:295 ../src/gui/chat.cpp:682
-msgid "C_all Contact"
-msgstr "_Контакт листа"
-
-#. copy a contact's URL to clipboard, usage: general
-#: ../src/gui/addressbook.cpp:1559 ../src/gui/addressbook.cpp:2596
-#: ../src/gui/chat.cpp:677 ../src/gui/chat.cpp:682
-msgid "_Copy URL to Clipboard"
-msgstr "У_множи адресу у списак исечака"
-
-#: ../src/gui/addressbook.cpp:1565 ../src/gui/addressbook.cpp:2601
-msgid "_Write e-Mail"
-msgstr "Напиши е-порук_у"
-
-#. add a contact to the local addressbook, usage: remote contacts only
-#: ../src/gui/addressbook.cpp:1572 ../src/gui/addressbook.cpp:2613
-#: ../src/gui/callshistory.cpp:302 ../src/gui/chat.cpp:682
-msgid "Add Contact to _Address Book"
-msgstr "Додај контакт у _адресар"
-
-#. send a contact a (SIP!) message, usage: SIP contacts only
-#: ../src/gui/addressbook.cpp:1579 ../src/gui/addressbook.cpp:2591
-msgid "_Send Message"
-msgstr "Пошаљи по_руку"
-
-#. edit a local contact's addressbook entry, usage: local contacts
-#: ../src/gui/addressbook.cpp:1586 ../src/gui/addressbook.cpp:1723
-#: ../src/gui/addressbook.cpp:2572
-msgid "_Properties"
-msgstr "О_собине"
-
-#. delete a local contact entry, usage: local contacts
-#: ../src/gui/addressbook.cpp:1593 ../src/gui/addressbook.cpp:1730
-#: ../src/gui/addressbook.cpp:2567
-msgid "_Delete"
-msgstr "О_бриши"
-
-#. "new contact" dialog, usage: local context
-#: ../src/gui/addressbook.cpp:1600 ../src/gui/addressbook.cpp:2608
-msgid "New _Contact"
-msgstr "Нови _контакт"
-
-#: ../src/gui/addressbook.cpp:2027
-#, c-format
-msgid "Error while fetching users list from %s"
-msgstr "Грешка при преузимању списка корисника са %s"
-
-#: ../src/gui/addressbook.cpp:2031
-#, c-format
-msgid "Found %d user in %s"
-msgid_plural "Found %d users in %s"
-msgstr[0] "Пронађен %d корисник у %s"
-msgstr[1] "Пронађено %d корисника у %s"
-msgstr[2] "Пронађена %d корисника у %s"
-
-#: ../src/gui/addressbook.cpp:2035
-#, c-format
-msgid "Found %d user in %s for a total of %d users"
-msgid_plural "Found %d users in %s for a total of %d users"
-msgstr[0] "Пронађен %d корисник у %s од укупно %d корисника"
-msgstr[1] "Пронађена %d корисника у %s од укупно %d корисника"
-msgstr[2] "Пронађено %d корисника у %s од укупно %d корисника"
-
-#: ../src/gui/addressbook.cpp:2523
-msgid "Address Book"
-msgstr "Именик"
-
-#: ../src/gui/addressbook.cpp:2558
-msgid "_File"
-msgstr "_Датотека"
-
-#: ../src/gui/addressbook.cpp:2560
-msgid "New _Address Book"
-msgstr "Нови и_меник"
-
-#: ../src/gui/addressbook.cpp:2579 ../src/gui/main.cpp:975
-msgid "_Close"
-msgstr "_Затвори"
-
-#: ../src/gui/addressbook.cpp:2584
-msgid "C_ontact"
-msgstr "К_онтакт"
-
-#: ../src/gui/addressbook.cpp:2686
-msgid "Remote Contacts"
-msgstr "Удаљени контакти"
+"Излазни уређај за звук је уређај који се користи за пуштање звука за време "
+"позива."
 
-#: ../src/gui/addressbook.cpp:2694
-msgid "Local Contacts"
-msgstr "Локални контакти"
+#. ---
+#: ../src/gui/assistant.cpp:1024
+msgid "Please choose the audio input device:"
+msgstr "Изаберите улазни уређај за звук:"
 
-#: ../src/gui/addressbook.cpp:2817
-msgid "Edit the Contact Information"
-msgstr "Уреди податке контакта"
+#: ../src/gui/assistant.cpp:1044
+msgid ""
+"The audio input device is the device that will be used to record your voice "
+"during calls."
+msgstr ""
+"Улазни уређај за звук је уређај који се користи за снимање гласа за време "
+"позива."
 
-#: ../src/gui/addressbook.cpp:2838 ../src/gui/addressbook.cpp:3308
-msgid "Name:"
-msgstr "Име:"
+#: ../src/gui/assistant.cpp:1146
+msgid "Please choose your video input device:"
+msgstr "Изаберите улазни уређај за видео:"
 
-#: ../src/gui/addressbook.cpp:2858
-msgid "VoIP URL:"
-msgstr "Адреса за пренос гласа преко Интернета:"
+#: ../src/gui/assistant.cpp:1166
+msgid ""
+"The video input device is the device that will be used to capture video "
+"during calls."
+msgstr ""
+"Улазни уређај за видео је уређај који се користи за снимање видеа за време "
+"позива."
 
-#: ../src/gui/addressbook.cpp:2880
-msgid "Email:"
-msgstr "Е-пошта:"
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
+#: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
+msgid "No device found"
+msgstr "Нисам нашао уређај"
 
-#: ../src/gui/addressbook.cpp:2901
-msgid "Speed Dial:"
-msgstr "Брзо бирање:"
+#: ../src/gui/assistant.cpp:1310
+msgid "Configuration Complete"
+msgstr "Подешавање завршено"
 
-#: ../src/gui/addressbook.cpp:2923
-msgid "Categories:"
-msgstr "Категорије:"
+#: ../src/gui/assistant.cpp:1312
+msgid ""
+"You have now finished the Ekiga configuration. All the settings can be "
+"changed in the Ekiga preferences. Enjoy!"
+msgstr ""
+"Управо сте завршили подешавање Екиге. Можете променити сва подешавања променити из "
+"Екигиних „Поставки“. Уживајте!"
 
-#: ../src/gui/addressbook.cpp:2948
-msgid "Local Addressbook:"
-msgstr "Локални адресар:"
+#: ../src/gui/assistant.cpp:1319
+msgid "Configuration summary:"
+msgstr "Преглед подешавања:"
 
-#: ../src/gui/addressbook.cpp:3114
-msgid ""
-"Please make sure to provide at least a full name or an URL for the contact."
-msgstr "Проверите да ли сте унели бар пуно име или адресу контакта."
+#: ../src/gui/assistant.cpp:1389
+msgid "Audio Ringing Device"
+msgstr "Звучни уређај за звоно"
 
-#: ../src/gui/addressbook.cpp:3161
-#, c-format
-msgid "Are you sure you want to delete %s from %s?"
-msgstr "Да ли сте сигурни да желите да уклоните %s из %s?"
+#: ../src/gui/assistant.cpp:1398
+msgid "Audio Output Device"
+msgstr "Излазни звучни уређај"
 
-#: ../src/gui/addressbook.cpp:3287
-msgid "Edit an address book"
-msgstr "Уреди именик"
-
-#: ../src/gui/addressbook.cpp:3288
-msgid "Add an address book"
-msgstr "Додај адресар"
-
-#: ../src/gui/addressbook.cpp:3333
-msgid "Type:"
-msgstr "Врста:"
-
-#: ../src/gui/addressbook.cpp:3339
-msgid "Local"
-msgstr "Локални"
-
-#: ../src/gui/addressbook.cpp:3340
-msgid "Remote LDAP"
-msgstr "Удаљени ЛДАП"
-
-#: ../src/gui/addressbook.cpp:3341
-msgid "Remote ILS"
-msgstr "Удаљени ИЛС"
-
-#: ../src/gui/addressbook.cpp:3372
-msgid "Hostname:"
-msgstr "Име рачунара:"
-
-#: ../src/gui/addressbook.cpp:3395
-msgid "Port:"
-msgstr "Порт:"
-
-#: ../src/gui/addressbook.cpp:3420
-msgid "Base DN:"
-msgstr "Основно име домена:"
-
-#: ../src/gui/addressbook.cpp:3443
-msgid "Search Scope:"
-msgstr "Опсег претраге:"
+#: ../src/gui/assistant.cpp:1407
+msgid "Audio Input Device"
+msgstr "Улазни звучни уређај"
 
-#: ../src/gui/addressbook.cpp:3449
-msgid "Subtree"
-msgstr "Подстабло"
+#: ../src/gui/assistant.cpp:1416
+msgid "Video Input Device"
+msgstr "Улазни видео уређај"
 
-#: ../src/gui/addressbook.cpp:3450
-msgid "One Level"
-msgstr "Један ниво"
+#: ../src/gui/assistant.cpp:1429
+msgid "SIP URI"
+msgstr "SIP адреса"
 
-#: ../src/gui/addressbook.cpp:3480
-msgid "Search Attribute:"
-msgstr "Претражи атрибут:"
-
-#: ../src/gui/addressbook.cpp:3593
-msgid "Please make sure you fill in all required fields."
-msgstr "Молим проверите да ли сте попунили сва обавезна поља."
+#: ../src/gui/assistant.cpp:1441
+msgid "Ekiga Call Out"
+msgstr "Екига телефонирање са рачунара на телефон"
 
-#: ../src/gui/addressbook.cpp:3639
+#: ../src/gui/assistant.cpp:1485
 #, c-format
-msgid "Are you sure you want to delete %s and all its contacts?"
-msgstr "Да ли сте сигурни да желите да уклоните %s и припадајуће контакте?"
+msgid "Ekiga Configuration Assistant (%d of %d)"
+msgstr "Чаробњак за уводно подешавање (страна %d/%d)"
 
-#: ../src/gui/callbacks.cpp:124
-msgid "Disconnecting..."
-msgstr "Прекидам..."
-
-#: ../src/gui/callbacks.cpp:139
+#: ../src/gui/callbacks.cpp:131
 msgid "Contributors:"
 msgstr "Сарадници:"
 
-#: ../src/gui/callbacks.cpp:146
+#: ../src/gui/callbacks.cpp:143
 msgid "Artwork:"
 msgstr "Уметнички рад:"
 
-#: ../src/gui/callbacks.cpp:152
+#: ../src/gui/callbacks.cpp:151
 msgid "See AUTHORS file for full credits"
 msgstr "Прочитајте датотеку AUTHORS са списком свих учесника"
 
+#: ../src/gui/callbacks.cpp:167
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version. "
+msgstr ""
+"Екига је слободан софтвер; можете га расподељивати и/или га мењати под "
+"условима ГНУ Опште Јавне Лиценце (GNU GPL) како је објављује Задужбина за "
+"Слободни Софтвер (FSF); било верзије 2 те Лиценце, било (по вашем нахођењу) "
+"било које новије верзије."
+
+#: ../src/gui/callbacks.cpp:171
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details. You should have received a copy of the GNU General Public "
+"License along with this program; if not, write to the Free Software "
+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Екига се расподељује у нади да ће бити од користи, али БЕЗ ИКАКВИХ "
+"ГАРАНЦИЈА; чак и без подразумеване гаранције КОРИСНОСТИ или ПРИЛАГОЂЕНОСТИ "
+"ОДРЕЂЕНОЈ НАМЕНИ.  Видите ГНУ Општу Јавну Лиценцу за више детаља. Требали "
+"сте да примите примерак ГНУ Опште Јавне Лиценце уз Екигу; ако нисте, пишите "
+"Задужбини за Слободни Софтвер (Free Software Foundation, Inc.), 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+
+#: ../src/gui/callbacks.cpp:178
+msgid ""
+"Ekiga is licensed under the GPL license and as a special exception, you have "
+"permission to link or otherwise combine this program with the programs OPAL, "
+"OpenH323 and PWLIB, and distribute the combination, without applying the "
+"requirements of the GNU GPL to the OPAL, OpenH323 and PWLIB programs, as "
+"long as you do follow the requirements of the GNU GPL for all the rest of "
+"the software thus combined."
+msgstr ""
+"Екига је лиценцирана под ГНУ Општом Јавном Лиценцом (GNU GPL), а као "
+"специјални изузетак, имате овлашћење да повезујете или на други начин "
+"комбинујете овај програм са програмима OPAL, OpenH323 and PWLIB и "
+"расподељујете овакву комбинацију без примене ГНУ Опште Јавне Лиценце на "
+"OPAL, OpenH323 and PWLIB програме, док год пратите захтеве ГНУ Опште Јавне "
+"Лиценце за остале искомбиноване програме."
+
 #. Translators: Please write translator credits here, and
 #. * separate names with \n
 #: ../src/gui/callbacks.cpp:190
@@ -2232,6 +2233,7 @@
 "Дејан Матијевић <dejan@ns.sympatico.ca>\n"
 "Данило Шеган <danilo@prevod.org>\n"
 "Слободан Д. Средојевић <slobo@akrep.be>\n"
+"Бранко Кокановић <branko.kokanovic@gmail.com>\n"
 "http://prevod.org — превод на српски језик."
 
 #: ../src/gui/callbacks.cpp:195
@@ -2244,935 +2246,648 @@
 "Интернет телефонијом, који омогућава да чините аудио и видео позиве удаљеним "
 "корисницима са SIP и H.323 хардвером или софтвером."
 
-#: ../src/gui/callshistory.cpp:664
-msgid "Received Calls"
-msgstr "Примљени позиви"
-
-#: ../src/gui/callshistory.cpp:664
-msgid "Placed Calls"
-msgstr "Начињени позиви"
-
-#: ../src/gui/callshistory.cpp:664
-msgid "Missed Calls"
-msgstr "Пропуштени позиви"
-
-#: ../src/gui/callshistory.cpp:676 ../src/gui/main.cpp:1136
-#: ../src/gui/statusicon.cpp:144
-msgid "Calls History"
-msgstr "Историјат позива"
+#: ../src/gui/callbacks.cpp:269
+msgid "Help display is not supported by your GTK+ version"
+msgstr "Приказ помоћи није подржан издањем ГТК+ библиотеке коју имате"
 
-#: ../src/gui/callshistory.cpp:719
-msgid "Date"
-msgstr "Датум"
-
-#: ../src/gui/callshistory.cpp:727
-msgid "Remote User"
-msgstr "Удањени корисник"
-
-#: ../src/gui/callshistory.cpp:736
-msgid "Call Duration"
-msgstr "Трајање позива"
-
-#: ../src/gui/callshistory.cpp:746
-msgid "Call End Reason"
-msgstr "Разлог завршетка разговора"
-
-#: ../src/gui/chat.cpp:625
-msgid "Hang _up"
-msgstr "Пре_кини везу"
-
-#: ../src/gui/chat.cpp:626 ../src/gui/statusicon.cpp:100
-msgid "_Call"
-msgstr "Поз_ив"
-
-#: ../src/gui/chat.cpp:627
-msgid "Call this user"
-msgstr "Позива овог корисника"
-
-#: ../src/gui/chat.cpp:635
-msgid "_Send"
-msgstr "_Пошаљи"
-
-#: ../src/gui/chat.cpp:640
-msgid "Send message"
-msgstr "Пошаљи поруку"
-
-#: ../src/gui/chat.cpp:677
-msgid "_Open URL"
-msgstr "Отвори _адресу"
-
-#: ../src/gui/chat.cpp:705
-msgid "_Copy Equation"
-msgstr "Умножи _једначину"
+#: ../src/gui/callbacks.cpp:277
+msgid "Unable to open help file."
+msgstr "Не могу да отворим датотеку помоћи."
 
-#: ../src/gui/chat.cpp:1325
-msgid "Chat Window"
-msgstr "Прозор за текстуалне поруке"
+#: ../src/gui/dialpad.cpp:55
+msgid "abc"
+msgstr "abc"
+
+#: ../src/gui/dialpad.cpp:56
+msgid "def"
+msgstr "def"
+
+#: ../src/gui/dialpad.cpp:57
+msgid "ghi"
+msgstr "ghi"
+
+#: ../src/gui/dialpad.cpp:58
+msgid "jkl"
+msgstr "jkl"
+
+#: ../src/gui/dialpad.cpp:59
+msgid "mno"
+msgstr "mnoвввв"
 
-#: ../src/gui/chat.cpp:1450
-msgid "You"
-msgstr "Ти"
+#: ../src/gui/dialpad.cpp:60
+msgid "pqrs"
+msgstr "pqrs"
 
-#. Translators: "He says", "You say"
-#: ../src/gui/chat.cpp:1452
-msgid "says:"
-msgstr "каже:"
+#: ../src/gui/dialpad.cpp:61
+msgid "tuv"
+msgstr "tuv"
 
-#: ../src/gui/chat.cpp:1452
-msgid "say:"
-msgstr "кажеш:"
+#: ../src/gui/dialpad.cpp:62
+msgid "wxyz"
+msgstr "wxyz"
+
+#. Translators: Is displayed once an account "%s" is registered.
+#: ../src/gui/main.cpp:526
+#, c-format
+msgid "Registered %s"
+msgstr "%s је регистрован"
 
-#: ../src/gui/chat.cpp:1524
-msgid "New Remote User"
-msgstr "Нови удаљени корисник"
+#. Translators: Is displayed once an account "%s" is unregistered.
+#: ../src/gui/main.cpp:533
+#, c-format
+msgid "Unregistered %s"
+msgstr "Искључен је налог %s"
 
-#: ../src/gui/config.cpp:236
-msgid "Changing this setting will only affect new calls"
-msgstr "Мењање овог подешавања ће се одразити само на нове позиве"
+#: ../src/gui/main.cpp:538
+#, c-format
+msgid "Could not unregister %s"
+msgstr "Не могу да искључим налог %s"
 
-#: ../src/gui/config.cpp:237
-msgid ""
-"Ekiga cannot apply one or more changes to the current call. Your new "
-"settings will take effect for the next call."
-msgstr ""
-"Екига не може да примени једну или више учињених измена на позив који је у "
-"току. Нова подешавања ће узети маха при следећем позиву."
+#: ../src/gui/main.cpp:542
+#, c-format
+msgid "Could not register %s"
+msgstr "Не могу да регистујем %s"
 
-#: ../src/gui/config.cpp:331
-msgid "H.245 Tunneling disabled"
-msgstr "H.245 тунел искључен"
+#: ../src/gui/main.cpp:612
+#, c-format
+msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
+msgstr "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 
-#: ../src/gui/config.cpp:332
-msgid "H.245 Tunneling enabled"
-msgstr "H.245 тунел укључен"
+#: ../src/gui/main.cpp:658
+#, c-format
+msgid "Connected with %s"
+msgstr "Повезан са %s"
 
-#: ../src/gui/config.cpp:364
-msgid "Early H.245 disabled"
-msgstr "Рани H.245 искључен"
+#: ../src/gui/main.cpp:699 ../src/gui/main.cpp:3522
+msgid "Standby"
+msgstr "Приправан"
 
-#: ../src/gui/config.cpp:365
-msgid "Early H.245 enabled"
-msgstr "Рани H.245 укључен"
+#: ../src/gui/main.cpp:760
+msgid "Call on hold"
+msgstr "Позив на чекању"
 
-#: ../src/gui/config.cpp:398
-msgid "Fast Start disabled"
-msgstr "Брзо покретање је искључено"
+#: ../src/gui/main.cpp:771
+msgid "Call retrieved"
+msgstr "Позив повраћен"
 
-#: ../src/gui/config.cpp:399
-msgid "Fast Start enabled"
-msgstr "Брзо покретање је укључено"
+#: ../src/gui/main.cpp:787
+#, c-format
+msgid "Missed call from %s"
+msgstr "Пропуштени позив од %s"
 
-#: ../src/gui/config.cpp:506
-msgid "Enabled silence detection"
-msgstr "Укључи откривање тишине"
+#: ../src/gui/main.cpp:924
+msgid "Error"
+msgstr "Грешка"
 
-#: ../src/gui/config.cpp:512
-msgid "Disabled silence detection"
-msgstr "Искључи откривање тишине"
+#: ../src/gui/main.cpp:989
+msgid "Error while initializing video output"
+msgstr "Грешка при покретању видео излаза"
 
-#: ../src/gui/config.cpp:571
-msgid "Enabled echo cancelation"
-msgstr "Поништавање одјека је укључено"
+#: ../src/gui/main.cpp:990
+msgid "No video will be displayed during this call->"
+msgstr "Никакав видео неће бити приказан за време овог позива->"
 
-#: ../src/gui/config.cpp:577
-msgid "Disabled echo cancelation"
-msgstr "Поништавање одјека је искључено"
+#: ../src/gui/main.cpp:1000
+msgid ""
+"There was an error opening or initializing the video output. Please verify "
+"that no other application is using the accelerated video output."
+msgstr ""
+"Десила се грешка приликом отварања или покретања видео излаза. Проверите да "
+"ниједан други програм не користи убрзани видео излаз."
 
-#: ../src/gui/druid.cpp:610
+#: ../src/gui/main.cpp:1002
 msgid ""
-"This is the Ekiga general configuration assistant. The following steps will "
-"set up Ekiga by asking a few simple questions.\n"
-"\n"
-"Once you have completed these steps, you can always change them later by "
-"selecting Preferences in the Edit menu."
+"There was an error opening or initializing the video output. Please verify "
+"that you are using a color depth of 24 or 32 bits per pixel."
 msgstr ""
-"Ово је чаробњак за подешавање Екиге. Следећи кораци ће подесити Екигу "
-"постављањем пар једноставних питања.\n"
-"\n"
-"Када прођете ове кораке, касније их увек можете изменити одабирањем ставке "
-"Поставке у менију Уређивање."
+"Десила се грешка приликом отварања или покретања видео излаза. Проверите да "
+"ли користите дубину боја од 24 или 32 бита по пикселу."
 
-#: ../src/gui/druid.cpp:622
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1115
 #, c-format
-msgid "Configuration Assistant - page 1/%d"
-msgstr "Чаробњак за уводно подешавање — страна 1/%d"
+msgid "Added video input device %s"
+msgstr "Додат је улазни видео уређај %s"
 
-#: ../src/gui/druid.cpp:664
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1127
 #, c-format
-msgid "Personal Information - page %d/%d"
-msgstr "Лични подаци — страна %d/%d"
+msgid "Removed video input device %s"
+msgstr "Уклоњен је улазни видео уређај %s"
 
-#. The user fields
-#: ../src/gui/druid.cpp:677
-msgid "Please enter your first name and your surname:"
-msgstr "Молим унесите име и презиме:"
+#: ../src/gui/main.cpp:1144
+#, c-format
+msgid "Error while accessing video device %s"
+msgstr "Грешка приликом приступа видео уређају %s"
 
-#: ../src/gui/druid.cpp:686
+#: ../src/gui/main.cpp:1147
 msgid ""
-"Your first name and surname will be used when connecting to other VoIP and "
-"videoconferencing software."
+"A moving logo will be transmitted during calls. Notice that you can always "
+"transmit a given image or the moving logo by choosing \"Picture\" as video "
+"plugin and \"Moving logo\" or \"Static picture\" as device."
 msgstr ""
-"Име и презиме ће се користити при повезивању са осталим VoIP и софтвером за "
-"видео конференције."
+"Покретни лого ће бити пренет за време позива. Увек можете послати дату слику "
+"или покретни лого избором „Слика“ за видео додатак и „ПокретниЛого“ или "
+"„СтатичнаСлика“ за уређај."
 
-#: ../src/gui/druid.cpp:732
-#, c-format
-msgid "ekiga.net Account - page %d/%d"
-msgstr "ekiga.net адреса — страна %d/%d"
+#: ../src/gui/main.cpp:1151
+msgid ""
+"There was an error while opening the device. In case it is a pluggable "
+"device it may be sufficient to reconnect it. If not, or if it still is not "
+"accessible, please check your permissions and make sure that the appropriate "
+"driver is loaded."
+msgstr ""
+"Догодила се грешка приликом отварања уређаја. Уколико можете да поново утакнете "
+"уређај, можда је то довољно се поново повеже. Уколико се уређај не утачиње "
+"или ово не успе, проверите овлашћења и уверите се да је одговарајући управљачки "
+"програм учитан."
 
-#: ../src/gui/druid.cpp:743
-msgid "Please enter your username:"
-msgstr "Молим унесите ваше корисничко име:"
+#: ../src/gui/main.cpp:1155
+msgid "Your video driver doesn't support the requested video format."
+msgstr "Управљачки програм за видео не подржава захтевани видео формат."
 
-#: ../src/gui/druid.cpp:751
-msgid "Please enter your password:"
-msgstr "Молим унесите вашу лозинку:"
+#: ../src/gui/main.cpp:1159
+msgid "Could not open the chosen channel."
+msgstr "Не могу да отворим изабрани канал."
 
-#: ../src/gui/druid.cpp:762
+#: ../src/gui/main.cpp:1163
 msgid ""
-"The username and password are used to login to your existing account at the "
-"ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
-"you may first create an account below. This will provide a SIP address that "
-"allows people to call you.\n"
-"\n"
-"You may skip this step if you use an alternative SIP service, or if you "
-"would prefer to specify the login details later."
+"Your driver doesn't seem to support any of the color formats supported by "
+"Ekiga.\n"
+" Please check your kernel driver documentation in order to determine which "
+"Palette is supported."
 msgstr ""
-"Можете да прескочите овај корак уколико користите неку другу SIP услугу или "
-"би желели да касније наведете податке за пријаву."
+"Управљачки програм изгледа да не подржава ниједан од формата боја које Екига "
+"подржава.\n"
+" Проверите документацију вашег управљачког програма у језгру да одредите "
+"која палета је подржана."
 
-#: ../src/gui/druid.cpp:772
-msgid "Get an ekiga.net SIP account"
-msgstr "Затражите ekiga.net SIP налог"
+#: ../src/gui/main.cpp:1167
+msgid "Error while setting the frame rate."
+msgstr "Грешка приликом подешавања броја кадрова у секунди."
 
-#: ../src/gui/druid.cpp:782
-msgid "I do not want to sign up for the ekiga.net free service"
-msgstr "Не желим да прихватим ekiga.net бесплатну услугу"
+#: ../src/gui/main.cpp:1171
+msgid "Error while setting the frame size."
+msgstr "Грешка приликом подешавања величине слике."
 
-#: ../src/gui/druid.cpp:835
-#, c-format
-msgid "Connection Type - page %d/%d"
-msgstr "Врста везе — страна %d/%d"
+#: ../src/gui/main.cpp:1176 ../src/gui/main.cpp:1278 ../src/gui/main.cpp:1393
+msgid "Unknown error."
+msgstr "Непозната грешка."
 
-#. The connection type
-#: ../src/gui/druid.cpp:847
-msgid "Please choose your connection type:"
-msgstr "Молим изаберите врсту везе:"
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1226
+#, c-format
+msgid "Added audio input device %s"
+msgstr "Додат улазни звучни уређај %s"
 
-#: ../src/gui/druid.cpp:855
-msgid ""
-"The connection type will permit determining the best quality settings that "
-"Ekiga will use during calls. You can later change the settings individually "
-"in the preferences window."
-msgstr ""
-"Врста везе дозвољава одређивање подешавања са најбољим квалитетом које ће "
-"Екига користити приликом позива. Накнадно можете изменити појединачна "
-"подешавања међу поставкама."
+#. Translators: This is a hotplug status
+#: ../src/gui/main.cpp:1243
+#, c-format
+msgid "Removed audio input device %s"
+msgstr "Уклоњен улазни звучни уређај %s"
 
-#: ../src/gui/druid.cpp:893
+#: ../src/gui/main.cpp:1260
 #, c-format
-msgid "NAT Type - page %d/%d"
-msgstr "Врста адресног преводиоца — страна %d/%d"
+msgid "Error while opening audio input device %s"
+msgstr "Грешка при отварању улазног звучног уређаја %s"
 
-#: ../src/gui/druid.cpp:903
-msgid "Click here to detect your NAT Type:"
-msgstr "Притисните овде да откријете коју врсту адресног преводиоца користите:"
+#. Translators: This happens when there is an error with audio input:
+#. * Nothing ("silence") will be transmitted
+#: ../src/gui/main.cpp:1265
+msgid "Only silence will be transmitted."
+msgstr "Друга страна ће чути само тишину."
 
-#: ../src/gui/druid.cpp:907
-msgid "Detect NAT Type"
-msgstr "Откриј врсту адресног преводиоца"
+#: ../src/gui/main.cpp:1269
+msgid ""
+"Unable to open the selected audio device for recording. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
+msgstr ""
+"Не могу да отворим изабрани звучни уређај за снимање. Уколико је уређај "
+"утачиње, можда ће бити довољно поново га повезати. Уколико се уређај не "
+"утачиње или ово не успе, проверите подешавање звука, овлашћења и да ли је "
+"уређај заузет."
 
-# bug: s/will permit to assist you/will assist you/
-#: ../src/gui/druid.cpp:911
+#: ../src/gui/main.cpp:1273
 msgid ""
-"The NAT type detection will permit to assist you in configuring your NAT "
-"router to be able to do calls with Ekiga."
+"The selected audio device was successfully opened but it is impossible to "
+"read data from this device. In case it is a pluggable device it may be "
+"sufficient to reconnect it. If not, or if it still is not accessible, please "
+"check your audio setup."
 msgstr ""
-"Откривање врсте адресног преводиоца ће вам помоћи да подесите ваш адресни "
-"преводилац усмеривач како би допуштао позиве из програма."
+"Изабран звучни уређај је успешно отворен али је немогуће читати податке са "
+"овог уређаја. Уколико можете да поново утакнете уређај, можда је то довољно "
+"да се поново повеже. Уколико се уређај не утачиње или ово не успе, "
+"проверите звучна подешавања."
+
+#: ../src/gui/main.cpp:1340
+#, c-format
+msgid "Added audio output device %s"
+msgstr "Додат је излазни звучни уређај %s"
 
-#: ../src/gui/druid.cpp:956
+#: ../src/gui/main.cpp:1356
 #, c-format
-msgid "Audio Manager - page %d/%d"
-msgstr "Управљање звуком — страна %d/%d"
+msgid "Removed audio output device %s"
+msgstr "Уклоњен је излазни звучни уређај %s"
 
-#. The Audio devices
-#: ../src/gui/druid.cpp:968
-msgid "Please choose your audio manager:"
-msgstr "Молим изаберите управљач звуком:"
+#: ../src/gui/main.cpp:1377
+#, c-format
+msgid "Error while opening audio output device %s"
+msgstr "Грешка при отварању излазног звучног уређаја %s"
+
+#: ../src/gui/main.cpp:1380
+msgid "No incoming sound will be played."
+msgstr "Долазни звук неће бити пуштан."
 
-#: ../src/gui/druid.cpp:977
+#: ../src/gui/main.cpp:1384
 msgid ""
-"The audio manager is the plugin that will manage your audio devices. "
-"WindowsMultimedia is probably the best choice when available."
+"Unable to open the selected audio device for playing. In case it is a "
+"pluggable device it may be sufficient to reconnect it. If not, or if it "
+"still is not accessible, please check your audio setup, the permissions and "
+"that the device is not busy."
 msgstr ""
-"Управљач звуком је додатак који управља звучним уређајима. WindowsMultimedia "
-"је вероватно најбоље решење ако је доступна."
+"Није могуће отворити изабран звучни уређај за пуштање. Уколико је уређај "
+"утачиње, можда ће бити довољно поново га повезати. Уколико се уређај не "
+"утачиње или ово не успе, проверите подешавање звука, овлашћења и да ли је "
+"уређај заузет."
 
-#: ../src/gui/druid.cpp:979
+#: ../src/gui/main.cpp:1388
 msgid ""
-"The audio manager is the plugin that will manage your audio devices. ALSA is "
-"probably the best choice when available."
+"The selected audio device was successfully opened but it is impossible to "
+"write data to this device. In case it is a pluggable device it may be "
+"sufficient to reconnect it. If not, or if it still is not accessible, please "
+"check your audio setup."
 msgstr ""
-"Управљач звуком је додатак који управља звучним уређајима. АЛСА је вероватно "
-"најбоље решење ако је доступна."
+"Изабран звучни уређај је успешно отворен али је немогуће снимати податке на "
+"овај уређај. Уколико можете да поново утакнете уређај, можда је то довољно "
+"да се поново повеже. Уколико се уређај не утачиње или ово не успе, проверите звучна "
+"подешавања."
 
-#: ../src/gui/druid.cpp:1019
-#, c-format
-msgid "Audio Devices - page %d/%d"
-msgstr "Звучни уређаји - страна %d/%d"
+#: ../src/gui/main.cpp:1579
+msgid "Video Settings"
+msgstr "Подешавања видеа"
 
-#. The Audio devices
-#: ../src/gui/druid.cpp:1031
-msgid "Please choose the audio output device:"
-msgstr "Изаберите излазни уређај за звук:"
+#: ../src/gui/main.cpp:1606
+msgid "Adjust brightness"
+msgstr "Подесити светлину"
 
-#: ../src/gui/druid.cpp:1039
-msgid ""
-"The audio output device is the device managed by the audio manager that will "
-"be used to play audio."
-msgstr ""
-"Излазни уређај за звук је уређај којим управља управљач звуком, а који се "
-"користи за пуштање звука."
+#: ../src/gui/main.cpp:1627
+msgid "Adjust whiteness"
+msgstr "Подеси белило"
 
-#: ../src/gui/druid.cpp:1049
-msgid "Please choose the audio input device:"
-msgstr "Изаберите улазни уређај за звук:"
+#: ../src/gui/main.cpp:1648
+msgid "Adjust color"
+msgstr "Подеси боје"
 
-#: ../src/gui/druid.cpp:1057
-msgid ""
-"The audio input device is the device managed by the audio manager that will "
-"be used to record your voice."
-msgstr ""
-"Улазни уређај за звук је уређај којим управља управљач звуком, а који се "
-"користи за снимање гласа."
+#: ../src/gui/main.cpp:1669
+msgid "Adjust contrast"
+msgstr "Подесити контраст"
 
-#: ../src/gui/druid.cpp:1070 ../src/gui/druid.cpp:1204
-msgid "Test Settings"
-msgstr "Проба подешавања"
+#: ../src/gui/main.cpp:1715
+msgid "Audio Settings"
+msgstr "Подешавања звука"
 
-#: ../src/gui/druid.cpp:1114
-#, c-format
-msgid "Video Manager - page %d/%d"
-msgstr "Управљање преносом слике — страна %d/%d"
+#: ../src/gui/main.cpp:2326
+msgid "_Retrieve Call"
+msgstr "Пов_рати позив"
 
-#. The Audio devices
-#: ../src/gui/druid.cpp:1126
-msgid "Please choose your video manager:"
-msgstr "Изаберите управљача видеом:"
+#: ../src/gui/main.cpp:2339
+msgid "_Hold Call"
+msgstr "_Задржи позив"
 
-#: ../src/gui/druid.cpp:1134
-msgid ""
-"The video manager is the plugin that will manage your video devices, "
-"Video4Linux is the most common choice if you own a webcam."
-msgstr ""
-"Управљач видеом је додатак који управља видео уређајима, Видео4Линукс је "
-"најчешћи избор уколико имате веб камеру."
+#: ../src/gui/main.cpp:2371 ../src/gui/main.cpp:3159
+msgid "Suspend _Audio"
+msgstr "Заустави _звук"
 
-#: ../src/gui/druid.cpp:1172
-#, c-format
-msgid "Video Devices - page %d/%d"
-msgstr "Уређаји за пренос слике— страна %d/%d"
+#: ../src/gui/main.cpp:2373 ../src/gui/main.cpp:3164
+msgid "Suspend _Video"
+msgstr "Заустави _слику"
 
-#. The Video devices
-#: ../src/gui/druid.cpp:1184
-msgid "Please choose the video input device:"
-msgstr "Изаберите улазни уређај за видео:"
+#: ../src/gui/main.cpp:2375
+msgid "Resume _Audio"
+msgstr "Обнови пријем _звука"
 
-#: ../src/gui/druid.cpp:1192
-msgid ""
-"The video input device is the device managed by the video manager that will "
-"be used to capture video."
-msgstr ""
-"Улазни уређај за видео је уређај којим управља управљач видеом, а који се "
-"користи за снимање видеа."
+#: ../src/gui/main.cpp:2377
+msgid "Resume _Video"
+msgstr "Обнови пријем _слике"
 
-#: ../src/gui/druid.cpp:1240
-#, c-format
-msgid "Configuration complete - page %d/%d"
-msgstr "Подешавање завршено - страна %d/%d"
+#: ../src/gui/main.cpp:2660 ../src/gui/main.cpp:2812
+msgid "Reject"
+msgstr "Одбаци"
 
-#: ../src/gui/druid.cpp:1630
-msgid "56k Modem"
-msgstr "Модем на обичној телефонској линији"
+#: ../src/gui/main.cpp:2662 ../src/gui/main.cpp:2811
+msgid "Accept"
+msgstr "Прихвати"
 
-#: ../src/gui/druid.cpp:1631
-msgid "ISDN"
-msgstr "Дигитална тел. линија са интегрисаним услугама"
+#: ../src/gui/main.cpp:2668 ../src/gui/main.cpp:2799
+msgid "Incoming call from"
+msgstr "Долазни позив од"
 
-#: ../src/gui/druid.cpp:1632
-msgid "xDSL/Cable"
-msgstr "Дигитална претплатничка линија/кабловски интернет"
-
-#: ../src/gui/druid.cpp:1633
-msgid "T1/LAN"
-msgstr "Брзи закупљени вод/локална мрежа"
+#: ../src/gui/main.cpp:2686 ../src/gui/main.cpp:2802
+msgid "Remote URI:"
+msgstr "Удаљена адреса:"
 
-#: ../src/gui/druid.cpp:1634
-msgid "Keep current settings"
-msgstr "Задржи текућа подешавања"
+#: ../src/gui/main.cpp:2698 ../src/gui/main.cpp:2804
+msgid "Remote Application:"
+msgstr "Удаљени програм:"
 
-#: ../src/gui/druid.cpp:1915
+#: ../src/gui/main.cpp:2719
 #, c-format
-msgid ""
-"You have now finished the Ekiga configuration. All the settings can be "
-"changed in the Ekiga preferences. Enjoy!\n"
-"\n"
-"\n"
-"Configuration summary:\n"
-"\n"
-"Username: %s\n"
-"Connection type: %s\n"
-"Audio manager: %s\n"
-"Audio player: %s\n"
-"Audio recorder: %s\n"
-"Video manager: %s\n"
-"Video input: %s\n"
-"SIP URL: %s\n"
-msgstr ""
-"Завршили сте подешавање Екиге. Сва подешавања се могу променити у самим "
-"поставкама Екиге. Уживајте!\n"
-"\n"
-"\n"
-"Преглед подешавања:\n"
-"\n"
-"Корисник:  %s\n"
-"Врста везе: %s\n"
-"Управљач звуком: %s\n"
-"Пуштање звука: %s\n"
-"Снимање звука: %s\n"
-"Управљач слике: %s\n"
-"Улаз слике: %s\n"
-"Адреса за позиве: %s\n"
-
-#: ../src/gui/druid.cpp:1970
-msgid "First Time Configuration Assistant"
-msgstr "Чаробњак за прво подешавање"
-
-#: ../src/gui/history.cpp:128 ../src/gui/main.cpp:1131
-msgid "General History"
-msgstr "Општи историјат"
-
-#: ../src/gui/main.cpp:667
-msgid "Enter a URL on the left, and click this button to place a call"
-msgstr ""
-"Унесите адресу коју позивате лево, и притисните ово дугме да упутите позив"
-
-#: ../src/gui/main.cpp:711
-msgid "Open text chat"
-msgstr "Отвори текстуални разговор"
-
-#: ../src/gui/main.cpp:735
-msgid "Change the view mode"
-msgstr "Промени режим приказа"
-
-#: ../src/gui/main.cpp:754
-msgid "Open address book"
-msgstr "Отвори именик"
+msgid "Call from %s"
+msgstr "Позив од %s"
 
-#: ../src/gui/main.cpp:775
-msgid "Display images from your camera device"
-msgstr "Прикажи слике са камере"
+#: ../src/gui/main.cpp:2925
+#, c-format
+msgid "Call Duration: %s\n"
+msgstr "Трајање позива: %s\n"
 
-#: ../src/gui/main.cpp:798
-msgid ""
-"Audio transmission status. During a call, click here to suspend or resume "
-"the audio transmission."
-msgstr ""
-"Стање звучног преноса. За време позива, притисните овде да зауставите или "
-"наставите звучни пренос."
+#: ../src/gui/main.cpp:2956
+msgid "Transfer call to:"
+msgstr "Пребаци позив:"
 
-#: ../src/gui/main.cpp:821
-msgid ""
-"Video transmission status. During a call, click here to suspend or resume "
-"the video transmission."
-msgstr ""
-"Стање преноса слике. За време позива, притисните овде да зауставите или "
-"наставите пренос слике."
+#: ../src/gui/main.cpp:3008
+msgid "No"
+msgstr "Не"
+
+#: ../src/gui/main.cpp:3010
+msgid "Yes"
+msgstr "Да"
+
+#: ../src/gui/main.cpp:3021
+msgid "Detected new audio input device:"
+msgstr "Препознат је нови улазни звучни уређај:"
+
+#: ../src/gui/main.cpp:3025
+msgid "Detected new audio output device:"
+msgstr "Препознат је нови излазни звучни уређај:"
+
+#: ../src/gui/main.cpp:3029
+msgid "Detected new video input device:"
+msgstr "Препознат је нови улазни видео уређај:"
+
+#: ../src/gui/main.cpp:3030 ../src/gui/preferences.cpp:921
+msgid "Video Devices"
+msgstr "Уређаји за слику"
 
-#: ../src/gui/main.cpp:901
-msgid "C_all"
-msgstr "Поз_ови"
+#: ../src/gui/main.cpp:3048
+msgid "Do you want to use it as default device?"
+msgstr "Да ли желите да га користите као подразумевани уређај?"
+
+#: ../src/gui/main.cpp:3116
+msgid "_Chat"
+msgstr "Ћаск_ање"
 
-#: ../src/gui/main.cpp:903
+#: ../src/gui/main.cpp:3118
 msgid "Ca_ll"
 msgstr "Позов_и"
 
-#: ../src/gui/main.cpp:903 ../src/gui/statusicon.cpp:100
+#: ../src/gui/main.cpp:3118
 msgid "Place a new call"
 msgstr "Упутите нови позив"
 
-#: ../src/gui/main.cpp:906 ../src/gui/statusicon.cpp:103
+#: ../src/gui/main.cpp:3121
 msgid "_Hang up"
 msgstr "Пре_кини позив"
 
-#: ../src/gui/main.cpp:907 ../src/gui/statusicon.cpp:104
+#: ../src/gui/main.cpp:3122
 msgid "Terminate the current call"
 msgstr "Прекида текући позив"
 
-#: ../src/gui/main.cpp:913 ../src/gui/statusicon.cpp:110
-msgid "_Available"
-msgstr "_Доступан"
-
-#: ../src/gui/main.cpp:914 ../src/gui/statusicon.cpp:111
-msgid "Display a popup to accept the call"
-msgstr "Прикажи искачући прозор за пријем позива"
-
-#: ../src/gui/main.cpp:919 ../src/gui/statusicon.cpp:116
-msgid "Aut_o Answer"
-msgstr "Сам се _јави"
-
-#: ../src/gui/main.cpp:920 ../src/gui/statusicon.cpp:117
-msgid "Auto answer calls"
-msgstr "Сам се јавља на позиве"
-
-#: ../src/gui/main.cpp:925 ../src/gui/statusicon.cpp:122
-msgid "_Do Not Disturb"
-msgstr "_Не узнемиравај"
-
-#: ../src/gui/main.cpp:926 ../src/gui/statusicon.cpp:123
-msgid "Reject calls"
-msgstr "Одбија позиве"
-
-#: ../src/gui/main.cpp:931 ../src/gui/statusicon.cpp:128
-msgid "_Forward"
-msgstr "_Преусмери"
-
-#: ../src/gui/main.cpp:931 ../src/gui/statusicon.cpp:128
-msgid "Forward calls"
-msgstr "Преусмерава позиве"
-
-#: ../src/gui/main.cpp:939
-msgid "Speed dials"
-msgstr "Брзо бирање"
-
-#: ../src/gui/main.cpp:943 ../src/gui/main.cpp:3148
-msgid "_Hold Call"
-msgstr "_Задржи позив"
+#: ../src/gui/main.cpp:3128
+msgid "A_dd Contact"
+msgstr "Дод_ај контакт"
+
+#: ../src/gui/main.cpp:3128
+msgid "Add a contact to the roster"
+msgstr "Додај контакт у листу"
+
+#: ../src/gui/main.cpp:3133
+msgid "Find contacts"
+msgstr "Пронађи контакт"
+
+#: ../src/gui/main.cpp:3140
+msgid "_Contact"
+msgstr "_Контакт"
+
+#: ../src/gui/main.cpp:3141
+msgid "Act on selected contact"
+msgstr "Акција над изабраним контактом"
+
+#: ../src/gui/main.cpp:3147
+msgid "H_old Call"
+msgstr "Задржи п_озив"
 
-#: ../src/gui/main.cpp:943
+#: ../src/gui/main.cpp:3147 ../src/gui/main.cpp:3616
 msgid "Hold the current call"
 msgstr "Задржава тренутни позив"
 
-#: ../src/gui/main.cpp:947
+#: ../src/gui/main.cpp:3151
 msgid "_Transfer Call"
 msgstr "_Пребаци позив"
 
-#: ../src/gui/main.cpp:948
+#: ../src/gui/main.cpp:3152
 msgid "Transfer the current call"
 msgstr "Пребацује тренутни позив"
 
-#: ../src/gui/main.cpp:955 ../src/gui/main.cpp:3182
-msgid "Suspend _Audio"
-msgstr "Заустави _звук"
-
-#: ../src/gui/main.cpp:956
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the audio transmission"
 msgstr "Зауставља или наставља звучни пренос"
 
-#: ../src/gui/main.cpp:960 ../src/gui/main.cpp:3184
-msgid "Suspend _Video"
-msgstr "Заустави _слику"
-
-#: ../src/gui/main.cpp:961
+#: ../src/gui/main.cpp:3165
 msgid "Suspend or resume the video transmission"
 msgstr "Зауставља или наставља пренос слике"
 
-#: ../src/gui/main.cpp:968
-msgid "_Save Current Picture"
-msgstr "_Сачувај тренутну слику"
-
-#: ../src/gui/main.cpp:969
-msgid "Save a snapshot of the current video"
-msgstr "Чува тренутну слику са видео везе"
-
-#: ../src/gui/main.cpp:975
+#: ../src/gui/main.cpp:3172
 msgid "Close the Ekiga window"
 msgstr "Затвара прозор програма Екига"
 
-#: ../src/gui/main.cpp:982 ../src/gui/statusicon.cpp:185
-msgid "_Quit"
-msgstr "_Изађи"
-
-#: ../src/gui/main.cpp:982 ../src/gui/statusicon.cpp:186
-msgid "Quit Ekiga"
-msgstr "Изађи из програма Екига"
-
-#: ../src/gui/main.cpp:986
-msgid "_Edit"
-msgstr "_Уређивање"
-
-#: ../src/gui/main.cpp:988
-msgid "Configuration Druid"
-msgstr "Чаробњак за подешавање"
-
-#: ../src/gui/main.cpp:989
-msgid "Run the configuration druid"
-msgstr "Покрени чаробњака за подешавање"
+#: ../src/gui/main.cpp:3179 ../src/gui/statusicon.cpp:414
+msgid "Quit"
+msgstr "Изађи"
+
+#: ../src/gui/main.cpp:3185
+msgid "_Configuration Assistant"
+msgstr "Чаробња_к за прво подешавање"
 
-#: ../src/gui/main.cpp:996
-msgid "_Accounts"
-msgstr "На_лози"
+#: ../src/gui/main.cpp:3186
+msgid "Run the configuration assistant"
+msgstr "Покрени чаробњака за прво подешавање"
 
-#: ../src/gui/main.cpp:997
+#: ../src/gui/main.cpp:3194
 msgid "Edit your accounts"
 msgstr "Уредите ваше налоге"
 
-#: ../src/gui/main.cpp:1002 ../src/gui/statusicon.cpp:152
-msgid "_Preferences"
-msgstr "_Поставке"
-
-#: ../src/gui/main.cpp:1003 ../src/gui/statusicon.cpp:153
+#: ../src/gui/main.cpp:3200
 msgid "Change your preferences"
 msgstr "Измените ваше поставке"
 
-#: ../src/gui/main.cpp:1008
+#: ../src/gui/main.cpp:3205
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../src/gui/main.cpp:1010
-msgid "View _Mode"
-msgstr "_Режим приказа"
-
-#: ../src/gui/main.cpp:1012
-msgid "Softp_hone"
-msgstr "Софтверски телефон"
-
-#: ../src/gui/main.cpp:1013
-msgid "Show the softphone view"
-msgstr "Прикажи софтверски телефон"
-
-#: ../src/gui/main.cpp:1018
-msgid "_Videophone"
-msgstr "Видеотелефон"
-
-#: ../src/gui/main.cpp:1019
-msgid "Show the videophone view"
-msgstr "Прикажи видеотелефон"
-
-#: ../src/gui/main.cpp:1024
-msgid "_Full View"
-msgstr "П_уни приказ"
-
-#: ../src/gui/main.cpp:1025
-msgid "View all components"
-msgstr "Отвори све делове"
-
-#: ../src/gui/main.cpp:1033
-msgid "Control Panel"
-msgstr "Управљачки панел"
+#: ../src/gui/main.cpp:3207
+msgid "Con_tacts"
+msgstr "Кон_такти"
+
+#: ../src/gui/main.cpp:3207
+msgid "View the contacts list"
+msgstr "Погледај списак контаката"
 
-#: ../src/gui/main.cpp:1035
+#: ../src/gui/main.cpp:3212
 msgid "_Dialpad"
 msgstr "_Бројчаник"
 
-#: ../src/gui/main.cpp:1035
+#: ../src/gui/main.cpp:3212
 msgid "View the dialpad"
 msgstr "Прикажи бројчаник"
 
-#: ../src/gui/main.cpp:1040
-msgid "_Audio Settings"
-msgstr "Подешавања зв_ука"
-
-#: ../src/gui/main.cpp:1041
-msgid "View audio settings"
-msgstr "Прегледај подешавања звука"
-
-#: ../src/gui/main.cpp:1046
-msgid "_Video Settings"
-msgstr "_Подешавања преноса слике"
-
-#: ../src/gui/main.cpp:1047
-msgid "View video settings"
-msgstr "Погледајте подешавања преноса слике"
-
-#: ../src/gui/main.cpp:1052 ../src/gui/main.cpp:1232
-msgid "Statistics"
-msgstr "Статистика"
-
-#: ../src/gui/main.cpp:1053
-msgid "View audio/video transmission and reception statistics"
-msgstr "Преглед статистике слања и пријема звука и слике"
-
-#: ../src/gui/main.cpp:1061 ../src/gui/main.cpp:4218
-msgid "Local Video"
-msgstr "Локална слика"
-
-#: ../src/gui/main.cpp:1062
-msgid "Local video image"
-msgstr "Локални видео снимак"
-
-#: ../src/gui/main.cpp:1067 ../src/gui/main.cpp:4225
-msgid "Remote Video"
-msgstr "Удаљена слика"
-
-#: ../src/gui/main.cpp:1068
-msgid "Remote video image"
-msgstr "Удаљена слика"
-
-#: ../src/gui/main.cpp:1073
-msgid "Both (Picture-in-Picture)"
-msgstr "Оба (слика у слици)"
-
-#: ../src/gui/main.cpp:1074 ../src/gui/main.cpp:1080 ../src/gui/main.cpp:1087
-msgid "Both video images"
-msgstr "Оба видео снимка"
-
-#: ../src/gui/main.cpp:1079
-msgid "Both (Side-by-Side)"
-msgstr "Оба (један поред другог)"
-
-#: ../src/gui/main.cpp:1086
-msgid "Both (Both in New Windows)"
-msgstr "Оба (оба у новим прозорима)"
-
-#: ../src/gui/main.cpp:1095 ../src/gui/main.cpp:1573 ../src/gui/main.cpp:1598
-msgid "Zoom In"
-msgstr "Увећај"
-
-#: ../src/gui/main.cpp:1095 ../src/gui/main.cpp:1573 ../src/gui/main.cpp:1598
-msgid "Zoom in"
-msgstr "Увећај"
-
-#: ../src/gui/main.cpp:1099 ../src/gui/main.cpp:1577 ../src/gui/main.cpp:1602
-msgid "Zoom Out"
-msgstr "Умањи"
-
-#: ../src/gui/main.cpp:1099 ../src/gui/main.cpp:1577 ../src/gui/main.cpp:1602
-msgid "Zoom out"
-msgstr "Умањи"
-
-#: ../src/gui/main.cpp:1103 ../src/gui/main.cpp:1581 ../src/gui/main.cpp:1606
-msgid "Normal Size"
-msgstr "Нормална величина"
-
-#: ../src/gui/main.cpp:1103 ../src/gui/main.cpp:1581 ../src/gui/main.cpp:1606
-msgid "Normal size"
-msgstr "Нормална величина"
-
-#: ../src/gui/main.cpp:1109 ../src/gui/main.cpp:1587 ../src/gui/main.cpp:1612
-msgid "Fullscreen"
-msgstr "Цео екран"
-
-#: ../src/gui/main.cpp:1115
-msgid "_Tools"
-msgstr "_Алати"
-
-#: ../src/gui/main.cpp:1117 ../src/gui/statusicon.cpp:136
-msgid "Address _Book"
-msgstr "Имени_к"
-
-#: ../src/gui/main.cpp:1118 ../src/gui/statusicon.cpp:137
-msgid "Open the address book"
-msgstr "Отвара именик"
-
-#: ../src/gui/main.cpp:1125
-msgid "C_hat Window"
-msgstr "_Текстуалне поруке"
-
-#: ../src/gui/main.cpp:1126
-msgid "Open the chat window"
-msgstr "Прикажи прозор за текстуалне поруке"
-
-#: ../src/gui/main.cpp:1132
-msgid "View the operations history"
-msgstr "Прегледај историјат радњи"
-
-#: ../src/gui/main.cpp:1137 ../src/gui/statusicon.cpp:145
-msgid "View the calls history"
-msgstr "Прегледај историјат позива"
-
-#: ../src/gui/main.cpp:1144
-msgid "PC-To-Phone Account"
-msgstr "Налог „Рачунар — телефон“"
-
-#: ../src/gui/main.cpp:1145
-msgid "Manage your PC-To-Phone account"
-msgstr "Управљајте налогом рачунар — телефон"
-
-#: ../src/gui/main.cpp:1150
-msgid "_Help"
-msgstr "_Помоћ"
-
-#: ../src/gui/main.cpp:1152 ../src/gui/statusicon.cpp:161
-#: ../src/gui/statusicon.cpp:172
-msgid "_Contents"
-msgstr "_Садржај"
-
-#: ../src/gui/main.cpp:1153 ../src/gui/statusicon.cpp:162
-#: ../src/gui/statusicon.cpp:173
-msgid "Get help by reading the Ekiga manual"
-msgstr "Потражите помоћ у упутству за Екигу"
-
-#: ../src/gui/main.cpp:1157 ../src/gui/main.cpp:1163
-#: ../src/gui/statusicon.cpp:166 ../src/gui/statusicon.cpp:177
-msgid "_About"
-msgstr "_О програму"
-
-#: ../src/gui/main.cpp:1158 ../src/gui/main.cpp:1164
-#: ../src/gui/statusicon.cpp:167 ../src/gui/statusicon.cpp:178
-msgid "View information about Ekiga"
-msgstr "Погледај податке о Екиги"
-
-#: ../src/gui/main.cpp:1315
-msgid "Dialpad"
-msgstr "Бројчаник"
+#: ../src/gui/main.cpp:3217
+msgid "_Call History"
+msgstr "_Историјат позива"
 
-#: ../src/gui/main.cpp:1368
-msgid "Adjust brightness"
-msgstr "Подесити светлину"
-
-#: ../src/gui/main.cpp:1390
-msgid "Adjust whiteness"
-msgstr "Подеси белило"
-
-#: ../src/gui/main.cpp:1412
-msgid "Adjust color"
-msgstr "Подеси боје"
+#: ../src/gui/main.cpp:3217
+msgid "View the call history"
+msgstr "Погледај историјат позива"
 
-#: ../src/gui/main.cpp:1434
-msgid "Adjust contrast"
-msgstr "Подесити контраст"
+#: ../src/gui/main.cpp:3225
+msgid "_Show Call Panel"
+msgstr "Прика_жи панел звања"
+
+#: ../src/gui/main.cpp:3233
+msgid "_Local Video"
+msgstr "_Локални видео"
 
-#: ../src/gui/main.cpp:1440
-msgid "Video"
-msgstr "Видео"
+#: ../src/gui/main.cpp:3234
+msgid "Local video image"
+msgstr "Локална видео слика"
 
-#: ../src/gui/main.cpp:1524
-msgid "Audio"
-msgstr "Звук"
+#: ../src/gui/main.cpp:3239
+msgid "_Remote Video"
+msgstr "_Удаљени видео"
 
-#: ../src/gui/main.cpp:1775
-msgid "Notification area not detected"
-msgstr "Обавештајна зона није пронађена"
+#: ../src/gui/main.cpp:3240
+msgid "Remote video image"
+msgstr "Удаљена слика"
 
-#: ../src/gui/main.cpp:1775
-msgid ""
-"The notification area is not present in your panel, so Ekiga cannot start "
-"hidden."
-msgstr ""
-"Обавештајна зона није присутна на панелу, зато Екига не може да се покрене "
-"скривена."
+#: ../src/gui/main.cpp:3245
+msgid "_Picture-in-Picture"
+msgstr "_Слика у слици"
 
-#: ../src/gui/main.cpp:2088
-#, c-format
-msgid "Sent DTMF %c"
-msgstr "Послат DTMF %c"
+#: ../src/gui/main.cpp:3246 ../src/gui/main.cpp:3252
+msgid "Both video images"
+msgstr "Оба видео снимка"
 
-#: ../src/gui/main.cpp:2311 ../src/gui/main.cpp:4308
-#, c-format
-msgid "Missed calls: %d - Voice Mails: %s"
-msgstr "Пропуштени позиви: %d — Говорна пошта: %s"
+#: ../src/gui/main.cpp:3251
+msgid "Picture-in-Picture in Separate _Window"
+msgstr "Слика у слици у _посебном прозору"
 
-#: ../src/gui/main.cpp:3132
-msgid "_Retrieve Call"
-msgstr "Пов_рати позив"
+#: ../src/gui/main.cpp:3259
+msgid "Zoom in"
+msgstr "Увећај"
 
-#: ../src/gui/main.cpp:3186
-msgid "Resume _Audio"
-msgstr "Обнови пријем _звука"
+#: ../src/gui/main.cpp:3263
+msgid "Zoom out"
+msgstr "Умањи"
 
-#: ../src/gui/main.cpp:3188
-msgid "Resume _Video"
-msgstr "Обнови пријем _слике"
+#: ../src/gui/main.cpp:3267
+msgid "Normal size"
+msgstr "Нормална величина"
 
-#: ../src/gui/main.cpp:3730
-msgid "Out:"
-msgstr "Напоље:"
-
-#: ../src/gui/main.cpp:3733
-msgid "In:"
-msgstr "Унутра:"
-
-#: ../src/gui/main.cpp:3757
-msgid "Registered accounts:"
-msgstr "Регистровани налози:"
+#: ../src/gui/main.cpp:3271
+msgid "_Fullscreen"
+msgstr "_Цео екран"
 
-#: ../src/gui/main.cpp:3882
-msgid "Transfer call to:"
-msgstr "Пребаци позив:"
+#: ../src/gui/main.cpp:3271
+msgid "Switch to fullscreen"
+msgstr "Пребаци у цео екран"
 
-#: ../src/gui/main.cpp:3883 ../src/gui/main.cpp:3948
-msgid "Transfer"
-msgstr "Пребаци"
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:402
+msgid "Get help by reading the Ekiga manual"
+msgstr "Потражите помоћ у упутству за Екигу"
 
-#: ../src/gui/main.cpp:3946
-msgid "Reject"
-msgstr "Одбаци"
+#: ../src/gui/main.cpp:3284 ../src/gui/statusicon.cpp:407
+msgid "View information about Ekiga"
+msgstr "Погледај податке о Екиги"
 
-#: ../src/gui/main.cpp:3950
-msgid "Accept"
-msgstr "Прихвати"
+#: ../src/gui/main.cpp:3358
+msgid ""
+"Enter a URI on the left, and click this button to place a call or to hangup"
+msgstr ""
+"Унесите адресу коју позивате лево, и притисните ово дугме да упутите позив "
+"или прекинете везу"
 
-#: ../src/gui/main.cpp:3957
-msgid "Incoming call from"
-msgstr "Долазни позив од"
+#: ../src/gui/main.cpp:3409
+msgid "Contacts"
+msgstr "Контакти"
 
-#: ../src/gui/main.cpp:3970
-msgid "Remote URL:"
-msgstr "Удаљена адреса:"
+#: ../src/gui/main.cpp:3432
+msgid "Dialpad"
+msgstr "Бројчаник"
 
-#: ../src/gui/main.cpp:3982
-msgid "Remote Application:"
-msgstr "Удаљени програм:"
+#: ../src/gui/main.cpp:3451
+msgid "Call history"
+msgstr "Историјат позива"
+
+#: ../src/gui/main.cpp:3554
+msgid "Change the volume of your soundcard"
+msgstr "Измените звук звучне карте"
+
+#: ../src/gui/main.cpp:3574
+msgid "Change the color settings of your video device"
+msgstr "Измените подешавања боје видео уређаја"
 
 # bug(slobo): превод за traversal
-#. Add the window icon and title
-#: ../src/gui/main.cpp:4050 ../src/gui/main.cpp:4238
+#: ../src/gui/main.cpp:3685
 msgid "Ekiga"
 msgstr "Екига"
 
-#: ../src/gui/main.cpp:4473
+#. Translators:
+#. * TX is a common abbreviation for "transmit"
+#: ../src/gui/main.cpp:4297
+#, c-format
+msgid "TX: %dx%d "
+msgstr "TX: %dx%d "
+
+#. Translators:
+#. * RX is a common abbreviation for "receive"
+#: ../src/gui/main.cpp:4302
+#, c-format
+msgid "RX: %dx%d "
+msgstr "RX: %dx%d "
+
+#: ../src/gui/main.cpp:4304
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
 "Late packets: %.1f %%\n"
 "Out of order packets: %.1f %%\n"
-"Jitter buffer: %d ms"
+"Jitter buffer: %d ms%s%s%s"
 msgstr ""
 "Изгубљени пакети: %.1f %%\n"
 "Закаснели пакети: %.1f %%\n"
 "Пакети ван реда: %.1f %%\n"
-"Jitter бафер: %d ms"
+"Jitter бафер: %d ms%s%s%s"
 
-#: ../src/gui/main.cpp:4570
-#, c-format
-msgid ""
-"Ekiga got an invalid value for the GConf key %s.\n"
-"\n"
-"It probably means that your GConf schemas have not been correctly installed "
-"or the that permissions are not correct.\n"
-"\n"
-"Please check the FAQ (http://www.ekiga.org/), the troubleshooting section of "
-"the GConf site (http://www.gnome.org/projects/gconf/) or the mailing list "
-"archives for more information (http://mail.gnome.org) about this problem."
+#: ../src/gui/main.cpp:4425
+msgid "Prints debug messages in the console (level between 1 and 5)"
+msgstr "Приказује поруке за решавање проблема у конзоли (нивои између 1 и 5)"
+
+#: ../src/gui/main.cpp:4430
+msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr ""
-"Екига је добио погрешну вредност за ГКонф кључ %s.\n"
-"\n"
-"Ово вероватно значи да ГКонф шема није правилно инсталирана или да овлашћења "
-"нису исправна.\n"
-"\n"
-"Проверите честа питања (http://www.ekiga.org/), део о решавању проблема са "
-"ГКонф странице (http://www.gnome.org/projects/gconf/) или архиву дописне "
-"листе за више података (http://mail.gnome.org) о овом проблему."
-
-#: ../src/gui/main.cpp:4573
-msgid "Gconf key error"
-msgstr "Gconf грешка кључа"
-
-#: ../src/gui/main.cpp:4603 ../src/gui/main.cpp:4622
-msgid "Prints debug messages in the console (level between 1 and 6)"
-msgstr "Приказује поруке за решавање проблема у конзоли (нивои између 1 и 6)"
+"Приказује корисничке поруке за решавање проблема у конзоли (нивои између 1 и "
+"4)"
 
-#: ../src/gui/main.cpp:4606 ../src/gui/main.cpp:4627
-msgid "Makes Ekiga call the given URL"
+#: ../src/gui/main.cpp:4435
+msgid "Makes Ekiga call the given URI"
 msgstr "Прави Екига позив на дату адресу"
 
-#: ../src/gui/main.cpp:4660
+#: ../src/gui/main.cpp:4554
 msgid "No usable audio plugin detected"
 msgstr "Нисам пронашао употребљив звучни уређај"
 
-#: ../src/gui/main.cpp:4660
+#: ../src/gui/main.cpp:4555
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
@@ -3180,132 +2895,67 @@
 "Екига не може да пронађе употребљив звучни уређај. Проверите да ли је "
 "инсталација исправна."
 
-#: ../src/gui/misc.cpp:115
-msgid "Error"
-msgstr "Грешка"
-
-#: ../src/gui/preferences.cpp:497
-msgid "Bandwidth"
-msgstr "Пропусни опсег"
-
-#: ../src/gui/preferences.cpp:505
-msgid "Clock Rate"
-msgstr "Такт"
-
-#: ../src/gui/preferences.cpp:630
-msgid "Personal Information"
-msgstr "Лични подаци"
-
-#: ../src/gui/preferences.cpp:633
-msgid "_First name:"
-msgstr "_Име:"
-
-#: ../src/gui/preferences.cpp:640
-msgid "Sur_name:"
-msgstr "_Презиме:"
-
-#: ../src/gui/preferences.cpp:642
-msgid "Enter your surname"
-msgstr "Унесите презиме"
-
-#: ../src/gui/preferences.cpp:648
-msgid "E-_mail address:"
-msgstr "Е-_пошта:"
-
-#: ../src/gui/preferences.cpp:650
-msgid "Enter your e-mail address"
-msgstr "Унесите адресу е-поште"
-
-#: ../src/gui/preferences.cpp:655
-msgid "_Comment:"
-msgstr "_Коментар:"
-
-#: ../src/gui/preferences.cpp:657
-msgid "Enter a comment about yourself"
-msgstr "Унесите коментар о себи"
-
-#: ../src/gui/preferences.cpp:662
-msgid "_Location:"
-msgstr "_Место:"
-
-#: ../src/gui/preferences.cpp:664
-msgid "Enter your country or city"
-msgstr "Унесите државу или град"
-
-#. Add the update button
-#: ../src/gui/preferences.cpp:669 ../src/gui/preferences.cpp:963
-msgid "_Apply"
-msgstr "Пр_имени"
+#: ../src/gui/main.cpp:4558
+msgid "No usable audio codecs detected"
+msgstr "Нисам пронашао употребљиви звучни кодек"
 
-#: ../src/gui/preferences.cpp:669
+#: ../src/gui/main.cpp:4559
 msgid ""
-"Click here to update the users directory you are registered to with the new "
-"First Name, Last Name, E-Mail, Comment and Location"
+"Ekiga didn't find any usable audio codec. Make sure that your installation "
+"is correct."
 msgstr ""
-"Притисните овде да освежите кориснички директоријум у који сте пријављени са "
-"новим именом, презименом, е-поштом, напоменом и местом"
+"Екига не може да пронађе употребљиви звучни кодек. Проверите да ли је "
+"инсталација исправна."
+
+#: ../src/gui/preferences.cpp:381
+msgid "Play sound for new voice mails"
+msgstr "Пусти звук при пријему говорне поште"
 
-#: ../src/gui/preferences.cpp:683
-msgid "Ekiga GUI"
-msgstr "Екига графичко сучеље"
+#: ../src/gui/preferences.cpp:391
+msgid "Play sound for new instant messages"
+msgstr "Пусти звук при пријему нових брзих порука"
 
-#: ../src/gui/preferences.cpp:685
+#: ../src/gui/preferences.cpp:457
+msgid "_Full name:"
+msgstr "_Пуно име:"
+
+#: ../src/gui/preferences.cpp:475
+msgid "User Interface"
+msgstr "Корисничко сучеље"
+
+#: ../src/gui/preferences.cpp:477
 msgid "Start _hidden"
 msgstr "Почни _скривен"
 
-#: ../src/gui/preferences.cpp:691
+#: ../src/gui/preferences.cpp:479
+msgid "Show offline _contacts"
+msgstr "Прикажи контакте ван мреже"
+
+#: ../src/gui/preferences.cpp:484
 msgid "Video Display"
 msgstr "Приказ слике"
 
-#: ../src/gui/preferences.cpp:693
+#: ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video _above other windows"
 msgstr "Постави прозоре који приказују слику _изнад осталих прозора"
 
-#: ../src/gui/preferences.cpp:706
-msgid "Users Directory"
-msgstr "Кориснички директоријум"
+#: ../src/gui/preferences.cpp:490
+msgid "Network Settings"
+msgstr "Подешавања мреже"
 
-#. Add all the fields
-#: ../src/gui/preferences.cpp:710
-msgid "Users directory:"
-msgstr "Кориснички директоријум:"
-
-#: ../src/gui/preferences.cpp:710
-msgid "The users directory server to register with"
-msgstr "Сервер корисничких директоријума за регистрацију"
-
-#: ../src/gui/preferences.cpp:712
-msgid "Enable _registering"
-msgstr "Укључи _регистрацију"
-
-#: ../src/gui/preferences.cpp:712
-msgid "If enabled, register with the selected users directory"
-msgstr "Ако је укључено, региструј се у изабрани кориснички директоријум"
-
-#: ../src/gui/preferences.cpp:714
-msgid "_Publish my details in the users directory when registering"
-msgstr "_Објави моје детаље у корисничком директоријуму при регистрацији"
-
-#: ../src/gui/preferences.cpp:714
-msgid ""
-"If enabled, your details are shown to people browsing the users directory. "
-"If disabled, you are not visible to users browsing the users directory, but "
-"they can still use the callto URL to call you."
-msgstr ""
-"Ако је укључено, детаљи се приказују људима који претражују кориснички "
-"директоријум. Ако је искључено, невидљиви сте људима који претражују "
-"кориснички директоријум, али они још увек могу да користе callto адресу да "
-"вас позову."
+#: ../src/gui/preferences.cpp:492
+msgid "Disable network _detection"
+msgstr "Искључи о_ткривање мреже"
 
-#: ../src/gui/preferences.cpp:725
+#: ../src/gui/preferences.cpp:503
 msgid "Call Forwarding"
 msgstr "Преусмеравање позива"
 
-#: ../src/gui/preferences.cpp:727
+#: ../src/gui/preferences.cpp:505
 msgid "_Always forward calls to the given host"
 msgstr "_Увек проследи позиве до датог домаћина"
 
-#: ../src/gui/preferences.cpp:727
+#: ../src/gui/preferences.cpp:505
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings"
@@ -3313,11 +2963,11 @@
 "Ако је укључено, сви долазни позиви ће бити преусмерени на рачунар који је "
 "назначен у подешавањима протокола"
 
-#: ../src/gui/preferences.cpp:729
+#: ../src/gui/preferences.cpp:507
 msgid "Forward calls to the given host if _no answer"
 msgstr "Преусмери позив до датог рачунара ако _нема одговора"
 
-#: ../src/gui/preferences.cpp:729
+#: ../src/gui/preferences.cpp:507
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you do not answer the call"
@@ -3325,11 +2975,11 @@
 "Ако је укључено, сви долазни позиви ће бити преусмерени на рачунар који је "
 "назначен у подешавањима протокола ако не одговорите на позив"
 
-#: ../src/gui/preferences.cpp:731
+#: ../src/gui/preferences.cpp:509
 msgid "Forward calls to the given host if _busy"
 msgstr "Преусмери позив до датог домаћина ако је _заузето"
 
-#: ../src/gui/preferences.cpp:731
+#: ../src/gui/preferences.cpp:509
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you already are in a call or if you "
@@ -3339,136 +2989,79 @@
 "назначен у подешавањима протокола ако имате позив или ако не желите да "
 "будете узнемиравани"
 
-#: ../src/gui/preferences.cpp:735 ../src/gui/preferences.cpp:1977
+#: ../src/gui/preferences.cpp:513 ../src/gui/preferences.cpp:1361
 msgid "Call Options"
 msgstr "Опције позива"
 
 #. Add all the fields
-#: ../src/gui/preferences.cpp:738
-msgid "Automatically _clear calls after 30 seconds of inactivity"
-msgstr "Сам _очисти позиве након 30 секунди неактивности"
-
-#: ../src/gui/preferences.cpp:740
+#: ../src/gui/preferences.cpp:516
 msgid "Timeout to reject or forward unanswered incoming calls (in seconds):"
 msgstr ""
 "Временски рок (у секундама) пре одбијања или прослеђивања неодговорених "
 "долазних позива:"
 
-#: ../src/gui/preferences.cpp:780
+#: ../src/gui/preferences.cpp:548
 msgid "Ekiga Sound Events"
 msgstr "Екига звучни догађаји"
 
-#: ../src/gui/preferences.cpp:829 ../src/gui/preferences.cpp:838
-#: ../src/gui/preferences.cpp:847
+#: ../src/gui/preferences.cpp:598
 msgid "Event"
 msgstr "Догађај"
 
-#: ../src/gui/preferences.cpp:859
+#: ../src/gui/preferences.cpp:610
 msgid "Choose a sound"
 msgstr "Изаберите неки звучни запис"
 
-#: ../src/gui/preferences.cpp:865
+#: ../src/gui/preferences.cpp:615
 msgid "Wavefiles"
 msgstr "wav датотеке"
 
-#: ../src/gui/preferences.cpp:874 ../src/gui/preferences.cpp:893
+#: ../src/gui/preferences.cpp:624 ../src/gui/preferences.cpp:643
 msgid "Play"
 msgstr "Пусти"
 
-#: ../src/gui/preferences.cpp:907
-msgid "Alternative Output Device"
-msgstr "Резервни излаз за звоно"
-
-#: ../src/gui/preferences.cpp:913
-msgid "Alternative output device:"
-msgstr "Резервни звучни излаз:"
-
-#: ../src/gui/preferences.cpp:913
-msgid "Select an alternative audio output device to use for sound events"
-msgstr "Изаберите резервни излазни звучни уређај који ће се користити за звоно"
-
-#: ../src/gui/preferences.cpp:931
-msgid "STUN"
-msgstr "STUN"
-
-#: ../src/gui/preferences.cpp:932
-msgid "IP Translation"
-msgstr "Превођење мрежних адреса"
-
-#: ../src/gui/preferences.cpp:945
-msgid "Network Interface"
-msgstr "Мрежни прикључак"
-
-#: ../src/gui/preferences.cpp:950
-msgid "Listen on:"
-msgstr "Ослушкуј на:"
-
-#: ../src/gui/preferences.cpp:957
-msgid "NAT Settings"
-msgstr "Подешавања адресног преводиоца"
-
-#: ../src/gui/preferences.cpp:959
-msgid "NAT Traversal Method:"
-msgstr "Метод адресног превођења:"
-
-#: ../src/gui/preferences.cpp:961
-msgid "STUN Se_rver:"
-msgstr "STU_N сервер:"
-
-#: ../src/gui/preferences.cpp:961
-msgid "The STUN server to use for STUN Support."
-msgstr "STUN сервер који се користи за STUN подршку."
-
-#: ../src/gui/preferences.cpp:963
-msgid "Click here to update your NAT settings"
-msgstr "Притисните овде да освежите подешавања адресног преводиоца"
-
-#: ../src/gui/preferences.cpp:975
+#: ../src/gui/preferences.cpp:664
 msgid "String"
 msgstr "Низ"
 
-#: ../src/gui/preferences.cpp:976
+#: ../src/gui/preferences.cpp:665
 msgid "Tone"
 msgstr "Тон"
 
-#: ../src/gui/preferences.cpp:977 ../src/gui/preferences.cpp:1027
+#: ../src/gui/preferences.cpp:666 ../src/gui/preferences.cpp:715
 msgid "RFC2833"
 msgstr "RFC2833"
 
-#: ../src/gui/preferences.cpp:978
+#: ../src/gui/preferences.cpp:667
 msgid "Q.931"
 msgstr "Q.931"
 
-#: ../src/gui/preferences.cpp:984 ../src/gui/preferences.cpp:1035
+#: ../src/gui/preferences.cpp:673 ../src/gui/preferences.cpp:725
 msgid "Misc Settings"
 msgstr "Разна подешавања"
 
-#: ../src/gui/preferences.cpp:986
-msgid "Default _gateway:"
-msgstr "Подразумевани уређај за мрежни п_ролаз:"
-
-#: ../src/gui/preferences.cpp:989 ../src/gui/preferences.cpp:1040
-msgid "Forward _URL:"
-msgstr "_Преусмери адресу:"
+#: ../src/gui/preferences.cpp:676 ../src/gui/preferences.cpp:730
+msgid "Forward _URI:"
+msgstr "Адреса пре_усмеравања:"
 
-#: ../src/gui/preferences.cpp:998
+#: ../src/gui/preferences.cpp:685
 msgid "Advanced Settings"
 msgstr "Напредна подешавања"
 
 #. The toggles
-#: ../src/gui/preferences.cpp:1001
+#: ../src/gui/preferences.cpp:688
 msgid "Enable H.245 _tunneling"
 msgstr "Омогући H.245 _тунел"
 
-#: ../src/gui/preferences.cpp:1003
+#: ../src/gui/preferences.cpp:690
 msgid "Enable _early H.245"
 msgstr "Укључи _рани H.245"
 
-#: ../src/gui/preferences.cpp:1005
+#: ../src/gui/preferences.cpp:692
 msgid "Enable fast _start procedure"
 msgstr "Укључи процедуру брзи _старт"
 
-#: ../src/gui/preferences.cpp:1005
+#: ../src/gui/preferences.cpp:692
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -3480,2423 +3073,230 @@
 "у и употреба Брзог старта и Н.245 тунелa заједно може да сруши неке верзије "
 "Netmeeting-a."
 
-#: ../src/gui/preferences.cpp:1011 ../src/gui/preferences.cpp:1048
+#: ../src/gui/preferences.cpp:698 ../src/gui/preferences.cpp:738
 msgid "DTMF Mode"
 msgstr "DTMF режим"
 
-#: ../src/gui/preferences.cpp:1013 ../src/gui/preferences.cpp:1050
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
 msgid "_Send DTMF as:"
 msgstr "_Пошаљи DTMF као:"
 
-#: ../src/gui/preferences.cpp:1013
-msgid ""
-"This permits to set the mode for DTMFs sending. The values can be \"String"
-"\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
-"\"). Choosing other values than \"String\" disables the Text Chat."
-msgstr ""
-"Ово омогућава подешавање режима за слање DTMF сигнала. Вредности могу бити "
-"„Низ“ (0), „Тон“ (1), „RFC2833“ (2), „Q.931“ (3) (почетна вредност је „Низ“) "
-"Избор неке друге вредности од „Низ“ искључује текстуални разговор"
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
+msgid "This allows you to set the mode for DTMFs sending."
+msgstr "Ово дозвољава да поставите режим за DTMF слање."
+
+#: ../src/gui/preferences.cpp:716
+msgid "INFO"
+msgstr "ИНФО"
 
-#: ../src/gui/preferences.cpp:1037
+#: ../src/gui/preferences.cpp:727
 msgid "_Outbound Proxy:"
 msgstr "Спољни везани посредни_к:"
 
-#: ../src/gui/preferences.cpp:1050
-msgid ""
-"This permits to set the mode for DTMFs sending. The value can be \"RFC2833"
-"\" (0) only."
-msgstr ""
-"Ово дозвољава да поставите режим DTMF слања. Вредност може бити само "
-"„RFC2833“"
-
-#: ../src/gui/preferences.cpp:1070
-msgid "Audio Plugin"
-msgstr "Додатак за звук"
-
-#: ../src/gui/preferences.cpp:1075
-msgid "Audio plugin:"
-msgstr "Додатак за звук:"
-
-#: ../src/gui/preferences.cpp:1075
-msgid ""
-"The audio plugin that will be used to detect the devices and manage them."
-msgstr ""
-"Додатак за звук који се користи за препознавање уређаја и њихово управљање."
-
-#: ../src/gui/preferences.cpp:1081 ../src/gui/preferences.cpp:2013
-msgid "Audio Devices"
-msgstr "Звучни уређаји"
+#: ../src/gui/preferences.cpp:768
+msgid "Ringing Device"
+msgstr "Уређај за звоно"
+
+#: ../src/gui/preferences.cpp:768
+msgid "Select the ringing audio device to use"
+msgstr "Изаберите уређај који ће се користити за звоњење"
 
-#: ../src/gui/preferences.cpp:1088
+#: ../src/gui/preferences.cpp:770
 msgid "Output device:"
 msgstr "Излазни уређај:"
 
-#: ../src/gui/preferences.cpp:1095 ../src/gui/preferences.cpp:1168
+#: ../src/gui/preferences.cpp:777 ../src/gui/preferences.cpp:928
 msgid "Input device:"
 msgstr "Улазни уређај:"
 
-#. That button will refresh the devices list
-#: ../src/gui/preferences.cpp:1100 ../src/gui/preferences.cpp:1234
+#. That button will refresh the device list
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
 msgid "_Detect devices"
 msgstr "Про_нађи уређаје"
 
-#: ../src/gui/preferences.cpp:1100
-msgid "Click here to refresh the devices list"
-msgstr "Кликните овде да освежите списак уређаја"
-
-#: ../src/gui/preferences.cpp:1126
-msgid "Normal"
-msgstr "Уобичајен"
-
-#: ../src/gui/preferences.cpp:1127
-msgid "Large"
-msgstr "Велики"
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
+msgid "Click here to refresh the device list."
+msgstr "Притисните овде да освежите списак уређаја."
 
-#: ../src/gui/preferences.cpp:1133
+#: ../src/gui/preferences.cpp:906
 msgid "PAL (Europe)"
 msgstr "PAL (Европа)"
 
-#: ../src/gui/preferences.cpp:1134
+#: ../src/gui/preferences.cpp:907
 msgid "NTSC (America)"
 msgstr "NTSC (Америка)"
 
-#: ../src/gui/preferences.cpp:1135
+#: ../src/gui/preferences.cpp:908
 msgid "SECAM (France)"
 msgstr "SECAM (Француска)"
 
-#: ../src/gui/preferences.cpp:1136
+#: ../src/gui/preferences.cpp:909
 msgid "Auto"
 msgstr "Само"
 
-#: ../src/gui/preferences.cpp:1152
-msgid "Video Plugin"
-msgstr "Додатак за слику"
-
-#: ../src/gui/preferences.cpp:1156
-msgid "Video plugin:"
-msgstr "Додатак за слику:"
-
-#: ../src/gui/preferences.cpp:1162 ../src/gui/preferences.cpp:2017
-msgid "Video Devices"
-msgstr "Уређаји за слику"
-
 #. Video Channel
-#: ../src/gui/preferences.cpp:1172
+#: ../src/gui/preferences.cpp:932
 msgid "Channel:"
 msgstr "Канал:"
 
-#: ../src/gui/preferences.cpp:1175
+#: ../src/gui/preferences.cpp:934
 msgid "Size:"
 msgstr "Величина:"
 
-#: ../src/gui/preferences.cpp:1175
-msgid ""
-"Select the transmitted video size: Normal (QCIF 176x144) or Large (CIF "
-"352x288)"
-msgstr ""
-"Изаберите величину слике која се преноси: Мала (QCIF 176x144) или велика "
-"(CIF 352x288)"
+#: ../src/gui/preferences.cpp:934
+msgid "Select the transmitted video size"
+msgstr "Одаберите величину послатог видео записа"
 
-#: ../src/gui/preferences.cpp:1178
+#: ../src/gui/preferences.cpp:936
 msgid "Format:"
 msgstr "Формат:"
 
-#. The file selector button
-#: ../src/gui/preferences.cpp:1181
-msgid "Image:"
-msgstr "Слика:"
-
-#: ../src/gui/preferences.cpp:1184
-msgid "Choose a Picture"
-msgstr "Изаберите слику"
-
-#: ../src/gui/preferences.cpp:1188
-msgid "Preview"
-msgstr "Преглед"
-
-#: ../src/gui/preferences.cpp:1198
-msgid "Images"
-msgstr "Слике"
-
-#: ../src/gui/preferences.cpp:1234
-msgid "Click here to refresh the devices list."
-msgstr "Притисните овде да освежите списак уређаја."
+#: ../src/gui/preferences.cpp:963 ../src/gui/preferences.cpp:1002
+#: ../src/gui/preferences.cpp:1386 ../src/gui/preferences.cpp:1396
+msgid "Codecs"
+msgstr "Kодеци"
 
-#: ../src/gui/preferences.cpp:1257
-msgid "Available Audio Codecs"
-msgstr "Доступни звучни кодеци"
-
-#: ../src/gui/preferences.cpp:1272
-msgid "Audio Codecs Settings"
-msgstr "Подешавања звучних кодека"
+#: ../src/gui/preferences.cpp:976 ../src/gui/preferences.cpp:1015
+msgid "Settings"
+msgstr "Подешавања"
 
 #. Translators: the full sentence is Automatically adjust jitter buffer
 #. between X and Y ms
-#: ../src/gui/preferences.cpp:1276
-msgid "Automatically adjust _jitter buffer between"
-msgstr "Аутоматски подеси _jitter бафер између"
-
-#: ../src/gui/preferences.cpp:1276
-msgid "and"
-msgstr "и"
-
-#: ../src/gui/preferences.cpp:1276
-msgid "ms"
-msgstr "мс"
-
-#: ../src/gui/preferences.cpp:1276
-msgid "The minimum jitter buffer size for audio reception (in ms)."
-msgstr "Најмања величина jitter бафера за звучни пријем (у мс)."
-
-#: ../src/gui/preferences.cpp:1276
-msgid "The maximum jitter buffer size for audio reception (in ms)."
-msgstr "Највећа величина jitter бафера за звучни пријем (у мс)."
-
-#: ../src/gui/preferences.cpp:1278
+#: ../src/gui/preferences.cpp:980
 msgid "Enable silence _detection"
 msgstr "Укључи _откривање тишине"
 
-#: ../src/gui/preferences.cpp:1278
+#: ../src/gui/preferences.cpp:980
 msgid "If enabled, use silence detection with the codecs supporting it."
 msgstr ""
 "Ако је укључено, користи откривање тишине са кодецима који то подржавају."
 
-#: ../src/gui/preferences.cpp:1280
+#: ../src/gui/preferences.cpp:982
 msgid "Enable echo can_celation"
 msgstr "Укључи поништавање одјека"
 
-#: ../src/gui/preferences.cpp:1280
+#: ../src/gui/preferences.cpp:982
 msgid "If enabled, use echo cancelation."
 msgstr "Ако је укључено, користи поништавање одјека"
 
-#: ../src/gui/preferences.cpp:1293 ../src/gui/preferences.cpp:1966
-msgid "General Settings"
-msgstr "Општа подешавања"
+# bug(slobo): не може овако остати
+#: ../src/gui/preferences.cpp:984
+msgid "Maximum _jitter buffer (in ms):"
+msgstr "Максимални _jitter бафер (у ms):"
 
-#: ../src/gui/preferences.cpp:1295
-msgid "Enable _video support"
-msgstr "Укључи пренос слике"
-
-#: ../src/gui/preferences.cpp:1295
-msgid "If enabled, allows video during calls."
-msgstr "Ако је укључено, видећете саговорника током позива."
-
-#: ../src/gui/preferences.cpp:1299
-msgid "Bandwidth Control"
-msgstr "Контрола пропусног опсега"
-
-#: ../src/gui/preferences.cpp:1301
-msgid "Maximum video _bandwidth (in kB/s):"
-msgstr "Највећи _пропусни опсег за слику (kB/s):"
-
-#: ../src/gui/preferences.cpp:1301
-msgid ""
-"The maximum video bandwidth in kbytes/s. The video quality and the number of "
-"transmitted frames per second will be dynamically adjusted above their "
-"minimum during calls to try to minimize the bandwidth to the given value."
-msgstr ""
-"Највећи пропусни опсег за слику у килобајтима/с. Квалитет слике и број "
-"пренесених оквира у секунди биће динамички подешени изнад њиховог минимума "
-"за време позива при покушају да се умањи пропусни опсег на дату вредност."
-
-#: ../src/gui/preferences.cpp:1306
-msgid "Advanced Quality Settings"
-msgstr "Напредно подешавање квалитета"
+#: ../src/gui/preferences.cpp:984
+msgid "The maximum jitter buffer size for audio reception (in ms)."
+msgstr "Највећа величина jitter бафера за звучни пријем (у мс)."
 
 #. Translators: the full sentence is Keep a minimum video quality of X %
-#: ../src/gui/preferences.cpp:1309
-msgid "Frame Rate"
-msgstr "Слика у секунди"
-
-#: ../src/gui/preferences.cpp:1309
+#: ../src/gui/preferences.cpp:1018
 msgid "Picture Quality"
 msgstr "Квалитет слике"
 
-#: ../src/gui/preferences.cpp:1309
+#: ../src/gui/preferences.cpp:1018
 msgid ""
-"Choose if you want to favour speed or quality for the transmitted video."
-msgstr "Изаберите да ли вам је важнија брзина или квалитет пренесене слике."
+"Choose if you want to guarantee a minimum image quality (possibly leading to "
+"dropped frames in order not to surpass the bitrate limit) or if you prefer "
+"to keep the frame rate."
+msgstr ""
+"Одаберите да ли желите да гарантујете минимални квалитет слике (што може "
+"довести до одбачених кадрова у преносу да би се обезбедио потребан проток) "
+"или број пренетих слика у секунди."
 
-#: ../src/gui/preferences.cpp:1907
-msgid "Play sound for new voice mails"
-msgstr "Пусти звук при пријему говорне поште"
+#: ../src/gui/preferences.cpp:1020
+msgid "Maximum video _bitrate (in kbits/s):"
+msgstr "Максимални _видео проток (у kbits/s):"
 
-#: ../src/gui/preferences.cpp:1916
-msgid "Play sound for new instant messages"
-msgstr "Пусти звук при пријему нових брзих порука"
+#: ../src/gui/preferences.cpp:1020
+msgid ""
+"The maximum video bitrate in kbits/s. The video quality and the effective "
+"frame rate will be dynamically adjusted to keep the bitrate at the given "
+"value."
+msgstr ""
+"Максимални видео проток у kbit/s. Видео квалитет и број пренесених кадрова у "
+"секунди ће бити динамички подешени да би се проток одржао на задатој вредности."
 
-#: ../src/gui/preferences.cpp:1945
+#: ../src/gui/preferences.cpp:1333
 msgid "Ekiga Preferences"
 msgstr "Егига поставке"
 
-#: ../src/gui/preferences.cpp:1960
+#: ../src/gui/preferences.cpp:1351
 msgid "General"
 msgstr "Опште"
 
-#: ../src/gui/preferences.cpp:1961
+#: ../src/gui/preferences.cpp:1352
 msgid "Personal Data"
 msgstr "Лични подаци"
 
-#: ../src/gui/preferences.cpp:1972
-msgid "Directory Settings"
-msgstr "Подешавања директоријума"
+#: ../src/gui/preferences.cpp:1357
+msgid "General Settings"
+msgstr "Општа подешавања"
 
-#: ../src/gui/preferences.cpp:1982
+#: ../src/gui/preferences.cpp:1366
 msgid "Sound Events"
 msgstr "Звучни догађаји"
 
-#: ../src/gui/preferences.cpp:1986
+#: ../src/gui/preferences.cpp:1370
 msgid "Protocols"
 msgstr "Протоколи"
 
-#: ../src/gui/preferences.cpp:1988
-msgid "Network Settings"
-msgstr "Подешавања мреже"
-
-#: ../src/gui/preferences.cpp:1993
+#: ../src/gui/preferences.cpp:1372
 msgid "SIP Settings"
 msgstr "SIP подешавања"
 
-#: ../src/gui/preferences.cpp:1998
+#: ../src/gui/preferences.cpp:1377
 msgid "H.323 Settings"
 msgstr "H.323 подешавања"
 
-#: ../src/gui/preferences.cpp:2002
-msgid "Codecs"
-msgstr "Kодеци"
-
-#: ../src/gui/preferences.cpp:2004
-msgid "Audio Codecs"
-msgstr "Звучни кодеци"
-
-#: ../src/gui/preferences.cpp:2008
-msgid "Video Codecs"
-msgstr "Видео кодеци"
+#: ../src/gui/preferences.cpp:1381
+msgid "Audio"
+msgstr "Звук"
 
-#: ../src/gui/preferences.cpp:2012
+#: ../src/gui/preferences.cpp:1382 ../src/gui/preferences.cpp:1392
 msgid "Devices"
 msgstr "Уређаји"
 
-#: ../src/gui/tools.cpp:174
-msgid ""
-"Please provide your username and password in order to be able to use the PC-"
-"To-Phone service."
-msgstr ""
-"Молим унесите име и е-пошту како би могли да користите услугу телефонирања "
-"са рачунара на телефон."
-
-#: ../src/gui/tools.cpp:312 ../src/gui/tools.cpp:331
-msgid "PC-To-Phone Settings"
-msgstr "Подешавања Рачунар — телефон позива"
-
-#. Introduction label
-#: ../src/gui/tools.cpp:322
-msgid ""
-"You can make calls to regular phones and cell numbers worldwide using Ekiga. "
-"To enable this, you need to do three things. First create an account at the "
-"URL below. Then enter your account number and password. Finally, activate "
-"the registration below.\n"
-"\n"
-"The service will work only if your account is created using the URL in this "
-"dialog."
-msgstr ""
-"Користећи Екигу можете да позивате обичне телефонске и мобилне бројеве широм "
-"света. Да би то урадили треба да обавите три корака. Прво на доњој адреси "
-"направите налог, затим унесите број налога и лозинку и коначно покрените "
-"регистровање.\n"
-"\n"
-"Проверите да ли користите адресу у овом прозорчету за добијање налога иначе "
-"услуга неће радити."
-
-#: ../src/gui/tools.cpp:333
-msgid "Account _number:"
-msgstr "Број _налога:"
-
-#: ../src/gui/tools.cpp:350
-msgid "_Password:"
-msgstr "_Лозинка:"
-
-#: ../src/gui/tools.cpp:369
-msgid "Use PC-To-Phone service"
-msgstr "Користи услугу позива Рачунар — телефон"
-
-#: ../src/gui/tools.cpp:381
-msgid ""
-"Click on one of the following links to get more information about your "
-"existing Ekiga PC-To-Phone account, or to create a new account."
-msgstr ""
-"Притисните на једну од следећих веза да добијете више информација о вашем "
-"постојећем Екига налогу за телефонирање са рачунара на телефон или да "
-"направите нови."
-
-#: ../src/gui/tools.cpp:389
-msgid "Get an Ekiga PC-To-Phone account"
-msgstr "Затражи Екига налог за телефонирање са рачунара на телефон"
-
-#: ../src/gui/tools.cpp:403
-msgid "Recharge the account"
-msgstr "Допуните налог"
-
-#: ../src/gui/tools.cpp:417
-msgid "Consult the balance history"
-msgstr "Погледај историјат стања"
-
-#: ../src/gui/tools.cpp:431
-msgid "Consult the calls history"
-msgstr "Погледај историјат позива"
-
-#~ msgid "Credits"
-#~ msgstr "Заслуге"
-
-#~ msgid "Written by"
-#~ msgstr "Написао"
-
-#~ msgid "Documented by"
-#~ msgstr "Документовао"
-
-#~ msgid "Translated by"
-#~ msgstr "Превео"
-
-#~ msgid "C_redits"
-#~ msgstr "_Заслуге"
-
-#~ msgid "Authors"
-#~ msgstr "Аутори"
-
-#~ msgid "List of authors of the programs"
-#~ msgstr "Списак аутора програма"
-
-#~ msgid "Documenter entry"
-#~ msgstr "Унос писца документације"
-
-#~ msgid "A single documenter entry"
-#~ msgstr "Унос једног писца документације"
-
-#~ msgid "About %s"
-#~ msgstr "О програму %s"
-
-#~ msgid "Remote user is offline"
-#~ msgstr "Удаљени корисник није на мрежи"
-
-#~ msgid "_Call user"
-#~ msgstr "Позови _корисника"
-
-#~ msgid "SIP Outbound Proxy"
-#~ msgstr "SIP спољни везани посредник"
-
-#~ msgid "Code contributors:"
-#~ msgstr "Сарадници програмери:"
-
-#~ msgid ""
-#~ "Your username and password are used to register to the ekiga.net SIP "
-#~ "service. It will provide you a SIP address that you can give to your "
-#~ "friends and family so that they can call you."
-#~ msgstr ""
-#~ "Ваше корисничко име и лозинка се користе за пријаву на ekiga.net SIP "
-#~ "услугу, То ће вам донети SIP адресу коју можете дати вашим пријатељима и "
-#~ "породици како би вас могли назвати."
-
-#~ msgid "Audio Endpoint - page %d/%d"
-#~ msgstr "Звучни излаз — страна %d/%d"
-
-#~ msgid "Video Endpoint - page %d/%d"
-#~ msgstr "Слика — страна %d/%d"
-
-#~ msgid "Sound to play:"
-#~ msgstr "Звук за пуштање:"
-
-#~ msgid "If enabled, the splash screen will be displayed when Ekiga starts"
-#~ msgstr ""
-#~ "Ако је укључено, уводни екран ће бити приказан при покретању програма"
-
-#~ msgid "Show splash screen at startup"
-#~ msgstr "Прикажи уводни екран при покретању"
-
-#~ msgid "_Show splash screen"
-#~ msgstr "Пр_икажи уводни екран"
-
-#~ msgid "Cl_ear call"
-#~ msgstr "Ск_лони позив"
-
-#~ msgid "C_onnect"
-#~ msgstr "П_овежи се"
-
-#~ msgid "Create a new connection"
-#~ msgstr "Направи нову везу"
-
-#~ msgid "Close the current connection"
-#~ msgstr "Затвори тренутну везу"
-
-#~ msgid ""
-#~ "If enabled, all incoming calls will be forwarded to the host that is "
-#~ "specified in the field above"
-#~ msgstr ""
-#~ "Ако је укључено, сви долазећи позиви ће бити преусмерени на рачунар који "
-#~ "је назначен у претходном пољу"
-
-#~ msgid "_Connect"
-#~ msgstr "_Повежи се"
-
-#~ msgid "GnomeMeeting"
-#~ msgstr "Гном састанак"
-
-#~ msgid "Videoconferencing"
-#~ msgstr "Видео конференција"
-
-#~ msgid "Automatically clear the text chat at the end of calls"
-#~ msgstr "Аутоматски обриши текстуални разговор на крају позива"
-
-#~ msgid ""
-#~ "Change the control panel section (4 means that the control panel is off)"
-#~ msgstr ""
-#~ "Промените секцију панела елемената (4 значи да је панел елемената "
-#~ "искључен)"
-
-#~ msgid ""
-#~ "Choose the number of blocks (that have not changed) transmitted with each "
-#~ "frame. These blocks fill in the background"
-#~ msgstr ""
-#~ "Изаберите број блокова (који нису промењени) који се преноси уз сваки "
-#~ "кадар. Ови блокови се попуњавају у позадини"
-
-#~ msgid "E-mail address"
-#~ msgstr "Адреса е-поште"
-
-#~ msgid "Enable H.245 tunnelling"
-#~ msgstr "Омогући H.245 тунел"
-
-#~ msgid "Enable IP translation"
-#~ msgstr "Омогући превођење мрежних адреса"
-
-#~ msgid "Enable video reception"
-#~ msgstr "Омогући видео пријем"
-
-#~ msgid "Enable video transmission"
-#~ msgstr "Омогући видео пренос"
-
-#~ msgid "Enter a comment about yourself for the user directory"
-#~ msgstr "Унесите коментар о себи за кориснички именик"
-
-#~ msgid ""
-#~ "Enter the public IP of your NAT/PAT router if you want to use IP "
-#~ "translation. If you are registered to ils.seconix.com, GnomeMeeting will "
-#~ "automatically fetch the public IP using the ILS service"
-#~ msgstr ""
-#~ "Унесите јавну IP адресу од вашег NAT/PAT рутера ако желите да користите "
-#~ "IP превођење. Ако сте регистровани на ils.seconix.com, Гном Састанак ће "
-#~ "аутоматски добавити јавну IP адресу користећи ILS сервис"
-
-#~ msgid "Enter your location (country or city) for the user directory"
-#~ msgstr "Унесите локацију (држава или град) за кориснички именик"
-
-#~ msgid "Gatekeeper ID"
-#~ msgstr "ИБ чувара капије"
-
-#~ msgid "Gatekeeper alias"
-#~ msgstr "Надимак чувара капије"
-
-#~ msgid "Gatekeeper alias as primary alias"
-#~ msgstr "Надимак чувара капије као основни надимак"
-
-#~ msgid "Gatekeeper host"
-#~ msgstr "Домаћин чувара капије"
-
-#~ msgid "Gatekeeper password"
-#~ msgstr "Лозинка чувара капије"
-
-#~ msgid "If enabled, register with the selected user directory"
-#~ msgstr ""
-#~ "Ако је укључено, пријави се помоћу директоријума изабраног корисника"
-
-#~ msgid ""
-#~ "If enabled, the text chat will automatically be cleared at the end of "
-#~ "calls"
-#~ msgstr ""
-#~ "Ако је укључено, текстуални разговор ће бити избрисан на крају позива"
-
-#~ msgid "If enabled, video is transmitted during a call"
-#~ msgstr "Ако је укључено, видео се преноси за време позива"
-
-#~ msgid ""
-#~ "If enabled, your details are shown to people browsing the user directory. "
-#~ "If disabled, you are not visible to users browsing the user directory, "
-#~ "but they can still use the callto URL to call you"
-#~ msgstr ""
-#~ "Ако је укључено, ваши детаљи су приказани људима који претражују "
-#~ "кориснички директоријум. Ако је искључено, невидљиви сте људима који "
-#~ "претражују кориснички директоријум, али они још увек могу да користе "
-#~ "позив на URL да вас позову"
-
-#~ msgid "Show my details to other registered users"
-#~ msgstr "Покажи моје детаље осталим регистрованим корисницима"
-
-#~ msgid "Show the chat window in the main window"
-#~ msgstr "Прикажи прозор за разговор у главном прозору"
-
-#~ msgid ""
-#~ "The Gatekeeper alias to use when registering (string, or E164 ID if only "
-#~ "0123456789#)"
-#~ msgstr ""
-#~ "Надимак чувара капије за коришћење код регистровања (низ знакова или E164 "
-#~ "ID ако је само 0123456789#)"
-
-#~ msgid "The Gatekeeper host to register with"
-#~ msgstr "Домаћин чувара капије за регистровање"
-
-#~ msgid "The Gatekeeper identifier to register with"
-#~ msgstr "Идентификатор чувара капије за регистровање"
-
-#~ msgid ""
-#~ "The Gatekeeper password to use for H.235 authentication to the Gatekeeper"
-#~ msgstr ""
-#~ "Лозинка чувара капије да се користи за H.235 аутентикацију за чувара "
-#~ "капије"
-
-#~ msgid ""
-#~ "The range of UDP ports that GnomeMeeting will use for RTP (audio and "
-#~ "video communication channels). You can change the UDP port range if you "
-#~ "are using IP translation and if you need to have several GnomeMeeting "
-#~ "running behind your NAT/PAT router. GnomeMeeting needs to be restarted "
-#~ "for the new values to take effect."
-#~ msgstr ""
-#~ "Опсег UDP порта који Гном састанак користи за RTP (звучни и видео "
-#~ "комуникациони канали). Можете променити UDP порт ако користите IP "
-#~ "превођење и ако имате потребу за више Гном састанака иза NAT/PAT рутера. "
-#~ "Гном састанак треба да буде поново покренут да нове вредности буду узете "
-#~ "у обзир."
-
-#~ msgid ""
-#~ "The range of UDP ports that GnomeMeeting will use when registering to "
-#~ "gatekeepers. You can change the UDP port range if you are using IP "
-#~ "translation and if you need to have several GnomeMeeting running behind "
-#~ "your NAT/PAT router. GnomeMeeting needs to be restarted for the new "
-#~ "values to take effect. This port range has no effect if you are not "
-#~ "registering to a gatekeeper."
-#~ msgstr ""
-#~ "Опсег UDP порта који Гном састанак користи при регистровању на чувара "
-#~ "капије. Можете променити UDP порт ако користите IP превођење и ако имате "
-#~ "потребу за више Гном састанака иза NAT/PAT рутера. Гном састанак треба да "
-#~ "буде поново покренут да нове вредности буду узете у обзир. Опсег порта "
-#~ "нема ефекат ако нисте регистровани на чувару капије."
-
-#~ msgid "The registering method to use"
-#~ msgstr "Метод пријављивања који се користи"
-
-#~ msgid "The user directory server to register with"
-#~ msgstr "Кориснички директоријум за регистровање"
-
-#~ msgid ""
-#~ "This enables H.245 Tunnelling mode. In H.245 Tunnelling mode H.245 "
-#~ "messages are encapsulated into the the H.225 channel (port 1720). This "
-#~ "saves one TCP connection during calls. H.245 Tunnelling was introduced in "
-#~ "H.323v2 and Netmeeting does not support it. Using both Fast Start and "
-#~ "H.245 Tunnelling can crash some versions of Netmeeting."
-#~ msgstr ""
-#~ "Ово укључује H.245 режим тунела. У H.245 режиму тунела H.245 поруке су "
-#~ "уоквирене у H.225 канал (порт 1720). Ово штеди једну TCP везу током "
-#~ "позива. H.245 тунел је уведен у H.323v2 и Netmeeting га не подржава. "
-#~ "Коришћење и Брзог старта и H.245 тунела може да сруши неке верзије "
-#~ "Netmeeting-а."
-
-#~ msgid ""
-#~ "This enables IP checking from seconix.com and fills the IP in the public "
-#~ "IP of the NAT/PAT gateway field of GnomeMeeting. The returned IP is only "
-#~ "used when IP Translation is enabled. If you disable IP checking, you will "
-#~ "have to manually enter the IP of your gateway in the GnomeMeeting "
-#~ "preferences"
-#~ msgstr ""
-#~ "Ово укључује проверу мрежне адресе са seconix.com и попуњава ИП у јавном "
-#~ "ИП пољу за NAT/PAT пролаз Гном састанка. Враћени ИП се користи једино "
-#~ "када је укључено превођење мрежних адреса. Уколико искључите проверу ИП-"
-#~ "а, мораћете да ручно унесете мрежу адресу излаза у поставкама Гном "
-#~ "састанка"
-
-#~ msgid ""
-#~ "This enables IP translation. IP translation is useful if GnomeMeeting is "
-#~ "running behind a NAT/PAT router. You have to put the public IP of the "
-#~ "router in the field below. If you are registered to ils.seconix.com, "
-#~ "GnomeMeeting will automatically fetch the public IP using the ILS "
-#~ "service. If your router natively supports H.323, you can disable this"
-#~ msgstr ""
-#~ "Ово укључује IP превођење. IP превођење је корисно када је Гном састанак "
-#~ "покренут иза NAT/PAT рутера. Треба да унесете јавну IP адресу од рутера у "
-#~ "наредно поље. Ако сте регистровани на ils.seconix.com, Гном састанак ће "
-#~ "аутоматски добавити јавну IP адресу користећи ILS сервис. Ако рутер "
-#~ "природно подржава H.323, ово можете да искључите"
-
-# bug: s/technic/technology/
-#~ msgid ""
-#~ "This enables STUN Support. STUN is a technic that permits to go through "
-#~ "some types of NAT gateways."
-#~ msgstr ""
-#~ "Ово укључује подршку за STUN. STUN је технологија која омогућава пролаз "
-#~ "кроз неке врсте мрежних преводилаца адреса."
-
-#~ msgid "Transmitted background blocks"
-#~ msgstr "Пренесени блокови у позадини"
-
-#~ msgid "Use the specified gateway to do calls"
-#~ msgstr "Користи наведени мрежни излаз за разговоре"
-
-#~ msgid ""
-#~ "Use this option to ensure the above alias is used as the primary alias "
-#~ "when registering with a gatekeeper. This may be required if your "
-#~ "gatekeeper can only perform authentication using the first alias in the "
-#~ "list"
-#~ msgstr ""
-#~ "Користите ову опцију да обезбедите да се користи горњи надимак као "
-#~ "основни надимак при пријави чувару капије. Ово може бити обавезно ако "
-#~ "чувар капије уме да аутентификује само коришћењем првог надимка из списка"
-
-#~ msgid "Total: %.2f MB"
-#~ msgstr "Укупно: %.2f MB"
-
-#~ msgid "URL"
-#~ msgstr "Адреса"
-
-#~ msgid "---- Call begins at %s\n"
-#~ msgstr "—— Позив почиње у %s\n"
-
-#~ msgid "---- Call ends at %s\n"
-#~ msgstr "—— Позив се завршава у %s\n"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Умножи путању везе"
-
-#~ msgid "Connect to"
-#~ msgstr "Повежи се са"
-
-#~ msgid "Add to Address Book"
-#~ msgstr "Додај у адресар"
-
-#~ msgid "YES"
-#~ msgstr "ДА"
-
-#~ msgid "Sorry, this script won't work while GnomeMeeting is running"
-#~ msgstr "Извините, ова скрипта неће радити док је Гном састанак покренут"
-
-#~ msgid "  WARNING!!!"
-#~ msgstr "  УПОЗОРЕЊЕ!!!"
-
-#~ msgid ""
-#~ "  This script will delete all user GnomeMeeting configuration,\n"
-#~ "  including preferences that may be important! \n"
-#~ "  The GConf daemon will be shut down, so make sure you have no\n"
-#~ "  applications depending on it running.\n"
-#~ "\n"
-#~ "  Do you really want to do this?\n"
-#~ "\n"
-#~ "  If so, say \"YES\".\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  Ова скрипта ће обрисати сва подешавања корисника Гном састанакa,\n"
-#~ "  укључујући карактеристике које могу бити важне!\n"
-#~ "  GConf позадински процес биће угашен, зато проверите да нема\n"
-#~ "  програма који су покренути и зависе од њега.\n"
-#~ "\n"
-#~ "  Да ли стварно то желите?\n"
-#~ "\n"
-#~ "  Ако је тако реците „ДА“.\n"
-#~ "\n"
-
-#~ msgid "Removing $HOME/.gconf/apps/gnomemeeting"
-#~ msgstr "Уклања $HOME/.gconf/apps/gnomemeeting"
-
-#~ msgid "Shutting down GConf daemon"
-#~ msgstr "Гашење GConf позадинског процеса"
-
-#~ msgid "...Done."
-#~ msgstr "...Урађено."
-
-#~ msgid "Leaving configuration alone."
-#~ msgstr "Оставља конфигурацију саму."
-
-#~ msgid "Have a nice day."
-#~ msgstr "Пријатно."
-
-#~ msgid ""
-#~ "  The GConf daemon will be shut down, so make sure you have no\n"
-#~ "  applications depending on it running.\n"
-#~ "\n"
-#~ "  Do you really want to do this?\n"
-#~ "\n"
-#~ "  If so, say \"YES\".\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  GConf позадински процес биће угашен, зато проверите да нема\n"
-#~ "  програма који су покренути и зависе од њега.\n"
-#~ "\n"
-#~ "  Да ли стварно то желите?\n"
-#~ "\n"
-#~ "  Ако је тако реците „ДА“.\n"
-#~ "\n"
-
-#~ msgid "Removing schemas"
-#~ msgstr "Уклања шеме"
-
-#~ msgid "Installing schemas"
-#~ msgstr "Инсталира шеме"
-
-#~ msgid ""
-#~ "CRITICAL ERROR -- Schema installation failed.\n"
-#~ "Most probably you have the GConf daemon running as root.\n"
-#~ "\n"
-#~ "Run \"gnomemeeting-config-tool --install-schemas\" as root.\n"
-#~ msgstr ""
-#~ "КРИТИЧНА ГРЕШКА -- Инсталација шеме није успела.\n"
-#~ "Највероватније имате GConf покренут као root.\n"
-#~ "\n"
-#~ "Покрените „gnomemeeting-config-tool --install-schemas“ као root.\n"
-
-#~ msgid "Usage:  gnomemeeting-config-tool OPTION"
-#~ msgstr "Кориштење:  gnomemeeting-config-tool ОПЦИЈА"
-
-#~ msgid "Fixes problems with the GnomeMeeting settings"
-#~ msgstr "Поправља проблеме са подешавањима Гном састанака"
-
-#~ msgid "  --clean                remove all user settings"
-#~ msgstr "  --clean                 уклонити сва корисничка подешавања"
-
-#~ msgid ""
-#~ "  --install-schemas      install schemas with default settings (run as "
-#~ "root)"
-#~ msgstr ""
-#~ "  --install-schemas      инсталира шеме са подразумеваним подешавањима "
-#~ "(покренути као root)"
-
-#~ msgid ""
-#~ "  --clean-schemas        remove schemas with default settings (run as "
-#~ "root)"
-#~ msgstr ""
-#~ "  --clean-schemas        уклања шеме са подразумеваним подешавањима "
-#~ "(покренути као root)"
-
-#~ msgid ""
-#~ "  --fix-permissions      fix permissions of GConf repository (run as root)"
-#~ msgstr ""
-#~ "  --fix-permissions      поправља овлашћења GConf спремишта (покренути "
-#~ "као root)"
-
-#~ msgid "No gateway or proxy specified"
-#~ msgstr "Није наведен излаз нити посредник"
-
-#~ msgid "You need to specify a host to use as gateway or proxy."
-#~ msgstr "Морате навести рачунар који користите за посредника или излаз."
-
-#~ msgid "Forward URL not specified"
-#~ msgstr "Није наведена адреса за преусмеравање"
-
-#~ msgid ""
-#~ "You need to specify an URL where to forward calls in the call forwarding "
-#~ "section of the preferences!\n"
-#~ "\n"
-#~ "Disabling forwarding."
-#~ msgstr ""
-#~ "Морате навести адресу на коју да преусмеравам позиве у одељку поставки за "
-#~ "преусмеравање позива!\n"
-#~ "\n"
-#~ "Искључује преусмеравање."
-
-#~ msgid "Failure opening %s for transmission, will try with next common codec"
-#~ msgstr "Грешка при отварању %s за пренос, покушаће следећи познати кодек"
-
-#~ msgid "Failure opening %s for reception, will try with next common codec"
-#~ msgstr "Грешка при отварању %s за пријем, покушаће следећи познат кодек"
-
-#~ msgid "Call transfer failed"
-#~ msgstr "Неуспело пребацивање позива"
-
-#~ msgid ""
-#~ "The remote user tried to transfer your call to another user, but it "
-#~ "failed."
-#~ msgstr ""
-#~ "Удаљени корисник је покушао да пребаци ваш позив другом кориснику, али "
-#~ "није успео."
-
-#~ msgid ""
-#~ "Your e-mail address is used when registering to the GnomeMeeting users "
-#~ "directory. It is used to create a callto address permitting your contacts "
-#~ "to easily call you wherever you are."
-#~ msgstr ""
-#~ "Е-пошта се користи при пријављивању у именик корисника Гном састанка. "
-#~ "Користи се за образовање позивних адреса које вам дозвољавају да вас ваши "
-#~ "познаници лако позову где год да сте."
-
-#~ msgid ""
-#~ "I don't want to register to the GnomeMeeting users directory and get a "
-#~ "callto address"
-#~ msgstr ""
-#~ "Не желим да се пријавим у именик корисника Гном састанка и да добијем "
-#~ "позивну адресу"
-
-#~ msgid "Forwarding call from %s to %s (Forward all calls)"
-#~ msgstr "Преусмерава позив од %s до %s (преусмери све позиве)"
-
-#~ msgid "Rejecting call from %s (Do Not Disturb)"
-#~ msgstr "Одбија позив од %s (не узнемиравај)"
-
-#~ msgid "Accepting call from %s (Auto Answer)"
-#~ msgstr "Прихвата позив од %s (сам одговара)"
-
-#~ msgid "Call rejected"
-#~ msgstr "Позив одбијен"
-
-#~ msgid "Call automatically answered"
-#~ msgstr "Аутоматски одговорено на позив"
-
-#~ msgid "Error while forwarding call to %s"
-#~ msgstr "Грешка при прослеђивању позива за %s"
-
-#~ msgid "There was an error when forwarding the call to the given host."
-#~ msgstr "Дошло је до грешке при прослеђивању позива на дати рачунар."
-
-#~ msgid "Connected"
-#~ msgstr "Повезано"
-
-#~ msgid "Remote user did not accept the call"
-#~ msgstr "Удаљени корисник није прихватио позив"
-
-#~ msgid "Local user did not accept the call"
-#~ msgstr "Локални корисник није прихватио позив"
-
-#~ msgid "Missed %d call"
-#~ msgid_plural "Missed %d calls"
-#~ msgstr[0] "Пропуштен %d позив"
-#~ msgstr[1] "Пропуштена %d позива"
-#~ msgstr[2] "Пропуштено %d позива"
-
-#~ msgid "Attaching lid hardware to codec"
-#~ msgstr "Прилаже lid hardware на кодек"
-
-#~ msgid "Forwarding Call to %s (No Answer)"
-#~ msgstr "Преусмеравање позива на %s (без одговора)"
-
-#~ msgid "Unregistered from gatekeeper %s"
-#~ msgstr "Нерегистрован од чувара капије %s"
-
-#~ msgid "Invalid gatekeeper hostname"
-#~ msgstr "Неисправно име чувара капије"
-
-#~ msgid "Please provide a hostname to use for the gatekeeper."
-#~ msgstr "Унесите име домаћина који ће бити чувар капије."
-
-#~ msgid "Invalid gatekeeper ID"
-#~ msgstr "Неисправан ИБ чувара капије"
-
-#~ msgid "Please provide a valid ID for the gatekeeper."
-#~ msgstr "Обезбедите исправан ИБ за чувара капије."
-
-#~ msgid "Gatekeeper set to %s"
-#~ msgstr "Чувар капије подешен на %s"
-
-#~ msgid "Trying to stop calling"
-#~ msgstr "Покушавање заустављања позива"
-
-#~ msgid "Stopping current call"
-#~ msgstr "Заустављање тренутног позива"
-
-#~ msgid "Opened Quicknet device %s"
-#~ msgstr "Отворен Quicknet уређај %s"
-
-#~ msgid "Error while opening the Quicknet device."
-#~ msgstr "Грешка при отварању Quicknet уређаја."
-
-#~ msgid ""
-#~ "Please check that your driver is correctly installed and that the device "
-#~ "is working correctly."
-#~ msgstr ""
-#~ "Проверите да ли је ваш управљачки програм правилно инсталиран и да ли "
-#~ "уређај ради исправно."
-
-#~ msgid "Closed Quicknet device %s"
-#~ msgstr "Затворен Quicknet уређај %s"
-
-#~ msgid "Phone is off hook"
-#~ msgstr "Слушалица није спуштена"
-
-#~ msgid "Phone is on hook"
-#~ msgstr "Слушалица спуштена"
-
-#~ msgid "Open control panel"
-#~ msgstr "Отвори контролни панел"
-
-#~ msgid "Quit GnomeMeeting"
-#~ msgstr "Излази из Гном састанка"
-
-#~ msgid "Text Chat"
-#~ msgstr "Текстуални разговор"
-
-#~ msgid "View/Hide the text chat window"
-#~ msgstr "Погледај/сакриј прозор текстуалног разговора"
-
-#~ msgid "Off"
-#~ msgstr "Искључено"
-
-#~ msgid "Hide the control panel"
-#~ msgstr "Сакриј контролни панел"
-
-#~ msgid "_Clear Text Chat"
-#~ msgstr "Очисти _текстуални разговор"
-
-#~ msgid "Clear the text chat"
-#~ msgstr "Чисти текстуални разговор"
-
-#~ msgid ""
-#~ "Lost packets:\n"
-#~ "Late packets:\n"
-#~ "Round-trip delay:\n"
-#~ "Jitter buffer:"
-#~ msgstr ""
-#~ "Изгубљени пакети:\n"
-#~ "Касни пакети:\n"
-#~ "Трајање повратног пута:\n"
-#~ "Jitter бафер:"
-
-#~ msgid "Click to clear"
-#~ msgstr "Кликните да очистите"
-
-#~ msgid "Generic error"
-#~ msgstr "Општа грешка"
-
-#~ msgid "GnomeMeeting GUI"
-#~ msgstr "Сучеље Гномовог састанка"
-
-#~ msgid "Forward calls to _host:"
-#~ msgstr "Преусмери позив до _домаћина:"
-
-# bug: plural-forms
-#~ msgid "seconds"
-#~ msgstr "секунди"
-
-#~ msgid "GnomeMeeting Sound Events"
-#~ msgstr "Звучни догађаји за Гном састанак"
-
-#~ msgid "Ring Output device:"
-#~ msgstr "Излазни уређај за звоно:"
-
-#~ msgid "All"
-#~ msgstr "Све"
-
-#~ msgid "rfc2833"
-#~ msgstr "rfc2833"
-
-#~ msgid "Signal"
-#~ msgstr "Сигнал"
-
-#~ msgid "H.323 Version 2 Settings"
-#~ msgstr "H.323 Верзија 2 подешавања"
-
-#~ msgid "DTMF Sending"
-#~ msgstr "Слање ДТМФ-а"
-
-#~ msgid ""
-#~ "This permits to set the mode for DTMFs sending. The values can be \"All"
-#~ "\", \"None\", \"rfc2833\", \"Signal\" or \"String\" (default is \"All\"). "
-#~ "Choosing other values than \"All\", \"String\" or \"rfc2833\" disables "
-#~ "the Text Chat."
-#~ msgstr ""
-#~ "Ово омогућава подешавање режима за слање ДТМФ-а. Вредности могу бити "
-#~ "„All“, „None“, „rfc2833“, „Signal“ или „String“ (подразумевано је „All“). "
-#~ "Избором неке друге вредности осим „All“, „String“ или „rfc2833“ искључује "
-#~ "се текстуални разговор."
-
-#~ msgid "Do not register"
-#~ msgstr "Не региструј"
-
-#~ msgid "Automatically discover"
-#~ msgstr "Аутоматски препознај"
-
-#~ msgid "Gatekeeper _host:"
-#~ msgstr "_Домаћин чувара капије:"
-
-#~ msgid "Gatekeeper _alias:"
-#~ msgstr "_Надимак чувара капије:"
-
-#~ msgid "Gatekeeper _password:"
-#~ msgstr "_Лозинка чувара капије:"
-
-#~ msgid "Registration timeout of"
-#~ msgstr "Регистрација истиче за"
-
-#~ msgid "minutes"
-#~ msgstr "минута"
-
-#~ msgid "Register this alias as the primary alias with the gatekeeper"
-#~ msgstr "Региструј овај надимак као основни надимак за чувара капије"
-
-#~ msgid ""
-#~ "Use this option to ensure the above alias is used as the primary alias "
-#~ "when registering with a gatekeeper. This may be required if your "
-#~ "gatekeeper can only perform authentication using the first alias in the "
-#~ "list."
-#~ msgstr ""
-#~ "Користите ову опцију да обезбедите да се користи горњи надимак као "
-#~ "основни надимак при регистрацији на чувара капије. Ово може бити обавезно "
-#~ "ако чувар капије уме да аутентификује само коришћењем првог надимка из "
-#~ "списка."
-
-#~ msgid "Registering method:"
-#~ msgstr "Метод регистровања:"
-
-#~ msgid "Click here to update your Gatekeeper settings"
-#~ msgstr "Кликните овде да освежите подешавања чувара капије"
-
-#~ msgid "Gateway/Proxy"
-#~ msgstr "Мрежни излаз/посредник"
-
-#~ msgid "Gateway / Proxy host:"
-#~ msgstr "Домаћин за мрежни излаз/посредника:"
-
-#~ msgid "Use gateway or proxy"
-#~ msgstr "Користи мрежни излаз или посредника"
-
-#~ msgid "Enable IP _translation"
-#~ msgstr "Омогући _превођење IP адреса"
-
-#~ msgid ""
-#~ "This enables IP translation. IP translation is useful if GnomeMeeting is "
-#~ "running behind a NAT/PAT router. You have to put the public IP of the "
-#~ "router in the field below. If you are registered to ils.seconix.com, "
-#~ "GnomeMeeting will automatically fetch the public IP using the ILS "
-#~ "service. If your router natively supports H.323, you can disable this."
-#~ msgstr ""
-#~ "Ово укључује IP превођење. IP превођење је корисно када је Гном састанак "
-#~ "покренут иза NAT/PAT рутера. Треба да унесете јавну IP адресу од рутера у "
-#~ "наредно поље. Ако сте регистровани на ils.seconix.com, Гном састанак ће "
-#~ "аутоматски добавити јавну IP адресу користећи ILS сервис. Ако рутер "
-#~ "природно подржава H.323, можете то да искључите."
-
-#~ msgid "Enable _automatic IP checking"
-#~ msgstr "Омогући _аутоматску проверу мрежних адреса"
-
-#~ msgid ""
-#~ "This enables IP checking from seconix.com and fills the IP in the public "
-#~ "IP of the NAT/PAT gateway field of GnomeMeeting. The returned IP is only "
-#~ "used when IP Translation is enabled. If you disable IP checking, you will "
-#~ "have to manually enter the IP of your gateway in the GnomeMeeting "
-#~ "preferences."
-#~ msgstr ""
-#~ "Ово укључује проверу мрежне адресе са seconix.com и попуњава ИП у јавном "
-#~ "ИП пољу за NAT/PAT пролаз Гном састанка. Враћени ИП се користи једино "
-#~ "када је укључено превођење мрежних адреса. Уколико искључите проверу ИП-"
-#~ "а, мораћете да ручно унесете мрежу адресу излаза у поставкама Гном "
-#~ "састанка."
-
-#~ msgid "Public _IP of the NAT/PAT router:"
-#~ msgstr "Јавна _IP адреса од NAT/PAT рутера:"
-
-#~ msgid ""
-#~ "Enter the public IP of your NAT/PAT router if you want to use IP "
-#~ "translation. If you are registered to ils.seconix.com, GnomeMeeting will "
-#~ "automatically fetch the public IP using the ILS service."
-#~ msgstr ""
-#~ "Унесите јавну IP адресу од вашег NAT/PAT рутера ако желите да користите "
-#~ "IP превођење. Ако сте регистровани на ils.seconix.com, Гном састанак ће "
-#~ "аутоматски добавити јавну IP адресу користећи ILS сервис."
-
-# bug: STUN?
-#~ msgid "STUN Support"
-#~ msgstr "STUN подршка"
-
-#~ msgid "Low"
-#~ msgstr "Низак"
-
-#~ msgid "Medium"
-#~ msgstr "Средњи"
-
-#~ msgid "High"
-#~ msgstr "Висок"
-
-#~ msgid "AGC"
-#~ msgstr "AGC"
-
-#~ msgid "POTS"
-#~ msgstr "СДТА"
-
-#~ msgid "Headset"
-#~ msgstr "Слушалице"
-
-#~ msgid "Quicknet Hardware"
-#~ msgstr "Quicknet хардвер"
-
-#~ msgid "Output device type:"
-#~ msgstr "Врста излазног уређаја:"
-
-#~ msgid "Country _code:"
-#~ msgstr "Државна _ознака:"
-
-#~ msgid ""
-#~ "The two-letter country code of your country (e.g.: BE, UK, FR, DE, ...)."
-#~ msgstr ""
-#~ "Два слова државне ознаке за вашу државу (нпр: YU, CA, UK, FR, DE, ...)."
-
-#~ msgid "Small"
-#~ msgstr "Мали"
-
-#~ msgid "Enable video _transmission"
-#~ msgstr "Омогући видео _пренос"
-
-#~ msgid "If enabled, video is transmitted during a call."
-#~ msgstr "Ако је укључено, видео се преноси за време позива."
-
-#~ msgid "Enable video _reception"
-#~ msgstr "Омогући видео п_ријем"
-
-#~ msgid "kB/s"
-#~ msgstr "кБ/с"
-
-# bug: bad! needs plural forms!!!
-#~ msgid "Transmit"
-#~ msgstr "Пренеси"
-
-#~ msgid ""
-#~ "Choose the number of blocks (that have not changed) transmitted with each "
-#~ "frame. These blocks fill in the background."
-#~ msgstr ""
-#~ "Изаберите број блокова (који нису измењени) који се преносе уз сваку "
-#~ "слику. Ови блокови се попуњавају у позадини."
-
-# bug: BAD! needs plural forms!
-#~ msgid "background _blocks with each frame"
-#~ msgstr "позадинских _блокова са сваком сликом"
-
-#~ msgid "GnomeMeeting Preferences"
-#~ msgstr "Поставке Гном састанка"
-
-#~ msgid "Gatekeeper Settings"
-#~ msgstr "Подешавања чувара капије"
-
-#~ msgid "Gateway / Proxy Settings"
-#~ msgstr "Подешавања мрежног излаза / посредника"
-
-#~ msgid "The type of NAT was successfully detected"
-#~ msgstr "Врста NAT-а је успешно откривена"
-
-#~ msgid "Use your MicroTelco account number"
-#~ msgstr "Користите број MicroTelco налога"
-
-#~ msgid "_Pin:"
-#~ msgstr "_Пин:"
-
-#~ msgid "Use your MicroTelco PIN"
-#~ msgstr "Користите MicroTelco ПИН"
-
-#~ msgid "GnomeMeeting Tray Icon"
-#~ msgstr "Гном Састанак икона на панелу"
-
-#~ msgid ""
-#~ "The call transfer failed, the user was either unreachable, or simply busy "
-#~ "when he received the call transfer request."
-#~ msgstr ""
-#~ "Пренос позива није успео, корисник није доступан или је једноставно било "
-#~ "заузето када је примио захтев за пренос позива."
-
-#~ msgid "No contact with speed dial %s# found, will call number %s instead"
-#~ msgstr "Није нађен контакт са брзим бирањем %s#, зваће %s уместо њега"
-
-#~ msgid "Title"
-#~ msgstr "Наслов"
-
-# bug: assistant is preffered over druid
-#~ msgid "Title of the druid"
-#~ msgstr "Наслов помоћника"
-
-#~ msgid "Logo"
-#~ msgstr "Знак"
-
-#~ msgid "Logo image"
-#~ msgstr "Слика логотипа"
-
-#~ msgid "Top Watermark"
-#~ msgstr "Горњи водени жиг"
-
-#~ msgid "Watermark image for the top"
-#~ msgstr "Слика воденог жига за врх"
-
-#~ msgid "Title Foreground"
-#~ msgstr "Боја наслова"
-
-#~ msgid "Foreground color of the title"
-#~ msgstr "Боја наслова"
-
-#~ msgid "Title Foreground Color"
-#~ msgstr "Боја наслова"
-
-#~ msgid "Foreground color of the title as a GdkColor"
-#~ msgstr "Боја наслова као GdkColor"
-
-#~ msgid "Title Foreground color set"
-#~ msgstr "Боја наслова је постављена"
-
-#~ msgid "Foreground color of the title is set"
-#~ msgstr "Боја наслова је постављена"
-
-#~ msgid "Background Color"
-#~ msgstr "Боја позадине"
-
-#~ msgid "Background color"
-#~ msgstr "Боја позадине"
-
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "Боја позадине као GdkColor"
-
-#~ msgid "Background color set"
-#~ msgstr "Боја позадине постављена"
-
-#~ msgid "Background color is set"
-#~ msgstr "Боја позадине је постављена"
-
-#~ msgid "Logo Background Color"
-#~ msgstr "Боја позадине логотипа"
-
-#~ msgid "Logo Background color"
-#~ msgstr "Боја позадине логотипа"
-
-#~ msgid "Logo Background color as a GdkColor"
-#~ msgstr "Боја позадине логотипа као GdkColor"
-
-#~ msgid "Logo Background color set"
-#~ msgstr "Боја позадине логотипа постављена"
-
-#~ msgid "Logo Background color is set"
-#~ msgstr "Боја позадине логотипа је постављена"
-
-#~ msgid "Show Finish"
-#~ msgstr "Прикажи „Заврши“"
-
-#~ msgid "Show the 'Finish' button instead of the 'Next' button"
-#~ msgstr "Прикажи дугме „Заврши“ уместо дугмета „Следеће“"
-
-#~ msgid "Show Help"
-#~ msgstr "Прикажи „Помоћ“"
-
-#~ msgid "Show the 'Help' button"
-#~ msgstr "Прикажи дугме „Помоћ“"
-
-# bug: plural-forms
-#~ msgid "Found %d users in %s"
-#~ msgstr "Нађох %d корисника у %s"
-
-# bug: plural-forms
-#~ msgid "Found %d users in %s for a total of %d users"
-#~ msgstr "Нађох %d корисника у %s од укупно %d корисника"
-
-#~ msgid "On LDAP servers"
-#~ msgstr "На ЛДАП серверима"
-
-# bug: plural-forms
-#~ msgid "Missed %d calls"
-#~ msgstr "Пропуштен %d позива"
-
-#~ msgid ""
-#~ "Another user already exists with the same alias, please use another alias."
-#~ msgstr "Већ постоји други корисник са истим надимком, узмите други надимак."
-
-#~ msgid ""
-#~ "You are not allowed to register to the gatekeeper. Please check your "
-#~ "login, password and firewall."
-#~ msgstr ""
-#~ "Није вам дозвољено регистровање са чуварем капије.  Проверите ваше име, "
-#~ "лозинку и ватрени зид."
-
-#~ msgid "There was a transport error."
-#~ msgstr "Догодила се грешка приликом транспорта."
-
-#~ msgid "No gatekeeper corresponding to your options has been found."
-#~ msgstr "Ниједан чувар капије није нађен пратећи ваше опције."
-
-#~ msgid "Error while registering with gatekeeper"
-#~ msgstr "Грешка при регистровању са чуварем капије"
-
-#~ msgid "Cannot contact the users directory"
-#~ msgstr "Не може да контактира кориснички директоријум"
-
-#~ msgid ""
-#~ "Failed to contact the users directory %s:%d. The directory is probably "
-#~ "currently overloaded, please try again later."
-#~ msgstr ""
-#~ "Нисам успео да се повежем са корисничким имеником %s:%d. Именик је "
-#~ "вероватно сада преоптерећен, покушајте касније."
-
-#~ msgid "Failed to bind to users directory: %s."
-#~ msgstr "Не могу да се вежем за директоријум корисника: %s."
-
-#~ msgid "Unregistered from the users directory %s."
-#~ msgstr "Одјављен из директоријума корисника %s."
-
-#~ msgid "Error while registering to %s"
-#~ msgstr "Грешка при пријави у %s"
-
-#~ msgid "Free for Cha_t"
-#~ msgstr "Слободан за раз_говор"
-
-#~ msgid "_Busy"
-#~ msgstr "_Заузет"
-
-#~ msgid "Both (Local Video Incrusted)"
-#~ msgstr "Оба (Обложен локални видео)"
-
-#~ msgid "Sent dtmf %c"
-#~ msgstr "Послах ДТМФ %c"
-
-#~ msgid "Buy a card"
-#~ msgstr "Купити картицу"
-
-#~ msgid "Consult my account details"
-#~ msgstr "Погледај детаље мог налога"
-
-#~ msgid "_About..."
-#~ msgstr "_О програму..."
-
-#~ msgid "Fullscreen height"
-#~ msgstr "Висина целог екрана"
-
-#~ msgid "Fullscreen width"
-#~ msgstr "Ширина целог екрана"
-
-#~ msgid "Show a status bar at the bottom of the main window"
-#~ msgstr "Прикажи линију са стањем на дну главног прозора"
-
-#~ msgid "Show status bar"
-#~ msgstr "Прикажи линију са стањем"
-
-#~ msgid "The image height for fullscreen"
-#~ msgstr "Висина слике за цео екран"
-
-#~ msgid "The image width for fullscreen"
-#~ msgstr "Ширина слике за цео екран"
-
-#~ msgid "The list of called URLs"
-#~ msgstr "Списак званих URL-ова"
-
-#~ msgid "The list of groups"
-#~ msgstr "Списак група"
-
-#~ msgid "Program name"
-#~ msgstr "Име програма"
-
-#~ msgid "The name of the program"
-#~ msgstr "Име програма"
-
-#~ msgid "Program version"
-#~ msgstr "Издање програма"
-
-#~ msgid "The version of the program"
-#~ msgstr "Издање програма"
-
-#~ msgid "Copyright string"
-#~ msgstr "Текст ауторских права"
-
-#~ msgid "Copyright information for the program"
-#~ msgstr "Подаци о ауторским правима за програм"
-
-#~ msgid "Comments string"
-#~ msgstr "Текст примедбе"
-
-#~ msgid "Comments about the program"
-#~ msgstr "Примедбе о програму"
-
-#~ msgid "Author entry"
-#~ msgstr "Унос аутора"
-
-#~ msgid "A single author entry"
-#~ msgstr "Унос једног аутора"
-
-#~ msgid "Documenters"
-#~ msgstr "Документовали"
-
-#~ msgid "List of people documenting the program"
-#~ msgstr "Списак људи који су документовали програм"
-
-# bug: translator_credits should be translatable as well!
-#~ msgid "Translator credits"
-#~ msgstr ""
-#~ "Дејан Матијевић <dejan@ns.sympatico.ca>\n"
-#~ "Данило Шеган <danilo@prevod.org>\n"
-#~ "\n"
-#~ "Prevod.org — превод на српски језик."
-
-#~ msgid ""
-#~ "Credits to the translators. This string should be marked as translatable"
-#~ msgstr "Заслуге преводиоца. Овај текст мора бити означен као преводив."
-
-#~ msgid "A logo for the about box"
-#~ msgstr "Знак за прозорче о програму"
-
-#~ msgid "Audio transmission: suspended"
-#~ msgstr "Звућни пренос: обустављен"
-
-#~ msgid "Audio transmission: resumed"
-#~ msgstr "Звућни пренос: настављен"
-
-#~ msgid "Video transmission: suspended"
-#~ msgstr "Видео пренос: обустављен"
-
-#~ msgid "Video transmission: resumed"
-#~ msgstr "Видео пренос: настављен"
-
-#~ msgid "Unanswered Calls"
-#~ msgstr "Неодговорени позиви"
-
-#~ msgid "STUN Server error"
-#~ msgstr "Грешка на STUN серверу"
-
-#~ msgid "Welcome to GnomeMeeting 1.00!"
-#~ msgstr "Добродошли у Гном Састанак 1.00!"
-
-#~ msgid ""
-#~ "Congratulations, you have just successfully launched GnomeMeeting 1.00 "
-#~ "for the first time.\n"
-#~ "GnomeMeeting is the leading VoIP, videoconferencing and telephony "
-#~ "software for Unix.\n"
-#~ "\n"
-#~ "Thanks to all of you who have helped us along the road to our golden 1.00 "
-#~ "release!\n"
-#~ "\n"
-#~ "The GnomeMeeting Team."
-#~ msgstr ""
-#~ "Честитамо, управо сте по први пут успешно покренули Гном састанак 1.00.\n"
-#~ "Гном састанак је водећи програм за VoIP, видео конференције и телефонију "
-#~ "за Униксе.\n"
-#~ "\n"
-#~ "Хвала свима који су помогли на путу до нашег златног издања 1.00!\n"
-#~ "\n"
-#~ "Тим Гном састанка."
-
-#~ msgid "No usable audio manager detected"
-#~ msgstr "Нисам пронашао употребљивог управника звуком"
-
-#~ msgid ""
-#~ "GnomeMeeting didn't find any usable sound manager. Make sure that your "
-#~ "installation is correct."
-#~ msgstr ""
-#~ "Гном састанак не може да пронађе употребљивог управника звуком. Проверите "
-#~ "да ли је ваша инсталација исправна."
-
-#~ msgid "View/Hide the status bar"
-#~ msgstr "Погледај или склони линију стања"
-
-#~ msgid "Both (Local Video in New Window)"
-#~ msgstr "Оба (Локални видео у новом прозору)"
-
-#~ msgid "Use a fullscreen size of"
-#~ msgstr "Користи величину пуног екрана од"
-
-#~ msgid "by"
-#~ msgstr "са"
-
-#~ msgid "pixels"
-#~ msgstr "тачака"
-
-#~ msgid "The image width for fullscreen."
-#~ msgstr "Ширина слике за цео екран."
-
-#~ msgid "The image height for fullscreen."
-#~ msgstr "Висина слике за цео екран."
-
-#~ msgid "Minimum transmitted FPS"
-#~ msgstr "Минималан пренос FTS"
-
-#~ msgid ""
-#~ "The minimum number of video frames to transmit each second when trying to "
-#~ "minimize the bandwidth"
-#~ msgstr ""
-#~ "Минимална ширина пропусног опсега видео оквира за пренос у свакој секунди "
-#~ "при покушају да минимализује ширина пропусног опсега видеа"
-
-#~ msgid ""
-#~ "iLBC-13k3 (internet Low Bitrate Codec) is a free speech codec suitable "
-#~ "for robust voice communication over IP. The codec is designed for narrow "
-#~ "band speech and results in a payload bit rate of 13.33 kbit/s with an "
-#~ "encoding frame length of 30 ms. The iLBC codec enables graceful speech "
-#~ "quality degradation in the case of lost frames, which occurs in "
-#~ "connection with lost or delayed IP packets."
-#~ msgstr ""
-#~ "iLBC-13k3 (internet Low Bitrate Codec) је слободно говорно кодирање "
-#~ "прилагођено доброј гласовној вези преко ИП-а. Кодирање је израђено за "
-#~ "узак опсег говора и резултује у величини од 13,33 kbit/s са дужином "
-#~ "кодираног кадра од 30 ms. iLBC кодирање омогућава добровољно снижење "
-#~ "квалитета говора у случају изгубљених кадрова, што се дешава при прекиду "
-#~ "везе или код изгубљених ИП пакета."
-
-#~ msgid "Excellent"
-#~ msgstr "Одлично"
-
-#~ msgid "13.33 Kbps"
-#~ msgstr "13,33 Kbps"
-
-#~ msgid ""
-#~ "iLBC-15k2 (internet Low Bitrate Codec) is a free speech codec suitable "
-#~ "for robust voice communication over IP. The codec is designed for narrow "
-#~ "band speech and results in a payload bitrate of 15.20 kbps with an "
-#~ "encoding length of 20 ms. The iLBC codec enables graceful speech quality "
-#~ "degradation in the case of lost frames, which occurs in connection with "
-#~ "lost or delayed IP packets."
-#~ msgstr ""
-#~ "iLBC-15k2 (internet Low Bitrate Codec) је слободно говорно кодирање "
-#~ "прилагођено доброј гласовној вези преко ИП-а. Кодирање је израђено за "
-#~ "узак опсег говора и резултује у величини од 15,20 kbit/s са дужином "
-#~ "кодираног кадра од 20 ms. iLBC кодирање омогућава добровољно снижење "
-#~ "квалитета говора у случају изгубљених кадрова, што се дешава при прекиду "
-#~ "везе или код изгубљених ИП пакета."
-
-#~ msgid "15.2 Kbps"
-#~ msgstr "15,2 Kbps"
-
-#~ msgid ""
-#~ "Speex is an Open Source/Free Software patent-free audio compression "
-#~ "format designed for speech. The Speex Project aims to lower the barrier "
-#~ "of entry for voice applications by providing a free alternative to "
-#~ "expensive proprietary speech codecs. Moreover, Speex is well-adapted to "
-#~ "Internet applications and provides useful features that are not present "
-#~ "in most other codecs. Finally, Speex is part of the GNU Project and is "
-#~ "available under the Xiph.org variant of the BSD license. SpeexNarrow-15k "
-#~ "is based on CELP and is designed to compress voice at a payload bitrate "
-#~ "of 15 kbps."
-#~ msgstr ""
-#~ "Speex је сажимање звука отвореног кода и слободан софтвер, без употребе "
-#~ "патената, сачињен за глас. Speex пројекат тежи мањем прагу за улаз у "
-#~ "гласовне програме обезбеђивањем бесплатне алтернативе власничким говорним "
-#~ "кодирањима. Даље, Speex је добро прилагођен Интернет програмима и "
-#~ "обезбеђује корисне могућности које нису присутне у многим другим "
-#~ "кодирањима. Коначно, Speex је део пројекта ГНУ и доступан је под Xiph.org "
-#~ "варијантом БСД лиценце. SpeexNarrow-15k се заснива на CELP-у и израђен је "
-#~ "ради сажимања гласа на величину од 15 kb/s."
-
-#~ msgid "15 Kbps"
-#~ msgstr "15 Kbps"
-
-#~ msgid ""
-#~ "Speex is an Open Source/Free Software patent-free audio compression "
-#~ "format designed for speech. The Speex Project aims to lower the barrier "
-#~ "of entry for voice applications by providing a free alternative to "
-#~ "expensive proprietary speech codecs. Moreover, Speex is well-adapted to "
-#~ "Internet applications and provides useful features that are not present "
-#~ "in most other codecs. Finally, Speex is part of the GNU Project and is "
-#~ "available under the Xiph.org variant of the BSD license. SpeexNarrow-8k "
-#~ "is based on CELP and is designed to compress voice at a payload bitrate "
-#~ "of 8 kbps."
-#~ msgstr ""
-#~ "Speex је сажимање звука отвореног кода и слободан софтвер, без употребе "
-#~ "патената, сачињен за глас. Speex пројекат тежи мањем прагу за улаз у "
-#~ "гласовне програме обезбеђивањем бесплатне алтернативе власничким говорним "
-#~ "кодирањима. Даље, Speex је добро прилагођен Интернет програмима и "
-#~ "обезбеђује корисне могућности које нису присутне у многим другим "
-#~ "кодирањима. Коначно, Speex је део пројекта ГНУ и доступан је под Xiph.org "
-#~ "варијантом БСД лиценце. SpeexNarrow-8k се заснива на CELP-у и израђен је "
-#~ "ради сажимања гласа на величину од 8 kbit/s."
-
-#~ msgid "Good"
-#~ msgstr "Добро"
-
-#~ msgid "8 Kbps"
-#~ msgstr "8 Kbps"
-
-#~ msgid ""
-#~ "MS-GSM is the Microsoft version of GSM 06.10. GSM 06.10 is a standardized "
-#~ "lossy speech compression employed by most European wireless telephones. "
-#~ "It uses RPE/LTP (residual pulse excitation/long term prediction) coding "
-#~ "to compress frames of 160 13-bit samples with a frame rate of 50 Hz into "
-#~ "260 bits.  Microsoft's GSM 06.10 codec is not compatible with the "
-#~ "standard frame format, they use 65-byte-frames (2 x 32 1/2) rather than "
-#~ "rounding to 33, and they number the bits in their bytes from the other "
-#~ "end."
-#~ msgstr ""
-#~ "MS-GSM је Микрософтово издање GSM-а 06.10. GSM 06.10 је стандардизован "
-#~ "неочувајуће сажимање које користи већина европских мобилних телефона. "
-#~ "Користи RPE/LTP (residual pulse excitation/long term prediction) кодирање "
-#~ "за сажимање кадрова од 160 13-битних узорака са учесталошћу кадрова од 50 "
-#~ "Hz у 260 бита.  Микрософтово GSM 06.10 кодирање није сагласно са "
-#~ "стандардним обликом кадра, они користе 65-бајтне кадрове (2 x 32 1/2) "
-#~ "уместо заокругљивања на 33, и они означајаву битове у њиховим бајтовима "
-#~ "са другог краја."
-
-#~ msgid "13 Kbps"
-#~ msgstr "13 Kbps"
-
-#~ msgid ""
-#~ "G.711 is the international standard for encoding telephone audio on 64 "
-#~ "kbps channel. It is a pulse code modulation (PCM) scheme operating at 8 "
-#~ "kHz sample rate, with 8 bits per sample, fully meeting ITU-T "
-#~ "recommendations. This standard has two forms, A-Law and u-Law. A-Law "
-#~ "G.711 PCM encoder converts 13 bit linear PCM samples into 8 bit "
-#~ "compressed PCM (logarithmic form) samples, and the decoder does the "
-#~ "conversion vice versa."
-#~ msgstr ""
-#~ "G.711 је међународни стандард за кодирање телефонског звука преко 64 kbit/"
-#~ "s канала. То је модулација пулсног кода (PCM) шема која ради на "
-#~ "учесталости узорка од 8 kHz, са 8 битова по узорку, у потпуности "
-#~ "испуњавајући препоруке ITU-T-а. Овај стандард има два облика, A-закон и µ-"
-#~ "закон. A-закон G.711 PCM кодирање претвара 13-битне линеарне PCM узорке у "
-#~ "8-битне сажете PCM (логаритамски облик) узорке, а декодирање се обавља "
-#~ "обрнутим поступком."
-
-#~ msgid "64 Kbps"
-#~ msgstr "64 Kbps"
-
-#~ msgid ""
-#~ "G.711 is the international standard for encoding telephone audio on 64 "
-#~ "kbps channel. It is a pulse code modulation (PCM) scheme operating at 8 "
-#~ "kHz sample rate, with 8 bits per sample, fully meeting ITU-T "
-#~ "recommendations. This standard has two forms, A-Law and u-Law. u-Law "
-#~ "G.711 PCM encoder converts 14 bit linear PCM samples into 8 bit "
-#~ "compressed PCM (logarithmic form) samples, and the decoder does the "
-#~ "conversion vice versa."
-#~ msgstr ""
-#~ "G.711 је међународни стандард за кодирање телефонског звука преко 64 kbit/"
-#~ "s канала. То је модулација пулсног кода (PCM) шема која ради на "
-#~ "учесталости узорка од 8 kHz, са 8 битова по узорку, у потпуности "
-#~ "испуњавајући препоруке ITU-T-а. Овај стандард има два облика, A-закон и µ-"
-#~ "закон. µ-закон G.711 PCM кодирање претвара 14-битне линеарне PCM узорке у "
-#~ "8-битне сажете PCM (логаритамски облик) узорке, а декодирање се обавља "
-#~ "обрнутим поступком."
-
-#~ msgid ""
-#~ "GSM 06.10 is a standardized lossy speech compression employed by first "
-#~ "generation of digital mobile phones in Europe. It uses RPE/LTP (residual "
-#~ "pulse excitation/long term prediction) coding to compress frames of 20 "
-#~ "ms, achieving a bitrate of 13kbps."
-#~ msgstr ""
-#~ "GSM 06.10 је стандардизовано неочувајуће сажимање које користи већина "
-#~ "европских мобилних телефона прве генерације. Користи RPE/LTP (residual "
-#~ "pulse excitation/long term prediction) кодирање за сажимање кадрова од "
-#~ "20мс, достижући количину података од 13kbps."
-
-#~ msgid "16.5 Kbps"
-#~ msgstr "16,5 Kbps"
-
-#~ msgid ""
-#~ "G.726 conforms to ITU-T G.726 recommendation that specifies speech "
-#~ "compression and decompression at rates of 16, 24, 32 and 40 Kbps based on "
-#~ "Adaptive Differential Pulse Code Modulation (ADPCM)."
-#~ msgstr ""
-#~ "G.726 прати препоруку ITU-T G.726 која одређује сажимање и извлачење "
-#~ "гласа при величини од 16, 24, 32 и 40 Kbit/s засновано на прилагодљивој "
-#~ "диференцијској модулацији пулсног кода (ADPCM)."
-
-#~ msgid "32 Kbps"
-#~ msgstr "32 Kbps"
-
-#~ msgid ""
-#~ "G.723.1 conforms to ITU-T G.723.1 recommendation. It was designed for "
-#~ "videoconferencing / telephony over standard phone lines, and is optimized "
-#~ "for realtime encode and decode. That codec is only available in "
-#~ "GnomeMeeting when using Quicknet cards due to patents restrictions."
-#~ msgstr ""
-#~ "G.723.1 прати препоруку ITU-T G.723.1. Израђен је за видео разговоре/"
-#~ "телефонију преко обичних телефонских линија, и прилагођен је кодирању и "
-#~ "декодирању у реалном времену. Кодирање је доступно у Гном састанку једино "
-#~ "када се користе Quicknet картице због патентних ограничења."
-
-#~ msgid "6.3 or 5.7 Kbps"
-#~ msgstr "6,3 или 5,7 Kbps"
-
-#~ msgid "Work"
-#~ msgstr "Посао"
-
-#~ msgid "Family"
-#~ msgstr "Породица"
-
-#~ msgid "Cannot contact the user directory"
-#~ msgstr "Не може да контактира кориснички директоријум"
-
-#~ msgid "Failed to contact LDAP server %s:%d"
-#~ msgstr "Није успео да контактира LDAP сервер %s:%d"
-
-#~ msgid "Failed to set time limit on LDAP operations"
-#~ msgstr "Није успео да подеси временски лимит на LDAP радње"
-
-#~ msgid "Failed to contact to LDAP server %s: %s"
-#~ msgstr "Није успео да контактира LDAP сервер %s: %s"
-
-#~ msgid "Fetching online users list from %s"
-#~ msgstr "Дохвата листу корисника на вези од %s"
-
-#~ msgid "Could not fetch online users list"
-#~ msgstr "Није успео да дохватити листу корисника на вези"
-
-#~ msgid "Connection to %s lost"
-#~ msgstr "Веза са %s прекинута"
-
-# bug: plural-forms
-#~ msgid "Search completed: %d user(s) found on %s"
-#~ msgstr "Потрага завршена: %d корисника нађено на %s"
-
-#~ msgid "Groups:"
-#~ msgstr "Групе:"
-
-#~ msgid "Invalid user name or URL"
-#~ msgstr "Погрешно корисничко име или URL"
-
-#~ msgid ""
-#~ "Please provide a valid name and URL for the contact you want to add to "
-#~ "the address book."
-#~ msgstr ""
-#~ "Обезбедите исправно име и URL за контакт који желите да додате у адресар."
-
-#~ msgid "Invalid group"
-#~ msgstr "Погрешна група"
-
-#~ msgid "You have to select a group to which you want to add your contact."
-#~ msgstr "Траба да одредите групу у коју желите да додате ваш контакт."
-
-#~ msgid "Invalid speed dial"
-#~ msgstr "Погрешно брзо бирање"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Погрешна адреса (URL)"
-
-#~ msgid ""
-#~ "Another contact with the same URL already exists in the address book."
-#~ msgstr "Други контакт са истим URL већ постоји у аресару."
-
-#~ msgid "Are you sure you want to remove %s [%s] from this group?"
-#~ msgstr "Да ли сте сигурни да желите да уклоните %s [%s] из ове групе?"
-
-#~ msgid "Add %s to Address Book"
-#~ msgstr "Додај %s у адресар"
-
-#~ msgid "_Tranfer Call to Contact"
-#~ msgstr "Пребацивање позива за контакт"
-
-#~ msgid "Add a New Server"
-#~ msgstr "Додај нови сервер"
-
-#~ msgid "Enter the server name:"
-#~ msgstr "Унесите име сервера:"
-
-#~ msgid ""
-#~ "Sorry but there is already a server with the same name in the address "
-#~ "book."
-#~ msgstr "Нажалост већ постоји сервер са истим именом у аресару."
-
-#~ msgid "Add a New Group"
-#~ msgstr "Додај нову групу"
-
-#~ msgid "Enter the group name:"
-#~ msgstr "Унеси ново име за групу:"
-
-#~ msgid ""
-#~ "Sorry but there is already a group with the same name in the address book."
-#~ msgstr "Нажалост већ постоји група са истим именом у аресару."
-
-#~ msgid "Invalid server or group name"
-#~ msgstr "Погрешно име сервера или групе."
-
-#~ msgid "Please enter a new name for server %s:"
-#~ msgstr "Молим унесите ново име за сервер %s:"
-
-#~ msgid "Please enter a new name for group %s:"
-#~ msgstr "Молим унесите ново име за групу %s:"
-
-#~ msgid "New Group"
-#~ msgstr "Нова група"
-
-#~ msgid "_Rename"
-#~ msgstr "П_реименуј"
-
-#~ msgid "Delete"
-#~ msgstr "Обриши"
-
-#~ msgid "New _Server"
-#~ msgstr "Нови сервер"
-
-#~ msgid "New _Group"
-#~ msgstr "Нова група"
-
-#  Translators: This is "V" as in "Video"
-#~ msgid "V"
-#~ msgstr "B"
-
-#~ msgid "IP"
-#~ msgstr "IP"
-
-#~ msgid "First name contains"
-#~ msgstr "Име садржи"
-
-#~ msgid "Servers"
-#~ msgstr "Сервери"
-
-#~ msgid "Groups"
-#~ msgstr "Групе"
-
-#~ msgid "_About GnomeMeeting"
-#~ msgstr "_О Гном Састанку"
-
-#~ msgid "Codec Information"
-#~ msgstr "Подаци о запису"
-
-#~ msgid "NAT/PAT Router Support"
-#~ msgstr "NAT/PAT подршка рутера"
-
-#~ msgid "Info"
-#~ msgstr "Информације"
-
-#~ msgid "Keep a minimum video _quality of"
-#~ msgstr "Задржи минимални видео квалитет од"
-
-#~ msgid ""
-#~ "The minimum transmitted video quality to keep when trying to minimize the "
-#~ "used bandwidth:  choose 100% on a LAN for the best quality, 1% being the "
-#~ "worst quality"
-#~ msgstr ""
-#~ "Минимално пренети видео квалитет да задржи при покушају да се "
-#~ "минимализује коришћење ширине пропусног опсега: изаберите 100% за LAN за "
-#~ "најбољи квалитет, 1% даје најлошији квалитет"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Transmit at least"
-#~ msgstr "Пренети на крају"
-
-#~ msgid "_frames per second"
-#~ msgstr "0 оквира у секунди"
-
-#~ msgid "Enabled Silence Detection"
-#~ msgstr "Омогући проналажење тишине"
-
-#~ msgid "Failed to restart the video channel"
-#~ msgstr "Не могу да поново покренем видео канал"
-
-#~ msgid ""
-#~ "You have changed a video device related setting during a call. That "
-#~ "requires to restart the video transmission channel, but it failed."
-#~ msgstr ""
-#~ "Изменили сте подешавање видео уређаја у току позива. Ово захтева поновно "
-#~ "покретање канала за пренос, али то није успело."
-
-#~ msgid "Test those settings"
-#~ msgstr "Испробајте ова подешавања"
-
-#~ msgid "New server"
-#~ msgstr "Нови сервер"
-
-#~ msgid "New group"
-#~ msgstr "Нова група"
-
-#~ msgid "New contact"
-#~ msgstr "Нови контакт"
-
-#~ msgid "GnomeMeeting Address Book"
-#~ msgstr "Гном Састанак адресар"
-
-#~ msgid "Please choose the video image"
-#~ msgstr "Изаберите видео слику"
-
-#~ msgid "Position on the screen of the general history window"
-#~ msgstr "Положај општег прозора историјата на екрану"
-
-#~ msgid "Size of the general history window"
-#~ msgstr "Величина прозора општег историјата"
-
-#~ msgid "Calls Clearing"
-#~ msgstr "Чићење позива"
-
-#~ msgid "Play or not the busy tone sound"
-#~ msgstr "Да ли да пусти звук заузећа"
-
-#~ msgid "Play or not the incoming call sound"
-#~ msgstr "Да ли да пусти звук на долазећи позив"
-
-#~ msgid "Play or not the ring tone sound"
-#~ msgstr "Да ли да пусти звук звона"
-
-#~ msgid "transmission"
-#~ msgstr "пренос"
-
-#~ msgid "reception"
-#~ msgstr "пријем"
-
-#~ msgid "recording"
-#~ msgstr "снимања"
-
-#~ msgid "playing"
-#~ msgstr "пуштања"
-
-#~ msgid ""
-#~ "Select the video device to use. Using an invalid video device or \"Picture"
-#~ "\" for video transmission will transmit a test picture."
-#~ msgstr ""
-#~ "Одаберите видео уређај који ће се користити.  Користећи неодговарајући "
-#~ "видео уређај или \"Слика\" за видео пренос ће пренети тест слику."
-
-#~ msgid "Couldn't compile http/ftp regex!"
-#~ msgstr "Не могу да преведем HTTP/FTP региз!"
-
-#~ msgid "Couldn't compile smiley regex!"
-#~ msgstr "Не могу да преведем регуларни израз за смешка!"
-
-#~ msgid "Couldn't compile latex regex!"
-#~ msgstr "Не могу да преведем регуларни израз за ЛаТеХ!"
-
-#~ msgid "Local video window height"
-#~ msgstr "Висина прозора локалног видеа"
-
-#~ msgid "Number of entries to store in history boxes"
-#~ msgstr "Број уноса за складиштење у историјским кутијама"
-
-#~ msgid "Received Video Quality Hint"
-#~ msgstr "Погодак примљеног видео квалитета"
-
-#~ msgid "Remote video window height"
-#~ msgstr "Висина прозора даљинског видеа"
-
-#~ msgid "The Video Quality to request to the remote"
-#~ msgstr "Видео квалитет захтеван од даљинског"
-
-#~ msgid "The height of the local video window"
-#~ msgstr "Висина прозора локалног видеа"
-
-#~ msgid "The height of the remote video window"
-#~ msgstr "Висина прозора даљинског видеа"
-
-#~ msgid "User Input Capabilities type"
-#~ msgstr "Тип корисничких улазних способности"
-
-#~ msgid "Remote user is not running GnomeMeeting"
-#~ msgstr "Даљински корисник није покренуо Гном Састанак"
-
-#~ msgid "Forward call to:"
-#~ msgstr "Проследи позив до:"
-
-#~ msgid "View the details of your account"
-#~ msgstr "Погледајте детаље вашег налога"
-
-#~ msgid "Maximum bandwidth available for the endpoint"
-#~ msgstr "Највећа пропусност у крајњој тачки"
-
-#~ msgid ""
-#~ "The codecs will be chosen during the negotiation according to the maximum "
-#~ "bandwidth available to the endpoint."
-#~ msgstr ""
-#~ "Кодирања ће бити изабрана приликом преговарања према највећој пропусној "
-#~ "моћи доступној на крајњој тачки."
-
-#~ msgid "Maximum Bandwidth"
-#~ msgstr "Највећа пропусност"
-
-#~ msgid "Maximum available bandwidth:"
-#~ msgstr "Највећа доступна пропусност:"
-
-#~ msgid "kbps"
-#~ msgstr "kbps"
-
-#~ msgid "User Input Capabilities"
-#~ msgstr "Корисничке улазне способности"
-
-#~ msgid "Call Control"
-#~ msgstr "Управљање позивом"
-
-#~ msgid "Internationalisation Maintainer:"
-#~ msgstr "Одржаваоц интернацијализације:"
-
-#~ msgid ""
-#~ "GnomeMeeting is a full-featured H.323\n"
-#~ "video conferencing application."
-#~ msgstr ""
-#~ "Гном Састанак је пун додатака H.323\n"
-#~ "видео конференције програм."
-
-#~ msgid "Choose a file to play"
-#~ msgstr "Коју датотеку да пустим"
-
-#~ msgid "Open Link"
-#~ msgstr "Отвори везу"
-
-#~ msgid "Copy Link Address"
-#~ msgstr "Умножи адресу везе"
-
-#~ msgid ""
-#~ "If enabled, GnomeMeeting will play a sound when receiving an incoming "
-#~ "call (the sound to play is chosen in the Gnome Control Center)."
-#~ msgstr ""
-#~ "Ако је укључено, Гном Састанак ће свирати звук када прима долазећи позив "
-#~ "(звук за свирање је изабран у Гном контролном центру)."
-
-#~ msgid ""
-#~ "If enabled, GnomeMeeting will start hidden. The docklet must be enabled."
-#~ msgstr ""
-#~ "Ако је укључено, Гном Састанак ће стартовати сакривен.  The docklet мора "
-#~ "бити укључен."
-
-#~ msgid "Play a sound on incoming calls"
-#~ msgstr "Свирај звук на долазећи позив"
-
-#~ msgid "Incoming Call"
-#~ msgstr "Долазећи позив"
-
-#~ msgid "gnomemeeting"
-#~ msgstr "gnomemeeting"
-
-#~ msgid "Started transmission of %s"
-#~ msgstr "Започет пренос %s"
-
-#~ msgid "Stopped transmission of %s"
-#~ msgstr "Завршен пренос %s"
-
-#~ msgid "Started reception of %s"
-#~ msgstr "Започет пријем %s"
-
-#~ msgid "Stopped reception of %s"
-#~ msgstr "Завршен пријем %s"
-
-#~ msgid "Select the audio output device device to use."
-#~ msgstr "Одаберите уређај који ће се користити за излаз звука."
-
-#~ msgid "Audio manager"
-#~ msgstr "Управник звуком"
-
-#~ msgid "Audio recorder"
-#~ msgstr "Снимање звука"
-
-#~ msgid "TTL for the registration"
-#~ msgstr "TTL за регистрацију"
-
-#~ msgid "The gatekeeper TTL for the registration, expressed in seconds."
-#~ msgstr "TTL заштитника за регистрацију, изражен у секундама."
-
-#~ msgid "Video manager"
-#~ msgstr "Управник видеом"
-
-#  Player is always a correct sound device, thanks to
-#  gnomemeeting_add_string_option_menu
-#~ msgid "Set Audio player device to %s"
-#~ msgstr "Подесите уређај за репродукцију звука на %s"
-
-#~ msgid "s"
-#~ msgstr "с"
-
-#~ msgid "Audio Manager"
-#~ msgstr "Управник звуком"
-
-#~ msgid "Audio manager:"
-#~ msgstr "Управник звуком:"
-
-#~ msgid "Recording device:"
-#~ msgstr "Уређај за снимање:"
-
-#~ msgid "Video Manager"
-#~ msgstr "Управник видеом"
-
-#~ msgid "Video manager:"
-#~ msgstr "Управник видеом:"
-
-#~ msgid "Video device:"
-#~ msgstr "Видео уређај:"
-
-#~ msgid "Video format:"
-#~ msgstr "Видео формат:"
-
-#~ msgid "Video image:"
-#~ msgstr "Видео слика:"
-
-#~ msgid "User Input Capabilities _type:"
-#~ msgstr "Тип корисничких улазних способности:"
-
-# bug: label?
-#~ msgid "The lable."
-#~ msgstr "Ознака"
-
-#~ msgid "Other"
-#~ msgstr "Друго"
-
-#~ msgid "Enabled"
-#~ msgstr "Омогућено"
-
-#~ msgid "Disabled"
-#~ msgstr "Искључено"
-
-#~ msgid ""
-#~ "Please enter your first name and surname, they will be used when "
-#~ "connecting to other audio/video conferencing software.\n"
-#~ "\n"
-#~ "Your e-mail address is used to provide you with a callto address that "
-#~ "your friends can use to call you without knowing your IP address.\n"
-#~ "\n"
-#~ "No information is made public unless you allow it to be published on the "
-#~ "directory of online GnomeMeeting users."
-#~ msgstr ""
-#~ "Унесите ваше име и надимак, они ће бити кориштени при вези на остале "
-#~ "програме за звучне и видео састанке.\n"
-#~ "\n"
-#~ "Ваша адреса е-поште је кориштена да вас обезбеди са \"позив до\" адресом "
-#~ "коју ваши пријатељи могу користити да вас позову без потребе да знају "
-#~ "вашу IP адресу\n"
-#~ "\n"
-#~ "Ниједан податак није објављен док ви то не дозволите у директоријуму "
-#~ "корисника на вези Гном Састанака."
-
-#~ msgid "_Surname:"
-#~ msgstr "Надимак:"
-
-#  The callto url
-#~ msgid "Callto URL"
-#~ msgstr "Позив до URL"
-
-#~ msgid "Directory of Online GnomeMeeting Users"
-#~ msgstr "Директоријум повезаних Гном Састанак корисника"
-
-#~ msgid "Publish my information on the directory of online GnomeMeeting users"
-#~ msgstr ""
-#~ "Објави моје податке у директоријуму корисника на вези Гном Састанака"
-
-#~ msgid ""
-#~ "Please select your network connection type. This is used to set default "
-#~ "video settings for your bandwidth. It is possible to change these "
-#~ "defaults later."
-#~ msgstr ""
-#~ "Селектујте тип ваше мрежне везе.  Ово се користи за подешавање подешеног "
-#~ "видео подешавања за вашу ширину пропусног опсега.  Могуће је променути "
-#~ "ове подешене вредности касније."
-
-#  Connection type
-#~ msgid "Connection Type"
-#~ msgstr "Врста повезивања"
-
-#~ msgid "DSL/Cable"
-#~ msgstr "DSL/Кабл"
-
-#~ msgid ""
-#~ "Please choose the audio devices to use during the GnomeMeeting session. "
-#~ "You can also choose to use a Quicknet device instead of the soundcard, "
-#~ "but the \"Test Audio\" button will only work for soundcards. Notice that "
-#~ "some webcams models have an internal microphone that can be used with "
-#~ "GnomeMeeting."
-#~ msgstr ""
-#~ "Изаберите уређај за репродукцију звука који ће се користити за време "
-#~ "трајања Гном Састанака. Можете такође да изаберете Quicknet уређај уместо "
-#~ "звучне картице, али \"Тест звука\" дугме ће радити само са звучном "
-#~ "картицом.  Неки модели мрежних камера имају уграђен микрофон који може "
-#~ "бити кориштен са Гном Састанком."
-
-#~ msgid "Audio recorder:"
-#~ msgstr "Снимање звука:"
-
-#~ msgid "Test Audio"
-#~ msgstr "Звучни тест"
-
-#~ msgid ""
-#~ "Please choose the video device to use during the GnomeMeeting session. "
-#~ "Click on the \"Test Video\" button to check if your setup is correct and "
-#~ "if your driver is supported by GnomeMeeting. You can only test the "
-#~ "correctness of your driver if the selected device is not already in use."
-#~ msgstr ""
-#~ "Изаберите уређај за репродукцију видеа који ће се користити за време "
-#~ "трајања Гном Састанака.   Кликните на \"Видео тест\" дугме да проверите "
-#~ "да ли је подешавање одговарајуће и да ли је ваш дрејвер подржан од Гном "
-#~ "Састанка.  Можете тестирати само одговарање вашег драјвера ако одабрани "
-#~ "уређај није у употреби."
-
-#~ msgid ""
-#~ "Enter the video device to use. Using an invalid video device for video "
-#~ "transmission will transmit a test picture."
-#~ msgstr ""
-#~ "Одредите видео уређај који ће се користити.  Користећи неодговарајући "
-#~ "видео уређај за видео пренос ће пренети тест слику."
-
-#~ msgid "Test Video"
-#~ msgstr "Видео тест"
-
-#~ msgid "PC-To-Phone Setup - page %d/%d"
-#~ msgstr "PC-до-телефон подешавање - страна %d/%d"
-
-#~ msgid "Register to the MicroTelco service"
-#~ msgstr "Регистрован MicroTelco сервис"
-
-#~ msgid "Tests OK!"
-#~ msgstr "Тест је у реду!"
-
-#~ msgid "Call from %s [%s] using %s"
-#~ msgstr "Позив од %s [%s] користећи %s"
-
-#~ msgid "Auto Rejected"
-#~ msgstr "Аутоматски одбачен"
-
-#~ msgid "Call Forwarded"
-#~ msgstr "Позив преусмерен"
-
-#~ msgid "Fast start disabled"
-#~ msgstr "Брзи старт искључен"
-
-#~ msgid "Fast start enabled"
-#~ msgstr "Брзи старт укључен"
-
-#~ msgid "H.245 Tunnelling disabled"
-#~ msgstr "H.245 тунел искључен"
-
-#~ msgid "H.245 Tunnelling enabled"
-#~ msgstr "H.245 тунел укључен"
-
-#~ msgid "Enabling H.245 Tunnelling"
-#~ msgstr "Омогућавање H.245 тунела"
-
-#~ msgid "Disabling H.245 Tunnelling"
-#~ msgstr "Искључивање H.245 тунел"
-
-#~ msgid "Enabling Fast Start"
-#~ msgstr "Омогућавање 'Брзи старт'"
-
-#~ msgid "Disabling Fast Start"
-#~ msgstr "Искључивање 'Брзи старт'"
-
-#~ msgid ""
-#~ "Call from %s\n"
-#~ "using %s"
-#~ msgstr ""
-#~ "Позив од %s\n"
-#~ "користећи %s"
-
-#~ msgid "Given calls"
-#~ msgstr "Прослеђени позиви"
-
-#~ msgid "Audio player mixer"
-#~ msgstr "Миксер репродукције звука"
-
-#~ msgid "Audio recorder mixer"
-#~ msgstr "Миксер снимања звука"
-
-#~ msgid "Do not disturb"
-#~ msgstr "Не узнемиравај"
-
-#~ msgid "If enabled, incoming calls will be automatically answered."
-#~ msgstr "Ако је укључено, на долазеће позиве биће аутоматски одговорено."
-
-#~ msgid "If enabled, incoming calls will be automatically refused."
-#~ msgstr "Ако је укључено, долазећи позиви ће бити аутоматски одбијени."
-
-#~ msgid "Select the mixer to use to change the volume of the audio player."
-#~ msgstr ""
-#~ "Селектујте миксер који ће се користити да се промени снага од "
-#~ "репродукованог звука."
-
-#~ msgid "Select the mixer to use to change the volume of the audio recorder."
-#~ msgstr ""
-#~ "Селектујте миксер који ће се користити да се промени снага од снимљеног "
-#~ "звука."
-
-#~ msgid "Started New Logical Channel..."
-#~ msgstr "Покретање новог логичног канала..."
-
-#~ msgid "Enabled silence detection for %s"
-#~ msgstr "Укључена детекција тишине за %s"
-
-#~ msgid "Disabled silence detection for %s"
-#~ msgstr "Искључена детекција тишине за %s"
-
-#~ msgid "Receiving %s"
-#~ msgstr "Примање %s"
-
-#~ msgid "Requesting remote to send video quality: %d%%"
-#~ msgstr "Захтевање даљинског да пошаље видео квалитет: %d%%"
-
-#~ msgid "Request ok"
-#~ msgstr "Захтев је у реду"
-
-#~ msgid "Audio player mixer:"
-#~ msgstr "Миксер репродукције звука:"
-
-#~ msgid "Audio recorder mixer:"
-#~ msgstr "Миксер снимања звука:"
-
-#~ msgid "Set Audio recorder device to %s"
-#~ msgstr "Подесите уређај за снимање звука на %s"
-
-#~ msgid "Contacting %s..."
-#~ msgstr "Контактира %s..."
-
-#~ msgid ""
-#~ "GnomeMeeting didn't find any usable sound devices. You need to install "
-#~ "and setup a soundcard or a Quicknet card in order to be able to use "
-#~ "GnomeMeeting. Please check your driver settings and permissions."
-#~ msgstr ""
-#~ "Гном Састанак није нашао ниједан користан звучни уређај.  Треба да "
-#~ "инсталирате и подесите звучну картицу или Quicknet картицу да би сте "
-#~ "могли користити Гном Састанак.  Проверите ваше подешавање драјвера и "
-#~ "овлаштења."
-
-#~ msgid "Local Video Image"
-#~ msgstr "Локални видео снимак"
-
-#~ msgid "Remote Video Image"
-#~ msgstr "Даљински видео снимак"
-
-#~ msgid "Both Video Images"
-#~ msgstr "Оба видео снимка"
-
-#~ msgid "Both (Local and Remote Video in New Windows)"
-#~ msgstr "Оба (Локални и даљински видео у новом прозору)"
-
-#~ msgid "Do not disturb (reject incoming calls)"
-#~ msgstr "Не узнемиравај (одбацивање долазећих позива)"
-
-#~ msgid "Okay"
-#~ msgstr "Уреду"
-
-#~ msgid "Good Quality"
-#~ msgstr "Добар квалитет"
-
-#~ msgid "Excellent Quality"
-#~ msgstr "Одличан квалитет"
-
-#~ msgid "Behavior"
-#~ msgstr "Понашање"
-
-#~ msgid "Do _not disturb"
-#~ msgstr "Не узнемиравај"
-
-#~ msgid "Display a po_pup window when receiving a call"
-#~ msgstr "Приказуј искачући прозор при примању позива"
-
-#~ msgid "Failed to open the audio device"
-#~ msgstr "Не може да отвори звучни уређај"
-
-#~ msgid ""
-#~ "GnomeMeeting is now playing what it is recording with a 5 seconds delay. "
-#~ "If you don't hear yourself with the delay, you will have to fix your "
-#~ "audio setup and probably install a full-duplex driver before calling "
-#~ "other GnomeMeeting users.\n"
-#~ "\n"
-#~ "Recording and playing... Please talk."
-#~ msgstr ""
-#~ "Гном Састанак сада репродукује оно што је снимано за 5 секунди "
-#~ "закашњења.  Ако неможете да чујете себе са закашњењем, треба да поправите "
-#~ "ваша подешавања звука и вероватно инсталирате full-duplex  драјвер пре "
-#~ "позива осталих Гном Састанак корисника.\n"
-#~ "\n"
-#~ "Снимање и репродукција... Говорите."
-
-#~ msgid "Video Device Opened"
-#~ msgstr "Видео уређај отворен"
-
-#~ msgid "Video Device Closed"
-#~ msgstr "Видео уређај затворен"
-
-#~ msgid "Color Format for the video palette"
-#~ msgstr "Формат боје за видео палете"
-
-#~ msgid "Parse error"
-#~ msgstr "Грешка при обради"
-
-#~ msgid ""
-#~ "There was an error while processing the registering to the user "
-#~ "directory: %d %s."
-#~ msgstr ""
-#~ "Настала је грешка приликом обраде регистровања на кориснички "
-#~ "директоријум: %d %s."
-
-#~ msgid "Failed to contact the user directory %s:%d."
-#~ msgstr "Не може да контактира кориснички директоријум %s:%d."
-
-#~ msgid "Successfully registered to %s."
-#~ msgstr "Успешно регистрован на %s."
-
-#~ msgid "Successfully unregistered from %s."
-#~ msgstr "Успешно одрегистрован са %s."
-
-#~ msgid "Enable bilinear _filtering on displayed video"
-#~ msgstr "Укључи билинеарни филтер на приказани видео"
+#: ../src/gui/preferences.cpp:1391
+msgid "Video"
+msgstr "Видео"
 
-#~ msgid "Browse..."
-#~ msgstr "Претражи..."
+#: ../src/gui/statusicon.cpp:306
+#, c-format
+msgid "You have %d message"
+msgid_plural "You have %d messages"
+msgstr[0] "Имате %d поруку"
+msgstr[1] "Имате %d поруке"
+msgstr[2] "Имате %d порука"
+
+#: ../src/gui/statusmenu.cpp:87
+msgid "Online"
+msgstr "На мрежи"
+
+#: ../src/gui/statusmenu.cpp:88
+msgid "Away"
+msgstr "Одсутан"
+
+#: ../src/gui/statusmenu.cpp:89
+msgid "Do Not Disturb"
+msgstr "Не узнемиравај"
+
+#: ../src/gui/statusmenu.cpp:387
+msgid "Custom message..."
+msgstr "Произвољна порука..."
+
+#: ../src/gui/statusmenu.cpp:430
+msgid "Clear"
+msgstr "Очисти"
+
+#. Build the dialog
+#: ../src/gui/statusmenu.cpp:521 ../src/gui/statusmenu.cpp:671
+msgid "Custom Message"
+msgstr "Произвољна порука"
+
+#: ../src/gui/statusmenu.cpp:537
+msgid "Delete custom messages:"
+msgstr "Избриши произвољне поруке:"
+
+#: ../src/gui/statusmenu.cpp:692
+msgid "Define a custom message:"
+msgstr "Дефиниши произвољну поруку:"
diff -Nru ekiga-3.2.5/po/uk.po ekiga-3.2.6~ppa~karmic1/po/uk.po
--- ekiga-3.2.5/po/uk.po	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/uk.po	2009-09-22 15:27:35.000000000 +0100
@@ -4,12 +4,13 @@
 # Yuriy Syrota <yuri@renome.rovno.ua>
 # Maxim Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
 #
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
 "Project-Id-Version: ekiga\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-29 02:57+0000\n"
-"PO-Revision-Date: 2008-10-29 02:57-0000\n"
+"POT-Creation-Date: 2009-09-18 06:56+0300\n"
+"PO-Revision-Date: 2009-09-17 02:57-0000\n"
 "Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <linux@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
@@ -65,11 +66,7 @@
 msgid "Audio output device"
 msgstr "Пристрій виводу звуку"
 
-#: ../ekiga.schemas.in.in.h:8
-msgid "Automatic echo cancellation"
-msgstr "Автоматичне зниження відлуння"
-
-#: ../ekiga.schemas.in.in.h:9 ../src/gui/preferences.cpp:428
+#: ../ekiga.schemas.in.in.h:8 ../src/gui/preferences.cpp:516
 msgid ""
 "Automatically reject or forward incoming calls if no answer is given after "
 "the specified amount of time (in seconds)"
@@ -77,15 +74,15 @@
 "Автоматично відкидати або переадресовувати вхідні дзвінки за відсутності "
 "відповіді протягом визначеного проміжку часу (у секундах)"
 
-#: ../ekiga.schemas.in.in.h:10
+#: ../ekiga.schemas.in.in.h:9
 msgid "Calls history"
 msgstr "Історія викликів"
 
-#: ../ekiga.schemas.in.in.h:11
+#: ../ekiga.schemas.in.in.h:10
 msgid "Change the main window panel section"
 msgstr "Змінити розділ панелі головного вікна"
 
-#: ../ekiga.schemas.in.in.h:12
+#: ../ekiga.schemas.in.in.h:11
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -97,29 +94,34 @@
 "Він не підтримується Netmeeting, і одночасне використання швидкого старту і "
 "тунелювання H.245 може призвести до збоїв деяких версій Netmeeting."
 
-#: ../ekiga.schemas.in.in.h:13
+#: ../ekiga.schemas.in.in.h:12
 msgid "Contact long status"
 msgstr "Розширений статус контактів"
 
-#: ../ekiga.schemas.in.in.h:14
+#: ../ekiga.schemas.in.in.h:13
 msgid "Contact short status"
 msgstr "Короткий статус контактів"
 
-#: ../ekiga.schemas.in.in.h:15
-msgid "Country code"
-msgstr "Код країни"
-
-#: ../ekiga.schemas.in.in.h:16
+#: ../ekiga.schemas.in.in.h:14
 msgid "DTMF sending"
 msgstr "Передавання DTMF"
 
+#: ../ekiga.schemas.in.in.h:15
+msgid "Disable STUN network detection"
+msgstr "Вимкнути автоматичне визначення конфігурації мережі"
+
+#: ../ekiga.schemas.in.in.h:16 ../src/gui/preferences.cpp:492
+msgid "Disable the automatic network setup resulting from the STUN test"
+msgstr ""
+"Вимкнути автоматичне визначення конфігурації мережі за допомогою тесту STUN"
+
 #: ../ekiga.schemas.in.in.h:17
 msgid "Disable video hardware acceleration"
 msgstr "Вимкнути апаратне прискорення відео"
 
-#: ../ekiga.schemas.in.in.h:18
-msgid "Display a popup window when receiving a call"
-msgstr "Відкривати вікно при отриманні виклику"
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3596
+msgid "Display images from your camera device"
+msgstr "Показувати зображення з вашої камери"
 
 #: ../ekiga.schemas.in.in.h:19
 msgid "Enable 'Fast Start'"
@@ -142,10 +144,6 @@
 msgstr "Увімкнути виявлення мовчання"
 
 #: ../ekiga.schemas.in.in.h:24
-msgid "Enable video support"
-msgstr "Увімкнути підтримку відео"
-
-#: ../ekiga.schemas.in.in.h:25
 msgid ""
 "Enter the number of seconds after which Ekiga should try refreshing the NAT "
 "binding when STUN is being used"
@@ -153,31 +151,31 @@
 "Введіть кількість секунд після якої Ekiga буде намагатись оновити таблицю "
 "NAT при використанні STUN"
 
-#: ../ekiga.schemas.in.in.h:26 ../src/gui/preferences.cpp:378
+#: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
 msgid "Enter your full name"
 msgstr "Введіть повне ім'я"
 
-#: ../ekiga.schemas.in.in.h:27
+#: ../ekiga.schemas.in.in.h:26
 msgid "Forward calls to host"
 msgstr "Переадресовувати виклики на машину"
 
-#: ../ekiga.schemas.in.in.h:28
+#: ../ekiga.schemas.in.in.h:27
 msgid "Forward calls to the given host if busy"
 msgstr "Переадресовувати виклики на вказану машину, якщо лінія зайнята"
 
-#: ../ekiga.schemas.in.in.h:29
+#: ../ekiga.schemas.in.in.h:28
 msgid "Forward calls to the given host if no answer"
 msgstr "Переадресовувати виклики на вказану машину, якщо немає відповіді"
 
-#: ../ekiga.schemas.in.in.h:30 ../src/gui/preferences.cpp:1002
+#: ../ekiga.schemas.in.in.h:29 ../src/gui/preferences.cpp:1018
 msgid "Frame Rate"
 msgstr "Частота кадрів"
 
-#: ../ekiga.schemas.in.in.h:31
+#: ../ekiga.schemas.in.in.h:30
 msgid "Full name"
 msgstr "Повне ім'я"
 
-#: ../ekiga.schemas.in.in.h:32 ../src/gui/preferences.cpp:396
+#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:477
 msgid ""
 "If enabled, Ekiga will start hidden provided that the notification area is "
 "present in the GNOME panel"
@@ -185,18 +183,13 @@
 "Якщо відмічено, запускати Ekiga мінімізованим у вигляді значка в області "
 "сповіщення панелі GNOME."
 
-#: ../ekiga.schemas.in.in.h:33
-msgid ""
-"If enabled, a popup window will be displayed when receiving an incoming call"
-msgstr "При отриманні вхідного виклику, відкривати вікно"
-
-#: ../ekiga.schemas.in.in.h:34
+#: ../ekiga.schemas.in.in.h:32
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below"
 msgstr "Переадресовувати всі вхідні виклики на вказану нижче машину"
 
-#: ../ekiga.schemas.in.in.h:35
+#: ../ekiga.schemas.in.in.h:33
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you already are in a call or if you are in "
@@ -205,7 +198,7 @@
 "Переадресовувати всі вхідні виклики на вказану нижче машину, якщо активний "
 "інший виклик (лінія зайнята) чи ви знаходитесь в режимі \"Не турбувати\""
 
-#: ../ekiga.schemas.in.in.h:36
+#: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you do not answer the call"
@@ -213,177 +206,157 @@
 "Переадресовувати всі вхідні виклики на вказану нижче машину, якщо ви не "
 "відповідаєте на виклик"
 
-#: ../ekiga.schemas.in.in.h:37
-msgid "If enabled, allows video during calls"
-msgstr "Приймати відео в процесі виклику"
-
-#: ../ekiga.schemas.in.in.h:38 ../src/gui/preferences.cpp:398
+#: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
 msgid "If enabled, offline contacts will be shown in the roster"
 msgstr ""
 "Якщо увімкнено, у списку контактів будуть показані контакти не у мережі"
 
-#: ../ekiga.schemas.in.in.h:39
+#: ../ekiga.schemas.in.in.h:36
 msgid "If enabled, use echo cancelation"
 msgstr "Автоматичне зниження відлуння"
 
-#: ../ekiga.schemas.in.in.h:40
+#: ../ekiga.schemas.in.in.h:37
 msgid "If enabled, use silence detection with the codecs supporting it"
 msgstr ""
 "Використовувати виявлення мовчання для кодеків, що підтримують цю функцію."
 
-#: ../ekiga.schemas.in.in.h:41
+#: ../ekiga.schemas.in.in.h:38
 msgid "Kind of network selected in the druid"
 msgstr "Тип підключення до мережі"
 
-#: ../ekiga.schemas.in.in.h:42
+#: ../ekiga.schemas.in.in.h:39
 msgid "LDAP servers"
 msgstr "Сервери LDAP"
 
-#: ../ekiga.schemas.in.in.h:43
+#: ../ekiga.schemas.in.in.h:40
 msgid "List of configured LDAP servers"
 msgstr "Список налаштованих серверів LDAP"
 
-#: ../ekiga.schemas.in.in.h:44
+#: ../ekiga.schemas.in.in.h:41
 msgid "List of folded groups in the roster"
 msgstr "Список згорнутих груп у контактах"
 
-#: ../ekiga.schemas.in.in.h:45
+#: ../ekiga.schemas.in.in.h:42
 msgid "Listen port"
 msgstr "Прослуховувати порт"
 
-#: ../ekiga.schemas.in.in.h:46
+#: ../ekiga.schemas.in.in.h:43
 msgid "Local video window size"
 msgstr "Розмір вікна локального відео"
 
-#: ../ekiga.schemas.in.in.h:47
+#: ../ekiga.schemas.in.in.h:44
 msgid "Maximum RX video bitrate"
 msgstr "Максимальна швидкість прийому відео"
 
-#: ../ekiga.schemas.in.in.h:48
+#: ../ekiga.schemas.in.in.h:45
 msgid "Maximum TX video bitrate"
 msgstr "Максимальна швидкість надсилання відео"
 
-#: ../ekiga.schemas.in.in.h:49
+#: ../ekiga.schemas.in.in.h:46
 msgid "Maximum jitter buffer"
 msgstr "Максимальна затримка"
 
-#: ../ekiga.schemas.in.in.h:50
+#: ../ekiga.schemas.in.in.h:47
 msgid "NAT Binding Timeout"
 msgstr "Затримка таблиці NAT"
 
-#: ../ekiga.schemas.in.in.h:51
+#: ../ekiga.schemas.in.in.h:48
 msgid "No answer timeout"
 msgstr "Період очікування відповіді"
 
-#: ../ekiga.schemas.in.in.h:52
+#: ../ekiga.schemas.in.in.h:49
 msgid "Outbound Proxy"
 msgstr "Вихідний проксі"
 
-#: ../ekiga.schemas.in.in.h:53
-msgid "Output device type"
-msgstr "Тип пристрою виводу"
-
-#: ../ekiga.schemas.in.in.h:54 ../src/gui/preferences.cpp:405
+#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video above other windows during calls"
 msgstr "При викликах розміщувати вікна, що показують відео, над іншими вікнами"
 
-#: ../ekiga.schemas.in.in.h:55 ../src/gui/preferences.cpp:1372
+#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
 msgid "Play busy tone"
 msgstr "Відтворювати тон \"зайнято\""
 
-#: ../ekiga.schemas.in.in.h:56 ../src/gui/preferences.cpp:1363
+#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:361
 msgid "Play ring tone"
 msgstr "Відтворювати тон дзвінка"
 
-#: ../ekiga.schemas.in.in.h:57 ../src/gui/preferences.cpp:1354
+#: ../ekiga.schemas.in.in.h:53 ../src/gui/preferences.cpp:351
 msgid "Play sound on incoming calls"
 msgstr "Відтворювати звук при вхідних дзвінках"
 
-#: ../ekiga.schemas.in.in.h:58
+#: ../ekiga.schemas.in.in.h:54
 msgid "Play sound on new message"
 msgstr "Відтворювати звук при отриманні повідомлення"
 
-#: ../ekiga.schemas.in.in.h:59
+#: ../ekiga.schemas.in.in.h:55
 msgid "Play sound on new voice mail"
 msgstr "Відтворювати звук при отриманні голосової пошти"
 
-#: ../ekiga.schemas.in.in.h:60
+#: ../ekiga.schemas.in.in.h:56
 msgid "Position of the local video window"
 msgstr "Позиція вікна локального відео"
 
-#: ../ekiga.schemas.in.in.h:61
+#: ../ekiga.schemas.in.in.h:57
 msgid "Position on the screen of the address book window"
 msgstr "Позиція вікна адресної книги"
 
-#: ../ekiga.schemas.in.in.h:62
+#: ../ekiga.schemas.in.in.h:58
 msgid "Position on the screen of the audio settings window"
 msgstr "Позиція вікна параметрів звуку"
 
-#: ../ekiga.schemas.in.in.h:63
+#: ../ekiga.schemas.in.in.h:59
 msgid "Position on the screen of the chat window"
 msgstr "Позиція вікна текстового діалогу"
 
-#: ../ekiga.schemas.in.in.h:64
+#: ../ekiga.schemas.in.in.h:60
 msgid "Position on the screen of the druid window"
 msgstr "Позиція вікна помічника"
 
-#: ../ekiga.schemas.in.in.h:65
+#: ../ekiga.schemas.in.in.h:61
 msgid "Position on the screen of the log window"
 msgstr "Позиція вікна журналу"
 
-#: ../ekiga.schemas.in.in.h:66
+#: ../ekiga.schemas.in.in.h:62
 msgid "Position on the screen of the main window"
 msgstr "Позиція основного вікна"
 
-#: ../ekiga.schemas.in.in.h:67
+#: ../ekiga.schemas.in.in.h:63
 msgid "Position on the screen of the preferences window"
 msgstr "Позиція вікна параметрів"
 
-#: ../ekiga.schemas.in.in.h:68
+#: ../ekiga.schemas.in.in.h:64
 msgid "Position on the screen of the video settings window"
 msgstr "Позиція вікна параметрів відео"
 
-#: ../ekiga.schemas.in.in.h:69
-msgid "Registration timeout"
-msgstr "Таймаут реєстрації"
-
-#: ../ekiga.schemas.in.in.h:70
+#: ../ekiga.schemas.in.in.h:65
 msgid "Remote video window position"
 msgstr "Позиція вікна віддаленого відео"
 
-#: ../ekiga.schemas.in.in.h:71
+#: ../ekiga.schemas.in.in.h:66
 msgid "Remote video window size"
 msgstr "Розмір вікна віддаленого відео"
 
-#: ../ekiga.schemas.in.in.h:72
-msgid "Revision of the schema file"
-msgstr "Версія файлу schema"
-
-#: ../ekiga.schemas.in.in.h:73
-msgid "Roster view saving group status"
-msgstr "Статус груп у списку контактів"
-
-#: ../ekiga.schemas.in.in.h:74
+#: ../ekiga.schemas.in.in.h:67
 msgid "Select an alternative audio output device to use for sound events."
 msgstr ""
 "Вкажіть альтернативний пристрій відтворення звуку для відтворення звукових "
 "подій."
 
-#: ../ekiga.schemas.in.in.h:75 ../src/gui/preferences.cpp:707
+#: ../ekiga.schemas.in.in.h:68 ../src/gui/preferences.cpp:777
 msgid "Select the audio input device to use"
 msgstr "Вкажіть пристрій вводу звуку"
 
-#: ../ekiga.schemas.in.in.h:76 ../src/gui/preferences.cpp:700
+#: ../ekiga.schemas.in.in.h:69 ../src/gui/preferences.cpp:770
 msgid "Select the audio output device to use"
 msgstr "Вкажіть пристрій відтворення звуку"
 
-#: ../ekiga.schemas.in.in.h:77 ../src/gui/preferences.cpp:866
+#: ../ekiga.schemas.in.in.h:70 ../src/gui/preferences.cpp:936
 msgid ""
 "Select the format for video cameras (does not apply to most USB cameras)"
 msgstr ""
 "Виберіть формат для відеокамер (не застосовується до більшості камер USB)"
 
-#: ../ekiga.schemas.in.in.h:78
+#: ../ekiga.schemas.in.in.h:71
 msgid ""
 "Select the transmitted video size: Small (QCIF 176x144) or Large (CIF "
 "352x288)"
@@ -391,7 +364,7 @@
 "Виберіть розмір відео, що передається: малий (QCIF 176x144) чи великий (CIF "
 "352x288)."
 
-#: ../ekiga.schemas.in.in.h:79 ../src/gui/preferences.cpp:858
+#: ../ekiga.schemas.in.in.h:72 ../src/gui/preferences.cpp:928
 msgid ""
 "Select the video input device to use. If an error occurs when using this "
 "device a test picture will be transmitted."
@@ -399,43 +372,43 @@
 "Виберіть пристрій вводу відео. Якщо при використанні цього пристрою виникне "
 "помилка, буде передаватись тестове зображення."
 
-#: ../ekiga.schemas.in.in.h:80
+#: ../ekiga.schemas.in.in.h:73
 msgid "Show offline contacts"
 msgstr "Показувати контакти не у мережі"
 
-#: ../ekiga.schemas.in.in.h:81 ../src/gui/main.cpp:3177
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3225
 msgid "Show the call panel"
 msgstr "Показати панель виклику"
 
-#: ../ekiga.schemas.in.in.h:82
+#: ../ekiga.schemas.in.in.h:75
 msgid "Size of the address book window"
 msgstr "Розмір вікна адресної книги"
 
-#: ../ekiga.schemas.in.in.h:83
+#: ../ekiga.schemas.in.in.h:76
 msgid "Size of the audio settings window"
 msgstr "Розмір вікна параметрів звуку"
 
-#: ../ekiga.schemas.in.in.h:84
+#: ../ekiga.schemas.in.in.h:77
 msgid "Size of the chat window"
 msgstr "Розмір вікна текстового діалогу"
 
-#: ../ekiga.schemas.in.in.h:85
+#: ../ekiga.schemas.in.in.h:78
 msgid "Size of the druid window"
 msgstr "Розмір вікна помічника"
 
-#: ../ekiga.schemas.in.in.h:86
+#: ../ekiga.schemas.in.in.h:79
 msgid "Size of the preferences window"
 msgstr "Розмір вікна параметрів"
 
-#: ../ekiga.schemas.in.in.h:87
+#: ../ekiga.schemas.in.in.h:80
 msgid "Size of the video settings window"
 msgstr "Розмір вікна параметрів відео"
 
-#: ../ekiga.schemas.in.in.h:88
+#: ../ekiga.schemas.in.in.h:81
 msgid "Specify the software scaling algorithm"
 msgstr "Алгоритм програмної зміни масштабу відео"
 
-#: ../ekiga.schemas.in.in.h:89
+#: ../ekiga.schemas.in.in.h:82
 msgid ""
 "Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest "
 "neighbor with box filter, 2: bilinear filtering, 3: hyperbolic filtering. "
@@ -445,41 +418,31 @@
 "ближчого сусіднього з прямокутним фільтром, 2: білінійна фільтрація, 3: "
 "гіперболічна фільтрація. Цей параметр не використовується у системі Windows"
 
-#: ../ekiga.schemas.in.in.h:90
+#: ../ekiga.schemas.in.in.h:83
 msgid "Start hidden"
 msgstr "Мінімізувати під час запуску"
 
-#: ../ekiga.schemas.in.in.h:91
+#: ../ekiga.schemas.in.in.h:84
 msgid "TCP port range"
 msgstr "Діапазон портів TCP"
 
-#: ../ekiga.schemas.in.in.h:92
+#: ../ekiga.schemas.in.in.h:85
 msgid "Temporal Spatial Trade Off"
 msgstr "Уподобання оптимізації пропускної здатності"
 
-#: ../ekiga.schemas.in.in.h:93
+#: ../ekiga.schemas.in.in.h:86
 msgid "The Audio Codecs List"
 msgstr "Список звукових кодеків"
 
-#: ../ekiga.schemas.in.in.h:94
-msgid ""
-"The Automatic Echo Cancellation level: Off, Low, Medium, High, Automatic "
-"Gain Compensation. Choosing Automatic Gain Compensation modulates the volume "
-"for best quality."
-msgstr ""
-"Рівень автоматичного зменшення відлуння: вимкнено, низький, середній, "
-"високий, автоматичне регулювання рівня. Автоматичне регулювання рівня змінює "
-"гучність для досягнення найкращого результату."
-
-#: ../ekiga.schemas.in.in.h:95 ../src/gui/preferences.cpp:657
+#: ../ekiga.schemas.in.in.h:87 ../src/gui/preferences.cpp:727
 msgid "The SIP Outbound Proxy to use for outgoing calls"
 msgstr "Вихідний проксі-сервер для SIP"
 
-#: ../ekiga.schemas.in.in.h:96
+#: ../ekiga.schemas.in.in.h:88
 msgid "The STUN Server"
 msgstr "Сервер STUN"
 
-#: ../ekiga.schemas.in.in.h:97
+#: ../ekiga.schemas.in.in.h:89
 msgid ""
 "The STUN server to use for STUN Support. STUN is a technology that permits "
 "passage through some types of NAT gateway"
@@ -487,54 +450,54 @@
 "Сервер STUN, що використовується для підтримки STUN. STUN - технологія, що "
 "дозволяє переходити через деякі типи шлюзів NAT."
 
-#: ../ekiga.schemas.in.in.h:98
+#: ../ekiga.schemas.in.in.h:90
 msgid "The Video Codecs List"
 msgstr "Список відео кодеків"
 
-#: ../ekiga.schemas.in.in.h:99
+#: ../ekiga.schemas.in.in.h:91
 msgid "The accounts list"
 msgstr "Список облікових записів"
 
-#: ../ekiga.schemas.in.in.h:100
+#: ../ekiga.schemas.in.in.h:92
 msgid "The audio codecs list"
 msgstr "Список звукових кодеків"
 
-#: ../ekiga.schemas.in.in.h:101
+#: ../ekiga.schemas.in.in.h:93
 msgid "The busy tone sound"
 msgstr "Звуковий тон \"зайнято\""
 
-#: ../ekiga.schemas.in.in.h:102
+#: ../ekiga.schemas.in.in.h:94
 msgid ""
 "The chosen sound will be played at the end of calls or calling somebody who "
 "is busy, if enabled"
 msgstr ""
 "Цей звук буде відтворюватись при завершенні виклику або якщо абонент зайнятий"
 
-#: ../ekiga.schemas.in.in.h:103
+#: ../ekiga.schemas.in.in.h:95
 msgid "The chosen sound will be played on incoming calls, if enabled"
 msgstr "Цей звук буде відтворюватись при отриманні вхідного дзвінка"
 
-#: ../ekiga.schemas.in.in.h:104
+#: ../ekiga.schemas.in.in.h:96
 msgid ""
 "The chosen sound will be played when a new instant message is received, if "
 "enabled"
 msgstr "Цей звук буде відтворюватись при отриманні нового повідомлення"
 
-#: ../ekiga.schemas.in.in.h:105
+#: ../ekiga.schemas.in.in.h:97
 msgid ""
 "The chosen sound will be played when a new voice mail is received, if enabled"
 msgstr ""
 "Цей звук буде відтворюватись при отриманні нового голосового повідомлення"
 
-#: ../ekiga.schemas.in.in.h:106
+#: ../ekiga.schemas.in.in.h:98
 msgid "The chosen sound will be played when calling somebody, if enabled"
 msgstr "Цей звук буде відтворюватись при виклику будь-кого"
 
-#: ../ekiga.schemas.in.in.h:107
+#: ../ekiga.schemas.in.in.h:99
 msgid "The default video view"
 msgstr "Початкове відео"
 
-#: ../ekiga.schemas.in.in.h:108
+#: ../ekiga.schemas.in.in.h:100
 msgid ""
 "The default video view (0: Local, 1: Remote, 2: Both layered, 3: Both with "
 "local video in a separate window, 4: Both)"
@@ -542,40 +505,32 @@
 "Початкове відео (0 — локальне, 1 — віддалене, 2 — обидва з перекриттям, 3 — "
 "обидва з локальним в окремому вікні, 4 — обидва)"
 
-#: ../ekiga.schemas.in.in.h:109
+#: ../ekiga.schemas.in.in.h:101
 msgid "The dial tone sound"
 msgstr "Звук гудка у лінії"
 
-#: ../ekiga.schemas.in.in.h:110
+#: ../ekiga.schemas.in.in.h:102
 msgid "The history of the 100 last calls"
 msgstr "Історія останніх 100 викликів"
 
-#: ../ekiga.schemas.in.in.h:111 ../src/gui/preferences.cpp:606
-#: ../src/gui/preferences.cpp:660
+#: ../ekiga.schemas.in.in.h:103 ../src/gui/preferences.cpp:676
+#: ../src/gui/preferences.cpp:730
 msgid "The host where calls should be forwarded if call forwarding is enabled"
 msgstr "Вузол, на який перенаправляти виклики, коли увімкнено переадресацію."
 
-#: ../ekiga.schemas.in.in.h:112
-msgid ""
-"The image to transmit if \"Picture\" is selected as video plugin or if the "
-"opening of the device fails. Leave blank to use the default Ekiga logo."
-msgstr ""
-"Зображення, що передаватиметься, якщо в якості модуля відео вказано \"Picture"
-"\" (якщо не вказано, буде використовуватись емблема Ekiga)."
-
-#: ../ekiga.schemas.in.in.h:113
+#: ../ekiga.schemas.in.in.h:104
 msgid "The incoming call sound"
 msgstr "Звук вхідного виклику"
 
-#: ../ekiga.schemas.in.in.h:114
+#: ../ekiga.schemas.in.in.h:105
 msgid "The list of accounts to which Ekiga should register"
 msgstr "Список облікових рахунків, що використовуються Ekiga для реєстрації"
 
-#: ../ekiga.schemas.in.in.h:115
+#: ../ekiga.schemas.in.in.h:106
 msgid "The long status information"
 msgstr "Розширена інформація про статус"
 
-#: ../ekiga.schemas.in.in.h:116
+#: ../ekiga.schemas.in.in.h:107
 msgid ""
 "The maximum RX video bitrate in kbit/s. This value will be signaled to the "
 "peer endpoint that can adjust (if it supports it) its TX bitrate if it is "
@@ -586,7 +541,7 @@
 "підтримки) власну швидкість передачі відео, якщо вона перевищує отримане "
 "значення."
 
-#: ../ekiga.schemas.in.in.h:117
+#: ../ekiga.schemas.in.in.h:108
 msgid ""
 "The maximum TX video bitrate in kbit/s. The video quality and the number of "
 "transmitted frames per second (depends on selected codec) will be "
@@ -598,11 +553,11 @@
 "динамічно регулюватись таким чином, щоб при викликах мінімізувати смугу "
 "пропускання до вказаного значення."
 
-#: ../ekiga.schemas.in.in.h:118
+#: ../ekiga.schemas.in.in.h:109
 msgid "The maximum jitter buffer size for audio reception (in ms)"
 msgstr "Максимальний розмір буфера прийому звуку (в мілісекундах)"
 
-#: ../ekiga.schemas.in.in.h:119
+#: ../ekiga.schemas.in.in.h:110
 msgid ""
 "The maximum transmitted frame rate in frames/s. This rate may not be reached "
 "in case a minimum quality was configure via a TSTO value smaller than 31 and "
@@ -613,23 +568,15 @@
 "параметра значення TSTO більше 31, та обраної смуги пропускання недостатньо "
 "для підтримки мінімальної якості, що вимагається."
 
-#: ../ekiga.schemas.in.in.h:120
+#: ../ekiga.schemas.in.in.h:111
 msgid "The new instant message sound"
 msgstr "Звук для нового повідомлення"
 
-#: ../ekiga.schemas.in.in.h:121
+#: ../ekiga.schemas.in.in.h:112
 msgid "The new voice mail sound"
 msgstr "Звук нового голосового повідомлення"
 
-#: ../ekiga.schemas.in.in.h:122
-msgid ""
-"The output device type is the type of device connected to your Quicknet "
-"card. It can be either a POTS (Plain Old Telephone System) or a headset."
-msgstr ""
-"Тип пристрою виводу - це тип пристрою, що з'єднаний з вашою картою Quicknet. "
-"Може бути або POTS (Plain Old Telephone System), або трубка."
-
-#: ../ekiga.schemas.in.in.h:123
+#: ../ekiga.schemas.in.in.h:113
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect"
@@ -637,7 +584,7 @@
 "Порт прийому вхідних з'єднань. Щоб зміна вступила в дію, необхідно "
 "перезапустити Ekiga."
 
-#: ../ekiga.schemas.in.in.h:124
+#: ../ekiga.schemas.in.in.h:114
 msgid ""
 "The port to listen to for incoming connections. Ekiga needs to be restarted "
 "for the new value to take effect."
@@ -645,23 +592,15 @@
 "Порт прийому вхідних з'єднань. Щоб зміна вступила в дію, необхідно "
 "перезапустити Ekiga."
 
-#: ../ekiga.schemas.in.in.h:125
+#: ../ekiga.schemas.in.in.h:115
 msgid "The position of the local video window"
 msgstr "Позиція вікна локального відео"
 
-#: ../ekiga.schemas.in.in.h:126
+#: ../ekiga.schemas.in.in.h:116
 msgid "The position of the remote video window"
 msgstr "Позиція вікна віддаленого відео"
 
-#: ../ekiga.schemas.in.in.h:127
-msgid ""
-"The prefix that will be used to save pictures of the conversation. That "
-"prefix is followed by the snapshot number."
-msgstr ""
-"Префікс, що буде використано для збереження стоп-кадрів. За префіксом буде "
-"йти номер знімка."
-
-#: ../ekiga.schemas.in.in.h:128
+#: ../ekiga.schemas.in.in.h:117
 msgid ""
 "The range of TCP ports that Ekiga will use for the H.323 H.245 channel. This "
 "port range has no effect if both participants to the conference are using "
@@ -671,27 +610,23 @@
 "зміна вступила в дію, необхідно перезапустити Ekiga. Цей параметр недійсний, "
 "якщо обидва учасника використовують тунелювання H.245. "
 
-#: ../ekiga.schemas.in.in.h:129
+#: ../ekiga.schemas.in.in.h:118
 msgid "The range of UDP ports that Ekiga will use."
 msgstr "Діапазон портів UDP, що використовується."
 
-#: ../ekiga.schemas.in.in.h:130
-msgid "The save prefix"
-msgstr "Префікс збереження"
-
-#: ../ekiga.schemas.in.in.h:131
+#: ../ekiga.schemas.in.in.h:119
 msgid "The short status information"
 msgstr "Перегляд інформації про статус"
 
-#: ../ekiga.schemas.in.in.h:132
+#: ../ekiga.schemas.in.in.h:120
 msgid "The size of the local video window"
 msgstr "Розмір вікна локального відео"
 
-#: ../ekiga.schemas.in.in.h:133
+#: ../ekiga.schemas.in.in.h:121
 msgid "The size of the remote video window"
 msgstr "Ширина вікна віддаленого відео"
 
-#: ../ekiga.schemas.in.in.h:134
+#: ../ekiga.schemas.in.in.h:122
 msgid ""
 "The sound that will be played at the end of calls or when calling somebody "
 "who is busy, if enabled"
@@ -699,50 +634,39 @@
 "Цей звук буде відтворюватись наприкінці викликів або при викликанні когось, "
 "хто зайнятий"
 
-#: ../ekiga.schemas.in.in.h:135
+#: ../ekiga.schemas.in.in.h:123
 msgid "The sound that will be played on incoming calls, if enabled"
 msgstr "Цей звук буде використовуватись при отриманні вхідного виклику"
 
-#: ../ekiga.schemas.in.in.h:136
+#: ../ekiga.schemas.in.in.h:124
 msgid "The sound that will be played when calling somebody, if enabled"
 msgstr "Цей звук буде використовуватись при викликанні будь-кого"
 
-#: ../ekiga.schemas.in.in.h:137
+#: ../ekiga.schemas.in.in.h:125
 msgid ""
 "The sound that will be played when there is a new instant message, if enabled"
 msgstr "Цей звук буде використовуватись при надходженні нового повідомлення."
 
-#: ../ekiga.schemas.in.in.h:138
+#: ../ekiga.schemas.in.in.h:126
 msgid ""
 "The sound that will be played when there is a new voice mail, if enabled"
 msgstr ""
 "Цей звук буде використовуватись при надходженні нового голосового "
 "повідомлення."
 
-#: ../ekiga.schemas.in.in.h:139
-msgid ""
-"The time after which Ekiga will renew its registration with the registrar"
-msgstr ""
-"Час, по закінченні якого Ekiga буде оновлювати свою реєстрацію на "
-"реєстраційному сервері"
-
-#: ../ekiga.schemas.in.in.h:140
-msgid "The two-letter country code of your country (e.g.: BE, UK, FR, DE, ...)"
-msgstr "Дві літери коду вашої країни (тобто UA, BE, FR, DE, ...)."
-
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/preferences.cpp:862
+#: ../ekiga.schemas.in.in.h:127 ../src/gui/preferences.cpp:932
 msgid "The video channel number to use (to select camera, tv or other sources)"
 msgstr "Номер відеоканалу (камера, ТБ чи інше джерело)"
 
-#: ../ekiga.schemas.in.in.h:142
+#: ../ekiga.schemas.in.in.h:128
 msgid "The video codecs list"
 msgstr "Список відео кодеків"
 
-#: ../ekiga.schemas.in.in.h:143
+#: ../ekiga.schemas.in.in.h:129
 msgid "The video view before having switched to fullscreen"
 msgstr "Вигляд відео до перемикання у повноекранний режим"
 
-#: ../ekiga.schemas.in.in.h:144
+#: ../ekiga.schemas.in.in.h:130
 msgid ""
 "The video view before having switched to fullscreen (same values as "
 "video_view)"
@@ -750,11 +674,11 @@
 "Вигляд відео до перемикання у повноекранний режим (ті самі значення, що й у "
 "video_view)"
 
-#: ../ekiga.schemas.in.in.h:145
+#: ../ekiga.schemas.in.in.h:131
 msgid "The zoom value"
 msgstr "Кратність збільшення"
 
-#: ../ekiga.schemas.in.in.h:146
+#: ../ekiga.schemas.in.in.h:132
 msgid ""
 "The zoom value in percent to apply to images displayed in the main GUI (can "
 "be 50, 100, or 200)"
@@ -762,7 +686,7 @@
 "Кратність збільшення зображень в основному інтерфейсі (може бути 0.50, 1.00 "
 "чи 2.00)"
 
-#: ../ekiga.schemas.in.in.h:147
+#: ../ekiga.schemas.in.in.h:133
 msgid ""
 "This allows you to set the mode for sending DTMFs. The values can be "
 "\"RFC2833\" (0), \"INFO\" (1)"
@@ -770,7 +694,7 @@
 "Дозволяє встановлення режиму для надсилання DTMF. Можливі значення: лише "
 "\"RFC2833\" (0), \"INFO\" (1)"
 
-#: ../ekiga.schemas.in.in.h:148
+#: ../ekiga.schemas.in.in.h:134
 msgid ""
 "This allows you to set the mode for sending DTMFs. The values can be \"String"
 "\" (0), \"Tone\" (1), \"RFC2833\" (2), \"Q.931\" (3) (default is \"String"
@@ -781,7 +705,7 @@
 "\"). Вибір будь-якого значення, відмінного від \"Рядок\" вмикає текстовий "
 "діалог"
 
-#: ../ekiga.schemas.in.in.h:149 ../src/gui/preferences.cpp:618
+#: ../ekiga.schemas.in.in.h:135 ../src/gui/preferences.cpp:688
 msgid ""
 "This enables H.245 Tunneling mode. In H.245 Tunneling mode H.245 messages "
 "are encapsulated into the H.225 channel (port 1720). This saves one TCP "
@@ -795,11 +719,11 @@
 "Воно не підтримується в Netmeeting, і одночасне використання швидкого старту "
 "і тунелювання H.245 може призвести до збоїв деяких версій Netmeeting"
 
-#: ../ekiga.schemas.in.in.h:150 ../src/gui/preferences.cpp:620
+#: ../ekiga.schemas.in.in.h:136 ../src/gui/preferences.cpp:690
 msgid "This enables H.245 early in the setup"
 msgstr "Включати H.245 на ранній стадії з'єднання"
 
-#: ../ekiga.schemas.in.in.h:151
+#: ../ekiga.schemas.in.in.h:137
 msgid ""
 "This key disables DirectX (on win32) and XVideo (on Linux) video hardware "
 "acceleration"
@@ -807,39 +731,31 @@
 "Вимикає апаратне прискорення відео DirectX (у системі Windows) та XVideo (на "
 "Linux)"
 
-#: ../ekiga.schemas.in.in.h:152
+#: ../ekiga.schemas.in.in.h:138
 msgid "UDP port range"
 msgstr "Діапазон портів UDP"
 
-#: ../ekiga.schemas.in.in.h:153
-msgid "Version"
-msgstr "Версія"
-
-#: ../ekiga.schemas.in.in.h:154
+#: ../ekiga.schemas.in.in.h:139
 msgid "Video channel"
 msgstr "Відеоканал"
 
-#: ../ekiga.schemas.in.in.h:155
+#: ../ekiga.schemas.in.in.h:140
 msgid "Video format"
 msgstr "Формат відео"
 
-#: ../ekiga.schemas.in.in.h:156
-msgid "Video image"
-msgstr "Відео"
-
-#: ../ekiga.schemas.in.in.h:157 ../src/gui/assistant.cpp:1152
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr "Пристрій вводу відео"
 
-#: ../ekiga.schemas.in.in.h:158
+#: ../ekiga.schemas.in.in.h:142
 msgid "Video preview"
 msgstr "Зразок відео"
 
-#: ../ekiga.schemas.in.in.h:159
+#: ../ekiga.schemas.in.in.h:143
 msgid "Video size"
 msgstr "Розмір відео"
 
-#: ../ekiga.schemas.in.in.h:160
+#: ../ekiga.schemas.in.in.h:144
 msgid ""
 "Whether to prefer to sustain the max. frame rate or lower it possibly in "
 "order to keep a minimum level of (spatial) quality for all frames. 0: "
@@ -850,927 +766,1124 @@
 "забезпечувати найвищу якість зображення, 31: надавати перевагу частоті "
 "кадрів."
 
-#: ../lib/engine/addressbook/call-history/history-contact.cpp:152
+#: ../lib/engine/addressbook/contact-core.cpp:60
+msgid "_Find"
+msgstr "З_найти"
+
+#: ../lib/engine/components/avahi/avahi-heap.cpp:125
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
+msgid "Neighbours"
+msgstr "Сусіди"
+
+#: ../lib/engine/components/call-history/history-book.cpp:137
+#: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
+msgid "Clear List"
+msgstr "Очистити список"
+
+#: ../lib/engine/components/call-history/history-contact.cpp:155
 msgid "Received"
 msgstr "Отримані"
 
-#: ../lib/engine/addressbook/call-history/history-contact.cpp:155
+#: ../lib/engine/components/call-history/history-contact.cpp:158
 msgid "Placed"
 msgstr "Набрані"
 
-#: ../lib/engine/addressbook/call-history/history-contact.cpp:158
+#: ../lib/engine/components/call-history/history-contact.cpp:161
 msgid "Missed"
 msgstr "Пропущені"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:234
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:196
-#: ../src/endpoints/opal-account.cpp:310 ../src/gui/main.cpp:3135
-msgid "_Edit"
-msgstr "_Правка"
+#: ../lib/engine/components/evolution/evolution-book.cpp:76
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
+#, c-format
+msgid "%d user found"
+msgid_plural "%d users found"
+msgstr[0] "Знайдений %d користувач"
+msgstr[1] "Знайдено %d користувача"
+msgstr[2] "Знайдено %d користувачів"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:236
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:198
-#: ../src/endpoints/opal-account.cpp:312
-msgid "_Remove"
-msgstr "В_идалити"
+#: ../lib/engine/components/evolution/evolution-book.cpp:281
+msgid "New _Contact"
+msgstr "_Створити контакт"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:326
-msgid "Edit contact"
-msgstr "Редагування контакту"
+#: ../lib/engine/components/evolution/evolution-book.cpp:317
+#: ../lib/engine/components/local-roster/local-cluster.cpp:82
+#: ../lib/engine/components/local-roster/local-heap.cpp:117
+msgid "New contact"
+msgstr "Створення контакту"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:328
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:290
-#: ../src/endpoints/opal-account.cpp:353
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:357
 msgid "Please update the following fields:"
 msgstr "Заповніть наступні поля:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:330
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:223
-#: ../lib/engine/presence/local-roster/local-heap.cpp:182
-#: ../lib/engine/presence/local-roster/local-heap.cpp:334
-#: ../src/endpoints/opal-account.cpp:355 ../src/endpoints/opal-bank.cpp:101
-#: ../src/endpoints/opal-bank.cpp:111
-msgid "Name:"
-msgstr "Ім'я:"
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+msgid "_Name:"
+msgstr "_Ім'я:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:339
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:293
+#: ../lib/engine/components/evolution/evolution-book.cpp:322
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
 msgid "VoIP _URI:"
 msgstr "VoIP _URL:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:340
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:294
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
 msgid "_Home phone:"
 msgstr "_Домашній телефон:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:341
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:295
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
 msgid "_Office phone:"
 msgstr "_Офісний телефон"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:342
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:296
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
 msgid "_Cell phone:"
 msgstr "_Мобільний телефон"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:343
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:297
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
 msgid "_Pager:"
 msgstr "_Пейджер:"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:395
+#: ../lib/engine/components/evolution/evolution-contact.cpp:234
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:314
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3183
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:236
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:316
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
+msgid "_Remove"
+msgstr "В_идалити"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
+msgid "Edit contact"
+msgstr "Редагування контакту"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:359
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:169
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+msgid "Name:"
+msgstr "Ім'я:"
+
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
 msgid "Remove contact"
 msgstr "Видалення контакту"
 
-#: ../lib/engine/addressbook/evolution/evolution-contact.cpp:397
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
 #, c-format
 msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr "Ви дійсно бажаєте видалити обліковий запис %s з адресної книги?"
 
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:76
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:901
-#, c-format
-msgid "%d user found"
-msgid_plural "%d users found"
-msgstr[0] "Знайдений %d користувач"
-msgstr[1] "Знайдено %d користувача"
-msgstr[2] "Знайдено %d користувачів"
-
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:244
-msgid "New _Contact"
-msgstr "_Створити контакт"
-
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:288
-#: ../lib/engine/presence/local-roster/local-heap.cpp:115
-msgid "New contact"
-msgstr "Створення контакту"
-
-#: ../lib/engine/addressbook/evolution/evolution-book.cpp:292
-msgid "_Name:"
-msgstr "_Ім'я:"
+#: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
+msgid "Audio test"
+msgstr "Перевірка звуку"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:132
-msgid "Add an LDAP Address Book"
-msgstr "Додати адресну книгу LDAP"
+#: ../lib/engine/components/gstreamer/gst-audiooutput.cpp:320
+msgid "Silent"
+msgstr "Тихо"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:135
-msgid "Add the Ekiga.net Directory"
-msgstr "Додати каталог користувачів Ekiga.net"
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
+msgid "Video test"
+msgstr "Перевірка відео"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:157
-msgid "Create LDAP directory"
-msgstr "Створити каталог LDAP"
+#. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Crazy"
+msgstr "Скажений"
 
-#: ../lib/engine/addressbook/ldap/ldap-source.cpp:172
-msgid "Ekiga.net Directory"
-msgstr "Каталог користувачів LDAP"
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
+msgid "Screencast"
+msgstr "Екранна копія"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:410
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
 msgid "_Refresh"
 msgstr "_Оновити"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:413
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
 msgid "_Remove addressbook"
 msgstr "В_идалити адресну книгу"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:415
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
 msgid "Addressbook _properties"
 msgstr "В_ластивості адресної книги"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:546
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
 msgid "LDAP SASL Interaction"
 msgstr "Взаємодія LDAP з SASL"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:578
+#. Translators, Howard explained : "Challenge" is a generic term
+#. * in authentication. It's a prompt from the authentication mechanism
+#. * for some type of credential. Exactly what kind of challenge and
+#. * what kind of credential depends on the specific authentication
+#. * mechanism. Since SASL is a generic interface, and can dynamically
+#. * load arbitrary mechanisms, there's not much more specific you can
+#. * say about it. You might google for "challenge response
+#. * authentication" if you'd like more background context.
+#.
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
 msgid "Challenge: "
 msgstr "Виклик: "
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:586
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
 msgid "Interact"
 msgstr "Взаємодія"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:655
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
 msgid "Refreshing"
 msgstr "Оновлення"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:661
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
 msgid "Could not initialize server"
 msgstr "Не вдається ініціалізувати сервер"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:675
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:720
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
 msgid "LDAP Error: "
 msgstr "Помилка LDAP: "
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:729
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
 msgid "Contacted server"
 msgstr "Сервер, що відповів"
 
 #. patience == 0
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:772
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
 msgid "Could not connect to server"
 msgstr "Не вдається з'єднатись з сервером"
 
 #. patience == 0
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:820
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:874
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
 msgid "Could not search"
 msgstr "Не вдається запустити пошук"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:828
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
 msgid "Waiting for search results"
 msgstr "Очікування результатів пошуку"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:923
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
 msgid "Please edit the following fields"
 msgstr "Відредагуйте наступні поля"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:925
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
 msgid "Book _Name"
 msgstr "_Назва книги"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:926
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
 msgid "Server _URI"
 msgstr "_URI сервера"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:927
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
 msgid "_Base DN"
 msgstr "_Базова DN:"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:933
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
 msgid "Subtree"
 msgstr "Дерево"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:934
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
 msgid "Single Level"
 msgstr "Один рівень"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:935
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
 msgid "_Search Scope"
 msgstr "Область по_шуку:"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:944
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
 msgid "_DisplayName Attribute"
 msgstr "Атрибут _ВизначногоІмені (DN)"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:945
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
 msgid "Call _Attributes"
 msgstr "_Атрибут виклику"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:947
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:949
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
 msgid "_Filter Template"
 msgstr "Шаблон _фільтру"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:951
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
 msgid "Bind _ID"
 msgstr "_Ідентифікатор прив'язки"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:952
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
 msgid "_Password"
 msgstr "_Пароль"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:953
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
 msgid "Use TLS"
 msgstr "Використовувати TLS"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:954
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
 msgid "Use SASL"
 msgstr "Використовувати SASL"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:968
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
 msgid "SASL _Mechanism"
 msgstr "_Механізм SASL"
 
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:979
-msgid "Edit LDAP directory"
-msgstr "Редагувати каталог на сервері LDAP"
-
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:1008
-msgid "Please provide a Book Name for this directory\n"
-msgstr "Вкажіть назву книги для цього каталогу\n"
-
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:1011
-msgid "Please provide a Server URI\n"
-msgstr "Вкажіть URI сервера\n"
-
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:1014
-msgid "Please provide a DisplayName Attribute\n"
-msgstr "Вкажіть атрибут ВизначногоІмені (DN)\n"
-
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:1017
-msgid "Please provide a Call Attribute\n"
-msgstr "Вкажіть атрибут виклику\n"
-
-#: ../lib/engine/addressbook/ldap/ldap-book.cpp:1020
-msgid "Invalid Server URI\n"
-msgstr "Неправильний URI сервера\n"
-
-#: ../lib/engine/addressbook/skel/contact-core.cpp:57
-msgid "_Find"
-msgstr "З_найти"
-
-#: ../lib/engine/components/gstreamer/gst-audioinput.cpp:270
-msgid "Audio test"
-msgstr "Перевірка звуку"
-
-#: ../lib/engine/components/gstreamer/gst-audiooutput.cpp:282
-msgid "Silent"
-msgstr "Тихо"
-
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:226
-msgid "Video test"
-msgstr "Перевірка відео"
-
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:373
-msgid "Crazy"
-msgstr "Скажений"
-
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-msgid "Goom"
-msgstr "В'язкий"
-
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:373
-msgid "Screencast"
-msgstr "Екранна копія"
-
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:656
-msgid "Address Book"
-msgstr "Адресна книга"
-
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:672
-#: ../src/gui/main.cpp:3084
-msgid "Address _Book"
-msgstr "_Адресна книга"
-
-#. This will add static and dynamic actions
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:681
-msgid "_Action"
-msgstr "Д_ія"
-
-#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:726
-msgid "Category"
-msgstr "Категорія"
-
-#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:638
-#: ../src/gui/assistant.cpp:1375
-msgid "Full Name"
-msgstr "Повне ім'я"
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
+msgid "Edit LDAP directory"
+msgstr "Редагувати каталог на сервері LDAP"
 
-#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:649
-msgid "_Search Filter:"
-msgstr "Фільтр по_шуку:"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
+msgid "Please provide a Book Name for this directory\n"
+msgstr "Вкажіть назву книги для цього каталогу\n"
 
-#: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:163
-#: ../src/gui/statusmenu.cpp:499
-msgid "Clear"
-msgstr "Очистити"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
+msgid "Please provide a Server URI\n"
+msgstr "Вкажіть URI сервера\n"
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:247
-msgid "says:"
-msgstr "сказав(ла):"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
+msgid "Please provide a DisplayName Attribute\n"
+msgstr "Вкажіть атрибут ВизначногоІмені (DN)\n"
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:370
-msgid "Open link in browser"
-msgstr "Відкрити посилання у веб-оглядачі"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
+msgid "Please provide a Call Attribute\n"
+msgstr "Вкажіть атрибут виклику\n"
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:376
-msgid "Copy link"
-msgstr "Копіювати адресу посилання"
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
+msgid "Invalid Server URI\n"
+msgstr "Неправильний URI сервера\n"
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:905
-msgid "_Smile..."
-msgstr "_Емоції..."
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
+msgid "Add an LDAP Address Book"
+msgstr "Додати адресну книгу LDAP"
 
-#. we can't do much here since we get the Chat as reference...
-#: ../lib/engine/gui/gtk-frontend/chat-window.cpp:433
-msgid "Chat Window"
-msgstr "Вікно розмови"
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
+msgid "Add the Ekiga.net Directory"
+msgstr "Додати каталог користувачів Ekiga.net"
 
-#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:981
-#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1016
-msgid "Unsorted"
-msgstr "Без сортування"
+#: ../lib/engine/components/ldap/ldap-source.cpp:152
+msgid "Create LDAP directory"
+msgstr "Створити каталог LDAP"
 
-#: ../lib/engine/presence/avahi/avahi-heap.cpp:126
-#: ../lib/engine/presence/avahi/avahi-heap.cpp:308
-msgid "Neighbours"
-msgstr "Сусіди"
+#: ../lib/engine/components/ldap/ldap-source.cpp:167
+msgid "Ekiga.net Directory"
+msgstr "Каталог користувачів LDAP"
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:220
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
 msgid "Edit roster element"
 msgstr "Редагувати елемент списку"
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:221
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
 msgstr ""
 "Заповніть цю форму для зміни існуючого елементу локального списку ekiga"
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:224
-#: ../lib/engine/presence/local-roster/local-heap.cpp:191
-#: ../lib/engine/presence/local-roster/local-heap.cpp:193
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:170
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
 msgid "Address:"
 msgstr "Адреса:"
 
-#: ../lib/engine/presence/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
 msgid "Choose groups:"
 msgstr "Виберіть групи:"
 
-#: ../lib/engine/presence/local-roster/local-roster-bridge.cpp:94
-#: ../lib/engine/presence/local-roster/local-heap.cpp:179
+#: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
 msgid "Add to local roster"
 msgstr "Додати до локальних контактів"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:90
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
 msgid "Services"
 msgstr "Служби"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:91
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
 msgid "Echo test"
 msgstr "Перевірка дзвінка"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:92
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
 msgid "Conference room"
 msgstr "Кімната конференцій"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:108
+#: ../lib/engine/components/local-roster/local-heap.cpp:110
 msgid "Local roster"
 msgstr "Локальні контакти"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:125
+#: ../lib/engine/components/local-roster/local-heap.cpp:127
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:158
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
 msgid "Family"
 msgstr "Родина"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:159
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
 msgid "Friend"
 msgstr "Друзі"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:160
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
 msgid "Associate"
 msgstr "Пов'язати"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:161
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
 msgid "Assistant"
 msgstr "Помічник"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:162
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
 msgid "Supervisor"
 msgstr "Супервізор"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:163
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
 msgid "Self"
 msgstr "Я сам"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:180
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
 msgid ""
 "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr "Заповніть форму та додайте новий контакт до локального списку"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:197
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
 msgid "Put contact in groups:"
 msgstr "Додати контакт до групи:"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:305
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
 msgid "You supplied an unsupported address"
 msgstr "Ви вказали непідтримувану адресу"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:307
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
 msgid "You already have a contact with this address!"
 msgstr "Вже є контакт з такою адресою!"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:332
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
 msgid "Rename group"
 msgstr "Перейменувати групу"
 
-#: ../lib/engine/presence/local-roster/local-heap.cpp:333
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
 msgid "Please edit this group name"
 msgstr "Вкажіть назву групи"
 
-#: ../lib/gui/codecsbox.cpp:477
-msgid "Move selected codec priority upwards"
-msgstr "Перемістити виділений кодек у більш пріоритетні"
-
-#: ../lib/gui/codecsbox.cpp:487
-msgid "Move selected codec priority downwards"
-msgstr "Перемістити виділений кодек у менш пріоритетні"
-
-#: ../lib/gui/gmdialog.c:476
-msgid "Do not show this dialog again"
-msgstr "Не показувати це вікно знову"
-
-#: ../src/endpoints/h323-endpoint.cpp:132
-#: ../src/endpoints/sip-endpoint.cpp:256 ../src/endpoints/sip-endpoint.cpp:260
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:233
+#: ../lib/engine/components/opal/sip-endpoint.cpp:237
 msgid "Call"
 msgstr "Виклик"
 
-#: ../src/endpoints/h323-endpoint.cpp:135
-#: ../src/endpoints/sip-endpoint.cpp:257 ../src/endpoints/sip-endpoint.cpp:261
-#: ../src/gui/main.cpp:2909
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
+#: ../lib/engine/components/opal/sip-endpoint.cpp:238 ../src/gui/main.cpp:2957
 msgid "Transfer"
 msgstr "Передача"
 
 #. Translators : The alias we are registering already exists : failure
-#: ../src/endpoints/h323-endpoint.cpp:299
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
 msgid "Duplicate alias"
 msgstr "Назва вже існує"
 
-#: ../src/endpoints/h323-endpoint.cpp:302
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
 msgid "Bad username/password"
 msgstr "Некоректне ім'я користувача/пароль"
 
-#: ../src/endpoints/h323-endpoint.cpp:305
-#: ../src/endpoints/sip-endpoint.cpp:873
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
 msgid "Transport error"
 msgstr "Помилка зв'язку"
 
-#: ../src/endpoints/h323-endpoint.cpp:316
-#: ../src/endpoints/h323-endpoint.cpp:321
-#: ../src/endpoints/sip-endpoint.cpp:880
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:825
 msgid "Failed"
 msgstr "Не вдається"
 
-#: ../src/endpoints/manager.cpp:714
-msgid ""
-"Ekiga did not manage to configure your network settings automatically. You "
-"can still use it, but you need to configure your network settings manually.\n"
-"\n"
-"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
-"for instructions"
-msgstr ""
-"Ekiga не вдається автоматично налаштувати параметри мережі. Потрібно "
-"налаштувати мережу вручну.\n"
-"\n"
-"Для отримання докладних інструкцій прочитайте сторінку http://wiki.ekiga.org/"
-"index.php/Enable_port_forwarding_manually"
-
-#: ../src/endpoints/opal-account.cpp:302
+#: ../lib/engine/components/opal/opal-account.cpp:306
 msgid "_Disable"
 msgstr "В_имкнути"
 
-#: ../src/endpoints/opal-account.cpp:305
+#: ../lib/engine/components/opal/opal-account.cpp:309
 msgid "_Enable"
 msgstr "_Увімкнути"
 
-#: ../src/endpoints/opal-account.cpp:326 ../src/gui/assistant.cpp:726
+#: ../lib/engine/components/opal/opal-account.cpp:330
+#: ../src/gui/assistant.cpp:716
 msgid "Recharge the account"
 msgstr "Оплатити послугу"
 
-#: ../src/endpoints/opal-account.cpp:331 ../src/gui/assistant.cpp:738
+#: ../lib/engine/components/opal/opal-account.cpp:335
+#: ../src/gui/assistant.cpp:728
 msgid "Consult the balance history"
 msgstr "Показати зміну балансу"
 
-#: ../src/endpoints/opal-account.cpp:336
+#: ../lib/engine/components/opal/opal-account.cpp:340
 msgid "Consult the call history"
 msgstr "Переглянути журнал викликів"
 
-#: ../src/endpoints/opal-account.cpp:351 ../src/endpoints/opal-bank.cpp:74
+#: ../lib/engine/components/opal/opal-account.cpp:355
+#: ../lib/engine/components/opal/opal-bank.cpp:95
 msgid "Edit account"
 msgstr "Правка облікового запису"
 
-#: ../src/endpoints/opal-account.cpp:357 ../src/endpoints/opal-bank.cpp:112
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:133
 msgid "Registrar:"
 msgstr "Реєстратор:"
 
-#: ../src/endpoints/opal-account.cpp:359 ../src/endpoints/opal-bank.cpp:102
+#: ../lib/engine/components/opal/opal-account.cpp:363
+#: ../lib/engine/components/opal/opal-bank.cpp:123
 msgid "Gatekeeper:"
 msgstr "Вузол gatekeeper:"
 
-#: ../src/endpoints/opal-account.cpp:360 ../src/endpoints/opal-bank.cpp:83
-#: ../src/endpoints/opal-bank.cpp:103 ../src/endpoints/opal-bank.cpp:113
+#: ../lib/engine/components/opal/opal-account.cpp:364
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:174
 msgid "User:"
 msgstr "Користувач:"
 
 #. Translators:
 #. * SIP knows two usernames: The name for the client ("User") and the name
 #. * for the authentication procedure ("Authentication User")
-#: ../src/endpoints/opal-account.cpp:365 ../src/endpoints/opal-bank.cpp:114
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:135
 msgid "Authentication User:"
 msgstr "Користувач:"
 
-#: ../src/endpoints/opal-account.cpp:366 ../src/endpoints/opal-bank.cpp:85
-#: ../src/endpoints/opal-bank.cpp:105 ../src/endpoints/opal-bank.cpp:115
+#: ../lib/engine/components/opal/opal-account.cpp:370
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:173
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/endpoints/opal-account.cpp:367 ../src/endpoints/opal-bank.cpp:106
-#: ../src/endpoints/opal-bank.cpp:116
+#: ../lib/engine/components/opal/opal-account.cpp:371
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
 msgid "Timeout:"
 msgstr "Затримка:"
 
-#: ../src/endpoints/opal-account.cpp:368 ../src/endpoints/opal-bank.cpp:119
+#: ../lib/engine/components/opal/opal-account.cpp:372
+#: ../lib/engine/components/opal/opal-bank.cpp:140
 msgid "Enable Account"
 msgstr "Увімкнути обліковий запис"
 
-#: ../src/endpoints/opal-account.cpp:401 ../src/endpoints/opal-bank.cpp:157
+#: ../lib/engine/components/opal/opal-account.cpp:405
+#: ../lib/engine/components/opal/opal-bank.cpp:179
 msgid "You did not supply a name for that account."
 msgstr "Не вказано назву облікового запису"
 
-#: ../src/endpoints/opal-account.cpp:403 ../src/endpoints/opal-bank.cpp:159
+#: ../lib/engine/components/opal/opal-account.cpp:407
+#: ../lib/engine/components/opal/opal-bank.cpp:181
 msgid "You did not supply a host to register to."
 msgstr "Не вказано назву сервера для реєстрації."
 
-#: ../src/endpoints/opal-account.cpp:405 ../src/endpoints/opal-bank.cpp:161
+#: ../lib/engine/components/opal/opal-account.cpp:409
+#: ../lib/engine/components/opal/opal-bank.cpp:183
 msgid "You did not supply a user name for that account."
 msgstr "Не вказано ім'я користувача у цьому обліковому записі."
 
-#: ../src/endpoints/opal-account.cpp:407 ../src/endpoints/opal-bank.cpp:163
+#: ../lib/engine/components/opal/opal-account.cpp:411
+#: ../lib/engine/components/opal/opal-bank.cpp:185
 msgid "The timeout should have a bigger value."
 msgstr "Значення затримки надто мале."
 
-#: ../src/endpoints/opal-bank.cpp:55
+#: ../lib/engine/components/opal/opal-bank.cpp:75
 msgid "_Add an Ekiga.net Account"
 msgstr "_Додати обліковий запис на ekiga.net"
 
-#: ../src/endpoints/opal-bank.cpp:57
+#: ../lib/engine/components/opal/opal-bank.cpp:77
 msgid "_Add an Ekiga Call Out Account"
 msgstr "Додати обліковий запис Ekiga _Call Out"
 
-#: ../src/endpoints/opal-bank.cpp:59
+#: ../lib/engine/components/opal/opal-bank.cpp:79
 msgid "_Add a SIP Account"
 msgstr "Додати обліковий запис _SIP"
 
-#: ../src/endpoints/opal-bank.cpp:61
+#: ../lib/engine/components/opal/opal-bank.cpp:81
 msgid "_Add an H.323 Account"
 msgstr "Додати обліковий запис _H.323"
 
-#: ../src/endpoints/opal-bank.cpp:75
+#: ../lib/engine/components/opal/opal-bank.cpp:96
 msgid "Please update the following fields."
 msgstr "Заповніть наступні поля."
 
-#: ../src/endpoints/opal-bank.cpp:80 ../src/gui/assistant.cpp:599
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
 msgid "Get an Ekiga.net SIP account"
 msgstr "Отримати обліковий запис SIP на сервері ekiga.net"
 
-#: ../src/endpoints/opal-bank.cpp:90 ../src/gui/assistant.cpp:714
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
 msgid "Get an Ekiga Call Out account"
 msgstr "Отримати обліковий запис Call Out для Ekiga"
 
-#: ../src/endpoints/opal-bank.cpp:94 ../src/gui/main.cpp:2662
-#: ../src/gui/main.cpp:2758
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2711
+#: ../src/gui/main.cpp:2806
 msgid "Account ID:"
 msgstr "Ідентифікатор:"
 
-#: ../src/endpoints/opal-bank.cpp:96
+#: ../lib/engine/components/opal/opal-bank.cpp:117
 msgid "PIN Code:"
 msgstr "PIN-код:"
 
-#: ../src/endpoints/opal-call.cpp:428
+#: ../lib/engine/components/opal/opal-call.cpp:405
 msgid "Local user cleared the call"
 msgstr "Локальний користувач перервав виклик"
 
-#: ../src/endpoints/opal-call.cpp:431 ../src/endpoints/opal-call.cpp:434
+#: ../lib/engine/components/opal/opal-call.cpp:408
+#: ../lib/engine/components/opal/opal-call.cpp:411
 msgid "Local user rejected the call"
 msgstr "Локальний користувач відмовився від виклику"
 
-#: ../src/endpoints/opal-call.cpp:437
+#: ../lib/engine/components/opal/opal-call.cpp:414
 msgid "Remote user cleared the call"
 msgstr "Віддалений користувач перервав виклик"
 
-#: ../src/endpoints/opal-call.cpp:440
+#: ../lib/engine/components/opal/opal-call.cpp:417
 msgid "Remote user rejected the call"
 msgstr "Віддалений користувач відмовився від виклику"
 
-#: ../src/endpoints/opal-call.cpp:443
+#: ../lib/engine/components/opal/opal-call.cpp:420
 msgid "Remote user has stopped calling"
 msgstr "Віддалений користувач припинив викликати"
 
-#: ../src/endpoints/opal-call.cpp:446
+#: ../lib/engine/components/opal/opal-call.cpp:423
 msgid "Abnormal call termination"
 msgstr "Ненормальне завершення виклику"
 
-#: ../src/endpoints/opal-call.cpp:449 ../src/gui/main.cpp:1473
+#: ../lib/engine/components/opal/opal-call.cpp:426 ../src/gui/main.cpp:1501
 msgid "Could not connect to remote host"
 msgstr "Не вдається підключитися до віддаленого вузла"
 
-#: ../src/endpoints/opal-call.cpp:452
+#: ../lib/engine/components/opal/opal-call.cpp:429
 msgid "The Gatekeeper cleared the call"
 msgstr "Вузол Gatekeeper перервав виклик"
 
-#: ../src/endpoints/opal-call.cpp:455
+#: ../lib/engine/components/opal/opal-call.cpp:432
 msgid "User not found"
 msgstr "Користувача не знайдено"
 
-#: ../src/endpoints/opal-call.cpp:458
+#: ../lib/engine/components/opal/opal-call.cpp:435
 msgid "Insufficient bandwidth"
 msgstr "Недостатня смуга пропускання"
 
-#: ../src/endpoints/opal-call.cpp:461
+#: ../lib/engine/components/opal/opal-call.cpp:438
 msgid "No common codec"
 msgstr "Немає спільного кодеку"
 
-#: ../src/endpoints/opal-call.cpp:464
+#: ../lib/engine/components/opal/opal-call.cpp:441
 msgid "Call forwarded"
 msgstr "Виклик переадресовано"
 
-#: ../src/endpoints/opal-call.cpp:467
+#: ../lib/engine/components/opal/opal-call.cpp:444
 msgid "Security check failed"
 msgstr "Помилка перевірки безпеки"
 
-#: ../src/endpoints/opal-call.cpp:470
+#: ../lib/engine/components/opal/opal-call.cpp:447
 msgid "Local user is busy"
 msgstr "Локальний користувач зайнятий"
 
-#: ../src/endpoints/opal-call.cpp:473 ../src/endpoints/opal-call.cpp:479
+#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:456
 msgid "Congested link to remote party"
 msgstr "Завантажений канал до віддаленого абонента"
 
-#: ../src/endpoints/opal-call.cpp:476
+#: ../lib/engine/components/opal/opal-call.cpp:453
 msgid "Remote user is busy"
 msgstr "Віддалений користувач зайнятий"
 
-#: ../src/endpoints/opal-call.cpp:482
+#: ../lib/engine/components/opal/opal-call.cpp:459
 msgid "Remote host is offline"
 msgstr "Віддалений вузол вимкнений"
 
-#: ../src/endpoints/opal-call.cpp:488
+#: ../lib/engine/components/opal/opal-call.cpp:465
 msgid "User is not available"
 msgstr "Користувач недоступний"
 
-#: ../src/endpoints/opal-call.cpp:500
+#: ../lib/engine/components/opal/opal-call.cpp:477
 msgid "Call completed"
 msgstr "Виклик завершено"
 
-#: ../src/endpoints/sip-endpoint.cpp:281 ../src/endpoints/sip-endpoint.cpp:283
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
+msgid ""
+"Ekiga did not manage to configure your network settings automatically. You "
+"can still use it, but you need to configure your network settings manually.\n"
+"\n"
+"Please see http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually "
+"for instructions"
+msgstr ""
+"Ekiga не вдається автоматично налаштувати параметри мережі. Потрібно "
+"налаштувати мережу вручну.\n"
+"\n"
+"Для отримання докладних інструкцій прочитайте сторінку http://wiki.ekiga.org/"
+"index.php/Enable_port_forwarding_manually"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:258
+#: ../lib/engine/components/opal/sip-endpoint.cpp:260
 msgid "Message"
 msgstr "Повідомлення"
 
-#: ../src/endpoints/sip-endpoint.cpp:687
+#: ../lib/engine/components/opal/sip-endpoint.cpp:632
 msgid "Bad request"
 msgstr "Неправильний запит"
 
-#: ../src/endpoints/sip-endpoint.cpp:691
+#: ../lib/engine/components/opal/sip-endpoint.cpp:636
 msgid "Payment required"
 msgstr "Потрібна оплата"
 
-#: ../src/endpoints/sip-endpoint.cpp:695
+#: ../lib/engine/components/opal/sip-endpoint.cpp:640
 msgid "Unauthorized"
 msgstr "Не дозволено"
 
-#: ../src/endpoints/sip-endpoint.cpp:699
+#: ../lib/engine/components/opal/sip-endpoint.cpp:644
 msgid "Forbidden"
 msgstr "Заборонено"
 
-#: ../src/endpoints/sip-endpoint.cpp:703
+#: ../lib/engine/components/opal/sip-endpoint.cpp:648
 msgid "Timeout"
 msgstr "Час вийшов"
 
-#: ../src/endpoints/sip-endpoint.cpp:707
+#: ../lib/engine/components/opal/sip-endpoint.cpp:652
 msgid "Conflict"
 msgstr "Конфлікт"
 
-#: ../src/endpoints/sip-endpoint.cpp:711
+#: ../lib/engine/components/opal/sip-endpoint.cpp:656
 msgid "Temporarily unavailable"
 msgstr "Тимчасова недоступно"
 
-#: ../src/endpoints/sip-endpoint.cpp:715
+#: ../lib/engine/components/opal/sip-endpoint.cpp:660
 msgid "Not acceptable"
 msgstr "Неприпустимо"
 
-#: ../src/endpoints/sip-endpoint.cpp:719
+#: ../lib/engine/components/opal/sip-endpoint.cpp:664
 msgid "Illegal status code"
 msgstr "Некоректний код статусу"
 
-#: ../src/endpoints/sip-endpoint.cpp:723
+#: ../lib/engine/components/opal/sip-endpoint.cpp:668
 msgid "Multiple choices"
 msgstr "Можливі варіанти"
 
-#: ../src/endpoints/sip-endpoint.cpp:727
+#: ../lib/engine/components/opal/sip-endpoint.cpp:672
 msgid "Moved permanently"
 msgstr "Переміщено"
 
-#: ../src/endpoints/sip-endpoint.cpp:731
+#: ../lib/engine/components/opal/sip-endpoint.cpp:676
 msgid "Moved temporarily"
 msgstr "Тимчасово переміщено"
 
-#: ../src/endpoints/sip-endpoint.cpp:735
+#: ../lib/engine/components/opal/sip-endpoint.cpp:680
 msgid "Use proxy"
 msgstr "Використовувати проксі"
 
-#: ../src/endpoints/sip-endpoint.cpp:739
+#: ../lib/engine/components/opal/sip-endpoint.cpp:684
 msgid "Alternative service"
 msgstr "Альтернативна служба"
 
-#: ../src/endpoints/sip-endpoint.cpp:743
+#: ../lib/engine/components/opal/sip-endpoint.cpp:688
 msgid "Not found"
 msgstr "Не знайдено"
 
-#: ../src/endpoints/sip-endpoint.cpp:747
+#: ../lib/engine/components/opal/sip-endpoint.cpp:692
 msgid "Method not allowed"
 msgstr "Метод заборонено"
 
-#: ../src/endpoints/sip-endpoint.cpp:751
+#: ../lib/engine/components/opal/sip-endpoint.cpp:696
 msgid "Proxy authentication required"
 msgstr "Потрібна автентифікація проксі"
 
-#: ../src/endpoints/sip-endpoint.cpp:755
+#: ../lib/engine/components/opal/sip-endpoint.cpp:700
 msgid "Length required"
 msgstr "Потрібна довжина"
 
-#: ../src/endpoints/sip-endpoint.cpp:759
+#: ../lib/engine/components/opal/sip-endpoint.cpp:704
 msgid "Request entity too big"
 msgstr "Запит надто великий"
 
-#: ../src/endpoints/sip-endpoint.cpp:763
+#: ../lib/engine/components/opal/sip-endpoint.cpp:708
 msgid "Request URI too long"
 msgstr "URI запиту надто довга"
 
-#: ../src/endpoints/sip-endpoint.cpp:767
+#: ../lib/engine/components/opal/sip-endpoint.cpp:712
 msgid "Unsupported media type"
 msgstr "Спосіб передачі не підтримується"
 
-#: ../src/endpoints/sip-endpoint.cpp:771
+#: ../lib/engine/components/opal/sip-endpoint.cpp:716
 msgid "Unsupported URI scheme"
 msgstr "Схема URI не підтримується"
 
 #. Translators : The extension we are trying to register does not exist
-#: ../src/endpoints/sip-endpoint.cpp:776
+#: ../lib/engine/components/opal/sip-endpoint.cpp:721
 msgid "Bad extension"
 msgstr "Розширення не підтримується"
 
-#: ../src/endpoints/sip-endpoint.cpp:780
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
 msgid "Extension required"
 msgstr "Вимагається доповнення URI"
 
-#: ../src/endpoints/sip-endpoint.cpp:784
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
 msgid "Interval too brief"
 msgstr "Інтервал надто малий"
 
-#: ../src/endpoints/sip-endpoint.cpp:788
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
 msgid "Loop detected"
 msgstr "Виявлено цикл"
 
-#: ../src/endpoints/sip-endpoint.cpp:792
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
 msgid "Too many hops"
 msgstr "Надто багато вузлів комутації"
 
-#: ../src/endpoints/sip-endpoint.cpp:796
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
 msgid "Address incomplete"
 msgstr "Адреса неточна"
 
-#: ../src/endpoints/sip-endpoint.cpp:800
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
 msgid "Ambiguous"
 msgstr "Надлишковий"
 
-#: ../src/endpoints/sip-endpoint.cpp:804
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
 msgid "Busy Here"
 msgstr "Зайнято"
 
-#: ../src/endpoints/sip-endpoint.cpp:808
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
 msgid "Request terminated"
 msgstr "Запит відхилено"
 
-#: ../src/endpoints/sip-endpoint.cpp:812
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
 msgid "Not acceptable here"
 msgstr "Неприпустимо"
 
-#: ../src/endpoints/sip-endpoint.cpp:816
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
 msgid "Bad event"
 msgstr "Неправильна подія"
 
-#: ../src/endpoints/sip-endpoint.cpp:820
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
 msgid "Request pending"
 msgstr "Запит оброблено"
 
-#: ../src/endpoints/sip-endpoint.cpp:824
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
 msgid "Undecipherable"
 msgstr "Не піддається аналізу"
 
-#: ../src/endpoints/sip-endpoint.cpp:828
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
 msgid "Internal server error"
 msgstr "Внутрішня помилка сервера"
 
-#: ../src/endpoints/sip-endpoint.cpp:832
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
 msgid "Not implemented"
 msgstr "Не підтримується"
 
-#: ../src/endpoints/sip-endpoint.cpp:836
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
 msgid "Bad gateway"
 msgstr "Некоректний шлюз"
 
-#: ../src/endpoints/sip-endpoint.cpp:840
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
 msgid "Service unavailable"
 msgstr "Служба недоступна"
 
-#: ../src/endpoints/sip-endpoint.cpp:844
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
 msgid "Server timeout"
 msgstr "Перевищено час очікування"
 
-#: ../src/endpoints/sip-endpoint.cpp:848
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
 msgid "SIP version not supported"
 msgstr "Версія SIP не підтримується"
 
-#: ../src/endpoints/sip-endpoint.cpp:852
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
 msgid "Message too large"
 msgstr "Повідомлення надто велике"
 
-#: ../src/endpoints/sip-endpoint.cpp:856
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
 msgid "Busy everywhere"
 msgstr "Всюди зайнято"
 
-#: ../src/endpoints/sip-endpoint.cpp:860
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
 msgid "Decline"
 msgstr "Відхилено"
 
-#: ../src/endpoints/sip-endpoint.cpp:864
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
 msgid "Does not exist anymore"
 msgstr "Більше не існує"
 
-#: ../src/endpoints/sip-endpoint.cpp:868
+#: ../lib/engine/components/opal/sip-endpoint.cpp:813
 msgid "Globally not acceptable"
 msgstr "Неприпустимо всюди"
 
-#: ../src/endpoints/sip-endpoint.cpp:996
+#: ../lib/engine/components/opal/sip-endpoint.cpp:950
 msgid "Could not send message"
 msgstr "Не вдається надіслати повідомлення"
 
-#: ../src/gui/accounts.cpp:234
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1045
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Вхідний виклик від %s"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1047
+#, c-format
+msgid "Incoming call"
+msgstr "Вхідний виклик"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1053
+#, c-format
+msgid "In a call with %s"
+msgstr "Розмова з %s"
+
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1055
+#, c-format
+msgid "In a call"
+msgstr "Розмова"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:102
+msgid "New resource list"
+msgstr "Новий список адресатів"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:166
+msgid "Add new resource-list"
+msgstr "Створити новий список"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:167
+msgid ""
+"Please fill in this form to add a new contact list to ekiga's remote roster"
+msgstr "Заповніть форму, щоб створити новий контакт на сервері ekiga"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:171
+msgid "Writable:"
+msgstr "Підтримує запис:"
+
+#: ../lib/engine/components/resource-list/rl-cluster.cpp:172
+msgid "Username:"
+msgstr "Ім'я користувача:"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
+#: ../lib/engine/components/resource-list/rl-heap.cpp:178
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
+msgid "Unnamed"
+msgstr "Невідомий"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:200
+msgid "_Add a new contact"
+msgstr "_Новий контакт"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:202
+msgid "_Refresh contact list"
+msgstr "_Оновити список контактів"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:204
+msgid "Contact list _properties"
+msgstr "Параметри списку _контактів"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
+msgid "Edit contact list properties"
+msgstr "Редагування списку контактів"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
+msgid "Please edit the following fields (no identifier means global)"
+msgstr "Заповніть наступні поля (за відсутності ідентифікатора змінюється все)"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+msgid "Contact list's name"
+msgstr "Список контактів"
+
+#. "Document" used as a name -- uri point to the root of a document tree
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
+msgid "Document root"
+msgstr "Корінь адресної книги"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+msgid "Identifier"
+msgstr "Ідентифікатор"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
+msgid "Writable"
+msgstr "Змінюваний"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+msgid "Server username"
+msgstr "Ім'я користувача"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+msgid "Server password"
+msgstr "Пароль"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
+msgid "Add a remote contact"
+msgstr "Додати зовнішній контакт"
+
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
+msgid "Please fill in this form to create a new contact on a remote server"
+msgstr "Заповніть форму, щоб створити новий контакт на сервері"
+
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+msgid "Edit remote contact"
+msgstr "Редагування зовнішнього контакту"
+
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
+msgid ""
+"Please fill in this form to change an existing contact on a remote server"
+msgstr "Заповніть цю форму для зміни існуючого контакту на сервері"
+
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
+msgid "Invalid server data"
+msgstr "Дані сервера некоректні"
+
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
+msgid "Click to fetch"
+msgstr "Натисніть, щоб завантажити"
+
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
+msgid "Distant contact"
+msgstr "Зовнішній контакт"
+
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
+#, c-format
+msgid "%s / List #%d"
+msgstr "%s / Список №%d"
+
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
+#, c-format
+msgid "List #%d"
+msgstr "Список №%d"
+
+#: ../lib/engine/gui/gtk-core/form-dialog-gtk.cpp:660
+msgid "Advanced"
+msgstr "Додатково"
+
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:659
+msgid "Address Book"
+msgstr "Адресна книга"
+
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
+#: ../src/gui/main.cpp:3132
+msgid "Address _Book"
+msgstr "_Адресна книга"
+
+#. This will add static and dynamic actions
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:684
+msgid "_Action"
+msgstr "Д_ія"
+
+#: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:729
+msgid "Category"
+msgstr "Категорія"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
+#: ../src/gui/assistant.cpp:1368
+msgid "Full Name"
+msgstr "Повне ім'я"
+
+#: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:601
+msgid "_Search Filter:"
+msgstr "Фільтр по_шуку:"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:247
+msgid "says:"
+msgstr "сказав(ла):"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:370
+msgid "Open link in browser"
+msgstr "Відкрити посилання у веб-оглядачі"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:376
+msgid "Copy link"
+msgstr "Копіювати адресу посилання"
+
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
+msgid "_Smile..."
+msgstr "_Емоції..."
+
+#. we can't do much here since we get the Chat as reference...
+#: ../lib/engine/gui/gtk-frontend/chat-window.cpp:432
+msgid "Chat Window"
+msgstr "Вікно розмови"
+
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:989
+#: ../lib/engine/gui/gtk-frontend/roster-view-gtk.cpp:1024
+msgid "Unsorted"
+msgstr "Без сортування"
+
+#: ../lib/gui/codecsbox.cpp:478
+msgid "Move selected codec priority upwards"
+msgstr "Перемістити виділений кодек у більш пріоритетні"
+
+#: ../lib/gui/codecsbox.cpp:488
+msgid "Move selected codec priority downwards"
+msgstr "Перемістити виділений кодек у менш пріоритетні"
+
+#: ../lib/gui/gmdialog.c:462
+msgid "Do not show this dialog again"
+msgstr "Не показувати це вікно знову"
+
+#: ../src/gui/accounts.cpp:230
 msgid "Registered"
 msgstr "Зареєстрований"
 
-#: ../src/gui/accounts.cpp:238
+#: ../src/gui/accounts.cpp:234
 msgid "Unregistered"
 msgstr "Відключений"
 
-#: ../src/gui/accounts.cpp:242
+#: ../src/gui/accounts.cpp:238
 msgid "Could not unregister"
 msgstr "Не вдається скасувати реєстрацію"
 
-#: ../src/gui/accounts.cpp:248
+#: ../src/gui/accounts.cpp:244
 msgid "Could not register"
 msgstr "Не вдається зареєструватися"
 
-#: ../src/gui/accounts.cpp:254
+#: ../src/gui/accounts.cpp:250
 msgid "Processing..."
 msgstr "Обробка..."
 
-#: ../src/gui/accounts.cpp:627
+#: ../src/gui/accounts.cpp:636
 msgid "Account Name"
 msgstr "Обліковий запис"
 
-#: ../src/gui/accounts.cpp:628
+#: ../src/gui/accounts.cpp:637
 msgid "Voice Mails"
 msgstr "Голосова пошта"
 
-#: ../src/gui/accounts.cpp:629
+#: ../src/gui/accounts.cpp:638
 msgid "Status"
 msgstr "Стан"
 
-#: ../src/gui/accounts.cpp:640 ../src/gui/accounts.cpp:683
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
 msgid "Accounts"
 msgstr "Облікові записи"
 
-#: ../src/gui/accounts.cpp:654 ../src/gui/main.cpp:3145
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3193
 msgid "_Accounts"
 msgstr "_Облікові записи"
 
-#: ../src/gui/accounts.cpp:658 ../src/gui/main.cpp:3228
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3276
 msgid "_Help"
 msgstr "_Довідка"
 
@@ -1779,11 +1892,11 @@
 #. * description in the list of configured accounts, it shows if an account
 #. * is activated or not (a status the user can choose).
 #.
-#: ../src/gui/accounts.cpp:691 ../src/gui/preferences.cpp:497
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
 msgid "A"
 msgstr "А"
 
-#: ../src/gui/assistant.cpp:317
+#: ../src/gui/assistant.cpp:321
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1797,20 +1910,20 @@
 "Змінити вказані параметри ви зможете потім за допомогою пункту \"Параметри\" "
 "в меню \"Правка\"."
 
-#: ../src/gui/assistant.cpp:325
-msgid "Welcome in Ekiga"
+#: ../src/gui/assistant.cpp:329
+msgid "Welcome to Ekiga"
 msgstr "Ekiga"
 
-#: ../src/gui/assistant.cpp:359 ../src/gui/preferences.cpp:373
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "Особиста інформація"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:362
+#: ../src/gui/assistant.cpp:356
 msgid "Please enter your first name and your surname:"
 msgstr "Вкажіть ваше ім'я та прізвище:"
 
-#: ../src/gui/assistant.cpp:371
+#: ../src/gui/assistant.cpp:365
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
@@ -1818,19 +1931,19 @@
 "Ваші ім'я та прізвище будуть використовуватись при підключенні до інших "
 "програм для VoIP та відеоконференцій."
 
-#: ../src/gui/assistant.cpp:562
+#: ../src/gui/assistant.cpp:559
 msgid "Ekiga.net Account"
 msgstr "Обліковий запис ekiga.net"
 
-#: ../src/gui/assistant.cpp:564
+#: ../src/gui/assistant.cpp:561
 msgid "Please enter your username:"
 msgstr "Введіть ім'я користувача:"
 
-#: ../src/gui/assistant.cpp:572
+#: ../src/gui/assistant.cpp:569
 msgid "Please enter your password:"
 msgstr "Введіть пароль:"
 
-#: ../src/gui/assistant.cpp:582
+#: ../src/gui/assistant.cpp:579
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1849,23 +1962,23 @@
 "Ви можете пропустити цей крок, якщо ви використовуєте альтернативну службу "
 "SIP, або якщо ви бажаєте вказати параметри підключення пізніше."
 
-#: ../src/gui/assistant.cpp:609
+#: ../src/gui/assistant.cpp:606
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "Я не хочу підписуватись на безкоштовний сервіс ekiga.net"
 
-#: ../src/gui/assistant.cpp:679
+#: ../src/gui/assistant.cpp:669
 msgid "Ekiga Call Out Account"
 msgstr "Обліковий запис Ekiga Call Out"
 
-#: ../src/gui/assistant.cpp:681
+#: ../src/gui/assistant.cpp:671
 msgid "Please enter your account ID:"
 msgstr "Введіть ідентифікатор:"
 
-#: ../src/gui/assistant.cpp:689
+#: ../src/gui/assistant.cpp:679
 msgid "Please enter your PIN code:"
 msgstr "Введіть PIN-код:"
 
-#: ../src/gui/assistant.cpp:700
+#: ../src/gui/assistant.cpp:690
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1886,48 +1999,48 @@
 "Переконайтесь, що ви використовуєте наведене нижче посилання для отримання "
 "облікового запису, у іншому випадку послуга не буде працювати.\n"
 
-#: ../src/gui/assistant.cpp:750
+#: ../src/gui/assistant.cpp:740
 msgid "Consult the calls history"
 msgstr "Переглянути журнал викликів"
 
-#: ../src/gui/assistant.cpp:760
+#: ../src/gui/assistant.cpp:750
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr "Я не хочу підписуватись на сервіс ekiga.net"
 
-#: ../src/gui/assistant.cpp:832 ../src/gui/assistant.cpp:1386
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
 msgid "Connection Type"
 msgstr "Тип з'єднання"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:835
+#: ../src/gui/assistant.cpp:819
 msgid "Please choose your connection type:"
 msgstr "Виберіть тип з'єднання:"
 
-#: ../src/gui/assistant.cpp:852
+#: ../src/gui/assistant.cpp:836
 msgid "56k Modem"
 msgstr "Модем 56К"
 
-#: ../src/gui/assistant.cpp:857
+#: ../src/gui/assistant.cpp:841
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:862
+#: ../src/gui/assistant.cpp:846
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "Кабель/DSL (128 Кбіт/c)"
 
-#: ../src/gui/assistant.cpp:867
+#: ../src/gui/assistant.cpp:851
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "Кабель/DSL (512 Кбіт/с)"
 
-#: ../src/gui/assistant.cpp:872
+#: ../src/gui/assistant.cpp:856
 msgid "LAN"
 msgstr "Локальна мережа"
 
-#: ../src/gui/assistant.cpp:877
+#: ../src/gui/assistant.cpp:861
 msgid "Keep current settings"
 msgstr "Зберегти поточні параметри"
 
-#: ../src/gui/assistant.cpp:882
+#: ../src/gui/assistant.cpp:866
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -1937,16 +2050,16 @@
 "використовувати при викликах. Пізніше ви зможете змінити ці параметри в меню "
 "параметрів."
 
-#: ../src/gui/assistant.cpp:976 ../src/gui/main.cpp:2974
-#: ../src/gui/main.cpp:2978 ../src/gui/preferences.cpp:690
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3022
+#: ../src/gui/main.cpp:3026 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "Звукові пристрої"
 
-#: ../src/gui/assistant.cpp:978
+#: ../src/gui/assistant.cpp:962
 msgid "Please choose the audio ringing device:"
 msgstr "Виберіть пристрій для дзвінка:"
 
-#: ../src/gui/assistant.cpp:998
+#: ../src/gui/assistant.cpp:982
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
@@ -1954,11 +2067,11 @@
 "Пристрій дзвінка використовується для виводу сповіщення про вхідний виклик."
 
 #. ---
-#: ../src/gui/assistant.cpp:1009
+#: ../src/gui/assistant.cpp:993
 msgid "Please choose the audio output device:"
 msgstr "Виберіть пристрій виводу звуку:"
 
-#: ../src/gui/assistant.cpp:1029
+#: ../src/gui/assistant.cpp:1013
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
@@ -1966,39 +2079,39 @@
 "Пристрій виводу звуку використовується для виводу звуку під час розмови."
 
 #. ---
-#: ../src/gui/assistant.cpp:1040
+#: ../src/gui/assistant.cpp:1024
 msgid "Please choose the audio input device:"
 msgstr "Виберіть пристрій вводу звуку:"
 
-#: ../src/gui/assistant.cpp:1060
+#: ../src/gui/assistant.cpp:1044
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
 msgstr ""
 "Пристрій вводу звуку використовується для запису голосу під час розмови."
 
-#: ../src/gui/assistant.cpp:1154
+#: ../src/gui/assistant.cpp:1146
 msgid "Please choose your video input device:"
 msgstr "Виберіть пристрій вводу відео:"
 
-#: ../src/gui/assistant.cpp:1174
+#: ../src/gui/assistant.cpp:1166
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
 msgstr ""
 "Пристрій вводу відео використовується для вводу зображення під час дзвінка."
 
-#: ../src/gui/assistant.cpp:1238 ../src/gui/assistant.cpp:1262
-#: ../src/gui/assistant.cpp:1286 ../src/gui/preferences.cpp:735
-#: ../src/gui/preferences.cpp:760 ../src/gui/preferences.cpp:784
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
+#: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "Пристрій не знайдено."
 
-#: ../src/gui/assistant.cpp:1317
+#: ../src/gui/assistant.cpp:1310
 msgid "Configuration Complete"
 msgstr "Налаштовування завершене"
 
-#: ../src/gui/assistant.cpp:1319
+#: ../src/gui/assistant.cpp:1312
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
@@ -2006,52 +2119,52 @@
 "Налаштовування Ekiga завершена. Всі параметри можна змінити у діалозі "
 "налаштовування Ekiga."
 
-#: ../src/gui/assistant.cpp:1326
+#: ../src/gui/assistant.cpp:1319
 msgid "Configuration summary:"
 msgstr "Зведення параметрів:"
 
-#: ../src/gui/assistant.cpp:1396
+#: ../src/gui/assistant.cpp:1389
 msgid "Audio Ringing Device"
 msgstr "Пристрій дзвінка"
 
-#: ../src/gui/assistant.cpp:1405
+#: ../src/gui/assistant.cpp:1398
 msgid "Audio Output Device"
 msgstr "Пристрій виводу звуку"
 
-#: ../src/gui/assistant.cpp:1414
+#: ../src/gui/assistant.cpp:1407
 msgid "Audio Input Device"
 msgstr "Пристрій вводу звуку"
 
-#: ../src/gui/assistant.cpp:1423
+#: ../src/gui/assistant.cpp:1416
 msgid "Video Input Device"
 msgstr "Пристрій вводу відео"
 
-#: ../src/gui/assistant.cpp:1436
+#: ../src/gui/assistant.cpp:1429
 msgid "SIP URI"
 msgstr "SIP URI"
 
-#: ../src/gui/assistant.cpp:1448
+#: ../src/gui/assistant.cpp:1441
 msgid "Ekiga Call Out"
 msgstr "Ekiga Call Out"
 
-#: ../src/gui/assistant.cpp:1490
+#: ../src/gui/assistant.cpp:1485
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr "Помічник налаштовування (сторінка %d з %d)"
 
-#: ../src/gui/callbacks.cpp:130
+#: ../src/gui/callbacks.cpp:131
 msgid "Contributors:"
 msgstr "Розробники:"
 
-#: ../src/gui/callbacks.cpp:141
+#: ../src/gui/callbacks.cpp:143
 msgid "Artwork:"
 msgstr "Дизайн:"
 
-#: ../src/gui/callbacks.cpp:149
+#: ../src/gui/callbacks.cpp:151
 msgid "See AUTHORS file for full credits"
 msgstr "Повний список авторів у файлі AUTHORS"
 
-#: ../src/gui/callbacks.cpp:165
+#: ../src/gui/callbacks.cpp:167
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -2062,7 +2175,7 @@
 "викладених у GNU General Public License що видана Free Software Foundation; "
 "або версії 2 ліцензії, або (на ваше розсуд довільної старшої версії."
 
-#: ../src/gui/callbacks.cpp:169
+#: ../src/gui/callbacks.cpp:171
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -2071,14 +2184,14 @@
 "License along with this program; if not, write to the Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Програма поширюється зі сподіванням, що буде корисною, але "
-"БЕЗ ЖОДНИХ ГАРАНТІЙ; не гарантується навіть ПРИДАТНІСТЬ та ВІДПОВІДНІСТЬ БУДЬ-ЯКИМ"
-"ВИМОГАМ. Для отримання додаткової інформації ознайомтесь з GNU "
-"General Public License. Ви мали б отримати з програмою копію GNU General Public License. Якщо"
-"цього не сталося, напишіть до Free Software Foundation, Inc., 51 "
-"Franklin St, Fifth Floor, Boston, MA 02111-1307, USA."
+"Програма поширюється зі сподіванням, що буде корисною, але БЕЗ ЖОДНИХ "
+"ГАРАНТІЙ; не гарантується навіть ПРИДАТНІСТЬ та ВІДПОВІДНІСТЬ БУДЬ-"
+"ЯКИМВИМОГАМ. Для отримання додаткової інформації ознайомтесь з GNU General "
+"Public License. Ви мали б отримати з програмою копію GNU General Public "
+"License. Якщоцього не сталося, напишіть до Free Software Foundation, Inc., "
+"51 Franklin St, Fifth Floor, Boston, MA 02111-1307, USA."
 
-#: ../src/gui/callbacks.cpp:176
+#: ../src/gui/callbacks.cpp:178
 msgid ""
 "Ekiga is licensed under the GPL license and as a special exception, you have "
 "permission to link or otherwise combine this program with the programs OPAL, "
@@ -2087,21 +2200,21 @@
 "long as you do follow the requirements of the GNU GPL for all the rest of "
 "the software thus combined."
 msgstr ""
-"Ekiga поширюється під ліцензією GPL зі спеціальними винятками, що полягають у тому, "
-"що дозволено компонувати чи іншим чином використовувати цю програму з бібліотеками "
-"OPAL, OpenH323 та PWLIB та поширювати комбінацію без урахування вимог ліцензії "
-"GPL по відношенню до бібліотек OPAL, OpenH323 та PWLIB, якщо "
-"інші вимоги ліцензії GPL виконуються."
+"Ekiga поширюється під ліцензією GPL зі спеціальними винятками, що полягають "
+"у тому, що дозволено компонувати чи іншим чином використовувати цю програму "
+"з бібліотеками OPAL, OpenH323 та PWLIB та поширювати комбінацію без "
+"урахування вимог ліцензії GPL по відношенню до бібліотек OPAL, OpenH323 та "
+"PWLIB, якщо інші вимоги ліцензії GPL виконуються."
 
 #. Translators: Please write translator credits here, and
 #. * separate names with \n
-#: ../src/gui/callbacks.cpp:188
+#: ../src/gui/callbacks.cpp:190
 msgid "translator-credits"
 msgstr ""
 "Юрій Сирота <yuriy@beer.com>\n"
 "Максим Дзюманенко <dziumanenko@gmail.com>"
 
-#: ../src/gui/callbacks.cpp:193
+#: ../src/gui/callbacks.cpp:195
 msgid ""
 "Ekiga is full-featured SIP and H.323 compatible VoIP, IP-Telephony and "
 "Videoconferencing application that allows you to make audio and video calls "
@@ -2111,134 +2224,141 @@
 "та IP-телефонії, що дозволяє з'єднуватись з іншими користувачами, які "
 "використовують програмне чи апаратне забезпечення SIP чи H.323."
 
-#: ../src/gui/dialpad.cpp:54
+#: ../src/gui/callbacks.cpp:269
+msgid "Help display is not supported by your GTK+ version"
+msgstr "Версія GTK+ не має функцій показу довідки програми"
+
+#: ../src/gui/callbacks.cpp:277
+msgid "Unable to open help file."
+msgstr "Не вдається відкрити файл довідки."
+
+#: ../src/gui/dialpad.cpp:55
 msgid "abc"
 msgstr "abc"
 
-#: ../src/gui/dialpad.cpp:55
+#: ../src/gui/dialpad.cpp:56
 msgid "def"
 msgstr "def"
 
-#: ../src/gui/dialpad.cpp:56
+#: ../src/gui/dialpad.cpp:57
 msgid "ghi"
 msgstr "ghi"
 
-#: ../src/gui/dialpad.cpp:57
+#: ../src/gui/dialpad.cpp:58
 msgid "jkl"
 msgstr "jkl"
 
-#: ../src/gui/dialpad.cpp:58
+#: ../src/gui/dialpad.cpp:59
 msgid "mno"
 msgstr "mno"
 
-#: ../src/gui/dialpad.cpp:59
+#: ../src/gui/dialpad.cpp:60
 msgid "pqrs"
 msgstr "pqrs"
 
-#: ../src/gui/dialpad.cpp:60
+#: ../src/gui/dialpad.cpp:61
 msgid "tuv"
 msgstr "tuv"
 
-#: ../src/gui/dialpad.cpp:61
+#: ../src/gui/dialpad.cpp:62
 msgid "wxyz"
 msgstr "wxyz"
 
 #. Translators: Is displayed once an account "%s" is registered.
-#: ../src/gui/main.cpp:514
+#: ../src/gui/main.cpp:526
 #, c-format
 msgid "Registered %s"
 msgstr "%s зареєстрований"
 
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:520
+#: ../src/gui/main.cpp:533
 #, c-format
 msgid "Unregistered %s"
 msgstr "Реєстрацію %s скасовано"
 
-#: ../src/gui/main.cpp:525
+#: ../src/gui/main.cpp:538
 #, c-format
 msgid "Could not unregister %s"
 msgstr "Не вдається скасувати реєстрацію %s"
 
-#: ../src/gui/main.cpp:529
+#: ../src/gui/main.cpp:542
 #, c-format
 msgid "Could not register %s"
 msgstr "Не вдається зареєструвати %s"
 
-#: ../src/gui/main.cpp:598
+#: ../src/gui/main.cpp:612
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr "Звук:%.1f/%.1f  Відео:%.1f/%.1f  Кадри:%d/%d"
 
-#: ../src/gui/main.cpp:644
+#: ../src/gui/main.cpp:658
 #, c-format
 msgid "Connected with %s"
 msgstr "З'єднано з %s"
 
-#: ../src/gui/main.cpp:681 ../src/gui/main.cpp:3472
+#: ../src/gui/main.cpp:699 ../src/gui/main.cpp:3522
 msgid "Standby"
 msgstr "Очікування"
 
-#: ../src/gui/main.cpp:740
+#: ../src/gui/main.cpp:760
 msgid "Call on hold"
 msgstr "Виклик утримується"
 
-#: ../src/gui/main.cpp:751
+#: ../src/gui/main.cpp:771
 msgid "Call retrieved"
 msgstr "Виклик прийнято"
 
-#: ../src/gui/main.cpp:767
+#: ../src/gui/main.cpp:787
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропущений виклик від %s"
 
-#: ../src/gui/main.cpp:902 ../src/gui/misc.cpp:94
+#: ../src/gui/main.cpp:924
 msgid "Error"
 msgstr "Помилка"
 
-#: ../src/gui/main.cpp:972
-#, c-format
+#: ../src/gui/main.cpp:989
 msgid "Error while initializing video output"
 msgstr "Помилка під час ініціалізації виводу відео"
 
-#: ../src/gui/main.cpp:974
+#: ../src/gui/main.cpp:990
 msgid "No video will be displayed during this call->"
 msgstr "Під час цього дзвінка відео не буде виводитись->"
 
-#: ../src/gui/main.cpp:982
+#: ../src/gui/main.cpp:1000
 msgid ""
-"There was an error opening initializing the video output. Please verify that "
-"no other applicating is using the accelerated video output."
+"There was an error opening or initializing the video output. Please verify "
+"that no other application is using the accelerated video output."
 msgstr ""
-"Помилка при відкриванні виводу відео. Перевірте, що інші програми не "
-"використовуються вивід відео з апаратним прискоренням."
+"Помилка при ініціалізації системи виводу відео. Перевірте, що інші програми "
+"не використовуються вивід відео з апаратним прискоренням."
 
-#: ../src/gui/main.cpp:984
+#: ../src/gui/main.cpp:1002
 msgid ""
-"There was an error opening initializing the video output. Please verify that "
-"you are using a color depth of 24 or 32 bits per pixel."
+"There was an error opening or initializing the video output. Please verify "
+"that you are using a color depth of 24 or 32 bits per pixel."
 msgstr ""
-"Помилка при відкриванні виводу відео. Перевірте, що встановлено глибину "
-"кольору 24 або 32 біт на точку."
+"Помилка при ініціалізації системи при відкриванні виводу відео. Перевірте, "
+"що встановлено глибину кольору 24 або 32 біт на точку."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1099
+#: ../src/gui/main.cpp:1115
 #, c-format
 msgid "Added video input device %s"
 msgstr "Додано пристрій вводу відео %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1111
+#: ../src/gui/main.cpp:1127
 #, c-format
 msgid "Removed video input device %s"
 msgstr "Видалено пристрій вводу відео %s"
 
-#: ../src/gui/main.cpp:1128
+#: ../src/gui/main.cpp:1144
 #, c-format
 msgid "Error while accessing video device %s"
 msgstr "Не вдається отримати доступ до пристрою захоплення відео %s"
 
-#: ../src/gui/main.cpp:1131
+#: ../src/gui/main.cpp:1147
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
@@ -2248,7 +2368,7 @@
 "можете передавати вибране зображення чи емблему, вибравши у якості пристрою"
 "\"Picture\" як модуль відео, та \"Moving logo\" або \"Static picture\"."
 
-#: ../src/gui/main.cpp:1135
+#: ../src/gui/main.cpp:1151
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
@@ -2259,15 +2379,15 @@
 "від'єднаний, його повторне підключення може допомогти вирішити проблему. У "
 "іншому разі перевірте права доступу до пристрою та роботу драйвера."
 
-#: ../src/gui/main.cpp:1139
+#: ../src/gui/main.cpp:1155
 msgid "Your video driver doesn't support the requested video format."
 msgstr "Ваш відеодрайвер не підтримує потрібний формат відео."
 
-#: ../src/gui/main.cpp:1143
+#: ../src/gui/main.cpp:1159
 msgid "Could not open the chosen channel."
 msgstr "Не вдається відкрити вказаний канал."
 
-#: ../src/gui/main.cpp:1147
+#: ../src/gui/main.cpp:1163
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2278,42 +2398,42 @@
 "Ekiga.\n"
 "Подивіться в документації драйвера ядра, яка саме палітра підтримується."
 
-#: ../src/gui/main.cpp:1151
+#: ../src/gui/main.cpp:1167
 msgid "Error while setting the frame rate."
 msgstr "Помилка встановлення частоти кадрів."
 
-#: ../src/gui/main.cpp:1155
+#: ../src/gui/main.cpp:1171
 msgid "Error while setting the frame size."
 msgstr "Помилка встановлення розміру кадру."
 
-#: ../src/gui/main.cpp:1160 ../src/gui/main.cpp:1262 ../src/gui/main.cpp:1377
+#: ../src/gui/main.cpp:1176 ../src/gui/main.cpp:1278 ../src/gui/main.cpp:1393
 msgid "Unknown error."
 msgstr "Невідома помилка."
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1210
+#: ../src/gui/main.cpp:1226
 #, c-format
 msgid "Added audio input device %s"
 msgstr "Додано пристрій вводу звуку %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1227
+#: ../src/gui/main.cpp:1243
 #, c-format
 msgid "Removed audio input device %s"
 msgstr "Видалено пристрій вводу звуку %s"
 
-#: ../src/gui/main.cpp:1244
+#: ../src/gui/main.cpp:1260
 #, c-format
 msgid "Error while opening audio input device %s"
 msgstr "Не вдається відкрити пристрій вводу звуку %s"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
-#: ../src/gui/main.cpp:1249
+#: ../src/gui/main.cpp:1265
 msgid "Only silence will be transmitted."
 msgstr "Співрозмовники нічого не почують."
 
-#: ../src/gui/main.cpp:1253
+#: ../src/gui/main.cpp:1269
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2325,7 +2445,7 @@
 "проблему. У іншому разі перевірте параметри звуку, права доступу до пристрою "
 "та перевірте, що інші програми не займають пристрій."
 
-#: ../src/gui/main.cpp:1257
+#: ../src/gui/main.cpp:1273
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2336,26 +2456,26 @@
 "від'єднаний, його повторне підключення може допомогти вирішити проблему. У "
 "іншому разі перевірте параметри звуку."
 
-#: ../src/gui/main.cpp:1324
+#: ../src/gui/main.cpp:1340
 #, c-format
 msgid "Added audio output device %s"
 msgstr "Додано пристрій виводу звуку %s"
 
-#: ../src/gui/main.cpp:1340
+#: ../src/gui/main.cpp:1356
 #, c-format
 msgid "Removed audio output device %s"
 msgstr "Видалено пристрій виводу звуку %s"
 
-#: ../src/gui/main.cpp:1361
+#: ../src/gui/main.cpp:1377
 #, c-format
 msgid "Error while opening audio output device %s"
 msgstr "Помилка при відкривання пристрою виводу звуку %s"
 
-#: ../src/gui/main.cpp:1364
+#: ../src/gui/main.cpp:1380
 msgid "No incoming sound will be played."
 msgstr "Вхідний дзвінок не буде чутно."
 
-#: ../src/gui/main.cpp:1368
+#: ../src/gui/main.cpp:1384
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2367,7 +2487,7 @@
 "проблему. У іншому разі перевірте параметри звуку, права доступу, та "
 "переконайтесь, що пристрій не зайнятий."
 
-#: ../src/gui/main.cpp:1372
+#: ../src/gui/main.cpp:1388
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
@@ -2378,340 +2498,337 @@
 "вдалося. Якщо пристрій може бути від'єднаний, його повторне підключення може "
 "допомогти вирішити проблему. У іншому разі перевірте параметри звуку."
 
-#: ../src/gui/main.cpp:1546
+#: ../src/gui/main.cpp:1579
 msgid "Video Settings"
 msgstr "Параметри відео"
 
-#: ../src/gui/main.cpp:1573
+#: ../src/gui/main.cpp:1606
 msgid "Adjust brightness"
 msgstr "Налаштовування яскравості"
 
-#: ../src/gui/main.cpp:1594
+#: ../src/gui/main.cpp:1627
 msgid "Adjust whiteness"
 msgstr "Налаштовування рівня білого"
 
-#: ../src/gui/main.cpp:1615
+#: ../src/gui/main.cpp:1648
 msgid "Adjust color"
 msgstr "Налаштовування кольору"
 
-#: ../src/gui/main.cpp:1636
+#: ../src/gui/main.cpp:1669
 msgid "Adjust contrast"
 msgstr "Налаштовування контрастності"
 
-#: ../src/gui/main.cpp:1682
+#: ../src/gui/main.cpp:1715
 msgid "Audio Settings"
 msgstr "Параметри звуку"
 
-#: ../src/gui/main.cpp:2286
+#: ../src/gui/main.cpp:2326
 msgid "_Retrieve Call"
 msgstr "_Прийняти виклик"
 
-#: ../src/gui/main.cpp:2299
+#: ../src/gui/main.cpp:2339
 msgid "_Hold Call"
 msgstr "_Утримувати виклик"
 
-#: ../src/gui/main.cpp:2331 ../src/gui/main.cpp:3111
+#: ../src/gui/main.cpp:2371 ../src/gui/main.cpp:3159
 msgid "Suspend _Audio"
 msgstr "Призупинити передавання зву_ку"
 
-#: ../src/gui/main.cpp:2333 ../src/gui/main.cpp:3116
+#: ../src/gui/main.cpp:2373 ../src/gui/main.cpp:3164
 msgid "Suspend _Video"
 msgstr "Призупинити передавання в_ідео"
 
-#: ../src/gui/main.cpp:2335
+#: ../src/gui/main.cpp:2375
 msgid "Resume _Audio"
 msgstr "Відновити передавання зву_ку"
 
-#: ../src/gui/main.cpp:2337
+#: ../src/gui/main.cpp:2377
 msgid "Resume _Video"
 msgstr "Відновити передавання _відео"
 
-#: ../src/gui/main.cpp:2611 ../src/gui/main.cpp:2764
+#: ../src/gui/main.cpp:2660 ../src/gui/main.cpp:2812
 msgid "Reject"
 msgstr "Відкинути"
 
-#: ../src/gui/main.cpp:2613 ../src/gui/main.cpp:2763
+#: ../src/gui/main.cpp:2662 ../src/gui/main.cpp:2811
 msgid "Accept"
 msgstr "Прийняти"
 
-#: ../src/gui/main.cpp:2619 ../src/gui/main.cpp:2751
+#: ../src/gui/main.cpp:2668 ../src/gui/main.cpp:2799
 msgid "Incoming call from"
 msgstr "Вхідний виклик від"
 
-#: ../src/gui/main.cpp:2637 ../src/gui/main.cpp:2754
+#: ../src/gui/main.cpp:2686 ../src/gui/main.cpp:2802
 msgid "Remote URI:"
 msgstr "Віддалений URI:"
 
-#: ../src/gui/main.cpp:2649 ../src/gui/main.cpp:2756
+#: ../src/gui/main.cpp:2698 ../src/gui/main.cpp:2804
 msgid "Remote Application:"
 msgstr "Віддалена програма:"
 
-#: ../src/gui/main.cpp:2670
+#: ../src/gui/main.cpp:2719
 #, c-format
 msgid "Call from %s"
 msgstr "Виклик від %s"
 
-#: ../src/gui/main.cpp:2877
+#: ../src/gui/main.cpp:2925
 #, c-format
 msgid "Call Duration: %s\n"
 msgstr "Тривалість виклику: %s\n"
 
-#: ../src/gui/main.cpp:2908
+#: ../src/gui/main.cpp:2956
 msgid "Transfer call to:"
 msgstr "Переадресовувати виклик на:"
 
-#: ../src/gui/main.cpp:2960
+#: ../src/gui/main.cpp:3008
 msgid "No"
 msgstr "Ні"
 
-#: ../src/gui/main.cpp:2962
+#: ../src/gui/main.cpp:3010
 msgid "Yes"
 msgstr "Так"
 
-#: ../src/gui/main.cpp:2973
+#: ../src/gui/main.cpp:3021
 msgid "Detected new audio input device:"
 msgstr "Виберіть пристрій вводу звуку:"
 
-#: ../src/gui/main.cpp:2977
+#: ../src/gui/main.cpp:3025
 msgid "Detected new audio output device:"
 msgstr "Виберіть пристрій виводу звуку:"
 
-#: ../src/gui/main.cpp:2981
+#: ../src/gui/main.cpp:3029
 msgid "Detected new video input device:"
 msgstr "Виберіть пристрій вводу відео:"
 
-#: ../src/gui/main.cpp:2982 ../src/gui/preferences.cpp:851
+#: ../src/gui/main.cpp:3030 ../src/gui/preferences.cpp:921
 msgid "Video Devices"
 msgstr "Відеопристрої"
 
-#: ../src/gui/main.cpp:3000
+#: ../src/gui/main.cpp:3048
 msgid "Do you want to use it as default device?"
 msgstr "Використовувати цей пристрій типово?"
 
-#: ../src/gui/main.cpp:3068
+#: ../src/gui/main.cpp:3116
 msgid "_Chat"
 msgstr "_Написати"
 
-#: ../src/gui/main.cpp:3070
+#: ../src/gui/main.cpp:3118
 msgid "Ca_ll"
 msgstr "_Виклик"
 
-#: ../src/gui/main.cpp:3070
+#: ../src/gui/main.cpp:3118
 msgid "Place a new call"
 msgstr "Зробити новий виклик"
 
-#: ../src/gui/main.cpp:3073
+#: ../src/gui/main.cpp:3121
 msgid "_Hang up"
 msgstr "Відкл_ючити"
 
-#: ../src/gui/main.cpp:3074
+#: ../src/gui/main.cpp:3122
 msgid "Terminate the current call"
 msgstr "Завершити поточний виклик"
 
-#: ../src/gui/main.cpp:3080
+#: ../src/gui/main.cpp:3128
 msgid "A_dd Contact"
 msgstr "_Додати контакт"
 
-#: ../src/gui/main.cpp:3080
+#: ../src/gui/main.cpp:3128
 msgid "Add a contact to the roster"
 msgstr "Додати контакт до списку"
 
-#: ../src/gui/main.cpp:3085
+#: ../src/gui/main.cpp:3133
 msgid "Find contacts"
 msgstr "Знайти контакти"
 
-#: ../src/gui/main.cpp:3092
+#: ../src/gui/main.cpp:3140
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: ../src/gui/main.cpp:3093
+#: ../src/gui/main.cpp:3141
 msgid "Act on selected contact"
 msgstr "Дії для виділеного контакту"
 
-#: ../src/gui/main.cpp:3099
+#: ../src/gui/main.cpp:3147
 msgid "H_old Call"
 msgstr "_Утримувати виклик"
 
-#: ../src/gui/main.cpp:3099 ../src/gui/main.cpp:3566
+#: ../src/gui/main.cpp:3147 ../src/gui/main.cpp:3616
 msgid "Hold the current call"
 msgstr "Утримувати поточний виклик"
 
-#: ../src/gui/main.cpp:3103
+#: ../src/gui/main.cpp:3151
 msgid "_Transfer Call"
 msgstr "П_ереадресувати виклик"
 
-#: ../src/gui/main.cpp:3104
+#: ../src/gui/main.cpp:3152
 msgid "Transfer the current call"
 msgstr "Переадресувати поточний виклик"
 
-#: ../src/gui/main.cpp:3112
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the audio transmission"
 msgstr "Призупинити чи продовжити передавання звуку"
 
-#: ../src/gui/main.cpp:3117
+#: ../src/gui/main.cpp:3165
 msgid "Suspend or resume the video transmission"
 msgstr "Призупинити чи продовжити передавання відео"
 
-#: ../src/gui/main.cpp:3124
+#: ../src/gui/main.cpp:3172
 msgid "Close the Ekiga window"
 msgstr "Закрити вікно Ekiga"
 
-#: ../src/gui/main.cpp:3131 ../src/gui/statusicon.cpp:405
+#: ../src/gui/main.cpp:3179 ../src/gui/statusicon.cpp:414
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../src/gui/main.cpp:3137
+#: ../src/gui/main.cpp:3185
 msgid "_Configuration Assistant"
 msgstr "Помічник _налаштовування"
 
-#: ../src/gui/main.cpp:3138
+#: ../src/gui/main.cpp:3186
 msgid "Run the configuration assistant"
 msgstr "Запустити помічник налаштовування"
 
-#: ../src/gui/main.cpp:3146
+#: ../src/gui/main.cpp:3194
 msgid "Edit your accounts"
 msgstr "Правка вашого облікового запису"
 
-#: ../src/gui/main.cpp:3152
+#: ../src/gui/main.cpp:3200
 msgid "Change your preferences"
 msgstr "Змінити параметри користувача"
 
-#: ../src/gui/main.cpp:3157
+#: ../src/gui/main.cpp:3205
 msgid "_View"
 msgstr "_Вигляд"
 
-#: ../src/gui/main.cpp:3159
+#: ../src/gui/main.cpp:3207
 msgid "Con_tacts"
 msgstr "_Контакти"
 
-#: ../src/gui/main.cpp:3159
+#: ../src/gui/main.cpp:3207
 msgid "View the contacts list"
 msgstr "Показати список контактів"
 
-#: ../src/gui/main.cpp:3164
+#: ../src/gui/main.cpp:3212
 msgid "_Dialpad"
 msgstr "Панель _набору номера"
 
-#: ../src/gui/main.cpp:3164
+#: ../src/gui/main.cpp:3212
 msgid "View the dialpad"
 msgstr "Показати панель набору номера"
 
-#: ../src/gui/main.cpp:3169
+#: ../src/gui/main.cpp:3217
 msgid "_Call History"
 msgstr "_Історія викликів"
 
-#: ../src/gui/main.cpp:3169
+#: ../src/gui/main.cpp:3217
 msgid "View the call history"
 msgstr "Показати історію викликів"
 
-#: ../src/gui/main.cpp:3177
+#: ../src/gui/main.cpp:3225
 msgid "_Show Call Panel"
 msgstr "Панель _керування"
 
-#: ../src/gui/main.cpp:3185
+#: ../src/gui/main.cpp:3233
 msgid "_Local Video"
 msgstr "_Локальне відео"
 
-#: ../src/gui/main.cpp:3186
+#: ../src/gui/main.cpp:3234
 msgid "Local video image"
 msgstr "Локальне відеозображення"
 
-#: ../src/gui/main.cpp:3191
+#: ../src/gui/main.cpp:3239
 msgid "_Remote Video"
 msgstr "_Віддалене відео"
 
-#: ../src/gui/main.cpp:3192
+#: ../src/gui/main.cpp:3240
 msgid "Remote video image"
 msgstr "Віддалене відеозображення"
 
-#: ../src/gui/main.cpp:3197
+#: ../src/gui/main.cpp:3245
 msgid "_Picture-in-Picture"
 msgstr "Ка_ртинка-у-картинці"
 
-#: ../src/gui/main.cpp:3198 ../src/gui/main.cpp:3204
+#: ../src/gui/main.cpp:3246 ../src/gui/main.cpp:3252
 msgid "Both video images"
 msgstr "Обидва відеозображення"
 
-#: ../src/gui/main.cpp:3203
+#: ../src/gui/main.cpp:3251
 msgid "Picture-in-Picture in Separate _Window"
 msgstr "Картинка-у-картинці у окремому _вікні"
 
-#: ../src/gui/main.cpp:3211
+#: ../src/gui/main.cpp:3259
 msgid "Zoom in"
 msgstr "Збільшити"
 
-#: ../src/gui/main.cpp:3215
+#: ../src/gui/main.cpp:3263
 msgid "Zoom out"
 msgstr "Зменшити"
 
-#: ../src/gui/main.cpp:3219
+#: ../src/gui/main.cpp:3267
 msgid "Normal size"
 msgstr "Звичайний розмір"
 
-#: ../src/gui/main.cpp:3223
+#: ../src/gui/main.cpp:3271
 msgid "_Fullscreen"
 msgstr "На весь _екран"
 
-#: ../src/gui/main.cpp:3223
+#: ../src/gui/main.cpp:3271
 msgid "Switch to fullscreen"
 msgstr "Перейти в повноекранний режим"
 
-#: ../src/gui/main.cpp:3231 ../src/gui/statusicon.cpp:393
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:402
 msgid "Get help by reading the Ekiga manual"
 msgstr "Отримати довідку з посібника Ekiga"
 
-#: ../src/gui/main.cpp:3236 ../src/gui/statusicon.cpp:398
+#: ../src/gui/main.cpp:3284 ../src/gui/statusicon.cpp:407
 msgid "View information about Ekiga"
 msgstr "Перегляд інформації про Ekiga"
 
-#: ../src/gui/main.cpp:3310
-msgid "Enter a URI on the left, and click this button to place a call"
+#: ../src/gui/main.cpp:3358
+msgid ""
+"Enter a URI on the left, and click this button to place a call or to hangup"
 msgstr ""
-"Введіть ліворуч URI для виклику та натисніть цю кнопку для виконання виклику"
+"Щоб почати чи завершити виклик, введіть ліворуч URI та натисніть цю кнопку"
 
-#: ../src/gui/main.cpp:3361
+#: ../src/gui/main.cpp:3409
 msgid "Contacts"
 msgstr "Контакти"
 
-#: ../src/gui/main.cpp:3384
+#: ../src/gui/main.cpp:3432
 msgid "Dialpad"
 msgstr "Панель набору номера"
 
-#: ../src/gui/main.cpp:3401
+#: ../src/gui/main.cpp:3451
 msgid "Call history"
 msgstr "Історія викликів"
 
-#: ../src/gui/main.cpp:3504
+#: ../src/gui/main.cpp:3554
 msgid "Change the volume of your soundcard"
 msgstr "Змінити гучність звукової плати"
 
-#: ../src/gui/main.cpp:3524
+#: ../src/gui/main.cpp:3574
 msgid "Change the color settings of your video device"
 msgstr "Змінити параметри кольорів відео-пристрою"
 
-#: ../src/gui/main.cpp:3546
-msgid "Display images from your camera device"
-msgstr "Показувати зображення з вашої камери"
-
-#: ../src/gui/main.cpp:3634
+#: ../src/gui/main.cpp:3685
 msgid "Ekiga"
 msgstr "Ekiga"
 
 #. Translators:
 #. * TX is a common abbreviation for "transmit"
-#: ../src/gui/main.cpp:4248
+#: ../src/gui/main.cpp:4297
 #, c-format
 msgid "TX: %dx%d "
 msgstr "Передача: %dx%d "
 
 #. Translators:
 #. * RX is a common abbreviation for "receive"
-#: ../src/gui/main.cpp:4253
+#: ../src/gui/main.cpp:4302
 #, c-format
 msgid "RX: %dx%d "
 msgstr "Прийом: %dx%d "
 
-#: ../src/gui/main.cpp:4255
+#: ../src/gui/main.cpp:4304
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2724,23 +2841,23 @@
 "Пакетів не у послідовності: %.1f %%\n"
 "Буферизація: %d мс%s%s%s"
 
-#: ../src/gui/main.cpp:4392
+#: ../src/gui/main.cpp:4425
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr "Виводити налагоджувальну інформацію на консоль (рівні від 1 до 5)"
 
-#: ../src/gui/main.cpp:4397
+#: ../src/gui/main.cpp:4430
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr "Виводити налагоджувальну інформацію на консоль (рівні від 1 до 4)"
 
-#: ../src/gui/main.cpp:4402
+#: ../src/gui/main.cpp:4435
 msgid "Makes Ekiga call the given URI"
 msgstr "Викликати даний URI використовуючи Ekiga"
 
-#: ../src/gui/main.cpp:4518
+#: ../src/gui/main.cpp:4554
 msgid "No usable audio plugin detected"
 msgstr "Не вдалось знайти підтримуваний модуль звуку"
 
-#: ../src/gui/main.cpp:4519
+#: ../src/gui/main.cpp:4555
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
@@ -2748,11 +2865,11 @@
 "Ekiga не може знайти жодного відповідного модулю звуку. Переконайтесь, що "
 "програма встановлена коректно."
 
-#: ../src/gui/main.cpp:4522
+#: ../src/gui/main.cpp:4558
 msgid "No usable audio codecs detected"
 msgstr "Не вдалось знайти підтримуваний модуль звуку"
 
-#: ../src/gui/main.cpp:4523
+#: ../src/gui/main.cpp:4559
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
@@ -2760,64 +2877,55 @@
 "Ekiga не може знайти жодного відповідного модулю звуку. Переконайтесь, що "
 "програма встановлена коректно."
 
-#: ../src/gui/main.cpp:4529
-msgid "Configuration database corruption"
-msgstr "Пошкоджена база даних конфігурації"
+#: ../src/gui/preferences.cpp:381
+msgid "Play sound for new voice mails"
+msgstr "Відтворювати звук при отриманні голосової пошти"
 
-#: ../src/gui/main.cpp:4530
-#, c-format
-msgid ""
-"Ekiga got an invalid value for the configuration key %s.\n"
-"\n"
-"It probably means that your configuration schemas have not been correctly "
-"installed or that the permissions are not correct.\n"
-"\n"
-"Please check the FAQ (http://www.ekiga.org/), the troubleshooting section of "
-"the GConf site (http://www.gnome.org/projects/gconf/) or the mailing list "
-"archives for more information (http://mail.gnome.org) about this problem."
-msgstr ""
-"Програма Ekiga отримала неправильне значення ключа конфігурації %s.\n"
-"\n"
-"Це може означати, що схеми конфігурації не були коректно встановлені або "
-"мають неправильні права доступу.\n"
-"\n"
-"Ознайомтесь з FAQ (http://www.ekiga.org/), розділом \"Уникнення несправностей"
-"\" сайту GConf (http://www.gnome.org/projects/gconf/) чи архівами поштових "
-"розсилок (http://mail.gnome.org) для отримання докладної інформації."
+#: ../src/gui/preferences.cpp:391
+msgid "Play sound for new instant messages"
+msgstr "Відтворювати звук при отриманні повідомлень"
 
-#: ../src/gui/preferences.cpp:376
+#: ../src/gui/preferences.cpp:457
 msgid "_Full name:"
 msgstr "Повне _ім'я:"
 
-#: ../src/gui/preferences.cpp:394
+#: ../src/gui/preferences.cpp:475
 msgid "User Interface"
 msgstr "Інтерфейс"
 
-#: ../src/gui/preferences.cpp:396
+#: ../src/gui/preferences.cpp:477
 msgid "Start _hidden"
 msgstr "Запускати з_горнутим"
 
-#: ../src/gui/preferences.cpp:398
+#: ../src/gui/preferences.cpp:479
 msgid "Show offline _contacts"
 msgstr "Показувати не у мере_жі"
 
-#: ../src/gui/preferences.cpp:403
+#: ../src/gui/preferences.cpp:484
 msgid "Video Display"
 msgstr "Відображення відео"
 
-#: ../src/gui/preferences.cpp:405
+#: ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video _above other windows"
 msgstr "Розміщати вікна, що відображують відео, _над іншими вікнами"
 
-#: ../src/gui/preferences.cpp:415
+#: ../src/gui/preferences.cpp:490
+msgid "Network Settings"
+msgstr "Параметри мережі"
+
+#: ../src/gui/preferences.cpp:492
+msgid "Disable network _detection"
+msgstr "Не визначати параметри _автоматично"
+
+#: ../src/gui/preferences.cpp:503
 msgid "Call Forwarding"
 msgstr "Переадресація викликів"
 
-#: ../src/gui/preferences.cpp:417
+#: ../src/gui/preferences.cpp:505
 msgid "_Always forward calls to the given host"
 msgstr "З_авжди переадресовувати виклики на даний вузол"
 
-#: ../src/gui/preferences.cpp:417
+#: ../src/gui/preferences.cpp:505
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings"
@@ -2825,11 +2933,11 @@
 "Якщо увімкнено, переадресовувати всі вхідні виклики на вузол, що вказаний у "
 "розділі \"протоколи\""
 
-#: ../src/gui/preferences.cpp:419
+#: ../src/gui/preferences.cpp:507
 msgid "Forward calls to the given host if _no answer"
 msgstr "Переадресовувати виклики на вказаний вузол, якщо _немає відповіді"
 
-#: ../src/gui/preferences.cpp:419
+#: ../src/gui/preferences.cpp:507
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you do not answer the call"
@@ -2837,11 +2945,11 @@
 "Якщо увімкнено, то всі вхідні виклики переадресовуватимуться на вузол, що "
 "вказаний у розділі \"протоколи\", якщо ви не відповідаєте на виклик"
 
-#: ../src/gui/preferences.cpp:421
+#: ../src/gui/preferences.cpp:509
 msgid "Forward calls to the given host if _busy"
 msgstr "Переадресовувати виклики на вказаний вузол, якщо лінія за_йнята"
 
-#: ../src/gui/preferences.cpp:421
+#: ../src/gui/preferences.cpp:509
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the protocol settings if you already are in a call or if you "
@@ -2851,78 +2959,77 @@
 "вказаний у розділі \"протоколи\", якщо активний інший виклик (лінія зайнята) "
 "чи ви знаходитесь в режимі \"Не турбувати\"."
 
-#: ../src/gui/preferences.cpp:425 ../src/gui/preferences.cpp:1447
+#: ../src/gui/preferences.cpp:513 ../src/gui/preferences.cpp:1361
 msgid "Call Options"
 msgstr "Параметри викликів"
 
 #. Add all the fields
-#: ../src/gui/preferences.cpp:428
+#: ../src/gui/preferences.cpp:516
 msgid "Timeout to reject or forward unanswered incoming calls (in seconds):"
 msgstr "Відкидати або переадресовувати вхідні виклики без відповіді після "
 
-#: ../src/gui/preferences.cpp:460
+#: ../src/gui/preferences.cpp:548
 msgid "Ekiga Sound Events"
 msgstr "Звукові події Ekiga"
 
-#: ../src/gui/preferences.cpp:509 ../src/gui/preferences.cpp:518
-#: ../src/gui/preferences.cpp:527
+#: ../src/gui/preferences.cpp:598
 msgid "Event"
 msgstr "Подія"
 
-#: ../src/gui/preferences.cpp:539
+#: ../src/gui/preferences.cpp:610
 msgid "Choose a sound"
 msgstr "Виберіть звук"
 
-#: ../src/gui/preferences.cpp:545
+#: ../src/gui/preferences.cpp:615
 msgid "Wavefiles"
 msgstr "Звукові файли"
 
-#: ../src/gui/preferences.cpp:554 ../src/gui/preferences.cpp:573
+#: ../src/gui/preferences.cpp:624 ../src/gui/preferences.cpp:643
 msgid "Play"
 msgstr "Відтворити"
 
-#: ../src/gui/preferences.cpp:594
+#: ../src/gui/preferences.cpp:664
 msgid "String"
 msgstr "Рядок"
 
-#: ../src/gui/preferences.cpp:595
+#: ../src/gui/preferences.cpp:665
 msgid "Tone"
 msgstr "Тон"
 
-#: ../src/gui/preferences.cpp:596 ../src/gui/preferences.cpp:645
+#: ../src/gui/preferences.cpp:666 ../src/gui/preferences.cpp:715
 msgid "RFC2833"
 msgstr "RFC2833"
 
-#: ../src/gui/preferences.cpp:597
+#: ../src/gui/preferences.cpp:667
 msgid "Q.931"
 msgstr "Q.931"
 
-#: ../src/gui/preferences.cpp:603 ../src/gui/preferences.cpp:655
+#: ../src/gui/preferences.cpp:673 ../src/gui/preferences.cpp:725
 msgid "Misc Settings"
 msgstr "Різні параметри"
 
-#: ../src/gui/preferences.cpp:606 ../src/gui/preferences.cpp:660
+#: ../src/gui/preferences.cpp:676 ../src/gui/preferences.cpp:730
 msgid "Forward _URI:"
 msgstr "_URI переадресації:"
 
-#: ../src/gui/preferences.cpp:615
+#: ../src/gui/preferences.cpp:685
 msgid "Advanced Settings"
 msgstr "Додаткові параметри"
 
 #. The toggles
-#: ../src/gui/preferences.cpp:618
+#: ../src/gui/preferences.cpp:688
 msgid "Enable H.245 _tunneling"
 msgstr "Увімкнути _тунелювання  H.245"
 
-#: ../src/gui/preferences.cpp:620
+#: ../src/gui/preferences.cpp:690
 msgid "Enable _early H.245"
 msgstr "Увімкнути _ранній H.245"
 
-#: ../src/gui/preferences.cpp:622
+#: ../src/gui/preferences.cpp:692
 msgid "Enable fast _start procedure"
 msgstr "Увімкнути ш_видкий старт"
 
-#: ../src/gui/preferences.cpp:622
+#: ../src/gui/preferences.cpp:692
 msgid ""
 "Connection will be established in Fast Start mode. Fast Start is a new way "
 "to start calls faster that was introduced in H.323v2. It is not supported by "
@@ -2934,182 +3041,127 @@
 "підтримується Netmeeting, і одночасне використання швидкого старту і "
 "тунелювання H.245 може призвести до збоїв деяких версій Netmeeting."
 
-#: ../src/gui/preferences.cpp:628 ../src/gui/preferences.cpp:668
+#: ../src/gui/preferences.cpp:698 ../src/gui/preferences.cpp:738
 msgid "DTMF Mode"
 msgstr "Режим DTMF"
 
-#: ../src/gui/preferences.cpp:630 ../src/gui/preferences.cpp:670
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
 msgid "_Send DTMF as:"
 msgstr "_Надсилати DTMF:"
 
-#: ../src/gui/preferences.cpp:630 ../src/gui/preferences.cpp:670
+#: ../src/gui/preferences.cpp:700 ../src/gui/preferences.cpp:740
 msgid "This allows you to set the mode for DTMFs sending."
 msgstr "Дозволяє встановлення режиму для надсилання DTMF."
 
-#: ../src/gui/preferences.cpp:646
+#: ../src/gui/preferences.cpp:716
 msgid "INFO"
 msgstr "INFO"
 
-#: ../src/gui/preferences.cpp:657
+#: ../src/gui/preferences.cpp:727
 msgid "_Outbound Proxy:"
 msgstr "_Вихідний проксі-сервер:"
 
-#: ../src/gui/preferences.cpp:698
+#: ../src/gui/preferences.cpp:768
 msgid "Ringing Device"
 msgstr "Пристрій дзвінка"
 
-#: ../src/gui/preferences.cpp:698
+#: ../src/gui/preferences.cpp:768
 msgid "Select the ringing audio device to use"
 msgstr "Вкажіть пристрій дзвінка"
 
-#: ../src/gui/preferences.cpp:700
+#: ../src/gui/preferences.cpp:770
 msgid "Output device:"
 msgstr "Пристрій виводу:"
 
-#: ../src/gui/preferences.cpp:707 ../src/gui/preferences.cpp:858
+#: ../src/gui/preferences.cpp:777 ../src/gui/preferences.cpp:928
 msgid "Input device:"
 msgstr "Пристрій вводу:"
 
 #. That button will refresh the device list
-#. The file selector button
-#. FIXME disabled for now
-#. label = gtk_label_new (_("Image:"));
-#.
-#. button =
-#. gtk_file_chooser_button_new_with_backend (_("Choose a Picture"),
-#. GTK_FILE_CHOOSER_ACTION_OPEN,
-#. FILECHOOSER_BACKEND);
-#.
-#. preview_image_frame = gtk_frame_new (_("Preview"));
-#. preview_image = gtk_image_new ();
-#. gtk_container_add (GTK_CONTAINER (preview_image_frame), preview_image);
-#. gtk_widget_set_size_request (preview_image, 256, 256);
-#. gtk_widget_show (preview_image);
-#. gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (button),
-#. preview_image_frame);
-#.
-#.
-#. filefilter = gtk_file_filter_new ();
-#. gtk_file_filter_set_name (filefilter, _("Images"));
-#. gtk_file_filter_add_pixbuf_formats (filefilter);
-#. gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (button), filefilter);
-#.
-#. g_signal_connect (G_OBJECT (button), "update-preview",
-#. G_CALLBACK (image_filename_browse_preview_cb),
-#. (gpointer) preview_image);
-#.
-#. conf_image = gm_conf_get_string (VIDEO_DEVICES_KEY "image");
-#. if (!conf_image || (!strcmp (conf_image, ""))) {
-#. g_free (conf_image);
-#. conf_image = NULL;
-#. }
-#.
-#. if (conf_image)
-#. gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (button), conf_image);
-#. g_free (conf_image);
-#.
-#. gtk_table_attach (GTK_TABLE (subsection), button, 1, 2, 4, 5,
-#. (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
-#. (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
-#. 0, GNOMEMEETING_PAD_SMALL);
-#.
-#. gtk_table_attach (GTK_TABLE (subsection), label, 0, 1, 4, 5,
-#. (GtkAttachOptions) (GTK_FILL),
-#. (GtkAttachOptions) (GTK_FILL),
-#. 0, 0);
-#.
-#. gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-#. gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-#.
-#. g_signal_connect_after (G_OBJECT (button), "selection-changed",
-#. G_CALLBACK (image_filename_browse_cb),
-#. (gpointer) VIDEO_DEVICES_KEY "image");
-#.
-#. That button will refresh the device list
-#: ../src/gui/preferences.cpp:712 ../src/gui/preferences.cpp:923
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
 msgid "_Detect devices"
 msgstr "_Пошук пристроїв"
 
-#: ../src/gui/preferences.cpp:712 ../src/gui/preferences.cpp:923
+#: ../src/gui/preferences.cpp:782 ../src/gui/preferences.cpp:939
 msgid "Click here to refresh the device list."
 msgstr "Натисніть, щоб оновити перелік пристроїв."
 
-#: ../src/gui/preferences.cpp:836
+#: ../src/gui/preferences.cpp:906
 msgid "PAL (Europe)"
 msgstr "PAL (Європа)"
 
-#: ../src/gui/preferences.cpp:837
+#: ../src/gui/preferences.cpp:907
 msgid "NTSC (America)"
 msgstr "NTSC (Америка)"
 
-#: ../src/gui/preferences.cpp:838
+#: ../src/gui/preferences.cpp:908
 msgid "SECAM (France)"
 msgstr "SECAM (Франція)"
 
-#: ../src/gui/preferences.cpp:839
+#: ../src/gui/preferences.cpp:909
 msgid "Auto"
 msgstr "Авто"
 
 #. Video Channel
-#: ../src/gui/preferences.cpp:862
+#: ../src/gui/preferences.cpp:932
 msgid "Channel:"
 msgstr "Канал:"
 
-#: ../src/gui/preferences.cpp:864
+#: ../src/gui/preferences.cpp:934
 msgid "Size:"
 msgstr "Розмір:"
 
-#: ../src/gui/preferences.cpp:864
+#: ../src/gui/preferences.cpp:934
 msgid "Select the transmitted video size"
 msgstr "Вкажіть розмір відео, що передається"
 
-#: ../src/gui/preferences.cpp:866
+#: ../src/gui/preferences.cpp:936
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../src/gui/preferences.cpp:947 ../src/gui/preferences.cpp:986
-#: ../src/gui/preferences.cpp:1472 ../src/gui/preferences.cpp:1482
+#: ../src/gui/preferences.cpp:963 ../src/gui/preferences.cpp:1002
+#: ../src/gui/preferences.cpp:1386 ../src/gui/preferences.cpp:1396
 msgid "Codecs"
 msgstr "Кодеки"
 
-#: ../src/gui/preferences.cpp:960 ../src/gui/preferences.cpp:999
+#: ../src/gui/preferences.cpp:976 ../src/gui/preferences.cpp:1015
 msgid "Settings"
 msgstr "Параметри"
 
 #. Translators: the full sentence is Automatically adjust jitter buffer
 #. between X and Y ms
-#: ../src/gui/preferences.cpp:964
+#: ../src/gui/preferences.cpp:980
 msgid "Enable silence _detection"
 msgstr "Увімкнути виявлення _мовчання"
 
-#: ../src/gui/preferences.cpp:964
+#: ../src/gui/preferences.cpp:980
 msgid "If enabled, use silence detection with the codecs supporting it."
 msgstr ""
 "Якщо увімкнено, використовувати виявлення мовчання для кодеків, що функцію "
 "кодеку."
 
-#: ../src/gui/preferences.cpp:966
+#: ../src/gui/preferences.cpp:982
 msgid "Enable echo can_celation"
 msgstr "Увімкнути зни_ження відлуння"
 
-#: ../src/gui/preferences.cpp:966
+#: ../src/gui/preferences.cpp:982
 msgid "If enabled, use echo cancelation."
 msgstr "Якщо увімкнено, використовувати зниження відлуння."
 
-#: ../src/gui/preferences.cpp:968
+#: ../src/gui/preferences.cpp:984
 msgid "Maximum _jitter buffer (in ms):"
 msgstr "Максимальна за_тримка (у мс)"
 
-#: ../src/gui/preferences.cpp:968
+#: ../src/gui/preferences.cpp:984
 msgid "The maximum jitter buffer size for audio reception (in ms)."
 msgstr "Максимальний розмір буфера прийому звуку (в мс)."
 
 #. Translators: the full sentence is Keep a minimum video quality of X %
-#: ../src/gui/preferences.cpp:1002
+#: ../src/gui/preferences.cpp:1018
 msgid "Picture Quality"
 msgstr "Якість зображення"
 
-#: ../src/gui/preferences.cpp:1002
+#: ../src/gui/preferences.cpp:1018
 msgid ""
 "Choose if you want to guarantee a minimum image quality (possibly leading to "
 "dropped frames in order not to surpass the bitrate limit) or if you prefer "
@@ -3119,11 +3171,11 @@
 "призведе до втрат пакетів через обмежений канал) або треба зберігати частоту "
 "кадрів, за рахунок якості ущерб."
 
-#: ../src/gui/preferences.cpp:1004
+#: ../src/gui/preferences.cpp:1020
 msgid "Maximum video _bitrate (in kbits/s):"
 msgstr "Максимальна _смуга пропускання відео (у кбіт/с):"
 
-#: ../src/gui/preferences.cpp:1004
+#: ../src/gui/preferences.cpp:1020
 msgid ""
 "The maximum video bitrate in kbits/s. The video quality and the effective "
 "frame rate will be dynamically adjusted to keep the bitrate at the given "
@@ -3133,59 +3185,51 @@
 "відео і кількість кадрів на секунду буде автоматично регулюватися таким "
 "чином, щоб мінімізувати смугу пропускання до вказаного значення."
 
-#: ../src/gui/preferences.cpp:1381
-msgid "Play sound for new voice mails"
-msgstr "Відтворювати звук при отриманні голосової пошти"
-
-#: ../src/gui/preferences.cpp:1390
-msgid "Play sound for new instant messages"
-msgstr "Відтворювати звук при отриманні повідомлень"
-
-#: ../src/gui/preferences.cpp:1419
+#: ../src/gui/preferences.cpp:1333
 msgid "Ekiga Preferences"
 msgstr "П_араметри Ekiga"
 
-#: ../src/gui/preferences.cpp:1437
+#: ../src/gui/preferences.cpp:1351
 msgid "General"
 msgstr "Загальне"
 
-#: ../src/gui/preferences.cpp:1438
+#: ../src/gui/preferences.cpp:1352
 msgid "Personal Data"
 msgstr "Особисті дані"
 
-#: ../src/gui/preferences.cpp:1443
+#: ../src/gui/preferences.cpp:1357
 msgid "General Settings"
 msgstr "Загальні параметри"
 
-#: ../src/gui/preferences.cpp:1452
+#: ../src/gui/preferences.cpp:1366
 msgid "Sound Events"
 msgstr "Звукові події"
 
-#: ../src/gui/preferences.cpp:1456
+#: ../src/gui/preferences.cpp:1370
 msgid "Protocols"
 msgstr "Протоколи"
 
-#: ../src/gui/preferences.cpp:1458
+#: ../src/gui/preferences.cpp:1372
 msgid "SIP Settings"
 msgstr "Параметри SIP"
 
-#: ../src/gui/preferences.cpp:1463
+#: ../src/gui/preferences.cpp:1377
 msgid "H.323 Settings"
 msgstr "Параметри H.323"
 
-#: ../src/gui/preferences.cpp:1467
+#: ../src/gui/preferences.cpp:1381
 msgid "Audio"
 msgstr "Звук"
 
-#: ../src/gui/preferences.cpp:1468 ../src/gui/preferences.cpp:1478
+#: ../src/gui/preferences.cpp:1382 ../src/gui/preferences.cpp:1392
 msgid "Devices"
 msgstr "Пристрої"
 
-#: ../src/gui/preferences.cpp:1477
+#: ../src/gui/preferences.cpp:1391
 msgid "Video"
 msgstr "Зображення"
 
-#: ../src/gui/statusicon.cpp:304
+#: ../src/gui/statusicon.cpp:306
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
@@ -3193,31 +3237,144 @@
 msgstr[1] "Отримано %d повідомлення"
 msgstr[2] "Отримано %d повідомлень"
 
-#: ../src/gui/statusmenu.cpp:90
+#: ../src/gui/statusmenu.cpp:87
 msgid "Online"
 msgstr "У мережі"
 
-#: ../src/gui/statusmenu.cpp:91
+#: ../src/gui/statusmenu.cpp:88
 msgid "Away"
 msgstr "Відійшов"
 
-#: ../src/gui/statusmenu.cpp:92
+#: ../src/gui/statusmenu.cpp:89
 msgid "Do Not Disturb"
 msgstr "Не турбувати"
 
-#: ../src/gui/statusmenu.cpp:456
+#: ../src/gui/statusmenu.cpp:387
 msgid "Custom message..."
 msgstr "Інше..."
 
+#: ../src/gui/statusmenu.cpp:430
+msgid "Clear"
+msgstr "Очистити"
+
 #. Build the dialog
-#: ../src/gui/statusmenu.cpp:587 ../src/gui/statusmenu.cpp:741
+#: ../src/gui/statusmenu.cpp:521 ../src/gui/statusmenu.cpp:671
 msgid "Custom Message"
 msgstr "Стан"
 
-#: ../src/gui/statusmenu.cpp:603
+#: ../src/gui/statusmenu.cpp:537
 msgid "Delete custom messages:"
 msgstr "Видаліть стан:"
 
-#: ../src/gui/statusmenu.cpp:762
+#: ../src/gui/statusmenu.cpp:692
 msgid "Define a custom message:"
 msgstr "Вкажіть стан:"
+
+#~ msgid "Automatic echo cancellation"
+#~ msgstr "Автоматичне зниження відлуння"
+
+#~ msgid "Country code"
+#~ msgstr "Код країни"
+
+#~ msgid "Display a popup window when receiving a call"
+#~ msgstr "Відкривати вікно при отриманні виклику"
+
+#~ msgid "Enable video support"
+#~ msgstr "Увімкнути підтримку відео"
+
+#~ msgid ""
+#~ "If enabled, a popup window will be displayed when receiving an incoming "
+#~ "call"
+#~ msgstr "При отриманні вхідного виклику, відкривати вікно"
+
+#~ msgid "If enabled, allows video during calls"
+#~ msgstr "Приймати відео в процесі виклику"
+
+#~ msgid "Output device type"
+#~ msgstr "Тип пристрою виводу"
+
+#~ msgid "Registration timeout"
+#~ msgstr "Таймаут реєстрації"
+
+#~ msgid "Revision of the schema file"
+#~ msgstr "Версія файлу schema"
+
+#~ msgid "Roster view saving group status"
+#~ msgstr "Статус груп у списку контактів"
+
+#~ msgid ""
+#~ "The Automatic Echo Cancellation level: Off, Low, Medium, High, Automatic "
+#~ "Gain Compensation. Choosing Automatic Gain Compensation modulates the "
+#~ "volume for best quality."
+#~ msgstr ""
+#~ "Рівень автоматичного зменшення відлуння: вимкнено, низький, середній, "
+#~ "високий, автоматичне регулювання рівня. Автоматичне регулювання рівня "
+#~ "змінює гучність для досягнення найкращого результату."
+
+#~ msgid ""
+#~ "The image to transmit if \"Picture\" is selected as video plugin or if "
+#~ "the opening of the device fails. Leave blank to use the default Ekiga "
+#~ "logo."
+#~ msgstr ""
+#~ "Зображення, що передаватиметься, якщо в якості модуля відео вказано "
+#~ "\"Picture\" (якщо не вказано, буде використовуватись емблема Ekiga)."
+
+#~ msgid ""
+#~ "The output device type is the type of device connected to your Quicknet "
+#~ "card. It can be either a POTS (Plain Old Telephone System) or a headset."
+#~ msgstr ""
+#~ "Тип пристрою виводу - це тип пристрою, що з'єднаний з вашою картою "
+#~ "Quicknet. Може бути або POTS (Plain Old Telephone System), або трубка."
+
+#~ msgid ""
+#~ "The prefix that will be used to save pictures of the conversation. That "
+#~ "prefix is followed by the snapshot number."
+#~ msgstr ""
+#~ "Префікс, що буде використано для збереження стоп-кадрів. За префіксом "
+#~ "буде йти номер знімка."
+
+#~ msgid "The save prefix"
+#~ msgstr "Префікс збереження"
+
+#~ msgid ""
+#~ "The time after which Ekiga will renew its registration with the registrar"
+#~ msgstr ""
+#~ "Час, по закінченні якого Ekiga буде оновлювати свою реєстрацію на "
+#~ "реєстраційному сервері"
+
+#~ msgid ""
+#~ "The two-letter country code of your country (e.g.: BE, UK, FR, DE, ...)"
+#~ msgstr "Дві літери коду вашої країни (тобто UA, BE, FR, DE, ...)."
+
+#~ msgid "Version"
+#~ msgstr "Версія"
+
+#~ msgid "Video image"
+#~ msgstr "Відео"
+
+#~ msgid "Goom"
+#~ msgstr "В'язкий"
+
+#~ msgid "Configuration database corruption"
+#~ msgstr "Пошкоджена база даних конфігурації"
+
+#~ msgid ""
+#~ "Ekiga got an invalid value for the configuration key %s.\n"
+#~ "\n"
+#~ "It probably means that your configuration schemas have not been correctly "
+#~ "installed or that the permissions are not correct.\n"
+#~ "\n"
+#~ "Please check the FAQ (http://www.ekiga.org/), the troubleshooting section "
+#~ "of the GConf site (http://www.gnome.org/projects/gconf/) or the mailing "
+#~ "list archives for more information (http://mail.gnome.org) about this "
+#~ "problem."
+#~ msgstr ""
+#~ "Програма Ekiga отримала неправильне значення ключа конфігурації %s.\n"
+#~ "\n"
+#~ "Це може означати, що схеми конфігурації не були коректно встановлені або "
+#~ "мають неправильні права доступу.\n"
+#~ "\n"
+#~ "Ознайомтесь з FAQ (http://www.ekiga.org/), розділом \"Уникнення "
+#~ "несправностей\" сайту GConf (http://www.gnome.org/projects/gconf/) чи "
+#~ "архівами поштових розсилок (http://mail.gnome.org) для отримання "
+#~ "докладної інформації."
diff -Nru ekiga-3.2.5/po/zh_HK.po ekiga-3.2.6~ppa~karmic1/po/zh_HK.po
--- ekiga-3.2.5/po/zh_HK.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/zh_HK.po	2009-09-22 15:27:35.000000000 +0100
@@ -5,13 +5,13 @@
 # Woodman Tuen <wmtuen@gmail.com>, 2004-07.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2008.
 #
-#: ../lib/engine/components/resource-list/rl-entry.cpp:163
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
-"Project-Id-Version: ekiga 3.1.1\n"
+"Project-Id-Version: ekiga 3.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-25 20:01+0800\n"
-"PO-Revision-Date: 2009-02-25 20:02+0800\n"
+"POT-Creation-Date: 2009-08-29 16:18+0800\n"
+"PO-Revision-Date: 2009-08-29 16:19+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -108,215 +108,215 @@
 msgid "Disable video hardware acceleration"
 msgstr "停用視像硬件加速"
 
-#: ../ekiga.schemas.in.in.h:18
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3591
+msgid "Display images from your camera device"
+msgstr "顯示攝影機所拍攝的圖片"
+
+#: ../ekiga.schemas.in.in.h:19
 msgid "Enable 'Fast Start'"
 msgstr "啟用「快速啟動」"
 
-#: ../ekiga.schemas.in.in.h:19
+#: ../ekiga.schemas.in.in.h:20
 msgid "Enable H.245 tunneling"
 msgstr "啟用 H.245 穿隧技術"
 
-#: ../ekiga.schemas.in.in.h:20
+#: ../ekiga.schemas.in.in.h:21
 msgid "Enable early H.245"
 msgstr "啟用早期 H.245"
 
-#: ../ekiga.schemas.in.in.h:21
+#: ../ekiga.schemas.in.in.h:22
 msgid "Enable echo cancelation"
 msgstr "啟用回音消除功能"
 
-#: ../ekiga.schemas.in.in.h:22
+#: ../ekiga.schemas.in.in.h:23
 msgid "Enable silence detection"
 msgstr "啟用靜音探測"
 
-#: ../ekiga.schemas.in.in.h:23
+#: ../ekiga.schemas.in.in.h:24
 msgid ""
 "Enter the number of seconds after which Ekiga should try refreshing the NAT "
 "binding when STUN is being used"
 msgstr "輸入在使用 STUN 時，Ekiga 應在多少秒後更新 NAT 連結的時間，"
 
-#: ../ekiga.schemas.in.in.h:24 ../src/gui/preferences.cpp:459
+#: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
 msgid "Enter your full name"
 msgstr "輸入你的全名"
 
-#: ../ekiga.schemas.in.in.h:25
+#: ../ekiga.schemas.in.in.h:26
 msgid "Forward calls to host"
 msgstr "轉駁來電至主機"
 
-#: ../ekiga.schemas.in.in.h:26
+#: ../ekiga.schemas.in.in.h:27
 msgid "Forward calls to the given host if busy"
 msgstr "忙線時轉駁來電至指定的主機"
 
-#: ../ekiga.schemas.in.in.h:27
+#: ../ekiga.schemas.in.in.h:28
 msgid "Forward calls to the given host if no answer"
 msgstr "無應答時轉駁來電至指定的主機"
 
-#: ../ekiga.schemas.in.in.h:28 ../src/gui/preferences.cpp:1018
+#: ../ekiga.schemas.in.in.h:29 ../src/gui/preferences.cpp:1018
 msgid "Frame Rate"
 msgstr "幀率"
 
-#: ../ekiga.schemas.in.in.h:29
+#: ../ekiga.schemas.in.in.h:30
 msgid "Full name"
 msgstr "全名"
 
-#: ../ekiga.schemas.in.in.h:30 ../src/gui/preferences.cpp:477
+#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:477
 msgid ""
 "If enabled, Ekiga will start hidden provided that the notification area is "
 "present in the GNOME panel"
 msgstr "如啟用此項，Ekiga 將在啟動時隱藏起來。並會縮小在 GNOME 面版的狀態通知區上。"
 
-#: ../ekiga.schemas.in.in.h:31
+#: ../ekiga.schemas.in.in.h:32
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below"
 msgstr "如啟用，所有電話都會轉駁到下面所指定的主機"
 
-#: ../ekiga.schemas.in.in.h:32
+#: ../ekiga.schemas.in.in.h:33
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you already are in a call or if you are in "
 "Do Not Disturb mode"
 msgstr "如啟用，若你在通話中或處於請勿打擾狀態時，所有電話都會轉駁到下面所指定的主機。"
 
-#: ../ekiga.schemas.in.in.h:33
+#: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you do not answer the call"
 msgstr "如啟用，所有你沒有接聽的電話都會轉駁到下面所指定的主機。"
 
-#: ../ekiga.schemas.in.in.h:34 ../src/gui/preferences.cpp:479
+#: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
 msgid "If enabled, offline contacts will be shown in the roster"
 msgstr "如果啟用，離線聯絡人會顯示在名冊中"
 
-#: ../ekiga.schemas.in.in.h:35
+#: ../ekiga.schemas.in.in.h:36
 msgid "If enabled, use echo cancelation"
 msgstr "如啟用此項，使用回音消除功能"
 
-#: ../ekiga.schemas.in.in.h:36
+#: ../ekiga.schemas.in.in.h:37
 msgid "If enabled, use silence detection with the codecs supporting it"
 msgstr "如啟用，則會使用編碼解碼器支援的靜音探測"
 
-#: ../ekiga.schemas.in.in.h:37
+#: ../ekiga.schemas.in.in.h:38
 msgid "Kind of network selected in the druid"
 msgstr "在設定精靈中選擇的網絡類型"
 
-#: ../ekiga.schemas.in.in.h:38
+#: ../ekiga.schemas.in.in.h:39
 msgid "LDAP servers"
 msgstr "LDAP 伺服器"
 
-#: ../ekiga.schemas.in.in.h:39
+#: ../ekiga.schemas.in.in.h:40
 msgid "List of configured LDAP servers"
 msgstr "設定的 LDAP 伺服器清單"
 
-#: ../ekiga.schemas.in.in.h:40
+#: ../ekiga.schemas.in.in.h:41
 msgid "List of folded groups in the roster"
 msgstr "名冊中摺疊的羣組清單"
 
-#: ../ekiga.schemas.in.in.h:41
+#: ../ekiga.schemas.in.in.h:42
 msgid "Listen port"
 msgstr "監聽埠"
 
-#: ../ekiga.schemas.in.in.h:42
+#: ../ekiga.schemas.in.in.h:43
 msgid "Local video window size"
 msgstr "本機視像畫面視窗的大小"
 
 # src/pref_window.cpp:1554
-#: ../ekiga.schemas.in.in.h:43
+#: ../ekiga.schemas.in.in.h:44
 msgid "Maximum RX video bitrate"
 msgstr "最大 RX 視像頻寬"
 
 # src/pref_window.cpp:1554
-#: ../ekiga.schemas.in.in.h:44
+#: ../ekiga.schemas.in.in.h:45
 msgid "Maximum TX video bitrate"
 msgstr "最大 TX 視像頻寬"
 
-#: ../ekiga.schemas.in.in.h:45
+#: ../ekiga.schemas.in.in.h:46
 msgid "Maximum jitter buffer"
 msgstr "抗抖動緩衝的最大值"
 
-#: ../ekiga.schemas.in.in.h:46
+#: ../ekiga.schemas.in.in.h:47
 msgid "NAT Binding Timeout"
 msgstr "NAT 連結逾時"
 
-#: ../ekiga.schemas.in.in.h:47
+#: ../ekiga.schemas.in.in.h:48
 msgid "No answer timeout"
 msgstr "沒有接聽逾時"
 
-#: ../ekiga.schemas.in.in.h:48
+#: ../ekiga.schemas.in.in.h:49
 msgid "Outbound Proxy"
 msgstr "Outbound Proxy"
 
-#: ../ekiga.schemas.in.in.h:49 ../src/gui/preferences.cpp:486
+#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video above other windows during calls"
 msgstr "正在通話時，將視像畫面視窗置於其它的視窗上"
 
-#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:371
+#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
 msgid "Play busy tone"
 msgstr "播放忙線音"
 
-#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:361
+#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:361
 msgid "Play ring tone"
 msgstr "播放鈐聲"
 
-#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:351
+#: ../ekiga.schemas.in.in.h:53 ../src/gui/preferences.cpp:351
 msgid "Play sound on incoming calls"
 msgstr "來電時播放音效"
 
-#: ../ekiga.schemas.in.in.h:53
+#: ../ekiga.schemas.in.in.h:54
 msgid "Play sound on new message"
 msgstr "收到新訊息時播放音效"
 
-#: ../ekiga.schemas.in.in.h:54
+#: ../ekiga.schemas.in.in.h:55
 msgid "Play sound on new voice mail"
 msgstr "收到新留言時播放音效"
 
-#: ../ekiga.schemas.in.in.h:55
+#: ../ekiga.schemas.in.in.h:56
 msgid "Position of the local video window"
 msgstr "本機視像畫面視窗的位置"
 
-#: ../ekiga.schemas.in.in.h:56
+#: ../ekiga.schemas.in.in.h:57
 msgid "Position on the screen of the address book window"
 msgstr "通訊錄視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:57
+#: ../ekiga.schemas.in.in.h:58
 msgid "Position on the screen of the audio settings window"
 msgstr "音訊設定視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:58
+#: ../ekiga.schemas.in.in.h:59
 msgid "Position on the screen of the chat window"
 msgstr "聊天視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:59
+#: ../ekiga.schemas.in.in.h:60
 msgid "Position on the screen of the druid window"
 msgstr "首次設定精靈視窗在螢幕中位置"
 
-#: ../ekiga.schemas.in.in.h:60
+#: ../ekiga.schemas.in.in.h:61
 msgid "Position on the screen of the log window"
 msgstr "記錄視窗的螢幕位置"
 
-#: ../ekiga.schemas.in.in.h:61
+#: ../ekiga.schemas.in.in.h:62
 msgid "Position on the screen of the main window"
 msgstr "主視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:62
+#: ../ekiga.schemas.in.in.h:63
 msgid "Position on the screen of the preferences window"
 msgstr "偏好設定視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:63
+#: ../ekiga.schemas.in.in.h:64
 msgid "Position on the screen of the video settings window"
 msgstr "視像設定視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:64
+#: ../ekiga.schemas.in.in.h:65
 msgid "Remote video window position"
 msgstr "遠端視像畫面視窗的位置"
 
-#: ../ekiga.schemas.in.in.h:65
+#: ../ekiga.schemas.in.in.h:66
 msgid "Remote video window size"
 msgstr "遠端視像畫面視窗的太小"
 
-#: ../ekiga.schemas.in.in.h:66
-msgid "Roster view saving group status"
-msgstr "名冊模式儲存羣組狀態"
-
 #: ../ekiga.schemas.in.in.h:67
 msgid "Select an alternative audio output device to use for sound events."
 msgstr "選擇鈐聲事件所使用的其它音訊輸出裝置。"
@@ -350,7 +350,7 @@
 msgid "Show offline contacts"
 msgstr "顯示離線聯絡人"
 
-#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3214
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3220
 msgid "Show the call panel"
 msgstr "顯示撥號面板"
 
@@ -399,7 +399,7 @@
 
 #: ../ekiga.schemas.in.in.h:85
 msgid "Temporal Spatial Trade Off"
-msgstr ""
+msgstr "暫時空間替換"
 
 #: ../ekiga.schemas.in.in.h:86
 msgid "The Audio Codecs List"
@@ -669,7 +669,7 @@
 msgid "Video format"
 msgstr "視像格式"
 
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1153
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr "視像輸入裝置"
 
@@ -688,121 +688,121 @@
 "Highest minimal quality, 31: lowest minimal quality"
 msgstr "是否傾向維持最大幀率或是要降低它以保持所有幀最低限度的品質。0: 最低品質設為最大。31: 最低品質設為最小"
 
-#: ../lib/engine/addressbook/contact-core.cpp:58
+#: ../lib/engine/addressbook/contact-core.cpp:60
 msgid "_Find"
 msgstr "尋找(_F)"
 
 #: ../lib/engine/components/avahi/avahi-heap.cpp:125
-#: ../lib/engine/components/avahi/avahi-heap.cpp:306
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
 msgid "Neighbours"
 msgstr "鄰居"
 
-#: ../lib/engine/components/call-history/history-book.cpp:140
+#: ../lib/engine/components/call-history/history-book.cpp:137
 #: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
 msgid "Clear List"
 msgstr "清除清單"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:153
+#: ../lib/engine/components/call-history/history-contact.cpp:155
 msgid "Received"
 msgstr "已接收"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:156
+#: ../lib/engine/components/call-history/history-contact.cpp:158
 msgid "Placed"
 msgstr "掛斷的電腦"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:159
+#: ../lib/engine/components/call-history/history-contact.cpp:161
 msgid "Missed"
 msgstr "未接"
 
 #: ../lib/engine/components/evolution/evolution-book.cpp:76
-#: ../lib/engine/components/ldap/ldap-book.cpp:909
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
 #, c-format
 msgid "%d user found"
 msgid_plural "%d users found"
 msgstr[0] "已找到 %d 個使用者"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:244
+#: ../lib/engine/components/evolution/evolution-book.cpp:283
 msgid "New _Contact"
 msgstr "新增聯絡人(_C)"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:288
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
 #: ../lib/engine/components/local-roster/local-cluster.cpp:82
 #: ../lib/engine/components/local-roster/local-heap.cpp:117
 msgid "New contact"
 msgstr "新增聯絡人"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:290
-#: ../lib/engine/components/evolution/evolution-contact.cpp:328
-#: ../lib/engine/components/opal/opal-account.cpp:351
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
 msgid "Please update the following fields:"
 msgstr "請更新下列欄位:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:292
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:293
-#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
 msgid "VoIP _URI:"
 msgstr "VoIP _URI:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:294
-#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
 msgid "_Home phone:"
 msgstr "家用電話(_H):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:295
-#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
 msgid "_Office phone:"
 msgstr "公司電話(_O):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:296
-#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+#: ../lib/engine/components/evolution/evolution-book.cpp:327
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
 msgid "_Cell phone:"
 msgstr "手機(_C):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:297
-#: ../lib/engine/components/evolution/evolution-contact.cpp:343
+#: ../lib/engine/components/evolution/evolution-book.cpp:328
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
 msgid "_Pager:"
 msgstr "傳呼機(_P):"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:234
-#: ../lib/engine/components/local-roster/local-presentity.cpp:197
-#: ../lib/engine/components/opal/opal-account.cpp:308
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:203
-#: ../src/gui/main.cpp:3172
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3178
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:236
-#: ../lib/engine/components/local-roster/local-presentity.cpp:199
-#: ../lib/engine/components/opal/opal-account.cpp:310
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:205
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
 msgid "Edit contact"
 msgstr "編輯聯絡人"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:330
-#: ../lib/engine/components/local-roster/local-presentity.cpp:224
-#: ../lib/engine/components/local-roster/local-heap.cpp:184
-#: ../lib/engine/components/local-roster/local-heap.cpp:364
-#: ../lib/engine/components/opal/opal-account.cpp:353
-#: ../lib/engine/components/opal/opal-bank.cpp:99
-#: ../lib/engine/components/opal/opal-bank.cpp:109
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:169
-#: ../lib/engine/components/resource-list/rl-heap.cpp:544
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:224
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
 msgid "Name:"
 msgstr "姓名:"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:395
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
 msgid "Remove contact"
 msgstr "移除聯絡人"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:397
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
 #, c-format
 msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr "確定要從通訊錄中移除 %s？"
@@ -820,30 +820,30 @@
 msgstr "視像測試"
 
 #. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Crazy"
 msgstr "瘋狂"
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Screencast"
 msgstr "螢幕廣播"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:409
-#: ../lib/engine/components/resource-list/rl-entry.cpp:143
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:130
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:412
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
 msgid "_Remove addressbook"
 msgstr "移除通訊錄(_R)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:414
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
 msgid "Addressbook _properties"
 msgstr "通訊錄屬性(_P)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:545
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
 msgid "LDAP SASL Interaction"
 msgstr "LDAP SASL 通訊錄"
 
@@ -856,140 +856,138 @@
 #. * say about it. You might google for "challenge response
 #. * authentication" if you'd like more background context.
 #.
-#: ../lib/engine/components/ldap/ldap-book.cpp:587
-#, fuzzy
-#| msgid "Calling %s"
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
 msgid "Challenge: "
-msgstr "正在致電 %s"
+msgstr "Challenge 驗證："
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:595
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
 msgid "Interact"
 msgstr "互動式"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:664
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
 msgid "Refreshing"
 msgstr "重新整理中"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:670
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
 msgid "Could not initialize server"
 msgstr "無法初始化伺服器"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:684
-#: ../lib/engine/components/ldap/ldap-book.cpp:729
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
 msgid "LDAP Error: "
 msgstr "LDAP 錯誤:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:738
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
 msgid "Contacted server"
 msgstr "已連接的伺服器"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:781
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
 msgid "Could not connect to server"
 msgstr "無法連接伺服器"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:829
-#: ../lib/engine/components/ldap/ldap-book.cpp:882
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
 msgid "Could not search"
 msgstr "無法搜尋"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:837
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
 msgid "Waiting for search results"
 msgstr "等待搜尋結果"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:931
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
 msgid "Please edit the following fields"
 msgstr "請編輯下列欄位:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:933
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
 msgid "Book _Name"
 msgstr "書本名稱(_N)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:934
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
 msgid "Server _URI"
 msgstr "伺服器 _URI"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:935
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
 msgid "_Base DN"
 msgstr "基本 _DN"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:941
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
 msgid "Subtree"
 msgstr "子目錄"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:942
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
 msgid "Single Level"
 msgstr "同一層"
 
 # src/ldap_window.cpp:476
-#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
 msgid "_Search Scope"
 msgstr "搜尋範圍(_S)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:952
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
 msgid "_DisplayName Attribute"
 msgstr "顯示名稱屬性(_D)"
 
 # src/ldap_window.cpp:476
-#: ../lib/engine/components/ldap/ldap-book.cpp:953
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
 msgid "Call _Attributes"
 msgstr "通話屬性(_A)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:955
-#: ../lib/engine/components/ldap/ldap-book.cpp:957
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
 msgid "_Filter Template"
 msgstr "過濾條件範本(_F)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:959
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
 msgid "Bind _ID"
 msgstr "繫結 _ID"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:960
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
 msgid "_Password"
 msgstr "密碼(_P)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:961
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
 msgid "Use TLS"
 msgstr "使用 TLS"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:962
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
 msgid "Use SASL"
 msgstr "使用 SASL"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:976
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
 msgid "SASL _Mechanism"
 msgstr "SASL 機制"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:987
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
 msgid "Edit LDAP directory"
 msgstr "編輯 LDAP 使用者目錄"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1016
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
 msgid "Please provide a Book Name for this directory\n"
 msgstr "請提供這個目錄的書本名稱\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1019
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
 msgid "Please provide a Server URI\n"
 msgstr "請提供伺服器 URI\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1022
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
 msgid "Please provide a DisplayName Attribute\n"
 msgstr "請提供顯示名稱屬性\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1025
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
 msgid "Please provide a Call Attribute\n"
 msgstr "請提供通話屬性\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1028
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
 msgid "Invalid Server URI\n"
 msgstr "無效的伺服器 URI\n"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:127
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
 msgid "Add an LDAP Address Book"
 msgstr "加入 LDAP 通訊錄"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:130
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
 msgid "Add the Ekiga.net Directory"
 msgstr "加入 Ekiga.net 目錄"
 
@@ -1001,45 +999,45 @@
 msgid "Ekiga.net Directory"
 msgstr "Ekiga.net 目錄"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:221
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
 msgid "Edit roster element"
 msgstr "編輯名單元件"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:222
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
 msgstr "請填好這個表單以改變現有的 ekiga 內部名單"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:225
-#: ../lib/engine/components/local-roster/local-heap.cpp:193
-#: ../lib/engine/components/local-roster/local-heap.cpp:195
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:170
-#: ../lib/engine/components/resource-list/rl-heap.cpp:545
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
 msgid "Address:"
 msgstr "地址:"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:227
-#: ../lib/engine/components/resource-list/rl-heap.cpp:546
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
 msgid "Choose groups:"
 msgstr "選擇羣組:"
 
 #: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
-#: ../lib/engine/components/local-roster/local-heap.cpp:181
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
 msgid "Add to local roster"
 msgstr "加入至本地端名冊"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:92
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
 msgid "Services"
 msgstr "服務"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
 msgid "Echo test"
 msgstr "回音測試"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:94
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
 msgid "Conference room"
 msgstr "會議室"
 
@@ -1051,128 +1049,143 @@
 msgid "Rename"
 msgstr "重新命名"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:160
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
 msgid "Family"
 msgstr "家族"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:161
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
 msgid "Friend"
 msgstr "朋友"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:162
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
 msgid "Associate"
 msgstr "關聯"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:163
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
 msgid "Assistant"
 msgstr "助理"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:164
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
 msgid "Supervisor"
 msgstr "監督者"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:165
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
 msgid "Self"
 msgstr "自己"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:182
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
 msgid ""
 "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr "請填好這個表單以便加入新的聯絡人到 ekiga 內部名單"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:199
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
 msgid "Put contact in groups:"
 msgstr "將聯絡人置於羣組:"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:335
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
 msgid "You supplied an unsupported address"
 msgstr "你輸入的是不支援的位址"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:337
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
 msgid "You already have a contact with this address!"
 msgstr "你已經有使用這個位址的聯絡人了！"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:362
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
 msgid "Rename group"
 msgstr "重新命名羣組"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:363
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
 msgid "Please edit this group name"
 msgstr "請編輯這個羣組名稱"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:143
-#: ../lib/engine/components/opal/sip-endpoint.cpp:257
-#: ../lib/engine/components/opal/sip-endpoint.cpp:261
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:230
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
 msgid "Call"
 msgstr "通話"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:146
-#: ../lib/engine/components/opal/sip-endpoint.cpp:258
-#: ../lib/engine/components/opal/sip-endpoint.cpp:262 ../src/gui/main.cpp:2946
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:231
+#: ../lib/engine/components/opal/sip-endpoint.cpp:235 ../src/gui/main.cpp:2952
 msgid "Transfer"
 msgstr "轉送"
 
 #. Translators : The alias we are registering already exists : failure
-#: ../lib/engine/components/opal/h323-endpoint.cpp:310
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
 msgid "Duplicate alias"
 msgstr "重複的別名"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:313
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
 msgid "Bad username/password"
 msgstr "錯誤的使用者名稱/密碼"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:316
-#: ../lib/engine/components/opal/sip-endpoint.cpp:896
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:911
 msgid "Transport error"
 msgstr "轉送錯誤"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:327
-#: ../lib/engine/components/opal/h323-endpoint.cpp:332
-#: ../lib/engine/components/opal/sip-endpoint.cpp:903
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:918
 msgid "Failed"
 msgstr "失敗"
 
-#: ../lib/engine/components/opal/opal-account.cpp:300
+#: ../lib/engine/components/opal/opal-account.cpp:303
 msgid "_Disable"
 msgstr "停用(_D)"
 
-#: ../lib/engine/components/opal/opal-account.cpp:303
+#: ../lib/engine/components/opal/opal-account.cpp:306
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../lib/engine/components/opal/opal-account.cpp:324
-#: ../src/gui/assistant.cpp:725
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
 msgid "Recharge the account"
 msgstr "為帳號加值"
 
-#: ../lib/engine/components/opal/opal-account.cpp:329
-#: ../src/gui/assistant.cpp:737
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
 msgid "Consult the balance history"
 msgstr "查閱結算記錄"
 
-#: ../lib/engine/components/opal/opal-account.cpp:334
+#: ../lib/engine/components/opal/opal-account.cpp:337
 msgid "Consult the call history"
 msgstr "查閱通話記錄"
 
-#: ../lib/engine/components/opal/opal-account.cpp:349
-#: ../lib/engine/components/opal/opal-bank.cpp:72
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
 msgid "Edit account"
 msgstr "編輯帳號"
 
-#: ../lib/engine/components/opal/opal-account.cpp:355
-#: ../lib/engine/components/opal/opal-bank.cpp:110
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
 msgid "Registrar:"
 msgstr "註冊服務商："
 
-#: ../lib/engine/components/opal/opal-account.cpp:357
-#: ../lib/engine/components/opal/opal-bank.cpp:100
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
 msgid "Gatekeeper:"
 msgstr "閘道管理員："
 
-#: ../lib/engine/components/opal/opal-account.cpp:358
-#: ../lib/engine/components/opal/opal-bank.cpp:81
-#: ../lib/engine/components/opal/opal-bank.cpp:101
-#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:174
 msgid "User:"
 msgstr "使用者:"
@@ -1180,166 +1193,168 @@
 #. Translators:
 #. * SIP knows two usernames: The name for the client ("User") and the name
 #. * for the authentication procedure ("Authentication User")
-#: ../lib/engine/components/opal/opal-account.cpp:363
-#: ../lib/engine/components/opal/opal-bank.cpp:112
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
 msgid "Authentication User:"
 msgstr "驗證使用者:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:364
-#: ../lib/engine/components/opal/opal-bank.cpp:83
-#: ../lib/engine/components/opal/opal-bank.cpp:103
-#: ../lib/engine/components/opal/opal-bank.cpp:113
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:173
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:365
-#: ../lib/engine/components/opal/opal-bank.cpp:104
-#: ../lib/engine/components/opal/opal-bank.cpp:114
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
 msgid "Timeout:"
 msgstr "逾時時間:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:366
-#: ../lib/engine/components/opal/opal-bank.cpp:117
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
 msgid "Enable Account"
 msgstr "啟用帳號"
 
-#: ../lib/engine/components/opal/opal-account.cpp:401
-#: ../lib/engine/components/opal/opal-bank.cpp:155
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
 msgid "You did not supply a name for that account."
 msgstr "你沒有提供該帳號的名稱。"
 
-#: ../lib/engine/components/opal/opal-account.cpp:403
-#: ../lib/engine/components/opal/opal-bank.cpp:157
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
 msgid "You did not supply a host to register to."
 msgstr "你沒有提供該要註冊的主機。"
 
-#: ../lib/engine/components/opal/opal-account.cpp:405
-#: ../lib/engine/components/opal/opal-bank.cpp:159
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
 msgid "You did not supply a user name for that account."
 msgstr "你沒有提供該帳號的使用者名稱。"
 
-#: ../lib/engine/components/opal/opal-account.cpp:407
-#: ../lib/engine/components/opal/opal-bank.cpp:161
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
 msgid "The timeout should have a bigger value."
 msgstr "逾時時間應該使用更大的數值。"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:53
+#: ../lib/engine/components/opal/opal-bank.cpp:75
 msgid "_Add an Ekiga.net Account"
 msgstr "加入 Ekig_a.net 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:55
+#: ../lib/engine/components/opal/opal-bank.cpp:77
 msgid "_Add an Ekiga Call Out Account"
 msgstr "加入 Ekig_a Call Out 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:57
+#: ../lib/engine/components/opal/opal-bank.cpp:79
 msgid "_Add a SIP Account"
 msgstr "加入 S_IP 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:59
+#: ../lib/engine/components/opal/opal-bank.cpp:81
 msgid "_Add an H.323 Account"
 msgstr "加入 _H.323 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:73
+#: ../lib/engine/components/opal/opal-bank.cpp:96
 msgid "Please update the following fields."
 msgstr "請更新下列欄位:。"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:605
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
 msgid "Get an Ekiga.net SIP account"
 msgstr "取得 Ekiga.net SIP 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:713
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
 msgid "Get an Ekiga Call Out account"
 msgstr "取得 Ekiga Call Out 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:92 ../src/gui/main.cpp:2700
-#: ../src/gui/main.cpp:2795
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2706
+#: ../src/gui/main.cpp:2801
 msgid "Account ID:"
 msgstr "帳號 ID:"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:94
+#: ../lib/engine/components/opal/opal-bank.cpp:117
 msgid "PIN Code:"
 msgstr "PIN 碼:"
 
-#: ../lib/engine/components/opal/opal-call.cpp:444
+#: ../lib/engine/components/opal/opal-call.cpp:404
 msgid "Local user cleared the call"
 msgstr "本機使用者已清除通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:447
-#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:407
+#: ../lib/engine/components/opal/opal-call.cpp:410
 msgid "Local user rejected the call"
 msgstr "本機使用者拒絕接聽來電"
 
-#: ../lib/engine/components/opal/opal-call.cpp:453
+#: ../lib/engine/components/opal/opal-call.cpp:413
 msgid "Remote user cleared the call"
 msgstr "遠端使用者已清除通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:456
+#: ../lib/engine/components/opal/opal-call.cpp:416
 msgid "Remote user rejected the call"
 msgstr "遠端使用者拒絕通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:459
+#: ../lib/engine/components/opal/opal-call.cpp:419
 msgid "Remote user has stopped calling"
 msgstr "遠端使用者已停止通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:462
+#: ../lib/engine/components/opal/opal-call.cpp:422
 msgid "Abnormal call termination"
 msgstr "不正常終止通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:465 ../src/gui/main.cpp:1490
+#: ../lib/engine/components/opal/opal-call.cpp:425 ../src/gui/main.cpp:1496
 msgid "Could not connect to remote host"
 msgstr "無法連接遠端主機"
 
-#: ../lib/engine/components/opal/opal-call.cpp:468
+#: ../lib/engine/components/opal/opal-call.cpp:428
 msgid "The Gatekeeper cleared the call"
 msgstr "閘道管理員已清除通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:471
+#: ../lib/engine/components/opal/opal-call.cpp:431
 msgid "User not found"
 msgstr "找不到使用者"
 
-#: ../lib/engine/components/opal/opal-call.cpp:474
+#: ../lib/engine/components/opal/opal-call.cpp:434
 msgid "Insufficient bandwidth"
 msgstr "頻寬不足"
 
-#: ../lib/engine/components/opal/opal-call.cpp:477
+#: ../lib/engine/components/opal/opal-call.cpp:437
 msgid "No common codec"
 msgstr "沒有通用的編碼解碼器"
 
-#: ../lib/engine/components/opal/opal-call.cpp:480
+#: ../lib/engine/components/opal/opal-call.cpp:440
 msgid "Call forwarded"
 msgstr "來電已轉駁"
 
-#: ../lib/engine/components/opal/opal-call.cpp:483
+#: ../lib/engine/components/opal/opal-call.cpp:443
 msgid "Security check failed"
 msgstr "安全性檢查失敗"
 
-#: ../lib/engine/components/opal/opal-call.cpp:486
+#: ../lib/engine/components/opal/opal-call.cpp:446
 msgid "Local user is busy"
 msgstr "本機使用者現正忙碌"
 
-#: ../lib/engine/components/opal/opal-call.cpp:489
-#: ../lib/engine/components/opal/opal-call.cpp:495
+#: ../lib/engine/components/opal/opal-call.cpp:449
+#: ../lib/engine/components/opal/opal-call.cpp:455
 msgid "Congested link to remote party"
 msgstr "遠端使用者線路擁塞"
 
-#: ../lib/engine/components/opal/opal-call.cpp:492
+#: ../lib/engine/components/opal/opal-call.cpp:452
 msgid "Remote user is busy"
 msgstr "遠端使用者現正忙碌"
 
-#: ../lib/engine/components/opal/opal-call.cpp:498
+#: ../lib/engine/components/opal/opal-call.cpp:458
 msgid "Remote host is offline"
 msgstr "遠端主機不在網上"
 
-#: ../lib/engine/components/opal/opal-call.cpp:504
+#: ../lib/engine/components/opal/opal-call.cpp:464
 msgid "User is not available"
 msgstr "使用者現正不在"
 
-#: ../lib/engine/components/opal/opal-call.cpp:516
+#: ../lib/engine/components/opal/opal-call.cpp:476
 msgid "Call completed"
 msgstr "通話完成"
 
-#: ../lib/engine/components/opal/opal-call-manager.cpp:725
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
 msgid ""
 "Ekiga did not manage to configure your network settings automatically. You "
 "can still use it, but you need to configure your network settings manually.\n"
@@ -1351,218 +1366,218 @@
 "\n"
 "請查閱 http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually 以取得指示"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:282
-#: ../lib/engine/components/opal/sip-endpoint.cpp:284
+#: ../lib/engine/components/opal/sip-endpoint.cpp:255
+#: ../lib/engine/components/opal/sip-endpoint.cpp:257
 msgid "Message"
 msgstr "訊息"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:710
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
 msgid "Bad request"
 msgstr "錯誤要求"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:714
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
 msgid "Payment required"
 msgstr "須要付帳"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:718
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
 msgid "Unauthorized"
 msgstr "未驗證"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:722
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
 msgid "Forbidden"
 msgstr "被禁止"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:726
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
 msgid "Timeout"
 msgstr "逾時"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:730
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
 msgid "Conflict"
 msgstr "衝突"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:734
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
 msgid "Temporarily unavailable"
 msgstr "暫時無法使用"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:738
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
 msgid "Not acceptable"
 msgstr "不能接受"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:742
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
 msgid "Illegal status code"
 msgstr "不合法的狀態代碼"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:746
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
 msgid "Multiple choices"
 msgstr "多重選擇"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:750
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
 msgid "Moved permanently"
 msgstr "永久移動"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:754
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
 msgid "Moved temporarily"
 msgstr "暫時移動"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:758
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
 msgid "Use proxy"
 msgstr "使用代理伺服器"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:762
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
 msgid "Alternative service"
 msgstr "替代的服務"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:766
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
 msgid "Not found"
 msgstr "找不到"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:770
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
 msgid "Method not allowed"
 msgstr "這個方法是不允許的"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:774
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
 msgid "Proxy authentication required"
 msgstr "代理伺服器需要驗證"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:778
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
 msgid "Length required"
 msgstr "要求長度"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:782
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
 msgid "Request entity too big"
 msgstr "要求項目太大"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:786
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
 msgid "Request URI too long"
 msgstr "要求 URI 太長"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:790
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
 msgid "Unsupported media type"
 msgstr "不支援的媒體類型"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:794
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
 msgid "Unsupported URI scheme"
 msgstr "不支援的 URI 結構"
 
 #. Translators : The extension we are trying to register does not exist
-#: ../lib/engine/components/opal/sip-endpoint.cpp:799
+#: ../lib/engine/components/opal/sip-endpoint.cpp:814
 msgid "Bad extension"
 msgstr "錯誤的延伸檔名"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:803
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
 msgid "Extension required"
 msgstr "需要擴充功能"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:807
+#: ../lib/engine/components/opal/sip-endpoint.cpp:822
 msgid "Interval too brief"
 msgstr "間隔太短"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:811
+#: ../lib/engine/components/opal/sip-endpoint.cpp:826
 msgid "Loop detected"
 msgstr "偵測到廻圈"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:815
+#: ../lib/engine/components/opal/sip-endpoint.cpp:830
 msgid "Too many hops"
-msgstr ""
+msgstr "hops 過多"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:819
+#: ../lib/engine/components/opal/sip-endpoint.cpp:834
 msgid "Address incomplete"
 msgstr "位址不完整"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:823
+#: ../lib/engine/components/opal/sip-endpoint.cpp:838
 msgid "Ambiguous"
 msgstr "模稜兩可的"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:827
+#: ../lib/engine/components/opal/sip-endpoint.cpp:842
 msgid "Busy Here"
 msgstr "此處佔線"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:831
+#: ../lib/engine/components/opal/sip-endpoint.cpp:846
 msgid "Request terminated"
 msgstr "要求已終止"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:835
+#: ../lib/engine/components/opal/sip-endpoint.cpp:850
 msgid "Not acceptable here"
 msgstr "這裏不能接受"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:839
+#: ../lib/engine/components/opal/sip-endpoint.cpp:854
 msgid "Bad event"
 msgstr "錯誤的事件"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:843
+#: ../lib/engine/components/opal/sip-endpoint.cpp:858
 msgid "Request pending"
 msgstr "要求保留中"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:847
+#: ../lib/engine/components/opal/sip-endpoint.cpp:862
 msgid "Undecipherable"
 msgstr "無法解譯的"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:851
+#: ../lib/engine/components/opal/sip-endpoint.cpp:866
 msgid "Internal server error"
 msgstr "內部的伺服器錯誤"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:855
+#: ../lib/engine/components/opal/sip-endpoint.cpp:870
 msgid "Not implemented"
 msgstr "未實作"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:859
+#: ../lib/engine/components/opal/sip-endpoint.cpp:874
 msgid "Bad gateway"
 msgstr "錯誤的閘道器"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:863
+#: ../lib/engine/components/opal/sip-endpoint.cpp:878
 msgid "Service unavailable"
 msgstr "服務無法使用"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:867
+#: ../lib/engine/components/opal/sip-endpoint.cpp:882
 msgid "Server timeout"
 msgstr "伺服器逾時"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:871
+#: ../lib/engine/components/opal/sip-endpoint.cpp:886
 msgid "SIP version not supported"
 msgstr "不支援此 SIP 版本"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:875
+#: ../lib/engine/components/opal/sip-endpoint.cpp:890
 msgid "Message too large"
 msgstr "訊息太大"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:879
+#: ../lib/engine/components/opal/sip-endpoint.cpp:894
 msgid "Busy everywhere"
 msgstr "到處佔線"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:883
+#: ../lib/engine/components/opal/sip-endpoint.cpp:898
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:887
+#: ../lib/engine/components/opal/sip-endpoint.cpp:902
 msgid "Does not exist anymore"
 msgstr "不再存在"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:891
+#: ../lib/engine/components/opal/sip-endpoint.cpp:906
 msgid "Globally not acceptable"
 msgstr "全域無法接受"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1020
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1043
 msgid "Could not send message"
 msgstr "無法傳送訊息"
 
 # src/endpoint.cpp:467
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1165
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
 # src/endpoint.cpp:467
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1136
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1167
 #, c-format
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1142
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1173
 #, c-format
 msgid "In a call with %s"
 msgstr "與 %s 通話中"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1144
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1175
 #, c-format
 msgid "In a call"
 msgstr "通話中"
@@ -1588,11 +1603,11 @@
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:103
-#: ../lib/engine/components/resource-list/rl-heap.cpp:144
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
 #: ../lib/engine/components/resource-list/rl-heap.cpp:178
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:133
-#: ../lib/engine/components/resource-list/rl-entry.cpp:130
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
 msgid "Unnamed"
 msgstr "未命名的"
 
@@ -1608,74 +1623,74 @@
 msgid "Contact list _properties"
 msgstr "聯絡人清單(_P)"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:467
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
 msgid "Edit contact list properties"
 msgstr "編輯聯絡人清單屬性"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
 msgid "Please edit the following fields (no identifier means global)"
 msgstr "請編輯下列欄位（沒有識別碼則代表全域）"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
 msgid "Contact list's name"
 msgstr "聯絡人清單名稱"
 
 #. "Document" used as a name -- uri point to the root of a document tree
-#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
 msgid "Document root"
 msgstr "文件根目錄"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
 msgid "Identifier"
 msgstr "識別碼"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:476
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
 msgid "Writable"
 msgstr "可寫的"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:477
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
 msgid "Server username"
 msgstr "伺服器使用者名稱"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:478
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
 msgid "Server password"
 msgstr "伺服器密碼"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:530
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
 msgid "Add a remote contact"
 msgstr "加入遠端聯絡人"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:531
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
 msgid "Please fill in this form to create a new contact on a remote server"
 msgstr "請填好這個表單以便在遠端伺服器建立新的聯絡人"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:221
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
 msgid "Edit remote contact"
 msgstr "編輯遠端聯絡人"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
 msgid ""
 "Please fill in this form to change an existing contact on a remote server"
 msgstr "請填好這個表單以改變遠端伺服器既存的聯絡人"
 
-#: ../lib/engine/components/resource-list/rl-entry.cpp:186
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
 msgid "Invalid server data"
 msgstr "無效的伺服器資料"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:51
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
 msgid "Click to fetch"
 msgstr "按這裏取得"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:118
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
 msgid "Distant contact"
 msgstr "遠端聯絡人"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:181
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
 #, c-format
 msgid "%s / List #%d"
 msgstr "%s /清單 #%d"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:185
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
 #, c-format
 msgid "List #%d"
 msgstr "清單 #%d"
@@ -1689,7 +1704,7 @@
 msgstr "通訊錄"
 
 #: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
-#: ../src/gui/main.cpp:3121
+#: ../src/gui/main.cpp:3127
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
@@ -1703,7 +1718,7 @@
 msgstr "分類"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
-#: ../src/gui/assistant.cpp:1377
+#: ../src/gui/assistant.cpp:1368
 msgid "Full Name"
 msgstr "全名"
 
@@ -1724,7 +1739,7 @@
 msgid "Copy link"
 msgstr "複製連結"
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:904
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
 msgid "_Smile..."
 msgstr "微笑(_S)..."
 
@@ -1738,11 +1753,11 @@
 msgid "Unsorted"
 msgstr "未排序"
 
-#: ../lib/gui/codecsbox.cpp:477
+#: ../lib/gui/codecsbox.cpp:478
 msgid "Move selected codec priority upwards"
 msgstr "將選定的 codec 優先權提高"
 
-#: ../lib/gui/codecsbox.cpp:487
+#: ../lib/gui/codecsbox.cpp:488
 msgid "Move selected codec priority downwards"
 msgstr "將選定的 codec 優先權降低"
 
@@ -1750,50 +1765,50 @@
 msgid "Do not show this dialog again"
 msgstr "不再顯示此對話框"
 
-#: ../src/gui/accounts.cpp:229
+#: ../src/gui/accounts.cpp:230
 msgid "Registered"
 msgstr "已註冊"
 
 # src/pref_window.cpp:2113
-#: ../src/gui/accounts.cpp:233
+#: ../src/gui/accounts.cpp:234
 msgid "Unregistered"
 msgstr "已取消註冊"
 
-#: ../src/gui/accounts.cpp:237
+#: ../src/gui/accounts.cpp:238
 msgid "Could not unregister"
 msgstr "無法取消註冊"
 
-#: ../src/gui/accounts.cpp:243
+#: ../src/gui/accounts.cpp:244
 msgid "Could not register"
 msgstr "無法註冊"
 
-#: ../src/gui/accounts.cpp:249
+#: ../src/gui/accounts.cpp:250
 msgid "Processing..."
 msgstr "處理中..."
 
-#: ../src/gui/accounts.cpp:632
+#: ../src/gui/accounts.cpp:636
 msgid "Account Name"
 msgstr "帳號名稱"
 
-#: ../src/gui/accounts.cpp:633
+#: ../src/gui/accounts.cpp:637
 msgid "Voice Mails"
 msgstr "語音信箱"
 
-#: ../src/gui/accounts.cpp:634
+#: ../src/gui/accounts.cpp:638
 msgid "Status"
 msgstr "狀態"
 
 # src/menu.cpp:383
-#: ../src/gui/accounts.cpp:645 ../src/gui/accounts.cpp:688
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
 msgid "Accounts"
 msgstr "帳號"
 
 # src/menu.cpp:383
-#: ../src/gui/accounts.cpp:659 ../src/gui/main.cpp:3182
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3188
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3265
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3271
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -1802,11 +1817,11 @@
 #. * description in the list of configured accounts, it shows if an account
 #. * is activated or not (a status the user can choose).
 #.
-#: ../src/gui/accounts.cpp:696 ../src/gui/preferences.cpp:586
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
 msgid "A"
 msgstr "A"
 
-#: ../src/gui/assistant.cpp:323
+#: ../src/gui/assistant.cpp:321
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1818,38 +1833,38 @@
 "\n"
 "一旦你完成了這些步驟，你還是可以在主選單編輯選項的「偏好設定」中修改它們。"
 
-#: ../src/gui/assistant.cpp:331
+#: ../src/gui/assistant.cpp:329
 msgid "Welcome to Ekiga"
 msgstr "歡迎使用 Ekiga"
 
-#: ../src/gui/assistant.cpp:365 ../src/gui/preferences.cpp:454
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "個人資料"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:368
+#: ../src/gui/assistant.cpp:356
 msgid "Please enter your first name and your surname:"
 msgstr "請輸入你的姓名："
 
-#: ../src/gui/assistant.cpp:377
+#: ../src/gui/assistant.cpp:365
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
 msgstr "你的姓名會用於連接到其它 VoIP 及視像會議軟件。"
 
-#: ../src/gui/assistant.cpp:568
+#: ../src/gui/assistant.cpp:559
 msgid "Ekiga.net Account"
 msgstr "Ekiga.net 帳號"
 
-#: ../src/gui/assistant.cpp:570
+#: ../src/gui/assistant.cpp:561
 msgid "Please enter your username:"
 msgstr "請輸入你的使用者名稱："
 
-#: ../src/gui/assistant.cpp:578
+#: ../src/gui/assistant.cpp:569
 msgid "Please enter your password:"
 msgstr "請輸入你的密碼："
 
-#: ../src/gui/assistant.cpp:588
+#: ../src/gui/assistant.cpp:579
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1863,23 +1878,23 @@
 "\n"
 "如你已使用其它的 SIP 服務，你可以略過這一步。或是你想遲些才設定登入資訊。"
 
-#: ../src/gui/assistant.cpp:615
+#: ../src/gui/assistant.cpp:606
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "我不想登記 ekiga.net 的免費服務"
 
-#: ../src/gui/assistant.cpp:678
+#: ../src/gui/assistant.cpp:669
 msgid "Ekiga Call Out Account"
 msgstr "Ekiga Call Out 帳號"
 
-#: ../src/gui/assistant.cpp:680
+#: ../src/gui/assistant.cpp:671
 msgid "Please enter your account ID:"
 msgstr "請輸入你的帳號 ID："
 
-#: ../src/gui/assistant.cpp:688
+#: ../src/gui/assistant.cpp:679
 msgid "Please enter your PIN code:"
 msgstr "請輸入你的 PIN 碼："
 
-#: ../src/gui/assistant.cpp:699
+#: ../src/gui/assistant.cpp:690
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1897,48 +1912,48 @@
 "- 接着輸入你的帳號 ID 及 PIN 碼。\n"
 "服務只會在以本對話盒中的 URL 建立帳號後才能使用。\n"
 
-#: ../src/gui/assistant.cpp:749
+#: ../src/gui/assistant.cpp:740
 msgid "Consult the calls history"
 msgstr "查閱通話記錄"
 
-#: ../src/gui/assistant.cpp:759
+#: ../src/gui/assistant.cpp:750
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr "我不想登記 Ekiga Call Out 服務"
 
-#: ../src/gui/assistant.cpp:825 ../src/gui/assistant.cpp:1388
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
 msgid "Connection Type"
 msgstr "連線類型"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:828
+#: ../src/gui/assistant.cpp:819
 msgid "Please choose your connection type:"
 msgstr "請選擇你的連線類型："
 
-#: ../src/gui/assistant.cpp:845
+#: ../src/gui/assistant.cpp:836
 msgid "56k Modem"
 msgstr "56k 數據機"
 
-#: ../src/gui/assistant.cpp:850
+#: ../src/gui/assistant.cpp:841
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:855
+#: ../src/gui/assistant.cpp:846
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "DSL/Cable (128 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:860
+#: ../src/gui/assistant.cpp:851
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "DSL/Cable (512 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:865
+#: ../src/gui/assistant.cpp:856
 msgid "LAN"
 msgstr "LAN"
 
-#: ../src/gui/assistant.cpp:870
+#: ../src/gui/assistant.cpp:861
 msgid "Keep current settings"
 msgstr "使用目前的設定"
 
-#: ../src/gui/assistant.cpp:875
+#: ../src/gui/assistant.cpp:866
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -1947,98 +1962,98 @@
 "連線類型會決定 Ekiga 該連線類型下取得最佳品質的設定。\n"
 "你可以稍後在偏好設定中獨立地修改這設定。"
 
-#: ../src/gui/assistant.cpp:969 ../src/gui/main.cpp:3011
-#: ../src/gui/main.cpp:3015 ../src/gui/preferences.cpp:760
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3017
+#: ../src/gui/main.cpp:3021 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "音訊裝置"
 
-#: ../src/gui/assistant.cpp:971
+#: ../src/gui/assistant.cpp:962
 msgid "Please choose the audio ringing device:"
 msgstr "請選擇音效響鈴裝置："
 
-#: ../src/gui/assistant.cpp:991
+#: ../src/gui/assistant.cpp:982
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
 msgstr "音效響鈴裝置是用來播放來電鈴聲音效的裝置。"
 
 #. ---
-#: ../src/gui/assistant.cpp:1002
+#: ../src/gui/assistant.cpp:993
 msgid "Please choose the audio output device:"
 msgstr "請選擇音訊輸出裝置："
 
-#: ../src/gui/assistant.cpp:1022
+#: ../src/gui/assistant.cpp:1013
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
 msgstr "音訊輸出裝置是在通話時用來播放聲音的裝置。"
 
 #. ---
-#: ../src/gui/assistant.cpp:1033
+#: ../src/gui/assistant.cpp:1024
 msgid "Please choose the audio input device:"
 msgstr "請選擇音訊輸入裝置："
 
-#: ../src/gui/assistant.cpp:1053
+#: ../src/gui/assistant.cpp:1044
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
 msgstr "音訊輸入裝置是在通話時用來收錄你聲音的裝置。"
 
-#: ../src/gui/assistant.cpp:1155
+#: ../src/gui/assistant.cpp:1146
 msgid "Please choose your video input device:"
 msgstr "請選擇你的視像輸入裝置："
 
-#: ../src/gui/assistant.cpp:1175
+#: ../src/gui/assistant.cpp:1166
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
 msgstr "視像輸入裝置是在通話時用來擷取視像的裝置。"
 
-#: ../src/gui/assistant.cpp:1240 ../src/gui/assistant.cpp:1264
-#: ../src/gui/assistant.cpp:1288 ../src/gui/preferences.cpp:805
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
 #: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "找不到任何裝置"
 
-#: ../src/gui/assistant.cpp:1319
+#: ../src/gui/assistant.cpp:1310
 msgid "Configuration Complete"
 msgstr "設定完成"
 
-#: ../src/gui/assistant.cpp:1321
+#: ../src/gui/assistant.cpp:1312
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
 msgstr "你現在已經完成 Ekiga 組態設定。所有的設定值都能在 Ekiga 偏好設定中更改。請儘情享受！"
 
-#: ../src/gui/assistant.cpp:1328
+#: ../src/gui/assistant.cpp:1319
 msgid "Configuration summary:"
 msgstr "組態摘要:"
 
-#: ../src/gui/assistant.cpp:1398
+#: ../src/gui/assistant.cpp:1389
 msgid "Audio Ringing Device"
 msgstr "音效響鈴裝置"
 
-#: ../src/gui/assistant.cpp:1407
+#: ../src/gui/assistant.cpp:1398
 msgid "Audio Output Device"
 msgstr "音效輸出裝置"
 
-#: ../src/gui/assistant.cpp:1416
+#: ../src/gui/assistant.cpp:1407
 msgid "Audio Input Device"
 msgstr "音效輸入裝置"
 
-#: ../src/gui/assistant.cpp:1425
+#: ../src/gui/assistant.cpp:1416
 msgid "Video Input Device"
 msgstr "視像輸入裝置"
 
-#: ../src/gui/assistant.cpp:1438
+#: ../src/gui/assistant.cpp:1429
 msgid "SIP URI"
 msgstr "SIP URI"
 
-#: ../src/gui/assistant.cpp:1450
+#: ../src/gui/assistant.cpp:1441
 msgid "Ekiga Call Out"
 msgstr "Ekiga Call Out"
 
-#: ../src/gui/assistant.cpp:1492
+#: ../src/gui/assistant.cpp:1485
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr "Ekiga 組態助理 (%d / %d)"
@@ -2145,104 +2160,104 @@
 
 # src/pref_window.cpp:2113
 #. Translators: Is displayed once an account "%s" is registered.
-#: ../src/gui/main.cpp:519
+#: ../src/gui/main.cpp:521
 #, c-format
 msgid "Registered %s"
 msgstr "已註冊到 %s"
 
 # src/pref_window.cpp:2113
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:525
+#: ../src/gui/main.cpp:528
 #, c-format
 msgid "Unregistered %s"
 msgstr "已取消註冊 %s"
 
-#: ../src/gui/main.cpp:530
+#: ../src/gui/main.cpp:533
 #, c-format
 msgid "Could not unregister %s"
 msgstr "無法取消註冊 %s"
 
-#: ../src/gui/main.cpp:534
+#: ../src/gui/main.cpp:537
 #, c-format
 msgid "Could not register %s"
 msgstr "無法註冊 %s"
 
-#: ../src/gui/main.cpp:604
+#: ../src/gui/main.cpp:607
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 
-#: ../src/gui/main.cpp:650
+#: ../src/gui/main.cpp:653
 #, c-format
 msgid "Connected with %s"
 msgstr "與 %s 連線"
 
-#: ../src/gui/main.cpp:691 ../src/gui/main.cpp:3511
+#: ../src/gui/main.cpp:694 ../src/gui/main.cpp:3517
 msgid "Standby"
 msgstr "備用"
 
-#: ../src/gui/main.cpp:752
+#: ../src/gui/main.cpp:755
 msgid "Call on hold"
 msgstr "保留通話"
 
-#: ../src/gui/main.cpp:763
+#: ../src/gui/main.cpp:766
 msgid "Call retrieved"
 msgstr "來電已收到"
 
-#: ../src/gui/main.cpp:779
+#: ../src/gui/main.cpp:782
 #, c-format
 msgid "Missed call from %s"
 msgstr "來自 %s 的未接來電"
 
-#: ../src/gui/main.cpp:916
+#: ../src/gui/main.cpp:919
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/gui/main.cpp:981
+#: ../src/gui/main.cpp:984
 msgid "Error while initializing video output"
 msgstr "初始化視像輸出裝置時發生錯誤"
 
-#: ../src/gui/main.cpp:982
+#: ../src/gui/main.cpp:985
 msgid "No video will be displayed during this call->"
 msgstr "在這次通話中將不顯示視像->"
 
-#: ../src/gui/main.cpp:992
+#: ../src/gui/main.cpp:995
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that no other application is using the accelerated video output."
 msgstr "在開啟或初始化視像輸出時發生錯誤。請確認沒有其他應用程式在使用加速視像輸出。"
 
-#: ../src/gui/main.cpp:994
+#: ../src/gui/main.cpp:997
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that you are using a color depth of 24 or 32 bits per pixel."
 msgstr "在開啟或初始化視像輸出時發生錯誤。請確認你使用的顏色深度為每像素 24 或 32 位元。"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1107
+#: ../src/gui/main.cpp:1110
 #, c-format
 msgid "Added video input device %s"
 msgstr "加入的視像輸入裝置 %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1119
+#: ../src/gui/main.cpp:1122
 #, c-format
 msgid "Removed video input device %s"
 msgstr "移除的視像輸入裝置 %s"
 
-#: ../src/gui/main.cpp:1136
+#: ../src/gui/main.cpp:1139
 #, c-format
 msgid "Error while accessing video device %s"
 msgstr "開啟視像裝置 %s 時發生錯誤"
 
-#: ../src/gui/main.cpp:1139
+#: ../src/gui/main.cpp:1142
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
 "plugin and \"Moving logo\" or \"Static picture\" as device."
 msgstr "在通話時會傳送一個移動的標幟。請注意你隨時可以傳送圖片或移動式標幟，只要將視像外掛程式選擇為「Picture」，並且將裝置選擇為「Moving logo」或「Static picture」。"
 
-#: ../src/gui/main.cpp:1143
+#: ../src/gui/main.cpp:1146
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
@@ -2250,15 +2265,15 @@
 "driver is loaded."
 msgstr "當開啟該裝置時發生錯誤。如果它是外接式裝置，可以再重新連接看看。如果不是，或者重新連接後仍無法使用，請檢查你的權限並確定已載入合適的驅動程式。"
 
-#: ../src/gui/main.cpp:1147
+#: ../src/gui/main.cpp:1150
 msgid "Your video driver doesn't support the requested video format."
 msgstr "此視像驅動程式不支援所要求的視像格式。"
 
-#: ../src/gui/main.cpp:1151
+#: ../src/gui/main.cpp:1154
 msgid "Could not open the chosen channel."
 msgstr "無法開啟所選的通道。"
 
-#: ../src/gui/main.cpp:1155
+#: ../src/gui/main.cpp:1158
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2268,42 +2283,42 @@
 "你的驅動程式不支援任何 Ekiga 所支援的彩色格式。\n"
 "請檢查你的核心驅動程式文件以確定該調色板是得到支援。"
 
-#: ../src/gui/main.cpp:1159
+#: ../src/gui/main.cpp:1162
 msgid "Error while setting the frame rate."
 msgstr "設定幀率時發生錯誤。"
 
-#: ../src/gui/main.cpp:1163
+#: ../src/gui/main.cpp:1166
 msgid "Error while setting the frame size."
 msgstr "設定幀尺寸時發生錯誤。"
 
-#: ../src/gui/main.cpp:1168 ../src/gui/main.cpp:1270 ../src/gui/main.cpp:1385
+#: ../src/gui/main.cpp:1171 ../src/gui/main.cpp:1273 ../src/gui/main.cpp:1388
 msgid "Unknown error."
 msgstr "不明的錯誤。"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1218
+#: ../src/gui/main.cpp:1221
 #, c-format
 msgid "Added audio input device %s"
 msgstr "加入的音訊輸入裝置 %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1235
+#: ../src/gui/main.cpp:1238
 #, c-format
 msgid "Removed audio input device %s"
 msgstr "移除的音訊輸入裝置 %s"
 
-#: ../src/gui/main.cpp:1252
+#: ../src/gui/main.cpp:1255
 #, c-format
 msgid "Error while opening audio input device %s"
 msgstr "開啟音效輸入裝置 %s 時發生錯誤"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
-#: ../src/gui/main.cpp:1257
+#: ../src/gui/main.cpp:1260
 msgid "Only silence will be transmitted."
 msgstr "無法傳輸任何聲音。"
 
-#: ../src/gui/main.cpp:1261
+#: ../src/gui/main.cpp:1264
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2311,7 +2326,7 @@
 "that the device is not busy."
 msgstr "無法開啟所選擇的音訊裝置來錄音。如果它是外接式裝置，可以再重新連接看看。如果不是，或者重新連接後仍無法使用，請檢查你的音訊設定，權限及裝置並不是使用中。"
 
-#: ../src/gui/main.cpp:1265
+#: ../src/gui/main.cpp:1268
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2319,26 +2334,26 @@
 "check your audio setup."
 msgstr "所選擇的音訊裝置開啟成功，但無法在這裝置中讀取資料。如果它是外接式裝置，可以再重新連接看看。如果不是，或者重新連接後仍無法使用，請檢查你的音訊設定。"
 
-#: ../src/gui/main.cpp:1332
+#: ../src/gui/main.cpp:1335
 #, c-format
 msgid "Added audio output device %s"
 msgstr "加入的音訊輸出裝置 %s"
 
-#: ../src/gui/main.cpp:1348
+#: ../src/gui/main.cpp:1351
 #, c-format
 msgid "Removed audio output device %s"
 msgstr "移除的音訊輸出裝置 %s"
 
-#: ../src/gui/main.cpp:1369
+#: ../src/gui/main.cpp:1372
 #, c-format
 msgid "Error while opening audio output device %s"
 msgstr "開啟音效輸出裝置 %s 時發生錯誤"
 
-#: ../src/gui/main.cpp:1372
+#: ../src/gui/main.cpp:1375
 msgid "No incoming sound will be played."
 msgstr "沒有要播放的來電音效。"
 
-#: ../src/gui/main.cpp:1376
+#: ../src/gui/main.cpp:1379
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2346,7 +2361,7 @@
 "that the device is not busy."
 msgstr "無法開啟所選擇的音訊裝置來播放。如果它是外接式裝置，可以再重新連接看看。如果不是，或者重新連接後仍無法使用，請檢查你的音訊設定，權限及裝置不是使用中。"
 
-#: ../src/gui/main.cpp:1380
+#: ../src/gui/main.cpp:1383
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
@@ -2354,342 +2369,338 @@
 "check your audio setup."
 msgstr "所選擇的音訊裝置開啟成功，但無法寫入資料到裝置中。如果它是外接式裝置，可以再重新連接看看。如果不是，或者重新連接後仍無法使用，請檢查你的音訊設定。"
 
-#: ../src/gui/main.cpp:1568
+#: ../src/gui/main.cpp:1574
 msgid "Video Settings"
 msgstr "視像設定"
 
-#: ../src/gui/main.cpp:1595
+#: ../src/gui/main.cpp:1601
 msgid "Adjust brightness"
 msgstr "調整亮度"
 
-#: ../src/gui/main.cpp:1616
+#: ../src/gui/main.cpp:1622
 msgid "Adjust whiteness"
 msgstr "調整白平衡"
 
-#: ../src/gui/main.cpp:1637
+#: ../src/gui/main.cpp:1643
 msgid "Adjust color"
 msgstr "調整顏色"
 
-#: ../src/gui/main.cpp:1658
+#: ../src/gui/main.cpp:1664
 msgid "Adjust contrast"
 msgstr "調整對比度"
 
-#: ../src/gui/main.cpp:1704
+#: ../src/gui/main.cpp:1710
 msgid "Audio Settings"
 msgstr "音訊設定"
 
-#: ../src/gui/main.cpp:2315
+#: ../src/gui/main.cpp:2321
 msgid "_Retrieve Call"
 msgstr "恢復通話(_R)"
 
-#: ../src/gui/main.cpp:2328
+#: ../src/gui/main.cpp:2334
 msgid "_Hold Call"
 msgstr "保留通話(_H)"
 
-#: ../src/gui/main.cpp:2360 ../src/gui/main.cpp:3148
+#: ../src/gui/main.cpp:2366 ../src/gui/main.cpp:3154
 msgid "Suspend _Audio"
 msgstr "暫停音訊(_A)"
 
-#: ../src/gui/main.cpp:2362 ../src/gui/main.cpp:3153
+#: ../src/gui/main.cpp:2368 ../src/gui/main.cpp:3159
 msgid "Suspend _Video"
 msgstr "暫停視像(_V)"
 
-#: ../src/gui/main.cpp:2364
+#: ../src/gui/main.cpp:2370
 msgid "Resume _Audio"
 msgstr "恢復音訊(_A)"
 
-#: ../src/gui/main.cpp:2366
+#: ../src/gui/main.cpp:2372
 msgid "Resume _Video"
 msgstr "恢復視像(_V)"
 
-#: ../src/gui/main.cpp:2649 ../src/gui/main.cpp:2801
+#: ../src/gui/main.cpp:2655 ../src/gui/main.cpp:2807
 msgid "Reject"
 msgstr "拒接"
 
-#: ../src/gui/main.cpp:2651 ../src/gui/main.cpp:2800
+#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2806
 msgid "Accept"
 msgstr "接受"
 
 # src/endpoint.cpp:467
-#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2788
+#: ../src/gui/main.cpp:2663 ../src/gui/main.cpp:2794
 msgid "Incoming call from"
 msgstr "來電來自"
 
 # src/menu.cpp:509
-#: ../src/gui/main.cpp:2675 ../src/gui/main.cpp:2791
+#: ../src/gui/main.cpp:2681 ../src/gui/main.cpp:2797
 msgid "Remote URI:"
 msgstr "遠端 URI："
 
-#: ../src/gui/main.cpp:2687 ../src/gui/main.cpp:2793
+#: ../src/gui/main.cpp:2693 ../src/gui/main.cpp:2799
 msgid "Remote Application:"
 msgstr "遠端程式："
 
-#: ../src/gui/main.cpp:2708
+#: ../src/gui/main.cpp:2714
 #, c-format
 msgid "Call from %s"
 msgstr "%s 來電"
 
-#: ../src/gui/main.cpp:2914
+#: ../src/gui/main.cpp:2920
 #, c-format
 msgid "Call Duration: %s\n"
 msgstr "通話時間：%s\n"
 
-#: ../src/gui/main.cpp:2945
+#: ../src/gui/main.cpp:2951
 msgid "Transfer call to:"
 msgstr "轉送通話到："
 
-#: ../src/gui/main.cpp:2997
+#: ../src/gui/main.cpp:3003
 msgid "No"
 msgstr "否"
 
-#: ../src/gui/main.cpp:2999
+#: ../src/gui/main.cpp:3005
 msgid "Yes"
 msgstr "是"
 
-#: ../src/gui/main.cpp:3010
+#: ../src/gui/main.cpp:3016
 msgid "Detected new audio input device:"
 msgstr "偵測到新的音訊輸入裝置："
 
-#: ../src/gui/main.cpp:3014
+#: ../src/gui/main.cpp:3020
 msgid "Detected new audio output device:"
 msgstr "偵測到新的音訊輸出裝置："
 
-#: ../src/gui/main.cpp:3018
+#: ../src/gui/main.cpp:3024
 msgid "Detected new video input device:"
 msgstr "偵測到新的視像輸入裝置："
 
-#: ../src/gui/main.cpp:3019 ../src/gui/preferences.cpp:921
+#: ../src/gui/main.cpp:3025 ../src/gui/preferences.cpp:921
 msgid "Video Devices"
 msgstr "視像裝置"
 
-#: ../src/gui/main.cpp:3037
+#: ../src/gui/main.cpp:3043
 msgid "Do you want to use it as default device?"
 msgstr "是否要用它做為預設的裝置？"
 
-#: ../src/gui/main.cpp:3105
+#: ../src/gui/main.cpp:3111
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: ../src/gui/main.cpp:3107
+#: ../src/gui/main.cpp:3113
 msgid "Ca_ll"
 msgstr "通話(_L)"
 
-#: ../src/gui/main.cpp:3107
+#: ../src/gui/main.cpp:3113
 msgid "Place a new call"
 msgstr "打出新電話"
 
-#: ../src/gui/main.cpp:3110
+#: ../src/gui/main.cpp:3116
 msgid "_Hang up"
 msgstr "掛線(_H)"
 
-#: ../src/gui/main.cpp:3111
+#: ../src/gui/main.cpp:3117
 msgid "Terminate the current call"
 msgstr "中斷目前的通話"
 
-#: ../src/gui/main.cpp:3117
+#: ../src/gui/main.cpp:3123
 msgid "A_dd Contact"
 msgstr "加入聯絡人(_D)"
 
-#: ../src/gui/main.cpp:3117
+#: ../src/gui/main.cpp:3123
 msgid "Add a contact to the roster"
 msgstr "將聯絡人加入名冊"
 
-#: ../src/gui/main.cpp:3122
+#: ../src/gui/main.cpp:3128
 msgid "Find contacts"
 msgstr "尋找聯絡人"
 
-#: ../src/gui/main.cpp:3129
+#: ../src/gui/main.cpp:3135
 msgid "_Contact"
 msgstr "聯絡人(_C)"
 
-#: ../src/gui/main.cpp:3130
+#: ../src/gui/main.cpp:3136
 msgid "Act on selected contact"
 msgstr "對已選取聯絡人的行動"
 
-#: ../src/gui/main.cpp:3136
+#: ../src/gui/main.cpp:3142
 msgid "H_old Call"
 msgstr "保留通話(_O)"
 
-#: ../src/gui/main.cpp:3136 ../src/gui/main.cpp:3605
+#: ../src/gui/main.cpp:3142 ../src/gui/main.cpp:3611
 msgid "Hold the current call"
 msgstr "保留目前的通話"
 
-#: ../src/gui/main.cpp:3140
+#: ../src/gui/main.cpp:3146
 msgid "_Transfer Call"
 msgstr "轉送來電(_T)"
 
-#: ../src/gui/main.cpp:3141
+#: ../src/gui/main.cpp:3147
 msgid "Transfer the current call"
 msgstr "轉送目前的通話"
 
-#: ../src/gui/main.cpp:3149
+#: ../src/gui/main.cpp:3155
 msgid "Suspend or resume the audio transmission"
 msgstr "暫停或恢復音訊傳送"
 
-#: ../src/gui/main.cpp:3154
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the video transmission"
 msgstr "暫停或恢復視像傳送"
 
-#: ../src/gui/main.cpp:3161
+#: ../src/gui/main.cpp:3167
 msgid "Close the Ekiga window"
 msgstr "關閉 Ekiga 視窗"
 
-#: ../src/gui/main.cpp:3168 ../src/gui/statusicon.cpp:406
+#: ../src/gui/main.cpp:3174 ../src/gui/statusicon.cpp:414
 msgid "Quit"
 msgstr "結束"
 
-#: ../src/gui/main.cpp:3174
+#: ../src/gui/main.cpp:3180
 msgid "_Configuration Assistant"
 msgstr "組態助理(_C)"
 
-#: ../src/gui/main.cpp:3175
+#: ../src/gui/main.cpp:3181
 msgid "Run the configuration assistant"
 msgstr "執行組態助理"
 
-#: ../src/gui/main.cpp:3183
+#: ../src/gui/main.cpp:3189
 msgid "Edit your accounts"
 msgstr "編輯你的帳號"
 
-#: ../src/gui/main.cpp:3189
+#: ../src/gui/main.cpp:3195
 msgid "Change your preferences"
 msgstr "修改偏好設定"
 
-#: ../src/gui/main.cpp:3194
+#: ../src/gui/main.cpp:3200
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/gui/main.cpp:3196
+#: ../src/gui/main.cpp:3202
 msgid "Con_tacts"
 msgstr "聯絡人(_T)"
 
-#: ../src/gui/main.cpp:3196
+#: ../src/gui/main.cpp:3202
 msgid "View the contacts list"
 msgstr "檢視聯絡人清單"
 
-#: ../src/gui/main.cpp:3201
+#: ../src/gui/main.cpp:3207
 msgid "_Dialpad"
 msgstr "撥號盤(_D)"
 
-#: ../src/gui/main.cpp:3201
+#: ../src/gui/main.cpp:3207
 msgid "View the dialpad"
 msgstr "顯示撥號盤"
 
-#: ../src/gui/main.cpp:3206
+#: ../src/gui/main.cpp:3212
 msgid "_Call History"
 msgstr "通話紀錄(_C)"
 
-#: ../src/gui/main.cpp:3206
+#: ../src/gui/main.cpp:3212
 msgid "View the call history"
 msgstr "檢視通話紀錄"
 
-#: ../src/gui/main.cpp:3214
+#: ../src/gui/main.cpp:3220
 msgid "_Show Call Panel"
 msgstr "顯示撥號面板(_S)"
 
-#: ../src/gui/main.cpp:3222
+#: ../src/gui/main.cpp:3228
 msgid "_Local Video"
 msgstr "本地端視像(_L)"
 
-#: ../src/gui/main.cpp:3223
+#: ../src/gui/main.cpp:3229
 msgid "Local video image"
 msgstr "本機視像畫面"
 
-#: ../src/gui/main.cpp:3228
+#: ../src/gui/main.cpp:3234
 msgid "_Remote Video"
 msgstr "遠端視像(_R)"
 
-#: ../src/gui/main.cpp:3229
+#: ../src/gui/main.cpp:3235
 msgid "Remote video image"
 msgstr "遠端視像畫面"
 
-#: ../src/gui/main.cpp:3234
+#: ../src/gui/main.cpp:3240
 msgid "_Picture-in-Picture"
 msgstr "子母畫面(_P)"
 
-#: ../src/gui/main.cpp:3235 ../src/gui/main.cpp:3241
+#: ../src/gui/main.cpp:3241 ../src/gui/main.cpp:3247
 msgid "Both video images"
 msgstr "本機和遠端的視像畫面"
 
-#: ../src/gui/main.cpp:3240
+#: ../src/gui/main.cpp:3246
 msgid "Picture-in-Picture in Separate _Window"
 msgstr "以個別視窗顯示子母畫面(_W)"
 
-#: ../src/gui/main.cpp:3248
+#: ../src/gui/main.cpp:3254
 msgid "Zoom in"
 msgstr "拉近"
 
-#: ../src/gui/main.cpp:3252
+#: ../src/gui/main.cpp:3258
 msgid "Zoom out"
 msgstr "拉遠"
 
-#: ../src/gui/main.cpp:3256
+#: ../src/gui/main.cpp:3262
 msgid "Normal size"
 msgstr "正常大小"
 
-#: ../src/gui/main.cpp:3260
+#: ../src/gui/main.cpp:3266
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: ../src/gui/main.cpp:3260
+#: ../src/gui/main.cpp:3266
 msgid "Switch to fullscreen"
 msgstr "切換至全螢幕"
 
-#: ../src/gui/main.cpp:3268 ../src/gui/statusicon.cpp:394
+#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:402
 msgid "Get help by reading the Ekiga manual"
 msgstr "閱讀 Ekiga 手冊以取得幫助"
 
-#: ../src/gui/main.cpp:3273 ../src/gui/statusicon.cpp:399
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:407
 msgid "View information about Ekiga"
 msgstr "顯示有關 Ekiga 的資訊"
 
-#: ../src/gui/main.cpp:3347
+#: ../src/gui/main.cpp:3353
 msgid ""
 "Enter a URI on the left, and click this button to place a call or to hangup"
 msgstr "先在左邊輸入要致電的 URI，接着按本按鍵來播打或掛斷電話"
 
-#: ../src/gui/main.cpp:3398
+#: ../src/gui/main.cpp:3404
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: ../src/gui/main.cpp:3421
+#: ../src/gui/main.cpp:3427
 msgid "Dialpad"
 msgstr "撥號盤"
 
-#: ../src/gui/main.cpp:3440
+#: ../src/gui/main.cpp:3446
 msgid "Call history"
 msgstr "通話紀錄"
 
-#: ../src/gui/main.cpp:3543
+#: ../src/gui/main.cpp:3549
 msgid "Change the volume of your soundcard"
 msgstr "調整音效卡的音量"
 
-#: ../src/gui/main.cpp:3563
+#: ../src/gui/main.cpp:3569
 msgid "Change the color settings of your video device"
 msgstr "調整視像裝置的顏色"
 
-#: ../src/gui/main.cpp:3585
-msgid "Display images from your camera device"
-msgstr "顯示攝影機所拍攝的圖片"
-
-#: ../src/gui/main.cpp:3674
+#: ../src/gui/main.cpp:3680
 msgid "Ekiga"
 msgstr "Ekiga"
 
 #. Translators:
 #. * TX is a common abbreviation for "transmit"
-#: ../src/gui/main.cpp:4281
+#: ../src/gui/main.cpp:4287
 #, c-format
 msgid "TX: %dx%d "
 msgstr "TX: %dx%d "
 
 #. Translators:
 #. * RX is a common abbreviation for "receive"
-#: ../src/gui/main.cpp:4286
+#: ../src/gui/main.cpp:4292
 #, c-format
 msgid "RX: %dx%d "
 msgstr "RX: %dx%d "
 
-#: ../src/gui/main.cpp:4288
+#: ../src/gui/main.cpp:4294
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2702,33 +2713,33 @@
 "損壞封包：%.1f %%\n"
 "抗抖動緩衝：%d ms%s%s%s"
 
-#: ../src/gui/main.cpp:4405
+#: ../src/gui/main.cpp:4415
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr "在主控台中顯示除錯訊息（等級由 1 至 5）"
 
-#: ../src/gui/main.cpp:4410
+#: ../src/gui/main.cpp:4420
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr "在主控台中顯示使用者層級除錯訊息（等級由 1 至 4）"
 
-#: ../src/gui/main.cpp:4415
+#: ../src/gui/main.cpp:4425
 msgid "Makes Ekiga call the given URI"
 msgstr "使 Ekiga 致電給指定的 URI"
 
-#: ../src/gui/main.cpp:4524
+#: ../src/gui/main.cpp:4544
 msgid "No usable audio plugin detected"
 msgstr "偵測不到可用的音訊外掛程式"
 
-#: ../src/gui/main.cpp:4525
+#: ../src/gui/main.cpp:4545
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
 msgstr "Ekiga 找不到可用的音效外掛程式，請確定程式是否正確安裝。"
 
-#: ../src/gui/main.cpp:4528
+#: ../src/gui/main.cpp:4548
 msgid "No usable audio codecs detected"
 msgstr "偵測不到可用的音訊編碼解碼器"
 
-#: ../src/gui/main.cpp:4529
+#: ../src/gui/main.cpp:4549
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
@@ -3070,7 +3081,7 @@
 msgid "Video"
 msgstr "視像"
 
-#: ../src/gui/statusicon.cpp:305
+#: ../src/gui/statusicon.cpp:306
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
@@ -3109,6 +3120,9 @@
 msgid "Define a custom message:"
 msgstr "定義自選訊息:"
 
+#~ msgid "Roster view saving group status"
+#~ msgstr "名冊模式儲存群組狀態"
+
 #~ msgid "Automatic echo cancellation"
 #~ msgstr "自動取消回應"
 
diff -Nru ekiga-3.2.5/po/zh_TW.po ekiga-3.2.6~ppa~karmic1/po/zh_TW.po
--- ekiga-3.2.5/po/zh_TW.po	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/po/zh_TW.po	2009-09-22 15:27:35.000000000 +0100
@@ -5,13 +5,13 @@
 # Woodman Tuen <wmtuen@gmail.com>, 2004-07.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2008.
 #
-#: ../lib/engine/components/resource-list/rl-entry.cpp:163
+#: ../lib/engine/components/resource-list/rl-entry.cpp:161
 msgid ""
 msgstr ""
-"Project-Id-Version: ekiga 3.1.1\n"
+"Project-Id-Version: ekiga 3.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-25 20:01+0800\n"
-"PO-Revision-Date: 2009-02-23 20:52+0800\n"
+"POT-Creation-Date: 2009-08-29 16:18+0800\n"
+"PO-Revision-Date: 2009-08-29 07:06+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -113,70 +113,74 @@
 msgid "Disable video hardware acceleration"
 msgstr "停用視訊硬體加速"
 
-#: ../ekiga.schemas.in.in.h:18
+#: ../ekiga.schemas.in.in.h:18 ../src/gui/main.cpp:3591
+msgid "Display images from your camera device"
+msgstr "顯示攝影機所拍攝的圖片"
+
+#: ../ekiga.schemas.in.in.h:19
 msgid "Enable 'Fast Start'"
 msgstr "啟用「快速啟動」"
 
-#: ../ekiga.schemas.in.in.h:19
+#: ../ekiga.schemas.in.in.h:20
 msgid "Enable H.245 tunneling"
 msgstr "啟用 H.245 穿隧技術"
 
-#: ../ekiga.schemas.in.in.h:20
+#: ../ekiga.schemas.in.in.h:21
 msgid "Enable early H.245"
 msgstr "啟用早期 H.245"
 
-#: ../ekiga.schemas.in.in.h:21
+#: ../ekiga.schemas.in.in.h:22
 msgid "Enable echo cancelation"
 msgstr "啟用回音消除功能"
 
-#: ../ekiga.schemas.in.in.h:22
+#: ../ekiga.schemas.in.in.h:23
 msgid "Enable silence detection"
 msgstr "啟用靜音探測"
 
-#: ../ekiga.schemas.in.in.h:23
+#: ../ekiga.schemas.in.in.h:24
 msgid ""
 "Enter the number of seconds after which Ekiga should try refreshing the NAT "
 "binding when STUN is being used"
 msgstr "輸入在使用 STUN 時，Ekiga 應在多少秒後更新 NAT 連結的時間，"
 
-#: ../ekiga.schemas.in.in.h:24 ../src/gui/preferences.cpp:459
+#: ../ekiga.schemas.in.in.h:25 ../src/gui/preferences.cpp:459
 msgid "Enter your full name"
 msgstr "輸入您的全名"
 
-#: ../ekiga.schemas.in.in.h:25
+#: ../ekiga.schemas.in.in.h:26
 msgid "Forward calls to host"
 msgstr "轉駁來電至主機"
 
-#: ../ekiga.schemas.in.in.h:26
+#: ../ekiga.schemas.in.in.h:27
 msgid "Forward calls to the given host if busy"
 msgstr "忙線時轉駁來電至指定的主機"
 
-#: ../ekiga.schemas.in.in.h:27
+#: ../ekiga.schemas.in.in.h:28
 msgid "Forward calls to the given host if no answer"
 msgstr "無應答時轉駁來電至指定的主機"
 
-#: ../ekiga.schemas.in.in.h:28 ../src/gui/preferences.cpp:1018
+#: ../ekiga.schemas.in.in.h:29 ../src/gui/preferences.cpp:1018
 msgid "Frame Rate"
 msgstr "幀率"
 
-#: ../ekiga.schemas.in.in.h:29
+#: ../ekiga.schemas.in.in.h:30
 msgid "Full name"
 msgstr "全名"
 
-#: ../ekiga.schemas.in.in.h:30 ../src/gui/preferences.cpp:477
+#: ../ekiga.schemas.in.in.h:31 ../src/gui/preferences.cpp:477
 msgid ""
 "If enabled, Ekiga will start hidden provided that the notification area is "
 "present in the GNOME panel"
 msgstr ""
 "如啟用此項，Ekiga 將在啟動時隱藏起來。並會縮小在 GNOME 面版的狀態通知區上。"
 
-#: ../ekiga.schemas.in.in.h:31
+#: ../ekiga.schemas.in.in.h:32
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below"
 msgstr "如啟用，所有電話都會轉駁到下面所指定的主機"
 
-#: ../ekiga.schemas.in.in.h:32
+#: ../ekiga.schemas.in.in.h:33
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you already are in a call or if you are in "
@@ -185,146 +189,142 @@
 "如啟用，若您在通話中或處於請勿打擾狀態時，所有電話都會轉駁到下面所指定的主"
 "機。"
 
-#: ../ekiga.schemas.in.in.h:33
+#: ../ekiga.schemas.in.in.h:34
 msgid ""
 "If enabled, all incoming calls will be forwarded to the host that is "
 "specified in the field below if you do not answer the call"
 msgstr "如啟用，所有您沒有接聽的電話都會轉駁到下面所指定的主機。"
 
-#: ../ekiga.schemas.in.in.h:34 ../src/gui/preferences.cpp:479
+#: ../ekiga.schemas.in.in.h:35 ../src/gui/preferences.cpp:479
 msgid "If enabled, offline contacts will be shown in the roster"
 msgstr "如果啟用，離線連絡人會顯示在名冊中"
 
-#: ../ekiga.schemas.in.in.h:35
+#: ../ekiga.schemas.in.in.h:36
 msgid "If enabled, use echo cancelation"
 msgstr "如啟用此項，使用回音消除功能"
 
-#: ../ekiga.schemas.in.in.h:36
+#: ../ekiga.schemas.in.in.h:37
 msgid "If enabled, use silence detection with the codecs supporting it"
 msgstr "如啟用，則會使用編碼解碼器支援的靜音探測"
 
-#: ../ekiga.schemas.in.in.h:37
+#: ../ekiga.schemas.in.in.h:38
 msgid "Kind of network selected in the druid"
 msgstr "在設定精靈中選擇的網路類型"
 
-#: ../ekiga.schemas.in.in.h:38
+#: ../ekiga.schemas.in.in.h:39
 msgid "LDAP servers"
 msgstr "LDAP 伺服器"
 
-#: ../ekiga.schemas.in.in.h:39
+#: ../ekiga.schemas.in.in.h:40
 msgid "List of configured LDAP servers"
 msgstr "設定的 LDAP 伺服器清單"
 
-#: ../ekiga.schemas.in.in.h:40
+#: ../ekiga.schemas.in.in.h:41
 msgid "List of folded groups in the roster"
 msgstr "名冊中摺疊的群組清單"
 
-#: ../ekiga.schemas.in.in.h:41
+#: ../ekiga.schemas.in.in.h:42
 msgid "Listen port"
 msgstr "監聽埠"
 
-#: ../ekiga.schemas.in.in.h:42
+#: ../ekiga.schemas.in.in.h:43
 msgid "Local video window size"
 msgstr "本機視訊畫面視窗的大小"
 
 # src/pref_window.cpp:1554
-#: ../ekiga.schemas.in.in.h:43
+#: ../ekiga.schemas.in.in.h:44
 msgid "Maximum RX video bitrate"
 msgstr "最大 RX 視訊頻寬"
 
 # src/pref_window.cpp:1554
-#: ../ekiga.schemas.in.in.h:44
+#: ../ekiga.schemas.in.in.h:45
 msgid "Maximum TX video bitrate"
 msgstr "最大 TX 視訊頻寬"
 
-#: ../ekiga.schemas.in.in.h:45
+#: ../ekiga.schemas.in.in.h:46
 msgid "Maximum jitter buffer"
 msgstr "抗抖動緩衝的最大值"
 
-#: ../ekiga.schemas.in.in.h:46
+#: ../ekiga.schemas.in.in.h:47
 msgid "NAT Binding Timeout"
 msgstr "NAT 連結逾時"
 
-#: ../ekiga.schemas.in.in.h:47
+#: ../ekiga.schemas.in.in.h:48
 msgid "No answer timeout"
 msgstr "沒有接聽逾時"
 
-#: ../ekiga.schemas.in.in.h:48
+#: ../ekiga.schemas.in.in.h:49
 msgid "Outbound Proxy"
 msgstr "Outbound Proxy"
 
-#: ../ekiga.schemas.in.in.h:49 ../src/gui/preferences.cpp:486
+#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:486
 msgid "Place windows displaying video above other windows during calls"
 msgstr "正在通話時，將視訊畫面視窗置於其它的視窗上"
 
-#: ../ekiga.schemas.in.in.h:50 ../src/gui/preferences.cpp:371
+#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:371
 msgid "Play busy tone"
 msgstr "播放忙線音"
 
-#: ../ekiga.schemas.in.in.h:51 ../src/gui/preferences.cpp:361
+#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:361
 msgid "Play ring tone"
 msgstr "播放鈐聲"
 
-#: ../ekiga.schemas.in.in.h:52 ../src/gui/preferences.cpp:351
+#: ../ekiga.schemas.in.in.h:53 ../src/gui/preferences.cpp:351
 msgid "Play sound on incoming calls"
 msgstr "來電時播放音效"
 
-#: ../ekiga.schemas.in.in.h:53
+#: ../ekiga.schemas.in.in.h:54
 msgid "Play sound on new message"
 msgstr "收到新訊息時播放音效"
 
-#: ../ekiga.schemas.in.in.h:54
+#: ../ekiga.schemas.in.in.h:55
 msgid "Play sound on new voice mail"
 msgstr "收到新留言時播放音效"
 
-#: ../ekiga.schemas.in.in.h:55
+#: ../ekiga.schemas.in.in.h:56
 msgid "Position of the local video window"
 msgstr "本機視訊畫面視窗的位置"
 
-#: ../ekiga.schemas.in.in.h:56
+#: ../ekiga.schemas.in.in.h:57
 msgid "Position on the screen of the address book window"
 msgstr "通訊錄視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:57
+#: ../ekiga.schemas.in.in.h:58
 msgid "Position on the screen of the audio settings window"
 msgstr "音訊設定視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:58
+#: ../ekiga.schemas.in.in.h:59
 msgid "Position on the screen of the chat window"
 msgstr "聊天視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:59
+#: ../ekiga.schemas.in.in.h:60
 msgid "Position on the screen of the druid window"
 msgstr "首次設定精靈視窗在螢幕中位置"
 
-#: ../ekiga.schemas.in.in.h:60
+#: ../ekiga.schemas.in.in.h:61
 msgid "Position on the screen of the log window"
 msgstr "記錄視窗的螢幕位置"
 
-#: ../ekiga.schemas.in.in.h:61
+#: ../ekiga.schemas.in.in.h:62
 msgid "Position on the screen of the main window"
 msgstr "主視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:62
+#: ../ekiga.schemas.in.in.h:63
 msgid "Position on the screen of the preferences window"
 msgstr "偏好設定視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:63
+#: ../ekiga.schemas.in.in.h:64
 msgid "Position on the screen of the video settings window"
 msgstr "視訊設定視窗在螢幕中的位置"
 
-#: ../ekiga.schemas.in.in.h:64
+#: ../ekiga.schemas.in.in.h:65
 msgid "Remote video window position"
 msgstr "遠端視訊畫面視窗的位置"
 
-#: ../ekiga.schemas.in.in.h:65
+#: ../ekiga.schemas.in.in.h:66
 msgid "Remote video window size"
 msgstr "遠端視訊畫面視窗的太小"
 
-#: ../ekiga.schemas.in.in.h:66
-msgid "Roster view saving group status"
-msgstr "名冊模式儲存群組狀態"
-
 #: ../ekiga.schemas.in.in.h:67
 msgid "Select an alternative audio output device to use for sound events."
 msgstr "選擇鈐聲事件所使用的其它音訊輸出裝置。"
@@ -358,7 +358,7 @@
 msgid "Show offline contacts"
 msgstr "顯示離線連絡人"
 
-#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3214
+#: ../ekiga.schemas.in.in.h:74 ../src/gui/main.cpp:3220
 msgid "Show the call panel"
 msgstr "顯示撥號面板"
 
@@ -409,7 +409,7 @@
 
 #: ../ekiga.schemas.in.in.h:85
 msgid "Temporal Spatial Trade Off"
-msgstr ""
+msgstr "暫時空間替換"
 
 #: ../ekiga.schemas.in.in.h:86
 msgid "The Audio Codecs List"
@@ -697,7 +697,7 @@
 msgid "Video format"
 msgstr "視訊格式"
 
-#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1153
+#: ../ekiga.schemas.in.in.h:141 ../src/gui/assistant.cpp:1144
 msgid "Video input device"
 msgstr "視訊輸入裝置"
 
@@ -718,121 +718,121 @@
 "是否傾向維持最大幀率或是要降低它以保持所有幀最低限度的品質。0: 最低品質設為最"
 "大。31: 最低品質設為最小"
 
-#: ../lib/engine/addressbook/contact-core.cpp:58
+#: ../lib/engine/addressbook/contact-core.cpp:60
 msgid "_Find"
 msgstr "尋找(_F)"
 
 #: ../lib/engine/components/avahi/avahi-heap.cpp:125
-#: ../lib/engine/components/avahi/avahi-heap.cpp:306
+#: ../lib/engine/components/avahi/avahi-heap.cpp:319
 msgid "Neighbours"
 msgstr "鄰居"
 
-#: ../lib/engine/components/call-history/history-book.cpp:140
+#: ../lib/engine/components/call-history/history-book.cpp:137
 #: ../lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp:162
 msgid "Clear List"
 msgstr "清除清單"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:153
+#: ../lib/engine/components/call-history/history-contact.cpp:155
 msgid "Received"
 msgstr "已接收"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:156
+#: ../lib/engine/components/call-history/history-contact.cpp:158
 msgid "Placed"
 msgstr "掛斷的電腦"
 
-#: ../lib/engine/components/call-history/history-contact.cpp:159
+#: ../lib/engine/components/call-history/history-contact.cpp:161
 msgid "Missed"
 msgstr "未接"
 
 #: ../lib/engine/components/evolution/evolution-book.cpp:76
-#: ../lib/engine/components/ldap/ldap-book.cpp:909
+#: ../lib/engine/components/ldap/ldap-book.cpp:897
 #, c-format
 msgid "%d user found"
 msgid_plural "%d users found"
 msgstr[0] "已找到 %d 個使用者"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:244
+#: ../lib/engine/components/evolution/evolution-book.cpp:283
 msgid "New _Contact"
 msgstr "新增連絡人(_C)"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:288
+#: ../lib/engine/components/evolution/evolution-book.cpp:319
 #: ../lib/engine/components/local-roster/local-cluster.cpp:82
 #: ../lib/engine/components/local-roster/local-heap.cpp:117
 msgid "New contact"
 msgstr "新增連絡人"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:290
-#: ../lib/engine/components/evolution/evolution-contact.cpp:328
-#: ../lib/engine/components/opal/opal-account.cpp:351
+#: ../lib/engine/components/evolution/evolution-book.cpp:321
+#: ../lib/engine/components/evolution/evolution-contact.cpp:327
+#: ../lib/engine/components/opal/opal-account.cpp:354
 msgid "Please update the following fields:"
 msgstr "請更新下列欄位:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:292
+#: ../lib/engine/components/evolution/evolution-book.cpp:323
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:293
-#: ../lib/engine/components/evolution/evolution-contact.cpp:339
+#: ../lib/engine/components/evolution/evolution-book.cpp:324
+#: ../lib/engine/components/evolution/evolution-contact.cpp:338
 msgid "VoIP _URI:"
 msgstr "VoIP _URI:"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:294
-#: ../lib/engine/components/evolution/evolution-contact.cpp:340
+#: ../lib/engine/components/evolution/evolution-book.cpp:325
+#: ../lib/engine/components/evolution/evolution-contact.cpp:339
 msgid "_Home phone:"
 msgstr "住家電話(_H):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:295
-#: ../lib/engine/components/evolution/evolution-contact.cpp:341
+#: ../lib/engine/components/evolution/evolution-book.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:340
 msgid "_Office phone:"
 msgstr "公司電話(_O):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:296
-#: ../lib/engine/components/evolution/evolution-contact.cpp:342
+#: ../lib/engine/components/evolution/evolution-book.cpp:327
+#: ../lib/engine/components/evolution/evolution-contact.cpp:341
 msgid "_Cell phone:"
 msgstr "手機(_C):"
 
-#: ../lib/engine/components/evolution/evolution-book.cpp:297
-#: ../lib/engine/components/evolution/evolution-contact.cpp:343
+#: ../lib/engine/components/evolution/evolution-book.cpp:328
+#: ../lib/engine/components/evolution/evolution-contact.cpp:342
 msgid "_Pager:"
 msgstr "呼叫器(_P):"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:234
-#: ../lib/engine/components/local-roster/local-presentity.cpp:197
-#: ../lib/engine/components/opal/opal-account.cpp:308
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:203
-#: ../src/gui/main.cpp:3172
+#: ../lib/engine/components/local-roster/local-presentity.cpp:199
+#: ../lib/engine/components/opal/opal-account.cpp:311
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:204
+#: ../src/gui/main.cpp:3178
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../lib/engine/components/evolution/evolution-contact.cpp:236
-#: ../lib/engine/components/local-roster/local-presentity.cpp:199
-#: ../lib/engine/components/opal/opal-account.cpp:310
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:205
+#: ../lib/engine/components/local-roster/local-presentity.cpp:201
+#: ../lib/engine/components/opal/opal-account.cpp:313
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:206
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:326
+#: ../lib/engine/components/evolution/evolution-contact.cpp:325
 msgid "Edit contact"
 msgstr "編輯連絡人"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:330
-#: ../lib/engine/components/local-roster/local-presentity.cpp:224
-#: ../lib/engine/components/local-roster/local-heap.cpp:184
-#: ../lib/engine/components/local-roster/local-heap.cpp:364
-#: ../lib/engine/components/opal/opal-account.cpp:353
-#: ../lib/engine/components/opal/opal-bank.cpp:99
-#: ../lib/engine/components/opal/opal-bank.cpp:109
+#: ../lib/engine/components/evolution/evolution-contact.cpp:329
+#: ../lib/engine/components/local-roster/local-presentity.cpp:226
+#: ../lib/engine/components/local-roster/local-heap.cpp:229
+#: ../lib/engine/components/local-roster/local-heap.cpp:433
+#: ../lib/engine/components/opal/opal-account.cpp:356
+#: ../lib/engine/components/opal/opal-bank.cpp:122
+#: ../lib/engine/components/opal/opal-bank.cpp:132
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:169
-#: ../lib/engine/components/resource-list/rl-heap.cpp:544
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:224
+#: ../lib/engine/components/resource-list/rl-heap.cpp:535
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
 msgid "Name:"
 msgstr "姓名:"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:395
+#: ../lib/engine/components/evolution/evolution-contact.cpp:386
 msgid "Remove contact"
 msgstr "移除連絡人"
 
-#: ../lib/engine/components/evolution/evolution-contact.cpp:397
+#: ../lib/engine/components/evolution/evolution-contact.cpp:388
 #, c-format
 msgid "Are you sure you want to remove %s from the addressbook?"
 msgstr "確定要從通訊錄中移除 %s？"
@@ -850,30 +850,30 @@
 msgstr "視訊測試"
 
 #. Translators: "Screencast" means the video input device will be your screen -- the other end will see your desktop
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:370
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:378
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Crazy"
 msgstr "瘋狂"
 
-#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:375
+#: ../lib/engine/components/gstreamer/gst-videoinput.cpp:383
 msgid "Screencast"
 msgstr "螢幕廣播"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:409
-#: ../lib/engine/components/resource-list/rl-entry.cpp:143
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:130
+#: ../lib/engine/components/ldap/ldap-book.cpp:411
+#: ../lib/engine/components/resource-list/rl-entry.cpp:144
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:132
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:412
+#: ../lib/engine/components/ldap/ldap-book.cpp:414
 msgid "_Remove addressbook"
 msgstr "移除通訊錄(_R)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:414
+#: ../lib/engine/components/ldap/ldap-book.cpp:416
 msgid "Addressbook _properties"
 msgstr "通訊錄屬性(_P)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:545
+#: ../lib/engine/components/ldap/ldap-book.cpp:541
 msgid "LDAP SASL Interaction"
 msgstr "LDAP SASL 通訊錄"
 
@@ -886,140 +886,138 @@
 #. * say about it. You might google for "challenge response
 #. * authentication" if you'd like more background context.
 #.
-#: ../lib/engine/components/ldap/ldap-book.cpp:587
-#, fuzzy
-#| msgid "Calling %s"
+#: ../lib/engine/components/ldap/ldap-book.cpp:583
 msgid "Challenge: "
-msgstr "正在致電 %s"
+msgstr "Challenge 驗證："
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:595
+#: ../lib/engine/components/ldap/ldap-book.cpp:591
 msgid "Interact"
 msgstr "互動式"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:664
+#: ../lib/engine/components/ldap/ldap-book.cpp:660
 msgid "Refreshing"
 msgstr "重新整理中"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:670
+#: ../lib/engine/components/ldap/ldap-book.cpp:666
 msgid "Could not initialize server"
 msgstr "無法初始化伺服器"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:684
-#: ../lib/engine/components/ldap/ldap-book.cpp:729
+#: ../lib/engine/components/ldap/ldap-book.cpp:680
+#: ../lib/engine/components/ldap/ldap-book.cpp:725
 msgid "LDAP Error: "
 msgstr "LDAP 錯誤:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:738
+#: ../lib/engine/components/ldap/ldap-book.cpp:734
 msgid "Contacted server"
 msgstr "已連接的伺服器"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:781
+#: ../lib/engine/components/ldap/ldap-book.cpp:773
 msgid "Could not connect to server"
 msgstr "無法連接伺服器"
 
 #. patience == 0
-#: ../lib/engine/components/ldap/ldap-book.cpp:829
-#: ../lib/engine/components/ldap/ldap-book.cpp:882
+#: ../lib/engine/components/ldap/ldap-book.cpp:821
+#: ../lib/engine/components/ldap/ldap-book.cpp:870
 msgid "Could not search"
 msgstr "無法搜尋"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:837
+#: ../lib/engine/components/ldap/ldap-book.cpp:829
 msgid "Waiting for search results"
 msgstr "等待搜尋結果"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:931
+#: ../lib/engine/components/ldap/ldap-book.cpp:919
 msgid "Please edit the following fields"
 msgstr "請編輯下列欄位:"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:933
+#: ../lib/engine/components/ldap/ldap-book.cpp:921
 msgid "Book _Name"
 msgstr "書本名稱(_N)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:934
+#: ../lib/engine/components/ldap/ldap-book.cpp:922
 msgid "Server _URI"
 msgstr "伺服器 _URI"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:935
+#: ../lib/engine/components/ldap/ldap-book.cpp:923
 msgid "_Base DN"
 msgstr "基本 _DN"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:941
+#: ../lib/engine/components/ldap/ldap-book.cpp:929
 msgid "Subtree"
 msgstr "子目錄"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:942
+#: ../lib/engine/components/ldap/ldap-book.cpp:930
 msgid "Single Level"
 msgstr "同一層"
 
 # src/ldap_window.cpp:476
-#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:931
 msgid "_Search Scope"
 msgstr "搜尋範圍(_S)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:952
+#: ../lib/engine/components/ldap/ldap-book.cpp:940
 msgid "_DisplayName Attribute"
 msgstr "顯示名稱屬性(_D)"
 
 # src/ldap_window.cpp:476
-#: ../lib/engine/components/ldap/ldap-book.cpp:953
+#: ../lib/engine/components/ldap/ldap-book.cpp:941
 msgid "Call _Attributes"
 msgstr "通話屬性(_A)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:955
-#: ../lib/engine/components/ldap/ldap-book.cpp:957
+#: ../lib/engine/components/ldap/ldap-book.cpp:943
+#: ../lib/engine/components/ldap/ldap-book.cpp:945
 msgid "_Filter Template"
 msgstr "過濾條件範本(_F)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:959
+#: ../lib/engine/components/ldap/ldap-book.cpp:947
 msgid "Bind _ID"
 msgstr "繫結 _ID"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:960
+#: ../lib/engine/components/ldap/ldap-book.cpp:948
 msgid "_Password"
 msgstr "密碼(_P)"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:961
+#: ../lib/engine/components/ldap/ldap-book.cpp:949
 msgid "Use TLS"
 msgstr "使用 TLS"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:962
+#: ../lib/engine/components/ldap/ldap-book.cpp:950
 msgid "Use SASL"
 msgstr "使用 SASL"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:976
+#: ../lib/engine/components/ldap/ldap-book.cpp:964
 msgid "SASL _Mechanism"
 msgstr "SASL 機制"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:987
+#: ../lib/engine/components/ldap/ldap-book.cpp:974
 msgid "Edit LDAP directory"
 msgstr "編輯 LDAP 使用者目錄"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1016
+#: ../lib/engine/components/ldap/ldap-book.cpp:1003
 msgid "Please provide a Book Name for this directory\n"
 msgstr "請提供這個目錄的書本名稱\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1019
+#: ../lib/engine/components/ldap/ldap-book.cpp:1006
 msgid "Please provide a Server URI\n"
 msgstr "請提供伺服器 URI\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1022
+#: ../lib/engine/components/ldap/ldap-book.cpp:1009
 msgid "Please provide a DisplayName Attribute\n"
 msgstr "請提供顯示名稱屬性\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1025
+#: ../lib/engine/components/ldap/ldap-book.cpp:1012
 msgid "Please provide a Call Attribute\n"
 msgstr "請提供通話屬性\n"
 
-#: ../lib/engine/components/ldap/ldap-book.cpp:1028
+#: ../lib/engine/components/ldap/ldap-book.cpp:1015
 msgid "Invalid Server URI\n"
 msgstr "無效的伺服器 URI\n"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:127
+#: ../lib/engine/components/ldap/ldap-source.cpp:130
 msgid "Add an LDAP Address Book"
 msgstr "加入 LDAP 通訊錄"
 
-#: ../lib/engine/components/ldap/ldap-source.cpp:130
+#: ../lib/engine/components/ldap/ldap-source.cpp:132
 msgid "Add the Ekiga.net Directory"
 msgstr "加入 Ekiga.net 目錄"
 
@@ -1031,45 +1029,45 @@
 msgid "Ekiga.net Directory"
 msgstr "Ekiga.net 目錄"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:221
+#: ../lib/engine/components/local-roster/local-presentity.cpp:223
 msgid "Edit roster element"
 msgstr "編輯名單元件"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:222
+#: ../lib/engine/components/local-roster/local-presentity.cpp:224
 msgid ""
 "Please fill in this form to change an existing element of ekiga's internal "
 "roster"
 msgstr "請填好這個表單以改變現有的 ekiga 內部名單"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:225
-#: ../lib/engine/components/local-roster/local-heap.cpp:193
-#: ../lib/engine/components/local-roster/local-heap.cpp:195
+#: ../lib/engine/components/local-roster/local-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-heap.cpp:238
+#: ../lib/engine/components/local-roster/local-heap.cpp:240
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:170
-#: ../lib/engine/components/resource-list/rl-heap.cpp:545
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:225
+#: ../lib/engine/components/resource-list/rl-heap.cpp:536
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:226
 msgid "Address:"
 msgstr "地址:"
 
-#: ../lib/engine/components/local-roster/local-presentity.cpp:227
-#: ../lib/engine/components/resource-list/rl-heap.cpp:546
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:227
+#: ../lib/engine/components/local-roster/local-presentity.cpp:229
+#: ../lib/engine/components/resource-list/rl-heap.cpp:537
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:228
 msgid "Choose groups:"
 msgstr "選擇群組:"
 
 #: ../lib/engine/components/local-roster/local-roster-bridge.cpp:93
-#: ../lib/engine/components/local-roster/local-heap.cpp:181
+#: ../lib/engine/components/local-roster/local-heap.cpp:226
 msgid "Add to local roster"
 msgstr "加入至本地端名冊"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:92
+#: ../lib/engine/components/local-roster/local-heap.cpp:94
 msgid "Services"
 msgstr "服務"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:93
+#: ../lib/engine/components/local-roster/local-heap.cpp:95
 msgid "Echo test"
 msgstr "回音測試"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:94
+#: ../lib/engine/components/local-roster/local-heap.cpp:96
 msgid "Conference room"
 msgstr "會議室"
 
@@ -1081,128 +1079,143 @@
 msgid "Rename"
 msgstr "重新命名"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:160
+#: ../lib/engine/components/local-roster/local-heap.cpp:190
 msgid "Family"
 msgstr "家族"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:161
+#: ../lib/engine/components/local-roster/local-heap.cpp:191
 msgid "Friend"
 msgstr "朋友"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:162
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; associate means
+#. someone who is at the same "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:196
 msgid "Associate"
 msgstr "關聯"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:163
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; assistant means
+#. someone who is at a lower "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:201
 msgid "Assistant"
 msgstr "助理"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:164
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; supervisor means
+#. someone who is at a higher "level" than you.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:206
 msgid "Supervisor"
 msgstr "監督者"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:165
+#. Translator: http://www.ietf.org/rfc/rfc4480.txt proposes several
+#. relationships between you and your contact; self means yourself.
+#.
+#: ../lib/engine/components/local-roster/local-heap.cpp:210
 msgid "Self"
 msgstr "自己"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:182
+#: ../lib/engine/components/local-roster/local-heap.cpp:227
 msgid ""
 "Please fill in this form to add a new contact to ekiga's internal roster"
 msgstr "請填好這個表單以便加入新的連絡人到 ekiga 內部名單"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:199
+#: ../lib/engine/components/local-roster/local-heap.cpp:244
 msgid "Put contact in groups:"
 msgstr "將連絡人置於群組:"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:335
+#: ../lib/engine/components/local-roster/local-heap.cpp:411
 msgid "You supplied an unsupported address"
 msgstr "您輸入的是不支援的位址"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:337
+#: ../lib/engine/components/local-roster/local-heap.cpp:413
 msgid "You already have a contact with this address!"
 msgstr "您已經有使用這個位址的連絡人了！"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:362
+#: ../lib/engine/components/local-roster/local-heap.cpp:431
 msgid "Rename group"
 msgstr "重新命名群組"
 
-#: ../lib/engine/components/local-roster/local-heap.cpp:363
+#: ../lib/engine/components/local-roster/local-heap.cpp:432
 msgid "Please edit this group name"
 msgstr "請編輯這個群組名稱"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:143
-#: ../lib/engine/components/opal/sip-endpoint.cpp:257
-#: ../lib/engine/components/opal/sip-endpoint.cpp:261
+#: ../lib/engine/components/opal/h323-endpoint.cpp:131
+#: ../lib/engine/components/opal/sip-endpoint.cpp:230
+#: ../lib/engine/components/opal/sip-endpoint.cpp:234
 msgid "Call"
 msgstr "通話"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:146
-#: ../lib/engine/components/opal/sip-endpoint.cpp:258
-#: ../lib/engine/components/opal/sip-endpoint.cpp:262 ../src/gui/main.cpp:2946
+#: ../lib/engine/components/opal/h323-endpoint.cpp:134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:231
+#: ../lib/engine/components/opal/sip-endpoint.cpp:235 ../src/gui/main.cpp:2952
 msgid "Transfer"
 msgstr "轉送"
 
 #. Translators : The alias we are registering already exists : failure
-#: ../lib/engine/components/opal/h323-endpoint.cpp:310
+#: ../lib/engine/components/opal/h323-endpoint.cpp:309
 msgid "Duplicate alias"
 msgstr "重複的別名"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:313
+#: ../lib/engine/components/opal/h323-endpoint.cpp:312
 msgid "Bad username/password"
 msgstr "錯誤的使用者名稱/密碼"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:316
-#: ../lib/engine/components/opal/sip-endpoint.cpp:896
+#: ../lib/engine/components/opal/h323-endpoint.cpp:315
+#: ../lib/engine/components/opal/sip-endpoint.cpp:911
 msgid "Transport error"
 msgstr "轉送錯誤"
 
-#: ../lib/engine/components/opal/h323-endpoint.cpp:327
-#: ../lib/engine/components/opal/h323-endpoint.cpp:332
-#: ../lib/engine/components/opal/sip-endpoint.cpp:903
+#: ../lib/engine/components/opal/h323-endpoint.cpp:326
+#: ../lib/engine/components/opal/h323-endpoint.cpp:331
+#: ../lib/engine/components/opal/sip-endpoint.cpp:918
 msgid "Failed"
 msgstr "失敗"
 
-#: ../lib/engine/components/opal/opal-account.cpp:300
+#: ../lib/engine/components/opal/opal-account.cpp:303
 msgid "_Disable"
 msgstr "停用(_D)"
 
-#: ../lib/engine/components/opal/opal-account.cpp:303
+#: ../lib/engine/components/opal/opal-account.cpp:306
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../lib/engine/components/opal/opal-account.cpp:324
-#: ../src/gui/assistant.cpp:725
+#: ../lib/engine/components/opal/opal-account.cpp:327
+#: ../src/gui/assistant.cpp:716
 msgid "Recharge the account"
 msgstr "為帳號加值"
 
-#: ../lib/engine/components/opal/opal-account.cpp:329
-#: ../src/gui/assistant.cpp:737
+#: ../lib/engine/components/opal/opal-account.cpp:332
+#: ../src/gui/assistant.cpp:728
 msgid "Consult the balance history"
 msgstr "查閱結算記錄"
 
-#: ../lib/engine/components/opal/opal-account.cpp:334
+#: ../lib/engine/components/opal/opal-account.cpp:337
 msgid "Consult the call history"
 msgstr "查閱通話記錄"
 
-#: ../lib/engine/components/opal/opal-account.cpp:349
-#: ../lib/engine/components/opal/opal-bank.cpp:72
+#: ../lib/engine/components/opal/opal-account.cpp:352
+#: ../lib/engine/components/opal/opal-bank.cpp:95
 msgid "Edit account"
 msgstr "編輯帳號"
 
-#: ../lib/engine/components/opal/opal-account.cpp:355
-#: ../lib/engine/components/opal/opal-bank.cpp:110
+#: ../lib/engine/components/opal/opal-account.cpp:358
+#: ../lib/engine/components/opal/opal-bank.cpp:133
 msgid "Registrar:"
 msgstr "註冊服務商："
 
-#: ../lib/engine/components/opal/opal-account.cpp:357
-#: ../lib/engine/components/opal/opal-bank.cpp:100
+#: ../lib/engine/components/opal/opal-account.cpp:360
+#: ../lib/engine/components/opal/opal-bank.cpp:123
 msgid "Gatekeeper:"
 msgstr "閘道管理員："
 
-#: ../lib/engine/components/opal/opal-account.cpp:358
-#: ../lib/engine/components/opal/opal-bank.cpp:81
-#: ../lib/engine/components/opal/opal-bank.cpp:101
-#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../lib/engine/components/opal/opal-account.cpp:361
+#: ../lib/engine/components/opal/opal-bank.cpp:104
+#: ../lib/engine/components/opal/opal-bank.cpp:124
+#: ../lib/engine/components/opal/opal-bank.cpp:134
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:174
 msgid "User:"
 msgstr "使用者:"
@@ -1210,166 +1223,168 @@
 #. Translators:
 #. * SIP knows two usernames: The name for the client ("User") and the name
 #. * for the authentication procedure ("Authentication User")
-#: ../lib/engine/components/opal/opal-account.cpp:363
-#: ../lib/engine/components/opal/opal-bank.cpp:112
+#: ../lib/engine/components/opal/opal-account.cpp:366
+#: ../lib/engine/components/opal/opal-bank.cpp:135
 msgid "Authentication User:"
 msgstr "驗證使用者:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:364
-#: ../lib/engine/components/opal/opal-bank.cpp:83
-#: ../lib/engine/components/opal/opal-bank.cpp:103
-#: ../lib/engine/components/opal/opal-bank.cpp:113
+#: ../lib/engine/components/opal/opal-account.cpp:367
+#: ../lib/engine/components/opal/opal-bank.cpp:106
+#: ../lib/engine/components/opal/opal-bank.cpp:126
+#: ../lib/engine/components/opal/opal-bank.cpp:136
 #: ../lib/engine/components/resource-list/rl-cluster.cpp:173
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:365
-#: ../lib/engine/components/opal/opal-bank.cpp:104
-#: ../lib/engine/components/opal/opal-bank.cpp:114
+#: ../lib/engine/components/opal/opal-account.cpp:368
+#: ../lib/engine/components/opal/opal-bank.cpp:127
+#: ../lib/engine/components/opal/opal-bank.cpp:137
 msgid "Timeout:"
 msgstr "逾時時間:"
 
-#: ../lib/engine/components/opal/opal-account.cpp:366
-#: ../lib/engine/components/opal/opal-bank.cpp:117
+#: ../lib/engine/components/opal/opal-account.cpp:369
+#: ../lib/engine/components/opal/opal-bank.cpp:140
 msgid "Enable Account"
 msgstr "啟用帳號"
 
-#: ../lib/engine/components/opal/opal-account.cpp:401
-#: ../lib/engine/components/opal/opal-bank.cpp:155
+#: ../lib/engine/components/opal/opal-account.cpp:402
+#: ../lib/engine/components/opal/opal-bank.cpp:179
 msgid "You did not supply a name for that account."
 msgstr "您沒有提供該帳號的名稱。"
 
-#: ../lib/engine/components/opal/opal-account.cpp:403
-#: ../lib/engine/components/opal/opal-bank.cpp:157
+#: ../lib/engine/components/opal/opal-account.cpp:404
+#: ../lib/engine/components/opal/opal-bank.cpp:181
 msgid "You did not supply a host to register to."
 msgstr "您沒有提供該要註冊的主機。"
 
-#: ../lib/engine/components/opal/opal-account.cpp:405
-#: ../lib/engine/components/opal/opal-bank.cpp:159
+#: ../lib/engine/components/opal/opal-account.cpp:406
+#: ../lib/engine/components/opal/opal-bank.cpp:183
 msgid "You did not supply a user name for that account."
 msgstr "您沒有提供該帳號的使用者名稱。"
 
-#: ../lib/engine/components/opal/opal-account.cpp:407
-#: ../lib/engine/components/opal/opal-bank.cpp:161
+#: ../lib/engine/components/opal/opal-account.cpp:408
+#: ../lib/engine/components/opal/opal-bank.cpp:185
 msgid "The timeout should have a bigger value."
 msgstr "逾時時間應該使用更大的數值。"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:53
+#: ../lib/engine/components/opal/opal-bank.cpp:75
 msgid "_Add an Ekiga.net Account"
 msgstr "加入 Ekig_a.net 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:55
+#: ../lib/engine/components/opal/opal-bank.cpp:77
 msgid "_Add an Ekiga Call Out Account"
 msgstr "加入 Ekig_a Call Out 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:57
+#: ../lib/engine/components/opal/opal-bank.cpp:79
 msgid "_Add a SIP Account"
 msgstr "加入 S_IP 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:59
+#: ../lib/engine/components/opal/opal-bank.cpp:81
 msgid "_Add an H.323 Account"
 msgstr "加入 _H.323 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:73
+#: ../lib/engine/components/opal/opal-bank.cpp:96
 msgid "Please update the following fields."
 msgstr "請更新下列欄位:。"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:78 ../src/gui/assistant.cpp:605
+#: ../lib/engine/components/opal/opal-bank.cpp:101
+#: ../src/gui/assistant.cpp:596
 msgid "Get an Ekiga.net SIP account"
 msgstr "取得 Ekiga.net SIP 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:88 ../src/gui/assistant.cpp:713
+#: ../lib/engine/components/opal/opal-bank.cpp:111
+#: ../src/gui/assistant.cpp:704
 msgid "Get an Ekiga Call Out account"
 msgstr "取得 Ekiga Call Out 帳號"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:92 ../src/gui/main.cpp:2700
-#: ../src/gui/main.cpp:2795
+#: ../lib/engine/components/opal/opal-bank.cpp:115 ../src/gui/main.cpp:2706
+#: ../src/gui/main.cpp:2801
 msgid "Account ID:"
 msgstr "帳號 ID:"
 
-#: ../lib/engine/components/opal/opal-bank.cpp:94
+#: ../lib/engine/components/opal/opal-bank.cpp:117
 msgid "PIN Code:"
 msgstr "PIN 碼:"
 
-#: ../lib/engine/components/opal/opal-call.cpp:444
+#: ../lib/engine/components/opal/opal-call.cpp:404
 msgid "Local user cleared the call"
 msgstr "本機使用者已清除通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:447
-#: ../lib/engine/components/opal/opal-call.cpp:450
+#: ../lib/engine/components/opal/opal-call.cpp:407
+#: ../lib/engine/components/opal/opal-call.cpp:410
 msgid "Local user rejected the call"
 msgstr "本機使用者拒絕接聽來電"
 
-#: ../lib/engine/components/opal/opal-call.cpp:453
+#: ../lib/engine/components/opal/opal-call.cpp:413
 msgid "Remote user cleared the call"
 msgstr "遠端使用者已清除通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:456
+#: ../lib/engine/components/opal/opal-call.cpp:416
 msgid "Remote user rejected the call"
 msgstr "遠端使用者拒絕通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:459
+#: ../lib/engine/components/opal/opal-call.cpp:419
 msgid "Remote user has stopped calling"
 msgstr "遠端使用者已停止通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:462
+#: ../lib/engine/components/opal/opal-call.cpp:422
 msgid "Abnormal call termination"
 msgstr "不正常終止通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:465 ../src/gui/main.cpp:1490
+#: ../lib/engine/components/opal/opal-call.cpp:425 ../src/gui/main.cpp:1496
 msgid "Could not connect to remote host"
 msgstr "無法連接遠端主機"
 
-#: ../lib/engine/components/opal/opal-call.cpp:468
+#: ../lib/engine/components/opal/opal-call.cpp:428
 msgid "The Gatekeeper cleared the call"
 msgstr "閘道管理員已清除通話"
 
-#: ../lib/engine/components/opal/opal-call.cpp:471
+#: ../lib/engine/components/opal/opal-call.cpp:431
 msgid "User not found"
 msgstr "找不到使用者"
 
-#: ../lib/engine/components/opal/opal-call.cpp:474
+#: ../lib/engine/components/opal/opal-call.cpp:434
 msgid "Insufficient bandwidth"
 msgstr "頻寬不足"
 
-#: ../lib/engine/components/opal/opal-call.cpp:477
+#: ../lib/engine/components/opal/opal-call.cpp:437
 msgid "No common codec"
 msgstr "沒有通用的編碼解碼器"
 
-#: ../lib/engine/components/opal/opal-call.cpp:480
+#: ../lib/engine/components/opal/opal-call.cpp:440
 msgid "Call forwarded"
 msgstr "來電已轉駁"
 
-#: ../lib/engine/components/opal/opal-call.cpp:483
+#: ../lib/engine/components/opal/opal-call.cpp:443
 msgid "Security check failed"
 msgstr "安全性檢查失敗"
 
-#: ../lib/engine/components/opal/opal-call.cpp:486
+#: ../lib/engine/components/opal/opal-call.cpp:446
 msgid "Local user is busy"
 msgstr "本機使用者現正忙碌"
 
-#: ../lib/engine/components/opal/opal-call.cpp:489
-#: ../lib/engine/components/opal/opal-call.cpp:495
+#: ../lib/engine/components/opal/opal-call.cpp:449
+#: ../lib/engine/components/opal/opal-call.cpp:455
 msgid "Congested link to remote party"
 msgstr "遠端使用者線路擁塞"
 
-#: ../lib/engine/components/opal/opal-call.cpp:492
+#: ../lib/engine/components/opal/opal-call.cpp:452
 msgid "Remote user is busy"
 msgstr "遠端使用者現正忙碌"
 
-#: ../lib/engine/components/opal/opal-call.cpp:498
+#: ../lib/engine/components/opal/opal-call.cpp:458
 msgid "Remote host is offline"
 msgstr "遠端主機不在線上"
 
-#: ../lib/engine/components/opal/opal-call.cpp:504
+#: ../lib/engine/components/opal/opal-call.cpp:464
 msgid "User is not available"
 msgstr "使用者現正不在"
 
-#: ../lib/engine/components/opal/opal-call.cpp:516
+#: ../lib/engine/components/opal/opal-call.cpp:476
 msgid "Call completed"
 msgstr "通話完成"
 
-#: ../lib/engine/components/opal/opal-call-manager.cpp:725
+#: ../lib/engine/components/opal/opal-call-manager.cpp:731
 msgid ""
 "Ekiga did not manage to configure your network settings automatically. You "
 "can still use it, but you need to configure your network settings manually.\n"
@@ -1383,218 +1398,218 @@
 "請查閱 http://wiki.ekiga.org/index.php/Enable_port_forwarding_manually 以取得"
 "指示"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:282
-#: ../lib/engine/components/opal/sip-endpoint.cpp:284
+#: ../lib/engine/components/opal/sip-endpoint.cpp:255
+#: ../lib/engine/components/opal/sip-endpoint.cpp:257
 msgid "Message"
 msgstr "訊息"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:710
+#: ../lib/engine/components/opal/sip-endpoint.cpp:725
 msgid "Bad request"
 msgstr "錯誤要求"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:714
+#: ../lib/engine/components/opal/sip-endpoint.cpp:729
 msgid "Payment required"
 msgstr "須要付帳"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:718
+#: ../lib/engine/components/opal/sip-endpoint.cpp:733
 msgid "Unauthorized"
 msgstr "未驗證"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:722
+#: ../lib/engine/components/opal/sip-endpoint.cpp:737
 msgid "Forbidden"
 msgstr "被禁止"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:726
+#: ../lib/engine/components/opal/sip-endpoint.cpp:741
 msgid "Timeout"
 msgstr "逾時"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:730
+#: ../lib/engine/components/opal/sip-endpoint.cpp:745
 msgid "Conflict"
 msgstr "衝突"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:734
+#: ../lib/engine/components/opal/sip-endpoint.cpp:749
 msgid "Temporarily unavailable"
 msgstr "暫時無法使用"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:738
+#: ../lib/engine/components/opal/sip-endpoint.cpp:753
 msgid "Not acceptable"
 msgstr "不能接受"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:742
+#: ../lib/engine/components/opal/sip-endpoint.cpp:757
 msgid "Illegal status code"
 msgstr "不合法的狀態代碼"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:746
+#: ../lib/engine/components/opal/sip-endpoint.cpp:761
 msgid "Multiple choices"
 msgstr "多重選擇"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:750
+#: ../lib/engine/components/opal/sip-endpoint.cpp:765
 msgid "Moved permanently"
 msgstr "永久移動"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:754
+#: ../lib/engine/components/opal/sip-endpoint.cpp:769
 msgid "Moved temporarily"
 msgstr "暫時移動"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:758
+#: ../lib/engine/components/opal/sip-endpoint.cpp:773
 msgid "Use proxy"
 msgstr "使用代理伺服器"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:762
+#: ../lib/engine/components/opal/sip-endpoint.cpp:777
 msgid "Alternative service"
 msgstr "替代的服務"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:766
+#: ../lib/engine/components/opal/sip-endpoint.cpp:781
 msgid "Not found"
 msgstr "找不到"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:770
+#: ../lib/engine/components/opal/sip-endpoint.cpp:785
 msgid "Method not allowed"
 msgstr "這個方法是不允許的"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:774
+#: ../lib/engine/components/opal/sip-endpoint.cpp:789
 msgid "Proxy authentication required"
 msgstr "代理伺服器需要驗證"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:778
+#: ../lib/engine/components/opal/sip-endpoint.cpp:793
 msgid "Length required"
 msgstr "要求長度"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:782
+#: ../lib/engine/components/opal/sip-endpoint.cpp:797
 msgid "Request entity too big"
 msgstr "要求項目太大"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:786
+#: ../lib/engine/components/opal/sip-endpoint.cpp:801
 msgid "Request URI too long"
 msgstr "要求 URI 太長"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:790
+#: ../lib/engine/components/opal/sip-endpoint.cpp:805
 msgid "Unsupported media type"
 msgstr "不支援的媒體類型"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:794
+#: ../lib/engine/components/opal/sip-endpoint.cpp:809
 msgid "Unsupported URI scheme"
 msgstr "不支援的 URI 結構"
 
 #. Translators : The extension we are trying to register does not exist
-#: ../lib/engine/components/opal/sip-endpoint.cpp:799
+#: ../lib/engine/components/opal/sip-endpoint.cpp:814
 msgid "Bad extension"
 msgstr "錯誤的延伸檔名"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:803
+#: ../lib/engine/components/opal/sip-endpoint.cpp:818
 msgid "Extension required"
 msgstr "需要擴充功能"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:807
+#: ../lib/engine/components/opal/sip-endpoint.cpp:822
 msgid "Interval too brief"
 msgstr "間隔太短"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:811
+#: ../lib/engine/components/opal/sip-endpoint.cpp:826
 msgid "Loop detected"
 msgstr "偵測到廻圈"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:815
+#: ../lib/engine/components/opal/sip-endpoint.cpp:830
 msgid "Too many hops"
-msgstr ""
+msgstr "hops 過多"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:819
+#: ../lib/engine/components/opal/sip-endpoint.cpp:834
 msgid "Address incomplete"
 msgstr "位址不完整"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:823
+#: ../lib/engine/components/opal/sip-endpoint.cpp:838
 msgid "Ambiguous"
 msgstr "模稜兩可的"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:827
+#: ../lib/engine/components/opal/sip-endpoint.cpp:842
 msgid "Busy Here"
 msgstr "此處佔線"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:831
+#: ../lib/engine/components/opal/sip-endpoint.cpp:846
 msgid "Request terminated"
 msgstr "要求已終止"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:835
+#: ../lib/engine/components/opal/sip-endpoint.cpp:850
 msgid "Not acceptable here"
 msgstr "這裡不能接受"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:839
+#: ../lib/engine/components/opal/sip-endpoint.cpp:854
 msgid "Bad event"
 msgstr "錯誤的事件"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:843
+#: ../lib/engine/components/opal/sip-endpoint.cpp:858
 msgid "Request pending"
 msgstr "要求保留中"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:847
+#: ../lib/engine/components/opal/sip-endpoint.cpp:862
 msgid "Undecipherable"
 msgstr "無法解譯的"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:851
+#: ../lib/engine/components/opal/sip-endpoint.cpp:866
 msgid "Internal server error"
 msgstr "內部的伺服器錯誤"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:855
+#: ../lib/engine/components/opal/sip-endpoint.cpp:870
 msgid "Not implemented"
 msgstr "未實作"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:859
+#: ../lib/engine/components/opal/sip-endpoint.cpp:874
 msgid "Bad gateway"
 msgstr "錯誤的閘道器"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:863
+#: ../lib/engine/components/opal/sip-endpoint.cpp:878
 msgid "Service unavailable"
 msgstr "服務無法使用"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:867
+#: ../lib/engine/components/opal/sip-endpoint.cpp:882
 msgid "Server timeout"
 msgstr "伺服器逾時"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:871
+#: ../lib/engine/components/opal/sip-endpoint.cpp:886
 msgid "SIP version not supported"
 msgstr "不支援此 SIP 版本"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:875
+#: ../lib/engine/components/opal/sip-endpoint.cpp:890
 msgid "Message too large"
 msgstr "訊息太大"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:879
+#: ../lib/engine/components/opal/sip-endpoint.cpp:894
 msgid "Busy everywhere"
 msgstr "到處佔線"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:883
+#: ../lib/engine/components/opal/sip-endpoint.cpp:898
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:887
+#: ../lib/engine/components/opal/sip-endpoint.cpp:902
 msgid "Does not exist anymore"
 msgstr "不再存在"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:891
+#: ../lib/engine/components/opal/sip-endpoint.cpp:906
 msgid "Globally not acceptable"
 msgstr "全域無法接受"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1020
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1043
 msgid "Could not send message"
 msgstr "無法傳送訊息"
 
 # src/endpoint.cpp:467
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1134
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1165
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
 # src/endpoint.cpp:467
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1136
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1167
 #, c-format
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1142
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1173
 #, c-format
 msgid "In a call with %s"
 msgstr "與 %s 通話中"
 
-#: ../lib/engine/components/opal/sip-endpoint.cpp:1144
+#: ../lib/engine/components/opal/sip-endpoint.cpp:1175
 #, c-format
 msgid "In a call"
 msgstr "通話中"
@@ -1620,11 +1635,11 @@
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:103
-#: ../lib/engine/components/resource-list/rl-heap.cpp:144
+#: ../lib/engine/components/resource-list/rl-heap.cpp:104
+#: ../lib/engine/components/resource-list/rl-heap.cpp:146
 #: ../lib/engine/components/resource-list/rl-heap.cpp:178
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:133
-#: ../lib/engine/components/resource-list/rl-entry.cpp:130
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:134
+#: ../lib/engine/components/resource-list/rl-entry.cpp:131
 msgid "Unnamed"
 msgstr "未命名的"
 
@@ -1640,74 +1655,74 @@
 msgid "Contact list _properties"
 msgstr "連絡人清單(_P)"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:467
+#: ../lib/engine/components/resource-list/rl-heap.cpp:464
 msgid "Edit contact list properties"
 msgstr "編輯連絡人清單屬性"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:469
+#: ../lib/engine/components/resource-list/rl-heap.cpp:466
 msgid "Please edit the following fields (no identifier means global)"
 msgstr "請編輯下列欄位（沒有識別碼則代表全域）"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:472
+#: ../lib/engine/components/resource-list/rl-heap.cpp:469
 msgid "Contact list's name"
 msgstr "連絡人清單名稱"
 
 #. "Document" used as a name -- uri point to the root of a document tree
-#: ../lib/engine/components/resource-list/rl-heap.cpp:474
+#: ../lib/engine/components/resource-list/rl-heap.cpp:471
 msgid "Document root"
 msgstr "文件根目錄"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:475
+#: ../lib/engine/components/resource-list/rl-heap.cpp:472
 msgid "Identifier"
 msgstr "識別碼"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:476
+#: ../lib/engine/components/resource-list/rl-heap.cpp:473
 msgid "Writable"
 msgstr "可寫的"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:477
+#: ../lib/engine/components/resource-list/rl-heap.cpp:474
 msgid "Server username"
 msgstr "伺服器使用者名稱"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:478
+#: ../lib/engine/components/resource-list/rl-heap.cpp:475
 msgid "Server password"
 msgstr "伺服器密碼"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:530
+#: ../lib/engine/components/resource-list/rl-heap.cpp:521
 msgid "Add a remote contact"
 msgstr "加入遠端連絡人"
 
-#: ../lib/engine/components/resource-list/rl-heap.cpp:531
+#: ../lib/engine/components/resource-list/rl-heap.cpp:522
 msgid "Please fill in this form to create a new contact on a remote server"
 msgstr "請填好這個表單以便在遠端伺服器建立新的連絡人"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:221
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
 msgid "Edit remote contact"
 msgstr "編輯遠端連絡人"
 
-#: ../lib/engine/components/resource-list/rl-presentity.cpp:222
+#: ../lib/engine/components/resource-list/rl-presentity.cpp:223
 msgid ""
 "Please fill in this form to change an existing contact on a remote server"
 msgstr "請填好這個表單以改變遠端伺服器既存的連絡人"
 
-#: ../lib/engine/components/resource-list/rl-entry.cpp:186
+#: ../lib/engine/components/resource-list/rl-entry.cpp:187
 msgid "Invalid server data"
 msgstr "無效的伺服器資料"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:51
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:53
 msgid "Click to fetch"
 msgstr "按這裡取得"
 
-#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:118
+#: ../lib/engine/components/resource-list/rl-entry-ref.cpp:120
 msgid "Distant contact"
 msgstr "遠端連絡人"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:181
+#: ../lib/engine/components/resource-list/rl-list.cpp:182
 #, c-format
 msgid "%s / List #%d"
 msgstr "%s /清單 #%d"
 
-#: ../lib/engine/components/resource-list/rl-list.cpp:185
+#: ../lib/engine/components/resource-list/rl-list.cpp:186
 #, c-format
 msgid "List #%d"
 msgstr "清單 #%d"
@@ -1721,7 +1736,7 @@
 msgstr "通訊錄"
 
 #: ../lib/engine/gui/gtk-frontend/addressbook-window.cpp:675
-#: ../src/gui/main.cpp:3121
+#: ../src/gui/main.cpp:3127
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
@@ -1735,7 +1750,7 @@
 msgstr "分類"
 
 #: ../lib/engine/gui/gtk-frontend/book-view-gtk.cpp:590
-#: ../src/gui/assistant.cpp:1377
+#: ../src/gui/assistant.cpp:1368
 msgid "Full Name"
 msgstr "全名"
 
@@ -1756,7 +1771,7 @@
 msgid "Copy link"
 msgstr "複製連結"
 
-#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:904
+#: ../lib/engine/gui/gtk-frontend/chat-area.cpp:907
 msgid "_Smile..."
 msgstr "微笑(_S)..."
 
@@ -1770,11 +1785,11 @@
 msgid "Unsorted"
 msgstr "未排序"
 
-#: ../lib/gui/codecsbox.cpp:477
+#: ../lib/gui/codecsbox.cpp:478
 msgid "Move selected codec priority upwards"
 msgstr "將選定的 codec 優先權提高"
 
-#: ../lib/gui/codecsbox.cpp:487
+#: ../lib/gui/codecsbox.cpp:488
 msgid "Move selected codec priority downwards"
 msgstr "將選定的 codec 優先權降低"
 
@@ -1782,50 +1797,50 @@
 msgid "Do not show this dialog again"
 msgstr "不再顯示此對話框"
 
-#: ../src/gui/accounts.cpp:229
+#: ../src/gui/accounts.cpp:230
 msgid "Registered"
 msgstr "已註冊"
 
 # src/pref_window.cpp:2113
-#: ../src/gui/accounts.cpp:233
+#: ../src/gui/accounts.cpp:234
 msgid "Unregistered"
 msgstr "已取消註冊"
 
-#: ../src/gui/accounts.cpp:237
+#: ../src/gui/accounts.cpp:238
 msgid "Could not unregister"
 msgstr "無法取消註冊"
 
-#: ../src/gui/accounts.cpp:243
+#: ../src/gui/accounts.cpp:244
 msgid "Could not register"
 msgstr "無法註冊"
 
-#: ../src/gui/accounts.cpp:249
+#: ../src/gui/accounts.cpp:250
 msgid "Processing..."
 msgstr "處理中..."
 
-#: ../src/gui/accounts.cpp:632
+#: ../src/gui/accounts.cpp:636
 msgid "Account Name"
 msgstr "帳號名稱"
 
-#: ../src/gui/accounts.cpp:633
+#: ../src/gui/accounts.cpp:637
 msgid "Voice Mails"
 msgstr "語音信箱"
 
-#: ../src/gui/accounts.cpp:634
+#: ../src/gui/accounts.cpp:638
 msgid "Status"
 msgstr "狀態"
 
 # src/menu.cpp:383
-#: ../src/gui/accounts.cpp:645 ../src/gui/accounts.cpp:688
+#: ../src/gui/accounts.cpp:649 ../src/gui/accounts.cpp:692
 msgid "Accounts"
 msgstr "帳號"
 
 # src/menu.cpp:383
-#: ../src/gui/accounts.cpp:659 ../src/gui/main.cpp:3182
+#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3188
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/gui/accounts.cpp:663 ../src/gui/main.cpp:3265
+#: ../src/gui/accounts.cpp:667 ../src/gui/main.cpp:3271
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -1834,11 +1849,11 @@
 #. * description in the list of configured accounts, it shows if an account
 #. * is activated or not (a status the user can choose).
 #.
-#: ../src/gui/accounts.cpp:696 ../src/gui/preferences.cpp:586
+#: ../src/gui/accounts.cpp:700 ../src/gui/preferences.cpp:586
 msgid "A"
 msgstr "A"
 
-#: ../src/gui/assistant.cpp:323
+#: ../src/gui/assistant.cpp:321
 msgid ""
 "This is the Ekiga general configuration assistant. The following steps will "
 "set up Ekiga by asking a few simple questions.\n"
@@ -1850,38 +1865,38 @@
 "\n"
 "一旦您完成了這些步驟，您還是可以在主選單編輯選項的「偏好設定」中修改它們。"
 
-#: ../src/gui/assistant.cpp:331
+#: ../src/gui/assistant.cpp:329
 msgid "Welcome to Ekiga"
 msgstr "歡迎使用 Ekiga"
 
-#: ../src/gui/assistant.cpp:365 ../src/gui/preferences.cpp:454
+#: ../src/gui/assistant.cpp:353 ../src/gui/preferences.cpp:454
 msgid "Personal Information"
 msgstr "個人資訊"
 
 #. The user fields
-#: ../src/gui/assistant.cpp:368
+#: ../src/gui/assistant.cpp:356
 msgid "Please enter your first name and your surname:"
 msgstr "請輸入您的姓名："
 
-#: ../src/gui/assistant.cpp:377
+#: ../src/gui/assistant.cpp:365
 msgid ""
 "Your first name and surname will be used when connecting to other VoIP and "
 "videoconferencing software."
 msgstr "您的姓名會用於連接到其它 VoIP 及視訊會議軟體。"
 
-#: ../src/gui/assistant.cpp:568
+#: ../src/gui/assistant.cpp:559
 msgid "Ekiga.net Account"
 msgstr "Ekiga.net 帳號"
 
-#: ../src/gui/assistant.cpp:570
+#: ../src/gui/assistant.cpp:561
 msgid "Please enter your username:"
 msgstr "請輸入您的使用者名稱："
 
-#: ../src/gui/assistant.cpp:578
+#: ../src/gui/assistant.cpp:569
 msgid "Please enter your password:"
 msgstr "請輸入您的密碼："
 
-#: ../src/gui/assistant.cpp:588
+#: ../src/gui/assistant.cpp:579
 msgid ""
 "The username and password are used to login to your existing account at the "
 "ekiga.net free SIP service. If you do not have an ekiga.net SIP address yet, "
@@ -1897,23 +1912,23 @@
 "\n"
 "如您已使用其它的 SIP 服務，您可以略過這一步。或是您想遲些才設定登入資訊。"
 
-#: ../src/gui/assistant.cpp:615
+#: ../src/gui/assistant.cpp:606
 msgid "I do not want to sign up for the ekiga.net free service"
 msgstr "我不想登記 ekiga.net 的免費服務"
 
-#: ../src/gui/assistant.cpp:678
+#: ../src/gui/assistant.cpp:669
 msgid "Ekiga Call Out Account"
 msgstr "Ekiga Call Out 帳號"
 
-#: ../src/gui/assistant.cpp:680
+#: ../src/gui/assistant.cpp:671
 msgid "Please enter your account ID:"
 msgstr "請輸入您的帳號 ID："
 
-#: ../src/gui/assistant.cpp:688
+#: ../src/gui/assistant.cpp:679
 msgid "Please enter your PIN code:"
 msgstr "請輸入您的 PIN 碼："
 
-#: ../src/gui/assistant.cpp:699
+#: ../src/gui/assistant.cpp:690
 msgid ""
 "You can make calls to regular phones and cell numbers worldwide using "
 "Ekiga.\n"
@@ -1931,48 +1946,48 @@
 "- 接著輸入您的帳號 ID 及 PIN 碼。\n"
 "服務只會在以本對話盒中的 URL 建立帳號後才能使用。\n"
 
-#: ../src/gui/assistant.cpp:749
+#: ../src/gui/assistant.cpp:740
 msgid "Consult the calls history"
 msgstr "查閱通話記錄"
 
-#: ../src/gui/assistant.cpp:759
+#: ../src/gui/assistant.cpp:750
 msgid "I do not want to sign up for the Ekiga Call Out service"
 msgstr "我不想登記 Ekiga Call Out 服務"
 
-#: ../src/gui/assistant.cpp:825 ../src/gui/assistant.cpp:1388
+#: ../src/gui/assistant.cpp:816 ../src/gui/assistant.cpp:1379
 msgid "Connection Type"
 msgstr "連線類型"
 
 #. The connection type
-#: ../src/gui/assistant.cpp:828
+#: ../src/gui/assistant.cpp:819
 msgid "Please choose your connection type:"
 msgstr "請選擇您的連線類型："
 
-#: ../src/gui/assistant.cpp:845
+#: ../src/gui/assistant.cpp:836
 msgid "56k Modem"
 msgstr "56k 數據機"
 
-#: ../src/gui/assistant.cpp:850
+#: ../src/gui/assistant.cpp:841
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/gui/assistant.cpp:855
+#: ../src/gui/assistant.cpp:846
 msgid "DSL/Cable (128 kbit/s uplink)"
 msgstr "DSL/Cable (128 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:860
+#: ../src/gui/assistant.cpp:851
 msgid "DSL/Cable (512 kbit/s uplink)"
 msgstr "DSL/Cable (512 kbit/s uplink)"
 
-#: ../src/gui/assistant.cpp:865
+#: ../src/gui/assistant.cpp:856
 msgid "LAN"
 msgstr "LAN"
 
-#: ../src/gui/assistant.cpp:870
+#: ../src/gui/assistant.cpp:861
 msgid "Keep current settings"
 msgstr "使用目前的設定"
 
-#: ../src/gui/assistant.cpp:875
+#: ../src/gui/assistant.cpp:866
 msgid ""
 "The connection type will permit determining the best quality settings that "
 "Ekiga will use during calls. You can later change the settings individually "
@@ -1981,64 +1996,64 @@
 "連線類型會決定 Ekiga 該連線類型下取得最佳品質的設定。\n"
 "您可以稍後在偏好設定中獨立地修改這設定。"
 
-#: ../src/gui/assistant.cpp:969 ../src/gui/main.cpp:3011
-#: ../src/gui/main.cpp:3015 ../src/gui/preferences.cpp:760
+#: ../src/gui/assistant.cpp:960 ../src/gui/main.cpp:3017
+#: ../src/gui/main.cpp:3021 ../src/gui/preferences.cpp:760
 msgid "Audio Devices"
 msgstr "音訊裝置"
 
-#: ../src/gui/assistant.cpp:971
+#: ../src/gui/assistant.cpp:962
 msgid "Please choose the audio ringing device:"
 msgstr "請選擇音效響鈴裝置："
 
-#: ../src/gui/assistant.cpp:991
+#: ../src/gui/assistant.cpp:982
 msgid ""
 "The audio ringing device is the device that will be used to play the ringing "
 "sound on incoming calls."
 msgstr "音效響鈴裝置是用來播放來電鈴聲音效的裝置。"
 
 #. ---
-#: ../src/gui/assistant.cpp:1002
+#: ../src/gui/assistant.cpp:993
 msgid "Please choose the audio output device:"
 msgstr "請選擇音訊輸出裝置："
 
-#: ../src/gui/assistant.cpp:1022
+#: ../src/gui/assistant.cpp:1013
 msgid ""
 "The audio output device is the device that will be used to play audio during "
 "calls."
 msgstr "音訊輸出裝置是在通話時用來播放聲音的裝置。"
 
 #. ---
-#: ../src/gui/assistant.cpp:1033
+#: ../src/gui/assistant.cpp:1024
 msgid "Please choose the audio input device:"
 msgstr "請選擇音訊輸入裝置："
 
-#: ../src/gui/assistant.cpp:1053
+#: ../src/gui/assistant.cpp:1044
 msgid ""
 "The audio input device is the device that will be used to record your voice "
 "during calls."
 msgstr "音訊輸入裝置是在通話時用來收錄您聲音的裝置。"
 
-#: ../src/gui/assistant.cpp:1155
+#: ../src/gui/assistant.cpp:1146
 msgid "Please choose your video input device:"
 msgstr "請選擇您的視訊輸入裝置："
 
-#: ../src/gui/assistant.cpp:1175
+#: ../src/gui/assistant.cpp:1166
 msgid ""
 "The video input device is the device that will be used to capture video "
 "during calls."
 msgstr "視訊輸入裝置是在通話時用來擷取視訊的裝置。"
 
-#: ../src/gui/assistant.cpp:1240 ../src/gui/assistant.cpp:1264
-#: ../src/gui/assistant.cpp:1288 ../src/gui/preferences.cpp:805
+#: ../src/gui/assistant.cpp:1231 ../src/gui/assistant.cpp:1255
+#: ../src/gui/assistant.cpp:1279 ../src/gui/preferences.cpp:805
 #: ../src/gui/preferences.cpp:830 ../src/gui/preferences.cpp:854
 msgid "No device found"
 msgstr "找不到任何裝置"
 
-#: ../src/gui/assistant.cpp:1319
+#: ../src/gui/assistant.cpp:1310
 msgid "Configuration Complete"
 msgstr "設定完成"
 
-#: ../src/gui/assistant.cpp:1321
+#: ../src/gui/assistant.cpp:1312
 msgid ""
 "You have now finished the Ekiga configuration. All the settings can be "
 "changed in the Ekiga preferences. Enjoy!"
@@ -2046,35 +2061,35 @@
 "您現在已經完成 Ekiga 組態設定。所有的設定值都能在 Ekiga 偏好設定中變更。請儘"
 "情享受！"
 
-#: ../src/gui/assistant.cpp:1328
+#: ../src/gui/assistant.cpp:1319
 msgid "Configuration summary:"
 msgstr "組態摘要:"
 
-#: ../src/gui/assistant.cpp:1398
+#: ../src/gui/assistant.cpp:1389
 msgid "Audio Ringing Device"
 msgstr "音效響鈴裝置"
 
-#: ../src/gui/assistant.cpp:1407
+#: ../src/gui/assistant.cpp:1398
 msgid "Audio Output Device"
 msgstr "音效輸出裝置"
 
-#: ../src/gui/assistant.cpp:1416
+#: ../src/gui/assistant.cpp:1407
 msgid "Audio Input Device"
 msgstr "音效輸入裝置"
 
-#: ../src/gui/assistant.cpp:1425
+#: ../src/gui/assistant.cpp:1416
 msgid "Video Input Device"
 msgstr "視訊輸入裝置"
 
-#: ../src/gui/assistant.cpp:1438
+#: ../src/gui/assistant.cpp:1429
 msgid "SIP URI"
 msgstr "SIP URI"
 
-#: ../src/gui/assistant.cpp:1450
+#: ../src/gui/assistant.cpp:1441
 msgid "Ekiga Call Out"
 msgstr "Ekiga Call Out"
 
-#: ../src/gui/assistant.cpp:1492
+#: ../src/gui/assistant.cpp:1485
 #, c-format
 msgid "Ekiga Configuration Assistant (%d of %d)"
 msgstr "Ekiga 組態助理 (%d / %d)"
@@ -2193,75 +2208,75 @@
 
 # src/pref_window.cpp:2113
 #. Translators: Is displayed once an account "%s" is registered.
-#: ../src/gui/main.cpp:519
+#: ../src/gui/main.cpp:521
 #, c-format
 msgid "Registered %s"
 msgstr "已註冊到 %s"
 
 # src/pref_window.cpp:2113
 #. Translators: Is displayed once an account "%s" is unregistered.
-#: ../src/gui/main.cpp:525
+#: ../src/gui/main.cpp:528
 #, c-format
 msgid "Unregistered %s"
 msgstr "已取消註冊 %s"
 
-#: ../src/gui/main.cpp:530
+#: ../src/gui/main.cpp:533
 #, c-format
 msgid "Could not unregister %s"
 msgstr "無法取消註冊 %s"
 
-#: ../src/gui/main.cpp:534
+#: ../src/gui/main.cpp:537
 #, c-format
 msgid "Could not register %s"
 msgstr "無法註冊 %s"
 
-#: ../src/gui/main.cpp:604
+#: ../src/gui/main.cpp:607
 #, c-format
 msgid "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 msgstr "A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"
 
-#: ../src/gui/main.cpp:650
+#: ../src/gui/main.cpp:653
 #, c-format
 msgid "Connected with %s"
 msgstr "與 %s 連線"
 
-#: ../src/gui/main.cpp:691 ../src/gui/main.cpp:3511
+#: ../src/gui/main.cpp:694 ../src/gui/main.cpp:3517
 msgid "Standby"
 msgstr "備用"
 
-#: ../src/gui/main.cpp:752
+#: ../src/gui/main.cpp:755
 msgid "Call on hold"
 msgstr "保留通話"
 
-#: ../src/gui/main.cpp:763
+#: ../src/gui/main.cpp:766
 msgid "Call retrieved"
 msgstr "來電已收到"
 
-#: ../src/gui/main.cpp:779
+#: ../src/gui/main.cpp:782
 #, c-format
 msgid "Missed call from %s"
 msgstr "來自 %s 的未接來電"
 
-#: ../src/gui/main.cpp:916
+#: ../src/gui/main.cpp:919
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/gui/main.cpp:981
+#: ../src/gui/main.cpp:984
 msgid "Error while initializing video output"
 msgstr "初始化視訊輸出裝置時發生錯誤"
 
-#: ../src/gui/main.cpp:982
+#: ../src/gui/main.cpp:985
 msgid "No video will be displayed during this call->"
 msgstr "在這次通話中將不顯示視訊->"
 
-#: ../src/gui/main.cpp:992
+#: ../src/gui/main.cpp:995
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that no other application is using the accelerated video output."
 msgstr ""
 "在開啟或初始化視訊輸出時發生錯誤。請確認沒有其他應用程式在使用加速視訊輸出。"
 
-#: ../src/gui/main.cpp:994
+#: ../src/gui/main.cpp:997
 msgid ""
 "There was an error opening or initializing the video output. Please verify "
 "that you are using a color depth of 24 or 32 bits per pixel."
@@ -2270,23 +2285,23 @@
 "元。"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1107
+#: ../src/gui/main.cpp:1110
 #, c-format
 msgid "Added video input device %s"
 msgstr "加入的視訊輸入裝置 %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1119
+#: ../src/gui/main.cpp:1122
 #, c-format
 msgid "Removed video input device %s"
 msgstr "移除的視訊輸入裝置 %s"
 
-#: ../src/gui/main.cpp:1136
+#: ../src/gui/main.cpp:1139
 #, c-format
 msgid "Error while accessing video device %s"
 msgstr "開啟視訊裝置 %s 時發生錯誤"
 
-#: ../src/gui/main.cpp:1139
+#: ../src/gui/main.cpp:1142
 msgid ""
 "A moving logo will be transmitted during calls. Notice that you can always "
 "transmit a given image or the moving logo by choosing \"Picture\" as video "
@@ -2296,7 +2311,7 @@
 "訊外掛程式選擇為「Picture」，並且將裝置選擇為「Moving logo」或「Static "
 "picture」。"
 
-#: ../src/gui/main.cpp:1143
+#: ../src/gui/main.cpp:1146
 msgid ""
 "There was an error while opening the device. In case it is a pluggable "
 "device it may be sufficient to reconnect it. If not, or if it still is not "
@@ -2306,15 +2321,15 @@
 "當開啟該裝置時發生錯誤。如果它是外接式裝置，可以再重新連接看看。如果不是，或"
 "者重新連接後仍無法使用，請檢查您的權限並確定已載入合適的驅動程式。"
 
-#: ../src/gui/main.cpp:1147
+#: ../src/gui/main.cpp:1150
 msgid "Your video driver doesn't support the requested video format."
 msgstr "此視訊驅動程式不支援所要求的視訊格式。"
 
-#: ../src/gui/main.cpp:1151
+#: ../src/gui/main.cpp:1154
 msgid "Could not open the chosen channel."
 msgstr "無法開啟所選的通道。"
 
-#: ../src/gui/main.cpp:1155
+#: ../src/gui/main.cpp:1158
 msgid ""
 "Your driver doesn't seem to support any of the color formats supported by "
 "Ekiga.\n"
@@ -2324,42 +2339,42 @@
 "您的驅動程式不支援任何 Ekiga 所支援的彩色格式。\n"
 "請檢查您的核心驅動程式文件以確定該調色板是得到支援。"
 
-#: ../src/gui/main.cpp:1159
+#: ../src/gui/main.cpp:1162
 msgid "Error while setting the frame rate."
 msgstr "設定幀率時發生錯誤。"
 
-#: ../src/gui/main.cpp:1163
+#: ../src/gui/main.cpp:1166
 msgid "Error while setting the frame size."
 msgstr "設定幀尺寸時發生錯誤。"
 
-#: ../src/gui/main.cpp:1168 ../src/gui/main.cpp:1270 ../src/gui/main.cpp:1385
+#: ../src/gui/main.cpp:1171 ../src/gui/main.cpp:1273 ../src/gui/main.cpp:1388
 msgid "Unknown error."
 msgstr "不明的錯誤。"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1218
+#: ../src/gui/main.cpp:1221
 #, c-format
 msgid "Added audio input device %s"
 msgstr "加入的音訊輸入裝置 %s"
 
 #. Translators: This is a hotplug status
-#: ../src/gui/main.cpp:1235
+#: ../src/gui/main.cpp:1238
 #, c-format
 msgid "Removed audio input device %s"
 msgstr "移除的音訊輸入裝置 %s"
 
-#: ../src/gui/main.cpp:1252
+#: ../src/gui/main.cpp:1255
 #, c-format
 msgid "Error while opening audio input device %s"
 msgstr "開啟音效輸入裝置 %s 時發生錯誤"
 
 #. Translators: This happens when there is an error with audio input:
 #. * Nothing ("silence") will be transmitted
-#: ../src/gui/main.cpp:1257
+#: ../src/gui/main.cpp:1260
 msgid "Only silence will be transmitted."
 msgstr "無法傳輸任何聲音。"
 
-#: ../src/gui/main.cpp:1261
+#: ../src/gui/main.cpp:1264
 msgid ""
 "Unable to open the selected audio device for recording. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2369,7 +2384,7 @@
 "無法開啟所選擇的音訊裝置來錄音。如果它是外接式裝置，可以再重新連接看看。如果"
 "不是，或者重新連接後仍無法使用，請檢查你的音訊設定，權限及裝置並不是使用中。"
 
-#: ../src/gui/main.cpp:1265
+#: ../src/gui/main.cpp:1268
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "read data from this device. In case it is a pluggable device it may be "
@@ -2379,26 +2394,26 @@
 "所選擇的音訊裝置開啟成功，但無法在這裝置中讀取資料。如果它是外接式裝置，可以"
 "再重新連接看看。如果不是，或者重新連接後仍無法使用，請檢查你的音訊設定。"
 
-#: ../src/gui/main.cpp:1332
+#: ../src/gui/main.cpp:1335
 #, c-format
 msgid "Added audio output device %s"
 msgstr "加入的音訊輸出裝置 %s"
 
-#: ../src/gui/main.cpp:1348
+#: ../src/gui/main.cpp:1351
 #, c-format
 msgid "Removed audio output device %s"
 msgstr "移除的音訊輸出裝置 %s"
 
-#: ../src/gui/main.cpp:1369
+#: ../src/gui/main.cpp:1372
 #, c-format
 msgid "Error while opening audio output device %s"
 msgstr "開啟音效輸出裝置 %s 時發生錯誤"
 
-#: ../src/gui/main.cpp:1372
+#: ../src/gui/main.cpp:1375
 msgid "No incoming sound will be played."
 msgstr "沒有要播放的來電音效。"
 
-#: ../src/gui/main.cpp:1376
+#: ../src/gui/main.cpp:1379
 msgid ""
 "Unable to open the selected audio device for playing. In case it is a "
 "pluggable device it may be sufficient to reconnect it. If not, or if it "
@@ -2408,7 +2423,7 @@
 "無法開啟所選擇的音訊裝置來播放。如果它是外接式裝置，可以再重新連接看看。如果"
 "不是，或者重新連接後仍無法使用，請檢查你的音訊設定，權限及裝置不是使用中。"
 
-#: ../src/gui/main.cpp:1380
+#: ../src/gui/main.cpp:1383
 msgid ""
 "The selected audio device was successfully opened but it is impossible to "
 "write data to this device. In case it is a pluggable device it may be "
@@ -2418,342 +2433,338 @@
 "所選擇的音訊裝置開啟成功，但無法寫入資料到裝置中。如果它是外接式裝置，可以再"
 "重新連接看看。如果不是，或者重新連接後仍無法使用，請檢查您的音訊設定。"
 
-#: ../src/gui/main.cpp:1568
+#: ../src/gui/main.cpp:1574
 msgid "Video Settings"
 msgstr "視訊設定"
 
-#: ../src/gui/main.cpp:1595
+#: ../src/gui/main.cpp:1601
 msgid "Adjust brightness"
 msgstr "調整亮度"
 
-#: ../src/gui/main.cpp:1616
+#: ../src/gui/main.cpp:1622
 msgid "Adjust whiteness"
 msgstr "調整白平衡"
 
-#: ../src/gui/main.cpp:1637
+#: ../src/gui/main.cpp:1643
 msgid "Adjust color"
 msgstr "調整顏色"
 
-#: ../src/gui/main.cpp:1658
+#: ../src/gui/main.cpp:1664
 msgid "Adjust contrast"
 msgstr "調整對比度"
 
-#: ../src/gui/main.cpp:1704
+#: ../src/gui/main.cpp:1710
 msgid "Audio Settings"
 msgstr "音訊設定"
 
-#: ../src/gui/main.cpp:2315
+#: ../src/gui/main.cpp:2321
 msgid "_Retrieve Call"
 msgstr "恢復通話(_R)"
 
-#: ../src/gui/main.cpp:2328
+#: ../src/gui/main.cpp:2334
 msgid "_Hold Call"
 msgstr "保留通話(_H)"
 
-#: ../src/gui/main.cpp:2360 ../src/gui/main.cpp:3148
+#: ../src/gui/main.cpp:2366 ../src/gui/main.cpp:3154
 msgid "Suspend _Audio"
 msgstr "暫停音訊(_A)"
 
-#: ../src/gui/main.cpp:2362 ../src/gui/main.cpp:3153
+#: ../src/gui/main.cpp:2368 ../src/gui/main.cpp:3159
 msgid "Suspend _Video"
 msgstr "暫停視訊(_V)"
 
-#: ../src/gui/main.cpp:2364
+#: ../src/gui/main.cpp:2370
 msgid "Resume _Audio"
 msgstr "恢復音訊(_A)"
 
-#: ../src/gui/main.cpp:2366
+#: ../src/gui/main.cpp:2372
 msgid "Resume _Video"
 msgstr "恢復視訊(_V)"
 
-#: ../src/gui/main.cpp:2649 ../src/gui/main.cpp:2801
+#: ../src/gui/main.cpp:2655 ../src/gui/main.cpp:2807
 msgid "Reject"
 msgstr "拒接"
 
-#: ../src/gui/main.cpp:2651 ../src/gui/main.cpp:2800
+#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2806
 msgid "Accept"
 msgstr "接受"
 
 # src/endpoint.cpp:467
-#: ../src/gui/main.cpp:2657 ../src/gui/main.cpp:2788
+#: ../src/gui/main.cpp:2663 ../src/gui/main.cpp:2794
 msgid "Incoming call from"
 msgstr "來電來自"
 
 # src/menu.cpp:509
-#: ../src/gui/main.cpp:2675 ../src/gui/main.cpp:2791
+#: ../src/gui/main.cpp:2681 ../src/gui/main.cpp:2797
 msgid "Remote URI:"
 msgstr "遠端 URI："
 
-#: ../src/gui/main.cpp:2687 ../src/gui/main.cpp:2793
+#: ../src/gui/main.cpp:2693 ../src/gui/main.cpp:2799
 msgid "Remote Application:"
 msgstr "遠端程式："
 
-#: ../src/gui/main.cpp:2708
+#: ../src/gui/main.cpp:2714
 #, c-format
 msgid "Call from %s"
 msgstr "%s 來電"
 
-#: ../src/gui/main.cpp:2914
+#: ../src/gui/main.cpp:2920
 #, c-format
 msgid "Call Duration: %s\n"
 msgstr "通話時間：%s\n"
 
-#: ../src/gui/main.cpp:2945
+#: ../src/gui/main.cpp:2951
 msgid "Transfer call to:"
 msgstr "轉送通話到："
 
-#: ../src/gui/main.cpp:2997
+#: ../src/gui/main.cpp:3003
 msgid "No"
 msgstr "否"
 
-#: ../src/gui/main.cpp:2999
+#: ../src/gui/main.cpp:3005
 msgid "Yes"
 msgstr "是"
 
-#: ../src/gui/main.cpp:3010
+#: ../src/gui/main.cpp:3016
 msgid "Detected new audio input device:"
 msgstr "偵測到新的音訊輸入裝置："
 
-#: ../src/gui/main.cpp:3014
+#: ../src/gui/main.cpp:3020
 msgid "Detected new audio output device:"
 msgstr "偵測到新的音訊輸出裝置："
 
-#: ../src/gui/main.cpp:3018
+#: ../src/gui/main.cpp:3024
 msgid "Detected new video input device:"
 msgstr "偵測到新的視訊輸入裝置："
 
-#: ../src/gui/main.cpp:3019 ../src/gui/preferences.cpp:921
+#: ../src/gui/main.cpp:3025 ../src/gui/preferences.cpp:921
 msgid "Video Devices"
 msgstr "視訊裝置"
 
-#: ../src/gui/main.cpp:3037
+#: ../src/gui/main.cpp:3043
 msgid "Do you want to use it as default device?"
 msgstr "是否要用它做為預設的裝置？"
 
-#: ../src/gui/main.cpp:3105
+#: ../src/gui/main.cpp:3111
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: ../src/gui/main.cpp:3107
+#: ../src/gui/main.cpp:3113
 msgid "Ca_ll"
 msgstr "通話(_L)"
 
-#: ../src/gui/main.cpp:3107
+#: ../src/gui/main.cpp:3113
 msgid "Place a new call"
 msgstr "打出新電話"
 
-#: ../src/gui/main.cpp:3110
+#: ../src/gui/main.cpp:3116
 msgid "_Hang up"
 msgstr "掛線(_H)"
 
-#: ../src/gui/main.cpp:3111
+#: ../src/gui/main.cpp:3117
 msgid "Terminate the current call"
 msgstr "中斷目前的通話"
 
-#: ../src/gui/main.cpp:3117
+#: ../src/gui/main.cpp:3123
 msgid "A_dd Contact"
 msgstr "加入連絡人(_D)"
 
-#: ../src/gui/main.cpp:3117
+#: ../src/gui/main.cpp:3123
 msgid "Add a contact to the roster"
 msgstr "將連絡人加入名冊"
 
-#: ../src/gui/main.cpp:3122
+#: ../src/gui/main.cpp:3128
 msgid "Find contacts"
 msgstr "尋找連絡人"
 
-#: ../src/gui/main.cpp:3129
+#: ../src/gui/main.cpp:3135
 msgid "_Contact"
 msgstr "連絡人(_C)"
 
-#: ../src/gui/main.cpp:3130
+#: ../src/gui/main.cpp:3136
 msgid "Act on selected contact"
 msgstr "對已選取連絡人的行動"
 
-#: ../src/gui/main.cpp:3136
+#: ../src/gui/main.cpp:3142
 msgid "H_old Call"
 msgstr "保留通話(_O)"
 
-#: ../src/gui/main.cpp:3136 ../src/gui/main.cpp:3605
+#: ../src/gui/main.cpp:3142 ../src/gui/main.cpp:3611
 msgid "Hold the current call"
 msgstr "保留目前的通話"
 
-#: ../src/gui/main.cpp:3140
+#: ../src/gui/main.cpp:3146
 msgid "_Transfer Call"
 msgstr "轉送來電(_T)"
 
-#: ../src/gui/main.cpp:3141
+#: ../src/gui/main.cpp:3147
 msgid "Transfer the current call"
 msgstr "轉送目前的通話"
 
-#: ../src/gui/main.cpp:3149
+#: ../src/gui/main.cpp:3155
 msgid "Suspend or resume the audio transmission"
 msgstr "暫停或恢復音訊傳送"
 
-#: ../src/gui/main.cpp:3154
+#: ../src/gui/main.cpp:3160
 msgid "Suspend or resume the video transmission"
 msgstr "暫停或恢復視訊傳送"
 
-#: ../src/gui/main.cpp:3161
+#: ../src/gui/main.cpp:3167
 msgid "Close the Ekiga window"
 msgstr "關閉 Ekiga 視窗"
 
-#: ../src/gui/main.cpp:3168 ../src/gui/statusicon.cpp:406
+#: ../src/gui/main.cpp:3174 ../src/gui/statusicon.cpp:414
 msgid "Quit"
 msgstr "結束"
 
-#: ../src/gui/main.cpp:3174
+#: ../src/gui/main.cpp:3180
 msgid "_Configuration Assistant"
 msgstr "組態助理(_C)"
 
-#: ../src/gui/main.cpp:3175
+#: ../src/gui/main.cpp:3181
 msgid "Run the configuration assistant"
 msgstr "執行組態助理"
 
-#: ../src/gui/main.cpp:3183
+#: ../src/gui/main.cpp:3189
 msgid "Edit your accounts"
 msgstr "編輯您的帳號"
 
-#: ../src/gui/main.cpp:3189
+#: ../src/gui/main.cpp:3195
 msgid "Change your preferences"
 msgstr "修改偏好設定"
 
-#: ../src/gui/main.cpp:3194
+#: ../src/gui/main.cpp:3200
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/gui/main.cpp:3196
+#: ../src/gui/main.cpp:3202
 msgid "Con_tacts"
 msgstr "連絡人(_T)"
 
-#: ../src/gui/main.cpp:3196
+#: ../src/gui/main.cpp:3202
 msgid "View the contacts list"
 msgstr "檢視連絡人清單"
 
-#: ../src/gui/main.cpp:3201
+#: ../src/gui/main.cpp:3207
 msgid "_Dialpad"
 msgstr "撥號盤(_D)"
 
-#: ../src/gui/main.cpp:3201
+#: ../src/gui/main.cpp:3207
 msgid "View the dialpad"
 msgstr "顯示撥號盤"
 
-#: ../src/gui/main.cpp:3206
+#: ../src/gui/main.cpp:3212
 msgid "_Call History"
 msgstr "通話紀錄(_C)"
 
-#: ../src/gui/main.cpp:3206
+#: ../src/gui/main.cpp:3212
 msgid "View the call history"
 msgstr "檢視通話紀錄"
 
-#: ../src/gui/main.cpp:3214
+#: ../src/gui/main.cpp:3220
 msgid "_Show Call Panel"
 msgstr "顯示撥號面板(_S)"
 
-#: ../src/gui/main.cpp:3222
+#: ../src/gui/main.cpp:3228
 msgid "_Local Video"
 msgstr "本地端視訊(_L)"
 
-#: ../src/gui/main.cpp:3223
+#: ../src/gui/main.cpp:3229
 msgid "Local video image"
 msgstr "本機視訊畫面"
 
-#: ../src/gui/main.cpp:3228
+#: ../src/gui/main.cpp:3234
 msgid "_Remote Video"
 msgstr "遠端視訊(_R)"
 
-#: ../src/gui/main.cpp:3229
+#: ../src/gui/main.cpp:3235
 msgid "Remote video image"
 msgstr "遠端視訊畫面"
 
-#: ../src/gui/main.cpp:3234
+#: ../src/gui/main.cpp:3240
 msgid "_Picture-in-Picture"
 msgstr "子母畫面(_P)"
 
-#: ../src/gui/main.cpp:3235 ../src/gui/main.cpp:3241
+#: ../src/gui/main.cpp:3241 ../src/gui/main.cpp:3247
 msgid "Both video images"
 msgstr "本機和遠端的視訊畫面"
 
-#: ../src/gui/main.cpp:3240
+#: ../src/gui/main.cpp:3246
 msgid "Picture-in-Picture in Separate _Window"
 msgstr "以個別視窗顯示子母畫面(_W)"
 
-#: ../src/gui/main.cpp:3248
+#: ../src/gui/main.cpp:3254
 msgid "Zoom in"
 msgstr "拉近"
 
-#: ../src/gui/main.cpp:3252
+#: ../src/gui/main.cpp:3258
 msgid "Zoom out"
 msgstr "拉遠"
 
-#: ../src/gui/main.cpp:3256
+#: ../src/gui/main.cpp:3262
 msgid "Normal size"
 msgstr "正常大小"
 
-#: ../src/gui/main.cpp:3260
+#: ../src/gui/main.cpp:3266
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: ../src/gui/main.cpp:3260
+#: ../src/gui/main.cpp:3266
 msgid "Switch to fullscreen"
 msgstr "切換至全螢幕"
 
-#: ../src/gui/main.cpp:3268 ../src/gui/statusicon.cpp:394
+#: ../src/gui/main.cpp:3274 ../src/gui/statusicon.cpp:402
 msgid "Get help by reading the Ekiga manual"
 msgstr "閱讀 Ekiga 手冊以取得幫助"
 
-#: ../src/gui/main.cpp:3273 ../src/gui/statusicon.cpp:399
+#: ../src/gui/main.cpp:3279 ../src/gui/statusicon.cpp:407
 msgid "View information about Ekiga"
 msgstr "顯示有關 Ekiga 的資訊"
 
-#: ../src/gui/main.cpp:3347
+#: ../src/gui/main.cpp:3353
 msgid ""
 "Enter a URI on the left, and click this button to place a call or to hangup"
 msgstr "先在左邊輸入要致電的 URI，接著按本按鍵來播打或掛斷電話"
 
-#: ../src/gui/main.cpp:3398
+#: ../src/gui/main.cpp:3404
 msgid "Contacts"
 msgstr "連絡人"
 
-#: ../src/gui/main.cpp:3421
+#: ../src/gui/main.cpp:3427
 msgid "Dialpad"
 msgstr "撥號盤"
 
-#: ../src/gui/main.cpp:3440
+#: ../src/gui/main.cpp:3446
 msgid "Call history"
 msgstr "通話紀錄"
 
-#: ../src/gui/main.cpp:3543
+#: ../src/gui/main.cpp:3549
 msgid "Change the volume of your soundcard"
 msgstr "調整音效卡的音量"
 
-#: ../src/gui/main.cpp:3563
+#: ../src/gui/main.cpp:3569
 msgid "Change the color settings of your video device"
 msgstr "調整視訊裝置的顏色"
 
-#: ../src/gui/main.cpp:3585
-msgid "Display images from your camera device"
-msgstr "顯示攝影機所拍攝的圖片"
-
-#: ../src/gui/main.cpp:3674
+#: ../src/gui/main.cpp:3680
 msgid "Ekiga"
 msgstr "Ekiga"
 
 #. Translators:
 #. * TX is a common abbreviation for "transmit"
-#: ../src/gui/main.cpp:4281
+#: ../src/gui/main.cpp:4287
 #, c-format
 msgid "TX: %dx%d "
 msgstr "TX: %dx%d "
 
 #. Translators:
 #. * RX is a common abbreviation for "receive"
-#: ../src/gui/main.cpp:4286
+#: ../src/gui/main.cpp:4292
 #, c-format
 msgid "RX: %dx%d "
 msgstr "RX: %dx%d "
 
-#: ../src/gui/main.cpp:4288
+#: ../src/gui/main.cpp:4294
 #, c-format
 msgid ""
 "Lost packets: %.1f %%\n"
@@ -2766,33 +2777,33 @@
 "損壞封包：%.1f %%\n"
 "抗抖動緩衝：%d ms%s%s%s"
 
-#: ../src/gui/main.cpp:4405
+#: ../src/gui/main.cpp:4415
 msgid "Prints debug messages in the console (level between 1 and 5)"
 msgstr "在主控台中顯示除錯訊息（等級由 1 至 5）"
 
-#: ../src/gui/main.cpp:4410
+#: ../src/gui/main.cpp:4420
 msgid "Prints user plane debug messages in the console (level between 1 and 4)"
 msgstr "在主控台中顯示使用者層級除錯訊息（等級由 1 至 4）"
 
-#: ../src/gui/main.cpp:4415
+#: ../src/gui/main.cpp:4425
 msgid "Makes Ekiga call the given URI"
 msgstr "使 Ekiga 致電給指定的 URI"
 
-#: ../src/gui/main.cpp:4524
+#: ../src/gui/main.cpp:4544
 msgid "No usable audio plugin detected"
 msgstr "偵測不到可用的音訊外掛程式"
 
-#: ../src/gui/main.cpp:4525
+#: ../src/gui/main.cpp:4545
 msgid ""
 "Ekiga didn't find any usable audio plugin. Make sure that your installation "
 "is correct."
 msgstr "Ekiga 找不到可用的音效外掛程式，請確定程式是否正確安裝。"
 
-#: ../src/gui/main.cpp:4528
+#: ../src/gui/main.cpp:4548
 msgid "No usable audio codecs detected"
 msgstr "偵測不到可用的音訊編碼解碼器"
 
-#: ../src/gui/main.cpp:4529
+#: ../src/gui/main.cpp:4549
 msgid ""
 "Ekiga didn't find any usable audio codec. Make sure that your installation "
 "is correct."
@@ -3143,7 +3154,7 @@
 msgid "Video"
 msgstr "視訊"
 
-#: ../src/gui/statusicon.cpp:305
+#: ../src/gui/statusicon.cpp:306
 #, c-format
 msgid "You have %d message"
 msgid_plural "You have %d messages"
@@ -3182,6 +3193,9 @@
 msgid "Define a custom message:"
 msgstr "定義自訂訊息:"
 
+#~ msgid "Roster view saving group status"
+#~ msgstr "名冊模式儲存群組狀態"
+
 #~ msgid "Automatic echo cancellation"
 #~ msgstr "自動取消回應"
 
diff -Nru ekiga-3.2.5/sounds/Makefile.in ekiga-3.2.6~ppa~karmic1/sounds/Makefile.in
--- ekiga-3.2.5/sounds/Makefile.in	2009-07-06 20:10:42.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/sounds/Makefile.in	2009-09-22 15:36:31.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -49,9 +52,23 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(ekigasoundsdir)"
-ekigasoundsDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(ekigasounds_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -163,6 +180,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -265,9 +283,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  sounds/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  sounds/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sounds/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu sounds/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -285,6 +303,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -294,20 +313,23 @@
 install-ekigasoundsDATA: $(ekigasounds_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(ekigasoundsdir)" || $(MKDIR_P) "$(DESTDIR)$(ekigasoundsdir)"
-	@list='$(ekigasounds_DATA)'; for p in $$list; do \
+	@list='$(ekigasounds_DATA)'; test -n "$(ekigasoundsdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(ekigasoundsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ekigasoundsdir)/$$f'"; \
-	  $(ekigasoundsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ekigasoundsdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ekigasoundsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(ekigasoundsdir)" || exit $$?; \
 	done
 
 uninstall-ekigasoundsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(ekigasounds_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(ekigasoundsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(ekigasoundsdir)/$$f"; \
-	done
+	@list='$(ekigasounds_DATA)'; test -n "$(ekigasoundsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(ekigasoundsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(ekigasoundsdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -331,13 +353,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -368,6 +394,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -386,6 +413,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -394,18 +423,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -440,6 +479,7 @@
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am uninstall uninstall-am uninstall-ekigasoundsDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Binary files /tmp/S3BdPzEt2V/ekiga-3.2.5/sounds/newmessage.wav and /tmp/YXIbDqa5pu/ekiga-3.2.6~ppa~karmic1/sounds/newmessage.wav differ
diff -Nru ekiga-3.2.5/src/gui/assistant.cpp ekiga-3.2.6~ppa~karmic1/src/gui/assistant.cpp
--- ekiga-3.2.5/src/gui/assistant.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/src/gui/assistant.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -192,14 +192,12 @@
   GtkTreeModel *model = NULL;
   GtkTreeIter iter;
 
-  gchar *option_string = NULL;
   gboolean found = FALSE;
-  
+
   if (!option)
     return;
 
   model = gtk_combo_box_get_model (combo_box);
-  option_string = g_locale_to_utf8 (option, -1, NULL, NULL, NULL);
 
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter)) {
 
@@ -209,7 +207,7 @@
       gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter, 0, &value);
       value_string = (gchar *) g_value_get_string (&value);
       if (g_ascii_strcasecmp  (value_string, option) == 0) {
-        gtk_list_store_set (GTK_LIST_STORE (model), &iter, 
+        gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                             1, TRUE,
                             -1);
         g_value_unset(&value);
@@ -223,13 +221,11 @@
 
   if (!found) {
     gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-    gtk_list_store_set (GTK_LIST_STORE (model), &iter, 
+    gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                         0, option,
                         1, TRUE,
                         -1);
   }
-
-  g_free (option_string);
 }
 
 static void
diff -Nru ekiga-3.2.5/src/gui/callbacks.cpp ekiga-3.2.6~ppa~karmic1/src/gui/callbacks.cpp
--- ekiga-3.2.5/src/gui/callbacks.cpp	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/src/gui/callbacks.cpp	2009-08-08 16:49:30.000000000 +0100
@@ -63,7 +63,7 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #ifdef HAVE_GNOME
-#include <gnome.h>
+#include <libgnome/gnome-help.h>
 #endif
 
 
diff -Nru ekiga-3.2.5/src/gui/main.cpp ekiga-3.2.6~ppa~karmic1/src/gui/main.cpp
--- ekiga-3.2.5/src/gui/main.cpp	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/src/gui/main.cpp	2009-09-22 15:27:35.000000000 +0100
@@ -496,6 +496,11 @@
                                                       DeviceType device_type);
 
 
+/* DESCRIPTION   :  /
+ * BEHAVIOR      : Returns the currently called URL in the URL bar.
+ * PRE           : The main window GMObject.
+ */
+static const std::string ekiga_main_window_get_call_url (EkigaMainWindow *mw);
 
 /* 
  * Engine Callbacks 
@@ -4241,12 +4246,17 @@
 }
 
 
-const char *
+static const std::string
 ekiga_main_window_get_call_url (EkigaMainWindow *mw)
 {
   g_return_val_if_fail (EKIGA_IS_MAIN_WINDOW (mw), NULL);
 
-  return gtk_entry_get_text (GTK_ENTRY (mw->priv->entry));
+  const gchar* entry_text = gtk_entry_get_text (GTK_ENTRY (mw->priv->entry));
+
+  if (entry_text != NULL)
+    return entry_text;
+  else
+    return "";
 }
 
 
@@ -4354,6 +4364,10 @@
   return gtk_image_get_pixbuf (GTK_IMAGE (mw->priv->main_video_image));
 }
 
+#ifdef WIN32
+// the linker must not find main
+#define main(c,v,e) ekigas_real_main(c,v,e)
+#endif
 
 /* The main () */
 int 
@@ -4453,6 +4467,13 @@
   text_label =  g_strdup_printf ("PTLIB_TRACE_CODECS_USER_PLANE=%d", debug_level_up);
   _putenv (text_label);
   g_free (text_label);
+  if (debug_level != 0) {
+    std::string desk_path = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
+    if (!desk_path.empty ()) {
+      std::freopen((desk_path + "\\ekiga-stdout.txt").c_str (), "w", stdout);
+      std::freopen((desk_path + "\\ekiga-stderr.txt").c_str (), "w", stderr);
+    }
+  }
 #endif
 
   /* Ekiga initialisation */
@@ -4622,9 +4643,6 @@
     /* use msvcrt.dll to parse command line */
     __getmainargs (&argc, &argv, &env, 0, &info);
 
-    std::freopen("stdout.txt", "w", stdout);
-    std::freopen("stderr.txt", "w", stderr);
-
     iresult = main (argc, argv, env);
   }
   CloseHandle (ekr_mutex);
diff -Nru ekiga-3.2.5/src/gui/main.h ekiga-3.2.6~ppa~karmic1/src/gui/main.h
--- ekiga-3.2.5/src/gui/main.h	2009-07-04 14:46:07.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/src/gui/main.h	2009-08-31 14:29:36.000000000 +0100
@@ -331,13 +331,6 @@
 
 
 /* DESCRIPTION   :  /
- * BEHAVIOR      : Returns the currently called URL in the URL bar.
- * PRE           : The main window GMObject.
- */
-const char *ekiga_main_window_get_call_url (EkigaMainWindow *main_window);
-
-
-/* DESCRIPTION   :  /
  * BEHAVIOR      : Clears the stats area in the control panel. 
  * PRE           : The main window GMObject.
  */
diff -Nru ekiga-3.2.5/src/Makefile.in ekiga-3.2.6~ppa~karmic1/src/Makefile.in
--- ekiga-3.2.5/src/Makefile.in	2009-07-06 20:10:42.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/src/Makefile.in	2009-09-22 15:36:31.000000000 +0100
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -74,10 +76,10 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = ekiga-config-tool
+CONFIG_CLEAN_VPATH_FILES =
 @HAVE_DBUS_TRUE@am__EXEEXT_1 = ekiga-helper$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(servicedir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am__ekiga_SOURCES_DIST = common.h gui/accounts.h gui/accounts.cpp \
 	gui/callbacks.h gui/callbacks.cpp gui/conf.h gui/conf.cpp \
@@ -116,11 +118,32 @@
 ekiga_helper_OBJECTS = $(am_ekiga_helper_OBJECTS) \
 	$(nodist_ekiga_helper_OBJECTS)
 @HAVE_DBUS_TRUE@ekiga_helper_DEPENDENCIES = $(am__DEPENDENCIES_1)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -143,13 +166,6 @@
 	$(ekiga_helper_SOURCES) $(nodist_ekiga_helper_SOURCES)
 DIST_SOURCES = $(am__ekiga_SOURCES_DIST) \
 	$(am__ekiga_helper_SOURCES_DIST)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-serviceDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(service_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -263,6 +279,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -434,9 +451,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -454,36 +471,52 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 ekiga-config-tool: $(top_builddir)/config.status $(srcdir)/ekiga-config-tool.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 $(top_srcdir)/win32/$(am__dirstamp):
 	@$(MKDIR_P) $(top_srcdir)/win32
 	@: > $(top_srcdir)/win32/$(am__dirstamp)
@@ -502,22 +535,37 @@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
 
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -543,203 +591,203 @@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
 @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 accounts.o: gui/accounts.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT accounts.o -MD -MP -MF $(DEPDIR)/accounts.Tpo -c -o accounts.o `test -f 'gui/accounts.cpp' || echo '$(srcdir)/'`gui/accounts.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/accounts.Tpo $(DEPDIR)/accounts.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/accounts.Tpo $(DEPDIR)/accounts.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/accounts.cpp' object='accounts.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o accounts.o `test -f 'gui/accounts.cpp' || echo '$(srcdir)/'`gui/accounts.cpp
 
 accounts.obj: gui/accounts.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT accounts.obj -MD -MP -MF $(DEPDIR)/accounts.Tpo -c -o accounts.obj `if test -f 'gui/accounts.cpp'; then $(CYGPATH_W) 'gui/accounts.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/accounts.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/accounts.Tpo $(DEPDIR)/accounts.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/accounts.Tpo $(DEPDIR)/accounts.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/accounts.cpp' object='accounts.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o accounts.obj `if test -f 'gui/accounts.cpp'; then $(CYGPATH_W) 'gui/accounts.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/accounts.cpp'; fi`
 
 callbacks.o: gui/callbacks.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT callbacks.o -MD -MP -MF $(DEPDIR)/callbacks.Tpo -c -o callbacks.o `test -f 'gui/callbacks.cpp' || echo '$(srcdir)/'`gui/callbacks.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/callbacks.Tpo $(DEPDIR)/callbacks.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/callbacks.Tpo $(DEPDIR)/callbacks.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/callbacks.cpp' object='callbacks.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o callbacks.o `test -f 'gui/callbacks.cpp' || echo '$(srcdir)/'`gui/callbacks.cpp
 
 callbacks.obj: gui/callbacks.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT callbacks.obj -MD -MP -MF $(DEPDIR)/callbacks.Tpo -c -o callbacks.obj `if test -f 'gui/callbacks.cpp'; then $(CYGPATH_W) 'gui/callbacks.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/callbacks.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/callbacks.Tpo $(DEPDIR)/callbacks.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/callbacks.Tpo $(DEPDIR)/callbacks.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/callbacks.cpp' object='callbacks.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o callbacks.obj `if test -f 'gui/callbacks.cpp'; then $(CYGPATH_W) 'gui/callbacks.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/callbacks.cpp'; fi`
 
 conf.o: gui/conf.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT conf.o -MD -MP -MF $(DEPDIR)/conf.Tpo -c -o conf.o `test -f 'gui/conf.cpp' || echo '$(srcdir)/'`gui/conf.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/conf.Tpo $(DEPDIR)/conf.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/conf.Tpo $(DEPDIR)/conf.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/conf.cpp' object='conf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o conf.o `test -f 'gui/conf.cpp' || echo '$(srcdir)/'`gui/conf.cpp
 
 conf.obj: gui/conf.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT conf.obj -MD -MP -MF $(DEPDIR)/conf.Tpo -c -o conf.obj `if test -f 'gui/conf.cpp'; then $(CYGPATH_W) 'gui/conf.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/conf.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/conf.Tpo $(DEPDIR)/conf.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/conf.Tpo $(DEPDIR)/conf.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/conf.cpp' object='conf.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o conf.obj `if test -f 'gui/conf.cpp'; then $(CYGPATH_W) 'gui/conf.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/conf.cpp'; fi`
 
 dialpad.o: gui/dialpad.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dialpad.o -MD -MP -MF $(DEPDIR)/dialpad.Tpo -c -o dialpad.o `test -f 'gui/dialpad.cpp' || echo '$(srcdir)/'`gui/dialpad.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dialpad.Tpo $(DEPDIR)/dialpad.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dialpad.Tpo $(DEPDIR)/dialpad.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/dialpad.cpp' object='dialpad.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dialpad.o `test -f 'gui/dialpad.cpp' || echo '$(srcdir)/'`gui/dialpad.cpp
 
 dialpad.obj: gui/dialpad.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dialpad.obj -MD -MP -MF $(DEPDIR)/dialpad.Tpo -c -o dialpad.obj `if test -f 'gui/dialpad.cpp'; then $(CYGPATH_W) 'gui/dialpad.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/dialpad.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dialpad.Tpo $(DEPDIR)/dialpad.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dialpad.Tpo $(DEPDIR)/dialpad.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/dialpad.cpp' object='dialpad.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dialpad.obj `if test -f 'gui/dialpad.cpp'; then $(CYGPATH_W) 'gui/dialpad.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/dialpad.cpp'; fi`
 
 assistant.o: gui/assistant.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT assistant.o -MD -MP -MF $(DEPDIR)/assistant.Tpo -c -o assistant.o `test -f 'gui/assistant.cpp' || echo '$(srcdir)/'`gui/assistant.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/assistant.Tpo $(DEPDIR)/assistant.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/assistant.Tpo $(DEPDIR)/assistant.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/assistant.cpp' object='assistant.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o assistant.o `test -f 'gui/assistant.cpp' || echo '$(srcdir)/'`gui/assistant.cpp
 
 assistant.obj: gui/assistant.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT assistant.obj -MD -MP -MF $(DEPDIR)/assistant.Tpo -c -o assistant.obj `if test -f 'gui/assistant.cpp'; then $(CYGPATH_W) 'gui/assistant.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/assistant.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/assistant.Tpo $(DEPDIR)/assistant.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/assistant.Tpo $(DEPDIR)/assistant.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/assistant.cpp' object='assistant.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o assistant.obj `if test -f 'gui/assistant.cpp'; then $(CYGPATH_W) 'gui/assistant.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/assistant.cpp'; fi`
 
 main.o: gui/main.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'gui/main.cpp' || echo '$(srcdir)/'`gui/main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/main.cpp' object='main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main.o `test -f 'gui/main.cpp' || echo '$(srcdir)/'`gui/main.cpp
 
 main.obj: gui/main.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'gui/main.cpp'; then $(CYGPATH_W) 'gui/main.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/main.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/main.cpp' object='main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main.obj `if test -f 'gui/main.cpp'; then $(CYGPATH_W) 'gui/main.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/main.cpp'; fi`
 
 misc.o: gui/misc.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f 'gui/misc.cpp' || echo '$(srcdir)/'`gui/misc.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/misc.cpp' object='misc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o misc.o `test -f 'gui/misc.cpp' || echo '$(srcdir)/'`gui/misc.cpp
 
 misc.obj: gui/misc.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f 'gui/misc.cpp'; then $(CYGPATH_W) 'gui/misc.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/misc.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/misc.cpp' object='misc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o misc.obj `if test -f 'gui/misc.cpp'; then $(CYGPATH_W) 'gui/misc.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/misc.cpp'; fi`
 
 preferences.o: gui/preferences.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT preferences.o -MD -MP -MF $(DEPDIR)/preferences.Tpo -c -o preferences.o `test -f 'gui/preferences.cpp' || echo '$(srcdir)/'`gui/preferences.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/preferences.Tpo $(DEPDIR)/preferences.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/preferences.Tpo $(DEPDIR)/preferences.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/preferences.cpp' object='preferences.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o preferences.o `test -f 'gui/preferences.cpp' || echo '$(srcdir)/'`gui/preferences.cpp
 
 preferences.obj: gui/preferences.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT preferences.obj -MD -MP -MF $(DEPDIR)/preferences.Tpo -c -o preferences.obj `if test -f 'gui/preferences.cpp'; then $(CYGPATH_W) 'gui/preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/preferences.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/preferences.Tpo $(DEPDIR)/preferences.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/preferences.Tpo $(DEPDIR)/preferences.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/preferences.cpp' object='preferences.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o preferences.obj `if test -f 'gui/preferences.cpp'; then $(CYGPATH_W) 'gui/preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/preferences.cpp'; fi`
 
 statusicon.o: gui/statusicon.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT statusicon.o -MD -MP -MF $(DEPDIR)/statusicon.Tpo -c -o statusicon.o `test -f 'gui/statusicon.cpp' || echo '$(srcdir)/'`gui/statusicon.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/statusicon.Tpo $(DEPDIR)/statusicon.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/statusicon.Tpo $(DEPDIR)/statusicon.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/statusicon.cpp' object='statusicon.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o statusicon.o `test -f 'gui/statusicon.cpp' || echo '$(srcdir)/'`gui/statusicon.cpp
 
 statusicon.obj: gui/statusicon.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT statusicon.obj -MD -MP -MF $(DEPDIR)/statusicon.Tpo -c -o statusicon.obj `if test -f 'gui/statusicon.cpp'; then $(CYGPATH_W) 'gui/statusicon.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/statusicon.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/statusicon.Tpo $(DEPDIR)/statusicon.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/statusicon.Tpo $(DEPDIR)/statusicon.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/statusicon.cpp' object='statusicon.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o statusicon.obj `if test -f 'gui/statusicon.cpp'; then $(CYGPATH_W) 'gui/statusicon.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/statusicon.cpp'; fi`
 
 statusmenu.o: gui/statusmenu.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT statusmenu.o -MD -MP -MF $(DEPDIR)/statusmenu.Tpo -c -o statusmenu.o `test -f 'gui/statusmenu.cpp' || echo '$(srcdir)/'`gui/statusmenu.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/statusmenu.Tpo $(DEPDIR)/statusmenu.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/statusmenu.Tpo $(DEPDIR)/statusmenu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/statusmenu.cpp' object='statusmenu.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o statusmenu.o `test -f 'gui/statusmenu.cpp' || echo '$(srcdir)/'`gui/statusmenu.cpp
 
 statusmenu.obj: gui/statusmenu.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT statusmenu.obj -MD -MP -MF $(DEPDIR)/statusmenu.Tpo -c -o statusmenu.obj `if test -f 'gui/statusmenu.cpp'; then $(CYGPATH_W) 'gui/statusmenu.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/statusmenu.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/statusmenu.Tpo $(DEPDIR)/statusmenu.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/statusmenu.Tpo $(DEPDIR)/statusmenu.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gui/statusmenu.cpp' object='statusmenu.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o statusmenu.obj `if test -f 'gui/statusmenu.cpp'; then $(CYGPATH_W) 'gui/statusmenu.cpp'; else $(CYGPATH_W) '$(srcdir)/gui/statusmenu.cpp'; fi`
 
 plugin-gconst.o: $(top_srcdir)/win32/plugin-gconst.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin-gconst.o -MD -MP -MF $(DEPDIR)/plugin-gconst.Tpo -c -o plugin-gconst.o `test -f '$(top_srcdir)/win32/plugin-gconst.cpp' || echo '$(srcdir)/'`$(top_srcdir)/win32/plugin-gconst.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/plugin-gconst.Tpo $(DEPDIR)/plugin-gconst.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/plugin-gconst.Tpo $(DEPDIR)/plugin-gconst.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/win32/plugin-gconst.cpp' object='plugin-gconst.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin-gconst.o `test -f '$(top_srcdir)/win32/plugin-gconst.cpp' || echo '$(srcdir)/'`$(top_srcdir)/win32/plugin-gconst.cpp
 
 plugin-gconst.obj: $(top_srcdir)/win32/plugin-gconst.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin-gconst.obj -MD -MP -MF $(DEPDIR)/plugin-gconst.Tpo -c -o plugin-gconst.obj `if test -f '$(top_srcdir)/win32/plugin-gconst.cpp'; then $(CYGPATH_W) '$(top_srcdir)/win32/plugin-gconst.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/win32/plugin-gconst.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/plugin-gconst.Tpo $(DEPDIR)/plugin-gconst.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/plugin-gconst.Tpo $(DEPDIR)/plugin-gconst.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/win32/plugin-gconst.cpp' object='plugin-gconst.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin-gconst.obj `if test -f '$(top_srcdir)/win32/plugin-gconst.cpp'; then $(CYGPATH_W) '$(top_srcdir)/win32/plugin-gconst.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/win32/plugin-gconst.cpp'; fi`
 
 dbus.o: dbus-helper/dbus.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dbus.o -MD -MP -MF $(DEPDIR)/dbus.Tpo -c -o dbus.o `test -f 'dbus-helper/dbus.cpp' || echo '$(srcdir)/'`dbus-helper/dbus.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dbus.Tpo $(DEPDIR)/dbus.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dbus.Tpo $(DEPDIR)/dbus.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dbus-helper/dbus.cpp' object='dbus.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dbus.o `test -f 'dbus-helper/dbus.cpp' || echo '$(srcdir)/'`dbus-helper/dbus.cpp
 
 dbus.obj: dbus-helper/dbus.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dbus.obj -MD -MP -MF $(DEPDIR)/dbus.Tpo -c -o dbus.obj `if test -f 'dbus-helper/dbus.cpp'; then $(CYGPATH_W) 'dbus-helper/dbus.cpp'; else $(CYGPATH_W) '$(srcdir)/dbus-helper/dbus.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dbus.Tpo $(DEPDIR)/dbus.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dbus.Tpo $(DEPDIR)/dbus.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dbus-helper/dbus.cpp' object='dbus.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dbus.obj `if test -f 'dbus-helper/dbus.cpp'; then $(CYGPATH_W) 'dbus-helper/dbus.cpp'; else $(CYGPATH_W) '$(srcdir)/dbus-helper/dbus.cpp'; fi`
 
 dbus-helper.o: dbus-helper/dbus-helper.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dbus-helper.o -MD -MP -MF $(DEPDIR)/dbus-helper.Tpo -c -o dbus-helper.o `test -f 'dbus-helper/dbus-helper.cpp' || echo '$(srcdir)/'`dbus-helper/dbus-helper.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dbus-helper.Tpo $(DEPDIR)/dbus-helper.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dbus-helper.Tpo $(DEPDIR)/dbus-helper.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dbus-helper/dbus-helper.cpp' object='dbus-helper.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dbus-helper.o `test -f 'dbus-helper/dbus-helper.cpp' || echo '$(srcdir)/'`dbus-helper/dbus-helper.cpp
 
 dbus-helper.obj: dbus-helper/dbus-helper.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dbus-helper.obj -MD -MP -MF $(DEPDIR)/dbus-helper.Tpo -c -o dbus-helper.obj `if test -f 'dbus-helper/dbus-helper.cpp'; then $(CYGPATH_W) 'dbus-helper/dbus-helper.cpp'; else $(CYGPATH_W) '$(srcdir)/dbus-helper/dbus-helper.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/dbus-helper.Tpo $(DEPDIR)/dbus-helper.Po
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dbus-helper.Tpo $(DEPDIR)/dbus-helper.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dbus-helper/dbus-helper.cpp' object='dbus-helper.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dbus-helper.obj `if test -f 'dbus-helper/dbus-helper.cpp'; then $(CYGPATH_W) 'dbus-helper/dbus-helper.cpp'; else $(CYGPATH_W) '$(srcdir)/dbus-helper/dbus-helper.cpp'; fi`
@@ -752,20 +800,23 @@
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
-	@list='$(service_DATA)'; for p in $$list; do \
+	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
-	  $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(servicedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(servicedir)" || exit $$?; \
 	done
 
 uninstall-serviceDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(service_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(servicedir)/$$f"; \
-	done
+	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(servicedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -779,7 +830,7 @@
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -787,29 +838,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -830,13 +886,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -870,6 +930,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 	-test -z "$(top_srcdir)/win32/$(DEPDIR)/$(am__dirstamp)" || rm -f $(top_srcdir)/win32/$(DEPDIR)/$(am__dirstamp)
 	-test -z "$(top_srcdir)/win32/$(am__dirstamp)" || rm -f $(top_srcdir)/win32/$(am__dirstamp)
@@ -894,6 +955,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -902,18 +965,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS install-binSCRIPTS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -937,7 +1010,7 @@
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-serviceDATA
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
@@ -982,6 +1055,7 @@
             echo "#define EKIGA_REVISION \"unknown\"" > revision.h; \
           fi \
         fi
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru ekiga-3.2.5/win32/nsisinstaller/ekiga.nsi ekiga-3.2.6~ppa~karmic1/win32/nsisinstaller/ekiga.nsi
--- ekiga-3.2.5/win32/nsisinstaller/ekiga.nsi	2009-07-04 14:46:44.000000000 +0100
+++ ekiga-3.2.6~ppa~karmic1/win32/nsisinstaller/ekiga.nsi	2009-07-21 11:23:14.000000000 +0100
@@ -393,7 +393,7 @@
   
   Section $(EKIGA_RUN_AT_STARTUP) SecStartup
      SetOutPath $INSTDIR
-     CreateShortCut "$SMSTARTUP\Ekiga.lnk" "$INSTDIR\ekiga.exe" "" "" 0 SW_SHOWMINIMIZED
+     CreateShortCut "$SMSTARTUP\Ekiga.lnk" "$INSTDIR\ekiga.exe" "" "" 0 SW_SHOWNORMAL
   SectionEnd
 SubSectionEnd